From 2ddabce031c6c408688477544f9b16a28b7b9cb1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 27 May 2014 12:35:54 +0200 Subject: Port inkscape to librevenge framework for WPG, CDR and VSD imports (bzr r13398.1.1) --- configure.ac | 24 +++++---------------- src/extension/internal/cdr-input.cpp | 20 ++++++++++-------- src/extension/internal/vsd-input.cpp | 20 ++++++++++-------- src/extension/internal/wpg-input.cpp | 41 ++++++++++++------------------------ src/ui/dialog/symbols.cpp | 10 +++++---- 5 files changed, 46 insertions(+), 69 deletions(-) diff --git a/configure.ac b/configure.ac index bc2633253..205638507 100644 --- a/configure.ac +++ b/configure.ac @@ -526,28 +526,14 @@ AC_ARG_ENABLE(wpg, with_libwpg=no if test "x$enable_wpg" = "xyes"; then - PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no) - if test "x$with_libwpg01" = "xyes"; then - AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x]) - with_libwpg=yes - AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS) - AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS) - fi - - PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no) - if test "x$with_libwpg02" = "xyes"; then - AC_DEFINE(WITH_LIBWPG02,1,[Build in libwpg 0.2.x]) - with_libwpg=yes - AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS) - AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS) - fi + PKG_CHECK_MODULES(LIBWPG, libwpg-0.3 librevenge-0.0 librevenge-stream-0.0, with_libwpg=yes, with_libwpg=no) if test "x$with_libwpg" = "xyes"; then AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg]) fi fi -AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes") -AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes") +AC_SUBST(LIBWPG_LIBS) +AC_SUBST(LIBWPG_CFLAGS) AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes") dnl ******************************** @@ -561,7 +547,7 @@ AC_ARG_ENABLE(visio, with_libvisio=no if test "x$enable_visio" = "xyes"; then - PKG_CHECK_MODULES(LIBVISIO, libvisio-0.0 >= 0.0.20 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libvisio=yes, with_libvisio=no) + PKG_CHECK_MODULES(LIBVISIO, libvisio-0.1 librevenge-0.0 librevenge-stream-0.0, with_libvisio=yes, with_libvisio=no) if test "x$with_libvisio" = "xyes"; then AC_DEFINE(WITH_LIBVISIO,1,[Build in libvisio]) @@ -582,7 +568,7 @@ AC_ARG_ENABLE(cdr, with_libcdr=no if test "x$enable_cdr" = "xyes"; then - PKG_CHECK_MODULES(LIBCDR, libcdr-0.0 >= 0.0.3 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libcdr=yes, with_libcdr=no) + PKG_CHECK_MODULES(LIBCDR, libcdr-0.1 librevenge-0.0 librevenge-stream-0.0, with_libcdr=yes, with_libcdr=no) if test "x$with_libcdr" = "xyes"; then AC_DEFINE(WITH_LIBCDR,1,[Build in libcdr]) diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index 0111ed626..c4f251361 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -60,7 +60,7 @@ namespace Internal { class CdrImportDialog : public Gtk::Dialog { public: - CdrImportDialog(const std::vector &vec); + CdrImportDialog(const std::vector &vec); virtual ~CdrImportDialog(); bool showDialog(); @@ -86,12 +86,12 @@ private: class Gtk::VBox * vbox2; class Gtk::Widget * _previewArea; - const std::vector &_vec; // Document to be imported + const std::vector &_vec; // Document to be imported unsigned _current_page; // Current selected page int _preview_width, _preview_height; // Size of the preview area }; -CdrImportDialog::CdrImportDialog(const std::vector &vec) +CdrImportDialog::CdrImportDialog(const std::vector &vec) : _vec(vec), _current_page(1) { int num_pages = _vec.size(); @@ -210,14 +210,16 @@ void CdrImportDialog::_setPreviewPage(unsigned page) SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - WPXFileStream input(uri); + librevenge::RVNGFileStream input(uri); if (!libcdr::CDRDocument::isSupported(&input)) { return NULL; } - libcdr::CDRStringVector output; - if (!libcdr::CDRDocument::generateSVG(&input, output)) { + librevenge::RVNGStringVector output; + librevenge::RVNGSVGDrawingGenerator generator(output, "svg"); + + if (!libcdr::CDRDocument::parse(&input, &generator)) { return NULL; } @@ -225,9 +227,9 @@ SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u return NULL; } - std::vector tmpSVGOutput; + std::vector tmpSVGOutput; for (unsigned i=0; i\n\n"); + librevenge::RVNGString tmpString("\n\n"); tmpString.append(output[i]); tmpSVGOutput.push_back(tmpString); } diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index 6fc79237b..b7e8669b8 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -59,7 +59,7 @@ namespace Internal { class VsdImportDialog : public Gtk::Dialog { public: - VsdImportDialog(const std::vector &vec); + VsdImportDialog(const std::vector &vec); virtual ~VsdImportDialog(); bool showDialog(); @@ -85,12 +85,12 @@ private: class Gtk::VBox * vbox2; class Gtk::Widget * _previewArea; - const std::vector &_vec; // Document to be imported + const std::vector &_vec; // Document to be imported unsigned _current_page; // Current selected page int _preview_width, _preview_height; // Size of the preview area }; -VsdImportDialog::VsdImportDialog(const std::vector &vec) +VsdImportDialog::VsdImportDialog(const std::vector &vec) : _vec(vec), _current_page(1) { int num_pages = _vec.size(); @@ -209,14 +209,16 @@ void VsdImportDialog::_setPreviewPage(unsigned page) SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - WPXFileStream input(uri); + librevenge::RVNGFileStream input(uri); if (!libvisio::VisioDocument::isSupported(&input)) { return NULL; } - libvisio::VSDStringVector output; - if (!libvisio::VisioDocument::generateSVG(&input, output)) { + librevenge::RVNGStringVector output; + librevenge::RVNGSVGDrawingGenerator generator(output, "svg"); + + if (!libvisio::VisioDocument::parse(&input, &generator)) { return NULL; } @@ -224,9 +226,9 @@ SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u return NULL; } - std::vector tmpSVGOutput; + std::vector tmpSVGOutput; for (unsigned i=0; i\n\n"); + librevenge::RVNGString tmpString("\n\n"); tmpString.append(output[i]); tmpSVGOutput.push_back(tmpString); } diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index 14ff3ec77..c10926361 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -52,17 +52,8 @@ #include "util/units.h" #include -// Take a guess and fallback to 0.1.x if no configure has run -#if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02) -#define WITH_LIBWPG01 1 -#endif - #include "libwpg/libwpg.h" -#if WITH_LIBWPG01 -#include "libwpg/WPGStreamImplementation.h" -#elif WITH_LIBWPG02 -#include "libwpd-stream/libwpd-stream.h" -#endif +#include "librevenge-stream/librevenge-stream.h" using namespace libwpg; @@ -73,17 +64,9 @@ namespace Internal { SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { -#if WITH_LIBWPG01 - WPXInputStream* input = new libwpg::WPGFileStream(uri); -#elif WITH_LIBWPG02 - WPXInputStream* input = new WPXFileStream(uri); -#endif - if (input->isOLEStream()) { -#if WITH_LIBWPG01 - WPXInputStream* olestream = input->getDocumentOLEStream(); -#elif WITH_LIBWPG02 - WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN"); -#endif + librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(uri); + if (input->isStructured()) { + librevenge::RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN"); if (olestream) { delete input; input = olestream; @@ -98,15 +81,17 @@ SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u return NULL; } -#if WITH_LIBWPG01 - libwpg::WPGString output; -#elif WITH_LIBWPG02 - WPXString output; -#endif - if (!libwpg::WPGraphics::generateSVG(input, output)) { + librevenge::RVNGStringVector vec; + librevenge::RVNGSVGDrawingGenerator generator(vec, ""); + + if (!libwpg::WPGraphics::parse(input, &generator) || vec.empty() || vec[0].empty()) + { delete input; return NULL; - } + } + + librevenge::RVNGString output("\n\n"); + output.append(vec[0]); //printf("I've got a doc: \n%s", painter.document.c_str()); diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 8e0d085a4..0b048ed82 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -63,7 +63,7 @@ #ifdef WITH_LIBVISIO #include -#include +#include #endif #include "verbs.h" @@ -449,14 +449,16 @@ void SymbolsDialog::iconChanged() { // Read Visio stencil files SPDocument* read_vss( gchar* fullname, gchar* filename ) { - WPXFileStream input(fullname); + librevenge::RVNGFileStream input(fullname); if (!libvisio::VisioDocument::isSupported(&input)) { return NULL; } - libvisio::VSDStringVector output; - if (!libvisio::VisioDocument::generateSVGStencils(&input, output)) { + librevenge::RVNGStringVector output; + librevenge::RVNGSVGDrawingGenerator generator(output, "svg"); + + if (!libvisio::VisioDocument::parseStencils(&input, &generator)) { return NULL; } -- cgit v1.2.3 From 07616faa20b8d4876d0946ad553b91bdf83fc922 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Sun, 10 Aug 2014 20:42:01 -0400 Subject: OS X packaging update (bzr r13506.1.1) --- packaging/macosx/Resources/bin/inkscape | 53 +- packaging/macosx/Resources/icons/.DS_Store | Bin 0 -> 6148 bytes .../16x16/stock/3floppy_unmount-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/3floppy_unmount.png | 1 + .../icons/GtkStock/16x16/stock/add-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/add.png | 1 + .../16x16/stock/application-exit-symbolic.png | 1 + .../GtkStock/16x16/stock/application-exit.png | Bin 0 -> 647 bytes .../icons/GtkStock/16x16/stock/ascii-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/ascii.png | 1 + .../icons/GtkStock/16x16/stock/bottom-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/bottom.png | 1 + .../16x16/stock/cdrom_unmount-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/cdrom_unmount.png | 1 + .../16x16/stock/cdwriter_unmount-symbolic.png | 1 + .../GtkStock/16x16/stock/cdwriter_unmount.png | 1 + .../GtkStock/16x16/stock/centrejust-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/centrejust.png | 1 + .../16x16/stock/connect_established-symbolic.png | 1 + .../GtkStock/16x16/stock/connect_established.png | 1 + .../GtkStock/16x16/stock/desktop-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/desktop.png | 1 + .../16x16/stock/dialog-information-symbolic.png | 1 + .../GtkStock/16x16/stock/dialog-information.png | Bin 0 -> 879 bytes .../GtkStock/16x16/stock/document-new-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/document-new.png | Bin 0 -> 569 bytes .../16x16/stock/document-open-recent-symbolic.png | 1 + .../GtkStock/16x16/stock/document-open-recent.png | Bin 0 -> 892 bytes .../16x16/stock/document-open-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/document-open.png | Bin 0 -> 492 bytes .../stock/document-print-preview-symbolic.png | 1 + .../16x16/stock/document-print-preview.png | Bin 0 -> 733 bytes .../16x16/stock/document-print-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/document-print.png | Bin 0 -> 525 bytes .../16x16/stock/document-properties-symbolic.png | 1 + .../GtkStock/16x16/stock/document-properties.png | Bin 0 -> 794 bytes .../16x16/stock/document-revert-ltr-symbolic.png | 1 + .../GtkStock/16x16/stock/document-revert-ltr.png | Bin 0 -> 800 bytes .../16x16/stock/document-revert-rtl-symbolic.png | 1 + .../GtkStock/16x16/stock/document-revert-rtl.png | Bin 0 -> 794 bytes .../16x16/stock/document-revert-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/document-revert.png | 1 + .../16x16/stock/document-save-as-symbolic.png | 1 + .../GtkStock/16x16/stock/document-save-as.png | Bin 0 -> 770 bytes .../16x16/stock/document-save-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/document-save.png | Bin 0 -> 652 bytes .../icons/GtkStock/16x16/stock/down-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/down.png | 1 + .../16x16/stock/drive-harddisk-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/drive-harddisk.png | Bin 0 -> 832 bytes .../GtkStock/16x16/stock/dvd_unmount-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/dvd_unmount.png | 1 + .../GtkStock/16x16/stock/edit-clear-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-clear.png | Bin 0 -> 695 bytes .../GtkStock/16x16/stock/edit-copy-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-copy.png | Bin 0 -> 498 bytes .../GtkStock/16x16/stock/edit-cut-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-cut.png | Bin 0 -> 876 bytes .../GtkStock/16x16/stock/edit-delete-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-delete.png | Bin 0 -> 866 bytes .../16x16/stock/edit-find-replace-symbolic.png | 1 + .../GtkStock/16x16/stock/edit-find-replace.png | Bin 0 -> 875 bytes .../GtkStock/16x16/stock/edit-find-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-find.png | Bin 0 -> 788 bytes .../GtkStock/16x16/stock/edit-paste-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-paste.png | Bin 0 -> 561 bytes .../16x16/stock/edit-redo-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-redo-ltr.png | Bin 0 -> 790 bytes .../16x16/stock/edit-redo-rtl-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-redo-rtl.png | Bin 0 -> 808 bytes .../GtkStock/16x16/stock/edit-redo-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-redo.png | 1 + .../16x16/stock/edit-select-all-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-select-all.png | Bin 0 -> 547 bytes .../16x16/stock/edit-undo-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-undo-ltr.png | Bin 0 -> 784 bytes .../16x16/stock/edit-undo-rtl-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-undo-rtl.png | Bin 0 -> 764 bytes .../GtkStock/16x16/stock/edit-undo-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/edit-undo.png | 1 + .../GtkStock/16x16/stock/editclear-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/editclear.png | 1 + .../GtkStock/16x16/stock/editcopy-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/editcopy.png | 1 + .../GtkStock/16x16/stock/editcut-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/editcut.png | 1 + .../GtkStock/16x16/stock/editdelete-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/editdelete.png | 1 + .../GtkStock/16x16/stock/editpaste-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/editpaste.png | 1 + .../icons/GtkStock/16x16/stock/empty-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/empty.png | 1 + .../icons/GtkStock/16x16/stock/exit-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/exit.png | 1 + .../GtkStock/16x16/stock/filefind-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/filefind.png | 1 + .../GtkStock/16x16/stock/filenew-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/filenew.png | 1 + .../GtkStock/16x16/stock/fileopen-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/fileopen.png | 1 + .../GtkStock/16x16/stock/fileprint-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/fileprint.png | 1 + .../16x16/stock/filequickprint-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/filequickprint.png | 1 + .../GtkStock/16x16/stock/filesave-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/filesave.png | 1 + .../GtkStock/16x16/stock/filesaveas-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/filesaveas.png | 1 + .../icons/GtkStock/16x16/stock/find-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/find.png | 1 + .../16x16/stock/folder-remote-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/folder-remote.png | Bin 0 -> 548 bytes .../icons/GtkStock/16x16/stock/folder-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/folder.png | Bin 0 -> 548 bytes .../GtkStock/16x16/stock/folder_home-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/folder_home.png | 1 + .../stock/format-indent-less-ltr-symbolic.png | 1 + .../16x16/stock/format-indent-less-ltr.png | Bin 0 -> 594 bytes .../stock/format-indent-less-rtl-symbolic.png | 1 + .../16x16/stock/format-indent-less-rtl.png | Bin 0 -> 596 bytes .../stock/format-indent-more-ltr-symbolic.png | 1 + .../16x16/stock/format-indent-more-ltr.png | Bin 0 -> 611 bytes .../stock/format-indent-more-rtl-symbolic.png | 1 + .../16x16/stock/format-indent-more-rtl.png | Bin 0 -> 604 bytes .../16x16/stock/format-justify-center-symbolic.png | 1 + .../GtkStock/16x16/stock/format-justify-center.png | Bin 0 -> 393 bytes .../16x16/stock/format-justify-fill-symbolic.png | 1 + .../GtkStock/16x16/stock/format-justify-fill.png | Bin 0 -> 358 bytes .../16x16/stock/format-justify-left-symbolic.png | 1 + .../GtkStock/16x16/stock/format-justify-left.png | Bin 0 -> 378 bytes .../16x16/stock/format-justify-right-symbolic.png | 1 + .../GtkStock/16x16/stock/format-justify-right.png | Bin 0 -> 400 bytes .../16x16/stock/format-text-bold-symbolic.png | 1 + .../GtkStock/16x16/stock/format-text-bold.png | Bin 0 -> 649 bytes .../16x16/stock/format-text-italic-symbolic.png | 1 + .../GtkStock/16x16/stock/format-text-italic.png | Bin 0 -> 665 bytes .../stock/format-text-strikethrough-symbolic.png | 1 + .../16x16/stock/format-text-strikethrough.png | Bin 0 -> 656 bytes .../16x16/stock/format-text-underline-symbolic.png | 1 + .../GtkStock/16x16/stock/format-text-underline.png | Bin 0 -> 645 bytes .../16x16/stock/gnome-dev-cdrom-audio-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-dev-cdrom-audio.png | 1 + .../16x16/stock/gnome-dev-disc-cdr-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-dev-disc-cdr.png | 1 + .../16x16/stock/gnome-dev-disc-cdrw-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-dev-disc-cdrw.png | 1 + .../stock/gnome-dev-disc-dvdr-plus-symbolic.png | 1 + .../16x16/stock/gnome-dev-disc-dvdr-plus.png | 1 + .../16x16/stock/gnome-dev-disc-dvdr-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-dev-disc-dvdr.png | 1 + .../16x16/stock/gnome-dev-disc-dvdram-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-dev-disc-dvdram.png | 1 + .../16x16/stock/gnome-dev-disc-dvdrom-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png | 1 + .../16x16/stock/gnome-dev-disc-dvdrw-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png | 1 + .../16x16/stock/gnome-dev-floppy-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-dev-floppy.png | 1 + .../stock/gnome-dev-harddisk-1394-symbolic.png | 1 + .../16x16/stock/gnome-dev-harddisk-1394.png | 1 + .../16x16/stock/gnome-dev-harddisk-symbolic.png | 1 + .../stock/gnome-dev-harddisk-usb-symbolic.png | 1 + .../16x16/stock/gnome-dev-harddisk-usb.png | 1 + .../GtkStock/16x16/stock/gnome-dev-harddisk.png | 1 + .../16x16/stock/gnome-fs-desktop-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-fs-desktop.png | 1 + .../16x16/stock/gnome-fs-directory-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-fs-directory.png | 1 + .../GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gnome-fs-ftp.png | 1 + .../16x16/stock/gnome-fs-home-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gnome-fs-home.png | 1 + .../GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gnome-fs-nfs.png | 1 + .../16x16/stock/gnome-fs-share-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gnome-fs-share.png | 1 + .../GtkStock/16x16/stock/gnome-fs-smb-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gnome-fs-smb.png | 1 + .../GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gnome-fs-ssh.png | 1 + .../16x16/stock/gnome-mime-text-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gnome-mime-text.png | 1 + .../gnome-mime-x-directory-smb-share-symbolic.png | 1 + .../stock/gnome-mime-x-directory-smb-share.png | 1 + .../16x16/stock/gnome-netstatus-idle-symbolic.png | 1 + .../GtkStock/16x16/stock/gnome-netstatus-idle.png | 1 + .../GtkStock/16x16/stock/gnome-run-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gnome-run.png | 1 + .../GtkStock/16x16/stock/go-bottom-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-bottom.png | Bin 0 -> 647 bytes .../GtkStock/16x16/stock/go-down-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-down.png | Bin 0 -> 598 bytes .../GtkStock/16x16/stock/go-first-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-first-ltr.png | Bin 0 -> 632 bytes .../GtkStock/16x16/stock/go-first-rtl-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-first-rtl.png | Bin 0 -> 653 bytes .../GtkStock/16x16/stock/go-home-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-home.png | Bin 0 -> 735 bytes .../GtkStock/16x16/stock/go-jump-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-jump-ltr.png | Bin 0 -> 811 bytes .../GtkStock/16x16/stock/go-jump-rtl-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-jump-rtl.png | Bin 0 -> 806 bytes .../GtkStock/16x16/stock/go-last-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-last-ltr.png | Bin 0 -> 653 bytes .../GtkStock/16x16/stock/go-last-rtl-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-last-rtl.png | Bin 0 -> 632 bytes .../GtkStock/16x16/stock/go-next-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-next-ltr.png | Bin 0 -> 580 bytes .../GtkStock/16x16/stock/go-next-rtl-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-next-rtl.png | Bin 0 -> 579 bytes .../16x16/stock/go-previous-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-previous-ltr.png | Bin 0 -> 579 bytes .../16x16/stock/go-previous-rtl-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-previous-rtl.png | Bin 0 -> 580 bytes .../icons/GtkStock/16x16/stock/go-top-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/go-top.png | Bin 0 -> 630 bytes .../icons/GtkStock/16x16/stock/go-up-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/go-up.png | Bin 0 -> 551 bytes .../icons/GtkStock/16x16/stock/gohome-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gohome.png | 1 + .../GtkStock/16x16/stock/gtk-about-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-about.png | 1 + .../GtkStock/16x16/stock/gtk-add-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-add.png | 1 + .../GtkStock/16x16/stock/gtk-bold-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-bold.png | 1 + .../GtkStock/16x16/stock/gtk-cancel-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-cancel.png | 1 + .../16x16/stock/gtk-caps-lock-warning-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-caps-lock-warning.png | Bin 0 -> 275 bytes .../GtkStock/16x16/stock/gtk-cdrom-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-cdrom.png | 1 + .../GtkStock/16x16/stock/gtk-clear-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-clear.png | 1 + .../GtkStock/16x16/stock/gtk-close-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-close.png | 1 + .../16x16/stock/gtk-color-picker-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-color-picker.png | Bin 0 -> 606 bytes .../GtkStock/16x16/stock/gtk-connect-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-connect.png | Bin 0 -> 692 bytes .../GtkStock/16x16/stock/gtk-convert-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-convert.png | Bin 0 -> 677 bytes .../GtkStock/16x16/stock/gtk-copy-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-copy.png | 1 + .../GtkStock/16x16/stock/gtk-cut-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-cut.png | 1 + .../GtkStock/16x16/stock/gtk-delete-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-delete.png | 1 + .../16x16/stock/gtk-dialog-info-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-dialog-info.png | 1 + .../16x16/stock/gtk-directory-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-directory.png | 1 + .../16x16/stock/gtk-disconnect-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-disconnect.png | Bin 0 -> 715 bytes .../GtkStock/16x16/stock/gtk-edit-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-edit.png | Bin 0 -> 755 bytes .../GtkStock/16x16/stock/gtk-execute-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-execute.png | 1 + .../16x16/stock/gtk-find-and-replace-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-find-and-replace.png | 1 + .../GtkStock/16x16/stock/gtk-find-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-find.png | 1 + .../GtkStock/16x16/stock/gtk-floppy-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-floppy.png | 1 + .../GtkStock/16x16/stock/gtk-font-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-font.png | Bin 0 -> 706 bytes .../16x16/stock/gtk-fullscreen-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-fullscreen.png | 1 + .../GtkStock/16x16/stock/gtk-go-down-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-go-down.png | 1 + .../GtkStock/16x16/stock/gtk-go-up-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-go-up.png | 1 + .../16x16/stock/gtk-goto-bottom-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-goto-bottom.png | 1 + .../GtkStock/16x16/stock/gtk-goto-top-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-goto-top.png | 1 + .../GtkStock/16x16/stock/gtk-harddisk-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-harddisk.png | 1 + .../GtkStock/16x16/stock/gtk-help-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-help.png | 1 + .../GtkStock/16x16/stock/gtk-home-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-home.png | 1 + .../GtkStock/16x16/stock/gtk-index-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-index.png | Bin 0 -> 753 bytes .../GtkStock/16x16/stock/gtk-italic-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-italic.png | 1 + .../16x16/stock/gtk-justify-center-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-justify-center.png | 1 + .../16x16/stock/gtk-justify-fill-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-justify-fill.png | 1 + .../16x16/stock/gtk-justify-left-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-justify-left.png | 1 + .../16x16/stock/gtk-justify-right-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-justify-right.png | 1 + .../16x16/stock/gtk-leave-fullscreen-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-leave-fullscreen.png | 1 + .../16x16/stock/gtk-media-pause-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-media-pause.png | 1 + .../16x16/stock/gtk-media-record-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-media-record.png | 1 + .../16x16/stock/gtk-media-stop-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-media-stop.png | 1 + .../16x16/stock/gtk-missing-image-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-missing-image.png | 1 + .../GtkStock/16x16/stock/gtk-new-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-new.png | 1 + .../GtkStock/16x16/stock/gtk-open-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-open.png | 1 + .../stock/gtk-orientation-landscape-symbolic.png | 1 + .../16x16/stock/gtk-orientation-landscape.png | Bin 0 -> 756 bytes .../stock/gtk-orientation-portrait-symbolic.png | 1 + .../16x16/stock/gtk-orientation-portrait.png | Bin 0 -> 543 bytes .../gtk-orientation-reverse-landscape-symbolic.png | 1 + .../stock/gtk-orientation-reverse-landscape.png | Bin 0 -> 751 bytes .../gtk-orientation-reverse-portrait-symbolic.png | 1 + .../stock/gtk-orientation-reverse-portrait.png | Bin 0 -> 557 bytes .../16x16/stock/gtk-page-setup-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-page-setup.png | Bin 0 -> 622 bytes .../GtkStock/16x16/stock/gtk-paste-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-paste.png | 1 + .../16x16/stock/gtk-preferences-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-preferences.png | Bin 0 -> 1014 bytes .../16x16/stock/gtk-print-preview-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-print-preview.png | 1 + .../GtkStock/16x16/stock/gtk-print-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-print.png | 1 + .../16x16/stock/gtk-properties-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-properties.png | 1 + .../GtkStock/16x16/stock/gtk-quit-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-quit.png | 1 + .../GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-redo-ltr.png | 1 + .../GtkStock/16x16/stock/gtk-refresh-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-refresh.png | 1 + .../GtkStock/16x16/stock/gtk-remove-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-remove.png | 1 + .../stock/gtk-revert-to-saved-ltr-symbolic.png | 1 + .../16x16/stock/gtk-revert-to-saved-ltr.png | 1 + .../stock/gtk-revert-to-saved-rtl-symbolic.png | 1 + .../16x16/stock/gtk-revert-to-saved-rtl.png | 1 + .../GtkStock/16x16/stock/gtk-save-as-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-save-as.png | 1 + .../GtkStock/16x16/stock/gtk-save-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-save.png | 1 + .../16x16/stock/gtk-select-all-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-select-all.png | 1 + .../16x16/stock/gtk-select-color-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-select-color.png | Bin 0 -> 735 bytes .../16x16/stock/gtk-select-font-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-select-font.png | Bin 0 -> 706 bytes .../16x16/stock/gtk-sort-ascending-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-sort-ascending.png | 1 + .../16x16/stock/gtk-sort-descending-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-sort-descending.png | 1 + .../16x16/stock/gtk-spell-check-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-spell-check.png | 1 + .../GtkStock/16x16/stock/gtk-stop-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-stop.png | 1 + .../16x16/stock/gtk-strikethrough-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-strikethrough.png | 1 + .../16x16/stock/gtk-undelete-ltr-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-undelete-ltr.png | Bin 0 -> 962 bytes .../16x16/stock/gtk-undelete-rtl-symbolic.png | 1 + .../GtkStock/16x16/stock/gtk-undelete-rtl.png | Bin 0 -> 952 bytes .../16x16/stock/gtk-underline-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-underline.png | 1 + .../GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-undo-ltr.png | 1 + .../GtkStock/16x16/stock/gtk-zoom-100-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-zoom-100.png | 1 + .../GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-zoom-fit.png | 1 + .../GtkStock/16x16/stock/gtk-zoom-in-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-zoom-in.png | 1 + .../GtkStock/16x16/stock/gtk-zoom-out-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/gtk-zoom-out.png | 1 + .../GtkStock/16x16/stock/harddrive-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/harddrive.png | 1 + .../GtkStock/16x16/stock/hdd_unmount-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/hdd_unmount.png | 1 + .../GtkStock/16x16/stock/help-about-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/help-about.png | Bin 0 -> 704 bytes .../16x16/stock/help-contents-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/help-contents.png | Bin 0 -> 1002 bytes .../icons/GtkStock/16x16/stock/help-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/help.png | 1 + .../16x16/stock/image-missing-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/image-missing.png | Bin 0 -> 654 bytes .../icons/GtkStock/16x16/stock/info-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/info.png | 1 + .../16x16/stock/inode-directory-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/inode-directory.png | 1 + .../GtkStock/16x16/stock/kfm_home-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/kfm_home.png | 1 + .../GtkStock/16x16/stock/leftjust-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/leftjust.png | 1 + .../GtkStock/16x16/stock/list-add-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/list-add.png | Bin 0 -> 260 bytes .../GtkStock/16x16/stock/list-remove-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/list-remove.png | Bin 0 -> 210 bytes .../GtkStock/16x16/stock/media-cdrom-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/media-cdrom.png | 1 + .../GtkStock/16x16/stock/media-floppy-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/media-floppy.png | Bin 0 -> 652 bytes .../16x16/stock/media-optical-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/media-optical.png | Bin 0 -> 894 bytes .../16x16/stock/media-playback-pause-symbolic.png | 1 + .../GtkStock/16x16/stock/media-playback-pause.png | Bin 0 -> 247 bytes .../stock/media-playback-start-ltr-symbolic.png | 1 + .../16x16/stock/media-playback-start-ltr.png | Bin 0 -> 542 bytes .../stock/media-playback-start-rtl-symbolic.png | 1 + .../16x16/stock/media-playback-start-rtl.png | Bin 0 -> 532 bytes .../16x16/stock/media-playback-stop-symbolic.png | 1 + .../GtkStock/16x16/stock/media-playback-stop.png | Bin 0 -> 295 bytes .../GtkStock/16x16/stock/media-record-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/media-record.png | Bin 0 -> 565 bytes .../stock/media-seek-backward-ltr-symbolic.png | 1 + .../16x16/stock/media-seek-backward-ltr.png | Bin 0 -> 502 bytes .../stock/media-seek-backward-rtl-symbolic.png | 1 + .../16x16/stock/media-seek-backward-rtl.png | Bin 0 -> 523 bytes .../stock/media-seek-forward-ltr-symbolic.png | 1 + .../16x16/stock/media-seek-forward-ltr.png | Bin 0 -> 523 bytes .../stock/media-seek-forward-rtl-symbolic.png | 1 + .../16x16/stock/media-seek-forward-rtl.png | Bin 0 -> 502 bytes .../stock/media-skip-backward-ltr-symbolic.png | 1 + .../16x16/stock/media-skip-backward-ltr.png | Bin 0 -> 462 bytes .../stock/media-skip-backward-rtl-symbolic.png | 1 + .../16x16/stock/media-skip-backward-rtl.png | Bin 0 -> 455 bytes .../stock/media-skip-forward-ltr-symbolic.png | 1 + .../16x16/stock/media-skip-forward-ltr.png | Bin 0 -> 455 bytes .../stock/media-skip-forward-rtl-symbolic.png | 1 + .../16x16/stock/media-skip-forward-rtl.png | Bin 0 -> 462 bytes .../16x16/stock/messagebox_info-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/messagebox_info.png | 1 + .../GtkStock/16x16/stock/mime_ascii-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/mime_ascii.png | 1 + .../icons/GtkStock/16x16/stock/misc-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/misc.png | 1 + .../GtkStock/16x16/stock/network-idle-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/network-idle.png | Bin 0 -> 623 bytes .../GtkStock/16x16/stock/network-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/network.png | 1 + .../GtkStock/16x16/stock/nm-adhoc-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/nm-adhoc.png | 1 + .../16x16/stock/nm-device-wired-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/nm-device-wired.png | 1 + .../16x16/stock/nm-device-wireless-symbolic.png | 1 + .../GtkStock/16x16/stock/nm-device-wireless.png | 1 + .../16x16/stock/package_editors-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/package_editors.png | 1 + .../16x16/stock/package_settings-symbolic.png | 1 + .../GtkStock/16x16/stock/package_settings.png | 1 + .../GtkStock/16x16/stock/player_pause-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/player_pause.png | 1 + .../16x16/stock/player_record-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/player_record.png | 1 + .../GtkStock/16x16/stock/player_stop-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/player_stop.png | 1 + .../16x16/stock/preferences-system-symbolic.png | 1 + .../GtkStock/16x16/stock/preferences-system.png | 1 + .../16x16/stock/printer-error-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/printer-error.png | Bin 0 -> 711 bytes .../GtkStock/16x16/stock/printer-info-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/printer-info.png | Bin 0 -> 724 bytes .../16x16/stock/printer-paused-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/printer-paused.png | Bin 0 -> 689 bytes .../16x16/stock/printer-warning-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/printer-warning.png | Bin 0 -> 685 bytes .../GtkStock/16x16/stock/process-stop-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/process-stop.png | Bin 0 -> 769 bytes .../GtkStock/16x16/stock/redhat-home-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/redhat-home.png | 1 + .../stock/redhat-system_settings-symbolic.png | 1 + .../16x16/stock/redhat-system_settings.png | 1 + .../icons/GtkStock/16x16/stock/redo-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/redo.png | 1 + .../icons/GtkStock/16x16/stock/reload-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/reload.png | 1 + .../GtkStock/16x16/stock/reload3-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/reload3.png | 1 + .../16x16/stock/reload_all_tabs-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/reload_all_tabs.png | 1 + .../GtkStock/16x16/stock/reload_page-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/reload_page.png | 1 + .../icons/GtkStock/16x16/stock/remove-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/remove.png | 1 + .../icons/GtkStock/16x16/stock/revert-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/revert.png | 1 + .../GtkStock/16x16/stock/rightjust-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/rightjust.png | 1 + .../GtkStock/16x16/stock/stock_about-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_about.png | 1 + .../GtkStock/16x16/stock/stock_bottom-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_bottom.png | 1 + .../GtkStock/16x16/stock/stock_close-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_close.png | 1 + .../GtkStock/16x16/stock/stock_copy-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_copy.png | 1 + .../GtkStock/16x16/stock/stock_cut-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_cut.png | 1 + .../GtkStock/16x16/stock/stock_delete-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_delete.png | 1 + .../16x16/stock/stock_dialog-info-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_dialog-info.png | 1 + .../GtkStock/16x16/stock/stock_down-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_down.png | 1 + .../16x16/stock/stock_file-properites-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_file-properites.png | 1 + .../GtkStock/16x16/stock/stock_folder-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_folder.png | 1 + .../16x16/stock/stock_fullscreen-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_fullscreen.png | 1 + .../GtkStock/16x16/stock/stock_help-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_help.png | 1 + .../GtkStock/16x16/stock/stock_home-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_home.png | 1 + .../stock/stock_leave-fullscreen-symbolic.png | 1 + .../16x16/stock/stock_leave-fullscreen.png | 1 + .../16x16/stock/stock_media-pause-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_media-pause.png | 1 + .../16x16/stock/stock_media-rec-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_media-rec.png | 1 + .../16x16/stock/stock_media-stop-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_media-stop.png | 1 + .../16x16/stock/stock_new-text-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_new-text.png | 1 + .../GtkStock/16x16/stock/stock_paste-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_paste.png | 1 + .../16x16/stock/stock_print-preview-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_print-preview.png | 1 + .../GtkStock/16x16/stock/stock_print-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_print.png | 1 + .../16x16/stock/stock_properties-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_properties.png | 1 + .../GtkStock/16x16/stock/stock_redo-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_redo.png | 1 + .../16x16/stock/stock_refresh-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_refresh.png | 1 + .../16x16/stock/stock_save-as-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_save-as.png | 1 + .../GtkStock/16x16/stock/stock_save-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_save.png | 1 + .../stock/stock_search-and-replace-symbolic.png | 1 + .../16x16/stock/stock_search-and-replace.png | 1 + .../GtkStock/16x16/stock/stock_search-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_search.png | 1 + .../16x16/stock/stock_select-all-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_select-all.png | 1 + .../16x16/stock/stock_spellcheck-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_spellcheck.png | 1 + .../GtkStock/16x16/stock/stock_stop-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_stop.png | 1 + .../stock/stock_text-strikethrough-symbolic.png | 1 + .../16x16/stock/stock_text-strikethrough.png | 1 + .../16x16/stock/stock_text_bold-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_text_bold.png | 1 + .../16x16/stock/stock_text_center-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_text_center.png | 1 + .../16x16/stock/stock_text_italic-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_text_italic.png | 1 + .../16x16/stock/stock_text_justify-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_text_justify.png | 1 + .../16x16/stock/stock_text_left-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_text_left.png | 1 + .../16x16/stock/stock_text_right-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_text_right.png | 1 + .../16x16/stock/stock_text_underlined-symbolic.png | 1 + .../GtkStock/16x16/stock/stock_text_underlined.png | 1 + .../GtkStock/16x16/stock/stock_top-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_top.png | 1 + .../GtkStock/16x16/stock/stock_undo-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_undo.png | 1 + .../GtkStock/16x16/stock/stock_up-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_up.png | 1 + .../GtkStock/16x16/stock/stock_zoom-1-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_zoom-1.png | 1 + .../16x16/stock/stock_zoom-in-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_zoom-in.png | 1 + .../16x16/stock/stock_zoom-out-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_zoom-out.png | 1 + .../16x16/stock/stock_zoom-page-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/stock_zoom-page.png | 1 + .../icons/GtkStock/16x16/stock/stop-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/stop.png | 1 + .../16x16/stock/system-floppy-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/system-floppy.png | 1 + .../GtkStock/16x16/stock/system-run-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/system-run.png | Bin 0 -> 902 bytes .../16x16/stock/text-x-generic-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/text-x-generic.png | Bin 0 -> 569 bytes .../GtkStock/16x16/stock/text_bold-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/text_bold.png | 1 + .../GtkStock/16x16/stock/text_italic-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/text_italic.png | 1 + .../GtkStock/16x16/stock/text_strike-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/text_strike.png | 1 + .../GtkStock/16x16/stock/text_under-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/text_under.png | 1 + .../16x16/stock/tools-check-spelling-symbolic.png | 1 + .../GtkStock/16x16/stock/tools-check-spelling.png | Bin 0 -> 641 bytes .../icons/GtkStock/16x16/stock/top-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/top.png | 1 + .../icons/GtkStock/16x16/stock/txt-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/txt.png | 1 + .../icons/GtkStock/16x16/stock/txt2-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/txt2.png | 1 + .../icons/GtkStock/16x16/stock/undo-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/undo.png | 1 + .../GtkStock/16x16/stock/unknown-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/unknown.png | 1 + .../icons/GtkStock/16x16/stock/up-symbolic.png | 1 + .../Resources/icons/GtkStock/16x16/stock/up.png | 1 + .../GtkStock/16x16/stock/user-desktop-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/user-desktop.png | Bin 0 -> 548 bytes .../GtkStock/16x16/stock/user-home-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/user-home.png | Bin 0 -> 548 bytes .../16x16/stock/view-fullscreen-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/view-fullscreen.png | Bin 0 -> 432 bytes .../GtkStock/16x16/stock/view-refresh-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/view-refresh.png | Bin 0 -> 926 bytes .../GtkStock/16x16/stock/view-restore-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/view-restore.png | Bin 0 -> 473 bytes .../16x16/stock/view-sort-ascending-symbolic.png | 1 + .../GtkStock/16x16/stock/view-sort-ascending.png | Bin 0 -> 333 bytes .../16x16/stock/view-sort-descending-symbolic.png | 1 + .../GtkStock/16x16/stock/view-sort-descending.png | Bin 0 -> 331 bytes .../GtkStock/16x16/stock/viewmag+-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/viewmag+.png | 1 + .../GtkStock/16x16/stock/viewmag--symbolic.png | 1 + .../icons/GtkStock/16x16/stock/viewmag-.png | 1 + .../GtkStock/16x16/stock/viewmag1-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/viewmag1.png | 1 + .../GtkStock/16x16/stock/viewmagfit-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/viewmagfit.png | 1 + .../GtkStock/16x16/stock/window-close-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/window-close.png | Bin 0 -> 889 bytes .../16x16/stock/window_fullscreen-symbolic.png | 1 + .../GtkStock/16x16/stock/window_fullscreen.png | 1 + .../16x16/stock/window_nofullscreen-symbolic.png | 1 + .../GtkStock/16x16/stock/window_nofullscreen.png | 1 + .../16x16/stock/xfce-system-exit-symbolic.png | 1 + .../GtkStock/16x16/stock/xfce-system-exit.png | 1 + .../16x16/stock/xfce-system-settings-symbolic.png | 1 + .../GtkStock/16x16/stock/xfce-system-settings.png | 1 + .../GtkStock/16x16/stock/yast_HD-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/yast_HD.png | 1 + .../GtkStock/16x16/stock/yast_idetude-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/yast_idetude.png | 1 + .../16x16/stock/zoom-best-fit-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/zoom-best-fit.png | 1 + .../16x16/stock/zoom-fit-best-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/zoom-fit-best.png | Bin 0 -> 750 bytes .../GtkStock/16x16/stock/zoom-in-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/zoom-in.png | Bin 0 -> 785 bytes .../16x16/stock/zoom-original-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/zoom-original.png | Bin 0 -> 784 bytes .../GtkStock/16x16/stock/zoom-out-symbolic.png | 1 + .../icons/GtkStock/16x16/stock/zoom-out.png | Bin 0 -> 772 bytes .../GtkStock/20x20/stock/gtk-apply-symbolic.png | 1 + .../icons/GtkStock/20x20/stock/gtk-apply.png | Bin 0 -> 1002 bytes .../GtkStock/20x20/stock/gtk-cancel-symbolic.png | 1 + .../icons/GtkStock/20x20/stock/gtk-cancel.png | Bin 0 -> 1067 bytes .../GtkStock/20x20/stock/gtk-close-symbolic.png | 1 + .../icons/GtkStock/20x20/stock/gtk-close.png | 1 + .../icons/GtkStock/20x20/stock/gtk-no-symbolic.png | 1 + .../icons/GtkStock/20x20/stock/gtk-no.png | Bin 0 -> 952 bytes .../icons/GtkStock/20x20/stock/gtk-ok-symbolic.png | 1 + .../icons/GtkStock/20x20/stock/gtk-ok.png | Bin 0 -> 963 bytes .../GtkStock/20x20/stock/gtk-yes-symbolic.png | 1 + .../icons/GtkStock/20x20/stock/gtk-yes.png | Bin 0 -> 1044 bytes .../GtkStock/20x20/stock/stock_close-symbolic.png | 1 + .../icons/GtkStock/20x20/stock/stock_close.png | 1 + .../GtkStock/20x20/stock/window-close-symbolic.png | 1 + .../icons/GtkStock/20x20/stock/window-close.png | Bin 0 -> 1224 bytes .../24x24/stock/3floppy_unmount-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/3floppy_unmount.png | 1 + .../icons/GtkStock/24x24/stock/add-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/add.png | 1 + .../24x24/stock/application-exit-symbolic.png | 1 + .../GtkStock/24x24/stock/application-exit.png | Bin 0 -> 967 bytes .../icons/GtkStock/24x24/stock/ascii-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/ascii.png | 1 + .../24x24/stock/audio-volume-high-symbolic.png | 1 + .../GtkStock/24x24/stock/audio-volume-high.png | Bin 0 -> 1217 bytes .../24x24/stock/audio-volume-low-symbolic.png | 1 + .../GtkStock/24x24/stock/audio-volume-low.png | Bin 0 -> 857 bytes .../24x24/stock/audio-volume-medium-symbolic.png | 1 + .../GtkStock/24x24/stock/audio-volume-medium.png | Bin 0 -> 1021 bytes .../24x24/stock/audio-volume-muted-symbolic.png | 1 + .../GtkStock/24x24/stock/audio-volume-muted.png | Bin 0 -> 910 bytes .../icons/GtkStock/24x24/stock/bottom-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/bottom.png | 1 + .../24x24/stock/cdrom_unmount-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/cdrom_unmount.png | 1 + .../24x24/stock/cdwriter_unmount-symbolic.png | 1 + .../GtkStock/24x24/stock/cdwriter_unmount.png | 1 + .../GtkStock/24x24/stock/centrejust-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/centrejust.png | 1 + .../24x24/stock/connect_established-symbolic.png | 1 + .../GtkStock/24x24/stock/connect_established.png | 1 + .../GtkStock/24x24/stock/desktop-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/desktop.png | 1 + .../24x24/stock/dialog-information-symbolic.png | 1 + .../GtkStock/24x24/stock/dialog-information.png | Bin 0 -> 1420 bytes .../GtkStock/24x24/stock/document-new-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/document-new.png | Bin 0 -> 736 bytes .../24x24/stock/document-open-recent-symbolic.png | 1 + .../GtkStock/24x24/stock/document-open-recent.png | Bin 0 -> 1561 bytes .../24x24/stock/document-open-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/document-open.png | Bin 0 -> 612 bytes .../stock/document-print-preview-symbolic.png | 1 + .../24x24/stock/document-print-preview.png | Bin 0 -> 1244 bytes .../24x24/stock/document-print-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/document-print.png | Bin 0 -> 818 bytes .../24x24/stock/document-properties-symbolic.png | 1 + .../GtkStock/24x24/stock/document-properties.png | Bin 0 -> 1146 bytes .../24x24/stock/document-revert-ltr-symbolic.png | 1 + .../GtkStock/24x24/stock/document-revert-ltr.png | Bin 0 -> 1404 bytes .../24x24/stock/document-revert-rtl-symbolic.png | 1 + .../GtkStock/24x24/stock/document-revert-rtl.png | Bin 0 -> 1411 bytes .../24x24/stock/document-revert-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/document-revert.png | 1 + .../24x24/stock/document-save-as-symbolic.png | 1 + .../GtkStock/24x24/stock/document-save-as.png | Bin 0 -> 1206 bytes .../24x24/stock/document-save-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/document-save.png | Bin 0 -> 951 bytes .../icons/GtkStock/24x24/stock/down-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/down.png | 1 + .../24x24/stock/drive-harddisk-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/drive-harddisk.png | Bin 0 -> 1360 bytes .../GtkStock/24x24/stock/dvd_unmount-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/dvd_unmount.png | 1 + .../GtkStock/24x24/stock/edit-clear-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-clear.png | Bin 0 -> 1163 bytes .../GtkStock/24x24/stock/edit-copy-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-copy.png | Bin 0 -> 697 bytes .../GtkStock/24x24/stock/edit-cut-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-cut.png | Bin 0 -> 1032 bytes .../GtkStock/24x24/stock/edit-delete-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-delete.png | Bin 0 -> 1449 bytes .../24x24/stock/edit-find-replace-symbolic.png | 1 + .../GtkStock/24x24/stock/edit-find-replace.png | Bin 0 -> 1379 bytes .../GtkStock/24x24/stock/edit-find-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-find.png | Bin 0 -> 1238 bytes .../GtkStock/24x24/stock/edit-paste-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-paste.png | Bin 0 -> 893 bytes .../24x24/stock/edit-redo-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-redo-ltr.png | Bin 0 -> 1070 bytes .../24x24/stock/edit-redo-rtl-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-redo-rtl.png | Bin 0 -> 1085 bytes .../GtkStock/24x24/stock/edit-redo-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-redo.png | 1 + .../24x24/stock/edit-select-all-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-select-all.png | Bin 0 -> 717 bytes .../24x24/stock/edit-undo-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-undo-ltr.png | Bin 0 -> 1052 bytes .../24x24/stock/edit-undo-rtl-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-undo-rtl.png | Bin 0 -> 1035 bytes .../GtkStock/24x24/stock/edit-undo-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/edit-undo.png | 1 + .../GtkStock/24x24/stock/editclear-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/editclear.png | 1 + .../GtkStock/24x24/stock/editcopy-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/editcopy.png | 1 + .../GtkStock/24x24/stock/editcut-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/editcut.png | 1 + .../GtkStock/24x24/stock/editdelete-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/editdelete.png | 1 + .../GtkStock/24x24/stock/editpaste-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/editpaste.png | 1 + .../icons/GtkStock/24x24/stock/empty-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/empty.png | 1 + .../icons/GtkStock/24x24/stock/exit-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/exit.png | 1 + .../GtkStock/24x24/stock/filefind-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/filefind.png | 1 + .../GtkStock/24x24/stock/filenew-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/filenew.png | 1 + .../GtkStock/24x24/stock/fileopen-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/fileopen.png | 1 + .../GtkStock/24x24/stock/fileprint-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/fileprint.png | 1 + .../24x24/stock/filequickprint-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/filequickprint.png | 1 + .../GtkStock/24x24/stock/filesave-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/filesave.png | 1 + .../GtkStock/24x24/stock/filesaveas-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/filesaveas.png | 1 + .../icons/GtkStock/24x24/stock/find-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/find.png | 1 + .../24x24/stock/folder-remote-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/folder-remote.png | Bin 0 -> 662 bytes .../icons/GtkStock/24x24/stock/folder-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/folder.png | Bin 0 -> 662 bytes .../GtkStock/24x24/stock/folder_home-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/folder_home.png | 1 + .../stock/format-indent-less-ltr-symbolic.png | 1 + .../24x24/stock/format-indent-less-ltr.png | Bin 0 -> 843 bytes .../stock/format-indent-less-rtl-symbolic.png | 1 + .../24x24/stock/format-indent-less-rtl.png | Bin 0 -> 876 bytes .../stock/format-indent-more-ltr-symbolic.png | 1 + .../24x24/stock/format-indent-more-ltr.png | Bin 0 -> 852 bytes .../stock/format-indent-more-rtl-symbolic.png | 1 + .../24x24/stock/format-indent-more-rtl.png | Bin 0 -> 870 bytes .../24x24/stock/format-justify-center-symbolic.png | 1 + .../GtkStock/24x24/stock/format-justify-center.png | Bin 0 -> 490 bytes .../24x24/stock/format-justify-fill-symbolic.png | 1 + .../GtkStock/24x24/stock/format-justify-fill.png | Bin 0 -> 447 bytes .../24x24/stock/format-justify-left-symbolic.png | 1 + .../GtkStock/24x24/stock/format-justify-left.png | Bin 0 -> 489 bytes .../24x24/stock/format-justify-right-symbolic.png | 1 + .../GtkStock/24x24/stock/format-justify-right.png | Bin 0 -> 503 bytes .../24x24/stock/format-text-bold-symbolic.png | 1 + .../GtkStock/24x24/stock/format-text-bold.png | Bin 0 -> 947 bytes .../24x24/stock/format-text-italic-symbolic.png | 1 + .../GtkStock/24x24/stock/format-text-italic.png | Bin 0 -> 971 bytes .../stock/format-text-strikethrough-symbolic.png | 1 + .../24x24/stock/format-text-strikethrough.png | Bin 0 -> 966 bytes .../24x24/stock/format-text-underline-symbolic.png | 1 + .../GtkStock/24x24/stock/format-text-underline.png | Bin 0 -> 969 bytes .../24x24/stock/gnome-dev-cdrom-audio-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-dev-cdrom-audio.png | 1 + .../24x24/stock/gnome-dev-disc-cdr-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-dev-disc-cdr.png | 1 + .../24x24/stock/gnome-dev-disc-cdrw-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-dev-disc-cdrw.png | 1 + .../stock/gnome-dev-disc-dvdr-plus-symbolic.png | 1 + .../24x24/stock/gnome-dev-disc-dvdr-plus.png | 1 + .../24x24/stock/gnome-dev-disc-dvdr-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-dev-disc-dvdr.png | 1 + .../24x24/stock/gnome-dev-disc-dvdram-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-dev-disc-dvdram.png | 1 + .../24x24/stock/gnome-dev-disc-dvdrom-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png | 1 + .../24x24/stock/gnome-dev-disc-dvdrw-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png | 1 + .../24x24/stock/gnome-dev-floppy-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-dev-floppy.png | 1 + .../stock/gnome-dev-harddisk-1394-symbolic.png | 1 + .../24x24/stock/gnome-dev-harddisk-1394.png | 1 + .../24x24/stock/gnome-dev-harddisk-symbolic.png | 1 + .../stock/gnome-dev-harddisk-usb-symbolic.png | 1 + .../24x24/stock/gnome-dev-harddisk-usb.png | 1 + .../GtkStock/24x24/stock/gnome-dev-harddisk.png | 1 + .../24x24/stock/gnome-fs-desktop-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-fs-desktop.png | 1 + .../24x24/stock/gnome-fs-directory-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-fs-directory.png | 1 + .../GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gnome-fs-ftp.png | 1 + .../24x24/stock/gnome-fs-home-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gnome-fs-home.png | 1 + .../GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gnome-fs-nfs.png | 1 + .../24x24/stock/gnome-fs-share-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gnome-fs-share.png | 1 + .../GtkStock/24x24/stock/gnome-fs-smb-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gnome-fs-smb.png | 1 + .../GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gnome-fs-ssh.png | 1 + .../24x24/stock/gnome-mime-text-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gnome-mime-text.png | 1 + .../gnome-mime-x-directory-smb-share-symbolic.png | 1 + .../stock/gnome-mime-x-directory-smb-share.png | 1 + .../24x24/stock/gnome-netstatus-idle-symbolic.png | 1 + .../GtkStock/24x24/stock/gnome-netstatus-idle.png | 1 + .../GtkStock/24x24/stock/gnome-run-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gnome-run.png | 1 + .../GtkStock/24x24/stock/go-bottom-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-bottom.png | Bin 0 -> 1037 bytes .../GtkStock/24x24/stock/go-down-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-down.png | Bin 0 -> 973 bytes .../GtkStock/24x24/stock/go-first-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-first-ltr.png | Bin 0 -> 1028 bytes .../GtkStock/24x24/stock/go-first-rtl-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-first-rtl.png | Bin 0 -> 1061 bytes .../GtkStock/24x24/stock/go-home-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-home.png | Bin 0 -> 1050 bytes .../GtkStock/24x24/stock/go-jump-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-jump-ltr.png | Bin 0 -> 1229 bytes .../GtkStock/24x24/stock/go-jump-rtl-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-jump-rtl.png | Bin 0 -> 1226 bytes .../GtkStock/24x24/stock/go-last-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-last-ltr.png | Bin 0 -> 1061 bytes .../GtkStock/24x24/stock/go-last-rtl-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-last-rtl.png | Bin 0 -> 1028 bytes .../GtkStock/24x24/stock/go-next-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-next-ltr.png | Bin 0 -> 906 bytes .../GtkStock/24x24/stock/go-next-rtl-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-next-rtl.png | Bin 0 -> 915 bytes .../24x24/stock/go-previous-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-previous-ltr.png | Bin 0 -> 915 bytes .../24x24/stock/go-previous-rtl-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-previous-rtl.png | Bin 0 -> 906 bytes .../icons/GtkStock/24x24/stock/go-top-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/go-top.png | Bin 0 -> 1037 bytes .../icons/GtkStock/24x24/stock/go-up-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/go-up.png | Bin 0 -> 946 bytes .../icons/GtkStock/24x24/stock/gohome-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gohome.png | 1 + .../GtkStock/24x24/stock/gtk-about-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-about.png | 1 + .../GtkStock/24x24/stock/gtk-add-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-add.png | 1 + .../GtkStock/24x24/stock/gtk-bold-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-bold.png | 1 + .../GtkStock/24x24/stock/gtk-cancel-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-cancel.png | 1 + .../24x24/stock/gtk-caps-lock-warning-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-caps-lock-warning.png | Bin 0 -> 360 bytes .../GtkStock/24x24/stock/gtk-cdrom-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-cdrom.png | 1 + .../GtkStock/24x24/stock/gtk-clear-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-clear.png | 1 + .../GtkStock/24x24/stock/gtk-close-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-close.png | 1 + .../24x24/stock/gtk-color-picker-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-color-picker.png | Bin 0 -> 891 bytes .../GtkStock/24x24/stock/gtk-connect-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-connect.png | Bin 0 -> 946 bytes .../GtkStock/24x24/stock/gtk-convert-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-convert.png | Bin 0 -> 1413 bytes .../GtkStock/24x24/stock/gtk-copy-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-copy.png | 1 + .../GtkStock/24x24/stock/gtk-cut-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-cut.png | 1 + .../GtkStock/24x24/stock/gtk-delete-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-delete.png | 1 + .../24x24/stock/gtk-dialog-info-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-dialog-info.png | 1 + .../24x24/stock/gtk-directory-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-directory.png | 1 + .../24x24/stock/gtk-disconnect-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-disconnect.png | Bin 0 -> 852 bytes .../GtkStock/24x24/stock/gtk-edit-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-edit.png | Bin 0 -> 1120 bytes .../GtkStock/24x24/stock/gtk-execute-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-execute.png | 1 + .../24x24/stock/gtk-find-and-replace-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-find-and-replace.png | 1 + .../GtkStock/24x24/stock/gtk-find-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-find.png | 1 + .../GtkStock/24x24/stock/gtk-floppy-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-floppy.png | 1 + .../GtkStock/24x24/stock/gtk-font-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-font.png | Bin 0 -> 1109 bytes .../24x24/stock/gtk-fullscreen-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-fullscreen.png | 1 + .../GtkStock/24x24/stock/gtk-go-down-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-go-down.png | 1 + .../GtkStock/24x24/stock/gtk-go-up-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-go-up.png | 1 + .../24x24/stock/gtk-goto-bottom-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-goto-bottom.png | 1 + .../GtkStock/24x24/stock/gtk-goto-top-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-goto-top.png | 1 + .../GtkStock/24x24/stock/gtk-harddisk-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-harddisk.png | 1 + .../GtkStock/24x24/stock/gtk-help-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-help.png | 1 + .../GtkStock/24x24/stock/gtk-home-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-home.png | 1 + .../GtkStock/24x24/stock/gtk-index-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-index.png | Bin 0 -> 960 bytes .../GtkStock/24x24/stock/gtk-italic-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-italic.png | 1 + .../24x24/stock/gtk-justify-center-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-justify-center.png | 1 + .../24x24/stock/gtk-justify-fill-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-justify-fill.png | 1 + .../24x24/stock/gtk-justify-left-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-justify-left.png | 1 + .../24x24/stock/gtk-justify-right-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-justify-right.png | 1 + .../24x24/stock/gtk-leave-fullscreen-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-leave-fullscreen.png | 1 + .../24x24/stock/gtk-media-pause-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-media-pause.png | 1 + .../24x24/stock/gtk-media-record-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-media-record.png | 1 + .../24x24/stock/gtk-media-stop-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-media-stop.png | 1 + .../24x24/stock/gtk-missing-image-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-missing-image.png | 1 + .../GtkStock/24x24/stock/gtk-new-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-new.png | 1 + .../GtkStock/24x24/stock/gtk-open-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-open.png | 1 + .../stock/gtk-orientation-landscape-symbolic.png | 1 + .../24x24/stock/gtk-orientation-landscape.png | Bin 0 -> 1097 bytes .../stock/gtk-orientation-portrait-symbolic.png | 1 + .../24x24/stock/gtk-orientation-portrait.png | Bin 0 -> 931 bytes .../gtk-orientation-reverse-landscape-symbolic.png | 1 + .../stock/gtk-orientation-reverse-landscape.png | Bin 0 -> 1059 bytes .../gtk-orientation-reverse-portrait-symbolic.png | 1 + .../stock/gtk-orientation-reverse-portrait.png | Bin 0 -> 940 bytes .../24x24/stock/gtk-page-setup-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-page-setup.png | Bin 0 -> 1081 bytes .../GtkStock/24x24/stock/gtk-paste-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-paste.png | 1 + .../24x24/stock/gtk-preferences-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-preferences.png | Bin 0 -> 1691 bytes .../24x24/stock/gtk-print-preview-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-print-preview.png | 1 + .../GtkStock/24x24/stock/gtk-print-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-print.png | 1 + .../24x24/stock/gtk-properties-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-properties.png | 1 + .../GtkStock/24x24/stock/gtk-quit-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-quit.png | 1 + .../GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-redo-ltr.png | 1 + .../GtkStock/24x24/stock/gtk-refresh-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-refresh.png | 1 + .../GtkStock/24x24/stock/gtk-remove-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-remove.png | 1 + .../stock/gtk-revert-to-saved-ltr-symbolic.png | 1 + .../24x24/stock/gtk-revert-to-saved-ltr.png | 1 + .../stock/gtk-revert-to-saved-rtl-symbolic.png | 1 + .../24x24/stock/gtk-revert-to-saved-rtl.png | 1 + .../GtkStock/24x24/stock/gtk-save-as-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-save-as.png | 1 + .../GtkStock/24x24/stock/gtk-save-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-save.png | 1 + .../24x24/stock/gtk-select-all-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-select-all.png | 1 + .../24x24/stock/gtk-select-color-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-select-color.png | Bin 0 -> 993 bytes .../24x24/stock/gtk-select-font-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-select-font.png | Bin 0 -> 1109 bytes .../24x24/stock/gtk-sort-ascending-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-sort-ascending.png | 1 + .../24x24/stock/gtk-sort-descending-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-sort-descending.png | 1 + .../24x24/stock/gtk-spell-check-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-spell-check.png | 1 + .../GtkStock/24x24/stock/gtk-stop-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-stop.png | 1 + .../24x24/stock/gtk-strikethrough-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-strikethrough.png | 1 + .../24x24/stock/gtk-undelete-ltr-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-undelete-ltr.png | Bin 0 -> 1692 bytes .../24x24/stock/gtk-undelete-rtl-symbolic.png | 1 + .../GtkStock/24x24/stock/gtk-undelete-rtl.png | Bin 0 -> 1722 bytes .../24x24/stock/gtk-underline-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-underline.png | 1 + .../GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-undo-ltr.png | 1 + .../GtkStock/24x24/stock/gtk-zoom-100-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-zoom-100.png | 1 + .../GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-zoom-fit.png | 1 + .../GtkStock/24x24/stock/gtk-zoom-in-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-zoom-in.png | 1 + .../GtkStock/24x24/stock/gtk-zoom-out-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/gtk-zoom-out.png | 1 + .../GtkStock/24x24/stock/harddrive-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/harddrive.png | 1 + .../GtkStock/24x24/stock/hdd_unmount-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/hdd_unmount.png | 1 + .../GtkStock/24x24/stock/help-about-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/help-about.png | Bin 0 -> 982 bytes .../24x24/stock/help-contents-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/help-contents.png | Bin 0 -> 1728 bytes .../icons/GtkStock/24x24/stock/help-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/help.png | 1 + .../24x24/stock/image-missing-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/image-missing.png | Bin 0 -> 894 bytes .../icons/GtkStock/24x24/stock/info-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/info.png | 1 + .../24x24/stock/inode-directory-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/inode-directory.png | 1 + .../GtkStock/24x24/stock/kfm_home-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/kfm_home.png | 1 + .../GtkStock/24x24/stock/leftjust-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/leftjust.png | 1 + .../GtkStock/24x24/stock/list-add-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/list-add.png | Bin 0 -> 571 bytes .../GtkStock/24x24/stock/list-remove-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/list-remove.png | Bin 0 -> 369 bytes .../GtkStock/24x24/stock/media-cdrom-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/media-cdrom.png | 1 + .../GtkStock/24x24/stock/media-floppy-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/media-floppy.png | Bin 0 -> 951 bytes .../24x24/stock/media-optical-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/media-optical.png | Bin 0 -> 1372 bytes .../24x24/stock/media-playback-pause-symbolic.png | 1 + .../GtkStock/24x24/stock/media-playback-pause.png | Bin 0 -> 383 bytes .../stock/media-playback-start-ltr-symbolic.png | 1 + .../24x24/stock/media-playback-start-ltr.png | Bin 0 -> 863 bytes .../stock/media-playback-start-rtl-symbolic.png | 1 + .../24x24/stock/media-playback-start-rtl.png | Bin 0 -> 895 bytes .../24x24/stock/media-playback-stop-symbolic.png | 1 + .../GtkStock/24x24/stock/media-playback-stop.png | Bin 0 -> 400 bytes .../GtkStock/24x24/stock/media-record-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/media-record.png | Bin 0 -> 1063 bytes .../stock/media-seek-backward-ltr-symbolic.png | 1 + .../24x24/stock/media-seek-backward-ltr.png | Bin 0 -> 902 bytes .../stock/media-seek-backward-rtl-symbolic.png | 1 + .../24x24/stock/media-seek-backward-rtl.png | Bin 0 -> 776 bytes .../stock/media-seek-forward-ltr-symbolic.png | 1 + .../24x24/stock/media-seek-forward-ltr.png | Bin 0 -> 776 bytes .../stock/media-seek-forward-rtl-symbolic.png | 1 + .../24x24/stock/media-seek-forward-rtl.png | Bin 0 -> 902 bytes .../stock/media-skip-backward-ltr-symbolic.png | 1 + .../24x24/stock/media-skip-backward-ltr.png | Bin 0 -> 806 bytes .../stock/media-skip-backward-rtl-symbolic.png | 1 + .../24x24/stock/media-skip-backward-rtl.png | Bin 0 -> 848 bytes .../stock/media-skip-forward-ltr-symbolic.png | 1 + .../24x24/stock/media-skip-forward-ltr.png | Bin 0 -> 848 bytes .../stock/media-skip-forward-rtl-symbolic.png | 1 + .../24x24/stock/media-skip-forward-rtl.png | Bin 0 -> 806 bytes .../24x24/stock/messagebox_info-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/messagebox_info.png | 1 + .../GtkStock/24x24/stock/mime_ascii-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/mime_ascii.png | 1 + .../icons/GtkStock/24x24/stock/misc-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/misc.png | 1 + .../GtkStock/24x24/stock/network-idle-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/network-idle.png | Bin 0 -> 1015 bytes .../GtkStock/24x24/stock/network-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/network.png | 1 + .../GtkStock/24x24/stock/nm-adhoc-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/nm-adhoc.png | 1 + .../24x24/stock/nm-device-wired-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/nm-device-wired.png | 1 + .../24x24/stock/nm-device-wireless-symbolic.png | 1 + .../GtkStock/24x24/stock/nm-device-wireless.png | 1 + .../24x24/stock/package_editors-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/package_editors.png | 1 + .../24x24/stock/package_settings-symbolic.png | 1 + .../GtkStock/24x24/stock/package_settings.png | 1 + .../GtkStock/24x24/stock/player_pause-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/player_pause.png | 1 + .../24x24/stock/player_record-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/player_record.png | 1 + .../GtkStock/24x24/stock/player_stop-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/player_stop.png | 1 + .../24x24/stock/preferences-system-symbolic.png | 1 + .../GtkStock/24x24/stock/preferences-system.png | 1 + .../24x24/stock/printer-error-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/printer-error.png | Bin 0 -> 1130 bytes .../GtkStock/24x24/stock/printer-info-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/printer-info.png | Bin 0 -> 1154 bytes .../24x24/stock/printer-paused-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/printer-paused.png | Bin 0 -> 1096 bytes .../24x24/stock/printer-warning-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/printer-warning.png | Bin 0 -> 1099 bytes .../GtkStock/24x24/stock/process-stop-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/process-stop.png | Bin 0 -> 1043 bytes .../GtkStock/24x24/stock/redhat-home-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/redhat-home.png | 1 + .../stock/redhat-system_settings-symbolic.png | 1 + .../24x24/stock/redhat-system_settings.png | 1 + .../icons/GtkStock/24x24/stock/redo-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/redo.png | 1 + .../icons/GtkStock/24x24/stock/reload-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/reload.png | 1 + .../GtkStock/24x24/stock/reload3-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/reload3.png | 1 + .../24x24/stock/reload_all_tabs-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/reload_all_tabs.png | 1 + .../GtkStock/24x24/stock/reload_page-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/reload_page.png | 1 + .../icons/GtkStock/24x24/stock/remove-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/remove.png | 1 + .../icons/GtkStock/24x24/stock/revert-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/revert.png | 1 + .../GtkStock/24x24/stock/rightjust-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/rightjust.png | 1 + .../GtkStock/24x24/stock/stock_about-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_about.png | 1 + .../GtkStock/24x24/stock/stock_bottom-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_bottom.png | 1 + .../GtkStock/24x24/stock/stock_close-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_close.png | 1 + .../GtkStock/24x24/stock/stock_copy-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_copy.png | 1 + .../GtkStock/24x24/stock/stock_cut-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_cut.png | 1 + .../GtkStock/24x24/stock/stock_delete-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_delete.png | 1 + .../24x24/stock/stock_dialog-info-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_dialog-info.png | 1 + .../GtkStock/24x24/stock/stock_down-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_down.png | 1 + .../24x24/stock/stock_file-properites-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_file-properites.png | 1 + .../GtkStock/24x24/stock/stock_folder-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_folder.png | 1 + .../24x24/stock/stock_fullscreen-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_fullscreen.png | 1 + .../GtkStock/24x24/stock/stock_help-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_help.png | 1 + .../GtkStock/24x24/stock/stock_home-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_home.png | 1 + .../stock/stock_leave-fullscreen-symbolic.png | 1 + .../24x24/stock/stock_leave-fullscreen.png | 1 + .../24x24/stock/stock_media-pause-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_media-pause.png | 1 + .../24x24/stock/stock_media-rec-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_media-rec.png | 1 + .../24x24/stock/stock_media-stop-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_media-stop.png | 1 + .../24x24/stock/stock_new-text-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_new-text.png | 1 + .../GtkStock/24x24/stock/stock_paste-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_paste.png | 1 + .../24x24/stock/stock_print-preview-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_print-preview.png | 1 + .../GtkStock/24x24/stock/stock_print-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_print.png | 1 + .../24x24/stock/stock_properties-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_properties.png | 1 + .../GtkStock/24x24/stock/stock_redo-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_redo.png | 1 + .../24x24/stock/stock_refresh-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_refresh.png | 1 + .../24x24/stock/stock_save-as-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_save-as.png | 1 + .../GtkStock/24x24/stock/stock_save-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_save.png | 1 + .../stock/stock_search-and-replace-symbolic.png | 1 + .../24x24/stock/stock_search-and-replace.png | 1 + .../GtkStock/24x24/stock/stock_search-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_search.png | 1 + .../24x24/stock/stock_select-all-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_select-all.png | 1 + .../24x24/stock/stock_spellcheck-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_spellcheck.png | 1 + .../GtkStock/24x24/stock/stock_stop-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_stop.png | 1 + .../stock/stock_text-strikethrough-symbolic.png | 1 + .../24x24/stock/stock_text-strikethrough.png | 1 + .../24x24/stock/stock_text_bold-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_text_bold.png | 1 + .../24x24/stock/stock_text_center-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_text_center.png | 1 + .../24x24/stock/stock_text_italic-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_text_italic.png | 1 + .../24x24/stock/stock_text_justify-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_text_justify.png | 1 + .../24x24/stock/stock_text_left-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_text_left.png | 1 + .../24x24/stock/stock_text_right-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_text_right.png | 1 + .../24x24/stock/stock_text_underlined-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_text_underlined.png | 1 + .../GtkStock/24x24/stock/stock_top-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_top.png | 1 + .../GtkStock/24x24/stock/stock_undo-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_undo.png | 1 + .../GtkStock/24x24/stock/stock_up-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_up.png | 1 + .../24x24/stock/stock_volume-0-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_volume-0.png | 1 + .../24x24/stock/stock_volume-max-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_volume-max.png | 1 + .../24x24/stock/stock_volume-med-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_volume-med.png | 1 + .../24x24/stock/stock_volume-min-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_volume-min.png | 1 + .../24x24/stock/stock_volume-mute-symbolic.png | 1 + .../GtkStock/24x24/stock/stock_volume-mute.png | 1 + .../GtkStock/24x24/stock/stock_volume-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_volume.png | 1 + .../GtkStock/24x24/stock/stock_zoom-1-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_zoom-1.png | 1 + .../24x24/stock/stock_zoom-in-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_zoom-in.png | 1 + .../24x24/stock/stock_zoom-out-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_zoom-out.png | 1 + .../24x24/stock/stock_zoom-page-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/stock_zoom-page.png | 1 + .../icons/GtkStock/24x24/stock/stop-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/stop.png | 1 + .../24x24/stock/system-floppy-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/system-floppy.png | 1 + .../GtkStock/24x24/stock/system-run-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/system-run.png | Bin 0 -> 1592 bytes .../24x24/stock/text-x-generic-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/text-x-generic.png | Bin 0 -> 736 bytes .../GtkStock/24x24/stock/text_bold-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/text_bold.png | 1 + .../GtkStock/24x24/stock/text_italic-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/text_italic.png | 1 + .../GtkStock/24x24/stock/text_strike-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/text_strike.png | 1 + .../GtkStock/24x24/stock/text_under-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/text_under.png | 1 + .../24x24/stock/tools-check-spelling-symbolic.png | 1 + .../GtkStock/24x24/stock/tools-check-spelling.png | Bin 0 -> 950 bytes .../icons/GtkStock/24x24/stock/top-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/top.png | 1 + .../icons/GtkStock/24x24/stock/txt-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/txt.png | 1 + .../icons/GtkStock/24x24/stock/txt2-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/txt2.png | 1 + .../icons/GtkStock/24x24/stock/undo-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/undo.png | 1 + .../GtkStock/24x24/stock/unknown-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/unknown.png | 1 + .../icons/GtkStock/24x24/stock/up-symbolic.png | 1 + .../Resources/icons/GtkStock/24x24/stock/up.png | 1 + .../GtkStock/24x24/stock/user-desktop-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/user-desktop.png | Bin 0 -> 662 bytes .../GtkStock/24x24/stock/user-home-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/user-home.png | Bin 0 -> 662 bytes .../24x24/stock/view-fullscreen-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/view-fullscreen.png | Bin 0 -> 606 bytes .../GtkStock/24x24/stock/view-refresh-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/view-refresh.png | Bin 0 -> 1466 bytes .../GtkStock/24x24/stock/view-restore-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/view-restore.png | Bin 0 -> 677 bytes .../24x24/stock/view-sort-ascending-symbolic.png | 1 + .../GtkStock/24x24/stock/view-sort-ascending.png | Bin 0 -> 413 bytes .../24x24/stock/view-sort-descending-symbolic.png | 1 + .../GtkStock/24x24/stock/view-sort-descending.png | Bin 0 -> 379 bytes .../GtkStock/24x24/stock/viewmag+-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/viewmag+.png | 1 + .../GtkStock/24x24/stock/viewmag--symbolic.png | 1 + .../icons/GtkStock/24x24/stock/viewmag-.png | 1 + .../GtkStock/24x24/stock/viewmag1-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/viewmag1.png | 1 + .../GtkStock/24x24/stock/viewmagfit-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/viewmagfit.png | 1 + .../GtkStock/24x24/stock/window-close-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/window-close.png | Bin 0 -> 1453 bytes .../24x24/stock/window_fullscreen-symbolic.png | 1 + .../GtkStock/24x24/stock/window_fullscreen.png | 1 + .../24x24/stock/window_nofullscreen-symbolic.png | 1 + .../GtkStock/24x24/stock/window_nofullscreen.png | 1 + .../24x24/stock/xfce-system-exit-symbolic.png | 1 + .../GtkStock/24x24/stock/xfce-system-exit.png | 1 + .../24x24/stock/xfce-system-settings-symbolic.png | 1 + .../GtkStock/24x24/stock/xfce-system-settings.png | 1 + .../GtkStock/24x24/stock/yast_HD-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/yast_HD.png | 1 + .../GtkStock/24x24/stock/yast_idetude-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/yast_idetude.png | 1 + .../24x24/stock/zoom-best-fit-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/zoom-best-fit.png | 1 + .../24x24/stock/zoom-fit-best-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/zoom-fit-best.png | Bin 0 -> 937 bytes .../GtkStock/24x24/stock/zoom-in-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/zoom-in.png | Bin 0 -> 993 bytes .../24x24/stock/zoom-original-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/zoom-original.png | Bin 0 -> 962 bytes .../GtkStock/24x24/stock/zoom-out-symbolic.png | 1 + .../icons/GtkStock/24x24/stock/zoom-out.png | Bin 0 -> 941 bytes .../32x32/stock/gtk-dnd-multiple-symbolic.png | 1 + .../GtkStock/32x32/stock/gtk-dnd-multiple.png | Bin 0 -> 1215 bytes .../GtkStock/32x32/stock/gtk-dnd-symbolic.png | 1 + .../icons/GtkStock/32x32/stock/gtk-dnd.png | Bin 0 -> 1349 bytes .../GtkStock/48x48/stock/dialog-error-symbolic.png | 1 + .../icons/GtkStock/48x48/stock/dialog-error.png | Bin 0 -> 2828 bytes .../48x48/stock/dialog-information-symbolic.png | 1 + .../GtkStock/48x48/stock/dialog-information.png | Bin 0 -> 3259 bytes .../48x48/stock/dialog-password-symbolic.png | 1 + .../icons/GtkStock/48x48/stock/dialog-password.png | Bin 0 -> 2358 bytes .../48x48/stock/dialog-question-symbolic.png | 1 + .../icons/GtkStock/48x48/stock/dialog-question.png | Bin 0 -> 2809 bytes .../48x48/stock/dialog-warning-symbolic.png | 1 + .../icons/GtkStock/48x48/stock/dialog-warning.png | Bin 0 -> 2358 bytes .../icons/GtkStock/48x48/stock/error-symbolic.png | 1 + .../Resources/icons/GtkStock/48x48/stock/error.png | 1 + .../stock/gtk-dialog-authentication-symbolic.png | 1 + .../48x48/stock/gtk-dialog-authentication.png | 1 + .../48x48/stock/gtk-dialog-error-symbolic.png | 1 + .../GtkStock/48x48/stock/gtk-dialog-error.png | 1 + .../48x48/stock/gtk-dialog-info-symbolic.png | 1 + .../icons/GtkStock/48x48/stock/gtk-dialog-info.png | 1 + .../48x48/stock/gtk-dialog-question-symbolic.png | 1 + .../GtkStock/48x48/stock/gtk-dialog-question.png | 1 + .../48x48/stock/gtk-dialog-warning-symbolic.png | 1 + .../GtkStock/48x48/stock/gtk-dialog-warning.png | 1 + .../GtkStock/48x48/stock/important-symbolic.png | 1 + .../icons/GtkStock/48x48/stock/important.png | 1 + .../icons/GtkStock/48x48/stock/info-symbolic.png | 1 + .../Resources/icons/GtkStock/48x48/stock/info.png | 1 + .../48x48/stock/messagebox_critical-symbolic.png | 1 + .../GtkStock/48x48/stock/messagebox_critical.png | 1 + .../48x48/stock/messagebox_info-symbolic.png | 1 + .../icons/GtkStock/48x48/stock/messagebox_info.png | 1 + .../48x48/stock/messagebox_warning-symbolic.png | 1 + .../GtkStock/48x48/stock/messagebox_warning.png | 1 + .../48x48/stock/stock_dialog-error-symbolic.png | 1 + .../GtkStock/48x48/stock/stock_dialog-error.png | 1 + .../48x48/stock/stock_dialog-info-symbolic.png | 1 + .../GtkStock/48x48/stock/stock_dialog-info.png | 1 + .../48x48/stock/stock_dialog-question-symbolic.png | 1 + .../GtkStock/48x48/stock/stock_dialog-question.png | 1 + .../48x48/stock/stock_dialog-warning-symbolic.png | 1 + .../GtkStock/48x48/stock/stock_dialog-warning.png | 1 + .../Resources/icons/GtkStock/icon-theme.cache | Bin 0 -> 38464 bytes .../macosx/Resources/icons/GtkStock/index.theme | 34 + .../macosx/Resources/themes/Adwaita/.DS_Store | Bin 0 -> 6148 bytes .../themes/Adwaita/backgrounds/adwaita-timed.xml | 51 + .../themes/Adwaita/backgrounds/bright-day.jpg | Bin 0 -> 1448256 bytes .../themes/Adwaita/backgrounds/good-night.jpg | Bin 0 -> 473584 bytes .../themes/Adwaita/backgrounds/morning.jpg | Bin 0 -> 1182508 bytes .../Resources/themes/Adwaita/gtk-2.0/.DS_Store | Bin 0 -> 6148 bytes .../Adwaita/gtk-2.0/Arrows/arrow-down-insens.png | Bin 0 -> 314 bytes .../Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png | Bin 0 -> 302 bytes .../gtk-2.0/Arrows/arrow-down-small-insens.png | Bin 0 -> 298 bytes .../gtk-2.0/Arrows/arrow-down-small-prelight.png | Bin 0 -> 275 bytes .../Adwaita/gtk-2.0/Arrows/arrow-down-small.png | Bin 0 -> 277 bytes .../themes/Adwaita/gtk-2.0/Arrows/arrow-down.png | Bin 0 -> 304 bytes .../Adwaita/gtk-2.0/Arrows/arrow-left-insens.png | Bin 0 -> 289 bytes .../Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png | Bin 0 -> 282 bytes .../themes/Adwaita/gtk-2.0/Arrows/arrow-left.png | Bin 0 -> 290 bytes .../Adwaita/gtk-2.0/Arrows/arrow-right-insens.png | Bin 0 -> 306 bytes .../gtk-2.0/Arrows/arrow-right-prelight.png | Bin 0 -> 290 bytes .../themes/Adwaita/gtk-2.0/Arrows/arrow-right.png | Bin 0 -> 292 bytes .../Adwaita/gtk-2.0/Arrows/arrow-up-insens.png | Bin 0 -> 294 bytes .../Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png | Bin 0 -> 292 bytes .../gtk-2.0/Arrows/arrow-up-small-insens.png | Bin 0 -> 270 bytes .../gtk-2.0/Arrows/arrow-up-small-prelight.png | Bin 0 -> 258 bytes .../Adwaita/gtk-2.0/Arrows/arrow-up-small.png | Bin 0 -> 257 bytes .../themes/Adwaita/gtk-2.0/Arrows/arrow-up.png | Bin 0 -> 295 bytes .../Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png | Bin 0 -> 254 bytes .../themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png | Bin 0 -> 276 bytes .../gtk-2.0/Buttons/button-default-nohilight.png | Bin 0 -> 448 bytes .../Adwaita/gtk-2.0/Buttons/button-default.png | Bin 0 -> 484 bytes .../Buttons/button-insensitive-nohilight.png | Bin 0 -> 371 bytes .../Adwaita/gtk-2.0/Buttons/button-insensitive.png | Bin 0 -> 405 bytes .../gtk-2.0/Buttons/button-prelight-nohilight.png | Bin 0 -> 439 bytes .../Adwaita/gtk-2.0/Buttons/button-prelight.png | Bin 0 -> 478 bytes .../gtk-2.0/Buttons/button-pressed-nohilight.png | Bin 0 -> 408 bytes .../Adwaita/gtk-2.0/Buttons/button-pressed.png | Bin 0 -> 450 bytes .../Check-Radio/checkbox-checked-insensitive.png | Bin 0 -> 3299 bytes .../gtk-2.0/Check-Radio/checkbox-checked.png | Bin 0 -> 3400 bytes .../Check-Radio/checkbox-unchecked-insensitive.png | Bin 0 -> 3019 bytes .../gtk-2.0/Check-Radio/checkbox-unchecked.png | Bin 0 -> 3047 bytes .../Adwaita/gtk-2.0/Check-Radio/menucheck.png | Bin 0 -> 427 bytes .../gtk-2.0/Check-Radio/menucheck_prelight.png | Bin 0 -> 313 bytes .../Adwaita/gtk-2.0/Check-Radio/menuoption.png | Bin 0 -> 256 bytes .../gtk-2.0/Check-Radio/menuoption_prelight.png | Bin 0 -> 220 bytes .../Check-Radio/option-checked-insensitive.png | Bin 0 -> 728 bytes .../Adwaita/gtk-2.0/Check-Radio/option-checked.png | Bin 0 -> 868 bytes .../Check-Radio/option-unchecked-insensitive.png | Bin 0 -> 620 bytes .../gtk-2.0/Check-Radio/option-unchecked.png | Bin 0 -> 673 bytes .../gtk-2.0/Entry/combo-entry-border-active-bg.png | Bin 0 -> 274 bytes .../Entry/combo-entry-border-active-notebook.png | Bin 0 -> 274 bytes .../Entry/combo-entry-border-active-rtl-bg.png | Bin 0 -> 295 bytes .../combo-entry-border-active-rtl-notebook.png | Bin 0 -> 295 bytes .../gtk-2.0/Entry/combo-entry-border-bg.png | Bin 0 -> 334 bytes .../Entry/combo-entry-border-disabled-bg.png | Bin 0 -> 275 bytes .../Entry/combo-entry-border-disabled-notebook.png | Bin 0 -> 263 bytes .../Entry/combo-entry-border-disabled-rtl-bg.png | Bin 0 -> 295 bytes .../combo-entry-border-disabled-rtl-notebook.png | Bin 0 -> 280 bytes .../gtk-2.0/Entry/combo-entry-border-notebook.png | Bin 0 -> 304 bytes .../gtk-2.0/Entry/combo-entry-border-rtl-bg.png | Bin 0 -> 373 bytes .../Entry/combo-entry-border-rtl-notebook.png | Bin 0 -> 322 bytes .../Entry/combo-entry-button-active-rtl.png | Bin 0 -> 359 bytes .../gtk-2.0/Entry/combo-entry-button-active.png | Bin 0 -> 373 bytes .../Entry/combo-entry-button-disabled-rtl.png | Bin 0 -> 317 bytes .../gtk-2.0/Entry/combo-entry-button-disabled.png | Bin 0 -> 331 bytes .../gtk-2.0/Entry/combo-entry-button-rtl.png | Bin 0 -> 353 bytes .../Adwaita/gtk-2.0/Entry/combo-entry-button.png | Bin 0 -> 368 bytes .../gtk-2.0/Entry/entry-border-active-bg-solid.png | Bin 0 -> 402 bytes .../gtk-2.0/Entry/entry-border-active-bg.png | Bin 0 -> 355 bytes .../gtk-2.0/Entry/entry-border-active-notebook.png | Bin 0 -> 356 bytes .../gtk-2.0/Entry/entry-border-bg-solid.png | Bin 0 -> 406 bytes .../Adwaita/gtk-2.0/Entry/entry-border-bg.png | Bin 0 -> 427 bytes .../gtk-2.0/Entry/entry-border-disabled-bg.png | Bin 0 -> 353 bytes .../Entry/entry-border-disabled-notebook.png | Bin 0 -> 331 bytes .../gtk-2.0/Entry/entry-border-fill-plain.png | Bin 0 -> 139 bytes .../gtk-2.0/Entry/entry-border-fill-solid.png | Bin 0 -> 203 bytes .../Adwaita/gtk-2.0/Entry/entry-border-fill.png | Bin 0 -> 179 bytes .../gtk-2.0/Entry/entry-border-notebook.png | Bin 0 -> 407 bytes .../themes/Adwaita/gtk-2.0/Expanders/minus.png | Bin 0 -> 294 bytes .../themes/Adwaita/gtk-2.0/Expanders/plus.png | Bin 0 -> 324 bytes .../themes/Adwaita/gtk-2.0/Handles/handle-h.png | Bin 0 -> 181 bytes .../themes/Adwaita/gtk-2.0/Handles/handle-v.png | Bin 0 -> 179 bytes .../themes/Adwaita/gtk-2.0/Lines/line-h.png | Bin 0 -> 135 bytes .../themes/Adwaita/gtk-2.0/Lines/line-v.png | Bin 0 -> 2764 bytes .../themes/Adwaita/gtk-2.0/Lines/menu_line_h.png | Bin 0 -> 141 bytes .../Adwaita/gtk-2.0/Menu-Menubar/menubar.png | Bin 0 -> 3056 bytes .../gtk-2.0/Menu-Menubar/menubar_button.png | Bin 0 -> 289 bytes .../themes/Adwaita/gtk-2.0/Others/focus.png | Bin 0 -> 212 bytes .../themes/Adwaita/gtk-2.0/Others/null.png | Bin 0 -> 4933 bytes .../themes/Adwaita/gtk-2.0/Others/tree_header.png | Bin 0 -> 2803 bytes .../Adwaita/gtk-2.0/ProgressBar/progressbar.png | Bin 0 -> 459 bytes .../Adwaita/gtk-2.0/ProgressBar/progressbar_v.png | Bin 0 -> 430 bytes .../gtk-2.0/ProgressBar/trough-progressbar.png | Bin 0 -> 450 bytes .../gtk-2.0/ProgressBar/trough-progressbar_v.png | Bin 0 -> 411 bytes .../gtk-2.0/Range/slider-horiz-prelight.png | Bin 0 -> 3274 bytes .../themes/Adwaita/gtk-2.0/Range/slider-horiz.png | Bin 0 -> 3274 bytes .../Adwaita/gtk-2.0/Range/slider-vert-prelight.png | Bin 0 -> 3293 bytes .../themes/Adwaita/gtk-2.0/Range/slider-vert.png | Bin 0 -> 3293 bytes .../Adwaita/gtk-2.0/Range/trough-horizontal.png | Bin 0 -> 2927 bytes .../Adwaita/gtk-2.0/Range/trough-vertical.png | Bin 0 -> 2964 bytes .../gtk-2.0/Scrollbars/slider-horiz-active.png | Bin 0 -> 2903 bytes .../gtk-2.0/Scrollbars/slider-horiz-insens.png | Bin 0 -> 2905 bytes .../gtk-2.0/Scrollbars/slider-horiz-prelight.png | Bin 0 -> 2911 bytes .../Adwaita/gtk-2.0/Scrollbars/slider-horiz.png | Bin 0 -> 2904 bytes .../gtk-2.0/Scrollbars/slider-vert-active.png | Bin 0 -> 2893 bytes .../gtk-2.0/Scrollbars/slider-vert-insens.png | Bin 0 -> 2893 bytes .../gtk-2.0/Scrollbars/slider-vert-prelight.png | Bin 0 -> 2896 bytes .../Adwaita/gtk-2.0/Scrollbars/slider-vert.png | Bin 0 -> 2892 bytes .../gtk-2.0/Scrollbars/trough-scrollbar-horiz.png | Bin 0 -> 2782 bytes .../gtk-2.0/Scrollbars/trough-scrollbar-vert.png | Bin 0 -> 2782 bytes .../Adwaita/gtk-2.0/Shadows/frame-gap-end.png | Bin 0 -> 174 bytes .../Adwaita/gtk-2.0/Shadows/frame-gap-start.png | Bin 0 -> 174 bytes .../themes/Adwaita/gtk-2.0/Shadows/frame.png | Bin 0 -> 242 bytes .../gtk-2.0/Spin/down-background-disable-rtl.png | Bin 0 -> 264 bytes .../gtk-2.0/Spin/down-background-disable.png | Bin 0 -> 260 bytes .../Adwaita/gtk-2.0/Spin/down-background-rtl.png | Bin 0 -> 277 bytes .../Adwaita/gtk-2.0/Spin/down-background.png | Bin 0 -> 265 bytes .../gtk-2.0/Spin/up-background-disable-rtl.png | Bin 0 -> 242 bytes .../Adwaita/gtk-2.0/Spin/up-background-disable.png | Bin 0 -> 257 bytes .../Adwaita/gtk-2.0/Spin/up-background-rtl.png | Bin 0 -> 269 bytes .../themes/Adwaita/gtk-2.0/Spin/up-background.png | Bin 0 -> 293 bytes .../Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png | Bin 0 -> 120 bytes .../Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png | Bin 0 -> 121 bytes .../themes/Adwaita/gtk-2.0/Tabs/notebook.png | Bin 0 -> 2786 bytes .../Adwaita/gtk-2.0/Tabs/tab-bottom-active.png | Bin 0 -> 2913 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png | Bin 0 -> 3604 bytes .../Adwaita/gtk-2.0/Tabs/tab-left-active.png | Bin 0 -> 2882 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-left.png | Bin 0 -> 2904 bytes .../Adwaita/gtk-2.0/Tabs/tab-right-active.png | Bin 0 -> 2881 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-right.png | Bin 0 -> 2918 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png | Bin 0 -> 2928 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-top.png | Bin 0 -> 3581 bytes .../Adwaita/gtk-2.0/Toolbar/inline-toolbar.png | Bin 0 -> 2883 bytes .../macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc | 2391 ++++++++++++++++++++ .../macosx/Resources/themes/Adwaita/index.theme | 141 ++ .../themes/Adwaita/metacity-1/metacity-theme-2.xml | 1604 +++++++++++++ .../themes/Adwaita/metacity-1/metacity-theme-3.xml | 1723 ++++++++++++++ .../gtk-2.0/Scrollbars/stepper-down.png | Bin 465 -> 0 bytes .../gtk-2.0/Scrollbars/stepper-left.png | Bin 497 -> 0 bytes .../gtk-2.0/Scrollbars/stepper-right.png | Bin 498 -> 0 bytes .../gtk-2.0/Scrollbars/stepper-up.png | Bin 463 -> 0 bytes .../gtk-2.0/Scrollbars/trough-scrollbar-horiz.png | Bin 1014 -> 0 bytes .../gtk-2.0/Scrollbars/trough-scrollbar-vert.png | Bin 905 -> 0 bytes .../gtk-2.0/Scrollbars_1/copy-slider.sh | 7 - .../gtk-2.0/Scrollbars_1/slider-horiz-prelight.png | Bin 5940 -> 0 bytes .../gtk-2.0/Scrollbars_1/slider-horiz.png | Bin 5940 -> 0 bytes .../gtk-2.0/Scrollbars_1/slider-vert-prelight.png | Bin 5409 -> 0 bytes .../gtk-2.0/Scrollbars_1/slider-vert.png | Bin 5409 -> 0 bytes .../gtk-2.0/Scrollbars_6/copy-slider.sh | 7 - .../gtk-2.0/Scrollbars_6/slider-horiz-prelight.png | Bin 5864 -> 0 bytes .../gtk-2.0/Scrollbars_6/slider-horiz.png | Bin 5864 -> 0 bytes .../gtk-2.0/Scrollbars_6/slider-vert-prelight.png | Bin 5412 -> 0 bytes .../gtk-2.0/Scrollbars_6/slider-vert.png | Bin 5412 -> 0 bytes .../Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc | 547 ----- packaging/macosx/osx-app.sh | 277 +-- packaging/macosx/osx-build.sh | 113 +- 1549 files changed, 7235 insertions(+), 862 deletions(-) create mode 100644 packaging/macosx/Resources/icons/.DS_Store create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/add-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/add.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/down-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/down.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/find-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/find.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/network.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/top-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/top.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/up-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/up.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag--symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag-.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/add-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/add.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/down-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/down.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/find-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/find.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/network.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/top-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/top.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/up-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/up.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag--symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag-.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning-symbolic.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/error-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/error.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/important-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/important.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning-symbolic.png create mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning.png create mode 100644 packaging/macosx/Resources/icons/GtkStock/icon-theme.cache create mode 100644 packaging/macosx/Resources/icons/GtkStock/index.theme create mode 100644 packaging/macosx/Resources/themes/Adwaita/.DS_Store create mode 100644 packaging/macosx/Resources/themes/Adwaita/backgrounds/adwaita-timed.xml create mode 100644 packaging/macosx/Resources/themes/Adwaita/backgrounds/bright-day.jpg create mode 100644 packaging/macosx/Resources/themes/Adwaita/backgrounds/good-night.jpg create mode 100644 packaging/macosx/Resources/themes/Adwaita/backgrounds/morning.jpg create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/.DS_Store create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-insens.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-insens.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-insens.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-plain.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-solid.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/minus.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/plus.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-h.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-v.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-h.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-v.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/menu_line_h.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/focus.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/null.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/tree_header.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-horizontal.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-vertical.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-end.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-start.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png create mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc create mode 100644 packaging/macosx/Resources/themes/Adwaita/index.theme create mode 100644 packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-2.xml create mode 100644 packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-3.xml delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png delete mode 100755 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png delete mode 100755 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 486877fa4..2cd872cac 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -42,12 +42,13 @@ export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # No longer required if path rewriting has been conducted. # export DYLD_LIBRARY_PATH="$TOP/lib" -mkdir -p "${HOME}/.inkscape-etc" +PREFDIR="${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91" +mkdir -p "$PREFDIR" export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="$HOME/.inkscape-etc/pangorc" -export GTK_IM_MODULE_FILE="$HOME/.inkscape-etc/gtk.immodules" -export GDK_PIXBUF_MODULE_FILE="$HOME/.inkscape-etc/gdk-pixbuf.loaders" +export PANGO_RC_FILE="$PREFDIR/pangorc" +export GTK_IM_MODULE_FILE="$PREFDIR/gtk.immodules" +export GDK_PIXBUF_MODULE_FILE="$PREFDIR/gdk-pixbuf.loaders" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" @@ -77,38 +78,7 @@ ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/ # Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then - # Appearance setting - aquaStyle=`defaults read "Apple Global Domain" AppleAquaColorVariant 2>/dev/null` - # 1 for aqua, 6 for graphite, inexistant if the default color was never changed - if [[ "$aquaStyle" == "" ]]; then - aquaStyle=1 # set aqua as default - fi - - # Highlight Color setting - hiliColor=`defaults read "Apple Global Domain" AppleHighlightColor 2>/dev/null` - # a RGB value, with components between 0 and 1, also inexistant if it was not changed - if [[ "$hiliColor" == "" ]]; then - hiliColor="0.709800 0.835300 1.000000" # set blue as default - fi - - # Menu items color - if [[ aquaStyle -eq 1 ]]; then - menuColor="#4a76cd" # blue - else - menuColor="#7c8da4" # graphite - fi - # Format highlight color as a GTK rgb value - hiliColorFormated=`echo $hiliColor | awk -F " " '{print "\\\{"$1","$2","$3"\\\}"}'` - - # echo $menuColor - # echo $hiliColorFormated - - # Modify the gtkrc - # - with the correct colors - # - to point to the correct scrollbars folder - sed 's/OSX_HILI_COLOR_PLACEHOLDER/'$hiliColorFormated'/g' "$INKSCAPE_SHAREDIR/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc" | sed 's/OSX_MENU_COLOR_PLACEHOLDER/\"'$menuColor'\"/g' | sed 's/AQUASTYLE_PLACEHOLDER/'$aquaStyle'/g' | sed 's|${THEMEDIR}|'"$ESCAPEDTOP/themes/Clearlooks-Quicksilver-OSX/gtk-2.0|g" > "${HOME}/.inkscape-etc/gtkrc" - - export GTK2_RC_FILES="$HOME/.inkscape-etc/gtkrc" + export GTK2_RC_FILES="$ESCAPEDTOP/themes/Adwaita/gtk-2.0/gtkrc" fi # If the AppleCollationOrder preference doesn't exist, we fall back to using @@ -116,7 +86,6 @@ fi LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] then - echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2 LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ sed 's/_.*//'` echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 @@ -145,14 +114,12 @@ else fi fi echo "Setting Language: $LANG" 1>&2 +export LC_ALL="$LANG" -sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" +sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$PREFDIR/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${HOME}/.inkscape-etc/pango.modules" -cp -f "$TOP/etc/pango/pangox.aliases" "${HOME}/.inkscape-etc/" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ - > "${HOME}/.inkscape-etc/gtk.immodules" + > "$PREFDIR/pango.modules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ - > "${HOME}/.inkscape-etc/gdk-pixbuf.loaders" + > "$PREFDIR/gdk-pixbuf.loaders" exec "$CWD/inkscape-bin" "$@" diff --git a/packaging/macosx/Resources/icons/.DS_Store b/packaging/macosx/Resources/icons/.DS_Store new file mode 100644 index 000000000..fa2ecbea7 Binary files /dev/null and b/packaging/macosx/Resources/icons/.DS_Store differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount-symbolic.png new file mode 120000 index 000000000..198cfb326 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount-symbolic.png @@ -0,0 +1 @@ +3floppy_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add-symbolic.png new file mode 120000 index 000000000..f26caeafb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add-symbolic.png @@ -0,0 +1 @@ +add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add.png new file mode 120000 index 000000000..7d4c8781d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add.png @@ -0,0 +1 @@ +list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit-symbolic.png new file mode 120000 index 000000000..0ecb0b9ba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit-symbolic.png @@ -0,0 +1 @@ +application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit.png new file mode 100644 index 000000000..d070809f1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii-symbolic.png new file mode 120000 index 000000000..306ee6a20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii-symbolic.png @@ -0,0 +1 @@ +ascii.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom-symbolic.png new file mode 120000 index 000000000..faf41843c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom-symbolic.png @@ -0,0 +1 @@ +bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom.png new file mode 120000 index 000000000..c58ca3d0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom.png @@ -0,0 +1 @@ +go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount-symbolic.png new file mode 120000 index 000000000..675a3d8d5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount-symbolic.png @@ -0,0 +1 @@ +cdrom_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount-symbolic.png new file mode 120000 index 000000000..69e9cb48e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount-symbolic.png @@ -0,0 +1 @@ +cdwriter_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust-symbolic.png new file mode 120000 index 000000000..337ad727a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust-symbolic.png @@ -0,0 +1 @@ +centrejust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust.png new file mode 120000 index 000000000..980c099ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust.png @@ -0,0 +1 @@ +format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established-symbolic.png new file mode 120000 index 000000000..5beb19d41 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established-symbolic.png @@ -0,0 +1 @@ +connect_established.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop-symbolic.png new file mode 120000 index 000000000..3c4032691 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop-symbolic.png @@ -0,0 +1 @@ +desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop.png new file mode 120000 index 000000000..200ab00ab --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop.png @@ -0,0 +1 @@ +user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information-symbolic.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information-symbolic.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information.png new file mode 100644 index 000000000..df87def2f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new-symbolic.png new file mode 120000 index 000000000..446977ddc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new-symbolic.png @@ -0,0 +1 @@ +document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new.png new file mode 100644 index 000000000..7cd94435a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent-symbolic.png new file mode 120000 index 000000000..f10003637 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent-symbolic.png @@ -0,0 +1 @@ +document-open-recent.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent.png new file mode 100644 index 000000000..61543990d Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-symbolic.png new file mode 120000 index 000000000..f58170cc1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-symbolic.png @@ -0,0 +1 @@ +document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open.png new file mode 100644 index 000000000..476185370 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview-symbolic.png new file mode 120000 index 000000000..9dfea717c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview-symbolic.png @@ -0,0 +1 @@ +document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview.png new file mode 100644 index 000000000..45b44f324 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-symbolic.png new file mode 120000 index 000000000..863a49fc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-symbolic.png @@ -0,0 +1 @@ +document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print.png new file mode 100644 index 000000000..5997b9222 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties-symbolic.png new file mode 120000 index 000000000..b447aa240 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties-symbolic.png @@ -0,0 +1 @@ +document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties.png new file mode 100644 index 000000000..65d22e4fb Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr-symbolic.png new file mode 120000 index 000000000..ac1bd52d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr-symbolic.png @@ -0,0 +1 @@ +document-revert-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr.png new file mode 100644 index 000000000..026014ca3 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl-symbolic.png new file mode 120000 index 000000000..f56254a08 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl-symbolic.png @@ -0,0 +1 @@ +document-revert-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl.png new file mode 100644 index 000000000..aaea1ff39 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-symbolic.png new file mode 120000 index 000000000..35c2c00a5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-symbolic.png @@ -0,0 +1 @@ +document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert.png new file mode 120000 index 000000000..ac1bd52d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert.png @@ -0,0 +1 @@ +document-revert-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as-symbolic.png new file mode 120000 index 000000000..6f8088857 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as-symbolic.png @@ -0,0 +1 @@ +document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as.png new file mode 100644 index 000000000..3409adc7a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-symbolic.png new file mode 120000 index 000000000..b1240e18d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-symbolic.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save.png new file mode 100644 index 000000000..18b7d2419 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down-symbolic.png new file mode 120000 index 000000000..0bef6f6e8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down-symbolic.png @@ -0,0 +1 @@ +down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down.png new file mode 120000 index 000000000..5240b846d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down.png @@ -0,0 +1 @@ +go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk-symbolic.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk-symbolic.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk.png new file mode 100644 index 000000000..b714d86e2 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount-symbolic.png new file mode 120000 index 000000000..041480d09 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount-symbolic.png @@ -0,0 +1 @@ +dvd_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear-symbolic.png new file mode 120000 index 000000000..f230219f3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear-symbolic.png @@ -0,0 +1 @@ +edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear.png new file mode 100644 index 000000000..49ae8db9c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy-symbolic.png new file mode 120000 index 000000000..e106cb543 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy-symbolic.png @@ -0,0 +1 @@ +edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy.png new file mode 100644 index 000000000..8dd48c494 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut-symbolic.png new file mode 120000 index 000000000..32b03023c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut-symbolic.png @@ -0,0 +1 @@ +edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut.png new file mode 100644 index 000000000..ff87558fc Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete-symbolic.png new file mode 120000 index 000000000..bb0a74a58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete-symbolic.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete.png new file mode 100644 index 000000000..2c5a46733 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace-symbolic.png new file mode 120000 index 000000000..e4057afed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace-symbolic.png @@ -0,0 +1 @@ +edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace.png new file mode 100644 index 000000000..fca34f52a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-symbolic.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-symbolic.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find.png new file mode 100644 index 000000000..e9a40950b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste-symbolic.png new file mode 120000 index 000000000..2f55649f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste-symbolic.png @@ -0,0 +1 @@ +edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste.png new file mode 100644 index 000000000..24588a3a4 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr-symbolic.png new file mode 120000 index 000000000..687ee4f05 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr-symbolic.png @@ -0,0 +1 @@ +edit-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr.png new file mode 100644 index 000000000..f7923083b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl-symbolic.png new file mode 120000 index 000000000..0f38059a6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl-symbolic.png @@ -0,0 +1 @@ +edit-redo-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl.png new file mode 100644 index 000000000..7c6c250b6 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-symbolic.png new file mode 120000 index 000000000..0061b57c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-symbolic.png @@ -0,0 +1 @@ +edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo.png new file mode 120000 index 000000000..687ee4f05 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo.png @@ -0,0 +1 @@ +edit-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all-symbolic.png new file mode 120000 index 000000000..30033c765 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all-symbolic.png @@ -0,0 +1 @@ +edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all.png new file mode 100644 index 000000000..e3bd4ba72 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr-symbolic.png new file mode 120000 index 000000000..3043c4fa7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr-symbolic.png @@ -0,0 +1 @@ +edit-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr.png new file mode 100644 index 000000000..b0c8a48d7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl-symbolic.png new file mode 120000 index 000000000..4020ce799 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl-symbolic.png @@ -0,0 +1 @@ +edit-undo-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl.png new file mode 100644 index 000000000..13e061e09 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-symbolic.png new file mode 120000 index 000000000..62d2a953e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-symbolic.png @@ -0,0 +1 @@ +edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo.png new file mode 120000 index 000000000..3043c4fa7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo.png @@ -0,0 +1 @@ +edit-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear-symbolic.png new file mode 120000 index 000000000..29ba74e20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear-symbolic.png @@ -0,0 +1 @@ +editclear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear.png new file mode 120000 index 000000000..f230219f3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear.png @@ -0,0 +1 @@ +edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy-symbolic.png new file mode 120000 index 000000000..6a91dbe20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy-symbolic.png @@ -0,0 +1 @@ +editcopy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy.png new file mode 120000 index 000000000..e106cb543 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy.png @@ -0,0 +1 @@ +edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut-symbolic.png new file mode 120000 index 000000000..778447500 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut-symbolic.png @@ -0,0 +1 @@ +editcut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut.png new file mode 120000 index 000000000..32b03023c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut.png @@ -0,0 +1 @@ +edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete-symbolic.png new file mode 120000 index 000000000..a94cb85d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete-symbolic.png @@ -0,0 +1 @@ +editdelete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete.png new file mode 120000 index 000000000..bb0a74a58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste-symbolic.png new file mode 120000 index 000000000..3c44aa574 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste-symbolic.png @@ -0,0 +1 @@ +editpaste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste.png new file mode 120000 index 000000000..2f55649f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste.png @@ -0,0 +1 @@ +edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty-symbolic.png new file mode 120000 index 000000000..1350bab17 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty-symbolic.png @@ -0,0 +1 @@ +empty.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit-symbolic.png new file mode 120000 index 000000000..4eb2fd526 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit-symbolic.png @@ -0,0 +1 @@ +exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit.png new file mode 120000 index 000000000..0ecb0b9ba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit.png @@ -0,0 +1 @@ +application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind-symbolic.png new file mode 120000 index 000000000..af3ede396 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind-symbolic.png @@ -0,0 +1 @@ +filefind.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew-symbolic.png new file mode 120000 index 000000000..c52f9eaf8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew-symbolic.png @@ -0,0 +1 @@ +filenew.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew.png new file mode 120000 index 000000000..446977ddc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew.png @@ -0,0 +1 @@ +document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen-symbolic.png new file mode 120000 index 000000000..99c3ecd92 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen-symbolic.png @@ -0,0 +1 @@ +fileopen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen.png new file mode 120000 index 000000000..f58170cc1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen.png @@ -0,0 +1 @@ +document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint-symbolic.png new file mode 120000 index 000000000..b7c96eb8a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint-symbolic.png @@ -0,0 +1 @@ +fileprint.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint.png new file mode 120000 index 000000000..863a49fc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint.png @@ -0,0 +1 @@ +document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint-symbolic.png new file mode 120000 index 000000000..03fba13fe --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint-symbolic.png @@ -0,0 +1 @@ +filequickprint.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint.png new file mode 120000 index 000000000..9dfea717c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint.png @@ -0,0 +1 @@ +document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave-symbolic.png new file mode 120000 index 000000000..287a9600a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave-symbolic.png @@ -0,0 +1 @@ +filesave.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave.png new file mode 120000 index 000000000..b1240e18d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas-symbolic.png new file mode 120000 index 000000000..805ae83a2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas-symbolic.png @@ -0,0 +1 @@ +filesaveas.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas.png new file mode 120000 index 000000000..6f8088857 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas.png @@ -0,0 +1 @@ +document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find-symbolic.png new file mode 120000 index 000000000..2e3266774 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find-symbolic.png @@ -0,0 +1 @@ +find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote-symbolic.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote-symbolic.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote.png new file mode 100644 index 000000000..14ed14a12 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-symbolic.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-symbolic.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder.png new file mode 100644 index 000000000..14ed14a12 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home-symbolic.png new file mode 120000 index 000000000..137e7d5ed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home-symbolic.png @@ -0,0 +1 @@ +folder_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home.png new file mode 120000 index 000000000..8c668dc1c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home.png @@ -0,0 +1 @@ +user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr-symbolic.png new file mode 120000 index 000000000..a33b3ffac --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr-symbolic.png @@ -0,0 +1 @@ +format-indent-less-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr.png new file mode 100644 index 000000000..776f5767e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl-symbolic.png new file mode 120000 index 000000000..d5c1b473d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl-symbolic.png @@ -0,0 +1 @@ +format-indent-less-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl.png new file mode 100644 index 000000000..18ededbfc Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr-symbolic.png new file mode 120000 index 000000000..5c9aeec8b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr-symbolic.png @@ -0,0 +1 @@ +format-indent-more-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr.png new file mode 100644 index 000000000..b00e21840 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl-symbolic.png new file mode 120000 index 000000000..e0ee3f7d7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl-symbolic.png @@ -0,0 +1 @@ +format-indent-more-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl.png new file mode 100644 index 000000000..015c495ef Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center-symbolic.png new file mode 120000 index 000000000..980c099ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center-symbolic.png @@ -0,0 +1 @@ +format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center.png new file mode 100644 index 000000000..57d6a0e35 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill-symbolic.png new file mode 120000 index 000000000..f1d9574cf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill-symbolic.png @@ -0,0 +1 @@ +format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill.png new file mode 100644 index 000000000..a416b25ab Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left-symbolic.png new file mode 120000 index 000000000..2da25a167 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left-symbolic.png @@ -0,0 +1 @@ +format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left.png new file mode 100644 index 000000000..9a7abf7ff Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right-symbolic.png new file mode 120000 index 000000000..017868ada --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right-symbolic.png @@ -0,0 +1 @@ +format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right.png new file mode 100644 index 000000000..15b507332 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold-symbolic.png new file mode 120000 index 000000000..ef50053bd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold-symbolic.png @@ -0,0 +1 @@ +format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold.png new file mode 100644 index 000000000..7e2c5dba9 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic-symbolic.png new file mode 120000 index 000000000..1ee2a31f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic-symbolic.png @@ -0,0 +1 @@ +format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic.png new file mode 100644 index 000000000..867df5ded Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough-symbolic.png new file mode 120000 index 000000000..9ff9a3776 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough-symbolic.png @@ -0,0 +1 @@ +format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough.png new file mode 100644 index 000000000..8a844a3a9 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline-symbolic.png new file mode 120000 index 000000000..4f5b1549c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline-symbolic.png @@ -0,0 +1 @@ +format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline.png new file mode 100644 index 000000000..35bcc8127 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio-symbolic.png new file mode 120000 index 000000000..cce40e357 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio-symbolic.png @@ -0,0 +1 @@ +gnome-dev-cdrom-audio.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr-symbolic.png new file mode 120000 index 000000000..fc19d096d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-cdr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw-symbolic.png new file mode 120000 index 000000000..3254f0b9a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-cdrw.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus-symbolic.png new file mode 120000 index 000000000..0babfc593 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdr-plus.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-symbolic.png new file mode 120000 index 000000000..e5acfa688 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram-symbolic.png new file mode 120000 index 000000000..3d65c827f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdram.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom-symbolic.png new file mode 120000 index 000000000..096e10ac3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw-symbolic.png new file mode 120000 index 000000000..6f333e959 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdrw.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy-symbolic.png new file mode 120000 index 000000000..ca93a31ac --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy-symbolic.png @@ -0,0 +1 @@ +gnome-dev-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394-symbolic.png new file mode 120000 index 000000000..709dd9407 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394-symbolic.png @@ -0,0 +1 @@ +gnome-dev-harddisk-1394.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-symbolic.png new file mode 120000 index 000000000..15fcbea7a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-symbolic.png @@ -0,0 +1 @@ +gnome-dev-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb-symbolic.png new file mode 120000 index 000000000..00cd3cdf1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb-symbolic.png @@ -0,0 +1 @@ +gnome-dev-harddisk-usb.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop-symbolic.png new file mode 120000 index 000000000..1de17f537 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop-symbolic.png @@ -0,0 +1 @@ +gnome-fs-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop.png new file mode 120000 index 000000000..200ab00ab --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop.png @@ -0,0 +1 @@ +user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory-symbolic.png new file mode 120000 index 000000000..d9bddcf2b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory-symbolic.png @@ -0,0 +1 @@ +gnome-fs-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png new file mode 120000 index 000000000..a941c98ed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png @@ -0,0 +1 @@ +gnome-fs-ftp.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home-symbolic.png new file mode 120000 index 000000000..42a0ae6a3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home-symbolic.png @@ -0,0 +1 @@ +gnome-fs-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home.png new file mode 120000 index 000000000..8c668dc1c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home.png @@ -0,0 +1 @@ +user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png new file mode 120000 index 000000000..b433450d1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png @@ -0,0 +1 @@ +gnome-fs-nfs.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share-symbolic.png new file mode 120000 index 000000000..d9a60f49d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share-symbolic.png @@ -0,0 +1 @@ +gnome-fs-share.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb-symbolic.png new file mode 120000 index 000000000..4f3d4e258 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb-symbolic.png @@ -0,0 +1 @@ +gnome-fs-smb.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png new file mode 120000 index 000000000..51ce27214 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png @@ -0,0 +1 @@ +gnome-fs-ssh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text-symbolic.png new file mode 120000 index 000000000..2d6a92f63 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text-symbolic.png @@ -0,0 +1 @@ +gnome-mime-text.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share-symbolic.png new file mode 120000 index 000000000..146decd75 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share-symbolic.png @@ -0,0 +1 @@ +gnome-mime-x-directory-smb-share.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle-symbolic.png new file mode 120000 index 000000000..a24805021 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle-symbolic.png @@ -0,0 +1 @@ +gnome-netstatus-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run-symbolic.png new file mode 120000 index 000000000..729e469c4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run-symbolic.png @@ -0,0 +1 @@ +gnome-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run.png new file mode 120000 index 000000000..9daf3feba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run.png @@ -0,0 +1 @@ +system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom-symbolic.png new file mode 120000 index 000000000..c58ca3d0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom-symbolic.png @@ -0,0 +1 @@ +go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom.png new file mode 100644 index 000000000..69aaafc2c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down-symbolic.png new file mode 120000 index 000000000..5240b846d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down-symbolic.png @@ -0,0 +1 @@ +go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down.png new file mode 100644 index 000000000..dcde30f02 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr-symbolic.png new file mode 120000 index 000000000..cd10b29f9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr-symbolic.png @@ -0,0 +1 @@ +go-first-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr.png new file mode 100644 index 000000000..689ba0a96 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl-symbolic.png new file mode 120000 index 000000000..c27895ff9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl-symbolic.png @@ -0,0 +1 @@ +go-first-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl.png new file mode 100644 index 000000000..a653e10ed Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home-symbolic.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home-symbolic.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home.png new file mode 100644 index 000000000..fadd43dc3 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr-symbolic.png new file mode 120000 index 000000000..1e84cdb4b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr-symbolic.png @@ -0,0 +1 @@ +go-jump-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr.png new file mode 100644 index 000000000..0f0f57a1a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl-symbolic.png new file mode 120000 index 000000000..da4dbb50a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl-symbolic.png @@ -0,0 +1 @@ +go-jump-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl.png new file mode 100644 index 000000000..0f03be58d Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr-symbolic.png new file mode 120000 index 000000000..e9a0b1bfb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr-symbolic.png @@ -0,0 +1 @@ +go-last-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr.png new file mode 100644 index 000000000..a653e10ed Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl-symbolic.png new file mode 120000 index 000000000..d10cbddc0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl-symbolic.png @@ -0,0 +1 @@ +go-last-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl.png new file mode 100644 index 000000000..689ba0a96 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr-symbolic.png new file mode 120000 index 000000000..ba611e6ec --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr-symbolic.png @@ -0,0 +1 @@ +go-next-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr.png new file mode 100644 index 000000000..5b9e3f0d1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl-symbolic.png new file mode 120000 index 000000000..5d7e220ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl-symbolic.png @@ -0,0 +1 @@ +go-next-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl.png new file mode 100644 index 000000000..9e77ac2ea Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr-symbolic.png new file mode 120000 index 000000000..e28ad36ea --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr-symbolic.png @@ -0,0 +1 @@ +go-previous-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr.png new file mode 100644 index 000000000..9e77ac2ea Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl-symbolic.png new file mode 120000 index 000000000..4b0816229 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl-symbolic.png @@ -0,0 +1 @@ +go-previous-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl.png new file mode 100644 index 000000000..5b9e3f0d1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top-symbolic.png new file mode 120000 index 000000000..3b5b7d6e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top-symbolic.png @@ -0,0 +1 @@ +go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top.png new file mode 100644 index 000000000..0a3b1bfba Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up-symbolic.png new file mode 120000 index 000000000..4a1025d4a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up-symbolic.png @@ -0,0 +1 @@ +go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up.png new file mode 100644 index 000000000..432225f51 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome-symbolic.png new file mode 120000 index 000000000..f31e7772d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome-symbolic.png @@ -0,0 +1 @@ +gohome.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about-symbolic.png new file mode 120000 index 000000000..474a4323d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about-symbolic.png @@ -0,0 +1 @@ +gtk-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about.png new file mode 120000 index 000000000..dd431b5e8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about.png @@ -0,0 +1 @@ +help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add-symbolic.png new file mode 120000 index 000000000..4a50663ad --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add-symbolic.png @@ -0,0 +1 @@ +gtk-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add.png new file mode 120000 index 000000000..7d4c8781d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add.png @@ -0,0 +1 @@ +list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold-symbolic.png new file mode 120000 index 000000000..8053f9c7a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold-symbolic.png @@ -0,0 +1 @@ +gtk-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold.png new file mode 120000 index 000000000..ef50053bd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold.png @@ -0,0 +1 @@ +format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel-symbolic.png new file mode 120000 index 000000000..e726007ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel-symbolic.png @@ -0,0 +1 @@ +gtk-cancel.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning-symbolic.png new file mode 120000 index 000000000..ae89400c9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning-symbolic.png @@ -0,0 +1 @@ +gtk-caps-lock-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning.png new file mode 100644 index 000000000..0dfa41876 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom-symbolic.png new file mode 120000 index 000000000..fcc64806d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom-symbolic.png @@ -0,0 +1 @@ +gtk-cdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear-symbolic.png new file mode 120000 index 000000000..f04e3f792 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear-symbolic.png @@ -0,0 +1 @@ +gtk-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear.png new file mode 120000 index 000000000..f230219f3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear.png @@ -0,0 +1 @@ +edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close-symbolic.png new file mode 120000 index 000000000..a3ced3a8e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close-symbolic.png @@ -0,0 +1 @@ +gtk-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker-symbolic.png new file mode 120000 index 000000000..cb3926ffb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker-symbolic.png @@ -0,0 +1 @@ +gtk-color-picker.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker.png new file mode 100644 index 000000000..24233cde0 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect-symbolic.png new file mode 120000 index 000000000..2fc301882 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect-symbolic.png @@ -0,0 +1 @@ +gtk-connect.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect.png new file mode 100644 index 000000000..097969a7c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert-symbolic.png new file mode 120000 index 000000000..7f053d572 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert-symbolic.png @@ -0,0 +1 @@ +gtk-convert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert.png new file mode 100644 index 000000000..e4d912579 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy-symbolic.png new file mode 120000 index 000000000..674753224 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy-symbolic.png @@ -0,0 +1 @@ +gtk-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy.png new file mode 120000 index 000000000..e106cb543 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy.png @@ -0,0 +1 @@ +edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut-symbolic.png new file mode 120000 index 000000000..f55e67fcf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut-symbolic.png @@ -0,0 +1 @@ +gtk-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut.png new file mode 120000 index 000000000..32b03023c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut.png @@ -0,0 +1 @@ +edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete-symbolic.png new file mode 120000 index 000000000..cb17163af --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete-symbolic.png @@ -0,0 +1 @@ +gtk-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete.png new file mode 120000 index 000000000..bb0a74a58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info-symbolic.png new file mode 120000 index 000000000..70ccbc7aa --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info-symbolic.png @@ -0,0 +1 @@ +gtk-dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory-symbolic.png new file mode 120000 index 000000000..f5a4d8dad --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory-symbolic.png @@ -0,0 +1 @@ +gtk-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect-symbolic.png new file mode 120000 index 000000000..911f3c46b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect-symbolic.png @@ -0,0 +1 @@ +gtk-disconnect.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect.png new file mode 100644 index 000000000..3dece1068 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit-symbolic.png new file mode 120000 index 000000000..a09517d38 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit-symbolic.png @@ -0,0 +1 @@ +gtk-edit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit.png new file mode 100644 index 000000000..c5da3f9fb Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute-symbolic.png new file mode 120000 index 000000000..d777d5f7a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute-symbolic.png @@ -0,0 +1 @@ +gtk-execute.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute.png new file mode 120000 index 000000000..9daf3feba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute.png @@ -0,0 +1 @@ +system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace-symbolic.png new file mode 120000 index 000000000..a03f9c58b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace-symbolic.png @@ -0,0 +1 @@ +gtk-find-and-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace.png new file mode 120000 index 000000000..e4057afed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace.png @@ -0,0 +1 @@ +edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-symbolic.png new file mode 120000 index 000000000..925deda81 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-symbolic.png @@ -0,0 +1 @@ +gtk-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy-symbolic.png new file mode 120000 index 000000000..eb899acc8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy-symbolic.png @@ -0,0 +1 @@ +gtk-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font-symbolic.png new file mode 120000 index 000000000..191b8aecf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font-symbolic.png @@ -0,0 +1 @@ +gtk-font.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font.png new file mode 100644 index 000000000..2514b6167 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen-symbolic.png new file mode 120000 index 000000000..673d2e6b1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen-symbolic.png @@ -0,0 +1 @@ +gtk-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen.png new file mode 120000 index 000000000..37aaf877e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen.png @@ -0,0 +1 @@ +view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down-symbolic.png new file mode 120000 index 000000000..c0f84c886 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down-symbolic.png @@ -0,0 +1 @@ +gtk-go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down.png new file mode 120000 index 000000000..5240b846d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down.png @@ -0,0 +1 @@ +go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up-symbolic.png new file mode 120000 index 000000000..ee76eec61 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up-symbolic.png @@ -0,0 +1 @@ +gtk-go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up.png new file mode 120000 index 000000000..4a1025d4a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up.png @@ -0,0 +1 @@ +go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom-symbolic.png new file mode 120000 index 000000000..27ab77552 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom-symbolic.png @@ -0,0 +1 @@ +gtk-goto-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom.png new file mode 120000 index 000000000..c58ca3d0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom.png @@ -0,0 +1 @@ +go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top-symbolic.png new file mode 120000 index 000000000..32ee14e66 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top-symbolic.png @@ -0,0 +1 @@ +gtk-goto-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top.png new file mode 120000 index 000000000..3b5b7d6e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top.png @@ -0,0 +1 @@ +go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk-symbolic.png new file mode 120000 index 000000000..152e871f3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk-symbolic.png @@ -0,0 +1 @@ +gtk-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help-symbolic.png new file mode 120000 index 000000000..796d97c74 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help-symbolic.png @@ -0,0 +1 @@ +gtk-help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help.png new file mode 120000 index 000000000..af8d871de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help.png @@ -0,0 +1 @@ +help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home-symbolic.png new file mode 120000 index 000000000..0f0054316 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home-symbolic.png @@ -0,0 +1 @@ +gtk-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index-symbolic.png new file mode 120000 index 000000000..1635a9d2b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index-symbolic.png @@ -0,0 +1 @@ +gtk-index.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index.png new file mode 100644 index 000000000..0967a61c3 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic-symbolic.png new file mode 120000 index 000000000..5a22fc560 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic-symbolic.png @@ -0,0 +1 @@ +gtk-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic.png new file mode 120000 index 000000000..1ee2a31f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic.png @@ -0,0 +1 @@ +format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center-symbolic.png new file mode 120000 index 000000000..2057ae4d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center-symbolic.png @@ -0,0 +1 @@ +gtk-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center.png new file mode 120000 index 000000000..980c099ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center.png @@ -0,0 +1 @@ +format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill-symbolic.png new file mode 120000 index 000000000..ad45b34dc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill-symbolic.png @@ -0,0 +1 @@ +gtk-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill.png new file mode 120000 index 000000000..f1d9574cf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill.png @@ -0,0 +1 @@ +format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left-symbolic.png new file mode 120000 index 000000000..a4ee605d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left-symbolic.png @@ -0,0 +1 @@ +gtk-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left.png new file mode 120000 index 000000000..2da25a167 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left.png @@ -0,0 +1 @@ +format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right-symbolic.png new file mode 120000 index 000000000..15dddca14 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right-symbolic.png @@ -0,0 +1 @@ +gtk-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right.png new file mode 120000 index 000000000..017868ada --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right.png @@ -0,0 +1 @@ +format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen-symbolic.png new file mode 120000 index 000000000..bc1251b2a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen-symbolic.png @@ -0,0 +1 @@ +gtk-leave-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen.png new file mode 120000 index 000000000..5b9d8f68b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen.png @@ -0,0 +1 @@ +view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause-symbolic.png new file mode 120000 index 000000000..e4880de80 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause-symbolic.png @@ -0,0 +1 @@ +gtk-media-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause.png new file mode 120000 index 000000000..0ef65d6d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record-symbolic.png new file mode 120000 index 000000000..6518a86a1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record-symbolic.png @@ -0,0 +1 @@ +gtk-media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record.png new file mode 120000 index 000000000..91f5c6f4d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record.png @@ -0,0 +1 @@ +media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop-symbolic.png new file mode 120000 index 000000000..b42b748dd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop-symbolic.png @@ -0,0 +1 @@ +gtk-media-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop.png new file mode 120000 index 000000000..423c7cf20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop.png @@ -0,0 +1 @@ +media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image-symbolic.png new file mode 120000 index 000000000..16ed32178 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image-symbolic.png @@ -0,0 +1 @@ +gtk-missing-image.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image.png new file mode 120000 index 000000000..344617bac --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image.png @@ -0,0 +1 @@ +image-missing.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new-symbolic.png new file mode 120000 index 000000000..913a6a7d3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new-symbolic.png @@ -0,0 +1 @@ +gtk-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new.png new file mode 120000 index 000000000..446977ddc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new.png @@ -0,0 +1 @@ +document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open-symbolic.png new file mode 120000 index 000000000..340a617d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open-symbolic.png @@ -0,0 +1 @@ +gtk-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open.png new file mode 120000 index 000000000..f58170cc1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open.png @@ -0,0 +1 @@ +document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape-symbolic.png new file mode 120000 index 000000000..95e896d4c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape-symbolic.png @@ -0,0 +1 @@ +gtk-orientation-landscape.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape.png new file mode 100644 index 000000000..748bb502d Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait-symbolic.png new file mode 120000 index 000000000..2dc258bb5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait-symbolic.png @@ -0,0 +1 @@ +gtk-orientation-portrait.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait.png new file mode 100644 index 000000000..94f078d91 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape-symbolic.png new file mode 120000 index 000000000..a6f0b4411 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape-symbolic.png @@ -0,0 +1 @@ +gtk-orientation-reverse-landscape.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape.png new file mode 100644 index 000000000..2a732a6ee Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait-symbolic.png new file mode 120000 index 000000000..1c8965166 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait-symbolic.png @@ -0,0 +1 @@ +gtk-orientation-reverse-portrait.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait.png new file mode 100644 index 000000000..c79cea355 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup-symbolic.png new file mode 120000 index 000000000..ff4533cc1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup-symbolic.png @@ -0,0 +1 @@ +gtk-page-setup.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup.png new file mode 100644 index 000000000..61b46d998 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste-symbolic.png new file mode 120000 index 000000000..892561ea8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste-symbolic.png @@ -0,0 +1 @@ +gtk-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste.png new file mode 120000 index 000000000..2f55649f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste.png @@ -0,0 +1 @@ +edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences-symbolic.png new file mode 120000 index 000000000..5acf3b2f2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences-symbolic.png @@ -0,0 +1 @@ +gtk-preferences.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences.png new file mode 100644 index 000000000..9703a40df Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview-symbolic.png new file mode 120000 index 000000000..8fe93e04e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview-symbolic.png @@ -0,0 +1 @@ +gtk-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview.png new file mode 120000 index 000000000..9dfea717c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview.png @@ -0,0 +1 @@ +document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-symbolic.png new file mode 120000 index 000000000..95ed2ec91 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-symbolic.png @@ -0,0 +1 @@ +gtk-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print.png new file mode 120000 index 000000000..863a49fc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print.png @@ -0,0 +1 @@ +document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties-symbolic.png new file mode 120000 index 000000000..5c3325bfc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties-symbolic.png @@ -0,0 +1 @@ +gtk-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties.png new file mode 120000 index 000000000..b447aa240 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties.png @@ -0,0 +1 @@ +document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit-symbolic.png new file mode 120000 index 000000000..e599db624 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit-symbolic.png @@ -0,0 +1 @@ +gtk-quit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit.png new file mode 120000 index 000000000..0ecb0b9ba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit.png @@ -0,0 +1 @@ +application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png new file mode 120000 index 000000000..d006923b8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png @@ -0,0 +1 @@ +gtk-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr.png new file mode 120000 index 000000000..0061b57c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr.png @@ -0,0 +1 @@ +edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh-symbolic.png new file mode 120000 index 000000000..38cbfeb52 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh-symbolic.png @@ -0,0 +1 @@ +gtk-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove-symbolic.png new file mode 120000 index 000000000..2e165cfdc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove-symbolic.png @@ -0,0 +1 @@ +gtk-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove.png new file mode 120000 index 000000000..1336403b3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove.png @@ -0,0 +1 @@ +list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr-symbolic.png new file mode 120000 index 000000000..39a6d5698 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr-symbolic.png @@ -0,0 +1 @@ +gtk-revert-to-saved-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr.png new file mode 120000 index 000000000..35c2c00a5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr.png @@ -0,0 +1 @@ +document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl-symbolic.png new file mode 120000 index 000000000..77c9eaa81 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl-symbolic.png @@ -0,0 +1 @@ +gtk-revert-to-saved-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl.png new file mode 120000 index 000000000..35c2c00a5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl.png @@ -0,0 +1 @@ +document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as-symbolic.png new file mode 120000 index 000000000..a7410d076 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as-symbolic.png @@ -0,0 +1 @@ +gtk-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as.png new file mode 120000 index 000000000..6f8088857 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as.png @@ -0,0 +1 @@ +document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-symbolic.png new file mode 120000 index 000000000..8eeb98b14 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-symbolic.png @@ -0,0 +1 @@ +gtk-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save.png new file mode 120000 index 000000000..b1240e18d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all-symbolic.png new file mode 120000 index 000000000..2711e9b55 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all-symbolic.png @@ -0,0 +1 @@ +gtk-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all.png new file mode 120000 index 000000000..30033c765 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all.png @@ -0,0 +1 @@ +edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color-symbolic.png new file mode 120000 index 000000000..367390596 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color-symbolic.png @@ -0,0 +1 @@ +gtk-select-color.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color.png new file mode 100644 index 000000000..2c764b374 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font-symbolic.png new file mode 120000 index 000000000..a4983fc58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font-symbolic.png @@ -0,0 +1 @@ +gtk-select-font.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font.png new file mode 100644 index 000000000..2514b6167 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending-symbolic.png new file mode 120000 index 000000000..30ddf10fa --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending-symbolic.png @@ -0,0 +1 @@ +gtk-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending.png new file mode 120000 index 000000000..28dd3cde5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending.png @@ -0,0 +1 @@ +view-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending-symbolic.png new file mode 120000 index 000000000..794f2156f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending-symbolic.png @@ -0,0 +1 @@ +gtk-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending.png new file mode 120000 index 000000000..578592d3b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending.png @@ -0,0 +1 @@ +view-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check-symbolic.png new file mode 120000 index 000000000..bdf2c4c70 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check-symbolic.png @@ -0,0 +1 @@ +gtk-spell-check.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check.png new file mode 120000 index 000000000..23b82da94 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check.png @@ -0,0 +1 @@ +tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop-symbolic.png new file mode 120000 index 000000000..7c9bdc3d3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop-symbolic.png @@ -0,0 +1 @@ +gtk-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough-symbolic.png new file mode 120000 index 000000000..6221ce0a3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough-symbolic.png @@ -0,0 +1 @@ +gtk-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough.png new file mode 120000 index 000000000..9ff9a3776 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough.png @@ -0,0 +1 @@ +format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr-symbolic.png new file mode 120000 index 000000000..0877291c0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr-symbolic.png @@ -0,0 +1 @@ +gtk-undelete-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr.png new file mode 100644 index 000000000..cc58d0fb5 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl-symbolic.png new file mode 120000 index 000000000..3844ffd1a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl-symbolic.png @@ -0,0 +1 @@ +gtk-undelete-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl.png new file mode 100644 index 000000000..a312dd854 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline-symbolic.png new file mode 120000 index 000000000..9c10f2b4f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline-symbolic.png @@ -0,0 +1 @@ +gtk-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline.png new file mode 120000 index 000000000..4f5b1549c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline.png @@ -0,0 +1 @@ +format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png new file mode 120000 index 000000000..eb2a153d3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png @@ -0,0 +1 @@ +gtk-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr.png new file mode 120000 index 000000000..62d2a953e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr.png @@ -0,0 +1 @@ +edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100-symbolic.png new file mode 120000 index 000000000..0615da6a2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100-symbolic.png @@ -0,0 +1 @@ +gtk-zoom-100.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100.png new file mode 120000 index 000000000..bfeb09ed1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100.png @@ -0,0 +1 @@ +zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png new file mode 120000 index 000000000..b399469e7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png @@ -0,0 +1 @@ +gtk-zoom-fit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in-symbolic.png new file mode 120000 index 000000000..65c933a16 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in-symbolic.png @@ -0,0 +1 @@ +gtk-zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in.png new file mode 120000 index 000000000..ee0a4b39d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in.png @@ -0,0 +1 @@ +zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out-symbolic.png new file mode 120000 index 000000000..bd5b889a6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out-symbolic.png @@ -0,0 +1 @@ +gtk-zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out.png new file mode 120000 index 000000000..be243b08a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out.png @@ -0,0 +1 @@ +zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive-symbolic.png new file mode 120000 index 000000000..0245415f2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive-symbolic.png @@ -0,0 +1 @@ +harddrive.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount-symbolic.png new file mode 120000 index 000000000..0f5bce8a1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount-symbolic.png @@ -0,0 +1 @@ +hdd_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about-symbolic.png new file mode 120000 index 000000000..dd431b5e8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about-symbolic.png @@ -0,0 +1 @@ +help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about.png new file mode 100644 index 000000000..010d294a7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents-symbolic.png new file mode 120000 index 000000000..af8d871de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents-symbolic.png @@ -0,0 +1 @@ +help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents.png new file mode 100644 index 000000000..20ae955c3 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-symbolic.png new file mode 120000 index 000000000..102ea55da --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-symbolic.png @@ -0,0 +1 @@ +help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help.png new file mode 120000 index 000000000..af8d871de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help.png @@ -0,0 +1 @@ +help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing-symbolic.png new file mode 120000 index 000000000..344617bac --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing-symbolic.png @@ -0,0 +1 @@ +image-missing.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing.png new file mode 100644 index 000000000..84b26afd6 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info-symbolic.png new file mode 120000 index 000000000..ad789b531 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info-symbolic.png @@ -0,0 +1 @@ +info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory-symbolic.png new file mode 120000 index 000000000..d8f486403 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory-symbolic.png @@ -0,0 +1 @@ +inode-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home-symbolic.png new file mode 120000 index 000000000..b2008e9c4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home-symbolic.png @@ -0,0 +1 @@ +kfm_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust-symbolic.png new file mode 120000 index 000000000..c8d6c19de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust-symbolic.png @@ -0,0 +1 @@ +leftjust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust.png new file mode 120000 index 000000000..2da25a167 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust.png @@ -0,0 +1 @@ +format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add-symbolic.png new file mode 120000 index 000000000..7d4c8781d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add-symbolic.png @@ -0,0 +1 @@ +list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add.png new file mode 100644 index 000000000..9cd9e5cf2 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove-symbolic.png new file mode 120000 index 000000000..1336403b3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove-symbolic.png @@ -0,0 +1 @@ +list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove.png new file mode 100644 index 000000000..0ed9c2210 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom-symbolic.png new file mode 120000 index 000000000..848507774 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom-symbolic.png @@ -0,0 +1 @@ +media-cdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy-symbolic.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy-symbolic.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy.png new file mode 100644 index 000000000..18b7d2419 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical-symbolic.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical-symbolic.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical.png new file mode 100644 index 000000000..922f452f1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause-symbolic.png new file mode 120000 index 000000000..0ef65d6d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause-symbolic.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause.png new file mode 100644 index 000000000..8b70f471a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr-symbolic.png new file mode 120000 index 000000000..1265a5a32 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr-symbolic.png @@ -0,0 +1 @@ +media-playback-start-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr.png new file mode 100644 index 000000000..e7e2584db Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl-symbolic.png new file mode 120000 index 000000000..956b43d14 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl-symbolic.png @@ -0,0 +1 @@ +media-playback-start-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl.png new file mode 100644 index 000000000..e3cb29165 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop-symbolic.png new file mode 120000 index 000000000..423c7cf20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop-symbolic.png @@ -0,0 +1 @@ +media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop.png new file mode 100644 index 000000000..c844e8322 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record-symbolic.png new file mode 120000 index 000000000..91f5c6f4d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record-symbolic.png @@ -0,0 +1 @@ +media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record.png new file mode 100644 index 000000000..93b2ec100 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr-symbolic.png new file mode 120000 index 000000000..64288c383 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr-symbolic.png @@ -0,0 +1 @@ +media-seek-backward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr.png new file mode 100644 index 000000000..4972cb7ba Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl-symbolic.png new file mode 120000 index 000000000..9863a32f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl-symbolic.png @@ -0,0 +1 @@ +media-seek-backward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl.png new file mode 100644 index 000000000..a02022474 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr-symbolic.png new file mode 120000 index 000000000..a7ca942c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr-symbolic.png @@ -0,0 +1 @@ +media-seek-forward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr.png new file mode 100644 index 000000000..a02022474 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl-symbolic.png new file mode 120000 index 000000000..7829cab85 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl-symbolic.png @@ -0,0 +1 @@ +media-seek-forward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl.png new file mode 100644 index 000000000..4972cb7ba Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr-symbolic.png new file mode 120000 index 000000000..cea15b4f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr-symbolic.png @@ -0,0 +1 @@ +media-skip-backward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr.png new file mode 100644 index 000000000..67dbb2e16 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl-symbolic.png new file mode 120000 index 000000000..11db21ad5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl-symbolic.png @@ -0,0 +1 @@ +media-skip-backward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl.png new file mode 100644 index 000000000..08ad0b69a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr-symbolic.png new file mode 120000 index 000000000..bd7416fbd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr-symbolic.png @@ -0,0 +1 @@ +media-skip-forward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr.png new file mode 100644 index 000000000..08ad0b69a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl-symbolic.png new file mode 120000 index 000000000..0ea17ba14 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl-symbolic.png @@ -0,0 +1 @@ +media-skip-forward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl.png new file mode 100644 index 000000000..67dbb2e16 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info-symbolic.png new file mode 120000 index 000000000..bfc646ad5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info-symbolic.png @@ -0,0 +1 @@ +messagebox_info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii-symbolic.png new file mode 120000 index 000000000..12b223390 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii-symbolic.png @@ -0,0 +1 @@ +mime_ascii.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc-symbolic.png new file mode 120000 index 000000000..af684393f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc-symbolic.png @@ -0,0 +1 @@ +misc.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle-symbolic.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle-symbolic.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle.png new file mode 100644 index 000000000..e74e060ea Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-symbolic.png new file mode 120000 index 000000000..a14428c62 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-symbolic.png @@ -0,0 +1 @@ +network.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc-symbolic.png new file mode 120000 index 000000000..34044c00c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc-symbolic.png @@ -0,0 +1 @@ +nm-adhoc.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired-symbolic.png new file mode 120000 index 000000000..6a9e23c0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired-symbolic.png @@ -0,0 +1 @@ +nm-device-wired.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless-symbolic.png new file mode 120000 index 000000000..e650e72e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless-symbolic.png @@ -0,0 +1 @@ +nm-device-wireless.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors-symbolic.png new file mode 120000 index 000000000..809305555 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors-symbolic.png @@ -0,0 +1 @@ +package_editors.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings-symbolic.png new file mode 120000 index 000000000..f7f21ce34 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings-symbolic.png @@ -0,0 +1 @@ +package_settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings.png new file mode 120000 index 000000000..1d8138d22 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings.png @@ -0,0 +1 @@ +preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause-symbolic.png new file mode 120000 index 000000000..f6af01a48 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause-symbolic.png @@ -0,0 +1 @@ +player_pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause.png new file mode 120000 index 000000000..0ef65d6d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record-symbolic.png new file mode 120000 index 000000000..5607649cd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record-symbolic.png @@ -0,0 +1 @@ +player_record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record.png new file mode 120000 index 000000000..91f5c6f4d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record.png @@ -0,0 +1 @@ +media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop-symbolic.png new file mode 120000 index 000000000..13f0c5aad --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop-symbolic.png @@ -0,0 +1 @@ +player_stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop.png new file mode 120000 index 000000000..423c7cf20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop.png @@ -0,0 +1 @@ +media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system-symbolic.png new file mode 120000 index 000000000..1d8138d22 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system-symbolic.png @@ -0,0 +1 @@ +preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system.png new file mode 120000 index 000000000..5acf3b2f2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system.png @@ -0,0 +1 @@ +gtk-preferences.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error-symbolic.png new file mode 120000 index 000000000..cffd04483 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error-symbolic.png @@ -0,0 +1 @@ +printer-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error.png new file mode 100644 index 000000000..934ee68d3 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info-symbolic.png new file mode 120000 index 000000000..aaa23147e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info-symbolic.png @@ -0,0 +1 @@ +printer-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info.png new file mode 100644 index 000000000..8e2ab7487 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused-symbolic.png new file mode 120000 index 000000000..ba165131c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused-symbolic.png @@ -0,0 +1 @@ +printer-paused.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused.png new file mode 100644 index 000000000..ebd5ac60c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning-symbolic.png new file mode 120000 index 000000000..6575a3557 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning-symbolic.png @@ -0,0 +1 @@ +printer-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning.png new file mode 100644 index 000000000..52410c38d Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop-symbolic.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop-symbolic.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop.png new file mode 100644 index 000000000..d88fed703 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home-symbolic.png new file mode 120000 index 000000000..9d96edc09 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home-symbolic.png @@ -0,0 +1 @@ +redhat-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings-symbolic.png new file mode 120000 index 000000000..99d35dedc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings-symbolic.png @@ -0,0 +1 @@ +redhat-system_settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings.png new file mode 120000 index 000000000..1d8138d22 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings.png @@ -0,0 +1 @@ +preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo-symbolic.png new file mode 120000 index 000000000..4d893d44a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo-symbolic.png @@ -0,0 +1 @@ +redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo.png new file mode 120000 index 000000000..0061b57c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo.png @@ -0,0 +1 @@ +edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload-symbolic.png new file mode 120000 index 000000000..b51c479ad --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload-symbolic.png @@ -0,0 +1 @@ +reload.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3-symbolic.png new file mode 120000 index 000000000..160584a15 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3-symbolic.png @@ -0,0 +1 @@ +reload3.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs-symbolic.png new file mode 120000 index 000000000..4edfb5a4c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs-symbolic.png @@ -0,0 +1 @@ +reload_all_tabs.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page-symbolic.png new file mode 120000 index 000000000..e8fdb1ec3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page-symbolic.png @@ -0,0 +1 @@ +reload_page.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove-symbolic.png new file mode 120000 index 000000000..584599bf0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove-symbolic.png @@ -0,0 +1 @@ +remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove.png new file mode 120000 index 000000000..1336403b3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove.png @@ -0,0 +1 @@ +list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert-symbolic.png new file mode 120000 index 000000000..00f6de08c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert-symbolic.png @@ -0,0 +1 @@ +revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert.png new file mode 120000 index 000000000..35c2c00a5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert.png @@ -0,0 +1 @@ +document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust-symbolic.png new file mode 120000 index 000000000..4827d0f19 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust-symbolic.png @@ -0,0 +1 @@ +rightjust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust.png new file mode 120000 index 000000000..017868ada --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust.png @@ -0,0 +1 @@ +format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about-symbolic.png new file mode 120000 index 000000000..47f3160cc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about-symbolic.png @@ -0,0 +1 @@ +stock_about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about.png new file mode 120000 index 000000000..dd431b5e8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about.png @@ -0,0 +1 @@ +help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom-symbolic.png new file mode 120000 index 000000000..7738c9958 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom-symbolic.png @@ -0,0 +1 @@ +stock_bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom.png new file mode 120000 index 000000000..c58ca3d0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom.png @@ -0,0 +1 @@ +go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close-symbolic.png new file mode 120000 index 000000000..462194393 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close-symbolic.png @@ -0,0 +1 @@ +stock_close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy-symbolic.png new file mode 120000 index 000000000..d4fe9b004 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy-symbolic.png @@ -0,0 +1 @@ +stock_copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy.png new file mode 120000 index 000000000..e106cb543 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy.png @@ -0,0 +1 @@ +edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut-symbolic.png new file mode 120000 index 000000000..6f34159d0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut-symbolic.png @@ -0,0 +1 @@ +stock_cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut.png new file mode 120000 index 000000000..32b03023c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut.png @@ -0,0 +1 @@ +edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete-symbolic.png new file mode 120000 index 000000000..54b0ede76 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete-symbolic.png @@ -0,0 +1 @@ +stock_delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete.png new file mode 120000 index 000000000..bb0a74a58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info-symbolic.png new file mode 120000 index 000000000..5b4fe4bc6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info-symbolic.png @@ -0,0 +1 @@ +stock_dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down-symbolic.png new file mode 120000 index 000000000..56d981416 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down-symbolic.png @@ -0,0 +1 @@ +stock_down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down.png new file mode 120000 index 000000000..5240b846d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down.png @@ -0,0 +1 @@ +go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites-symbolic.png new file mode 120000 index 000000000..2c81081ca --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites-symbolic.png @@ -0,0 +1 @@ +stock_file-properites.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites.png new file mode 120000 index 000000000..b447aa240 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites.png @@ -0,0 +1 @@ +document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder-symbolic.png new file mode 120000 index 000000000..5376f31f6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder-symbolic.png @@ -0,0 +1 @@ +stock_folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen-symbolic.png new file mode 120000 index 000000000..31893cedd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen-symbolic.png @@ -0,0 +1 @@ +stock_fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen.png new file mode 120000 index 000000000..37aaf877e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen.png @@ -0,0 +1 @@ +view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help-symbolic.png new file mode 120000 index 000000000..f4d63feef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help-symbolic.png @@ -0,0 +1 @@ +stock_help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help.png new file mode 120000 index 000000000..af8d871de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help.png @@ -0,0 +1 @@ +help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home-symbolic.png new file mode 120000 index 000000000..faf057c43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home-symbolic.png @@ -0,0 +1 @@ +stock_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen-symbolic.png new file mode 120000 index 000000000..00f3f4f77 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen-symbolic.png @@ -0,0 +1 @@ +stock_leave-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen.png new file mode 120000 index 000000000..5b9d8f68b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen.png @@ -0,0 +1 @@ +view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause-symbolic.png new file mode 120000 index 000000000..fcf5ee6aa --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause-symbolic.png @@ -0,0 +1 @@ +stock_media-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause.png new file mode 120000 index 000000000..0ef65d6d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec-symbolic.png new file mode 120000 index 000000000..3703897de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec-symbolic.png @@ -0,0 +1 @@ +stock_media-rec.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec.png new file mode 120000 index 000000000..91f5c6f4d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec.png @@ -0,0 +1 @@ +media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop-symbolic.png new file mode 120000 index 000000000..d3284d99b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop-symbolic.png @@ -0,0 +1 @@ +stock_media-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop.png new file mode 120000 index 000000000..423c7cf20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop.png @@ -0,0 +1 @@ +media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text-symbolic.png new file mode 120000 index 000000000..df5c64b6e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text-symbolic.png @@ -0,0 +1 @@ +stock_new-text.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text.png new file mode 120000 index 000000000..446977ddc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text.png @@ -0,0 +1 @@ +document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste-symbolic.png new file mode 120000 index 000000000..d031aef3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste-symbolic.png @@ -0,0 +1 @@ +stock_paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste.png new file mode 120000 index 000000000..2f55649f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste.png @@ -0,0 +1 @@ +edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview-symbolic.png new file mode 120000 index 000000000..cb72d5f96 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview-symbolic.png @@ -0,0 +1 @@ +stock_print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview.png new file mode 120000 index 000000000..9dfea717c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview.png @@ -0,0 +1 @@ +document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-symbolic.png new file mode 120000 index 000000000..5ea564c1c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-symbolic.png @@ -0,0 +1 @@ +stock_print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print.png new file mode 120000 index 000000000..863a49fc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print.png @@ -0,0 +1 @@ +document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties-symbolic.png new file mode 120000 index 000000000..cead9f906 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties-symbolic.png @@ -0,0 +1 @@ +stock_properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties.png new file mode 120000 index 000000000..b447aa240 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties.png @@ -0,0 +1 @@ +document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo-symbolic.png new file mode 120000 index 000000000..3abd89311 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo-symbolic.png @@ -0,0 +1 @@ +stock_redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo.png new file mode 120000 index 000000000..0061b57c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo.png @@ -0,0 +1 @@ +edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh-symbolic.png new file mode 120000 index 000000000..e617eefc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh-symbolic.png @@ -0,0 +1 @@ +stock_refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as-symbolic.png new file mode 120000 index 000000000..dfda8bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as-symbolic.png @@ -0,0 +1 @@ +stock_save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as.png new file mode 120000 index 000000000..6f8088857 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as.png @@ -0,0 +1 @@ +document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-symbolic.png new file mode 120000 index 000000000..08802a248 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-symbolic.png @@ -0,0 +1 @@ +stock_save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save.png new file mode 120000 index 000000000..b1240e18d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace-symbolic.png new file mode 120000 index 000000000..539fd27e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace-symbolic.png @@ -0,0 +1 @@ +stock_search-and-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace.png new file mode 120000 index 000000000..e4057afed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace.png @@ -0,0 +1 @@ +edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-symbolic.png new file mode 120000 index 000000000..34bffb533 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-symbolic.png @@ -0,0 +1 @@ +stock_search.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all-symbolic.png new file mode 120000 index 000000000..49d937f83 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all-symbolic.png @@ -0,0 +1 @@ +stock_select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all.png new file mode 120000 index 000000000..30033c765 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all.png @@ -0,0 +1 @@ +edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck-symbolic.png new file mode 120000 index 000000000..afb170689 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck-symbolic.png @@ -0,0 +1 @@ +stock_spellcheck.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck.png new file mode 120000 index 000000000..23b82da94 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck.png @@ -0,0 +1 @@ +tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop-symbolic.png new file mode 120000 index 000000000..e6673c5a3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop-symbolic.png @@ -0,0 +1 @@ +stock_stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough-symbolic.png new file mode 120000 index 000000000..0d1cedb91 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough-symbolic.png @@ -0,0 +1 @@ +stock_text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough.png new file mode 120000 index 000000000..9ff9a3776 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough.png @@ -0,0 +1 @@ +format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold-symbolic.png new file mode 120000 index 000000000..b34d8bcde --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold-symbolic.png @@ -0,0 +1 @@ +stock_text_bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold.png new file mode 120000 index 000000000..ef50053bd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold.png @@ -0,0 +1 @@ +format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center-symbolic.png new file mode 120000 index 000000000..39bd0f289 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center-symbolic.png @@ -0,0 +1 @@ +stock_text_center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center.png new file mode 120000 index 000000000..980c099ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center.png @@ -0,0 +1 @@ +format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic-symbolic.png new file mode 120000 index 000000000..eb525bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic-symbolic.png @@ -0,0 +1 @@ +stock_text_italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic.png new file mode 120000 index 000000000..1ee2a31f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic.png @@ -0,0 +1 @@ +format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify-symbolic.png new file mode 120000 index 000000000..2db29cb19 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify-symbolic.png @@ -0,0 +1 @@ +stock_text_justify.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify.png new file mode 120000 index 000000000..f1d9574cf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify.png @@ -0,0 +1 @@ +format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left-symbolic.png new file mode 120000 index 000000000..314710b94 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left-symbolic.png @@ -0,0 +1 @@ +stock_text_left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left.png new file mode 120000 index 000000000..2da25a167 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left.png @@ -0,0 +1 @@ +format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right-symbolic.png new file mode 120000 index 000000000..997c4e491 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right-symbolic.png @@ -0,0 +1 @@ +stock_text_right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right.png new file mode 120000 index 000000000..017868ada --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right.png @@ -0,0 +1 @@ +format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined-symbolic.png new file mode 120000 index 000000000..f57dd0345 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined-symbolic.png @@ -0,0 +1 @@ +stock_text_underlined.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined.png new file mode 120000 index 000000000..4f5b1549c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined.png @@ -0,0 +1 @@ +format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top-symbolic.png new file mode 120000 index 000000000..142c86cb8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top-symbolic.png @@ -0,0 +1 @@ +stock_top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top.png new file mode 120000 index 000000000..3b5b7d6e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top.png @@ -0,0 +1 @@ +go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo-symbolic.png new file mode 120000 index 000000000..94134ab91 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo-symbolic.png @@ -0,0 +1 @@ +stock_undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo.png new file mode 120000 index 000000000..62d2a953e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo.png @@ -0,0 +1 @@ +edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up-symbolic.png new file mode 120000 index 000000000..85fa025ce --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up-symbolic.png @@ -0,0 +1 @@ +stock_up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up.png new file mode 120000 index 000000000..4a1025d4a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up.png @@ -0,0 +1 @@ +go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1-symbolic.png new file mode 120000 index 000000000..15aa66135 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1-symbolic.png @@ -0,0 +1 @@ +stock_zoom-1.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1.png new file mode 120000 index 000000000..bfeb09ed1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1.png @@ -0,0 +1 @@ +zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in-symbolic.png new file mode 120000 index 000000000..e2bc92819 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in-symbolic.png @@ -0,0 +1 @@ +stock_zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in.png new file mode 120000 index 000000000..ee0a4b39d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in.png @@ -0,0 +1 @@ +zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out-symbolic.png new file mode 120000 index 000000000..3c633a495 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out-symbolic.png @@ -0,0 +1 @@ +stock_zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out.png new file mode 120000 index 000000000..be243b08a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out.png @@ -0,0 +1 @@ +zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page-symbolic.png new file mode 120000 index 000000000..3c75afc9e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page-symbolic.png @@ -0,0 +1 @@ +stock_zoom-page.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop-symbolic.png new file mode 120000 index 000000000..6222e6f71 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop-symbolic.png @@ -0,0 +1 @@ +stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy-symbolic.png new file mode 120000 index 000000000..1b471b958 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy-symbolic.png @@ -0,0 +1 @@ +system-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run-symbolic.png new file mode 120000 index 000000000..9daf3feba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run-symbolic.png @@ -0,0 +1 @@ +system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run.png new file mode 100644 index 000000000..c9c48d6a3 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic-symbolic.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic-symbolic.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic.png new file mode 100644 index 000000000..7cd94435a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold-symbolic.png new file mode 120000 index 000000000..7297aca53 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold-symbolic.png @@ -0,0 +1 @@ +text_bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold.png new file mode 120000 index 000000000..ef50053bd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold.png @@ -0,0 +1 @@ +format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic-symbolic.png new file mode 120000 index 000000000..567390a7e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic-symbolic.png @@ -0,0 +1 @@ +text_italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic.png new file mode 120000 index 000000000..1ee2a31f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic.png @@ -0,0 +1 @@ +format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike-symbolic.png new file mode 120000 index 000000000..67e697102 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike-symbolic.png @@ -0,0 +1 @@ +text_strike.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike.png new file mode 120000 index 000000000..9ff9a3776 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike.png @@ -0,0 +1 @@ +format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under-symbolic.png new file mode 120000 index 000000000..0032f1112 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under-symbolic.png @@ -0,0 +1 @@ +text_under.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under.png new file mode 120000 index 000000000..4f5b1549c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under.png @@ -0,0 +1 @@ +format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling-symbolic.png new file mode 120000 index 000000000..23b82da94 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling-symbolic.png @@ -0,0 +1 @@ +tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling.png new file mode 100644 index 000000000..32dcc2e63 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top-symbolic.png new file mode 120000 index 000000000..315e75e61 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top-symbolic.png @@ -0,0 +1 @@ +top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top.png new file mode 120000 index 000000000..3b5b7d6e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top.png @@ -0,0 +1 @@ +go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt-symbolic.png new file mode 120000 index 000000000..8ac1daefb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt-symbolic.png @@ -0,0 +1 @@ +txt.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2-symbolic.png new file mode 120000 index 000000000..387710868 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2-symbolic.png @@ -0,0 +1 @@ +txt2.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo-symbolic.png new file mode 120000 index 000000000..28c818a0e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo-symbolic.png @@ -0,0 +1 @@ +undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo.png new file mode 120000 index 000000000..62d2a953e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo.png @@ -0,0 +1 @@ +edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown-symbolic.png new file mode 120000 index 000000000..b1754e727 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown-symbolic.png @@ -0,0 +1 @@ +unknown.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up-symbolic.png new file mode 120000 index 000000000..3a33d8bde --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up-symbolic.png @@ -0,0 +1 @@ +up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up.png new file mode 120000 index 000000000..4a1025d4a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up.png @@ -0,0 +1 @@ +go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop-symbolic.png new file mode 120000 index 000000000..200ab00ab --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop-symbolic.png @@ -0,0 +1 @@ +user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop.png new file mode 100644 index 000000000..14ed14a12 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home-symbolic.png new file mode 120000 index 000000000..8c668dc1c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home-symbolic.png @@ -0,0 +1 @@ +user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home.png new file mode 100644 index 000000000..14ed14a12 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen-symbolic.png new file mode 120000 index 000000000..37aaf877e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen-symbolic.png @@ -0,0 +1 @@ +view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen.png new file mode 100644 index 000000000..b9e9ea632 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh-symbolic.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh-symbolic.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh.png new file mode 100644 index 000000000..e9ea8c4e5 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore-symbolic.png new file mode 120000 index 000000000..5b9d8f68b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore-symbolic.png @@ -0,0 +1 @@ +view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore.png new file mode 100644 index 000000000..49966a996 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending-symbolic.png new file mode 120000 index 000000000..28dd3cde5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending-symbolic.png @@ -0,0 +1 @@ +view-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending.png new file mode 100644 index 000000000..3f8fd257f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending-symbolic.png new file mode 120000 index 000000000..578592d3b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending-symbolic.png @@ -0,0 +1 @@ +view-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending.png new file mode 100644 index 000000000..a8aa70584 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+-symbolic.png new file mode 120000 index 000000000..920bdf9e9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+-symbolic.png @@ -0,0 +1 @@ +viewmag+.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+.png new file mode 120000 index 000000000..ee0a4b39d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+.png @@ -0,0 +1 @@ +zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag--symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag--symbolic.png new file mode 120000 index 000000000..604b33d4b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag--symbolic.png @@ -0,0 +1 @@ +viewmag-.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag-.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag-.png new file mode 120000 index 000000000..be243b08a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag-.png @@ -0,0 +1 @@ +zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1-symbolic.png new file mode 120000 index 000000000..14537edeb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1-symbolic.png @@ -0,0 +1 @@ +viewmag1.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1.png new file mode 120000 index 000000000..bfeb09ed1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1.png @@ -0,0 +1 @@ +zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit-symbolic.png new file mode 120000 index 000000000..4530444b9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit-symbolic.png @@ -0,0 +1 @@ +viewmagfit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close-symbolic.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close-symbolic.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close.png new file mode 100644 index 000000000..52f58630f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen-symbolic.png new file mode 120000 index 000000000..5e184b6c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen-symbolic.png @@ -0,0 +1 @@ +window_fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen.png new file mode 120000 index 000000000..37aaf877e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen.png @@ -0,0 +1 @@ +view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen-symbolic.png new file mode 120000 index 000000000..07b973d67 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen-symbolic.png @@ -0,0 +1 @@ +window_nofullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen.png new file mode 120000 index 000000000..5b9d8f68b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen.png @@ -0,0 +1 @@ +view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit-symbolic.png new file mode 120000 index 000000000..214adf7fb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit-symbolic.png @@ -0,0 +1 @@ +xfce-system-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit.png new file mode 120000 index 000000000..0ecb0b9ba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit.png @@ -0,0 +1 @@ +application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings-symbolic.png new file mode 120000 index 000000000..28a6ef505 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings-symbolic.png @@ -0,0 +1 @@ +xfce-system-settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings.png new file mode 120000 index 000000000..1d8138d22 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings.png @@ -0,0 +1 @@ +preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD-symbolic.png new file mode 120000 index 000000000..5de487b88 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD-symbolic.png @@ -0,0 +1 @@ +yast_HD.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude-symbolic.png new file mode 120000 index 000000000..a2fdbdd54 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude-symbolic.png @@ -0,0 +1 @@ +yast_idetude.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit-symbolic.png new file mode 120000 index 000000000..181b01518 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit-symbolic.png @@ -0,0 +1 @@ +zoom-best-fit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best-symbolic.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best-symbolic.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best.png new file mode 100644 index 000000000..adbf7f3a2 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in-symbolic.png new file mode 120000 index 000000000..ee0a4b39d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in-symbolic.png @@ -0,0 +1 @@ +zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in.png new file mode 100644 index 000000000..6b1b94336 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original-symbolic.png new file mode 120000 index 000000000..bfeb09ed1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original-symbolic.png @@ -0,0 +1 @@ +zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original.png new file mode 100644 index 000000000..92dddd2ea Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out-symbolic.png new file mode 120000 index 000000000..be243b08a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out-symbolic.png @@ -0,0 +1 @@ +zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out.png new file mode 100644 index 000000000..ddc1eb136 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply-symbolic.png new file mode 120000 index 000000000..aa966d9c4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply-symbolic.png @@ -0,0 +1 @@ +gtk-apply.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply.png new file mode 100644 index 000000000..afca0732a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel-symbolic.png new file mode 120000 index 000000000..e726007ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel-symbolic.png @@ -0,0 +1 @@ +gtk-cancel.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel.png new file mode 100644 index 000000000..0a395c099 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close-symbolic.png new file mode 120000 index 000000000..a3ced3a8e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close-symbolic.png @@ -0,0 +1 @@ +gtk-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no-symbolic.png new file mode 120000 index 000000000..4cfdaae9e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no-symbolic.png @@ -0,0 +1 @@ +gtk-no.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no.png new file mode 100644 index 000000000..2a7da6e2a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok-symbolic.png new file mode 120000 index 000000000..048d27332 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok-symbolic.png @@ -0,0 +1 @@ +gtk-ok.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok.png new file mode 100644 index 000000000..c08115f62 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes-symbolic.png new file mode 120000 index 000000000..bb3ef9b17 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes-symbolic.png @@ -0,0 +1 @@ +gtk-yes.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes.png new file mode 100644 index 000000000..e56236638 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close-symbolic.png new file mode 120000 index 000000000..462194393 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close-symbolic.png @@ -0,0 +1 @@ +stock_close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close-symbolic.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close-symbolic.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close.png new file mode 100644 index 000000000..a13d1984b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount-symbolic.png new file mode 120000 index 000000000..198cfb326 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount-symbolic.png @@ -0,0 +1 @@ +3floppy_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add-symbolic.png new file mode 120000 index 000000000..f26caeafb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add-symbolic.png @@ -0,0 +1 @@ +add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add.png new file mode 120000 index 000000000..7d4c8781d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add.png @@ -0,0 +1 @@ +list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit-symbolic.png new file mode 120000 index 000000000..0ecb0b9ba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit-symbolic.png @@ -0,0 +1 @@ +application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit.png new file mode 100644 index 000000000..0c9de64ba Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii-symbolic.png new file mode 120000 index 000000000..306ee6a20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii-symbolic.png @@ -0,0 +1 @@ +ascii.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high-symbolic.png new file mode 120000 index 000000000..3dc4302d0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high-symbolic.png @@ -0,0 +1 @@ +audio-volume-high.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high.png new file mode 100644 index 000000000..7de1e0e4f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low-symbolic.png new file mode 120000 index 000000000..dd3d1eea4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low-symbolic.png @@ -0,0 +1 @@ +audio-volume-low.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low.png new file mode 100644 index 000000000..4152b6c9f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium-symbolic.png new file mode 120000 index 000000000..3e599b49d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium-symbolic.png @@ -0,0 +1 @@ +audio-volume-medium.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium.png new file mode 100644 index 000000000..8d899cfa5 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted-symbolic.png new file mode 120000 index 000000000..8aeeb8edd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted-symbolic.png @@ -0,0 +1 @@ +audio-volume-muted.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted.png new file mode 100644 index 000000000..6902efdc6 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom-symbolic.png new file mode 120000 index 000000000..faf41843c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom-symbolic.png @@ -0,0 +1 @@ +bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom.png new file mode 120000 index 000000000..c58ca3d0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom.png @@ -0,0 +1 @@ +go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount-symbolic.png new file mode 120000 index 000000000..675a3d8d5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount-symbolic.png @@ -0,0 +1 @@ +cdrom_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount-symbolic.png new file mode 120000 index 000000000..69e9cb48e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount-symbolic.png @@ -0,0 +1 @@ +cdwriter_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust-symbolic.png new file mode 120000 index 000000000..337ad727a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust-symbolic.png @@ -0,0 +1 @@ +centrejust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust.png new file mode 120000 index 000000000..980c099ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust.png @@ -0,0 +1 @@ +format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established-symbolic.png new file mode 120000 index 000000000..5beb19d41 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established-symbolic.png @@ -0,0 +1 @@ +connect_established.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop-symbolic.png new file mode 120000 index 000000000..3c4032691 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop-symbolic.png @@ -0,0 +1 @@ +desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop.png new file mode 120000 index 000000000..200ab00ab --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop.png @@ -0,0 +1 @@ +user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information-symbolic.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information-symbolic.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information.png new file mode 100644 index 000000000..b66871a94 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new-symbolic.png new file mode 120000 index 000000000..446977ddc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new-symbolic.png @@ -0,0 +1 @@ +document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new.png new file mode 100644 index 000000000..c89e797b7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent-symbolic.png new file mode 120000 index 000000000..f10003637 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent-symbolic.png @@ -0,0 +1 @@ +document-open-recent.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent.png new file mode 100644 index 000000000..5edf531e3 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-symbolic.png new file mode 120000 index 000000000..f58170cc1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-symbolic.png @@ -0,0 +1 @@ +document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open.png new file mode 100644 index 000000000..312e1187f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview-symbolic.png new file mode 120000 index 000000000..9dfea717c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview-symbolic.png @@ -0,0 +1 @@ +document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview.png new file mode 100644 index 000000000..7f405de58 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-symbolic.png new file mode 120000 index 000000000..863a49fc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-symbolic.png @@ -0,0 +1 @@ +document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print.png new file mode 100644 index 000000000..05d22d7a8 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties-symbolic.png new file mode 120000 index 000000000..b447aa240 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties-symbolic.png @@ -0,0 +1 @@ +document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties.png new file mode 100644 index 000000000..297c86b0c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr-symbolic.png new file mode 120000 index 000000000..ac1bd52d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr-symbolic.png @@ -0,0 +1 @@ +document-revert-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr.png new file mode 100644 index 000000000..3046794e7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl-symbolic.png new file mode 120000 index 000000000..f56254a08 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl-symbolic.png @@ -0,0 +1 @@ +document-revert-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl.png new file mode 100644 index 000000000..46435e1a0 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-symbolic.png new file mode 120000 index 000000000..35c2c00a5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-symbolic.png @@ -0,0 +1 @@ +document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert.png new file mode 120000 index 000000000..ac1bd52d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert.png @@ -0,0 +1 @@ +document-revert-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as-symbolic.png new file mode 120000 index 000000000..6f8088857 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as-symbolic.png @@ -0,0 +1 @@ +document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as.png new file mode 100644 index 000000000..5da8a02dc Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-symbolic.png new file mode 120000 index 000000000..b1240e18d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-symbolic.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save.png new file mode 100644 index 000000000..7ef7685f4 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down-symbolic.png new file mode 120000 index 000000000..0bef6f6e8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down-symbolic.png @@ -0,0 +1 @@ +down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down.png new file mode 120000 index 000000000..5240b846d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down.png @@ -0,0 +1 @@ +go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk-symbolic.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk-symbolic.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk.png new file mode 100644 index 000000000..1be6b6c88 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount-symbolic.png new file mode 120000 index 000000000..041480d09 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount-symbolic.png @@ -0,0 +1 @@ +dvd_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear-symbolic.png new file mode 120000 index 000000000..f230219f3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear-symbolic.png @@ -0,0 +1 @@ +edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear.png new file mode 100644 index 000000000..590f673db Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy-symbolic.png new file mode 120000 index 000000000..e106cb543 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy-symbolic.png @@ -0,0 +1 @@ +edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy.png new file mode 100644 index 000000000..a1178e64f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut-symbolic.png new file mode 120000 index 000000000..32b03023c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut-symbolic.png @@ -0,0 +1 @@ +edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut.png new file mode 100644 index 000000000..82b105f80 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete-symbolic.png new file mode 120000 index 000000000..bb0a74a58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete-symbolic.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete.png new file mode 100644 index 000000000..e375b894e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace-symbolic.png new file mode 120000 index 000000000..e4057afed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace-symbolic.png @@ -0,0 +1 @@ +edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace.png new file mode 100644 index 000000000..ed81e5a82 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-symbolic.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-symbolic.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find.png new file mode 100644 index 000000000..5c83fb689 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste-symbolic.png new file mode 120000 index 000000000..2f55649f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste-symbolic.png @@ -0,0 +1 @@ +edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste.png new file mode 100644 index 000000000..e938c3e99 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr-symbolic.png new file mode 120000 index 000000000..687ee4f05 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr-symbolic.png @@ -0,0 +1 @@ +edit-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr.png new file mode 100644 index 000000000..3da43f0c0 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl-symbolic.png new file mode 120000 index 000000000..0f38059a6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl-symbolic.png @@ -0,0 +1 @@ +edit-redo-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl.png new file mode 100644 index 000000000..f2c1a50a1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-symbolic.png new file mode 120000 index 000000000..0061b57c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-symbolic.png @@ -0,0 +1 @@ +edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo.png new file mode 120000 index 000000000..687ee4f05 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo.png @@ -0,0 +1 @@ +edit-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all-symbolic.png new file mode 120000 index 000000000..30033c765 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all-symbolic.png @@ -0,0 +1 @@ +edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all.png new file mode 100644 index 000000000..1fc5b8282 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr-symbolic.png new file mode 120000 index 000000000..3043c4fa7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr-symbolic.png @@ -0,0 +1 @@ +edit-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr.png new file mode 100644 index 000000000..3b12a233a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl-symbolic.png new file mode 120000 index 000000000..4020ce799 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl-symbolic.png @@ -0,0 +1 @@ +edit-undo-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl.png new file mode 100644 index 000000000..3ba7d6240 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-symbolic.png new file mode 120000 index 000000000..62d2a953e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-symbolic.png @@ -0,0 +1 @@ +edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo.png new file mode 120000 index 000000000..3043c4fa7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo.png @@ -0,0 +1 @@ +edit-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear-symbolic.png new file mode 120000 index 000000000..29ba74e20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear-symbolic.png @@ -0,0 +1 @@ +editclear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear.png new file mode 120000 index 000000000..f230219f3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear.png @@ -0,0 +1 @@ +edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy-symbolic.png new file mode 120000 index 000000000..6a91dbe20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy-symbolic.png @@ -0,0 +1 @@ +editcopy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy.png new file mode 120000 index 000000000..e106cb543 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy.png @@ -0,0 +1 @@ +edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut-symbolic.png new file mode 120000 index 000000000..778447500 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut-symbolic.png @@ -0,0 +1 @@ +editcut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut.png new file mode 120000 index 000000000..32b03023c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut.png @@ -0,0 +1 @@ +edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete-symbolic.png new file mode 120000 index 000000000..a94cb85d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete-symbolic.png @@ -0,0 +1 @@ +editdelete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete.png new file mode 120000 index 000000000..bb0a74a58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste-symbolic.png new file mode 120000 index 000000000..3c44aa574 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste-symbolic.png @@ -0,0 +1 @@ +editpaste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste.png new file mode 120000 index 000000000..2f55649f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste.png @@ -0,0 +1 @@ +edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty-symbolic.png new file mode 120000 index 000000000..1350bab17 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty-symbolic.png @@ -0,0 +1 @@ +empty.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit-symbolic.png new file mode 120000 index 000000000..4eb2fd526 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit-symbolic.png @@ -0,0 +1 @@ +exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit.png new file mode 120000 index 000000000..0ecb0b9ba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit.png @@ -0,0 +1 @@ +application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind-symbolic.png new file mode 120000 index 000000000..af3ede396 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind-symbolic.png @@ -0,0 +1 @@ +filefind.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew-symbolic.png new file mode 120000 index 000000000..c52f9eaf8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew-symbolic.png @@ -0,0 +1 @@ +filenew.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew.png new file mode 120000 index 000000000..446977ddc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew.png @@ -0,0 +1 @@ +document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen-symbolic.png new file mode 120000 index 000000000..99c3ecd92 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen-symbolic.png @@ -0,0 +1 @@ +fileopen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen.png new file mode 120000 index 000000000..f58170cc1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen.png @@ -0,0 +1 @@ +document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint-symbolic.png new file mode 120000 index 000000000..b7c96eb8a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint-symbolic.png @@ -0,0 +1 @@ +fileprint.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint.png new file mode 120000 index 000000000..863a49fc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint.png @@ -0,0 +1 @@ +document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint-symbolic.png new file mode 120000 index 000000000..03fba13fe --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint-symbolic.png @@ -0,0 +1 @@ +filequickprint.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint.png new file mode 120000 index 000000000..9dfea717c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint.png @@ -0,0 +1 @@ +document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave-symbolic.png new file mode 120000 index 000000000..287a9600a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave-symbolic.png @@ -0,0 +1 @@ +filesave.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave.png new file mode 120000 index 000000000..b1240e18d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas-symbolic.png new file mode 120000 index 000000000..805ae83a2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas-symbolic.png @@ -0,0 +1 @@ +filesaveas.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas.png new file mode 120000 index 000000000..6f8088857 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas.png @@ -0,0 +1 @@ +document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find-symbolic.png new file mode 120000 index 000000000..2e3266774 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find-symbolic.png @@ -0,0 +1 @@ +find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote-symbolic.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote-symbolic.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote.png new file mode 100644 index 000000000..28b68f338 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-symbolic.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-symbolic.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder.png new file mode 100644 index 000000000..28b68f338 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home-symbolic.png new file mode 120000 index 000000000..137e7d5ed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home-symbolic.png @@ -0,0 +1 @@ +folder_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home.png new file mode 120000 index 000000000..8c668dc1c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home.png @@ -0,0 +1 @@ +user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr-symbolic.png new file mode 120000 index 000000000..a33b3ffac --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr-symbolic.png @@ -0,0 +1 @@ +format-indent-less-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr.png new file mode 100644 index 000000000..36d231434 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl-symbolic.png new file mode 120000 index 000000000..d5c1b473d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl-symbolic.png @@ -0,0 +1 @@ +format-indent-less-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl.png new file mode 100644 index 000000000..a6f7dc19b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr-symbolic.png new file mode 120000 index 000000000..5c9aeec8b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr-symbolic.png @@ -0,0 +1 @@ +format-indent-more-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr.png new file mode 100644 index 000000000..7e3656dc4 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl-symbolic.png new file mode 120000 index 000000000..e0ee3f7d7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl-symbolic.png @@ -0,0 +1 @@ +format-indent-more-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl.png new file mode 100644 index 000000000..5527663fd Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center-symbolic.png new file mode 120000 index 000000000..980c099ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center-symbolic.png @@ -0,0 +1 @@ +format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center.png new file mode 100644 index 000000000..35579d553 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill-symbolic.png new file mode 120000 index 000000000..f1d9574cf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill-symbolic.png @@ -0,0 +1 @@ +format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill.png new file mode 100644 index 000000000..eaf9a460b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left-symbolic.png new file mode 120000 index 000000000..2da25a167 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left-symbolic.png @@ -0,0 +1 @@ +format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left.png new file mode 100644 index 000000000..07db84109 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right-symbolic.png new file mode 120000 index 000000000..017868ada --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right-symbolic.png @@ -0,0 +1 @@ +format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right.png new file mode 100644 index 000000000..9bbd47ca0 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold-symbolic.png new file mode 120000 index 000000000..ef50053bd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold-symbolic.png @@ -0,0 +1 @@ +format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold.png new file mode 100644 index 000000000..9869fb8b1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic-symbolic.png new file mode 120000 index 000000000..1ee2a31f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic-symbolic.png @@ -0,0 +1 @@ +format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic.png new file mode 100644 index 000000000..8842b5aa7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough-symbolic.png new file mode 120000 index 000000000..9ff9a3776 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough-symbolic.png @@ -0,0 +1 @@ +format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough.png new file mode 100644 index 000000000..04d464e28 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline-symbolic.png new file mode 120000 index 000000000..4f5b1549c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline-symbolic.png @@ -0,0 +1 @@ +format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline.png new file mode 100644 index 000000000..be0906d8a Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio-symbolic.png new file mode 120000 index 000000000..cce40e357 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio-symbolic.png @@ -0,0 +1 @@ +gnome-dev-cdrom-audio.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr-symbolic.png new file mode 120000 index 000000000..fc19d096d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-cdr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw-symbolic.png new file mode 120000 index 000000000..3254f0b9a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-cdrw.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus-symbolic.png new file mode 120000 index 000000000..0babfc593 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdr-plus.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-symbolic.png new file mode 120000 index 000000000..e5acfa688 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram-symbolic.png new file mode 120000 index 000000000..3d65c827f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdram.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom-symbolic.png new file mode 120000 index 000000000..096e10ac3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw-symbolic.png new file mode 120000 index 000000000..6f333e959 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw-symbolic.png @@ -0,0 +1 @@ +gnome-dev-disc-dvdrw.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy-symbolic.png new file mode 120000 index 000000000..ca93a31ac --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy-symbolic.png @@ -0,0 +1 @@ +gnome-dev-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394-symbolic.png new file mode 120000 index 000000000..709dd9407 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394-symbolic.png @@ -0,0 +1 @@ +gnome-dev-harddisk-1394.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-symbolic.png new file mode 120000 index 000000000..15fcbea7a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-symbolic.png @@ -0,0 +1 @@ +gnome-dev-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb-symbolic.png new file mode 120000 index 000000000..00cd3cdf1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb-symbolic.png @@ -0,0 +1 @@ +gnome-dev-harddisk-usb.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop-symbolic.png new file mode 120000 index 000000000..1de17f537 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop-symbolic.png @@ -0,0 +1 @@ +gnome-fs-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop.png new file mode 120000 index 000000000..200ab00ab --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop.png @@ -0,0 +1 @@ +user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory-symbolic.png new file mode 120000 index 000000000..d9bddcf2b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory-symbolic.png @@ -0,0 +1 @@ +gnome-fs-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png new file mode 120000 index 000000000..a941c98ed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png @@ -0,0 +1 @@ +gnome-fs-ftp.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home-symbolic.png new file mode 120000 index 000000000..42a0ae6a3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home-symbolic.png @@ -0,0 +1 @@ +gnome-fs-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home.png new file mode 120000 index 000000000..8c668dc1c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home.png @@ -0,0 +1 @@ +user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png new file mode 120000 index 000000000..b433450d1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png @@ -0,0 +1 @@ +gnome-fs-nfs.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share-symbolic.png new file mode 120000 index 000000000..d9a60f49d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share-symbolic.png @@ -0,0 +1 @@ +gnome-fs-share.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb-symbolic.png new file mode 120000 index 000000000..4f3d4e258 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb-symbolic.png @@ -0,0 +1 @@ +gnome-fs-smb.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png new file mode 120000 index 000000000..51ce27214 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png @@ -0,0 +1 @@ +gnome-fs-ssh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text-symbolic.png new file mode 120000 index 000000000..2d6a92f63 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text-symbolic.png @@ -0,0 +1 @@ +gnome-mime-text.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share-symbolic.png new file mode 120000 index 000000000..146decd75 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share-symbolic.png @@ -0,0 +1 @@ +gnome-mime-x-directory-smb-share.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle-symbolic.png new file mode 120000 index 000000000..a24805021 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle-symbolic.png @@ -0,0 +1 @@ +gnome-netstatus-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run-symbolic.png new file mode 120000 index 000000000..729e469c4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run-symbolic.png @@ -0,0 +1 @@ +gnome-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run.png new file mode 120000 index 000000000..9daf3feba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run.png @@ -0,0 +1 @@ +system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom-symbolic.png new file mode 120000 index 000000000..c58ca3d0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom-symbolic.png @@ -0,0 +1 @@ +go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom.png new file mode 100644 index 000000000..79994416e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down-symbolic.png new file mode 120000 index 000000000..5240b846d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down-symbolic.png @@ -0,0 +1 @@ +go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down.png new file mode 100644 index 000000000..2a0a8ea2c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr-symbolic.png new file mode 120000 index 000000000..cd10b29f9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr-symbolic.png @@ -0,0 +1 @@ +go-first-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr.png new file mode 100644 index 000000000..e44f9b612 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl-symbolic.png new file mode 120000 index 000000000..c27895ff9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl-symbolic.png @@ -0,0 +1 @@ +go-first-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl.png new file mode 100644 index 000000000..3ba5c4ba7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home-symbolic.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home-symbolic.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home.png new file mode 100644 index 000000000..a2e0b3c96 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr-symbolic.png new file mode 120000 index 000000000..1e84cdb4b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr-symbolic.png @@ -0,0 +1 @@ +go-jump-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr.png new file mode 100644 index 000000000..9b639939f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl-symbolic.png new file mode 120000 index 000000000..da4dbb50a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl-symbolic.png @@ -0,0 +1 @@ +go-jump-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl.png new file mode 100644 index 000000000..80068face Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr-symbolic.png new file mode 120000 index 000000000..e9a0b1bfb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr-symbolic.png @@ -0,0 +1 @@ +go-last-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr.png new file mode 100644 index 000000000..3ba5c4ba7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl-symbolic.png new file mode 120000 index 000000000..d10cbddc0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl-symbolic.png @@ -0,0 +1 @@ +go-last-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl.png new file mode 100644 index 000000000..e44f9b612 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr-symbolic.png new file mode 120000 index 000000000..ba611e6ec --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr-symbolic.png @@ -0,0 +1 @@ +go-next-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr.png new file mode 100644 index 000000000..727ff37f2 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl-symbolic.png new file mode 120000 index 000000000..5d7e220ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl-symbolic.png @@ -0,0 +1 @@ +go-next-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl.png new file mode 100644 index 000000000..23b89b761 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr-symbolic.png new file mode 120000 index 000000000..e28ad36ea --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr-symbolic.png @@ -0,0 +1 @@ +go-previous-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr.png new file mode 100644 index 000000000..23b89b761 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl-symbolic.png new file mode 120000 index 000000000..4b0816229 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl-symbolic.png @@ -0,0 +1 @@ +go-previous-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl.png new file mode 100644 index 000000000..727ff37f2 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top-symbolic.png new file mode 120000 index 000000000..3b5b7d6e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top-symbolic.png @@ -0,0 +1 @@ +go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top.png new file mode 100644 index 000000000..9b98fd26f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up-symbolic.png new file mode 120000 index 000000000..4a1025d4a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up-symbolic.png @@ -0,0 +1 @@ +go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up.png new file mode 100644 index 000000000..3df5fe511 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome-symbolic.png new file mode 120000 index 000000000..f31e7772d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome-symbolic.png @@ -0,0 +1 @@ +gohome.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about-symbolic.png new file mode 120000 index 000000000..474a4323d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about-symbolic.png @@ -0,0 +1 @@ +gtk-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about.png new file mode 120000 index 000000000..dd431b5e8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about.png @@ -0,0 +1 @@ +help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add-symbolic.png new file mode 120000 index 000000000..4a50663ad --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add-symbolic.png @@ -0,0 +1 @@ +gtk-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add.png new file mode 120000 index 000000000..7d4c8781d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add.png @@ -0,0 +1 @@ +list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold-symbolic.png new file mode 120000 index 000000000..8053f9c7a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold-symbolic.png @@ -0,0 +1 @@ +gtk-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold.png new file mode 120000 index 000000000..ef50053bd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold.png @@ -0,0 +1 @@ +format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel-symbolic.png new file mode 120000 index 000000000..e726007ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel-symbolic.png @@ -0,0 +1 @@ +gtk-cancel.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning-symbolic.png new file mode 120000 index 000000000..ae89400c9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning-symbolic.png @@ -0,0 +1 @@ +gtk-caps-lock-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning.png new file mode 100644 index 000000000..ca76d509b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom-symbolic.png new file mode 120000 index 000000000..fcc64806d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom-symbolic.png @@ -0,0 +1 @@ +gtk-cdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear-symbolic.png new file mode 120000 index 000000000..f04e3f792 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear-symbolic.png @@ -0,0 +1 @@ +gtk-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear.png new file mode 120000 index 000000000..f230219f3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear.png @@ -0,0 +1 @@ +edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close-symbolic.png new file mode 120000 index 000000000..a3ced3a8e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close-symbolic.png @@ -0,0 +1 @@ +gtk-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker-symbolic.png new file mode 120000 index 000000000..cb3926ffb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker-symbolic.png @@ -0,0 +1 @@ +gtk-color-picker.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker.png new file mode 100644 index 000000000..fd97f343c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect-symbolic.png new file mode 120000 index 000000000..2fc301882 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect-symbolic.png @@ -0,0 +1 @@ +gtk-connect.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect.png new file mode 100644 index 000000000..97f2143fb Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert-symbolic.png new file mode 120000 index 000000000..7f053d572 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert-symbolic.png @@ -0,0 +1 @@ +gtk-convert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert.png new file mode 100644 index 000000000..da8194fa8 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy-symbolic.png new file mode 120000 index 000000000..674753224 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy-symbolic.png @@ -0,0 +1 @@ +gtk-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy.png new file mode 120000 index 000000000..e106cb543 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy.png @@ -0,0 +1 @@ +edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut-symbolic.png new file mode 120000 index 000000000..f55e67fcf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut-symbolic.png @@ -0,0 +1 @@ +gtk-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut.png new file mode 120000 index 000000000..32b03023c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut.png @@ -0,0 +1 @@ +edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete-symbolic.png new file mode 120000 index 000000000..cb17163af --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete-symbolic.png @@ -0,0 +1 @@ +gtk-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete.png new file mode 120000 index 000000000..bb0a74a58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info-symbolic.png new file mode 120000 index 000000000..70ccbc7aa --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info-symbolic.png @@ -0,0 +1 @@ +gtk-dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory-symbolic.png new file mode 120000 index 000000000..f5a4d8dad --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory-symbolic.png @@ -0,0 +1 @@ +gtk-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect-symbolic.png new file mode 120000 index 000000000..911f3c46b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect-symbolic.png @@ -0,0 +1 @@ +gtk-disconnect.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect.png new file mode 100644 index 000000000..883a003bc Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit-symbolic.png new file mode 120000 index 000000000..a09517d38 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit-symbolic.png @@ -0,0 +1 @@ +gtk-edit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit.png new file mode 100644 index 000000000..f429e1015 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute-symbolic.png new file mode 120000 index 000000000..d777d5f7a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute-symbolic.png @@ -0,0 +1 @@ +gtk-execute.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute.png new file mode 120000 index 000000000..9daf3feba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute.png @@ -0,0 +1 @@ +system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace-symbolic.png new file mode 120000 index 000000000..a03f9c58b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace-symbolic.png @@ -0,0 +1 @@ +gtk-find-and-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace.png new file mode 120000 index 000000000..e4057afed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace.png @@ -0,0 +1 @@ +edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-symbolic.png new file mode 120000 index 000000000..925deda81 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-symbolic.png @@ -0,0 +1 @@ +gtk-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy-symbolic.png new file mode 120000 index 000000000..eb899acc8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy-symbolic.png @@ -0,0 +1 @@ +gtk-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font-symbolic.png new file mode 120000 index 000000000..191b8aecf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font-symbolic.png @@ -0,0 +1 @@ +gtk-font.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font.png new file mode 100644 index 000000000..cde0e8698 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen-symbolic.png new file mode 120000 index 000000000..673d2e6b1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen-symbolic.png @@ -0,0 +1 @@ +gtk-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen.png new file mode 120000 index 000000000..37aaf877e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen.png @@ -0,0 +1 @@ +view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down-symbolic.png new file mode 120000 index 000000000..c0f84c886 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down-symbolic.png @@ -0,0 +1 @@ +gtk-go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down.png new file mode 120000 index 000000000..5240b846d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down.png @@ -0,0 +1 @@ +go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up-symbolic.png new file mode 120000 index 000000000..ee76eec61 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up-symbolic.png @@ -0,0 +1 @@ +gtk-go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up.png new file mode 120000 index 000000000..4a1025d4a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up.png @@ -0,0 +1 @@ +go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom-symbolic.png new file mode 120000 index 000000000..27ab77552 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom-symbolic.png @@ -0,0 +1 @@ +gtk-goto-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom.png new file mode 120000 index 000000000..c58ca3d0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom.png @@ -0,0 +1 @@ +go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top-symbolic.png new file mode 120000 index 000000000..32ee14e66 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top-symbolic.png @@ -0,0 +1 @@ +gtk-goto-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top.png new file mode 120000 index 000000000..3b5b7d6e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top.png @@ -0,0 +1 @@ +go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk-symbolic.png new file mode 120000 index 000000000..152e871f3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk-symbolic.png @@ -0,0 +1 @@ +gtk-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help-symbolic.png new file mode 120000 index 000000000..796d97c74 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help-symbolic.png @@ -0,0 +1 @@ +gtk-help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help.png new file mode 120000 index 000000000..af8d871de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help.png @@ -0,0 +1 @@ +help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home-symbolic.png new file mode 120000 index 000000000..0f0054316 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home-symbolic.png @@ -0,0 +1 @@ +gtk-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index-symbolic.png new file mode 120000 index 000000000..1635a9d2b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index-symbolic.png @@ -0,0 +1 @@ +gtk-index.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index.png new file mode 100644 index 000000000..9ddbe9b8e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic-symbolic.png new file mode 120000 index 000000000..5a22fc560 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic-symbolic.png @@ -0,0 +1 @@ +gtk-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic.png new file mode 120000 index 000000000..1ee2a31f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic.png @@ -0,0 +1 @@ +format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center-symbolic.png new file mode 120000 index 000000000..2057ae4d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center-symbolic.png @@ -0,0 +1 @@ +gtk-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center.png new file mode 120000 index 000000000..980c099ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center.png @@ -0,0 +1 @@ +format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill-symbolic.png new file mode 120000 index 000000000..ad45b34dc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill-symbolic.png @@ -0,0 +1 @@ +gtk-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill.png new file mode 120000 index 000000000..f1d9574cf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill.png @@ -0,0 +1 @@ +format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left-symbolic.png new file mode 120000 index 000000000..a4ee605d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left-symbolic.png @@ -0,0 +1 @@ +gtk-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left.png new file mode 120000 index 000000000..2da25a167 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left.png @@ -0,0 +1 @@ +format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right-symbolic.png new file mode 120000 index 000000000..15dddca14 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right-symbolic.png @@ -0,0 +1 @@ +gtk-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right.png new file mode 120000 index 000000000..017868ada --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right.png @@ -0,0 +1 @@ +format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen-symbolic.png new file mode 120000 index 000000000..bc1251b2a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen-symbolic.png @@ -0,0 +1 @@ +gtk-leave-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen.png new file mode 120000 index 000000000..5b9d8f68b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen.png @@ -0,0 +1 @@ +view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause-symbolic.png new file mode 120000 index 000000000..e4880de80 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause-symbolic.png @@ -0,0 +1 @@ +gtk-media-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause.png new file mode 120000 index 000000000..0ef65d6d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record-symbolic.png new file mode 120000 index 000000000..6518a86a1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record-symbolic.png @@ -0,0 +1 @@ +gtk-media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record.png new file mode 120000 index 000000000..91f5c6f4d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record.png @@ -0,0 +1 @@ +media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop-symbolic.png new file mode 120000 index 000000000..b42b748dd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop-symbolic.png @@ -0,0 +1 @@ +gtk-media-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop.png new file mode 120000 index 000000000..423c7cf20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop.png @@ -0,0 +1 @@ +media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image-symbolic.png new file mode 120000 index 000000000..16ed32178 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image-symbolic.png @@ -0,0 +1 @@ +gtk-missing-image.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image.png new file mode 120000 index 000000000..344617bac --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image.png @@ -0,0 +1 @@ +image-missing.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new-symbolic.png new file mode 120000 index 000000000..913a6a7d3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new-symbolic.png @@ -0,0 +1 @@ +gtk-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new.png new file mode 120000 index 000000000..446977ddc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new.png @@ -0,0 +1 @@ +document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open-symbolic.png new file mode 120000 index 000000000..340a617d6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open-symbolic.png @@ -0,0 +1 @@ +gtk-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open.png new file mode 120000 index 000000000..f58170cc1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open.png @@ -0,0 +1 @@ +document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape-symbolic.png new file mode 120000 index 000000000..95e896d4c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape-symbolic.png @@ -0,0 +1 @@ +gtk-orientation-landscape.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape.png new file mode 100644 index 000000000..fcf7f2a49 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait-symbolic.png new file mode 120000 index 000000000..2dc258bb5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait-symbolic.png @@ -0,0 +1 @@ +gtk-orientation-portrait.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait.png new file mode 100644 index 000000000..cb7b760bc Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape-symbolic.png new file mode 120000 index 000000000..a6f0b4411 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape-symbolic.png @@ -0,0 +1 @@ +gtk-orientation-reverse-landscape.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape.png new file mode 100644 index 000000000..69ade2524 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait-symbolic.png new file mode 120000 index 000000000..1c8965166 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait-symbolic.png @@ -0,0 +1 @@ +gtk-orientation-reverse-portrait.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait.png new file mode 100644 index 000000000..c309a6d82 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup-symbolic.png new file mode 120000 index 000000000..ff4533cc1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup-symbolic.png @@ -0,0 +1 @@ +gtk-page-setup.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup.png new file mode 100644 index 000000000..9acf0d5ff Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste-symbolic.png new file mode 120000 index 000000000..892561ea8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste-symbolic.png @@ -0,0 +1 @@ +gtk-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste.png new file mode 120000 index 000000000..2f55649f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste.png @@ -0,0 +1 @@ +edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences-symbolic.png new file mode 120000 index 000000000..5acf3b2f2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences-symbolic.png @@ -0,0 +1 @@ +gtk-preferences.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences.png new file mode 100644 index 000000000..2596f3cc5 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview-symbolic.png new file mode 120000 index 000000000..8fe93e04e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview-symbolic.png @@ -0,0 +1 @@ +gtk-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview.png new file mode 120000 index 000000000..9dfea717c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview.png @@ -0,0 +1 @@ +document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-symbolic.png new file mode 120000 index 000000000..95ed2ec91 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-symbolic.png @@ -0,0 +1 @@ +gtk-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print.png new file mode 120000 index 000000000..863a49fc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print.png @@ -0,0 +1 @@ +document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties-symbolic.png new file mode 120000 index 000000000..5c3325bfc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties-symbolic.png @@ -0,0 +1 @@ +gtk-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties.png new file mode 120000 index 000000000..b447aa240 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties.png @@ -0,0 +1 @@ +document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit-symbolic.png new file mode 120000 index 000000000..e599db624 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit-symbolic.png @@ -0,0 +1 @@ +gtk-quit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit.png new file mode 120000 index 000000000..0ecb0b9ba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit.png @@ -0,0 +1 @@ +application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png new file mode 120000 index 000000000..d006923b8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png @@ -0,0 +1 @@ +gtk-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr.png new file mode 120000 index 000000000..0061b57c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr.png @@ -0,0 +1 @@ +edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh-symbolic.png new file mode 120000 index 000000000..38cbfeb52 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh-symbolic.png @@ -0,0 +1 @@ +gtk-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove-symbolic.png new file mode 120000 index 000000000..2e165cfdc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove-symbolic.png @@ -0,0 +1 @@ +gtk-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove.png new file mode 120000 index 000000000..1336403b3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove.png @@ -0,0 +1 @@ +list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr-symbolic.png new file mode 120000 index 000000000..39a6d5698 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr-symbolic.png @@ -0,0 +1 @@ +gtk-revert-to-saved-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr.png new file mode 120000 index 000000000..35c2c00a5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr.png @@ -0,0 +1 @@ +document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl-symbolic.png new file mode 120000 index 000000000..77c9eaa81 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl-symbolic.png @@ -0,0 +1 @@ +gtk-revert-to-saved-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl.png new file mode 120000 index 000000000..35c2c00a5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl.png @@ -0,0 +1 @@ +document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as-symbolic.png new file mode 120000 index 000000000..a7410d076 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as-symbolic.png @@ -0,0 +1 @@ +gtk-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as.png new file mode 120000 index 000000000..6f8088857 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as.png @@ -0,0 +1 @@ +document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-symbolic.png new file mode 120000 index 000000000..8eeb98b14 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-symbolic.png @@ -0,0 +1 @@ +gtk-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save.png new file mode 120000 index 000000000..b1240e18d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all-symbolic.png new file mode 120000 index 000000000..2711e9b55 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all-symbolic.png @@ -0,0 +1 @@ +gtk-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all.png new file mode 120000 index 000000000..30033c765 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all.png @@ -0,0 +1 @@ +edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color-symbolic.png new file mode 120000 index 000000000..367390596 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color-symbolic.png @@ -0,0 +1 @@ +gtk-select-color.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color.png new file mode 100644 index 000000000..0e71c35d7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font-symbolic.png new file mode 120000 index 000000000..a4983fc58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font-symbolic.png @@ -0,0 +1 @@ +gtk-select-font.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font.png new file mode 100644 index 000000000..cde0e8698 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending-symbolic.png new file mode 120000 index 000000000..30ddf10fa --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending-symbolic.png @@ -0,0 +1 @@ +gtk-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending.png new file mode 120000 index 000000000..28dd3cde5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending.png @@ -0,0 +1 @@ +view-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending-symbolic.png new file mode 120000 index 000000000..794f2156f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending-symbolic.png @@ -0,0 +1 @@ +gtk-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending.png new file mode 120000 index 000000000..578592d3b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending.png @@ -0,0 +1 @@ +view-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check-symbolic.png new file mode 120000 index 000000000..bdf2c4c70 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check-symbolic.png @@ -0,0 +1 @@ +gtk-spell-check.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check.png new file mode 120000 index 000000000..23b82da94 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check.png @@ -0,0 +1 @@ +tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop-symbolic.png new file mode 120000 index 000000000..7c9bdc3d3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop-symbolic.png @@ -0,0 +1 @@ +gtk-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough-symbolic.png new file mode 120000 index 000000000..6221ce0a3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough-symbolic.png @@ -0,0 +1 @@ +gtk-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough.png new file mode 120000 index 000000000..9ff9a3776 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough.png @@ -0,0 +1 @@ +format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr-symbolic.png new file mode 120000 index 000000000..0877291c0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr-symbolic.png @@ -0,0 +1 @@ +gtk-undelete-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr.png new file mode 100644 index 000000000..bccc39e7c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl-symbolic.png new file mode 120000 index 000000000..3844ffd1a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl-symbolic.png @@ -0,0 +1 @@ +gtk-undelete-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl.png new file mode 100644 index 000000000..22023b853 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline-symbolic.png new file mode 120000 index 000000000..9c10f2b4f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline-symbolic.png @@ -0,0 +1 @@ +gtk-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline.png new file mode 120000 index 000000000..4f5b1549c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline.png @@ -0,0 +1 @@ +format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png new file mode 120000 index 000000000..eb2a153d3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png @@ -0,0 +1 @@ +gtk-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr.png new file mode 120000 index 000000000..62d2a953e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr.png @@ -0,0 +1 @@ +edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100-symbolic.png new file mode 120000 index 000000000..0615da6a2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100-symbolic.png @@ -0,0 +1 @@ +gtk-zoom-100.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100.png new file mode 120000 index 000000000..bfeb09ed1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100.png @@ -0,0 +1 @@ +zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png new file mode 120000 index 000000000..b399469e7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png @@ -0,0 +1 @@ +gtk-zoom-fit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in-symbolic.png new file mode 120000 index 000000000..65c933a16 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in-symbolic.png @@ -0,0 +1 @@ +gtk-zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in.png new file mode 120000 index 000000000..ee0a4b39d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in.png @@ -0,0 +1 @@ +zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out-symbolic.png new file mode 120000 index 000000000..bd5b889a6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out-symbolic.png @@ -0,0 +1 @@ +gtk-zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out.png new file mode 120000 index 000000000..be243b08a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out.png @@ -0,0 +1 @@ +zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive-symbolic.png new file mode 120000 index 000000000..0245415f2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive-symbolic.png @@ -0,0 +1 @@ +harddrive.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount-symbolic.png new file mode 120000 index 000000000..0f5bce8a1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount-symbolic.png @@ -0,0 +1 @@ +hdd_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about-symbolic.png new file mode 120000 index 000000000..dd431b5e8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about-symbolic.png @@ -0,0 +1 @@ +help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about.png new file mode 100644 index 000000000..063d0df43 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents-symbolic.png new file mode 120000 index 000000000..af8d871de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents-symbolic.png @@ -0,0 +1 @@ +help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents.png new file mode 100644 index 000000000..b00fbd8c1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-symbolic.png new file mode 120000 index 000000000..102ea55da --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-symbolic.png @@ -0,0 +1 @@ +help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help.png new file mode 120000 index 000000000..af8d871de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help.png @@ -0,0 +1 @@ +help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing-symbolic.png new file mode 120000 index 000000000..344617bac --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing-symbolic.png @@ -0,0 +1 @@ +image-missing.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing.png new file mode 100644 index 000000000..90e26e5bc Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info-symbolic.png new file mode 120000 index 000000000..ad789b531 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info-symbolic.png @@ -0,0 +1 @@ +info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory-symbolic.png new file mode 120000 index 000000000..d8f486403 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory-symbolic.png @@ -0,0 +1 @@ +inode-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home-symbolic.png new file mode 120000 index 000000000..b2008e9c4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home-symbolic.png @@ -0,0 +1 @@ +kfm_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust-symbolic.png new file mode 120000 index 000000000..c8d6c19de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust-symbolic.png @@ -0,0 +1 @@ +leftjust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust.png new file mode 120000 index 000000000..2da25a167 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust.png @@ -0,0 +1 @@ +format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add-symbolic.png new file mode 120000 index 000000000..7d4c8781d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add-symbolic.png @@ -0,0 +1 @@ +list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add.png new file mode 100644 index 000000000..2f8b70d9c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove-symbolic.png new file mode 120000 index 000000000..1336403b3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove-symbolic.png @@ -0,0 +1 @@ +list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove.png new file mode 100644 index 000000000..0bd69c92c Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom-symbolic.png new file mode 120000 index 000000000..848507774 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom-symbolic.png @@ -0,0 +1 @@ +media-cdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy-symbolic.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy-symbolic.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy.png new file mode 100644 index 000000000..7ef7685f4 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical-symbolic.png new file mode 120000 index 000000000..dcb92bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical-symbolic.png @@ -0,0 +1 @@ +media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical.png new file mode 100644 index 000000000..c4358f5f8 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause-symbolic.png new file mode 120000 index 000000000..0ef65d6d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause-symbolic.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause.png new file mode 100644 index 000000000..6187ba6d2 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr-symbolic.png new file mode 120000 index 000000000..1265a5a32 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr-symbolic.png @@ -0,0 +1 @@ +media-playback-start-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr.png new file mode 100644 index 000000000..0f5348900 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl-symbolic.png new file mode 120000 index 000000000..956b43d14 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl-symbolic.png @@ -0,0 +1 @@ +media-playback-start-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl.png new file mode 100644 index 000000000..036f05f55 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop-symbolic.png new file mode 120000 index 000000000..423c7cf20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop-symbolic.png @@ -0,0 +1 @@ +media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop.png new file mode 100644 index 000000000..9e54ef3f5 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record-symbolic.png new file mode 120000 index 000000000..91f5c6f4d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record-symbolic.png @@ -0,0 +1 @@ +media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record.png new file mode 100644 index 000000000..d1b25c2f1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr-symbolic.png new file mode 120000 index 000000000..64288c383 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr-symbolic.png @@ -0,0 +1 @@ +media-seek-backward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr.png new file mode 100644 index 000000000..508808285 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl-symbolic.png new file mode 120000 index 000000000..9863a32f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl-symbolic.png @@ -0,0 +1 @@ +media-seek-backward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl.png new file mode 100644 index 000000000..4a1bdf89b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr-symbolic.png new file mode 120000 index 000000000..a7ca942c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr-symbolic.png @@ -0,0 +1 @@ +media-seek-forward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr.png new file mode 100644 index 000000000..4a1bdf89b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl-symbolic.png new file mode 120000 index 000000000..7829cab85 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl-symbolic.png @@ -0,0 +1 @@ +media-seek-forward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl.png new file mode 100644 index 000000000..508808285 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr-symbolic.png new file mode 120000 index 000000000..cea15b4f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr-symbolic.png @@ -0,0 +1 @@ +media-skip-backward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr.png new file mode 100644 index 000000000..c3a649f4e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl-symbolic.png new file mode 120000 index 000000000..11db21ad5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl-symbolic.png @@ -0,0 +1 @@ +media-skip-backward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl.png new file mode 100644 index 000000000..3da34257d Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr-symbolic.png new file mode 120000 index 000000000..bd7416fbd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr-symbolic.png @@ -0,0 +1 @@ +media-skip-forward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr.png new file mode 100644 index 000000000..3da34257d Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl-symbolic.png new file mode 120000 index 000000000..0ea17ba14 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl-symbolic.png @@ -0,0 +1 @@ +media-skip-forward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl.png new file mode 100644 index 000000000..c3a649f4e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info-symbolic.png new file mode 120000 index 000000000..bfc646ad5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info-symbolic.png @@ -0,0 +1 @@ +messagebox_info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii-symbolic.png new file mode 120000 index 000000000..12b223390 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii-symbolic.png @@ -0,0 +1 @@ +mime_ascii.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc-symbolic.png new file mode 120000 index 000000000..af684393f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc-symbolic.png @@ -0,0 +1 @@ +misc.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle-symbolic.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle-symbolic.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle.png new file mode 100644 index 000000000..a6f14418b Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-symbolic.png new file mode 120000 index 000000000..a14428c62 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-symbolic.png @@ -0,0 +1 @@ +network.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network.png new file mode 120000 index 000000000..95ff6aad8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network.png @@ -0,0 +1 @@ +folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc-symbolic.png new file mode 120000 index 000000000..34044c00c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc-symbolic.png @@ -0,0 +1 @@ +nm-adhoc.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired-symbolic.png new file mode 120000 index 000000000..6a9e23c0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired-symbolic.png @@ -0,0 +1 @@ +nm-device-wired.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless-symbolic.png new file mode 120000 index 000000000..e650e72e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless-symbolic.png @@ -0,0 +1 @@ +nm-device-wireless.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless.png new file mode 120000 index 000000000..ca31ae7fd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless.png @@ -0,0 +1 @@ +network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors-symbolic.png new file mode 120000 index 000000000..809305555 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors-symbolic.png @@ -0,0 +1 @@ +package_editors.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings-symbolic.png new file mode 120000 index 000000000..f7f21ce34 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings-symbolic.png @@ -0,0 +1 @@ +package_settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings.png new file mode 120000 index 000000000..1d8138d22 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings.png @@ -0,0 +1 @@ +preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause-symbolic.png new file mode 120000 index 000000000..f6af01a48 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause-symbolic.png @@ -0,0 +1 @@ +player_pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause.png new file mode 120000 index 000000000..0ef65d6d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record-symbolic.png new file mode 120000 index 000000000..5607649cd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record-symbolic.png @@ -0,0 +1 @@ +player_record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record.png new file mode 120000 index 000000000..91f5c6f4d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record.png @@ -0,0 +1 @@ +media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop-symbolic.png new file mode 120000 index 000000000..13f0c5aad --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop-symbolic.png @@ -0,0 +1 @@ +player_stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop.png new file mode 120000 index 000000000..423c7cf20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop.png @@ -0,0 +1 @@ +media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system-symbolic.png new file mode 120000 index 000000000..1d8138d22 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system-symbolic.png @@ -0,0 +1 @@ +preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system.png new file mode 120000 index 000000000..5acf3b2f2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system.png @@ -0,0 +1 @@ +gtk-preferences.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error-symbolic.png new file mode 120000 index 000000000..cffd04483 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error-symbolic.png @@ -0,0 +1 @@ +printer-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error.png new file mode 100644 index 000000000..28517473d Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info-symbolic.png new file mode 120000 index 000000000..aaa23147e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info-symbolic.png @@ -0,0 +1 @@ +printer-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info.png new file mode 100644 index 000000000..13304368e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused-symbolic.png new file mode 120000 index 000000000..ba165131c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused-symbolic.png @@ -0,0 +1 @@ +printer-paused.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused.png new file mode 100644 index 000000000..da6df48a9 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning-symbolic.png new file mode 120000 index 000000000..6575a3557 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning-symbolic.png @@ -0,0 +1 @@ +printer-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning.png new file mode 100644 index 000000000..dd70e0be9 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop-symbolic.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop-symbolic.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop.png new file mode 100644 index 000000000..54e1cb3e9 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home-symbolic.png new file mode 120000 index 000000000..9d96edc09 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home-symbolic.png @@ -0,0 +1 @@ +redhat-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings-symbolic.png new file mode 120000 index 000000000..99d35dedc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings-symbolic.png @@ -0,0 +1 @@ +redhat-system_settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings.png new file mode 120000 index 000000000..1d8138d22 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings.png @@ -0,0 +1 @@ +preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo-symbolic.png new file mode 120000 index 000000000..4d893d44a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo-symbolic.png @@ -0,0 +1 @@ +redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo.png new file mode 120000 index 000000000..0061b57c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo.png @@ -0,0 +1 @@ +edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload-symbolic.png new file mode 120000 index 000000000..b51c479ad --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload-symbolic.png @@ -0,0 +1 @@ +reload.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3-symbolic.png new file mode 120000 index 000000000..160584a15 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3-symbolic.png @@ -0,0 +1 @@ +reload3.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs-symbolic.png new file mode 120000 index 000000000..4edfb5a4c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs-symbolic.png @@ -0,0 +1 @@ +reload_all_tabs.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page-symbolic.png new file mode 120000 index 000000000..e8fdb1ec3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page-symbolic.png @@ -0,0 +1 @@ +reload_page.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove-symbolic.png new file mode 120000 index 000000000..584599bf0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove-symbolic.png @@ -0,0 +1 @@ +remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove.png new file mode 120000 index 000000000..1336403b3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove.png @@ -0,0 +1 @@ +list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert-symbolic.png new file mode 120000 index 000000000..00f6de08c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert-symbolic.png @@ -0,0 +1 @@ +revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert.png new file mode 120000 index 000000000..35c2c00a5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert.png @@ -0,0 +1 @@ +document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust-symbolic.png new file mode 120000 index 000000000..4827d0f19 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust-symbolic.png @@ -0,0 +1 @@ +rightjust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust.png new file mode 120000 index 000000000..017868ada --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust.png @@ -0,0 +1 @@ +format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about-symbolic.png new file mode 120000 index 000000000..47f3160cc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about-symbolic.png @@ -0,0 +1 @@ +stock_about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about.png new file mode 120000 index 000000000..dd431b5e8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about.png @@ -0,0 +1 @@ +help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom-symbolic.png new file mode 120000 index 000000000..7738c9958 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom-symbolic.png @@ -0,0 +1 @@ +stock_bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom.png new file mode 120000 index 000000000..c58ca3d0f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom.png @@ -0,0 +1 @@ +go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close-symbolic.png new file mode 120000 index 000000000..462194393 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close-symbolic.png @@ -0,0 +1 @@ +stock_close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy-symbolic.png new file mode 120000 index 000000000..d4fe9b004 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy-symbolic.png @@ -0,0 +1 @@ +stock_copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy.png new file mode 120000 index 000000000..e106cb543 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy.png @@ -0,0 +1 @@ +edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut-symbolic.png new file mode 120000 index 000000000..6f34159d0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut-symbolic.png @@ -0,0 +1 @@ +stock_cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut.png new file mode 120000 index 000000000..32b03023c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut.png @@ -0,0 +1 @@ +edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete-symbolic.png new file mode 120000 index 000000000..54b0ede76 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete-symbolic.png @@ -0,0 +1 @@ +stock_delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete.png new file mode 120000 index 000000000..bb0a74a58 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info-symbolic.png new file mode 120000 index 000000000..5b4fe4bc6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info-symbolic.png @@ -0,0 +1 @@ +stock_dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down-symbolic.png new file mode 120000 index 000000000..56d981416 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down-symbolic.png @@ -0,0 +1 @@ +stock_down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down.png new file mode 120000 index 000000000..5240b846d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down.png @@ -0,0 +1 @@ +go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites-symbolic.png new file mode 120000 index 000000000..2c81081ca --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites-symbolic.png @@ -0,0 +1 @@ +stock_file-properites.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites.png new file mode 120000 index 000000000..b447aa240 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites.png @@ -0,0 +1 @@ +document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder-symbolic.png new file mode 120000 index 000000000..5376f31f6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder-symbolic.png @@ -0,0 +1 @@ +stock_folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder.png new file mode 120000 index 000000000..6b18cab33 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder.png @@ -0,0 +1 @@ +folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen-symbolic.png new file mode 120000 index 000000000..31893cedd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen-symbolic.png @@ -0,0 +1 @@ +stock_fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen.png new file mode 120000 index 000000000..37aaf877e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen.png @@ -0,0 +1 @@ +view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help-symbolic.png new file mode 120000 index 000000000..f4d63feef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help-symbolic.png @@ -0,0 +1 @@ +stock_help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help.png new file mode 120000 index 000000000..af8d871de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help.png @@ -0,0 +1 @@ +help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home-symbolic.png new file mode 120000 index 000000000..faf057c43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home-symbolic.png @@ -0,0 +1 @@ +stock_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home.png new file mode 120000 index 000000000..718c1b215 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home.png @@ -0,0 +1 @@ +go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen-symbolic.png new file mode 120000 index 000000000..00f3f4f77 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen-symbolic.png @@ -0,0 +1 @@ +stock_leave-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen.png new file mode 120000 index 000000000..5b9d8f68b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen.png @@ -0,0 +1 @@ +view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause-symbolic.png new file mode 120000 index 000000000..fcf5ee6aa --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause-symbolic.png @@ -0,0 +1 @@ +stock_media-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause.png new file mode 120000 index 000000000..0ef65d6d9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec-symbolic.png new file mode 120000 index 000000000..3703897de --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec-symbolic.png @@ -0,0 +1 @@ +stock_media-rec.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec.png new file mode 120000 index 000000000..91f5c6f4d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec.png @@ -0,0 +1 @@ +media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop-symbolic.png new file mode 120000 index 000000000..d3284d99b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop-symbolic.png @@ -0,0 +1 @@ +stock_media-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop.png new file mode 120000 index 000000000..423c7cf20 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop.png @@ -0,0 +1 @@ +media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text-symbolic.png new file mode 120000 index 000000000..df5c64b6e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text-symbolic.png @@ -0,0 +1 @@ +stock_new-text.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text.png new file mode 120000 index 000000000..446977ddc --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text.png @@ -0,0 +1 @@ +document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste-symbolic.png new file mode 120000 index 000000000..d031aef3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste-symbolic.png @@ -0,0 +1 @@ +stock_paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste.png new file mode 120000 index 000000000..2f55649f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste.png @@ -0,0 +1 @@ +edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview-symbolic.png new file mode 120000 index 000000000..cb72d5f96 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview-symbolic.png @@ -0,0 +1 @@ +stock_print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview.png new file mode 120000 index 000000000..9dfea717c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview.png @@ -0,0 +1 @@ +document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-symbolic.png new file mode 120000 index 000000000..5ea564c1c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-symbolic.png @@ -0,0 +1 @@ +stock_print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print.png new file mode 120000 index 000000000..863a49fc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print.png @@ -0,0 +1 @@ +document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties-symbolic.png new file mode 120000 index 000000000..cead9f906 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties-symbolic.png @@ -0,0 +1 @@ +stock_properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties.png new file mode 120000 index 000000000..b447aa240 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties.png @@ -0,0 +1 @@ +document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo-symbolic.png new file mode 120000 index 000000000..3abd89311 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo-symbolic.png @@ -0,0 +1 @@ +stock_redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo.png new file mode 120000 index 000000000..0061b57c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo.png @@ -0,0 +1 @@ +edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh-symbolic.png new file mode 120000 index 000000000..e617eefc4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh-symbolic.png @@ -0,0 +1 @@ +stock_refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as-symbolic.png new file mode 120000 index 000000000..dfda8bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as-symbolic.png @@ -0,0 +1 @@ +stock_save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as.png new file mode 120000 index 000000000..6f8088857 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as.png @@ -0,0 +1 @@ +document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-symbolic.png new file mode 120000 index 000000000..08802a248 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-symbolic.png @@ -0,0 +1 @@ +stock_save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save.png new file mode 120000 index 000000000..b1240e18d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace-symbolic.png new file mode 120000 index 000000000..539fd27e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace-symbolic.png @@ -0,0 +1 @@ +stock_search-and-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace.png new file mode 120000 index 000000000..e4057afed --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace.png @@ -0,0 +1 @@ +edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-symbolic.png new file mode 120000 index 000000000..34bffb533 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-symbolic.png @@ -0,0 +1 @@ +stock_search.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search.png new file mode 120000 index 000000000..dd4136811 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search.png @@ -0,0 +1 @@ +edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all-symbolic.png new file mode 120000 index 000000000..49d937f83 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all-symbolic.png @@ -0,0 +1 @@ +stock_select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all.png new file mode 120000 index 000000000..30033c765 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all.png @@ -0,0 +1 @@ +edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck-symbolic.png new file mode 120000 index 000000000..afb170689 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck-symbolic.png @@ -0,0 +1 @@ +stock_spellcheck.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck.png new file mode 120000 index 000000000..23b82da94 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck.png @@ -0,0 +1 @@ +tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop-symbolic.png new file mode 120000 index 000000000..e6673c5a3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop-symbolic.png @@ -0,0 +1 @@ +stock_stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough-symbolic.png new file mode 120000 index 000000000..0d1cedb91 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough-symbolic.png @@ -0,0 +1 @@ +stock_text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough.png new file mode 120000 index 000000000..9ff9a3776 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough.png @@ -0,0 +1 @@ +format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold-symbolic.png new file mode 120000 index 000000000..b34d8bcde --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold-symbolic.png @@ -0,0 +1 @@ +stock_text_bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold.png new file mode 120000 index 000000000..ef50053bd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold.png @@ -0,0 +1 @@ +format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center-symbolic.png new file mode 120000 index 000000000..39bd0f289 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center-symbolic.png @@ -0,0 +1 @@ +stock_text_center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center.png new file mode 120000 index 000000000..980c099ef --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center.png @@ -0,0 +1 @@ +format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic-symbolic.png new file mode 120000 index 000000000..eb525bea2 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic-symbolic.png @@ -0,0 +1 @@ +stock_text_italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic.png new file mode 120000 index 000000000..1ee2a31f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic.png @@ -0,0 +1 @@ +format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify-symbolic.png new file mode 120000 index 000000000..2db29cb19 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify-symbolic.png @@ -0,0 +1 @@ +stock_text_justify.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify.png new file mode 120000 index 000000000..f1d9574cf --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify.png @@ -0,0 +1 @@ +format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left-symbolic.png new file mode 120000 index 000000000..314710b94 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left-symbolic.png @@ -0,0 +1 @@ +stock_text_left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left.png new file mode 120000 index 000000000..2da25a167 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left.png @@ -0,0 +1 @@ +format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right-symbolic.png new file mode 120000 index 000000000..997c4e491 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right-symbolic.png @@ -0,0 +1 @@ +stock_text_right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right.png new file mode 120000 index 000000000..017868ada --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right.png @@ -0,0 +1 @@ +format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined-symbolic.png new file mode 120000 index 000000000..f57dd0345 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined-symbolic.png @@ -0,0 +1 @@ +stock_text_underlined.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined.png new file mode 120000 index 000000000..4f5b1549c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined.png @@ -0,0 +1 @@ +format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top-symbolic.png new file mode 120000 index 000000000..142c86cb8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top-symbolic.png @@ -0,0 +1 @@ +stock_top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top.png new file mode 120000 index 000000000..3b5b7d6e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top.png @@ -0,0 +1 @@ +go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo-symbolic.png new file mode 120000 index 000000000..94134ab91 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo-symbolic.png @@ -0,0 +1 @@ +stock_undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo.png new file mode 120000 index 000000000..62d2a953e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo.png @@ -0,0 +1 @@ +edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up-symbolic.png new file mode 120000 index 000000000..85fa025ce --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up-symbolic.png @@ -0,0 +1 @@ +stock_up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up.png new file mode 120000 index 000000000..4a1025d4a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up.png @@ -0,0 +1 @@ +go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0-symbolic.png new file mode 120000 index 000000000..2fef47746 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0-symbolic.png @@ -0,0 +1 @@ +stock_volume-0.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0.png new file mode 120000 index 000000000..dd3d1eea4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0.png @@ -0,0 +1 @@ +audio-volume-low.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max-symbolic.png new file mode 120000 index 000000000..dad717d7c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max-symbolic.png @@ -0,0 +1 @@ +stock_volume-max.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max.png new file mode 120000 index 000000000..3dc4302d0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max.png @@ -0,0 +1 @@ +audio-volume-high.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med-symbolic.png new file mode 120000 index 000000000..70c0749e7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med-symbolic.png @@ -0,0 +1 @@ +stock_volume-med.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med.png new file mode 120000 index 000000000..3e599b49d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med.png @@ -0,0 +1 @@ +audio-volume-medium.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min-symbolic.png new file mode 120000 index 000000000..37d105ad7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min-symbolic.png @@ -0,0 +1 @@ +stock_volume-min.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min.png new file mode 120000 index 000000000..dd3d1eea4 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min.png @@ -0,0 +1 @@ +audio-volume-low.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute-symbolic.png new file mode 120000 index 000000000..64de2b478 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute-symbolic.png @@ -0,0 +1 @@ +stock_volume-mute.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute.png new file mode 120000 index 000000000..8aeeb8edd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute.png @@ -0,0 +1 @@ +audio-volume-muted.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-symbolic.png new file mode 120000 index 000000000..ca538ec75 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-symbolic.png @@ -0,0 +1 @@ +stock_volume.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume.png new file mode 120000 index 000000000..3dc4302d0 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume.png @@ -0,0 +1 @@ +audio-volume-high.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1-symbolic.png new file mode 120000 index 000000000..15aa66135 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1-symbolic.png @@ -0,0 +1 @@ +stock_zoom-1.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1.png new file mode 120000 index 000000000..bfeb09ed1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1.png @@ -0,0 +1 @@ +zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in-symbolic.png new file mode 120000 index 000000000..e2bc92819 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in-symbolic.png @@ -0,0 +1 @@ +stock_zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in.png new file mode 120000 index 000000000..ee0a4b39d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in.png @@ -0,0 +1 @@ +zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out-symbolic.png new file mode 120000 index 000000000..3c633a495 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out-symbolic.png @@ -0,0 +1 @@ +stock_zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out.png new file mode 120000 index 000000000..be243b08a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out.png @@ -0,0 +1 @@ +zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page-symbolic.png new file mode 120000 index 000000000..3c75afc9e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page-symbolic.png @@ -0,0 +1 @@ +stock_zoom-page.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop-symbolic.png new file mode 120000 index 000000000..6222e6f71 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop-symbolic.png @@ -0,0 +1 @@ +stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop.png new file mode 120000 index 000000000..4e46eca45 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop.png @@ -0,0 +1 @@ +process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy-symbolic.png new file mode 120000 index 000000000..1b471b958 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy-symbolic.png @@ -0,0 +1 @@ +system-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy.png new file mode 120000 index 000000000..279b7346f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy.png @@ -0,0 +1 @@ +media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run-symbolic.png new file mode 120000 index 000000000..9daf3feba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run-symbolic.png @@ -0,0 +1 @@ +system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run.png new file mode 100644 index 000000000..2b11b5075 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic-symbolic.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic-symbolic.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic.png new file mode 100644 index 000000000..c89e797b7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold-symbolic.png new file mode 120000 index 000000000..7297aca53 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold-symbolic.png @@ -0,0 +1 @@ +text_bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold.png new file mode 120000 index 000000000..ef50053bd --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold.png @@ -0,0 +1 @@ +format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic-symbolic.png new file mode 120000 index 000000000..567390a7e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic-symbolic.png @@ -0,0 +1 @@ +text_italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic.png new file mode 120000 index 000000000..1ee2a31f8 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic.png @@ -0,0 +1 @@ +format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike-symbolic.png new file mode 120000 index 000000000..67e697102 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike-symbolic.png @@ -0,0 +1 @@ +text_strike.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike.png new file mode 120000 index 000000000..9ff9a3776 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike.png @@ -0,0 +1 @@ +format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under-symbolic.png new file mode 120000 index 000000000..0032f1112 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under-symbolic.png @@ -0,0 +1 @@ +text_under.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under.png new file mode 120000 index 000000000..4f5b1549c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under.png @@ -0,0 +1 @@ +format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling-symbolic.png new file mode 120000 index 000000000..23b82da94 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling-symbolic.png @@ -0,0 +1 @@ +tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling.png new file mode 100644 index 000000000..2574c181f Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top-symbolic.png new file mode 120000 index 000000000..315e75e61 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top-symbolic.png @@ -0,0 +1 @@ +top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top.png new file mode 120000 index 000000000..3b5b7d6e5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top.png @@ -0,0 +1 @@ +go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt-symbolic.png new file mode 120000 index 000000000..8ac1daefb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt-symbolic.png @@ -0,0 +1 @@ +txt.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2-symbolic.png new file mode 120000 index 000000000..387710868 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2-symbolic.png @@ -0,0 +1 @@ +txt2.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo-symbolic.png new file mode 120000 index 000000000..28c818a0e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo-symbolic.png @@ -0,0 +1 @@ +undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo.png new file mode 120000 index 000000000..62d2a953e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo.png @@ -0,0 +1 @@ +edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown-symbolic.png new file mode 120000 index 000000000..b1754e727 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown-symbolic.png @@ -0,0 +1 @@ +unknown.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown.png new file mode 120000 index 000000000..3a5efdf43 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown.png @@ -0,0 +1 @@ +text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up-symbolic.png new file mode 120000 index 000000000..3a33d8bde --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up-symbolic.png @@ -0,0 +1 @@ +up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up.png new file mode 120000 index 000000000..4a1025d4a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up.png @@ -0,0 +1 @@ +go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop-symbolic.png new file mode 120000 index 000000000..200ab00ab --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop-symbolic.png @@ -0,0 +1 @@ +user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop.png new file mode 100644 index 000000000..28b68f338 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home-symbolic.png new file mode 120000 index 000000000..8c668dc1c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home-symbolic.png @@ -0,0 +1 @@ +user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home.png new file mode 100644 index 000000000..28b68f338 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen-symbolic.png new file mode 120000 index 000000000..37aaf877e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen-symbolic.png @@ -0,0 +1 @@ +view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen.png new file mode 100644 index 000000000..21462fe0e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh-symbolic.png new file mode 120000 index 000000000..521b94e2e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh-symbolic.png @@ -0,0 +1 @@ +view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh.png new file mode 100644 index 000000000..09b5df1d1 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore-symbolic.png new file mode 120000 index 000000000..5b9d8f68b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore-symbolic.png @@ -0,0 +1 @@ +view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore.png new file mode 100644 index 000000000..ff9c2289d Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending-symbolic.png new file mode 120000 index 000000000..28dd3cde5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending-symbolic.png @@ -0,0 +1 @@ +view-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending.png new file mode 100644 index 000000000..44c871133 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending-symbolic.png new file mode 120000 index 000000000..578592d3b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending-symbolic.png @@ -0,0 +1 @@ +view-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending.png new file mode 100644 index 000000000..d498a59a5 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+-symbolic.png new file mode 120000 index 000000000..920bdf9e9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+-symbolic.png @@ -0,0 +1 @@ +viewmag+.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+.png new file mode 120000 index 000000000..ee0a4b39d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+.png @@ -0,0 +1 @@ +zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag--symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag--symbolic.png new file mode 120000 index 000000000..604b33d4b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag--symbolic.png @@ -0,0 +1 @@ +viewmag-.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag-.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag-.png new file mode 120000 index 000000000..be243b08a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag-.png @@ -0,0 +1 @@ +zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1-symbolic.png new file mode 120000 index 000000000..14537edeb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1-symbolic.png @@ -0,0 +1 @@ +viewmag1.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1.png new file mode 120000 index 000000000..bfeb09ed1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1.png @@ -0,0 +1 @@ +zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit-symbolic.png new file mode 120000 index 000000000..4530444b9 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit-symbolic.png @@ -0,0 +1 @@ +viewmagfit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close-symbolic.png new file mode 120000 index 000000000..f8a647d3d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close-symbolic.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close.png new file mode 100644 index 000000000..312b84dae Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen-symbolic.png new file mode 120000 index 000000000..5e184b6c7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen-symbolic.png @@ -0,0 +1 @@ +window_fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen.png new file mode 120000 index 000000000..37aaf877e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen.png @@ -0,0 +1 @@ +view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen-symbolic.png new file mode 120000 index 000000000..07b973d67 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen-symbolic.png @@ -0,0 +1 @@ +window_nofullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen.png new file mode 120000 index 000000000..5b9d8f68b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen.png @@ -0,0 +1 @@ +view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit-symbolic.png new file mode 120000 index 000000000..214adf7fb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit-symbolic.png @@ -0,0 +1 @@ +xfce-system-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit.png new file mode 120000 index 000000000..0ecb0b9ba --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit.png @@ -0,0 +1 @@ +application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings-symbolic.png new file mode 120000 index 000000000..28a6ef505 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings-symbolic.png @@ -0,0 +1 @@ +xfce-system-settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings.png new file mode 120000 index 000000000..1d8138d22 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings.png @@ -0,0 +1 @@ +preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD-symbolic.png new file mode 120000 index 000000000..5de487b88 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD-symbolic.png @@ -0,0 +1 @@ +yast_HD.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude-symbolic.png new file mode 120000 index 000000000..a2fdbdd54 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude-symbolic.png @@ -0,0 +1 @@ +yast_idetude.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude.png new file mode 120000 index 000000000..5ae622860 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude.png @@ -0,0 +1 @@ +drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit-symbolic.png new file mode 120000 index 000000000..181b01518 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit-symbolic.png @@ -0,0 +1 @@ +zoom-best-fit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best-symbolic.png new file mode 120000 index 000000000..9b4965a87 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best-symbolic.png @@ -0,0 +1 @@ +zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best.png new file mode 100644 index 000000000..dfbdf9b6e Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in-symbolic.png new file mode 120000 index 000000000..ee0a4b39d --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in-symbolic.png @@ -0,0 +1 @@ +zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in.png new file mode 100644 index 000000000..3a386fae7 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original-symbolic.png new file mode 120000 index 000000000..bfeb09ed1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original-symbolic.png @@ -0,0 +1 @@ +zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original.png new file mode 100644 index 000000000..499cbd6c6 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out-symbolic.png new file mode 120000 index 000000000..be243b08a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out-symbolic.png @@ -0,0 +1 @@ +zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out.png new file mode 100644 index 000000000..22afd1951 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple-symbolic.png new file mode 120000 index 000000000..0bf3991f5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple-symbolic.png @@ -0,0 +1 @@ +gtk-dnd-multiple.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple.png b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple.png new file mode 100644 index 000000000..dc09283f4 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-symbolic.png new file mode 120000 index 000000000..b0e9ec3d7 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-symbolic.png @@ -0,0 +1 @@ +gtk-dnd.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd.png b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd.png new file mode 100644 index 000000000..c58e5a6f4 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error-symbolic.png new file mode 120000 index 000000000..ab8db5ec3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error-symbolic.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error.png new file mode 100644 index 000000000..cb03e5420 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information-symbolic.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information-symbolic.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information.png new file mode 100644 index 000000000..d73990ecc Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password-symbolic.png new file mode 120000 index 000000000..c9e65253c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password-symbolic.png @@ -0,0 +1 @@ +dialog-password.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password.png new file mode 100644 index 000000000..f81198437 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question-symbolic.png new file mode 120000 index 000000000..80b9b28c1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question-symbolic.png @@ -0,0 +1 @@ +dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question.png new file mode 100644 index 000000000..14dbd9cac Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning-symbolic.png new file mode 120000 index 000000000..91cec009b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning-symbolic.png @@ -0,0 +1 @@ +dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning.png new file mode 100644 index 000000000..827a33918 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning.png differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error-symbolic.png new file mode 120000 index 000000000..39fca4944 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error-symbolic.png @@ -0,0 +1 @@ +error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error.png new file mode 120000 index 000000000..ab8db5ec3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication-symbolic.png new file mode 120000 index 000000000..51ce2e75e --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication-symbolic.png @@ -0,0 +1 @@ +gtk-dialog-authentication.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication.png new file mode 120000 index 000000000..c9e65253c --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication.png @@ -0,0 +1 @@ +dialog-password.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error-symbolic.png new file mode 120000 index 000000000..e5f28e590 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error-symbolic.png @@ -0,0 +1 @@ +gtk-dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error.png new file mode 120000 index 000000000..ab8db5ec3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info-symbolic.png new file mode 120000 index 000000000..70ccbc7aa --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info-symbolic.png @@ -0,0 +1 @@ +gtk-dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question-symbolic.png new file mode 120000 index 000000000..40bbebc0a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question-symbolic.png @@ -0,0 +1 @@ +gtk-dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question.png new file mode 120000 index 000000000..80b9b28c1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question.png @@ -0,0 +1 @@ +dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning-symbolic.png new file mode 120000 index 000000000..0a6758972 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning-symbolic.png @@ -0,0 +1 @@ +gtk-dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning.png new file mode 120000 index 000000000..91cec009b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning.png @@ -0,0 +1 @@ +dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important-symbolic.png new file mode 120000 index 000000000..e90fb7379 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important-symbolic.png @@ -0,0 +1 @@ +important.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important.png new file mode 120000 index 000000000..91cec009b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important.png @@ -0,0 +1 @@ +dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info-symbolic.png new file mode 120000 index 000000000..ad789b531 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info-symbolic.png @@ -0,0 +1 @@ +info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical-symbolic.png new file mode 120000 index 000000000..d94c949fb --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical-symbolic.png @@ -0,0 +1 @@ +messagebox_critical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical.png new file mode 120000 index 000000000..ab8db5ec3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info-symbolic.png new file mode 120000 index 000000000..bfc646ad5 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info-symbolic.png @@ -0,0 +1 @@ +messagebox_info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning-symbolic.png new file mode 120000 index 000000000..a153cb75b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning-symbolic.png @@ -0,0 +1 @@ +messagebox_warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning.png new file mode 120000 index 000000000..91cec009b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning.png @@ -0,0 +1 @@ +dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error-symbolic.png new file mode 120000 index 000000000..561c74e6a --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error-symbolic.png @@ -0,0 +1 @@ +stock_dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error.png new file mode 120000 index 000000000..ab8db5ec3 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info-symbolic.png new file mode 120000 index 000000000..5b4fe4bc6 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info-symbolic.png @@ -0,0 +1 @@ +stock_dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info.png new file mode 120000 index 000000000..5faec85f1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info.png @@ -0,0 +1 @@ +dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question-symbolic.png new file mode 120000 index 000000000..18fb1c428 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question-symbolic.png @@ -0,0 +1 @@ +stock_dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question.png new file mode 120000 index 000000000..80b9b28c1 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question.png @@ -0,0 +1 @@ +dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning-symbolic.png new file mode 120000 index 000000000..b140b7938 --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning-symbolic.png @@ -0,0 +1 @@ +stock_dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning.png new file mode 120000 index 000000000..91cec009b --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning.png @@ -0,0 +1 @@ +dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/icon-theme.cache b/packaging/macosx/Resources/icons/GtkStock/icon-theme.cache new file mode 100644 index 000000000..f0a1f2e23 Binary files /dev/null and b/packaging/macosx/Resources/icons/GtkStock/icon-theme.cache differ diff --git a/packaging/macosx/Resources/icons/GtkStock/index.theme b/packaging/macosx/Resources/icons/GtkStock/index.theme new file mode 100644 index 000000000..04adf411f --- /dev/null +++ b/packaging/macosx/Resources/icons/GtkStock/index.theme @@ -0,0 +1,34 @@ +[Icon Theme] +Name=GtkStock +Inherits=hicolor +Comment=Gtk Stock Icons for Inkscape.app +Example=folder + +# Directory list +Directories=16x16/stock,20x20/stock,24x24/stock,32x32/stock,48x48/stock, + +[16x16/stock] +Size=16 +Context=Stock +Type=fixed + +[20x20/stock] +Size=20 +Context=Stock +Type=fixed + +[24x24/stock] +Size=24 +Context=Stock +Type=fixed + +[32x32/stock] +Size=32 +Context=Stock +Type=fixed + +[48x48/stock] +Size=48 +Context=Stock +Type=fixed + diff --git a/packaging/macosx/Resources/themes/Adwaita/.DS_Store b/packaging/macosx/Resources/themes/Adwaita/.DS_Store new file mode 100644 index 000000000..866914c2f Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/.DS_Store differ diff --git a/packaging/macosx/Resources/themes/Adwaita/backgrounds/adwaita-timed.xml b/packaging/macosx/Resources/themes/Adwaita/backgrounds/adwaita-timed.xml new file mode 100644 index 000000000..4717076d0 --- /dev/null +++ b/packaging/macosx/Resources/themes/Adwaita/backgrounds/adwaita-timed.xml @@ -0,0 +1,51 @@ + + + 2011 + 11 + 24 + 7 + 00 + 00 + + + + + + +3600.0 +/opt/local-x11/share/themes/Adwaita/backgrounds/morning.jpg + + + + +18000.0 +/opt/local-x11/share/themes/Adwaita/backgrounds/morning.jpg +/opt/local-x11/share/themes/Adwaita/backgrounds/bright-day.jpg + + + + +18000.0 +/opt/local-x11/share/themes/Adwaita/backgrounds/bright-day.jpg + + + + +21600.0 +/opt/local-x11/share/themes/Adwaita/backgrounds/bright-day.jpg +/opt/local-x11/share/themes/Adwaita/backgrounds/good-night.jpg + + + + +18000.0 +/opt/local-x11/share/themes/Adwaita/backgrounds/good-night.jpg + + + + +7200.0 +/opt/local-x11/share/themes/Adwaita/backgrounds/good-night.jpg +/opt/local-x11/share/themes/Adwaita/backgrounds/morning.jpg + + diff --git a/packaging/macosx/Resources/themes/Adwaita/backgrounds/bright-day.jpg b/packaging/macosx/Resources/themes/Adwaita/backgrounds/bright-day.jpg new file mode 100644 index 000000000..910feaba7 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/backgrounds/bright-day.jpg differ diff --git a/packaging/macosx/Resources/themes/Adwaita/backgrounds/good-night.jpg b/packaging/macosx/Resources/themes/Adwaita/backgrounds/good-night.jpg new file mode 100644 index 000000000..0fd83401d Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/backgrounds/good-night.jpg differ diff --git a/packaging/macosx/Resources/themes/Adwaita/backgrounds/morning.jpg b/packaging/macosx/Resources/themes/Adwaita/backgrounds/morning.jpg new file mode 100644 index 000000000..33be99ef9 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/backgrounds/morning.jpg differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/.DS_Store b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/.DS_Store new file mode 100644 index 000000000..79d53e299 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/.DS_Store differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-insens.png new file mode 100644 index 000000000..e87bb51ae Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-insens.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png new file mode 100644 index 000000000..2d10da923 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png new file mode 100644 index 000000000..5b5e93ca5 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png new file mode 100644 index 000000000..0c8dea7c4 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png new file mode 100644 index 000000000..a382bdc27 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down.png new file mode 100644 index 000000000..6019518f8 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-insens.png new file mode 100644 index 000000000..36a645225 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-insens.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png new file mode 100644 index 000000000..364984ebd Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left.png new file mode 100644 index 000000000..e7f216da6 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-insens.png new file mode 100644 index 000000000..c726f5a6f Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-insens.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-prelight.png new file mode 100644 index 000000000..934076a07 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right.png new file mode 100644 index 000000000..2f640e2ef Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png new file mode 100644 index 000000000..546fd0377 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png new file mode 100644 index 000000000..80a746dce Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png new file mode 100644 index 000000000..b89863c35 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png new file mode 100644 index 000000000..75c45c92f Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png new file mode 100644 index 000000000..fc7ce0b31 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up.png new file mode 100644 index 000000000..ad8723162 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png new file mode 100644 index 000000000..9a2d7de74 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png new file mode 100644 index 000000000..d481aa79b Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png new file mode 100644 index 000000000..c30683369 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default.png new file mode 100644 index 000000000..1150b055c Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png new file mode 100644 index 000000000..88b3b1b85 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png new file mode 100644 index 000000000..bef18a0d8 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png new file mode 100644 index 000000000..0e2a559ef Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png new file mode 100644 index 000000000..a1e7cd4f2 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png new file mode 100644 index 000000000..1493cad19 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png new file mode 100644 index 000000000..c7d0d51ae Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png new file mode 100644 index 000000000..e0d48977d Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png new file mode 100644 index 000000000..046e2c664 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png new file mode 100644 index 000000000..7a5a28e49 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png new file mode 100644 index 000000000..6ae7b9f80 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png new file mode 100644 index 000000000..ae0cc6ab7 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png new file mode 100644 index 000000000..35dc5a755 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png new file mode 100644 index 000000000..ca3b939d7 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png new file mode 100644 index 000000000..0a409ab74 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png new file mode 100644 index 000000000..026660a99 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png new file mode 100644 index 000000000..2a03148a4 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png new file mode 100644 index 000000000..02c20ffa9 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png new file mode 100644 index 000000000..5bf608de3 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png new file mode 100644 index 000000000..3ec5cfdb9 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png new file mode 100644 index 000000000..3f400ce8b Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png new file mode 100644 index 000000000..e20312bad Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png new file mode 100644 index 000000000..4aea86fce Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png new file mode 100644 index 000000000..5717fab12 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png new file mode 100644 index 000000000..b5fc666b0 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-notebook.png new file mode 100644 index 000000000..bd768dd3f Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png new file mode 100644 index 000000000..aef4a29bc Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-notebook.png new file mode 100644 index 000000000..45eee33b1 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png new file mode 100644 index 000000000..217a7e2c9 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png new file mode 100644 index 000000000..0df28c54d Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png new file mode 100644 index 000000000..a4f9bbbf5 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png new file mode 100644 index 000000000..0b7d9f3a6 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png new file mode 100644 index 000000000..4737ad1c5 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png new file mode 100644 index 000000000..b317926bc Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png new file mode 100644 index 000000000..5c8d5a45e Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png new file mode 100644 index 000000000..213387fa7 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png new file mode 100644 index 000000000..6671400bc Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png new file mode 100644 index 000000000..85839b54a Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png new file mode 100644 index 000000000..c9abe1eba Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png new file mode 100644 index 000000000..15c343f95 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png new file mode 100644 index 000000000..4fd41cdbd Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png new file mode 100644 index 000000000..3a492dac7 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png new file mode 100644 index 000000000..e16b8dd2f Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-notebook.png new file mode 100644 index 000000000..0c1404262 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-plain.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-plain.png new file mode 100644 index 000000000..cc401ea56 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-plain.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-solid.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-solid.png new file mode 100644 index 000000000..a1997b7b5 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-solid.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png new file mode 100644 index 000000000..e28e81530 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png new file mode 100644 index 000000000..246f2fc51 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/minus.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/minus.png new file mode 100644 index 000000000..4a0d12637 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/minus.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/plus.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/plus.png new file mode 100644 index 000000000..e5ac141f9 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/plus.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-h.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-h.png new file mode 100644 index 000000000..f87fa8be7 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-h.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-v.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-v.png new file mode 100644 index 000000000..f7675dd91 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-v.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-h.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-h.png new file mode 100644 index 000000000..05ffb1f86 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-h.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-v.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-v.png new file mode 100644 index 000000000..ce3e1407d Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-v.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/menu_line_h.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/menu_line_h.png new file mode 100644 index 000000000..071d5a74c Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/menu_line_h.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png new file mode 100644 index 000000000..744847e8a Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png new file mode 100644 index 000000000..7bb832c84 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/focus.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/focus.png new file mode 100644 index 000000000..24b65d372 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/focus.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/null.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/null.png new file mode 100644 index 000000000..9d7e6bedc Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/null.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/tree_header.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/tree_header.png new file mode 100644 index 000000000..b5b4b3d1f Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/tree_header.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png new file mode 100644 index 000000000..389848d97 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png new file mode 100644 index 000000000..fcd82d14b Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png new file mode 100644 index 000000000..c7d0d51ae Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png new file mode 100644 index 000000000..fe29d7378 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png new file mode 100644 index 000000000..f8da785ca Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz.png new file mode 100644 index 000000000..f8da785ca Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png new file mode 100644 index 000000000..19463a9c6 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert.png new file mode 100644 index 000000000..19463a9c6 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-horizontal.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-horizontal.png new file mode 100644 index 000000000..e6d11d78a Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-horizontal.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-vertical.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-vertical.png new file mode 100644 index 000000000..f03e15d30 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-vertical.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png new file mode 100644 index 000000000..b9a289e35 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png new file mode 100644 index 000000000..6b2a1b87a Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png new file mode 100644 index 000000000..b9f6e9bbf Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png new file mode 100644 index 000000000..3a1002ca5 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png new file mode 100644 index 000000000..1fa45af3f Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png new file mode 100644 index 000000000..c913988e9 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png new file mode 100644 index 000000000..3836396d0 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png new file mode 100644 index 000000000..b35da7bab Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png new file mode 100644 index 000000000..46207b200 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png new file mode 100644 index 000000000..74b81ada4 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-end.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-end.png new file mode 100644 index 000000000..58cacf532 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-end.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-start.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-start.png new file mode 100644 index 000000000..0b7e484bf Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-start.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame.png new file mode 100644 index 000000000..d971298ff Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png new file mode 100644 index 000000000..59c29f140 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png new file mode 100644 index 000000000..2fbc3cb12 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png new file mode 100644 index 000000000..8c4e254d8 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background.png new file mode 100644 index 000000000..b8eb29aa5 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png new file mode 100644 index 000000000..a5b62f6eb Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png new file mode 100644 index 000000000..f0d445221 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png new file mode 100644 index 000000000..3a441fe47 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background.png new file mode 100644 index 000000000..67907ed10 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png new file mode 100644 index 000000000..db0b21c05 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png new file mode 100644 index 000000000..bd8565da8 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook.png new file mode 100644 index 000000000..fd6048df7 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png new file mode 100644 index 000000000..e5646a4d1 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png new file mode 100644 index 000000000..765c39712 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png new file mode 100644 index 000000000..fab96d6ce Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left.png new file mode 100644 index 000000000..381c23e4e Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png new file mode 100644 index 000000000..ad2d60c97 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right.png new file mode 100644 index 000000000..e01501bd4 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png new file mode 100644 index 000000000..94acac0d0 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top.png new file mode 100644 index 000000000..d5fe3ac5f Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png new file mode 100644 index 000000000..917347880 Binary files /dev/null and b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc new file mode 100644 index 000000000..2462866bf --- /dev/null +++ b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc @@ -0,0 +1,2391 @@ +# Bridge | ScionicSpectre + +gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#000000\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#4A90D9\nselected_fg_color:#FFFFFF\ntext_color:#313739\nbg_color:#EDEDED\ninsensitive_bg_color:#F4F4F2\ntooltip_bg_color:#343434" + +gtk-auto-mnemonics = 1 +gtk-primary-button-warps-slider = 1 + +style "default" +{ + xthickness = 1 + ythickness = 1 + + # Style Properties + + GtkWidget::focus-line-width = 1 + GtkMenuBar::window-dragging = 1 + GtkToolbar::window-dragging = 1 + GtkToolbar::internal-padding = 4 + GtkToolButton::icon-spacing = 4 + + GtkWidget::tooltip-radius = 3 + GtkWidget::tooltip-alpha = 235 + GtkWidget::new-tooltip-style = 1 #for compatibility + + GtkSeparatorMenuItem::horizontal-padding = 3 + GtkSeparatorMenuItem::wide-separators = 1 + GtkSeparatorMenuItem::separator-height = 1 + + GtkButton::child-displacement-y = 0 + GtkButton::default-border = { 0, 0, 0, 0 } + GtkButton::default-outside_border = { 0, 0, 0, 0 } + + GtkEntry::state-hint = 1 + + GtkScrollbar::trough-border = 0 + GtkRange::trough-border = 0 + GtkRange::slider-width = 13 + GtkRange::stepper-size = 0 + + GtkScrollbar::activate-slider = 1 + GtkScrollbar::has-backward-stepper = 0 + GtkScrollbar::has-forward-stepper = 0 + GtkScrollbar::min-slider-length = 42 + GtkScrolledWindow::scrollbar-spacing = 0 + GtkScrolledWindow::scrollbars-within-bevel = 1 + + GtkVScale::slider_length = 16 + GtkVScale::slider_width = 16 + GtkHScale::slider_length = 16 + GtkHScale::slider_width = 17 + + GtkStatusbar::shadow_type = GTK_SHADOW_NONE + GtkSpinButton::shadow_type = GTK_SHADOW_NONE + GtkMenuBar::shadow-type = GTK_SHADOW_NONE + GtkToolbar::shadow-type = GTK_SHADOW_NONE + GtkMenuBar::internal-padding = 0 #( every window is misaligned for the sake of menus ): + GtkMenu::horizontal-padding = 0 + GtkMenu::vertical-padding = 0 + + GtkCheckButton::indicator_spacing = 3 + GtkOptionMenu::indicator_spacing = { 8, 2, 0, 0 } + + GtkTreeView::row_ending_details = 0 + GtkTreeView::expander-size = 11 + GtkTreeView::vertical-separator = 4 + GtkTreeView::horizontal-separator = 4 + GtkTreeView::allow-rules = 1 + + GtkExpander::expander-size = 11 + + # Colors + + bg[NORMAL] = @bg_color + bg[PRELIGHT] = shade (1.02, @bg_color) + bg[SELECTED] = @selected_bg_color + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = shade (0.9, @bg_color) + + fg[NORMAL] = @text_color + fg[PRELIGHT] = @fg_color + fg[SELECTED] = @selected_fg_color + fg[INSENSITIVE] = darker (@bg_color) + fg[ACTIVE] = @fg_color + + text[NORMAL] = @text_color + text[PRELIGHT] = @text_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = darker (@bg_color) + text[ACTIVE] = @selected_fg_color + + base[NORMAL] = @base_color + base[PRELIGHT] = shade (0.95, @bg_color) + base[SELECTED] = @selected_bg_color + base[INSENSITIVE] = @bg_color + base[ACTIVE] = shade (0.9, @selected_bg_color) + + # For succinctness, all reasonable pixmap options remain here + + engine "pixmap" + { + + # Check Buttons + + image + { + function = CHECK + recolorable = TRUE + state = NORMAL + shadow = OUT + overlay_file = "Check-Radio/checkbox-unchecked.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = PRELIGHT + shadow = OUT + overlay_file = "Check-Radio/checkbox-unchecked.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = ACTIVE + shadow = OUT + overlay_file = "Check-Radio/checkbox-unchecked.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = SELECTED + shadow = OUT + overlay_file = "Check-Radio/checkbox-unchecked.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = INSENSITIVE + shadow = OUT + overlay_file = "Check-Radio/checkbox-unchecked-insensitive.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = NORMAL + shadow = IN + overlay_file = "Check-Radio/checkbox-checked.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = PRELIGHT + shadow = IN + overlay_file = "Check-Radio/checkbox-checked.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = ACTIVE + shadow = IN + overlay_file = "Check-Radio/checkbox-checked.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = SELECTED + shadow = IN + overlay_file = "Check-Radio/checkbox-checked.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = INSENSITIVE + shadow = IN + overlay_file = "Check-Radio/checkbox-checked-insensitive.png" + overlay_stretch = FALSE + } + + # Radio Buttons + + image + { + function = OPTION + state = NORMAL + shadow = OUT + overlay_file = "Check-Radio/option-unchecked.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = PRELIGHT + shadow = OUT + overlay_file = "Check-Radio/option-unchecked.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = ACTIVE + shadow = OUT + overlay_file = "Check-Radio/option-unchecked.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = SELECTED + shadow = OUT + overlay_file = "Check-Radio/option-unchecked.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = INSENSITIVE + shadow = OUT + overlay_file = "Check-Radio/option-unchecked-insensitive.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = NORMAL + shadow = IN + overlay_file = "Check-Radio/option-checked.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = PRELIGHT + shadow = IN + overlay_file = "Check-Radio/option-checked.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = ACTIVE + shadow = IN + overlay_file = "Check-Radio/option-checked.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = SELECTED + shadow = IN + overlay_file = "Check-Radio/option-checked.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = INSENSITIVE + shadow = IN + overlay_file = "Check-Radio/option-checked-insensitive.png" + overlay_stretch = FALSE + } + + # Arrows + + image + { + function = ARROW + overlay_file = "Arrows/arrow-up.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = UP + } + image + { + function = ARROW + state = PRELIGHT + overlay_file = "Arrows/arrow-up-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = UP + } + image + { + function = ARROW + state = ACTIVE + overlay_file = "Arrows/arrow-up-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = UP + } + image + { + function = ARROW + state = INSENSITIVE + overlay_file = "Arrows/arrow-up-insens.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = UP + } + + + image + { + function = ARROW + state = NORMAL + overlay_file = "Arrows/arrow-down.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = DOWN + } + image + { + function = ARROW + state = PRELIGHT + overlay_file = "Arrows/arrow-down-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = DOWN + } + image + { + function = ARROW + state = ACTIVE + overlay_file = "Arrows/arrow-down-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = DOWN + } + image + { + function = ARROW + state = INSENSITIVE + overlay_file = "Arrows/arrow-down-insens.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = DOWN + } + + image + { + function = ARROW + overlay_file = "Arrows/arrow-left.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = LEFT + } + image + { + function = ARROW + state = PRELIGHT + overlay_file = "Arrows/arrow-left-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = LEFT + } + image + { + function = ARROW + state = ACTIVE + overlay_file = "Arrows/arrow-left-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = LEFT + } + image + { + function = ARROW + state = INSENSITIVE + overlay_file = "Arrows/arrow-left-insens.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = LEFT + } + + image + { + function = ARROW + overlay_file = "Arrows/arrow-right.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = RIGHT + } + image + { + function = ARROW + state = PRELIGHT + overlay_file = "Arrows/arrow-right-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = RIGHT + } + image + { + function = ARROW + state = ACTIVE + overlay_file = "Arrows/arrow-right-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = RIGHT + } + image + { + function = ARROW + state = INSENSITIVE + overlay_file = "Arrows/arrow-right-insens.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = RIGHT + } + + + # Option Menu Arrows + + image + { + function = TAB + state = INSENSITIVE + overlay_file = "Arrows/arrow-down-insens.png" + overlay_stretch = FALSE + } + image + { + function = TAB + state = NORMAL + overlay_file = "Arrows/arrow-down.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + } + image + { + function = TAB + state = PRELIGHT + overlay_file = "Arrows/arrow-down-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + } + + # Lines + + image + { + function = VLINE + file = "Lines/line-v.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + } + image + { + function = HLINE + file = "Lines/line-h.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + } + + # Focuslines + + image + { + function = FOCUS + file = "Others/focus.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + } + + # Handles + + image + { + function = HANDLE + overlay_file = "Handles/handle-h.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + image + { + function = HANDLE + overlay_file = "Handles/handle-v.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + + # Expanders + + image + { + function = EXPANDER + expander_style = COLLAPSED + file = "Expanders/plus.png" + } + + image + { + function = EXPANDER + expander_style = EXPANDED + file = "Expanders/minus.png" + } + + image + { + function = EXPANDER + expander_style = SEMI_EXPANDED + file = "Expanders/minus.png" + } + + image + { + function = EXPANDER + expander_style = SEMI_COLLAPSED + file = "Expanders/plus.png" + } + + image + { + function = RESIZE_GRIP + state = NORMAL + detail = "statusbar" + overlay_file = "Others/null.png" + overlay_border = { 0,0,0,0 } + overlay_stretch = FALSE + } + + # Shadows ( this area needs help :P ) + + image + { + function = SHADOW_GAP + file = "Others/null.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + } +} + +style "toplevel_hack" +{ + engine "adwaita" + { + } +} + +style "ooo_stepper_hack" +{ + GtkScrollbar::stepper-size = 13 + GtkScrollbar::has-backward-stepper = 1 + GtkScrollbar::has-forward-stepper = 1 +} + +style "scrollbar" +{ + engine "pixmap" + { + image + { + function = BOX + detail = "trough" + file = "Scrollbars/trough-scrollbar-horiz.png" + border = { 19, 19, 4, 4 } + stretch = TRUE + orientation = HORIZONTAL + } + image + { + function = BOX + detail = "trough" + file = "Scrollbars/trough-scrollbar-vert.png" + border = { 4, 4, 19, 19 } + stretch = TRUE + orientation = VERTICAL + } + +# Sliders + + image + { + function = SLIDER + state = NORMAL + file = "Scrollbars/slider-horiz.png" + border = { 7, 7, 5, 5 } + stretch = TRUE + orientation = HORIZONTAL + + } + image + { + function = SLIDER + state = ACTIVE + file = "Scrollbars/slider-horiz-active.png" + border = { 7, 7, 5, 5 } + stretch = TRUE + orientation = HORIZONTAL + + } + image + { + function = SLIDER + state = PRELIGHT + file = "Scrollbars/slider-horiz-prelight.png" + border = { 7, 7, 5, 5 } + stretch = TRUE + orientation = HORIZONTAL + + } + image + { + function = SLIDER + state = INSENSITIVE + file = "Scrollbars/slider-horiz-insens.png" + border = { 7, 7, 5, 5 } + stretch = TRUE + orientation = HORIZONTAL + } + +# X Verticals + + image + { + function = SLIDER + state = NORMAL + file = "Scrollbars/slider-vert.png" + border = { 5, 5, 7, 7 } + stretch = TRUE + orientation = VERTICAL + + } + image + { + function = SLIDER + state = ACTIVE + file = "Scrollbars/slider-vert-active.png" + border = { 5, 5, 7, 7 } + stretch = TRUE + orientation = VERTICAL + + } + image + { + function = SLIDER + state = PRELIGHT + file = "Scrollbars/slider-vert-prelight.png" + border = { 5, 5, 7, 7 } + stretch = TRUE + orientation = VERTICAL + + } + image + { + function = SLIDER + state = INSENSITIVE + file = "Scrollbars/slider-vert-insens.png" + border = { 5, 5, 7, 7 } + stretch = TRUE + orientation = VERTICAL + + } + } +} + +style "menubar" +{ + bg[PRELIGHT] = "#FFF" + fg[SELECTED] = @text_color + + xthickness = 0 + ythickness = 0 + + engine "pixmap" + { + image + { + function = BOX + recolorable = TRUE + state = PRELIGHT + file = "Menu-Menubar/menubar_button.png" + + border = { 4, 4, 4, 4 } + stretch = TRUE + } + } +} + +style "menu" +{ + xthickness = 0 + ythickness = 0 + + GtkMenuItem::arrow-scaling = 0.4 + + bg[NORMAL] = shade (1.08, @bg_color) + bg[INSENSITIVE] = @base_color + bg[PRELIGHT] = @base_color + + engine "pixmap" # For menus that use horizontal lines rather than gtkseparator + { + image + { + function = HLINE + file = "Lines/menu_line_h.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + } + } +} + +style "menu_framed_box" +{ + engine "adwaita" + { + } +} + +style "menu_item" +{ + xthickness = 2 + ythickness = 4 + + # HACK: Gtk doesn't actually read this value + # while rendering the menu items, but Libreoffice + # does; setting this value equal to the one in + # fg[PRELIGHT] ensures a code path in the LO theming code + # that falls back to a dark text color for menu item text + # highlight. The price to pay is black text on menus as well, + # but at least it's readable. + # See https://bugs.freedesktop.org/show_bug.cgi?id=38038 + bg[SELECTED] = @selected_fg_color + + bg[PRELIGHT] = @selected_bg_color + fg[PRELIGHT] = @selected_fg_color + text[PRELIGHT] = @selected_fg_color + + engine "pixmap" + { + + # Check Buttons + + image + { + function = CHECK + recolorable = TRUE + state = NORMAL + shadow = OUT + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = PRELIGHT + shadow = OUT + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = ACTIVE + shadow = OUT + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = INSENSITIVE + shadow = OUT + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = NORMAL + shadow = IN + overlay_file = "Check-Radio/menucheck.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = PRELIGHT + shadow = IN + overlay_file = "Check-Radio/menucheck_prelight.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = ACTIVE + shadow = IN + overlay_file = "Check-Radio/menucheck.png" + overlay_stretch = FALSE + } + image + { + function = CHECK + recolorable = TRUE + state = INSENSITIVE + shadow = IN + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + + # Radio Buttons + + image + { + function = OPTION + state = NORMAL + shadow = OUT + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = PRELIGHT + shadow = OUT + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = ACTIVE + shadow = OUT + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = INSENSITIVE + shadow = OUT + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = NORMAL + shadow = IN + overlay_file = "Check-Radio/menuoption.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = PRELIGHT + shadow = IN + overlay_file = "Check-Radio/menuoption_prelight.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = ACTIVE + shadow = IN + overlay_file = "Check-Radio/menuoption.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + state = INSENSITIVE + shadow = IN + overlay_file = "Others/null.png" + overlay_stretch = FALSE + } + image + { + function = SHADOW # This fixes boxy Qt menu items + file = "Others/null.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + # Arrow Buttons + + image + { + function = ARROW + state = NORMAL + overlay_file = "Arrows/menu-arrow.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = RIGHT + } + image + { + function = ARROW + state = PRELIGHT + overlay_file = "Arrows/menu-arrow-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = RIGHT + } + } +} + +style "menubar_item" +{ + xthickness = 2 + ythickness = 3 + bg[PRELIGHT] = @selected_fg_color + fg[PRELIGHT] = @text_color +} + +style "button" +{ + xthickness = 4 + ythickness = 3 + + engine "pixmap" + { + image + { + function = BOX + state = NORMAL + file = "Buttons/button-default.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + state = PRELIGHT + file = "Buttons/button-prelight.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + state = ACTIVE + file = "Buttons/button-pressed.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + state = INSENSITIVE + file = "Buttons/button-insensitive.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + } +} + +style "button_nohilight" +{ + xthickness = 4 + ythickness = 3 + + engine "pixmap" + { + image + { + function = BOX + state = NORMAL + file = "Buttons/button-default-nohilight.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + state = PRELIGHT + file = "Buttons/button-prelight-nohilight.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + state = ACTIVE + file = "Buttons/button-pressed-nohilight.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + state = INSENSITIVE + file = "Buttons/button-insensitive-nohilight.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + } +} + +style "checkbutton" +{ + fg[PRELIGHT] = @text_color + fg[ACTIVE] = @text_color +} + +style "entry" +{ + xthickness = 3 + ythickness = 4 + + base[NORMAL] = @base_color + base[INSENSITIVE] = @insensitive_bg_color + + engine "pixmap" + { + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/entry-border-bg.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = SHADOW + detail = "entry" + state = INSENSITIVE + shadow = IN + file = "Entry/entry-border-disabled-bg.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/entry-border-active-bg.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + overlay_file = "Entry/entry-border-fill.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + overlay_file = "Entry/entry-border-fill.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + } +} + +style "notebook_entry" +{ + engine "pixmap" + { + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/entry-border-notebook.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = SHADOW + detail = "entry" + state = INSENSITIVE + shadow = IN + file = "Entry/entry-border-disabled-notebook.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/entry-border-active-notebook.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + } +} + +style "notebook_tab_label" +{ + fg[ACTIVE] = @text_color +} + +style "combobox_entry" +{ + xthickness = 3 + ythickness = 4 + + engine "pixmap" + { + # LTR version + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/combo-entry-border-bg.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + image + { + function = SHADOW + detail = "entry" + state = INSENSITIVE + shadow = IN + file = "Entry/combo-entry-border-disabled-bg.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/combo-entry-border-active-bg.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + + # RTL version + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/combo-entry-border-rtl-bg.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + image + { + function = SHADOW + detail = "entry" + state = INSENSITIVE + shadow = IN + file = "Entry/combo-entry-border-disabled-rtl-bg.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/combo-entry-border-active-rtl-bg.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + } +} + +style "notebook_combobox_entry" +{ + engine "pixmap" + { + # LTR version + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/combo-entry-border-notebook.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + image + { + function = SHADOW + detail = "entry" + state = INSENSITIVE + shadow = IN + file = "Entry/combo-entry-border-disabled-notebook.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/combo-entry-border-active-notebook.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + + # RTL version + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/combo-entry-border-rtl-notebook.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + image + { + function = SHADOW + detail = "entry" + state = INSENSITIVE + shadow = IN + file = "Entry/combo-entry-border-disabled-rtl-notebook.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/combo-entry-border-active-rtl-notebook.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + } +} + +style "combobox_entry_button" +{ + fg[ACTIVE] = @text_color + + engine "pixmap" + { + + # LTR version + image + { + function = BOX + state = NORMAL + file = "Entry/combo-entry-button.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + image + { + function = BOX + state = PRELIGHT + file = "Entry/combo-entry-button.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + image + { + function = BOX + state = INSENSITIVE + file = "Entry/combo-entry-button-disabled.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + image + { + function = BOX + state = ACTIVE + file = "Entry/combo-entry-button-active.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + + # RTL version + image + { + function = BOX + state = NORMAL + file = "Entry/combo-entry-button-rtl.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + image + { + function = BOX + state = PRELIGHT + file = "Entry/combo-entry-button-rtl.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + image + { + function = BOX + state = INSENSITIVE + file = "Entry/combo-entry-button-disabled-rtl.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + image + { + function = BOX + state = ACTIVE + file = "Entry/combo-entry-button-active-rtl.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + + } +} + +style "spinbutton" +{ + bg[NORMAL] = @bg_color + + xthickness = 3 + ythickness = 4 + + engine "pixmap" + { + image + { + function = ARROW + } + + # Spin-Up LTR + image + { + function = BOX + state = NORMAL + detail = "spinbutton_up" + file = "Spin/up-background.png" + border = { 1, 4, 5, 0 } + stretch = TRUE + overlay_file = "Arrows/arrow-up-small.png" + overlay_stretch = FALSE + direction = LTR + } + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_up" + file = "Spin/up-background.png" + border = { 1, 4, 5, 0 } + stretch = TRUE + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + direction = LTR + } + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_up" + file = "Spin/up-background-disable.png" + border = { 1, 4, 5, 0 } + stretch = TRUE + overlay_file = "Arrows/arrow-up-small-insens.png" + overlay_stretch = FALSE + direction = LTR + } + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_up" + file = "Spin/up-background.png" + border = { 1, 4, 5, 0 } + stretch = TRUE + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + direction = LTR + } + + # Spin-Up RTL + image + { + function = BOX + state = NORMAL + detail = "spinbutton_up" + file = "Spin/up-background-rtl.png" + border = { 4, 1, 5, 0 } + stretch = TRUE + overlay_file = "Arrows/arrow-up-small.png" + overlay_stretch = FALSE + direction = RTL + } + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_up" + file = "Spin/up-background-rtl.png" + border = { 4, 1, 5, 0 } + stretch = TRUE + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + direction = RTL + } + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_up" + file = "Spin/up-background-disable-rtl.png" + border = { 4, 1, 5, 0 } + stretch = TRUE + overlay_file = "Arrows/arrow-up-small-insens.png" + overlay_stretch = FALSE + direction = RTL + } + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_up" + file = "Spin/up-background-rtl.png" + border = { 4, 1, 5, 0 } + stretch = TRUE + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + direction = RTL + } + + # Spin-Down LTR + image + { + function = BOX + state = NORMAL + detail = "spinbutton_down" + file = "Spin/down-background.png" + border = { 1, 4, 1, 4 } + stretch = TRUE + overlay_file = "Arrows/arrow-down-small.png" + overlay_stretch = FALSE + direction = LTR + } + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_down" + file = "Spin/down-background.png" + border = { 1, 4, 1, 4 } + stretch = TRUE + overlay_file = "Arrows/arrow-down-small-prelight.png" + overlay_stretch = FALSE + direction = LTR + } + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_down" + file = "Spin/down-background-disable.png" + border = { 1, 4, 1, 4 } + stretch = TRUE + overlay_file = "Arrows/arrow-down-small-insens.png" + overlay_stretch = FALSE + direction = LTR + } + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_down" + file = "Spin/down-background.png" + border = { 1, 4, 1, 4 } + stretch = TRUE + overlay_file = "Arrows/arrow-down-small-prelight.png" + overlay_stretch = FALSE + direction = LTR + } + + # Spin-Down RTL + image + { + function = BOX + state = NORMAL + detail = "spinbutton_down" + file = "Spin/down-background-rtl.png" + border = { 4, 1, 1, 4 } + stretch = TRUE + overlay_file = "Arrows/arrow-down-small.png" + overlay_stretch = FALSE + direction = RTL + } + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_down" + file = "Spin/down-background-rtl.png" + border = { 4, 1, 1, 4 } + stretch = TRUE + overlay_file = "Arrows/arrow-down-small-prelight.png" + overlay_stretch = FALSE + direction = RTL + } + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_down" + file = "Spin/down-background-disable-rtl.png" + border = { 4, 1, 1, 4 } + stretch = TRUE + overlay_file = "Arrows/arrow-down-small-insens.png" + overlay_stretch = FALSE + direction = RTL + } + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_down" + file = "Spin/down-background-rtl.png" + border = { 4, 1, 1, 4 } + stretch = TRUE + overlay_file = "Arrows/arrow-down-small-prelight.png" + overlay_stretch = FALSE + direction = RTL + } + } +} + +style "gimp_spin_scale" +{ + bg[NORMAL] = @base_color + + engine "pixmap" + { + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + } + + image + { + function = BOX + state = NORMAL + detail = "spinbutton_up" + overlay_file = "Arrows/arrow-up-small.png" + overlay_stretch = FALSE + } + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_up" + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + } + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_up" + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + } + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_up" + overlay_file = "Arrows/arrow-up-small-insens.png" + overlay_stretch = FALSE + } + image + { + function = BOX + state = NORMAL + detail = "spinbutton_down" + overlay_file = "Arrows/arrow-down-small.png" + overlay_stretch = FALSE + } + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_down" + overlay_file = "Arrows/arrow-down-small-prelight.png" + overlay_stretch = FALSE + } + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_down" + overlay_file = "Arrows/arrow-down-small-prelight.png" + overlay_stretch = FALSE + } + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_down" + overlay_file = "Arrows/arrow-down-small-insens.png" + overlay_stretch = FALSE + } + } +} + +style "libreoffice_entry" +{ + engine "pixmap" + { + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + overlay_file = "Entry/entry-border-fill-solid.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + overlay_file = "Entry/entry-border-fill-solid.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/entry-border-bg-solid.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/entry-border-active-bg-solid.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + } +} + +style "standalone_entry" +{ + engine "pixmap" + { + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + file = "Entry/entry-border-fill-plain.png" + stretch = TRUE + border = { 0, 0, 0, 0 } + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + file = "Entry/entry-border-fill-plain.png" + stretch = TRUE + border = { 0, 0, 0, 0 } + } + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/entry-border-bg-solid.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/entry-border-active-bg-solid.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + } +} + +style "notebook" +{ + + xthickness = 5 + ythickness = 2 + + engine "pixmap" + { + image + { + function = EXTENSION + state = ACTIVE + file = "Tabs/tab-bottom.png" + border = { 3,3,3,5 } + stretch = TRUE + gap_side = TOP + } + image + { + function = EXTENSION + state = ACTIVE + file = "Tabs/tab-top.png" + border = { 3,3,5,3 } + stretch = TRUE + gap_side = BOTTOM + } + image + { + function = EXTENSION + state = ACTIVE + file = "Tabs/tab-left.png" + border = { 3,3,3,3 } + stretch = TRUE + gap_side = RIGHT + } + image + { + function = EXTENSION + state = ACTIVE + file = "Tabs/tab-right.png" + border = { 3,3,3,3 } + stretch = TRUE + gap_side = LEFT + } + image + { + function = EXTENSION + file = "Tabs/tab-top-active.png" + border = { 3,3,3,3 } + stretch = TRUE + gap_side = BOTTOM + } + image + { + function = EXTENSION + file = "Tabs/tab-bottom-active.png" + border = { 3,3,3,3 } + stretch = TRUE + gap_side = TOP + } + image + { + function = EXTENSION + file = "Tabs/tab-left-active.png" + border = { 3,3,3,3 } + stretch = TRUE + gap_side = RIGHT + } + image + { + function = EXTENSION + file = "Tabs/tab-right-active.png" + border = { 3,3,3,3 } + stretch = TRUE + gap_side = LEFT + } + +# How to draw boxes with a gap on one side (ie the page of a notebook) + + image + { + function = BOX_GAP + file = "Tabs/notebook.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + gap_file = "Tabs/notebook-gap-horiz.png" + gap_border = { 1, 1, 0, 0 } + gap_side = TOP + } + image + { + function = BOX_GAP + file = "Tabs/notebook.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + gap_file = "Tabs/notebook-gap-horiz.png" + gap_border = { 1, 1, 0, 0 } + gap_side = BOTTOM + } + image + { + function = BOX_GAP + file = "Tabs/notebook.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + gap_file = "Tabs/notebook-gap-vert.png" + gap_border = { 0, 0, 1, 1 } + gap_side = LEFT + } + image + { + function = BOX_GAP + file = "Tabs/notebook.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + gap_file = "Tabs/notebook-gap-vert.png" + gap_border = { 0, 0, 1, 1 } + gap_side = RIGHT + } + +# How to draw the box of a notebook when it isnt attached to a tab + + image + { + function = BOX + file = "Tabs/notebook.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + } +} + +style "handlebox" +{ + engine "pixmap" + { + image + { + function = BOX + file = "Others/null.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + detail = "handlebox_bin" + shadow = IN + } + image + { + function = BOX + file = "Others/null.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + detail = "handlebox_bin" + shadow = OUT + } + } +} + +style "combobox_separator" +{ + xthickness = 0 + ythickness = 0 + GtkWidget::wide-separators = 1 +} + +style "combobox" +{ + xthickness = 0 + ythickness = 0 +} + +style "combobox_button" +{ + xthickness = 2 + ythickness = 2 +} + +style "range" +{ + engine "pixmap" + { + image + { + function = BOX + detail = "trough" + file = "Range/trough-horizontal.png" + border = { 4, 4, 0, 0 } + stretch = TRUE + orientation = HORIZONTAL + } + image + { + function = BOX + detail = "trough" + file = "Range/trough-vertical.png" + border = { 0, 0, 4, 4 } + stretch = TRUE + orientation = VERTICAL + } + + # Horizontal + + image + { + function = SLIDER + state = NORMAL + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-horiz.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + image + { + function = SLIDER + state = PRELIGHT + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-horiz-prelight.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + image + { + function = SLIDER + state = INSENSITIVE + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-horiz.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + + # Vertical + + image + { + function = SLIDER + state = NORMAL + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-vert.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + image + { + function = SLIDER + state = PRELIGHT + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-vert-prelight.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + image + { + function = SLIDER + state = INSENSITIVE + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-vert.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + + # Function below removes ugly boxes + image + { + function = BOX + file = "Others/null.png" + border = { 3, 3, 3, 3 } + stretch = TRUE + } + + } +} + +style "progressbar" +{ + xthickness = 1 + ythickness = 1 + + engine "pixmap" + { + image + { + function = BOX + detail = "trough" + file = "ProgressBar/trough-progressbar.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + orientation = HORIZONTAL + } + image + { + function = BOX + detail = "bar" + file = "ProgressBar/progressbar.png" + stretch = TRUE + border = { 3, 3, 3, 3 } + orientation = HORIZONTAL + } + image + { + function = BOX + detail = "trough" + file = "ProgressBar/trough-progressbar_v.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + orientation = VERTICAL + } + image + { + function = BOX + detail = "bar" + file = "ProgressBar/progressbar_v.png" + stretch = TRUE + border = { 3, 3, 3, 3 } + orientation = VERTICAL + } + } +} + +style "separator_menu_item" +{ + engine "pixmap" + { + image + { + function = BOX + file = "Lines/menu_line_h.png" + border = { 0, 0, 1, 0 } + stretch = TRUE + } + } +} + +style "treeview_header" +{ + ythickness = 1 + + fg[NORMAL] = shade(0.55, @bg_color) + fg[PRELIGHT] = shade(0.80, @text_color) + font_name = "Bold" + + engine "pixmap" + { + image + { + function = BOX + file = "Others/tree_header.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + } + } +} + +style "scrolled_window" +{ + xthickness = 1 + ythickness = 1 + + engine "pixmap" + { + image + { + function = SHADOW + file = "Shadows/frame.png" + border = { 5, 5, 5, 5 } + stretch = TRUE + } + } +} + +style "frame" +{ + xthickness = 1 + ythickness = 1 + + engine "pixmap" + { + image + { + function = SHADOW + file = "Shadows/frame.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + shadow = IN + } + image + { + function = SHADOW_GAP + file = "Shadows/frame.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + gap_start_file = "Shadows/frame-gap-start.png" + gap_start_border = { 1, 0, 0, 0 } + gap_end_file = "Shadows/frame-gap-end.png" + gap_end_border = { 0, 1, 0, 0 } + shadow = IN + } + image + { + function = SHADOW + file = "Shadows/frame.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + shadow = OUT + } + image + { + function = SHADOW_GAP + file = "Shadows/frame.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + gap_start_file = "Shadows/frame-gap-start.png" + gap_start_border = { 1, 0, 0, 0 } + gap_end_file = "Shadows/frame-gap-end.png" + gap_end_border = { 0, 1, 0, 0 } + shadow = OUT + } + image + { + function = SHADOW + file = "Shadows/frame.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + shadow = ETCHED_IN + } + image + { + function = SHADOW_GAP + file = "Shadows/frame.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + gap_start_file = "Shadows/frame-gap-start.png" + gap_start_border = { 1, 0, 0, 0 } + gap_end_file = "Shadows/frame-gap-end.png" + gap_end_border = { 0, 1, 0, 0 } + shadow = ETCHED_IN + } + image + { + function = SHADOW + file = "Shadows/frame.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + shadow = ETCHED_OUT + } + image + { + function = SHADOW_GAP + file = "Shadows/frame.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + gap_start_file = "Shadows/frame-gap-start.png" + gap_start_border = { 1, 0, 0, 0 } + gap_end_file = "Shadows/frame-gap-end.png" + gap_end_border = { 0, 1, 0, 0 } + shadow = ETCHED_OUT + } + } +} + +style "gimp_toolbox_frame" +{ + engine "pixmap" + { + image + { + function = SHADOW + } + } +} + +style "toolbar" +{ + engine "pixmap" + { + image + { + function = SHADOW + } + } +} + +style "inline_toolbar" +{ + GtkToolbar::button-relief = GTK_RELIEF_NORMAL + + engine "pixmap" + { + image + { + function = BOX + file = "Toolbar/inline-toolbar.png" + stretch = TRUE + } + } +} + +style "notebook_viewport" +{ + bg[NORMAL] = @base_color +} + +style "tooltips" +{ + xthickness = 8 + ythickness = 4 + + bg[NORMAL] = @tooltip_bg_color + fg[NORMAL] = @tooltip_fg_color + bg[SELECTED] = @tooltip_bg_color +} + +style "eclipse-tooltips" +{ + xthickness = 8 + ythickness = 4 + + bg[NORMAL] = shade(1.05, @bg_color) + fg[NORMAL] = @text_color + bg[SELECTED] = shade(1.05, @bg_color) +} + +# Chromium +style "chrome-gtk-frame" +{ + ChromeGtkFrame::frame-color = @bg_color + ChromeGtkFrame::inactive-frame-color = @bg_color + + ChromeGtkFrame::frame-gradient-size = 16 + ChromeGtkFrame::frame-gradient-color = shade(1.07, @bg_color) + + ChromeGtkFrame::incognito-frame-color = shade(0.85, @bg_color) + ChromeGtkFrame::incognito-inactive-frame-color = @bg_color + + ChromeGtkFrame::incognito-frame-gradient-color = @bg_color + + ChromeGtkFrame::scrollbar-trough-color = shade(0.912, @bg_color) + ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_color) + ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color +} + +style "chrome_menu_item" +{ + bg[SELECTED] = @selected_bg_color +} + +style "null" +{ + engine "pixmap" + { + image + { + function = BOX + file = "Others/null.png" + stretch = TRUE + } + } +} + + +class "GtkWidget" style "default" +class "GtkScrollbar" style "scrollbar" +class "GtkButton" style "button" +class "GtkEntry" style "entry" +class "GtkOldEditable" style "entry" +class "GtkSpinButton" style "spinbutton" +class "GtkNotebook" style "notebook" +class "GtkRange" style "range" +class "GtkProgressBar" style "progressbar" +class "GtkSeparatorMenuItem" style "separator_menu_item" +class "GtkScrolledWindow" style "scrolled_window" +class "GtkFrame" style "frame" +class "GtkToolbar" style "toolbar" + +widget_class "**" style "menubar" +widget_class "**" style "menu" +widget_class "**" style "menu_framed_box" +widget_class "**" style "menu_item" +widget_class "*.*" style "menubar_item" +widget_class "**" style "checkbutton" +widget_class "*" style "combobox" +widget_class "**" style "combobox_button" +widget_class "**" style "combobox_separator" +widget_class "*HandleBox" style "handlebox" +widget_class "***" style "treeview_header" +widget_class "**" style "inline_toolbar" +widget_class "***" style "button_nohilight" +widget_class "**" style "combobox_entry" +widget_class "**" style "combobox_entry_button" +widget_class "**" style "button_nohilight" +widget_class "***" style "notebook_viewport" + +# Entries in notebooks draw with notebook's base color, but not if there's +# something else in the middle that draws gray again +widget_class "**" style "notebook_entry" +widget_class "***" style "entry" + +widget_class "***" style "notebook_combobox_entry" +widget_class "****" style "combobox_entry" + +# We also need to avoid changing fg color for the inactive notebook tab labels +widget_class "*." style "notebook_tab_label" + +# GTK tooltips +widget "gtk-tooltip*" style "tooltips" + +# Xchat special cases +widget "*xchat-inputbox" style "entry" + +# GIMP +# Disable gradients completely for GimpSpinScale +class "GimpSpinScale" style "gimp_spin_scale" +# Remove borders from "Wilbert frame" in Gimp +widget_class "**" style "gimp_toolbox_frame" + +# Chrome/Chromium +class "ChromeGtkFrame" style "chrome-gtk-frame" +widget_class "*Chrom*Button*" style "button" +widget_class "***" style "chrome_menu_item" + +# We use this weird selector to target an offscreen entry as created +# by Chrome/Chromium to derive the style for its toolbar +widget_class "" style "standalone_entry" + +# Eclipse/SWT +widget "gtk-tooltips*" style "eclipse-tooltips" +widget "*swt-toolbar-flat" style "null" + +# Openoffice, Libreoffice +class "GtkWindow" style "toplevel_hack" +widget "*openoffice-toplevel*" style "ooo_stepper_hack" +widget "*openoffice-toplevel*GtkEntry" style "libreoffice_entry" +widget "*openoffice-toplevel*GtkSpinButton" style "libreoffice_entry" +widget "*libreoffice-toplevel*GtkEntry" style "libreoffice_entry" +widget "*libreoffice-toplevel*GtkSpinButton" style "libreoffice_entry" diff --git a/packaging/macosx/Resources/themes/Adwaita/index.theme b/packaging/macosx/Resources/themes/Adwaita/index.theme new file mode 100644 index 000000000..a3bbc428c --- /dev/null +++ b/packaging/macosx/Resources/themes/Adwaita/index.theme @@ -0,0 +1,141 @@ +[X-GNOME-Metatheme] +Name=Adwaita +Name[af]=Adwaita +Name[an]=Adwaita +Name[ar]=أدوايتا +Name[as]=Adwaita +Name[be]=Adwaita +Name[bg]=Адвайта +Name[bn_IN]=অদৈত +Name[ca]=Adwaita +Name[ca@valencia]=Adwaita +Name[cs]=Adwaita +Name[da]=Adwaita +Name[de]=Adwaita +Name[el]=Adwaita +Name[en_CA]=Adwaita +Name[en_GB]=Adwaita +Name[eo]=Adwaita +Name[es]=Adwaita +Name[et]=Adwaita +Name[eu]=Adwaita +Name[fa]=آدوایتا +Name[fi]=Adwaita +Name[fr]=Adwaita +Name[fy]=Adwaita +Name[ga]=Adwaita +Name[gl]=Adwaita +Name[gu]=Adwaita +Name[he]=Adwaita +Name[hi]=अद्वैत +Name[hu]=Adwaita +Name[id]=Adwaita +Name[it]=Adwaita +Name[ja]=アドワイチャ +Name[km]=Adwaita +Name[kn]=ಅದ್ವೈತ +Name[ko]=애드와이타 +Name[lt]=Adwaita +Name[lv]=Adwaita +Name[ml]=അദ്വൈതം +Name[mr]=Adwaita +Name[nb]=Adwaita +Name[nl]=Adwaita +Name[or]=Adwaita +Name[pa]=ਅਡਵੇਟਾ +Name[pl]=Adwaita +Name[pt]=Adwaita +Name[pt_BR]=Adwaita +Name[ro]=Adwaita +Name[ru]=Адвайта +Name[sk]=Adwaita +Name[sl]=Adwaita +Name[sr]=Адвајта +Name[sr@latin]=Advajta +Name[sv]=Adwaita +Name[ta]=அத்வைதா +Name[te]=అద్వైత +Name[tg]=Адваита +Name[th]=อัทไวตะ +Name[tr]=Sadece bir tane +Name[ug]=Adwaita +Name[uk]=Адвайта +Name[uz@cyrillic]=Адвайта +Name[vi]=Adwaita +Name[zh_CN]=Adwaita +Name[zh_HK]=唯一 +Name[zh_TW]=唯一 +Type=X-GNOME-Metatheme +Comment=There is only one +Comment[af]=Daar is slegs een +Comment[an]=Solo bi ha que uno +Comment[ar]=هناك واحدة فقط +Comment[as]=কেৱল এটা আছে +Comment[be]=Адзіны і непаўторны +Comment[bg]=Един единствен има само +Comment[bn_IN]=শুধুমাত্র একটি রয়েছে +Comment[ca]=Només n'hi ha un +Comment[ca@valencia]=Només n'hi ha un +Comment[cs]=Je jen jedna +Comment[da]=Der er kun en +Comment[de]=Es gibt nur eines +Comment[el]=Υπάρχει μόνο μία +Comment[en_CA]=There is only one +Comment[en_GB]=There is only one +Comment[eo]=Tie nur unu estas +Comment[es]=Solo existe uno +Comment[et]=Ainult üks ongi +Comment[eu]=Bat bakarrik dago +Comment[fa]=فقط یکی وجود دارد +Comment[fi]=On vain yksi +Comment[fr]=Il n'y en a qu'un seul +Comment[fur]=Al è nome un +Comment[fy]=Der is inkeld ien +Comment[ga]=Níl ach ceann amháin +Comment[gl]=Só existe un +Comment[gu]=ત્યાં ફક્ત એક છે +Comment[he]=האחד והיחיד +Comment[hi]=केवल एक है +Comment[hu]=Csak egy van +Comment[id]=Hanya ada satu +Comment[it]=Il solo e l'unico +Comment[ja]=唯一無二 +Comment[km]=មាន​តែ​មួយ​គត់ +Comment[kn]=ಕೇವಲ ಒಂದು ಮಾತ್ರ ಇದೆ +Comment[ko]=오직 하나 뿐! +Comment[lt]=Yra vienintelė +Comment[lv]=Ir tikai viens +Comment[ml]=ഒരെണ്ണം മാത്രമേ ഉള്ളു +Comment[mr]=फक्त एकाच आहे +Comment[nb]=Det finnes bare én +Comment[nl]=Er is er maar één +Comment[or]=ସେଠାରେ କେବଳ ଗୋଟିଏ ଅଛି +Comment[pa]=ਸਿਰਫ਼ ਇੱਕ ਹੀ ਹੈ +Comment[pl]=Może być tylko jeden +Comment[pt]=Apenas existe um +Comment[pt_BR]=Há apenas um +Comment[ro]=Există doar unul singur +Comment[ru]=Единственная +Comment[sk]=Je len jediná +Comment[sl]=Lahko je le eden +Comment[sr]=Постоји само једна +Comment[sr@latin]=Postoji samo jedna +Comment[sv]=Det finns bara en +Comment[ta]=ஒன்றே ஒன்றூ உள்ளது +Comment[te]=అక్కడ ఒకటే ఉన్నది +Comment[tg]=Танҳо якто мавҷуд аст +Comment[th]=หนึ่งเดียวเท่านั้น +Comment[tr]=Sadece bir tane var +Comment[ug]=پەقەت بىرىلا بار +Comment[uk]=Існує лише одна +Comment[uz@cyrillic]=Фақат битта бор +Comment[vi]=Chỉ có một +Comment[zh_CN]=只有一个 +Comment[zh_HK]=只有唯一一個 +Comment[zh_TW]=只有唯一一個 +Encoding=UTF-8 +GtkTheme=Adwaita +MetacityTheme=Adwaita +IconTheme=gnome +CursorTheme=Adwaita +CursorSize=24 diff --git a/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-2.xml b/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-2.xml new file mode 100644 index 000000000..6d21d882e --- /dev/null +++ b/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-2.xml @@ -0,0 +1,1604 @@ + + + + Adwaita + GNOME Art Team <art.gnome.org> + Â Intel, Â Red Hat, Lapo Calamandrei + 2010 + Default GNOME 3 window theme + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2)) + 1" + color="C_title_focused" /> +</draw_ops> + +<draw_ops name="title_unfocused"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2)) + 1" + color="C_title_unfocused"/> +</draw_ops> + + <!-- window decorations --> + +<draw_ops name="entire_background_focused"> + <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="entire_background_unfocused"> + <include name="entire_background_focused" /> +</draw_ops> + +<draw_ops name="titlebar_fill_focused"> + <gradient type="vertical" x="0" y="0" width="width" height="height"> + <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" /> + <color value="gtk:bg[NORMAL]"/> + <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.06" /> + </gradient> +</draw_ops> + +<draw_ops name="titlebar_fill_focused_alt"> + <gradient type="vertical" x="0" y="0" width="width" height="height"> + <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" /> + <!-- <color value="gtk:bg[NORMAL]"/> --> + <!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> --> + <color value="gtk:bg[NORMAL]"/> + </gradient> +</draw_ops> + +<draw_ops name="titlebar_fill_unfocused"> + <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="titlebar_unfocused"> + <include name="titlebar_fill_unfocused" /> + <line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="hilight"> + <line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" /> + <gradient type="vertical" x="1" y="1" width="1" height="height-4"> + <color value="C_titlebar_focused_hilight" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> + </gradient> +</draw_ops> + +<draw_ops name="rounded_hilight"> + <line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" /> + <arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7" start_angle="270" extent_angle="90" /> + <arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7" start_angle="0" extent_angle="90" /> + <gradient type="vertical" x="1" y="5" width="1" height="height-9"> + <color value="C_titlebar_focused_hilight" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> + </gradient> +</draw_ops> + +<draw_ops name="titlebar_focused"> + <include name="titlebar_fill_focused_alt" /> + <include name="hilight" /> +</draw_ops> + +<draw_ops name="titlebar_focused_alt"> + <include name="titlebar_fill_focused_alt" /> + <include name="hilight" /> +</draw_ops> + +<draw_ops name="rounded_titlebar_focused"> + <include name="titlebar_fill_focused_alt" /> + <include name="rounded_hilight" /> +</draw_ops> + +<draw_ops name="rounded_titlebar_focused_alt"> + <include name="titlebar_fill_focused_alt" /> + <include name="rounded_hilight" /> +</draw_ops> + +<draw_ops name="border_focused"> + <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="border_unfocused"> + <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="rounded_border_focused"> + <line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" /> + <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" /> + <line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" /> + <arc color="C_border_focused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_focused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="rounded_border_unfocused"> + <line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" /> + <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" /> + <line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" /> + <arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="border_right_focused"> + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_right_unfocused"> + <line + x1="width" y1="0" + x2="width" y2="height" + color="C_border_unfocused" /> +</draw_ops> + +<draw_ops name="border_left_focused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_left_unfocused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_unfocused" /> +</draw_ops> + + <!-- button icons--> + +<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" /> + +<draw_ops name="close_glyph_focused"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="close_shadow_focused"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="close_focused"> + <include name="close_shadow_focused" y="1" /> + <!-- I'm not happy with the current aa I'll draw it twice to make it darker --> + <include name="close_shadow_focused" y="1" /> + <include name="close_glyph_focused" /> +</draw_ops> + +<draw_ops name="close_focused_pressed"> + <include name="close_glyph_focused" y="1" /> +</draw_ops> + +<draw_ops name="close_glyph_unfocused"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="close_unfocused"> + <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> + <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="close_glyph_unfocused_prelight"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="close_unfocused_prelight"> + <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> + <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="close_glyph_unfocused_pressed"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="close_unfocused_pressed"> + <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> + <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="maximize_glyph_focused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="maximize_shadow_focused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_shadow" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="maximize_focused"> + <include name="maximize_shadow_focused" y="1" /> + <include name="maximize_glyph_focused" /> +</draw_ops> + +<draw_ops name="maximize_focused_pressed"> + <include name="maximize_glyph_focused" y="1" /> +</draw_ops> + +<draw_ops name="maximize_glyph_unfocused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="maximize_unfocused"> + <include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="maximize_glyph_unfocused_prelight"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_prelight"> + <include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="maximize_glyph_unfocused_pressed"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_pressed"> + <include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="minimize_glyph_focused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="minimize_shadow_focused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="minimize_focused"> + <include name="minimize_shadow_focused" y="1" /> + <include name="minimize_glyph_focused" /> +</draw_ops> + +<draw_ops name="minimize_focused_pressed"> + <include name="minimize_glyph_focused" y="1" /> +</draw_ops> + +<draw_ops name="minimize_glyph_unfocused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="minimize_unfocused"> + <include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="minimize_glyph_unfocused_prelight"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_prelight"> + <include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="minimize_glyph_unfocused_pressed"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_pressed"> + <include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="menu_glyph_focused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="menu_shadow_focused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_shadow" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_shadow" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="menu_focused"> + <include name="menu_shadow_focused" y="1" /> + <include name="menu_glyph_focused" /> +</draw_ops> + +<draw_ops name="menu_focused_pressed"> + <include name="menu_glyph_focused" y="1" /> +</draw_ops> + +<draw_ops name="menu_glyph_unfocused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="menu_unfocused"> + <include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="menu_glyph_unfocused_prelight"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="menu_unfocused_prelight"> + <include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="menu_glyph_unfocused_pressed"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="menu_unfocused_pressed"> + <include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="shade_glyph_focused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_focused" /> + <rectangle + x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="shade_shadow_focused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_shadow" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="shade_focused"> + <include name="shade_shadow_focused" y="1" /> + <include name="shade_glyph_focused" /> +</draw_ops> + +<draw_ops name="shade_focused_pressed"> + <include name="shade_glyph_focused" y="1" /> +</draw_ops> + +<draw_ops name="shade_glyph_unfocused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused" /> + <rectangle + x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="shade_unfocused"> + <include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="shade_glyph_unfocused_prelight"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused_prelight" /> + <rectangle + x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="shade_unfocused_prelight"> + <include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="shade_glyph_unfocused_pressed"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused_pressed" /> + <rectangle + x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="shade_unfocused_pressed"> + <include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + + + <!-- button backgrounds --> + +<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> +<constant name="C_button_hilight" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6" /> + +<draw_ops name="button_fill"> <!-- button background gradient --> + <gradient type="vertical" x="0" y="0" width="width" height="height-2"> + <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.15" /> + <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.21" /> + <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.27" /> + <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.12" /> + </gradient> +</draw_ops> + +<draw_ops name="button_bottom"> + <line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border" /> + <line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_button_hilight" /> +</draw_ops> + +<draw_ops name="button_bevel"> + <gradient type="vertical" x="0" y="0" width="1" height="height-2"> + <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.1"/> + <color value="blend/gtk:bg[NORMAL]/#000000/0.1"/> + </gradient> + <gradient type="vertical" x="width-1" y="0" width="1" height="height-2"> + <color value="C_border_focused"/> + <color value="blend/gtk:bg[NORMAL]/#000000/0.1"/> + </gradient> +</draw_ops> + +<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status --> + <gradient type="vertical" x="0" y="0" width="width" height="height-2"> + <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03" /> + <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1" /> + <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.2" /> + <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.04" /> + </gradient> +</draw_ops> + +<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status --> + <gradient type="vertical" x="0" y="0" width="width" height="height-2"> + <color value="C_border_focused" /> + <color value="blend/#000000/gtk:bg[NORMAL]/0.75" /> + <color value="blend/#000000/gtk:bg[NORMAL]/0.8" /> + </gradient> +</draw_ops> + +<draw_ops name="button"> + <include name="button_fill" /> + <include name="button_bevel" /> + <include name="button_bottom" /> +</draw_ops> + +<draw_ops name="button_prelight"> + <include name="button_fill_prelight" /> + <include name="button_bevel" /> + <include name="button_bottom" /> +</draw_ops> + +<draw_ops name="button_pressed"> + <include name="button_fill_pressed" /> + <include name="button_bottom" /> +</draw_ops> + +<!-- things get messy here --> + +<draw_ops name="button_inner_right_slice1"> + <clip x="0" y="0" width="width" height="height-5" /> + <include name="button" /> +</draw_ops> +<draw_ops name="button_inner_right_slice2"> + <clip x="1" y="height-5" width="width-1" height="2" /> + <include name="button" /> +</draw_ops> +<draw_ops name="button_inner_right_slice3"> + <clip x="2" y="height-3" width="width-2" height="1" /> + <include name="button" /> +</draw_ops> +<draw_ops name="button_inner_right_slice4"> + <clip x="4" y="height-2" width="width-4" height="2" /> + <include name="button" /> +</draw_ops> + +<draw_ops name="button_inner_right_fill"> + <include name="button_inner_right_slice1" /> + <include name="button_inner_right_slice2" /> + <include name="button_inner_right_slice3" /> + <include name="button_inner_right_slice4" /> +</draw_ops> + +<draw_ops name="button_inner_right_slice1_prelight"> + <clip x="0" y="0" width="width" height="height-5" /> + <include name="button_prelight" /> +</draw_ops> +<draw_ops name="button_inner_right_slice2_prelight"> + <clip x="1" y="height-5" width="width-1" height="2" /> + <include name="button_prelight" /> +</draw_ops> +<draw_ops name="button_inner_right_slice3_prelight"> + <clip x="2" y="height-3" width="width-2" height="1" /> + <include name="button_prelight" /> +</draw_ops> +<draw_ops name="button_inner_right_slice4_prelight"> + <clip x="4" y="height-2" width="width-4" height="2" /> + <include name="button_prelight" /> +</draw_ops> + +<draw_ops name="button_inner_right_fill_prelight"> + <include name="button_inner_right_slice1_prelight" /> + <include name="button_inner_right_slice2_prelight" /> + <include name="button_inner_right_slice3_prelight" /> + <include name="button_inner_right_slice4_prelight" /> +</draw_ops> + +<draw_ops name="button_inner_right_slice1_pressed"> + <clip x="0" y="0" width="width" height="height-5" /> + <include name="button_pressed" /> +</draw_ops> +<draw_ops name="button_inner_right_slice2_pressed"> + <clip x="1" y="height-5" width="width-1" height="2" /> + <include name="button_pressed" /> +</draw_ops> +<draw_ops name="button_inner_right_slice3_pressed"> + <clip x="2" y="height-3" width="width-2" height="1" /> + <include name="button_pressed" /> +</draw_ops> +<draw_ops name="button_inner_right_slice4_pressed"> + <clip x="4" y="height-2" width="width-4" height="2" /> + <include name="button_pressed" /> +</draw_ops> + +<draw_ops name="button_inner_right_fill_pressed"> + <include name="button_inner_right_slice1_pressed" /> + <include name="button_inner_right_slice2_pressed" /> + <include name="button_inner_right_slice3_pressed" /> + <include name="button_inner_right_slice4_pressed" /> +</draw_ops> + + +<draw_ops name="button_inner_right_border"> + <gradient type="vertical" x="0" y="0" width="1" height="height-5"> + <color value="blend/gtk:bg[NORMAL]/#000000/0.06" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.06" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> + </gradient> + <arc color="C_button_hilight" x="1" y="height-10" width="9" height="9" start_angle="180" extent_angle="90" /> + <gradient type="vertical" x="1" y="0" width="1" height="height-5"> + <color value="C_border_focused" /> + <color value="C_button_border" /> + </gradient> + <arc color="C_button_border" x="1" y="height-11" width="9" height="9" start_angle="180" extent_angle="90" /> +</draw_ops> + +<draw_ops name="button_inner_right"> + <include name="button_inner_right_fill" /> + <include name="button_inner_right_border" /> +</draw_ops> + +<draw_ops name="button_inner_right_prelight"> + <include name="button_inner_right_fill_prelight" /> + <include name="button_inner_right_border" /> +</draw_ops> + +<draw_ops name="button_inner_right_pressed"> + <include name="button_inner_right_fill_pressed" /> + <include name="button_inner_right_border" /> +</draw_ops> + +<draw_ops name="button_inner_left_slice1"> + <clip x="0" y="0" width="width-1" height="height-5" /> + <include name="button" /> +</draw_ops> +<draw_ops name="button_inner_left_slice2"> + <clip x="0" y="height-5" width="width-2" height="2" /> + <include name="button" /> +</draw_ops> +<draw_ops name="button_inner_left_slice3"> + <clip x="0" y="height-3" width="width-3" height="1" /> + <include name="button" /> +</draw_ops> +<draw_ops name="button_inner_left_slice4"> + <clip x="0" y="height-2" width="width-5" height="2" /> + <include name="button" /> +</draw_ops> + +<draw_ops name="button_inner_left_fill"> + <include name="button_inner_left_slice1" /> + <include name="button_inner_left_slice2" /> + <include name="button_inner_left_slice3" /> + <include name="button_inner_left_slice4" /> +</draw_ops> + +<draw_ops name="button_inner_left_slice1_prelight"> + <clip x="0" y="0" width="width-1" height="height-5" /> + <include name="button_prelight" /> +</draw_ops> +<draw_ops name="button_inner_left_slice2_prelight"> + <clip x="0" y="height-5" width="width-2" height="2" /> + <include name="button_prelight" /> +</draw_ops> +<draw_ops name="button_inner_left_slice3_prelight"> + <clip x="0" y="height-3" width="width-3" height="1" /> + <include name="button_prelight" /> +</draw_ops> +<draw_ops name="button_inner_left_slice4_prelight"> + <clip x="0" y="height-2" width="width-5" height="2" /> + <include name="button_prelight" /> +</draw_ops> + +<draw_ops name="button_inner_left_fill_prelight"> + <include name="button_inner_left_slice1_prelight" /> + <include name="button_inner_left_slice2_prelight" /> + <include name="button_inner_left_slice3_prelight" /> + <include name="button_inner_left_slice4_prelight" /> +</draw_ops> + +<draw_ops name="button_inner_left_slice1_pressed"> + <clip x="0" y="0" width="width-1" height="height-5" /> + <include name="button_pressed" /> +</draw_ops> +<draw_ops name="button_inner_left_slice2_pressed"> + <clip x="0" y="height-5" width="width-2" height="2" /> + <include name="button_pressed" /> +</draw_ops> +<draw_ops name="button_inner_left_slice3_pressed"> + <clip x="0" y="height-3" width="width-3" height="1" /> + <include name="button_pressed" /> +</draw_ops> +<draw_ops name="button_inner_left_slice4_pressed"> + <clip x="0" y="height-2" width="width-5" height="2" /> + <include name="button_pressed" /> +</draw_ops> + +<draw_ops name="button_inner_left_fill_pressed"> + <include name="button_inner_left_slice1_pressed" /> + <include name="button_inner_left_slice2_pressed" /> + <include name="button_inner_left_slice3_pressed" /> + <include name="button_inner_left_slice4_pressed" /> +</draw_ops> + + +<draw_ops name="button_inner_left_border"> + <gradient type="vertical" x="width-1" y="0" width="1" height="height-6"> + <color value="C_titlebar_focused_hilight" /> + <color value="C_button_hilight" /> + </gradient> + <arc color="C_button_hilight" x="width-11" y="height-11" width="10" height="10" start_angle="90" extent_angle="90" /> + <gradient type="vertical" x="width-2" y="0" width="1" height="height-5"> + <color value="C_border_focused" /> + <color value="C_button_border" /> + </gradient> + <arc color="C_button_border" x="width-11" y="height-11" width="9" height="9" start_angle="90" extent_angle="90" /> +</draw_ops> + +<draw_ops name="button_inner_left"> + <include name="button_inner_left_fill" /> + <include name="button_inner_left_border" /> +</draw_ops> + +<draw_ops name="button_inner_left_prelight"> + <include name="button_inner_left_fill_prelight" /> + <include name="button_inner_left_border" /> +</draw_ops> + +<draw_ops name="button_inner_left_pressed"> + <include name="button_inner_left_fill_pressed" /> + <include name="button_inner_left_border" /> +</draw_ops> + +<!-- frame styles --> + +<frame_style name="normal_focused" geometry="normal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> + <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> + <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> + + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> + <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> + <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_unfocused" geometry="normal_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" /> + <piece position="title" draw_ops="title_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> + <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> + <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> + + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> + <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> + <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> + <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> + <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> + + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> + <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> + <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_focused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> + <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> + <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> + + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> + <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> + <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_unfocused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_focused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> + <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> + <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> + + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> + <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> + <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_unfocused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_focused" geometry="small"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_focused_alt" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button_inner_left"/> + <button function="left_middle_background" state="prelight" draw_ops="button_inner_left_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_inner_left_pressed"/> + + <button function="right_middle_background" state="normal" draw_ops="button_inner_right"/> + <button function="right_middle_background" state="prelight" draw_ops="button_inner_right_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_inner_right_pressed"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_unfocused" geometry="small_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_focused" geometry="borderless"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_unfocused" geometry="borderless"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- placeholder for unimplementated styles--> +<frame_style name="blank" geometry="normal"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- frame style sets --> + +<frame_style_set name="normal_style_set"> + <frame focus="yes" state="normal" resize="both" style="normal_focused"/> + <frame focus="no" state="normal" resize="both" style="normal_unfocused"/> + <frame focus="yes" state="maximized" style="normal_max_focused"/> + <frame focus="no" state="maximized" style="normal_max_unfocused"/> + <frame focus="yes" state="shaded" style="normal_focused"/> + <frame focus="no" state="shaded" style="normal_unfocused"/> + <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/> + <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/> +</frame_style_set> + +<frame_style_set name="dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="dialog_focused"/> + <frame focus="no" state="normal" resize="both" style="dialog_unfocused"/> + <frame focus="yes" state="maximized" style="blank"/> + <frame focus="no" state="maximized" style="blank"/> + <frame focus="yes" state="shaded" style="dialog_focused"/> + <frame focus="no" state="shaded" style="dialog_unfocused"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + +<frame_style_set name="modal_dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/> + <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/> + <frame focus="yes" state="maximized" style="blank"/> + <frame focus="no" state="maximized" style="blank"/> + <frame focus="yes" state="shaded" style="modal_dialog_focused"/> + <frame focus="no" state="shaded" style="modal_dialog_unfocused"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + +<frame_style_set name="utility_style_set"> + <frame focus="yes" state="normal" resize="both" style="utility_focused"/> + <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> + <frame focus="yes" state="maximized" style="blank"/> + <frame focus="no" state="maximized" style="blank"/> + <frame focus="yes" state="shaded" style="utility_focused"/> + <frame focus="no" state="shaded" style="utility_unfocused"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + +<frame_style_set name="border_style_set"> + <frame focus="yes" state="normal" resize="both" style="border_focused"/> + <frame focus="no" state="normal" resize="both" style="border_unfocused"/> + <frame focus="yes" state="maximized" style="blank"/> + <frame focus="no" state="maximized" style="blank"/> + <frame focus="yes" state="shaded" style="blank"/> + <frame focus="no" state="shaded" style="blank"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + + +<!-- windows --> + +<window type="normal" style_set="normal_style_set"/> +<window type="dialog" style_set="dialog_style_set"/> +<window type="modal_dialog" style_set="modal_dialog_style_set"/> +<window type="menu" style_set="utility_style_set"/> +<window type="utility" style_set="utility_style_set"/> +<window type="border" style_set="border_style_set"/> + +</metacity_theme> diff --git a/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-3.xml b/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-3.xml new file mode 100644 index 000000000..3461401ac --- /dev/null +++ b/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-3.xml @@ -0,0 +1,1723 @@ +<?xml version="1.0"?> +<metacity_theme> +<info> + <name>Adwaita</name> + <author>GNOME Art Team <art.gnome.org></author> + <copyright>Â Intel, Â Red Hat, Lapo Calamandrei</copyright> + <date>2012</date> + <description>Default GNOME 3 window theme</description> +</info> + +<!-- meaningfull constants --> + +<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.7" /> +<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> +<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" /> +<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" /> +<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" /> +<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" /> +<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" /> +<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" /> +<!-- color of the button icons --> +<constant name="C_icons_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" /> +<constant name="C_icons_pressed" value="gtk:text[SELECTED]" /> +<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" /> +<constant name="C_icons_unfocused_prelight" value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.3" /> +<constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" /> +<constant name="C_icons_shadow" value="gtk:custom(wm_title_shadow,gtk:base[NORMAL])" /> +<constant name="C_separator" value="blend/#000000/gtk:bg[NORMAL]/0.9" /> +<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons --> +<constant name="D_icons_shrink" value="3" /> <!-- increasing this value makes the icons in buttons smaller --> +<constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger --> +<!-- geometries --> + +<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4"> + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> + <distance name="title_vertical_pad" value="16"/> + <border name="title_border" left="10" right="10" top="0" bottom="2"/> + <border name="button_border" left="0" right="0" top="1" bottom="0"/> + <aspect_ratio name="button" value="1"/> +</frame_geometry> + +<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal"> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> +</frame_geometry> + +<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false"> + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> + <distance name="title_vertical_pad" value="15"/> <!-- + This needs to be 1 less then the + title_vertical_pad on normal state + or you'll have bigger buttons --> + <border name="title_border" left="10" right="10" top="1" bottom="2"/> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <distance name="bottom_height" value="0" /> +</frame_geometry> + +<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> + <distance name="right_width" value="0" /> +</frame_geometry> + +<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> + <distance name="left_width" value="1" /> +</frame_geometry> + +<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false"> + <distance name="title_vertical_pad" value="7"/> + <border name="title_border" left="10" right="10" top="0" bottom="1"/> + <border name="button_border" left="0" right="0" top="0" bottom="2"/> +</frame_geometry> + +<frame_geometry name="small_unfocused" parent="small"> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> +</frame_geometry> + +<frame_geometry name="nobuttons" hide_buttons="true" parent="normal"> +</frame_geometry> + +<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <border name="title_border" left="10" right="10" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <distance name="title_vertical_pad" value="1" /> +</frame_geometry> + +<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="bottom_height" value="0" /> + <distance name="title_vertical_pad" value="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small"> + <distance name="title_vertical_pad" value="5"/> +</frame_geometry> + +<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal"> + <distance name="title_vertical_pad" value="1"/> + <distance name="bottom_height" value="1"/> + <distance name="left_width" value="1"/> + <distance name="right_width" value="1"/> +</frame_geometry> + +<!-- drawing operations --> + + <!-- title --> + +<draw_ops name="title_focused"> + <title version="< 3.1" + x="(0 `max` ((width - title_width) / 2))" + y="(0 `max` ((height - title_height) / 2)) + 2" + color="C_title_focused_hilight" /> + <title version="< 3.1" + x="(0 `max` ((width - title_width) / 2))" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_focused_hilight_dark" /> + <title version="< 3.1" + x="(0 `max` ((width - title_width) / 2))" + y="(0 `max` ((height - title_height) / 2)) + 1" + color="C_title_focused" /> + <title version=">= 3.1" + x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))" + y="(0 `max` ((height - title_height) / 2)) + 2" + ellipsize_width="width" + color="C_title_focused_hilight" /> + <title version=">= 3.1" + x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))" + y="(0 `max` ((height - title_height) / 2))" + ellipsize_width="width" + color="C_title_focused_hilight_dark" /> + <title version=">= 3.1" + x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))" + y="(0 `max` ((height - title_height) / 2)) + 1" + ellipsize_width="width" + color="C_title_focused" /> +</draw_ops> + +<draw_ops name="title_unfocused"> + <title version="< 3.1" + x="(0 `max` ((width - title_width) / 2))" + y="(0 `max` ((height - title_height) / 2)) + 1" + color="C_title_unfocused"/> + <title version=">= 3.1" + x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width)))" + y="(0 `max` ((height - title_height) / 2)) + 1" + ellipsize_width="width" + color="C_title_unfocused"/> +</draw_ops> + + <!-- window decorations --> + +<draw_ops name="entire_background_focused"> + <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="entire_background_unfocused"> + <include name="entire_background_focused" /> +</draw_ops> + +<draw_ops name="titlebar_fill_focused"> + <gradient type="vertical" x="0" y="0" width="width" height="height"> + <color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" /> + <color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" /> + </gradient> +</draw_ops> + + +<draw_ops name="titlebar_fill_unfocused"> + <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="hilight"> + <line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" /> + <gradient type="vertical" x="1" y="1" width="1" height="height-4"> + <color value="C_titlebar_focused_hilight" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> + </gradient> +</draw_ops> + +<draw_ops name="rounded_hilight"> + <line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" /> + <arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7" start_angle="270" extent_angle="90" /> + <arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7" start_angle="0" extent_angle="90" /> + <gradient type="vertical" x="1" y="5" width="1" height="height-9"> + <color value="C_titlebar_focused_hilight" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> + </gradient> +</draw_ops> + +<draw_ops name="titlebar_focused"> + <include name="titlebar_fill_focused" /> + <include name="hilight" /> +</draw_ops> + +<draw_ops name="rounded_titlebar_focused"> + <include name="titlebar_fill_focused" /> + <include name="rounded_hilight" /> +</draw_ops> + +<draw_ops name="rounded_titlebar_focused_alt"> + <include name="titlebar_fill_focused" /> + <include name="rounded_hilight" /> +</draw_ops> + +<draw_ops name="border_focused"> + <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="border_unfocused"> + <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="rounded_border_focused"> + <line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" /> + <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" /> + <line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" /> + <arc color="C_border_focused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_focused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="rounded_border_unfocused"> + <line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" /> + <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" /> + <line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" /> + <arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> + + <!-- double arcs for darker borders --> + <arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> +</draw_ops> + + + +<draw_ops name="border_left_focused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_left_unfocused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_unfocused" /> +</draw_ops> + + <!-- button icons--> + + +<draw_ops name="close_shadow_focused"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="close_glyph_pressed"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_pressed" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_pressed" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_pressed" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_pressed" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_pressed" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_pressed" /> +</draw_ops> + +<draw_ops name="close_glyph_prelight"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="gtk:text[NORMAL]" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="gtk:text[NORMAL]" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="gtk:text[NORMAL]" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="gtk:text[NORMAL]" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="gtk:text[NORMAL]" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="gtk:text[NORMAL]" /> +</draw_ops> + +<draw_ops name="close_glyph_focused"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="close_focused"> + <include name="close_shadow_focused" y="1" /> + <include name="close_glyph_focused" /> + +</draw_ops> + +<draw_ops name="close_focused_pressed"> + <include name="close_glyph_pressed" y="1" /> +</draw_ops> + +<draw_ops name="close_focused_prelight"> + <include name="close_shadow_focused" y="1" /> + <include name="close_glyph_prelight" /> +</draw_ops> + +<draw_ops name="close_glyph_unfocused"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="close_unfocused"> + <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> + <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="close_glyph_unfocused_prelight"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="close_unfocused_prelight"> + <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> + <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="close_glyph_unfocused_pressed"> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> + <line + x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="close_unfocused_pressed"> + <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> + <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="maximize_glyph_focused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="maximize_glyph_pressed"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_pressed" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_pressed" /> +</draw_ops> + +<draw_ops name="maximize_glyph_prelight"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="gtk:text[NORMAL]" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="gtk:text[NORMAL]" /> +</draw_ops> + +<draw_ops name="maximize_shadow_focused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_shadow" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="maximize_focused"> + <include name="maximize_shadow_focused" y="1" /> + <include name="maximize_glyph_focused" /> +</draw_ops> + +<draw_ops name="maximize_focused_pressed"> + <include name="maximize_glyph_pressed" y="1" /> +</draw_ops> + +<draw_ops name="maximize_focused_prelight"> + <include name="maximize_shadow_focused" y="1" /> + <include name="maximize_glyph_prelight" /> +</draw_ops> + +<draw_ops name="maximize_glyph_unfocused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="maximize_unfocused"> + <include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="maximize_glyph_unfocused_prelight"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_prelight"> + <include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="maximize_glyph_unfocused_pressed"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_pressed"> + <include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="minimize_glyph_focused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="minimize_glyph_pressed"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_pressed" /> +</draw_ops> + +<draw_ops name="minimize_glyph_prelight"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="gtk:text[NORMAL]" /> +</draw_ops> + +<draw_ops name="minimize_shadow_focused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="minimize_focused"> + <include name="minimize_shadow_focused" y="1" /> + <include name="minimize_glyph_focused" /> +</draw_ops> + +<draw_ops name="minimize_focused_pressed"> + <include name="minimize_glyph_pressed" y="1" /> +</draw_ops> + +<draw_ops name="minimize_focused_prelight"> + <include name="minimize_shadow_focused" y="1" /> + <include name="minimize_glyph_prelight" /> +</draw_ops> + +<draw_ops name="minimize_glyph_unfocused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="minimize_unfocused"> + <include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="minimize_glyph_unfocused_prelight"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_prelight"> + <include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="minimize_glyph_unfocused_pressed"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_pressed"> + <include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="menu_glyph_focused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="menu_shadow_focused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_shadow" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_shadow" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="menu_focused"> + <include name="menu_shadow_focused" y="1" /> + <include name="menu_glyph_focused" /> +</draw_ops> + +<draw_ops name="menu_focused_pressed"> + <include name="menu_glyph_focused" /> +</draw_ops> + +<draw_ops name="menu_glyph_unfocused"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="menu_unfocused"> + <include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="menu_glyph_unfocused_prelight"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="menu_unfocused_prelight"> + <include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="menu_glyph_unfocused_pressed"> + <rectangle + x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="menu_unfocused_pressed"> + <include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="shade_glyph_focused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_focused" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_focused" /> + <rectangle + x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_focused" /> +</draw_ops> + +<draw_ops name="shade_shadow_focused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_shadow" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_shadow" /> +</draw_ops> + +<draw_ops name="shade_focused"> + <include name="shade_shadow_focused" y="1" /> + <include name="shade_glyph_focused" /> +</draw_ops> + +<draw_ops name="shade_focused_pressed"> + <include name="shade_glyph_focused" /> +</draw_ops> + +<draw_ops name="shade_glyph_unfocused"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused" /> + <rectangle + x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused" /> +</draw_ops> + +<draw_ops name="shade_unfocused"> + <include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="shade_glyph_unfocused_prelight"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_prelight" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused_prelight" /> + <rectangle + x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused_prelight" /> +</draw_ops> + +<draw_ops name="shade_unfocused_prelight"> + <include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> +</draw_ops> + +<draw_ops name="shade_glyph_unfocused_pressed"> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" + width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" + color="C_icons_unfocused_pressed" /> + <rectangle + x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused_pressed" /> + <rectangle + x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" + width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" + color="C_icons_unfocused_pressed" /> +</draw_ops> + +<draw_ops name="shade_unfocused_pressed"> + <include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> +</draw_ops> + + + <!-- button backgrounds --> + +<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> +<constant name="C_button_hilight" value="gtk:custom(wm_highlight,blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6)" /> + +<draw_ops name="button_border"> + <line x1="7" y1="4" x2="width-8" y2="4" color="C_button_border" /> + <arc color="C_button_border" x="width-9" y="4" width="4" height="4" start_angle="0" extent_angle="90"/> + <line x1="width-5" y1="7" x2="width-5" y2="height-8" color="C_button_border" /> + <arc color="C_button_border" x="width-9" y="height-9" width="4" height="4" start_angle="90" extent_angle="90"/> + <line x1="width-7" y1="height-5" x2="7" y2="height-5" color="C_button_border" /> + <arc color="C_button_border" x="4" y="height-9" width="4" height="4" start_angle="180" extent_angle="90"/> + <line x1="4" y1="7" x2="4" y2="height-8" color="C_button_border" /> + <arc color="C_button_border" x="4" y="4" width="4" height="4" start_angle="270" extent_angle="90"/> + <line x1="width-7" y1="height-4" x2="7" y2="height-4" color="C_title_focused_hilight" /> +</draw_ops> + + +<draw_ops name="button_fill"> <!-- button background gradient --> + +</draw_ops> + +<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status --> + <gradient type="vertical" x="5" y="5" width="width-10" height="height-10"> + <color value="gtk:custom(button_hover_gradient_color_a,gtk:fg[NORMAL])" /> + <color value="gtk:custom(button_hover_gradient_color_b,gtk:fg[NORMAL])" /> + </gradient> + <include name="button_border" /> +</draw_ops> + +<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status --> + <gradient type="vertical" x="5" y="5" width="width-10" height="height-10"> + <color value="gtk:custom(borders,gtk:fg[NORMAL])" /> + <color value="blend/gtk:custom(theme_bg_color,gtk:fg[NORMAL])/#000000/.05" /> + </gradient> + <include name="button_border" /> +</draw_ops> + +<draw_ops name="button"> +</draw_ops> + +<draw_ops name="button_prelight"> + <include name="button_fill_prelight" /> +</draw_ops> + +<draw_ops name="button_pressed"> + <include name="button_fill_pressed" /> +</draw_ops> + +<!-- frame styles --> + +<frame_style name="normal_focused" geometry="normal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_unfocused" geometry="normal_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_focused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_unfocused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_focused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_unfocused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_focused" geometry="small"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_unfocused" geometry="small_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_focused" geometry="border"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_unfocused" geometry="border"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="borderless" geometry="borderless"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="attached_focused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="attached_unfocused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_left_focused" geometry="tiled_left"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <!-- <piece position="overlay" draw_ops="border_right_focused" /> --> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_left_unfocused" geometry="tiled_left"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <!-- <piece position="overlay" draw_ops="border_right_unfocused" /> --> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_right_focused" geometry="tiled_right"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_left_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_focused" /> + <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + + <button function="left_middle_background" state="normal" draw_ops="button"/> + <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> + <button function="right_middle_background" state="normal" draw_ops="button"/> + <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> + <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_right_unfocused" geometry="tiled_right"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_left_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused"/> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> + <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="shade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- placeholder for unimplementated styles--> +<frame_style name="blank" geometry="normal"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- frame style sets --> + +<frame_style_set name="normal_style_set"> + <frame focus="yes" state="normal" resize="both" style="normal_focused"/> + <frame focus="no" state="normal" resize="both" style="normal_unfocused"/> + <frame focus="yes" state="maximized" style="normal_max_focused"/> + <frame focus="no" state="maximized" style="normal_max_unfocused"/> + <frame focus="yes" state="shaded" style="normal_focused"/> + <frame focus="no" state="shaded" style="normal_unfocused"/> + <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/> + <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/> + <frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/> + <frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/> + <frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/> + <frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/> + <frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/> + <frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/> + <frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/> + <frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/> +</frame_style_set> + +<frame_style_set name="dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="dialog_focused"/> + <frame focus="no" state="normal" resize="both" style="dialog_unfocused"/> + <frame focus="yes" state="maximized" style="blank"/> + <frame focus="no" state="maximized" style="blank"/> + <frame focus="yes" state="shaded" style="dialog_focused"/> + <frame focus="no" state="shaded" style="dialog_unfocused"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + +<frame_style_set name="modal_dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/> + <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/> + <frame focus="yes" state="maximized" style="blank"/> + <frame focus="no" state="maximized" style="blank"/> + <frame focus="yes" state="shaded" style="modal_dialog_focused"/> + <frame focus="no" state="shaded" style="modal_dialog_unfocused"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + +<frame_style_set name="utility_style_set"> + <frame focus="yes" state="normal" resize="both" style="utility_focused"/> + <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> + <frame focus="yes" state="maximized" style="blank"/> + <frame focus="no" state="maximized" style="blank"/> + <frame focus="yes" state="shaded" style="utility_focused"/> + <frame focus="no" state="shaded" style="utility_unfocused"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + +<frame_style_set name="border_style_set"> + <frame focus="yes" state="normal" resize="both" style="border_focused"/> + <frame focus="no" state="normal" resize="both" style="border_unfocused"/> + <frame focus="yes" state="maximized" style="borderless"/> + <frame focus="no" state="maximized" style="borderless"/> + <frame focus="yes" state="shaded" style="blank"/> + <frame focus="no" state="shaded" style="blank"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + +<frame_style_set name="attached_style_set"> + <frame focus="yes" state="normal" resize="both" style="attached_focused"/> + <frame focus="no" state="normal" resize="both" style="attached_unfocused"/> + <frame focus="yes" state="maximized" style="blank"/> + <frame focus="no" state="maximized" style="blank"/> + <frame focus="yes" state="shaded" style="blank"/> + <frame focus="no" state="shaded" style="blank"/> + <frame focus="yes" state="maximized_and_shaded" style="blank"/> + <frame focus="no" state="maximized_and_shaded" style="blank"/> +</frame_style_set> + + +<!-- windows --> + +<window type="normal" style_set="normal_style_set"/> +<window type="dialog" style_set="dialog_style_set"/> +<window type="modal_dialog" style_set="modal_dialog_style_set"/> +<window type="menu" style_set="utility_style_set"/> +<window type="utility" style_set="utility_style_set"/> +<window type="border" style_set="border_style_set"/> +<window version=">= 3.2" type="attached" style_set="attached_style_set"/> + +</metacity_theme> diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png deleted file mode 100644 index 62c0b41bd..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png deleted file mode 100644 index 0dff81db9..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png deleted file mode 100644 index 02ef8ee7a..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png deleted file mode 100644 index dba866012..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png deleted file mode 100644 index e978dfb9f..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png deleted file mode 100644 index 4f128b323..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh deleted file mode 100755 index 020e059bd..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cp -f slider-vert.png slider-vert-prelight.png -cp -f slider-vert.png slider-horiz-prelight.png -cp -f slider-vert.png slider-horiz.png -convert -rotate 90 slider-horiz.png slider-horiz.png -convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png \ No newline at end of file diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png deleted file mode 100644 index 1ee4528ba..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png deleted file mode 100644 index 1ee4528ba..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png deleted file mode 100644 index 4fa68000c..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png deleted file mode 100644 index 4fa68000c..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh deleted file mode 100755 index 020e059bd..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cp -f slider-vert.png slider-vert-prelight.png -cp -f slider-vert.png slider-horiz-prelight.png -cp -f slider-vert.png slider-horiz.png -convert -rotate 90 slider-horiz.png slider-horiz.png -convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png \ No newline at end of file diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png deleted file mode 100644 index c0f7f3c3f..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png deleted file mode 100644 index c0f7f3c3f..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png deleted file mode 100644 index 9643f378e..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png deleted file mode 100644 index 9643f378e..000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc deleted file mode 100644 index 171e73626..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc +++ /dev/null @@ -1,547 +0,0 @@ -# -# GTK theme to be used on Mac OS X, to mimic the appearance of Tiger -# -# Heavily based on Clearlooks-Quicksilver -# Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com) -# -# (c) 2007 JiHO <jo.irisson@gmail.com>. -# GNU General Public License http://www.gnu.org/copyleft/gpl.html -# - -pixmap_path "${THEMEDIR}" - -style "clearlooks-default" -{ - GtkButton ::default_border = { 0, 0, 0, 0 } - GtkRange ::trough_border = 0 - GtkPaned ::handle_size = 6 - GtkRange ::slider_width = 15 - GtkRange ::stepper_size = 15 - GtkScale ::slider-length = 23 - GtkScale ::trough-side-details = 1 - GtkScrollbar ::min_slider_length = 30 - GtkCheckButton ::indicator_size = 12 - GtkMenuBar ::internal-padding = 0 - GtkTreeView ::expander_size = 14 - GtkExpander ::expander_size = 16 - - xthickness = 1 - ythickness = 1 - - fg[NORMAL] = "#000000" # black - fg[PRELIGHT] = "#000000" # black - fg[SELECTED] = "#ffffff" # white - fg[ACTIVE] = "#000000" # black - fg[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - - bg[NORMAL] = {0.95, 0.95, 0.95} # very light gray - bg[PRELIGHT] = "#ffffff" # white - bg[SELECTED] = OSX_MENU_COLOR_PLACEHOLDER # menu color - bg[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - bg[ACTIVE] = {0.85, 0.85, 0.85} # gray - - base[NORMAL] = "#ffffff" # white - base[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER # menu color - base[ACTIVE] = {0.6, 0.6, 0.6} # dark gray - base[SELECTED] = OSX_HILI_COLOR_PLACEHOLDER # highlight color - base[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - - text[NORMAL] = "#000000" # black - text[PRELIGHT] = "#000000" # black - text[ACTIVE] = "#ffffff" # white - text[SELECTED] = "#ffffff" # white - text[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - - engine "clearlooks" - { - colorize_scrollbar = FALSE #TRUE - reliefstyle = 1 - menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient - toolbarstyle = 0 # 0 = flat, 1 = enable effects - animation = FALSE - radius = 3.0 # 3.0 = default, 0.0 = sharp corners - style = GUMMY # CLASSIC, GUMMY, GLOSSY - } -} - - -style "clearlooks-wide" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 -} - -style "clearlooks-button" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 - - bg[NORMAL] = "#f0f1f2" # a hint of blue... - - engine "clearlooks" { - style = CLASSIC - } -} - -style "clearlooks-notebook" = "clearlooks-wide" -{ - bg[NORMAL] = {0.93, 0.93, 0.93} - bg[INSENSITIVE] = {0.93, 0.93, 0.93} -} - -style "clearlooks-tasklist" = "clearlooks-default" -{ - xthickness = 5 - ythickness = 3 -} - -style "clearlooks-menu" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 1 - bg[NORMAL] = "#ffffff" -} - -style "clearlooks-menu-item" = "clearlooks-default" -{ - xthickness = 0 - ythickness = 2 - - fg[PRELIGHT] = "#ffffff" - text[PRELIGHT] = "#ffffff" - # We want PRELIGHT to be white for widgets, but coloured for the menu. - bg[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER - - # Radius of the menu items (inside menus) - engine "clearlooks" { - radius = 0.0 - } -} - -style "clearlooks-menu-itembar" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 -} - -style "clearlooks-tree" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 -} - -style "clearlooks-frame-title" = "clearlooks-default" -{ - fg[NORMAL] = "#404040" -} - -style "clearlooks-tooltips" = "clearlooks-default" -{ - xthickness = 4 - ythickness = 4 - bg[NORMAL] = { 1.0,1.0,0.75 } -} - -style "clearlooks-progressbar" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 - - fg[PRELIGHT] = "#ffffff" -} - -style "clearlooks-combo" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 3 -} - -# Added pixmaps for scollbars -style "scrollbar" = "default" -{ - # The values I set here have to do with the relative size of three graphic elements - # I have used: the slider, the arrow box, and the trough. They all have the same width - # of 15 pixels, but gtk wants to put in some spacing between them. It seems like it - # places the sliders inside the trough with a default 1 pixel border on either side of the slider, - # so that the trough has its width stretched by an additional two pixels(?). Setting the - # trough border makes the arrow box sit on top of the trough squarely, by making sure that - # the trough stays the same width as the arrowbox(?). I could be totally wrong here. - GtkRange::trough_border = 0 - GtkRange::slider_width = 15 - - # This sets the size of the steppers (arrow buttons on the end of the scrollbar). - # The image I am using is 15x15 pixels, and if I dont set this a one pixel line - # gets cut off of the top of the "up" stepper. - GtkRange::stepper_size = 15 - - # Set a minimum length for the slider. Since I set the border on the slider - # image to 15 pixels on either end of the slider I want the min length to be - # at least 30 pixels to avoid an ugly slider when gtk wants to make it smaller - # than 30 pixels. - GtkScrollbar::min_slider_length = 30 - - engine "pixmap" - { - # Horizontal slider background - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-horiz.png" - border = { 30, 30, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Vertical slider background - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-vert.png" - border = { 0, 0, 30, 30 } - stretch = TRUE - orientation = VERTICAL - } - - # Normal horizontal slider - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (active) - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (mouse over) - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (Insesitive) - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Normal vertical slider - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (Active) - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (mouse over) - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (Insesitive) - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - -################################################################################ -# SCROLLBAR STEPPERS -################################################################################ - - # Up - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - - ######### DOWN ############ - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - -############ RIGHT ################ - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - -############### LEFT ################### - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - } -} - -# widget styles -class "GtkWidget" style "clearlooks-default" -class "GtkButton" style "clearlooks-button" -class "GtkCombo" style "clearlooks-button" -class "GtkRange" style "clearlooks-wide" -class "GtkFrame" style "clearlooks-wide" -class "GtkMenu" style "clearlooks-menu" -class "GtkEntry" style "clearlooks-button" -class "GtkMenuItem" style "clearlooks-menu-item" -class "GtkStatusbar" style "clearlooks-wide" -class "GtkNotebook" style "clearlooks-notebook" -class "GtkProgressBar" style "clearlooks-progressbar" -class "GtkScrollbar" style "scrollbar" - -widget_class "*MenuItem.*" style "clearlooks-menu-item" - -# combobox stuff -widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo" -widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo" - -# tooltips stuff -widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist" -widget "gtk-tooltips" style "clearlooks-tooltips" - -# treeview stuff -widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree" -widget_class "*.GtkList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title" - -# notebook stuff -widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook" -widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook" - -# OS X uses 11 but due to differences in font smoothing, 10 actually integrates better -gtk-font-name="Lucida Grande 10" - -# icon sizes: 48, 32, 24 (tango=22), 16 -# -# gtk-dialog main icon in a dialog box: e.g. alert when file is not saved -# gtk-dnd icon showed while dragging and dropping (not used on OS X) -# gtk-button buttons: OK/Cancel dialogs, usually 22 but 16 is more OS X-ish -# gtk-large-toolbar large toolbar: toolbox -# gtk-small-toolbar small toolbar: command bar, tools control, snap control -# gtk-menu menus in applications: File, Edit -# panel-menu general Application/Places menu (not used on OS X) -# -# insckape-decoration layers lock, "affect" icons, etc. -# -#gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=22,22:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=16,16" -gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=12,12" - -# use OS X default pdf-viewer for print preview -gtk-print-preview-command="/usr/bin/open %f" - -# Whether images should be shown on buttons. -# Default value: TRUE -gtk-button-images = 0 - -# Whether images should be shown in menus. -gtk-menu-images = 0 - - diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index ef4301c17..f827a67b0 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -15,10 +15,12 @@ # Kees Cook <kees@outflux.net> # Michael Wybrow <mjwybrow@users.sourceforge.net> # Jean-Olivier Irisson <jo.irisson@gmail.com> +# Liam P. White <inkscapebrony@gmail.com> # # Copyright (C) 2005 Kees Cook # Copyright (C) 2005-2009 Michael Wybrow # Copyright (C) 2007-2009 Jean-Olivier Irisson +# Copyright (C) 2014 Liam P. White # # Released under GNU GPL, read the file 'COPYING' for more information # @@ -131,20 +133,9 @@ if [ ! -f "$plist" ]; then exit 1 fi -PYTHONPACKURL="http://inkscape.modevia.com/macosx-snap/Python-packages.dmg" - if [ "x$python_dir" == "x" ]; then echo "Python modules directory not specified." >&2 - echo "Python modules can be downloaded from:" >&2 - echo " $PYTHONPACKURL" >&2 - exit 1 -fi -if [ ! -e "$python_dir/i386" -o ! -e "$python_dir/ppc" ]; then - echo "Directory does not appear to contain the i386 and ppc python modules:" >&2 - echo " $python_dir" >&2 - echo "Python modules can be downloaded from:" >&2 - echo " $PYTHONPACKURL" >&2 exit 1 fi @@ -175,7 +166,7 @@ fi if [ ! -e "$LIBPREFIX/lib/aspell-0.60/en.dat" ]; then echo "Missing aspell en dictionary -- please install at least 'aspell-dict-en', but" >&2 - echo "preferably all dictionaries ('aspell-dict-*') and try again." >&2 + echo "preferably more dictionaries ('aspell-dict-*') and try again." >&2 exit 1 fi @@ -203,7 +194,7 @@ package="Inkscape.app" # Remove a previously existing package if necessary if [ -d $package ]; then echo "Removing previous Inkscape.app" - rm -Rf $package + rm -rf $package fi @@ -215,6 +206,7 @@ resdir=`pwd` #---------------------------------------------------------- pkgexec="$package/Contents/MacOS" pkgbin="$package/Contents/Resources/bin" +pkgshare="$package/Contents/Resources/share" pkglib="$package/Contents/Resources/lib" pkglocale="$package/Contents/Resources/locale" pkgpython="$package/Contents/Resources/python/site-packages/" @@ -223,6 +215,7 @@ pkgresources="$package/Contents/Resources" mkdir -p "$pkgexec" mkdir -p "$pkgbin" mkdir -p "$pkglib" +mkdir -p "$pkgshare" mkdir -p "$pkglocale" mkdir -p "$pkgpython" @@ -274,6 +267,13 @@ cp -rp "$LIBPREFIX/share/mime" "$pkgresources/share/" mkdir -p "$pkgresources/share/icons/hicolor" cp "$LIBPREFIX/share/icons/hicolor/index.theme" "$pkgresources/share/icons/hicolor" +# GTK+ themes +cp -RP "$LIBPREFIX/share/gtk-engines" "$pkgshare/" +for item in Adwaita Clearlooks HighContrast Industrial Raleigh Redmond ThinIce; do + mkdir -p "$pkgshare/themes/$item" + cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" +done + # Icons and the rest of the script framework rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" @@ -283,7 +283,7 @@ sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" $pkgbin/inkscape # Add python modules if requested if [ ${add_python} = "true" ]; then - # copy python site-packages. They need to be organized in a hierarchical set of directories, by architecture and python major+minor version, e.g. i386/2.3/ for Ptyhon 2.3 on Intel; ppc/2.4/ for Python 2.4 on PPC + # copy python site-packages. They need to be organized in a hierarchical set of directories, by architecture and python major+minor version, e.g. i386/2.3/ for Ptyhon 2.3 on Intel cp -rvf "$python_dir"/* "$pkgpython" fi @@ -293,20 +293,16 @@ echo "APPLInks" > $package/Contents/PkgInfo # Pull in extra requirements for Pango and GTK pkgetc="$package/Contents/Resources/etc" mkdir -p $pkgetc/pango -cp $LIBPREFIX/etc/pango/pangox.aliases $pkgetc/pango/ + # Need to adjust path and quote in case of spaces in path. sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $LIBPREFIX/etc/pango/pango.modules > $pkgetc/pango/pango.modules cat > $pkgetc/pango/pangorc <<END_PANGO [Pango] -ModuleFiles=\${HOME}/.inkscape-etc/pango.modules -[PangoX] -AliasFiles=\${HOME}/.inkscape-etc/pangox.aliases +ModuleFiles=\${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91/pango.modules END_PANGO -# We use a modified fonts.conf file so only need the dtd mkdir -p $pkgetc/fonts -cp $LIBPREFIX/etc/fonts/fonts.dtd $pkgetc/fonts/ -cp -r $LIBPREFIX/etc/fonts/conf.avail $pkgetc/fonts/ +cp -r $LIBPREFIX/etc/fonts/fonts.conf $pkgetc/fonts/ cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ mkdir -p $pkgetc/gtk-2.0 @@ -323,7 +319,7 @@ mkdir -p $pkglib/pango/$pango_version/modules cp $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version/modules/ gtk_version=`pkg-config --variable=gtk_binary_version gtk+-2.0` -mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,loaders,printbackends} +mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends} cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ mkdir -p $pkglib/gnome-vfs-2.0/modules @@ -333,167 +329,122 @@ mkdir -p $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/ cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" -cp -r "$LIBPREFIX/share/ImageMagick-$IMAGEMAGICKVER" "$pkgresources/share/" +cp -r "$LIBPREFIX/share/ImageMagick-6" "$pkgresources/share/" # Copy aspell dictionary files: -cp -r "$LIBPREFIX/lib/aspell-0.60" "$pkglib/" cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" -# Find out libs we need from fink, darwinports, or from a custom install +# Copy all linked libraries into the bundle +#---------------------------------------------------------- +# get list of *.so modules from python modules +python_libs="$(find $pkgpython -name *.so -or -name *.dylib)" + +# get list of included binary executables +extra_bin=$(find $pkgbin -exec file {} \; | grep executable | grep -v text | cut -d: -f1) + +# Find out libs we need from MacPorts, Fink, or from a custom install # (i.e. $LIBPREFIX), then loop until no changes. a=1 nfiles=0 endl=true while $endl; do - echo -e "\033[1mLooking for dependencies.\033[0m Round" $a - libs="`otool -L $pkglib/gtk-2.0/$gtk_version/{engines,immodules,loaders,printbackends}/*.{dylib,so} $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/* $pkglib/pango/$pango_version/modules/* $pkglib/gnome-vfs-2.0/modules/* $package/Contents/Resources/lib/* $pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/{filters,coders}/*.so $binary 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq`" - cp -f $libs $package/Contents/Resources/lib - let "a+=1" - nnfiles=`ls $package/Contents/Resources/lib | wc -l` - if [ $nnfiles = $nfiles ]; then - endl=false - else - nfiles=$nnfiles - fi -done - -# Add extra libraries of necessary -for libfile in $EXTRALIBS -do - cp -f $libfile $package/Contents/Resources/lib + echo -e "\033[1mLooking for dependencies.\033[0m Round" $a + libs="$(otool -L \ + $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends}/*.{dylib,so} \ + $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so \ + $pkglib/pango/$pango_version/modules/*.so \ + $pkglib/gnome-vfs-2.0/modules/*.so \ + $pkglib/gio/modules/*.so \ + $pkglib/ImageMagick-$IMAGEMAGICK_VER/modules-Q16/{filters,coders}/*.so \ + $pkglib/*.{dylib,so} \ + $pkgbin/*.so \ + $python_libs \ + $extra_bin \ + 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq)" + cp -f $libs "$pkglib" + let "a+=1" + nnfiles="$(ls "$pkglib" | wc -l)" + if [ $nnfiles = $nfiles ]; then + endl=false + else + nfiles=$nnfiles + fi done # Some libraries don't seem to have write permission, fix this. -chmod -R u+w $package/Contents/Resources/lib +chmod -R u+w "$package/Contents/Resources/lib" -# Strip libraries and executables if requested +# Rewrite id and paths of linked libraries #---------------------------------------------------------- -if [ "$strip" = "true" ]; then - echo -e "\n\033[1mStripping debugging symbols...\033[0m\n" - chmod +w "$pkglib"/*.dylib - strip -x "$pkglib"/*.dylib - strip -ur "$binpath" -fi +# extract level for relative path to libs +echo -e "\n\033[1mRewriting library paths ...\033[0m\n" + +LIBPREFIX_levels="$(echo "$LIBPREFIX"|awk -F/ '{print NF+1}')" -# NOTE: This works for all the dylibs but causes GTK to crash at startup. -# Instead we leave them with their original install_names and set -# DYLD_LIBRARY_PATH within the app bundle before running Inkscape. -# fixlib () { - libPath="`echo $2 | sed 's/.*Resources//'`" - pkgPath="`echo $2 | sed 's/Resources\/.*/Resources/'`" - # Fix a given executable or library to be relocatable - if [ ! -d "$1" ]; then - libs="`otool -L $1 | fgrep compatibility | cut -d\( -f1`" - for lib in $libs; do - echo " $lib" - base=`echo $lib | awk -F/ '{print $NF}'` - first=`echo $lib | cut -d/ -f1-3` - relative=`echo $lib | cut -d/ -f4-` - to=@executable_path/../$relative - if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /System/Library ]; then - /usr/bin/install_name_tool -change $lib $to $1 - if [ "`echo $lib | fgrep libcrypto`" = "" ]; then - /usr/bin/install_name_tool -id $to $1 - for ll in $libs; do - base=`echo $ll | awk -F/ '{print $NF}'` - first=`echo $ll | cut -d/ -f1-3` - relative=`echo $ll | cut -d/ -f4-` - to=@executable_path/../$relative - if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /System/Library -a "`echo $ll | fgrep libcrypto`" = "" ]; then - /usr/bin/install_name_tool -change $ll $to $pkgPath/$relative - fi - done - fi - fi - done - fi + if [ ! -d "$1" ]; then + fileLibs="$(otool -L $1 | fgrep compatibility | cut -d\( -f1)" + filePath="$(echo "$2" | sed 's/.*Resources//')" + fileType="$3" + unset to_id + case $fileType in + lib) + # TODO: verfiy correct/expected install name for relocated libs + to_id="$package/Contents/Resources$filePath/$1" + loader_to_res="$(echo $filePath | gawk -F/ '{for (i=1;i<NF;i++) sub($i,".."); sub($NF,"",$0); print $0}')" + ;; + bin) + loader_to_res="../" + ;; + exec) + loader_to_res="../Resources/" + ;; + *) + echo "Skipping loader_to_res for $1" + ;; + esac + [ $to_id ] && install_name_tool -id "$to_id" "$1" + for lib in $fileLibs; do + first="$(echo $lib | cut -d/ -f1-3)" + if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /opt/X11 -a $first != /System/Library ]; then + lib_prefix_levels="$(echo $lib | awk -F/ '{for (i=NF;i>0;i--) if($i=="lib") j=i; print j}')" + res_to_lib="$(echo $lib | cut -d/ -f$lib_prefix_levels-)" + unset to_path + case $fileType in + lib) + to_path="@loader_path/$loader_to_res$res_to_lib" + ;; + bin) + to_path="@executable_path/$loader_to_res$res_to_lib" + ;; + exec) + to_path="@executable_path/$loader_to_res$res_to_lib" + ;; + *) + echo "Skipping to_path for $lib in $1" + ;; + esac + [ $to_path ] && ${LIBPREFIX}/bin/install_name_tool -change "$lib" "$to_path" "$1" + fi + done + fi } rewritelibpaths () { - # - # Fix package deps - (cd "$package/Contents/Resources/lib/gtk-2.0/$gtk_version/loaders" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gtk-2.0/$gtk_version/engines" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gtk-2.0/$gtk_version/immodules" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gtk-2.0/$gtk_version/printbackends" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gnome-vfs-2.0/modules" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gdk-pixbuf-2.0/$gtk_version/loaders" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/pango/$pango_version/modules" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/bin" - for file in *; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - cd ../lib - for file in *.dylib; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) + echo "Rewriting dylib paths for included binaries:" + for file in $extra_bin; do + echo -n "Rewriting dylib paths for $file ... " + (cd "$(dirname $file)" ; fixlib "$(basename $file)" "$(dirname $file)" "bin") + echo "done" + done + echo "Rewriting dylib paths for included libraries:" + for file in $(find $package \( -name '*.so' -or -name '*.dylib' \) -and -not -ipath '*.dSYM*'); do + echo -n "Rewriting dylib paths for $file ... " + (cd "$(dirname $file)" ; fixlib "$(basename $file)" "$(dirname $file)" "lib") + echo "done" + done } -PATHLENGTH=`echo $LIBPREFIX | wc -c` -if [ "$PATHLENGTH" -ge "50" ]; then - # If the LIBPREFIX path is long enough to allow - # path rewriting, then do this. - rewritelibpaths -else - echo "Could not rewrite dylb paths for bundled libraries. This requires" >&2 - echo "Macports to be installed in a PREFIX of at least 50 characters in length." >&2 - echo "" >&2 - echo "The package will still work if the following line is uncommented in" >&2 - echo "Inkscape.app/Contents/Resources/bin/inkscape:" >&2 - echo ' export DYLD_LIBRARY_PATH="$TOP/lib"' >&2 - exit 1 - -fi +rewritelibpaths exit 0 diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 5281e70c6..a536adf64 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -6,8 +6,9 @@ # http://wiki.inkscape.org/wiki/index.php?title=CompilingMacOsX # for more complete information # -# Author: +# Authors: # Jean-Olivier Irisson <jo.irisson@gmail.com> +# Liam P. White <inkscapebrony@gmail.com> # with information from # Kees Cook # Michael Wybrow @@ -23,9 +24,7 @@ # Configure flags CONFFLAGS="--disable-openmp --enable-osxapp" # Libraries prefix (Warning: NO trailing slash) -LIBPREFIX="/opt/local" -# User name on Modevia -MODEVIA_NAME="" +LIBPREFIX="/opt/local-x11" ############################################################ @@ -64,12 +63,6 @@ Compilation script for Inkscape on Mac OS X. \033[1m-py,--with-python\033[0m specify python modules path for inclusion into the app bundle \033[1md,dist,distrib\033[0m store Inkscape.app in a disk image (dmg) for distribution - \033[1mf,fat,universal\033[0m - compile inkscape as a universal binary as both i386 and ppc architectures - \033[1mput,upload\033[0m - upload the dmg and the associate info file on Modevia server - \033[1mall\033[0m - do everything (update, configure, build, install, package, distribute) \033[1mEXAMPLES\033[0m \033[1m$0 conf build install\033[0m @@ -92,7 +85,7 @@ SRCROOT=$HERE/../.. # we are currently in packaging/macosx # Defaults if [ "$INSTALLPREFIX" = "" ] then - INSTALLPREFIX=$SRCROOT/Build/ + INSTALLPREFIX=$SRCROOT/inst-osxapp/ fi BZRUPDATE="f" AUTOGEN="f" @@ -102,7 +95,6 @@ NJOBS=1 INSTALL="f" PACKAGE="f" DISTRIB="f" -UPLOAD="f" UNIVERSAL="f" STRIP="" @@ -129,8 +121,6 @@ do AUTOGEN="t" ;; c|conf|configure) CONFIGURE="t" ;; - -u|--universal) - UNIVERSAL="t" ;; b|build) BUILD="t" ;; -j|--jobs) @@ -142,8 +132,6 @@ do PACKAGE="t" ;; d|dist|distrib) DISTRIB="t" ;; - put|upload) - UPLOAD="t" ;; -p|--prefix) INSTALLPREFIX=$2 shift 1 ;; @@ -159,35 +147,22 @@ do shift 1 done -OSXMINORVER=`/usr/bin/sw_vers | grep ProductVersion | cut -d' ' -f2 | cut -f1-2 -d.` +# OSXMINORVER=`/usr/bin/sw_vers | grep ProductVersion | cut -d' ' -f2 | cut -f1-2 -d.` # Set environment variables # ---------------------------------------------------------- -export LIBPREFIX +export LIBPREFIX="/opt/local-x11" # Specific environment variables # automake seach path export CPATH="$LIBPREFIX/include" # configure search path export CPPFLAGS="-I$LIBPREFIX/include" -# export CPPFLAGS="-I$LIBPREFIX/include -I /System/Library/Frameworks/Carbon.framework/Versions/Current/Headers" export LDFLAGS="-L$LIBPREFIX/lib" # compiler arguments -export CFLAGS="-O3 -Wall" +export CFLAGS="-O0 -Wall" export CXXFLAGS="$CFLAGS" -if [[ "$UNIVERSAL" == "t" ]] -then - MINOSXVER="$OSXMINORVER" - - export SDK=/Developer/SDKs/MacOSX${MINOSXVER}.sdk - - export CFLAGS="$CFLAGS -isysroot $SDK -arch ppc -arch i386" - export CXXFLAGS="$CFLAGS" - - export CONFFLAGS="$CONFFLAGS --disable-dependency-tracking" -fi - # Actions # ---------------------------------------------------------- if [[ "$BZRUPDATE" == "t" ]] @@ -203,55 +178,17 @@ then fi # Fetch some information -REVISION=`bzr version-info 2>/dev/null | grep revno | cut -d' ' -f2` -ARCH=`arch | tr [p,c] [P,C]` -OSXVERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -d' ' -f2` - -if [[ "$OSXMINORVER" == "10.3" ]]; then - TARGETNAME="PANTHER" - TARGETVERSION="10.3" -elif [[ "$OSXMINORVER" == "10.4" ]]; then - TARGETNAME="TIGER" - TARGETVERSION="10.4" -elif [[ "$OSXMINORVER" == "10.5" ]]; then - TARGETNAME="LEOPARD+" - TARGETVERSION="10.5+" -fi - -TARGETARCH="$ARCH" -if [[ "$UNIVERSAL" == "t" ]]; then - TARGETARCH="UNIVERSAL" -fi +REVISION=$(bzr revno) +ARCH=$(arch) +TARGETVERSION=$(/usr/bin/sw_vers | fgrep ProductVersion | tr -d \ | cut -d: -f2) NEWNAME="Inkscape-r$REVISION-$TARGETVERSION-$TARGETARCH" DMGFILE="$NEWNAME.dmg" INFOFILE="$NEWNAME-info.txt" - -if [[ "$UPLOAD" == "t" ]] -then - # If we are uploading, we are probably building nightlies and don't - # need to build a new one if the repository hasn't changed since the - # last. Hence, if a dmg for this version already exists, then just - # exit here. - if [[ -f "$DMGFILE" ]]; then - echo -e "\nRepository hasn't changed: $DMGFILE already exists." - exit 0 - fi -fi - if [[ "$AUTOGEN" == "t" ]] then cd $SRCROOT - if [[ "$UNIVERSAL" == "t" ]] - then - # Universal builds have to be built with the option - # --disable-dependency-tracking. So they need to be - # started from scratch each time. - if [[ -f Makefile ]]; then - make distclean - fi - fi export NOCONFIGURE=true && ./autogen.sh status=$? if [[ $status -ne 0 ]]; then @@ -263,14 +200,15 @@ fi if [[ "$CONFIGURE" == "t" ]] then - ALLCONFFLAGS=`echo "$CONFFLAGS --prefix=$INSTALLPREFIX"` + ALLCONFFLAGS="$CONFFLAGS --prefix=$INSTALLPREFIX" cd $SRCROOT if [ ! -f configure ] then echo "Configure script not found in $SRCROOT. Run '$0 autogen' first" exit 1 fi - ./configure $ALLCONFFLAGS + mkdir -p build-osxapp; cd build-osxapp + ../configure $ALLCONFFLAGS status=$? if [[ $status -ne 0 ]]; then echo -e "\nConfigure failed" @@ -281,7 +219,7 @@ fi if [[ "$BUILD" == "t" ]] then - cd $SRCROOT + cd $SRCROOT/build-osxapp make -j $NJOBS status=$? if [[ $status -ne 0 ]]; then @@ -293,7 +231,7 @@ fi if [[ "$INSTALL" == "t" ]] then - cd $SRCROOT + cd $SRCROOT/build-osxapp make install status=$? if [[ $status -ne 0 ]]; then @@ -312,9 +250,9 @@ then echo "The inkscape executable \"$INSTALLPREFIX/bin/inkscape\" cound not be found." exit 1 fi - if [ ! -e $SRCROOT/Info.plist ] + if [ ! -e $SRCROOT/build-osxapp/Info.plist ] then - echo "The file \"$SRCROOT/Info.plist\" could not be found, please re-run configure." + echo "The file \"$SRCROOT/build-osxapp/Info.plist\" could not be found, please re-run configure." exit 1 fi @@ -325,7 +263,7 @@ then fi # Create app bundle - ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $SRCROOT/Info.plist $PYTHON_MODULES + ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $SRCROOT/build-osxapp/Info.plist $PYTHON_MODULES status=$? if [[ $status -ne 0 ]]; then echo -e "\nApplication bundle creation failed" @@ -392,21 +330,6 @@ Configure options: fi fi -if [[ "$UPLOAD" == "t" ]] -then - # Provide default for user name on modevia - if [[ "$MODEVIA_NAME" == "" ]]; then - MODEVIA_NAME=$USER - fi - # Uploasd file - scp $DMGFILE $INFOFILE "$MODEVIA_NAME"@inkscape.modevia.com:inkscape/docs/macosx-snap/ - status=$? - if [[ $status -ne 0 ]]; then - echo -e "\nUpload failed" - exit $status - fi -fi - if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; then # open a Finder window here to admire what we just produced open . -- cgit v1.2.3 From edd1334f8ff1e4ba97283402f7c22566b731aa31 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 00:01:26 +0200 Subject: Info.plist.in: update copyright year (bzr r13506.1.2) --- Info.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Info.plist.in b/Info.plist.in index 096557c67..48c5daf98 100644 --- a/Info.plist.in +++ b/Info.plist.in @@ -329,7 +329,7 @@ <key>CFBundleVersion</key> <string>@VERSION@</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string> + <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string> <key>LSMinimumSystemVersion</key> <string>10.3</string> </dict> -- cgit v1.2.3 From b75d7d0088acdfca5a57ee898ddb40314a0e29a5 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 00:03:26 +0200 Subject: Info.plist.in: add application category (see bug #1302849) (bzr r13506.1.3) --- Info.plist.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Info.plist.in b/Info.plist.in index 48c5daf98..00fa2666d 100644 --- a/Info.plist.in +++ b/Info.plist.in @@ -330,6 +330,8 @@ <string>@VERSION@</string> <key>NSHumanReadableCopyright</key> <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string> + <key>LSApplicationCategoryType</key> + <string>public.app-category.graphics-design</string> <key>LSMinimumSystemVersion</key> <string>10.3</string> </dict> -- cgit v1.2.3 From 227b924a96b4842531cfd254703a57527cfeb704 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 00:04:43 +0200 Subject: Fix typos in build scripts (see bug #1305427) (bzr r13506.1.4) --- packaging/macosx/osx-app.sh | 2 +- packaging/macosx/osx-dmg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index f827a67b0..4a851cf56 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -65,7 +65,7 @@ Create an app bundle for OS X \033[1m-l,--libraries\033[0m specify the path to the librairies Inkscape depends on (typically /sw or /opt/local) - \033[1m-b--binary\033[0m + \033[1m-b,--binary\033[0m specify the path to Inkscape's binary. By default it is in Build/bin/ at the base of the source code directory \033[1m-p,--plist\033[0m diff --git a/packaging/macosx/osx-dmg.sh b/packaging/macosx/osx-dmg.sh index f1ce72132..95129b8cb 100755 --- a/packaging/macosx/osx-dmg.sh +++ b/packaging/macosx/osx-dmg.sh @@ -45,7 +45,7 @@ auto_open_opt= #---------------------------------------------------------- help() { -echo " +echo -e " Create a custom dmg file to distribute Inkscape \033[1mUSAGE\033[0m -- cgit v1.2.3 From 2e808488728a059bf9c60f2de644cefc8b0cd92e Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 00:07:36 +0200 Subject: Add /System/Library/Fonts back to fontconfig's directory list (see bug #1288672) (bzr r13506.1.5) --- packaging/macosx/Resources/etc/fonts/fonts.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf index c8a008dab..476aca105 100644 --- a/packaging/macosx/Resources/etc/fonts/fonts.conf +++ b/packaging/macosx/Resources/etc/fonts/fonts.conf @@ -26,7 +26,7 @@ <dir>/usr/share/fonts</dir> <dir>/usr/X11R6/lib/X11/fonts</dir> <dir>/opt/local/share/fonts</dir> - <!-- <dir>/System/Library/Fonts</dir> --> + <dir>/System/Library/Fonts</dir> <dir>/Network/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> -- cgit v1.2.3 From f113f779502e08ed57f2c2c8a2ef65ebfff861fd Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 03:15:30 +0200 Subject: Support compiling ScriptExec on newer versions of OS X (please review) (bzr r13506.1.6) --- .../ScriptExec/ScriptExec.xcode/project.pbxproj | 451 --------------------- .../ScriptExec.xcodeproj/project.pbxproj | 24 +- packaging/macosx/ScriptExec/main.c | 193 ++------- 3 files changed, 48 insertions(+), 620 deletions(-) delete mode 100644 packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj diff --git a/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj b/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj deleted file mode 100644 index bc081d5ef..000000000 --- a/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj +++ /dev/null @@ -1,451 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 39; - objects = { - 0249A66BFF388E3F11CA2CEA = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = "libstdc++.a"; - path = "/usr/lib/libstdc++.a"; - refType = 0; - sourceTree = "<absolute>"; - }; -//020 -//021 -//022 -//023 -//024 -//080 -//081 -//082 -//083 -//084 - 0867D6AAFE840B52C02AAC07 = { - children = ( - 0867D6ABFE840B52C02AAC07, - ); - isa = PBXVariantGroup; - name = InfoPlist.strings; - refType = 4; - sourceTree = "<group>"; - }; - 0867D6ABFE840B52C02AAC07 = { - fileEncoding = 10; - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = English; - path = English.lproj/InfoPlist.strings; - refType = 4; - sourceTree = "<group>"; - }; -//080 -//081 -//082 -//083 -//084 -//190 -//191 -//192 -//193 -//194 - 195DF8CFFE9D517E11CA2CBB = { - children = ( - 8D0C4E970486CD37000505A6, - ); - isa = PBXGroup; - name = Products; - refType = 4; - sourceTree = "<group>"; - }; -//190 -//191 -//192 -//193 -//194 -//200 -//201 -//202 -//203 -//204 - 20286C28FDCF999611CA2CEA = { - buildSettings = { - }; - buildStyles = ( - 4A9504C5FFE6A39111CA0CBA, - 4A9504C6FFE6A39111CA0CBA, - ); - hasScannedForEncodings = 1; - isa = PBXProject; - mainGroup = 20286C29FDCF999611CA2CEA; - projectDirPath = ""; - targets = ( - 8D0C4E890486CD37000505A6, - ); - }; - 20286C29FDCF999611CA2CEA = { - children = ( - 20286C2AFDCF999611CA2CEA, - 20286C2CFDCF999611CA2CEA, - 20286C32FDCF999611CA2CEA, - 195DF8CFFE9D517E11CA2CBB, - ); - isa = PBXGroup; - name = ScriptExec; - path = ""; - refType = 4; - sourceTree = "<group>"; - }; - 20286C2AFDCF999611CA2CEA = { - children = ( - 32DBCF6D0370B57F00C91783, - 20286C2BFDCF999611CA2CEA, - ); - isa = PBXGroup; - name = Sources; - path = ""; - refType = 4; - sourceTree = "<group>"; - }; - 20286C2BFDCF999611CA2CEA = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - path = main.c; - refType = 4; - sourceTree = "<group>"; - }; - 20286C2CFDCF999611CA2CEA = { - children = ( - 664C29F0060ECDC4006EC560, - B8DCE042056DAC3500C390B0, - 8D0C4E960486CD37000505A6, - B8DCE048056DAC5000C390B0, - 0867D6AAFE840B52C02AAC07, - ); - isa = PBXGroup; - name = Resources; - path = ""; - refType = 4; - sourceTree = "<group>"; - }; - 20286C32FDCF999611CA2CEA = { - children = ( - 20286C33FDCF999611CA2CEA, - 4A9504CAFFE6A41611CA0CBA, - 4A9504C8FFE6A3BC11CA0CBA, - 0249A66BFF388E3F11CA2CEA, - B8DCE04E056DACAE00C390B0, - ); - isa = PBXGroup; - name = "External Frameworks and Libraries"; - path = ""; - refType = 4; - sourceTree = "<group>"; - }; - 20286C33FDCF999611CA2CEA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = Carbon.framework; - path = /System/Library/Frameworks/Carbon.framework; - refType = 0; - sourceTree = "<absolute>"; - }; -//200 -//201 -//202 -//203 -//204 -//320 -//321 -//322 -//323 -//324 - 32DBCF6D0370B57F00C91783 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = ScriptExec_Prefix.pch; - refType = 4; - sourceTree = "<group>"; - }; -//320 -//321 -//322 -//323 -//324 -//4A0 -//4A1 -//4A2 -//4A3 -//4A4 - 4A9504C5FFE6A39111CA0CBA = { - buildRules = ( - ); - buildSettings = { - COPY_PHASE_STRIP = NO; - DEBUGGING_SYMBOLS = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; - ZERO_LINK = YES; - }; - isa = PBXBuildStyle; - name = Development; - }; - 4A9504C6FFE6A39111CA0CBA = { - buildRules = ( - ); - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = s; - ZERO_LINK = NO; - }; - isa = PBXBuildStyle; - name = Deployment; - }; - 4A9504C8FFE6A3BC11CA0CBA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = ApplicationServices.framework; - path = /System/Library/Frameworks/ApplicationServices.framework; - refType = 0; - sourceTree = "<absolute>"; - }; - 4A9504CAFFE6A41611CA0CBA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = CoreServices.framework; - path = /System/Library/Frameworks/CoreServices.framework; - refType = 0; - sourceTree = "<absolute>"; - }; -//4A0 -//4A1 -//4A2 -//4A3 -//4A4 -//660 -//661 -//662 -//663 -//664 - 664C29F0060ECDC4006EC560 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text.script.sh; - path = openDoc; - refType = 4; - sourceTree = "<group>"; - }; - 664C29F1060ECDC4006EC560 = { - fileRef = 664C29F0060ECDC4006EC560; - isa = PBXBuildFile; - settings = { - }; - }; -//660 -//661 -//662 -//663 -//664 -//8D0 -//8D1 -//8D2 -//8D3 -//8D4 - 8D0C4E890486CD37000505A6 = { - buildPhases = ( - 8D0C4E8A0486CD37000505A6, - 8D0C4E8C0486CD37000505A6, - 8D0C4E8F0486CD37000505A6, - 8D0C4E910486CD37000505A6, - 8D0C4E940486CD37000505A6, - ); - buildRules = ( - ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_ENABLE_TRIGRAPHS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ScriptExec_Prefix.pch; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - LIBRARY_STYLE = Static; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ScriptExec; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - WRAPPER_EXTENSION = app; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = ScriptExec; - productInstallPath = "$(HOME)/Applications"; - productName = ScriptExec; - productReference = 8D0C4E970486CD37000505A6; - productType = "com.apple.product-type.application"; - }; - 8D0C4E8A0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E8B0486CD37000505A6, - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E8B0486CD37000505A6 = { - fileRef = 32DBCF6D0370B57F00C91783; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E8C0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E8D0486CD37000505A6, - B8DCE045056DAC3500C390B0, - B8DCE049056DAC5000C390B0, - 664C29F1060ECDC4006EC560, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E8D0486CD37000505A6 = { - fileRef = 0867D6AAFE840B52C02AAC07; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E8F0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E900486CD37000505A6, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E900486CD37000505A6 = { - fileRef = 20286C2BFDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - ); - }; - }; - 8D0C4E910486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E920486CD37000505A6, - 8D0C4E930486CD37000505A6, - B8DCE04F056DACAE00C390B0, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E920486CD37000505A6 = { - fileRef = 20286C33FDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E930486CD37000505A6 = { - fileRef = 0249A66BFF388E3F11CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E940486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXRezBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E960486CD37000505A6 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist; - path = Info.plist; - refType = 4; - sourceTree = "<group>"; - }; - 8D0C4E970486CD37000505A6 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = ScriptExec.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; -//8D0 -//8D1 -//8D2 -//8D3 -//8D4 -//B80 -//B81 -//B82 -//B83 -//B84 - B8DCE042056DAC3500C390B0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - path = MenuBar.nib; - refType = 4; - sourceTree = "<group>"; - }; - B8DCE045056DAC3500C390B0 = { - fileRef = B8DCE042056DAC3500C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - B8DCE048056DAC5000C390B0 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text.script.sh; - path = script; - refType = 4; - sourceTree = "<group>"; - }; - B8DCE049056DAC5000C390B0 = { - fileRef = B8DCE048056DAC5000C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - B8DCE04E056DACAE00C390B0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Security.framework; - path = /System/Library/Frameworks/Security.framework; - refType = 0; - sourceTree = "<absolute>"; - }; - B8DCE04F056DACAE00C390B0 = { - fileRef = B8DCE04E056DACAE00C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - }; - rootObject = 20286C28FDCF999611CA2CEA; -} diff --git a/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj b/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj index 3d0fe0120..0443dd764 100644 --- a/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj +++ b/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj @@ -12,14 +12,12 @@ 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; 8D0C4E900486CD37000505A6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 20286C2BFDCF999611CA2CEA /* main.c */; settings = {ATTRIBUTES = (); }; }; 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; - 8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0249A66BFF388E3F11CA2CEA /* libstdc++.a */; }; B8DCE045056DAC3500C390B0 /* MenuBar.nib in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE042056DAC3500C390B0 /* MenuBar.nib */; }; B8DCE049056DAC5000C390B0 /* script in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE048056DAC5000C390B0 /* script */; }; B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8DCE04E056DACAE00C390B0 /* Security.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 0249A66BFF388E3F11CA2CEA /* libstdc++.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/libstdc++.a"; sourceTree = "<absolute>"; }; 0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 20286C2BFDCF999611CA2CEA /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; }; 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; @@ -40,7 +38,6 @@ buildActionMask = 2147483647; files = ( 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */, - 8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */, B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -94,7 +91,6 @@ 20286C33FDCF999611CA2CEA /* Carbon.framework */, 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */, 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */, - 0249A66BFF388E3F11CA2CEA /* libstdc++.a */, B8DCE04E056DACAE00C390B0 /* Security.framework */, ); name = "External Frameworks and Libraries"; @@ -140,9 +136,15 @@ 20286C28FDCF999611CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 78E9AE1A0A36A8E3000D76A8 /* Build configuration list for PBXProject "ScriptExec" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + en, + ); mainGroup = 20286C29FDCF999611CA2CEA /* ScriptExec */; projectDirPath = ""; + projectRoot = ""; targets = ( 8D0C4E890486CD37000505A6 /* ScriptExec */, ); @@ -199,6 +201,8 @@ 78E9AE170A36A8E3000D76A8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; FRAMEWORK_SEARCH_PATHS = ""; @@ -217,7 +221,6 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Static; - OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -236,6 +239,8 @@ 78E9AE180A36A8E3000D76A8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -270,6 +275,8 @@ 78E9AE190A36A8E3000D76A8 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; FRAMEWORK_SEARCH_PATHS = ""; GCC_ENABLE_TRIGRAPHS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -300,25 +307,18 @@ 78E9AE1B0A36A8E3000D76A8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; }; 78E9AE1C0A36A8E3000D76A8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; }; 78E9AE1D0A36A8E3000D76A8 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Default; }; diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c index f413d438a..e754057a9 100644 --- a/packaging/macosx/ScriptExec/main.c +++ b/packaging/macosx/ScriptExec/main.c @@ -6,6 +6,7 @@ With modifications by Aaron Voisine for gimp.app With modifications by Marianne gagnon for Wilber-loves-apple With modifications by Michael Wybrow for Inkscape.app + With modifications by ~suv for Inkscape.app This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,7 +40,12 @@ #pragma mark Includes // Apple stuff + +// Note: including Carbon prevents building the launcher app in x86_64 +// used for StandardAlert in RequestUserAttention(), +// RedFatalAlert() and X11FailedHandler() #include <Carbon/Carbon.h> + #include <CoreFoundation/CoreFoundation.h> #include <Security/Authorization.h> #include <Security/AuthorizationTags.h> @@ -83,15 +89,14 @@ static void *OpenDoc(void *arg); static OSErr ExecuteScript(char *script, pid_t *pid); static void GetParameters(void); -static char* GetScript(void); -static char* GetOpenDoc(void); +static unsigned char* GetScript(void); +static unsigned char* GetOpenDoc(void); OSErr LoadMenuBar(char *appName); -static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize); +static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize); static void RedFatalAlert(Str255 errorString, Str255 expStr); -static short DoesFileExist(char *path); -static OSStatus FixFCCache(void); +static short DoesFileExist(unsigned char *path); static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent, AppleEvent *reply, long refCon); @@ -109,7 +114,7 @@ static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, static OSStatus CompileAppleScript(const void* text, long textLength, AEDesc *resultData); static OSStatus SimpleCompileAppleScript(const char* theScript); -static void runScript(); +static OSErr runScript(); /////////////////////////////////////// // Globals @@ -181,7 +186,7 @@ int main(int argc, char* argv[]) GetParameters(); //load data from files containing exec settings // compile "icon clicked" script so it's ready to execute - SimpleCompileAppleScript("tell application \"X11\" to activate"); + SimpleCompileAppleScript("tell application \"XQuartz\" to activate"); RunApplicationEventLoop(); //Run the event loop return 0; @@ -253,116 +258,6 @@ static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, } -static size_t safeRead(int d, void *buf, size_t nbytes) -{ - ssize_t bytesToRead = nbytes; - ssize_t bytesRead = 0; - char *offset = (char *) buf; - - while ((bytesToRead > 0)) - { - bytesRead = read(d, offset, bytesToRead); - if (bytesRead > 0) - { - offset += bytesRead; - bytesToRead -= bytesRead; - } - else if (bytesRead == 0) - { - // Reached EOF. - break; - } - else if (bytesRead == -1) - { - if ((errno == EINTR) || (errno == EAGAIN)) - { - // Try again. - continue; - } - return 0; - } - } - return bytesRead; -} - - -///////////////////////////////////// -// Code to run fc-cache on first run -///////////////////////////////////// -static OSStatus FixFCCache (void) -{ - FILE *fileConnToChild = NULL; - int fdConnToChild = 0; - pid_t childPID = WAIT_ANY; - size_t bytesChildPID; - size_t bytesRead; - int status; - - char commandStr[] = "/usr/X11R6/bin/fc-cache"; - char *commandArgs[] = { "-f", NULL }; - - // Run fc-cache - AuthorizationItem authItems[] = - { - { - kAuthorizationRightExecute, - strlen(commandStr), - commandStr, - 0 - } - }; - AuthorizationItemSet authItemSet = - { - 1, - authItems - }; - AuthorizationRef authRef = NULL; - OSStatus err = AuthorizationCreate (NULL, &authItemSet, - kAuthorizationFlagInteractionAllowed | - kAuthorizationFlagExtendRights, &authRef); - - if (err == errAuthorizationSuccess) - { - err = AuthorizationExecuteWithPrivileges(authRef, commandStr, - kAuthorizationFlagDefaults, commandArgs, - &fileConnToChild); - - if (err == errAuthorizationSuccess) - { - // Unfortunately, AuthorizationExecuteWithPrivileges - // does not return the process ID associated with the - // process it runs. The best solution we have it to - // try and get the process ID from the file descriptor. - // This is based on example code from Apple's - // MoreAuthSample. - - fdConnToChild = fileno(fileConnToChild); - - // Try an get the process ID of the fc-cache command - bytesChildPID = sizeof(childPID); - bytesRead = safeRead(fdConnToChild, &childPID, - bytesChildPID); - if (bytesRead != bytesChildPID) - { - // If we can't get it the best alternative - // is to wait for any child to finish. - childPID = WAIT_ANY; - } - - if (fileConnToChild != NULL) { - fclose(fileConnToChild); - } - - // Wait for child process to finish. - waitpid(childPID, &status, 0); - } - } - AuthorizationFree(authRef, kAuthorizationFlagDestroyRights); - - return err; -} - - /////////////////////////////////// // Execution thread starts here /////////////////////////////////// @@ -448,14 +343,13 @@ static void GetParameters (void) /////////////////////////////////////// // Get path to the script in Resources folder /////////////////////////////////////// -static char* GetScript (void) +static unsigned char* GetScript (void) { CFStringRef fileName; CFBundleRef appBundle; CFURLRef scriptFileURL; FSRef fileRef; - FSSpec fileSpec; - char *path; + unsigned char *path; //get CF URL for script if (! (appBundle = CFBundleGetMainBundle())) return NULL; @@ -472,13 +366,9 @@ static char* GetScript (void) CFRelease(scriptFileURL); CFRelease(fileName); - //convert FSRef to FSSpec - if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec, - NULL)) return NULL; - //create path string if (! (path = malloc(kMaxPathLength))) return NULL; - if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL; + if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL; if (! DoesFileExist(path)) return NULL; return path; @@ -487,14 +377,13 @@ static char* GetScript (void) /////////////////////////////////////// // Gets the path to openDoc in Resources folder /////////////////////////////////////// -static char* GetOpenDoc (void) +static unsigned char* GetOpenDoc (void) { CFStringRef fileName; CFBundleRef appBundle; CFURLRef openDocFileURL; FSRef fileRef; - FSSpec fileSpec; - char *path; + unsigned char *path; //get CF URL for openDoc if (! (appBundle = CFBundleGetMainBundle())) return NULL; @@ -511,13 +400,9 @@ static char* GetOpenDoc (void) CFRelease(openDocFileURL); CFRelease(fileName); - //convert FSRef to FSSpec - if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec, - NULL)) return NULL; - //create path string if (! (path = malloc(kMaxPathLength))) return NULL; - if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL; + if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL; if (! DoesFileExist(path)) return NULL; return path; @@ -545,14 +430,8 @@ OSErr LoadMenuBar (char *appName) /////////////////////////////////////// // Generate path string from FSSpec record /////////////////////////////////////// -static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize) +static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize) { - OSErr err = noErr; - FSRef fileRef; - - //create file reference from file spec - if (err = FSpMakeFSRef(&file, &fileRef)) return err; - // and then convert the FSRef to a path return FSRefMakePath(&fileRef, path, maxPathSize); } @@ -569,9 +448,9 @@ static void RedFatalAlert (Str255 errorString, Str255 expStr) /////////////////////////////////////// // Determines whether file exists at path or not /////////////////////////////////////// -static short DoesFileExist (char *path) +static short DoesFileExist (unsigned char *path) { - if (access(path, F_OK) == -1) return false; + if (access((char *)path, F_OK) == -1) return false; return true; } @@ -590,7 +469,7 @@ static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent, if (! taskDone && pid) { //kill the script process brutally kill(pid, 9); - printf("Platypus App: PID %d killed brutally\n", pid); + printf("Inkscape.app: PID %d killed brutally\n", pid); } pthread_cancel(tid); @@ -610,31 +489,31 @@ static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, #pragma unused (reply, refCon) OSErr err = noErr; - AEDescList fileSpecList; + AEDescList fileRefList; AEKeyword keyword; DescType type; short i; long count, actualSize; - FSSpec fileSpec; - char path[kMaxPathLength]; + FSRef fileRef; + unsigned char path[kMaxPathLength]; while (numArgs > 0) free(fileArgs[numArgs--]); //Read the AppleEvent err = AEGetParamDesc(theAppleEvent, keyDirectObject, typeAEList, - &fileSpecList); + &fileRefList); - err = AECountItems(&fileSpecList, &count); //Count number of files + err = AECountItems(&fileRefList, &count); //Count number of files for (i = 1; i <= count; i++) { //iteratively process each file - //get fsspec from apple event - if (! (err = AEGetNthPtr(&fileSpecList, i, typeFSS, &keyword, &type, - (Ptr)&fileSpec, sizeof(FSSpec), &actualSize))) + //get fsref from apple event + if (! (err = AEGetNthPtr(&fileRefList, i, typeFSRef, &keyword, &type, + (Ptr)&fileRef, sizeof(FSRef), &actualSize))) { - //get path from file spec - if ((err = FSMakePath(fileSpec, (unsigned char *)&path, + //get path from file ref + if ((err = FSMakePath(fileRef, (unsigned char *)&path, kMaxPathLength))) return err; if (numArgs == kMaxArgumentsToScript) break; @@ -659,7 +538,7 @@ static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, AppleEvent *reply, long refCon) { - runScript(); + return runScript(); } // if app is being opened @@ -724,12 +603,12 @@ static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall, params.position = kWindowDefaultPosition; StandardAlert(kAlertStopAlert, "\pFailed to start X11", - "\pInkscape.app requires Apple's X11, which is freely downloadable from Apple's website for Panther (10.3.x) users and available as an optional install from the installation DVD for Tiger (10.4.x) users.\n\nPlease install X11 and restart Inkscape.", + "\pInkscape.app requires XQuartz.", ¶ms, &itemHit); if (itemHit == kAlertStdAlertCancelButton) { - OpenURL("http://www.apple.com/downloads/macosx/apple/macosx_updates/x11formacosx.html"); + OpenURL("http://xquartz.macosforge.org/landing/"); } ExitToShell(); @@ -774,7 +653,7 @@ static OSStatus CompileAppleScript(const void* text, long textLength, } /* runs the compiled applescript */ -static void runScript() +static OSErr runScript() { /* run the script */ err = OSAExecute(theComponent, scriptID, kOSANullScript, -- cgit v1.2.3 From 4f4e1a286aff707161b4ac1346c872b809254781 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 03:18:14 +0200 Subject: osx-build.sh: don't hard-code LIBPREFIX, other minor changes (bzr r13506.1.7) --- packaging/macosx/osx-build.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index a536adf64..a3e87c0e7 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -22,9 +22,11 @@ # User modifiable parameters #---------------------------------------------------------- # Configure flags -CONFFLAGS="--disable-openmp --enable-osxapp" +CONFFLAGS="--enable-osxapp --enable-localinstall" # Libraries prefix (Warning: NO trailing slash) -LIBPREFIX="/opt/local-x11" +if [ -z "$LIBPREFIX" ]; then + LIBPREFIX="/opt/local-x11" +fi ############################################################ @@ -151,7 +153,7 @@ done # Set environment variables # ---------------------------------------------------------- -export LIBPREFIX="/opt/local-x11" +export LIBPREFIX # Specific environment variables # automake seach path @@ -160,8 +162,8 @@ export CPATH="$LIBPREFIX/include" export CPPFLAGS="-I$LIBPREFIX/include" export LDFLAGS="-L$LIBPREFIX/lib" # compiler arguments -export CFLAGS="-O0 -Wall" -export CXXFLAGS="$CFLAGS" +export CFLAGS="-pipe -Os" +export CXXFLAGS="$CFLAGS -Wno-cast-align" # Actions # ---------------------------------------------------------- -- cgit v1.2.3 From 1a454f9f9fccd68179fda31d6605599999f17fa6 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 03:21:35 +0200 Subject: Fix GTK+ module caches; simplify gtk theme usage; remove copy of Adwaita theme (bzr r13506.1.8) --- packaging/macosx/Resources/bin/inkscape | 4 +- packaging/macosx/Resources/etc/gtk-2.0/gtkrc | 20 + .../macosx/Resources/themes/Adwaita/.DS_Store | Bin 6148 -> 0 bytes .../themes/Adwaita/backgrounds/adwaita-timed.xml | 51 - .../themes/Adwaita/backgrounds/bright-day.jpg | Bin 1448256 -> 0 bytes .../themes/Adwaita/backgrounds/good-night.jpg | Bin 473584 -> 0 bytes .../themes/Adwaita/backgrounds/morning.jpg | Bin 1182508 -> 0 bytes .../Resources/themes/Adwaita/gtk-2.0/.DS_Store | Bin 6148 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-down-insens.png | Bin 314 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png | Bin 302 -> 0 bytes .../gtk-2.0/Arrows/arrow-down-small-insens.png | Bin 298 -> 0 bytes .../gtk-2.0/Arrows/arrow-down-small-prelight.png | Bin 275 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-down-small.png | Bin 277 -> 0 bytes .../themes/Adwaita/gtk-2.0/Arrows/arrow-down.png | Bin 304 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-left-insens.png | Bin 289 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png | Bin 282 -> 0 bytes .../themes/Adwaita/gtk-2.0/Arrows/arrow-left.png | Bin 290 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-right-insens.png | Bin 306 -> 0 bytes .../gtk-2.0/Arrows/arrow-right-prelight.png | Bin 290 -> 0 bytes .../themes/Adwaita/gtk-2.0/Arrows/arrow-right.png | Bin 292 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-up-insens.png | Bin 294 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png | Bin 292 -> 0 bytes .../gtk-2.0/Arrows/arrow-up-small-insens.png | Bin 270 -> 0 bytes .../gtk-2.0/Arrows/arrow-up-small-prelight.png | Bin 258 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/arrow-up-small.png | Bin 257 -> 0 bytes .../themes/Adwaita/gtk-2.0/Arrows/arrow-up.png | Bin 295 -> 0 bytes .../Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png | Bin 254 -> 0 bytes .../themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png | Bin 276 -> 0 bytes .../gtk-2.0/Buttons/button-default-nohilight.png | Bin 448 -> 0 bytes .../Adwaita/gtk-2.0/Buttons/button-default.png | Bin 484 -> 0 bytes .../Buttons/button-insensitive-nohilight.png | Bin 371 -> 0 bytes .../Adwaita/gtk-2.0/Buttons/button-insensitive.png | Bin 405 -> 0 bytes .../gtk-2.0/Buttons/button-prelight-nohilight.png | Bin 439 -> 0 bytes .../Adwaita/gtk-2.0/Buttons/button-prelight.png | Bin 478 -> 0 bytes .../gtk-2.0/Buttons/button-pressed-nohilight.png | Bin 408 -> 0 bytes .../Adwaita/gtk-2.0/Buttons/button-pressed.png | Bin 450 -> 0 bytes .../Check-Radio/checkbox-checked-insensitive.png | Bin 3299 -> 0 bytes .../gtk-2.0/Check-Radio/checkbox-checked.png | Bin 3400 -> 0 bytes .../Check-Radio/checkbox-unchecked-insensitive.png | Bin 3019 -> 0 bytes .../gtk-2.0/Check-Radio/checkbox-unchecked.png | Bin 3047 -> 0 bytes .../Adwaita/gtk-2.0/Check-Radio/menucheck.png | Bin 427 -> 0 bytes .../gtk-2.0/Check-Radio/menucheck_prelight.png | Bin 313 -> 0 bytes .../Adwaita/gtk-2.0/Check-Radio/menuoption.png | Bin 256 -> 0 bytes .../gtk-2.0/Check-Radio/menuoption_prelight.png | Bin 220 -> 0 bytes .../Check-Radio/option-checked-insensitive.png | Bin 728 -> 0 bytes .../Adwaita/gtk-2.0/Check-Radio/option-checked.png | Bin 868 -> 0 bytes .../Check-Radio/option-unchecked-insensitive.png | Bin 620 -> 0 bytes .../gtk-2.0/Check-Radio/option-unchecked.png | Bin 673 -> 0 bytes .../gtk-2.0/Entry/combo-entry-border-active-bg.png | Bin 274 -> 0 bytes .../Entry/combo-entry-border-active-notebook.png | Bin 274 -> 0 bytes .../Entry/combo-entry-border-active-rtl-bg.png | Bin 295 -> 0 bytes .../combo-entry-border-active-rtl-notebook.png | Bin 295 -> 0 bytes .../gtk-2.0/Entry/combo-entry-border-bg.png | Bin 334 -> 0 bytes .../Entry/combo-entry-border-disabled-bg.png | Bin 275 -> 0 bytes .../Entry/combo-entry-border-disabled-notebook.png | Bin 263 -> 0 bytes .../Entry/combo-entry-border-disabled-rtl-bg.png | Bin 295 -> 0 bytes .../combo-entry-border-disabled-rtl-notebook.png | Bin 280 -> 0 bytes .../gtk-2.0/Entry/combo-entry-border-notebook.png | Bin 304 -> 0 bytes .../gtk-2.0/Entry/combo-entry-border-rtl-bg.png | Bin 373 -> 0 bytes .../Entry/combo-entry-border-rtl-notebook.png | Bin 322 -> 0 bytes .../Entry/combo-entry-button-active-rtl.png | Bin 359 -> 0 bytes .../gtk-2.0/Entry/combo-entry-button-active.png | Bin 373 -> 0 bytes .../Entry/combo-entry-button-disabled-rtl.png | Bin 317 -> 0 bytes .../gtk-2.0/Entry/combo-entry-button-disabled.png | Bin 331 -> 0 bytes .../gtk-2.0/Entry/combo-entry-button-rtl.png | Bin 353 -> 0 bytes .../Adwaita/gtk-2.0/Entry/combo-entry-button.png | Bin 368 -> 0 bytes .../gtk-2.0/Entry/entry-border-active-bg-solid.png | Bin 402 -> 0 bytes .../gtk-2.0/Entry/entry-border-active-bg.png | Bin 355 -> 0 bytes .../gtk-2.0/Entry/entry-border-active-notebook.png | Bin 356 -> 0 bytes .../gtk-2.0/Entry/entry-border-bg-solid.png | Bin 406 -> 0 bytes .../Adwaita/gtk-2.0/Entry/entry-border-bg.png | Bin 427 -> 0 bytes .../gtk-2.0/Entry/entry-border-disabled-bg.png | Bin 353 -> 0 bytes .../Entry/entry-border-disabled-notebook.png | Bin 331 -> 0 bytes .../gtk-2.0/Entry/entry-border-fill-plain.png | Bin 139 -> 0 bytes .../gtk-2.0/Entry/entry-border-fill-solid.png | Bin 203 -> 0 bytes .../Adwaita/gtk-2.0/Entry/entry-border-fill.png | Bin 179 -> 0 bytes .../gtk-2.0/Entry/entry-border-notebook.png | Bin 407 -> 0 bytes .../themes/Adwaita/gtk-2.0/Expanders/minus.png | Bin 294 -> 0 bytes .../themes/Adwaita/gtk-2.0/Expanders/plus.png | Bin 324 -> 0 bytes .../themes/Adwaita/gtk-2.0/Handles/handle-h.png | Bin 181 -> 0 bytes .../themes/Adwaita/gtk-2.0/Handles/handle-v.png | Bin 179 -> 0 bytes .../themes/Adwaita/gtk-2.0/Lines/line-h.png | Bin 135 -> 0 bytes .../themes/Adwaita/gtk-2.0/Lines/line-v.png | Bin 2764 -> 0 bytes .../themes/Adwaita/gtk-2.0/Lines/menu_line_h.png | Bin 141 -> 0 bytes .../Adwaita/gtk-2.0/Menu-Menubar/menubar.png | Bin 3056 -> 0 bytes .../gtk-2.0/Menu-Menubar/menubar_button.png | Bin 289 -> 0 bytes .../themes/Adwaita/gtk-2.0/Others/focus.png | Bin 212 -> 0 bytes .../themes/Adwaita/gtk-2.0/Others/null.png | Bin 4933 -> 0 bytes .../themes/Adwaita/gtk-2.0/Others/tree_header.png | Bin 2803 -> 0 bytes .../Adwaita/gtk-2.0/ProgressBar/progressbar.png | Bin 459 -> 0 bytes .../Adwaita/gtk-2.0/ProgressBar/progressbar_v.png | Bin 430 -> 0 bytes .../gtk-2.0/ProgressBar/trough-progressbar.png | Bin 450 -> 0 bytes .../gtk-2.0/ProgressBar/trough-progressbar_v.png | Bin 411 -> 0 bytes .../gtk-2.0/Range/slider-horiz-prelight.png | Bin 3274 -> 0 bytes .../themes/Adwaita/gtk-2.0/Range/slider-horiz.png | Bin 3274 -> 0 bytes .../Adwaita/gtk-2.0/Range/slider-vert-prelight.png | Bin 3293 -> 0 bytes .../themes/Adwaita/gtk-2.0/Range/slider-vert.png | Bin 3293 -> 0 bytes .../Adwaita/gtk-2.0/Range/trough-horizontal.png | Bin 2927 -> 0 bytes .../Adwaita/gtk-2.0/Range/trough-vertical.png | Bin 2964 -> 0 bytes .../gtk-2.0/Scrollbars/slider-horiz-active.png | Bin 2903 -> 0 bytes .../gtk-2.0/Scrollbars/slider-horiz-insens.png | Bin 2905 -> 0 bytes .../gtk-2.0/Scrollbars/slider-horiz-prelight.png | Bin 2911 -> 0 bytes .../Adwaita/gtk-2.0/Scrollbars/slider-horiz.png | Bin 2904 -> 0 bytes .../gtk-2.0/Scrollbars/slider-vert-active.png | Bin 2893 -> 0 bytes .../gtk-2.0/Scrollbars/slider-vert-insens.png | Bin 2893 -> 0 bytes .../gtk-2.0/Scrollbars/slider-vert-prelight.png | Bin 2896 -> 0 bytes .../Adwaita/gtk-2.0/Scrollbars/slider-vert.png | Bin 2892 -> 0 bytes .../gtk-2.0/Scrollbars/trough-scrollbar-horiz.png | Bin 2782 -> 0 bytes .../gtk-2.0/Scrollbars/trough-scrollbar-vert.png | Bin 2782 -> 0 bytes .../Adwaita/gtk-2.0/Shadows/frame-gap-end.png | Bin 174 -> 0 bytes .../Adwaita/gtk-2.0/Shadows/frame-gap-start.png | Bin 174 -> 0 bytes .../themes/Adwaita/gtk-2.0/Shadows/frame.png | Bin 242 -> 0 bytes .../gtk-2.0/Spin/down-background-disable-rtl.png | Bin 264 -> 0 bytes .../gtk-2.0/Spin/down-background-disable.png | Bin 260 -> 0 bytes .../Adwaita/gtk-2.0/Spin/down-background-rtl.png | Bin 277 -> 0 bytes .../Adwaita/gtk-2.0/Spin/down-background.png | Bin 265 -> 0 bytes .../gtk-2.0/Spin/up-background-disable-rtl.png | Bin 242 -> 0 bytes .../Adwaita/gtk-2.0/Spin/up-background-disable.png | Bin 257 -> 0 bytes .../Adwaita/gtk-2.0/Spin/up-background-rtl.png | Bin 269 -> 0 bytes .../themes/Adwaita/gtk-2.0/Spin/up-background.png | Bin 293 -> 0 bytes .../Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png | Bin 120 -> 0 bytes .../Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png | Bin 121 -> 0 bytes .../themes/Adwaita/gtk-2.0/Tabs/notebook.png | Bin 2786 -> 0 bytes .../Adwaita/gtk-2.0/Tabs/tab-bottom-active.png | Bin 2913 -> 0 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png | Bin 3604 -> 0 bytes .../Adwaita/gtk-2.0/Tabs/tab-left-active.png | Bin 2882 -> 0 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-left.png | Bin 2904 -> 0 bytes .../Adwaita/gtk-2.0/Tabs/tab-right-active.png | Bin 2881 -> 0 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-right.png | Bin 2918 -> 0 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png | Bin 2928 -> 0 bytes .../themes/Adwaita/gtk-2.0/Tabs/tab-top.png | Bin 3581 -> 0 bytes .../Adwaita/gtk-2.0/Toolbar/inline-toolbar.png | Bin 2883 -> 0 bytes .../macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc | 2391 -------------------- .../macosx/Resources/themes/Adwaita/index.theme | 141 -- .../themes/Adwaita/metacity-1/metacity-theme-2.xml | 1604 ------------- .../themes/Adwaita/metacity-1/metacity-theme-3.xml | 1723 -------------- packaging/macosx/osx-app.sh | 23 +- 137 files changed, 37 insertions(+), 5920 deletions(-) create mode 100644 packaging/macosx/Resources/etc/gtk-2.0/gtkrc delete mode 100644 packaging/macosx/Resources/themes/Adwaita/.DS_Store delete mode 100644 packaging/macosx/Resources/themes/Adwaita/backgrounds/adwaita-timed.xml delete mode 100644 packaging/macosx/Resources/themes/Adwaita/backgrounds/bright-day.jpg delete mode 100644 packaging/macosx/Resources/themes/Adwaita/backgrounds/good-night.jpg delete mode 100644 packaging/macosx/Resources/themes/Adwaita/backgrounds/morning.jpg delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/.DS_Store delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-insens.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-insens.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-insens.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-plain.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-solid.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/minus.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/plus.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-h.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-v.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-h.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-v.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/menu_line_h.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/focus.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/null.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/tree_header.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-horizontal.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-vertical.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-end.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-start.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png delete mode 100644 packaging/macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc delete mode 100644 packaging/macosx/Resources/themes/Adwaita/index.theme delete mode 100644 packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-2.xml delete mode 100644 packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-3.xml diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 2cd872cac..1dc236c5e 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -78,7 +78,7 @@ ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/ # Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then - export GTK2_RC_FILES="$ESCAPEDTOP/themes/Adwaita/gtk-2.0/gtkrc" + export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" fi # If the AppleCollationOrder preference doesn't exist, we fall back to using @@ -119,6 +119,8 @@ export LC_ALL="$LANG" sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$PREFDIR/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ > "$PREFDIR/pango.modules" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ + > "$PREFDIR/.inkscape-etc/gtk.immodules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ > "$PREFDIR/gdk-pixbuf.loaders" diff --git a/packaging/macosx/Resources/etc/gtk-2.0/gtkrc b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc new file mode 100644 index 000000000..b55f67c65 --- /dev/null +++ b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc @@ -0,0 +1,20 @@ +# +# gtkrc file for Inkscape.app (X11) +# + +gtk-theme-name = "Adwaita-osxapp" +gtk-font-name = "Lucida Grande 9" + +gtk-icon-theme-name = "GtkStock" +gtk-icon-sizes = "gtk-dialog=32,32:gtk-button=16,16:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=12,12" + +gtk-button-images = 0 +gtk-menu-images = 0 +gtk-toolbar-style = 0 +#gtk-toolbar-icon-size = 2 + +# fix Adwaita theme for Inkscape's GimpSpinScale widgets +style "spinbutton" {} +widget_class "*GimpSpinScale*" style "spinbutton" + +# eof diff --git a/packaging/macosx/Resources/themes/Adwaita/.DS_Store b/packaging/macosx/Resources/themes/Adwaita/.DS_Store deleted file mode 100644 index 866914c2f..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/.DS_Store and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/backgrounds/adwaita-timed.xml b/packaging/macosx/Resources/themes/Adwaita/backgrounds/adwaita-timed.xml deleted file mode 100644 index 4717076d0..000000000 --- a/packaging/macosx/Resources/themes/Adwaita/backgrounds/adwaita-timed.xml +++ /dev/null @@ -1,51 +0,0 @@ -<background> - <starttime> - <year>2011</year> - <month>11</month> - <day>24</day> - <hour>7</hour> - <minute>00</minute> - <second>00</second> - </starttime> - -<!-- This animation will start at 7 AM. --> - -<!-- We start with sunrise at 7 AM. It will remain up for 1 hour. --> -<static> -<duration>3600.0</duration> -<file>/opt/local-x11/share/themes/Adwaita/backgrounds/morning.jpg</file> -</static> - -<!-- Sunrise starts to transition to day at 8 AM. The transition lasts for 5 hours, ending at 1 PM. --> -<transition type="overlay"> -<duration>18000.0</duration> -<from>/opt/local-x11/share/themes/Adwaita/backgrounds/morning.jpg</from> -<to>/opt/local-x11/share/themes/Adwaita/backgrounds/bright-day.jpg</to> -</transition> - -<!-- It's 1 PM, we're showing the day image in full force now, for 5 hours ending at 6 PM. --> -<static> -<duration>18000.0</duration> -<file>/opt/local-x11/share/themes/Adwaita/backgrounds/bright-day.jpg</file> -</static> - -<!-- It's 7 PM and it's going to start to get darker. This will transition for 6 hours up until midnight. --> -<transition type="overlay"> -<duration>21600.0</duration> -<from>/opt/local-x11/share/themes/Adwaita/backgrounds/bright-day.jpg</from> -<to>/opt/local-x11/share/themes/Adwaita/backgrounds/good-night.jpg</to> -</transition> - -<!-- It's midnight. It'll stay dark for 5 hours up until 5 AM. --> -<static> -<duration>18000.0</duration> -<file>/opt/local-x11/share/themes/Adwaita/backgrounds/good-night.jpg</file> -</static> - -<!-- It's 5 AM. We'll start transitioning to sunrise for 2 hours up until 7 AM. --> -<transition type="overlay"> -<duration>7200.0</duration> -<from>/opt/local-x11/share/themes/Adwaita/backgrounds/good-night.jpg</from> -<to>/opt/local-x11/share/themes/Adwaita/backgrounds/morning.jpg</to> -</transition> -</background> diff --git a/packaging/macosx/Resources/themes/Adwaita/backgrounds/bright-day.jpg b/packaging/macosx/Resources/themes/Adwaita/backgrounds/bright-day.jpg deleted file mode 100644 index 910feaba7..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/backgrounds/bright-day.jpg and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/backgrounds/good-night.jpg b/packaging/macosx/Resources/themes/Adwaita/backgrounds/good-night.jpg deleted file mode 100644 index 0fd83401d..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/backgrounds/good-night.jpg and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/backgrounds/morning.jpg b/packaging/macosx/Resources/themes/Adwaita/backgrounds/morning.jpg deleted file mode 100644 index 33be99ef9..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/backgrounds/morning.jpg and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/.DS_Store b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/.DS_Store deleted file mode 100644 index 79d53e299..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/.DS_Store and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-insens.png deleted file mode 100644 index e87bb51ae..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-insens.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png deleted file mode 100644 index 2d10da923..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png deleted file mode 100644 index 5b5e93ca5..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png deleted file mode 100644 index 0c8dea7c4..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png deleted file mode 100644 index a382bdc27..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down.png deleted file mode 100644 index 6019518f8..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-down.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-insens.png deleted file mode 100644 index 36a645225..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-insens.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png deleted file mode 100644 index 364984ebd..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left.png deleted file mode 100644 index e7f216da6..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-left.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-insens.png deleted file mode 100644 index c726f5a6f..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-insens.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-prelight.png deleted file mode 100644 index 934076a07..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right.png deleted file mode 100644 index 2f640e2ef..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-right.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png deleted file mode 100644 index 546fd0377..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png deleted file mode 100644 index 80a746dce..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png deleted file mode 100644 index b89863c35..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png deleted file mode 100644 index 75c45c92f..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png deleted file mode 100644 index fc7ce0b31..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up.png deleted file mode 100644 index ad8723162..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/arrow-up.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png deleted file mode 100644 index 9a2d7de74..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png deleted file mode 100644 index d481aa79b..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png deleted file mode 100644 index c30683369..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default.png deleted file mode 100644 index 1150b055c..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-default.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png deleted file mode 100644 index 88b3b1b85..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png deleted file mode 100644 index bef18a0d8..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png deleted file mode 100644 index 0e2a559ef..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png deleted file mode 100644 index a1e7cd4f2..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png deleted file mode 100644 index 1493cad19..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png deleted file mode 100644 index c7d0d51ae..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png deleted file mode 100644 index e0d48977d..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png deleted file mode 100644 index 046e2c664..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png deleted file mode 100644 index 7a5a28e49..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png deleted file mode 100644 index 6ae7b9f80..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png deleted file mode 100644 index ae0cc6ab7..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png deleted file mode 100644 index 35dc5a755..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png deleted file mode 100644 index ca3b939d7..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png deleted file mode 100644 index 0a409ab74..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png deleted file mode 100644 index 026660a99..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png deleted file mode 100644 index 2a03148a4..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png deleted file mode 100644 index 02c20ffa9..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png deleted file mode 100644 index 5bf608de3..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png deleted file mode 100644 index 3ec5cfdb9..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png deleted file mode 100644 index 3f400ce8b..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png deleted file mode 100644 index e20312bad..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png deleted file mode 100644 index 4aea86fce..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png deleted file mode 100644 index 5717fab12..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png deleted file mode 100644 index b5fc666b0..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-notebook.png deleted file mode 100644 index bd768dd3f..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png deleted file mode 100644 index aef4a29bc..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-notebook.png deleted file mode 100644 index 45eee33b1..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png deleted file mode 100644 index 217a7e2c9..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png deleted file mode 100644 index 0df28c54d..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png deleted file mode 100644 index a4f9bbbf5..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png deleted file mode 100644 index 0b7d9f3a6..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png deleted file mode 100644 index 4737ad1c5..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png deleted file mode 100644 index b317926bc..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png deleted file mode 100644 index 5c8d5a45e..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png deleted file mode 100644 index 213387fa7..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png deleted file mode 100644 index 6671400bc..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png deleted file mode 100644 index 85839b54a..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png deleted file mode 100644 index c9abe1eba..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png deleted file mode 100644 index 15c343f95..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png deleted file mode 100644 index 4fd41cdbd..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png deleted file mode 100644 index 3a492dac7..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png deleted file mode 100644 index e16b8dd2f..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-notebook.png deleted file mode 100644 index 0c1404262..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-plain.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-plain.png deleted file mode 100644 index cc401ea56..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-plain.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-solid.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-solid.png deleted file mode 100644 index a1997b7b5..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill-solid.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png deleted file mode 100644 index e28e81530..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png deleted file mode 100644 index 246f2fc51..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/minus.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/minus.png deleted file mode 100644 index 4a0d12637..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/minus.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/plus.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/plus.png deleted file mode 100644 index e5ac141f9..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Expanders/plus.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-h.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-h.png deleted file mode 100644 index f87fa8be7..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-h.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-v.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-v.png deleted file mode 100644 index f7675dd91..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Handles/handle-v.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-h.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-h.png deleted file mode 100644 index 05ffb1f86..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-h.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-v.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-v.png deleted file mode 100644 index ce3e1407d..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/line-v.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/menu_line_h.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/menu_line_h.png deleted file mode 100644 index 071d5a74c..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Lines/menu_line_h.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png deleted file mode 100644 index 744847e8a..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png deleted file mode 100644 index 7bb832c84..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/focus.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/focus.png deleted file mode 100644 index 24b65d372..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/focus.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/null.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/null.png deleted file mode 100644 index 9d7e6bedc..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/null.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/tree_header.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/tree_header.png deleted file mode 100644 index b5b4b3d1f..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Others/tree_header.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png deleted file mode 100644 index 389848d97..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png deleted file mode 100644 index fcd82d14b..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png deleted file mode 100644 index c7d0d51ae..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png deleted file mode 100644 index fe29d7378..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png deleted file mode 100644 index f8da785ca..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz.png deleted file mode 100644 index f8da785ca..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png deleted file mode 100644 index 19463a9c6..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert.png deleted file mode 100644 index 19463a9c6..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/slider-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-horizontal.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-horizontal.png deleted file mode 100644 index e6d11d78a..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-horizontal.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-vertical.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-vertical.png deleted file mode 100644 index f03e15d30..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Range/trough-vertical.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png deleted file mode 100644 index b9a289e35..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png deleted file mode 100644 index 6b2a1b87a..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png deleted file mode 100644 index b9f6e9bbf..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png deleted file mode 100644 index 3a1002ca5..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png deleted file mode 100644 index 1fa45af3f..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png deleted file mode 100644 index c913988e9..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png deleted file mode 100644 index 3836396d0..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png deleted file mode 100644 index b35da7bab..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png deleted file mode 100644 index 46207b200..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png deleted file mode 100644 index 74b81ada4..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-end.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-end.png deleted file mode 100644 index 58cacf532..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-end.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-start.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-start.png deleted file mode 100644 index 0b7e484bf..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame-gap-start.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame.png deleted file mode 100644 index d971298ff..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Shadows/frame.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png deleted file mode 100644 index 59c29f140..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png deleted file mode 100644 index 2fbc3cb12..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png deleted file mode 100644 index 8c4e254d8..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background.png deleted file mode 100644 index b8eb29aa5..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/down-background.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png deleted file mode 100644 index a5b62f6eb..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png deleted file mode 100644 index f0d445221..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png deleted file mode 100644 index 3a441fe47..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background.png deleted file mode 100644 index 67907ed10..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Spin/up-background.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png deleted file mode 100644 index db0b21c05..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png deleted file mode 100644 index bd8565da8..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook.png deleted file mode 100644 index fd6048df7..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/notebook.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png deleted file mode 100644 index e5646a4d1..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png deleted file mode 100644 index 765c39712..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png deleted file mode 100644 index fab96d6ce..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left.png deleted file mode 100644 index 381c23e4e..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-left.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png deleted file mode 100644 index ad2d60c97..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right.png deleted file mode 100644 index e01501bd4..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-right.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png deleted file mode 100644 index 94acac0d0..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top.png deleted file mode 100644 index d5fe3ac5f..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Tabs/tab-top.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png deleted file mode 100644 index 917347880..000000000 Binary files a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc b/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc deleted file mode 100644 index 2462866bf..000000000 --- a/packaging/macosx/Resources/themes/Adwaita/gtk-2.0/gtkrc +++ /dev/null @@ -1,2391 +0,0 @@ -# Bridge | ScionicSpectre - -gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#000000\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#4A90D9\nselected_fg_color:#FFFFFF\ntext_color:#313739\nbg_color:#EDEDED\ninsensitive_bg_color:#F4F4F2\ntooltip_bg_color:#343434" - -gtk-auto-mnemonics = 1 -gtk-primary-button-warps-slider = 1 - -style "default" -{ - xthickness = 1 - ythickness = 1 - - # Style Properties - - GtkWidget::focus-line-width = 1 - GtkMenuBar::window-dragging = 1 - GtkToolbar::window-dragging = 1 - GtkToolbar::internal-padding = 4 - GtkToolButton::icon-spacing = 4 - - GtkWidget::tooltip-radius = 3 - GtkWidget::tooltip-alpha = 235 - GtkWidget::new-tooltip-style = 1 #for compatibility - - GtkSeparatorMenuItem::horizontal-padding = 3 - GtkSeparatorMenuItem::wide-separators = 1 - GtkSeparatorMenuItem::separator-height = 1 - - GtkButton::child-displacement-y = 0 - GtkButton::default-border = { 0, 0, 0, 0 } - GtkButton::default-outside_border = { 0, 0, 0, 0 } - - GtkEntry::state-hint = 1 - - GtkScrollbar::trough-border = 0 - GtkRange::trough-border = 0 - GtkRange::slider-width = 13 - GtkRange::stepper-size = 0 - - GtkScrollbar::activate-slider = 1 - GtkScrollbar::has-backward-stepper = 0 - GtkScrollbar::has-forward-stepper = 0 - GtkScrollbar::min-slider-length = 42 - GtkScrolledWindow::scrollbar-spacing = 0 - GtkScrolledWindow::scrollbars-within-bevel = 1 - - GtkVScale::slider_length = 16 - GtkVScale::slider_width = 16 - GtkHScale::slider_length = 16 - GtkHScale::slider_width = 17 - - GtkStatusbar::shadow_type = GTK_SHADOW_NONE - GtkSpinButton::shadow_type = GTK_SHADOW_NONE - GtkMenuBar::shadow-type = GTK_SHADOW_NONE - GtkToolbar::shadow-type = GTK_SHADOW_NONE - GtkMenuBar::internal-padding = 0 #( every window is misaligned for the sake of menus ): - GtkMenu::horizontal-padding = 0 - GtkMenu::vertical-padding = 0 - - GtkCheckButton::indicator_spacing = 3 - GtkOptionMenu::indicator_spacing = { 8, 2, 0, 0 } - - GtkTreeView::row_ending_details = 0 - GtkTreeView::expander-size = 11 - GtkTreeView::vertical-separator = 4 - GtkTreeView::horizontal-separator = 4 - GtkTreeView::allow-rules = 1 - - GtkExpander::expander-size = 11 - - # Colors - - bg[NORMAL] = @bg_color - bg[PRELIGHT] = shade (1.02, @bg_color) - bg[SELECTED] = @selected_bg_color - bg[INSENSITIVE] = @bg_color - bg[ACTIVE] = shade (0.9, @bg_color) - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @fg_color - fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) - fg[ACTIVE] = @fg_color - - text[NORMAL] = @text_color - text[PRELIGHT] = @text_color - text[SELECTED] = @selected_fg_color - text[INSENSITIVE] = darker (@bg_color) - text[ACTIVE] = @selected_fg_color - - base[NORMAL] = @base_color - base[PRELIGHT] = shade (0.95, @bg_color) - base[SELECTED] = @selected_bg_color - base[INSENSITIVE] = @bg_color - base[ACTIVE] = shade (0.9, @selected_bg_color) - - # For succinctness, all reasonable pixmap options remain here - - engine "pixmap" - { - - # Check Buttons - - image - { - function = CHECK - recolorable = TRUE - state = NORMAL - shadow = OUT - overlay_file = "Check-Radio/checkbox-unchecked.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = PRELIGHT - shadow = OUT - overlay_file = "Check-Radio/checkbox-unchecked.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = ACTIVE - shadow = OUT - overlay_file = "Check-Radio/checkbox-unchecked.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = SELECTED - shadow = OUT - overlay_file = "Check-Radio/checkbox-unchecked.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = INSENSITIVE - shadow = OUT - overlay_file = "Check-Radio/checkbox-unchecked-insensitive.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = NORMAL - shadow = IN - overlay_file = "Check-Radio/checkbox-checked.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = PRELIGHT - shadow = IN - overlay_file = "Check-Radio/checkbox-checked.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = ACTIVE - shadow = IN - overlay_file = "Check-Radio/checkbox-checked.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = SELECTED - shadow = IN - overlay_file = "Check-Radio/checkbox-checked.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = INSENSITIVE - shadow = IN - overlay_file = "Check-Radio/checkbox-checked-insensitive.png" - overlay_stretch = FALSE - } - - # Radio Buttons - - image - { - function = OPTION - state = NORMAL - shadow = OUT - overlay_file = "Check-Radio/option-unchecked.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = PRELIGHT - shadow = OUT - overlay_file = "Check-Radio/option-unchecked.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = ACTIVE - shadow = OUT - overlay_file = "Check-Radio/option-unchecked.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = SELECTED - shadow = OUT - overlay_file = "Check-Radio/option-unchecked.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = INSENSITIVE - shadow = OUT - overlay_file = "Check-Radio/option-unchecked-insensitive.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = NORMAL - shadow = IN - overlay_file = "Check-Radio/option-checked.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = PRELIGHT - shadow = IN - overlay_file = "Check-Radio/option-checked.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = ACTIVE - shadow = IN - overlay_file = "Check-Radio/option-checked.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = SELECTED - shadow = IN - overlay_file = "Check-Radio/option-checked.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = INSENSITIVE - shadow = IN - overlay_file = "Check-Radio/option-checked-insensitive.png" - overlay_stretch = FALSE - } - - # Arrows - - image - { - function = ARROW - overlay_file = "Arrows/arrow-up.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - image - { - function = ARROW - state = PRELIGHT - overlay_file = "Arrows/arrow-up-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - image - { - function = ARROW - state = ACTIVE - overlay_file = "Arrows/arrow-up-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - image - { - function = ARROW - state = INSENSITIVE - overlay_file = "Arrows/arrow-up-insens.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - - - image - { - function = ARROW - state = NORMAL - overlay_file = "Arrows/arrow-down.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - image - { - function = ARROW - state = PRELIGHT - overlay_file = "Arrows/arrow-down-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - image - { - function = ARROW - state = ACTIVE - overlay_file = "Arrows/arrow-down-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - image - { - function = ARROW - state = INSENSITIVE - overlay_file = "Arrows/arrow-down-insens.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image - { - function = ARROW - overlay_file = "Arrows/arrow-left.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = LEFT - } - image - { - function = ARROW - state = PRELIGHT - overlay_file = "Arrows/arrow-left-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = LEFT - } - image - { - function = ARROW - state = ACTIVE - overlay_file = "Arrows/arrow-left-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = LEFT - } - image - { - function = ARROW - state = INSENSITIVE - overlay_file = "Arrows/arrow-left-insens.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = LEFT - } - - image - { - function = ARROW - overlay_file = "Arrows/arrow-right.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - image - { - function = ARROW - state = PRELIGHT - overlay_file = "Arrows/arrow-right-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - image - { - function = ARROW - state = ACTIVE - overlay_file = "Arrows/arrow-right-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - image - { - function = ARROW - state = INSENSITIVE - overlay_file = "Arrows/arrow-right-insens.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - - # Option Menu Arrows - - image - { - function = TAB - state = INSENSITIVE - overlay_file = "Arrows/arrow-down-insens.png" - overlay_stretch = FALSE - } - image - { - function = TAB - state = NORMAL - overlay_file = "Arrows/arrow-down.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - image - { - function = TAB - state = PRELIGHT - overlay_file = "Arrows/arrow-down-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - - # Lines - - image - { - function = VLINE - file = "Lines/line-v.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - } - image - { - function = HLINE - file = "Lines/line-h.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - } - - # Focuslines - - image - { - function = FOCUS - file = "Others/focus.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - } - - # Handles - - image - { - function = HANDLE - overlay_file = "Handles/handle-h.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - image - { - function = HANDLE - overlay_file = "Handles/handle-v.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - - # Expanders - - image - { - function = EXPANDER - expander_style = COLLAPSED - file = "Expanders/plus.png" - } - - image - { - function = EXPANDER - expander_style = EXPANDED - file = "Expanders/minus.png" - } - - image - { - function = EXPANDER - expander_style = SEMI_EXPANDED - file = "Expanders/minus.png" - } - - image - { - function = EXPANDER - expander_style = SEMI_COLLAPSED - file = "Expanders/plus.png" - } - - image - { - function = RESIZE_GRIP - state = NORMAL - detail = "statusbar" - overlay_file = "Others/null.png" - overlay_border = { 0,0,0,0 } - overlay_stretch = FALSE - } - - # Shadows ( this area needs help :P ) - - image - { - function = SHADOW_GAP - file = "Others/null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - } -} - -style "toplevel_hack" -{ - engine "adwaita" - { - } -} - -style "ooo_stepper_hack" -{ - GtkScrollbar::stepper-size = 13 - GtkScrollbar::has-backward-stepper = 1 - GtkScrollbar::has-forward-stepper = 1 -} - -style "scrollbar" -{ - engine "pixmap" - { - image - { - function = BOX - detail = "trough" - file = "Scrollbars/trough-scrollbar-horiz.png" - border = { 19, 19, 4, 4 } - stretch = TRUE - orientation = HORIZONTAL - } - image - { - function = BOX - detail = "trough" - file = "Scrollbars/trough-scrollbar-vert.png" - border = { 4, 4, 19, 19 } - stretch = TRUE - orientation = VERTICAL - } - -# Sliders - - image - { - function = SLIDER - state = NORMAL - file = "Scrollbars/slider-horiz.png" - border = { 7, 7, 5, 5 } - stretch = TRUE - orientation = HORIZONTAL - - } - image - { - function = SLIDER - state = ACTIVE - file = "Scrollbars/slider-horiz-active.png" - border = { 7, 7, 5, 5 } - stretch = TRUE - orientation = HORIZONTAL - - } - image - { - function = SLIDER - state = PRELIGHT - file = "Scrollbars/slider-horiz-prelight.png" - border = { 7, 7, 5, 5 } - stretch = TRUE - orientation = HORIZONTAL - - } - image - { - function = SLIDER - state = INSENSITIVE - file = "Scrollbars/slider-horiz-insens.png" - border = { 7, 7, 5, 5 } - stretch = TRUE - orientation = HORIZONTAL - } - -# X Verticals - - image - { - function = SLIDER - state = NORMAL - file = "Scrollbars/slider-vert.png" - border = { 5, 5, 7, 7 } - stretch = TRUE - orientation = VERTICAL - - } - image - { - function = SLIDER - state = ACTIVE - file = "Scrollbars/slider-vert-active.png" - border = { 5, 5, 7, 7 } - stretch = TRUE - orientation = VERTICAL - - } - image - { - function = SLIDER - state = PRELIGHT - file = "Scrollbars/slider-vert-prelight.png" - border = { 5, 5, 7, 7 } - stretch = TRUE - orientation = VERTICAL - - } - image - { - function = SLIDER - state = INSENSITIVE - file = "Scrollbars/slider-vert-insens.png" - border = { 5, 5, 7, 7 } - stretch = TRUE - orientation = VERTICAL - - } - } -} - -style "menubar" -{ - bg[PRELIGHT] = "#FFF" - fg[SELECTED] = @text_color - - xthickness = 0 - ythickness = 0 - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "Menu-Menubar/menubar_button.png" - - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -style "menu" -{ - xthickness = 0 - ythickness = 0 - - GtkMenuItem::arrow-scaling = 0.4 - - bg[NORMAL] = shade (1.08, @bg_color) - bg[INSENSITIVE] = @base_color - bg[PRELIGHT] = @base_color - - engine "pixmap" # For menus that use horizontal lines rather than gtkseparator - { - image - { - function = HLINE - file = "Lines/menu_line_h.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - } - } -} - -style "menu_framed_box" -{ - engine "adwaita" - { - } -} - -style "menu_item" -{ - xthickness = 2 - ythickness = 4 - - # HACK: Gtk doesn't actually read this value - # while rendering the menu items, but Libreoffice - # does; setting this value equal to the one in - # fg[PRELIGHT] ensures a code path in the LO theming code - # that falls back to a dark text color for menu item text - # highlight. The price to pay is black text on menus as well, - # but at least it's readable. - # See https://bugs.freedesktop.org/show_bug.cgi?id=38038 - bg[SELECTED] = @selected_fg_color - - bg[PRELIGHT] = @selected_bg_color - fg[PRELIGHT] = @selected_fg_color - text[PRELIGHT] = @selected_fg_color - - engine "pixmap" - { - - # Check Buttons - - image - { - function = CHECK - recolorable = TRUE - state = NORMAL - shadow = OUT - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = PRELIGHT - shadow = OUT - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = ACTIVE - shadow = OUT - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = INSENSITIVE - shadow = OUT - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = NORMAL - shadow = IN - overlay_file = "Check-Radio/menucheck.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = PRELIGHT - shadow = IN - overlay_file = "Check-Radio/menucheck_prelight.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = ACTIVE - shadow = IN - overlay_file = "Check-Radio/menucheck.png" - overlay_stretch = FALSE - } - image - { - function = CHECK - recolorable = TRUE - state = INSENSITIVE - shadow = IN - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - - # Radio Buttons - - image - { - function = OPTION - state = NORMAL - shadow = OUT - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = PRELIGHT - shadow = OUT - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = ACTIVE - shadow = OUT - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = INSENSITIVE - shadow = OUT - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = NORMAL - shadow = IN - overlay_file = "Check-Radio/menuoption.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = PRELIGHT - shadow = IN - overlay_file = "Check-Radio/menuoption_prelight.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = ACTIVE - shadow = IN - overlay_file = "Check-Radio/menuoption.png" - overlay_stretch = FALSE - } - image - { - function = OPTION - state = INSENSITIVE - shadow = IN - overlay_file = "Others/null.png" - overlay_stretch = FALSE - } - image - { - function = SHADOW # This fixes boxy Qt menu items - file = "Others/null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - # Arrow Buttons - - image - { - function = ARROW - state = NORMAL - overlay_file = "Arrows/menu-arrow.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - image - { - function = ARROW - state = PRELIGHT - overlay_file = "Arrows/menu-arrow-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - } -} - -style "menubar_item" -{ - xthickness = 2 - ythickness = 3 - bg[PRELIGHT] = @selected_fg_color - fg[PRELIGHT] = @text_color -} - -style "button" -{ - xthickness = 4 - ythickness = 3 - - engine "pixmap" - { - image - { - function = BOX - state = NORMAL - file = "Buttons/button-default.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - state = PRELIGHT - file = "Buttons/button-prelight.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - state = ACTIVE - file = "Buttons/button-pressed.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - state = INSENSITIVE - file = "Buttons/button-insensitive.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -style "button_nohilight" -{ - xthickness = 4 - ythickness = 3 - - engine "pixmap" - { - image - { - function = BOX - state = NORMAL - file = "Buttons/button-default-nohilight.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - state = PRELIGHT - file = "Buttons/button-prelight-nohilight.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - state = ACTIVE - file = "Buttons/button-pressed-nohilight.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - state = INSENSITIVE - file = "Buttons/button-insensitive-nohilight.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -style "checkbutton" -{ - fg[PRELIGHT] = @text_color - fg[ACTIVE] = @text_color -} - -style "entry" -{ - xthickness = 3 - ythickness = 4 - - base[NORMAL] = @base_color - base[INSENSITIVE] = @insensitive_bg_color - - engine "pixmap" - { - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "Entry/entry-border-bg.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "Entry/entry-border-disabled-bg.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "Entry/entry-border-active-bg.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "Entry/entry-border-fill.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "Entry/entry-border-fill.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - } -} - -style "notebook_entry" -{ - engine "pixmap" - { - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "Entry/entry-border-notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "Entry/entry-border-disabled-notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "Entry/entry-border-active-notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -style "notebook_tab_label" -{ - fg[ACTIVE] = @text_color -} - -style "combobox_entry" -{ - xthickness = 3 - ythickness = 4 - - engine "pixmap" - { - # LTR version - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "Entry/combo-entry-border-bg.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "Entry/combo-entry-border-disabled-bg.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "Entry/combo-entry-border-active-bg.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - # RTL version - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "Entry/combo-entry-border-rtl-bg.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "Entry/combo-entry-border-disabled-rtl-bg.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "Entry/combo-entry-border-active-rtl-bg.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - } -} - -style "notebook_combobox_entry" -{ - engine "pixmap" - { - # LTR version - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "Entry/combo-entry-border-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "Entry/combo-entry-border-disabled-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "Entry/combo-entry-border-active-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - # RTL version - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "Entry/combo-entry-border-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - image - { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "Entry/combo-entry-border-disabled-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "Entry/combo-entry-border-active-rtl-notebook.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - } -} - -style "combobox_entry_button" -{ - fg[ACTIVE] = @text_color - - engine "pixmap" - { - - # LTR version - image - { - function = BOX - state = NORMAL - file = "Entry/combo-entry-button.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - image - { - function = BOX - state = PRELIGHT - file = "Entry/combo-entry-button.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - image - { - function = BOX - state = INSENSITIVE - file = "Entry/combo-entry-button-disabled.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - image - { - function = BOX - state = ACTIVE - file = "Entry/combo-entry-button-active.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = LTR - } - - # RTL version - image - { - function = BOX - state = NORMAL - file = "Entry/combo-entry-button-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - image - { - function = BOX - state = PRELIGHT - file = "Entry/combo-entry-button-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - image - { - function = BOX - state = INSENSITIVE - file = "Entry/combo-entry-button-disabled-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - image - { - function = BOX - state = ACTIVE - file = "Entry/combo-entry-button-active-rtl.png" - border = { 4, 4, 5, 4 } - stretch = TRUE - direction = RTL - } - - } -} - -style "spinbutton" -{ - bg[NORMAL] = @bg_color - - xthickness = 3 - ythickness = 4 - - engine "pixmap" - { - image - { - function = ARROW - } - - # Spin-Up LTR - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - file = "Spin/up-background.png" - border = { 1, 4, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - file = "Spin/up-background.png" - border = { 1, 4, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - file = "Spin/up-background-disable.png" - border = { 1, 4, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-insens.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - file = "Spin/up-background.png" - border = { 1, 4, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - direction = LTR - } - - # Spin-Up RTL - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - file = "Spin/up-background-rtl.png" - border = { 4, 1, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - file = "Spin/up-background-rtl.png" - border = { 4, 1, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - file = "Spin/up-background-disable-rtl.png" - border = { 4, 1, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-insens.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - file = "Spin/up-background-rtl.png" - border = { 4, 1, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - direction = RTL - } - - # Spin-Down LTR - image - { - function = BOX - state = NORMAL - detail = "spinbutton_down" - file = "Spin/down-background.png" - border = { 1, 4, 1, 4 } - stretch = TRUE - overlay_file = "Arrows/arrow-down-small.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_down" - file = "Spin/down-background.png" - border = { 1, 4, 1, 4 } - stretch = TRUE - overlay_file = "Arrows/arrow-down-small-prelight.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_down" - file = "Spin/down-background-disable.png" - border = { 1, 4, 1, 4 } - stretch = TRUE - overlay_file = "Arrows/arrow-down-small-insens.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_down" - file = "Spin/down-background.png" - border = { 1, 4, 1, 4 } - stretch = TRUE - overlay_file = "Arrows/arrow-down-small-prelight.png" - overlay_stretch = FALSE - direction = LTR - } - - # Spin-Down RTL - image - { - function = BOX - state = NORMAL - detail = "spinbutton_down" - file = "Spin/down-background-rtl.png" - border = { 4, 1, 1, 4 } - stretch = TRUE - overlay_file = "Arrows/arrow-down-small.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_down" - file = "Spin/down-background-rtl.png" - border = { 4, 1, 1, 4 } - stretch = TRUE - overlay_file = "Arrows/arrow-down-small-prelight.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_down" - file = "Spin/down-background-disable-rtl.png" - border = { 4, 1, 1, 4 } - stretch = TRUE - overlay_file = "Arrows/arrow-down-small-insens.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_down" - file = "Spin/down-background-rtl.png" - border = { 4, 1, 1, 4 } - stretch = TRUE - overlay_file = "Arrows/arrow-down-small-prelight.png" - overlay_stretch = FALSE - direction = RTL - } - } -} - -style "gimp_spin_scale" -{ - bg[NORMAL] = @base_color - - engine "pixmap" - { - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - } - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - } - - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - overlay_file = "Arrows/arrow-up-small.png" - overlay_stretch = FALSE - } - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - } - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - } - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - overlay_file = "Arrows/arrow-up-small-insens.png" - overlay_stretch = FALSE - } - image - { - function = BOX - state = NORMAL - detail = "spinbutton_down" - overlay_file = "Arrows/arrow-down-small.png" - overlay_stretch = FALSE - } - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_down" - overlay_file = "Arrows/arrow-down-small-prelight.png" - overlay_stretch = FALSE - } - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_down" - overlay_file = "Arrows/arrow-down-small-prelight.png" - overlay_stretch = FALSE - } - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_down" - overlay_file = "Arrows/arrow-down-small-insens.png" - overlay_stretch = FALSE - } - } -} - -style "libreoffice_entry" -{ - engine "pixmap" - { - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "Entry/entry-border-fill-solid.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "Entry/entry-border-fill-solid.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "Entry/entry-border-bg-solid.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "Entry/entry-border-active-bg-solid.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -style "standalone_entry" -{ - engine "pixmap" - { - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - file = "Entry/entry-border-fill-plain.png" - stretch = TRUE - border = { 0, 0, 0, 0 } - } - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - file = "Entry/entry-border-fill-plain.png" - stretch = TRUE - border = { 0, 0, 0, 0 } - } - image - { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "Entry/entry-border-bg-solid.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "Entry/entry-border-active-bg-solid.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -style "notebook" -{ - - xthickness = 5 - ythickness = 2 - - engine "pixmap" - { - image - { - function = EXTENSION - state = ACTIVE - file = "Tabs/tab-bottom.png" - border = { 3,3,3,5 } - stretch = TRUE - gap_side = TOP - } - image - { - function = EXTENSION - state = ACTIVE - file = "Tabs/tab-top.png" - border = { 3,3,5,3 } - stretch = TRUE - gap_side = BOTTOM - } - image - { - function = EXTENSION - state = ACTIVE - file = "Tabs/tab-left.png" - border = { 3,3,3,3 } - stretch = TRUE - gap_side = RIGHT - } - image - { - function = EXTENSION - state = ACTIVE - file = "Tabs/tab-right.png" - border = { 3,3,3,3 } - stretch = TRUE - gap_side = LEFT - } - image - { - function = EXTENSION - file = "Tabs/tab-top-active.png" - border = { 3,3,3,3 } - stretch = TRUE - gap_side = BOTTOM - } - image - { - function = EXTENSION - file = "Tabs/tab-bottom-active.png" - border = { 3,3,3,3 } - stretch = TRUE - gap_side = TOP - } - image - { - function = EXTENSION - file = "Tabs/tab-left-active.png" - border = { 3,3,3,3 } - stretch = TRUE - gap_side = RIGHT - } - image - { - function = EXTENSION - file = "Tabs/tab-right-active.png" - border = { 3,3,3,3 } - stretch = TRUE - gap_side = LEFT - } - -# How to draw boxes with a gap on one side (ie the page of a notebook) - - image - { - function = BOX_GAP - file = "Tabs/notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_file = "Tabs/notebook-gap-horiz.png" - gap_border = { 1, 1, 0, 0 } - gap_side = TOP - } - image - { - function = BOX_GAP - file = "Tabs/notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_file = "Tabs/notebook-gap-horiz.png" - gap_border = { 1, 1, 0, 0 } - gap_side = BOTTOM - } - image - { - function = BOX_GAP - file = "Tabs/notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_file = "Tabs/notebook-gap-vert.png" - gap_border = { 0, 0, 1, 1 } - gap_side = LEFT - } - image - { - function = BOX_GAP - file = "Tabs/notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - gap_file = "Tabs/notebook-gap-vert.png" - gap_border = { 0, 0, 1, 1 } - gap_side = RIGHT - } - -# How to draw the box of a notebook when it isnt attached to a tab - - image - { - function = BOX - file = "Tabs/notebook.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -style "handlebox" -{ - engine "pixmap" - { - image - { - function = BOX - file = "Others/null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - detail = "handlebox_bin" - shadow = IN - } - image - { - function = BOX - file = "Others/null.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - detail = "handlebox_bin" - shadow = OUT - } - } -} - -style "combobox_separator" -{ - xthickness = 0 - ythickness = 0 - GtkWidget::wide-separators = 1 -} - -style "combobox" -{ - xthickness = 0 - ythickness = 0 -} - -style "combobox_button" -{ - xthickness = 2 - ythickness = 2 -} - -style "range" -{ - engine "pixmap" - { - image - { - function = BOX - detail = "trough" - file = "Range/trough-horizontal.png" - border = { 4, 4, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - image - { - function = BOX - detail = "trough" - file = "Range/trough-vertical.png" - border = { 0, 0, 4, 4 } - stretch = TRUE - orientation = VERTICAL - } - - # Horizontal - - image - { - function = SLIDER - state = NORMAL - file = "Others/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-horiz.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - image - { - function = SLIDER - state = PRELIGHT - file = "Others/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-horiz-prelight.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - image - { - function = SLIDER - state = INSENSITIVE - file = "Others/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-horiz.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - - # Vertical - - image - { - function = SLIDER - state = NORMAL - file = "Others/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-vert.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - image - { - function = SLIDER - state = PRELIGHT - file = "Others/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-vert-prelight.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - image - { - function = SLIDER - state = INSENSITIVE - file = "Others/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-vert.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - - # Function below removes ugly boxes - image - { - function = BOX - file = "Others/null.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - - } -} - -style "progressbar" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = BOX - detail = "trough" - file = "ProgressBar/trough-progressbar.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - orientation = HORIZONTAL - } - image - { - function = BOX - detail = "bar" - file = "ProgressBar/progressbar.png" - stretch = TRUE - border = { 3, 3, 3, 3 } - orientation = HORIZONTAL - } - image - { - function = BOX - detail = "trough" - file = "ProgressBar/trough-progressbar_v.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - orientation = VERTICAL - } - image - { - function = BOX - detail = "bar" - file = "ProgressBar/progressbar_v.png" - stretch = TRUE - border = { 3, 3, 3, 3 } - orientation = VERTICAL - } - } -} - -style "separator_menu_item" -{ - engine "pixmap" - { - image - { - function = BOX - file = "Lines/menu_line_h.png" - border = { 0, 0, 1, 0 } - stretch = TRUE - } - } -} - -style "treeview_header" -{ - ythickness = 1 - - fg[NORMAL] = shade(0.55, @bg_color) - fg[PRELIGHT] = shade(0.80, @text_color) - font_name = "Bold" - - engine "pixmap" - { - image - { - function = BOX - file = "Others/tree_header.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - } - } -} - -style "scrolled_window" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = SHADOW - file = "Shadows/frame.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - } - } -} - -style "frame" -{ - xthickness = 1 - ythickness = 1 - - engine "pixmap" - { - image - { - function = SHADOW - file = "Shadows/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = IN - } - image - { - function = SHADOW_GAP - file = "Shadows/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "Shadows/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "Shadows/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = IN - } - image - { - function = SHADOW - file = "Shadows/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = OUT - } - image - { - function = SHADOW_GAP - file = "Shadows/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "Shadows/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "Shadows/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = OUT - } - image - { - function = SHADOW - file = "Shadows/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = ETCHED_IN - } - image - { - function = SHADOW_GAP - file = "Shadows/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "Shadows/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "Shadows/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = ETCHED_IN - } - image - { - function = SHADOW - file = "Shadows/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - shadow = ETCHED_OUT - } - image - { - function = SHADOW_GAP - file = "Shadows/frame.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - gap_start_file = "Shadows/frame-gap-start.png" - gap_start_border = { 1, 0, 0, 0 } - gap_end_file = "Shadows/frame-gap-end.png" - gap_end_border = { 0, 1, 0, 0 } - shadow = ETCHED_OUT - } - } -} - -style "gimp_toolbox_frame" -{ - engine "pixmap" - { - image - { - function = SHADOW - } - } -} - -style "toolbar" -{ - engine "pixmap" - { - image - { - function = SHADOW - } - } -} - -style "inline_toolbar" -{ - GtkToolbar::button-relief = GTK_RELIEF_NORMAL - - engine "pixmap" - { - image - { - function = BOX - file = "Toolbar/inline-toolbar.png" - stretch = TRUE - } - } -} - -style "notebook_viewport" -{ - bg[NORMAL] = @base_color -} - -style "tooltips" -{ - xthickness = 8 - ythickness = 4 - - bg[NORMAL] = @tooltip_bg_color - fg[NORMAL] = @tooltip_fg_color - bg[SELECTED] = @tooltip_bg_color -} - -style "eclipse-tooltips" -{ - xthickness = 8 - ythickness = 4 - - bg[NORMAL] = shade(1.05, @bg_color) - fg[NORMAL] = @text_color - bg[SELECTED] = shade(1.05, @bg_color) -} - -# Chromium -style "chrome-gtk-frame" -{ - ChromeGtkFrame::frame-color = @bg_color - ChromeGtkFrame::inactive-frame-color = @bg_color - - ChromeGtkFrame::frame-gradient-size = 16 - ChromeGtkFrame::frame-gradient-color = shade(1.07, @bg_color) - - ChromeGtkFrame::incognito-frame-color = shade(0.85, @bg_color) - ChromeGtkFrame::incognito-inactive-frame-color = @bg_color - - ChromeGtkFrame::incognito-frame-gradient-color = @bg_color - - ChromeGtkFrame::scrollbar-trough-color = shade(0.912, @bg_color) - ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_color) - ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color -} - -style "chrome_menu_item" -{ - bg[SELECTED] = @selected_bg_color -} - -style "null" -{ - engine "pixmap" - { - image - { - function = BOX - file = "Others/null.png" - stretch = TRUE - } - } -} - - -class "GtkWidget" style "default" -class "GtkScrollbar" style "scrollbar" -class "GtkButton" style "button" -class "GtkEntry" style "entry" -class "GtkOldEditable" style "entry" -class "GtkSpinButton" style "spinbutton" -class "GtkNotebook" style "notebook" -class "GtkRange" style "range" -class "GtkProgressBar" style "progressbar" -class "GtkSeparatorMenuItem" style "separator_menu_item" -class "GtkScrolledWindow" style "scrolled_window" -class "GtkFrame" style "frame" -class "GtkToolbar" style "toolbar" - -widget_class "*<GtkMenuBar>*" style "menubar" -widget_class "*<GtkMenu>*" style "menu" -widget_class "*<GtkMenu>*" style "menu_framed_box" -widget_class "*<GtkMenuItem>*" style "menu_item" -widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "menubar_item" -widget_class "*<GtkCheckButton>*" style "checkbutton" -widget_class "*<GtkComboBox>" style "combobox" -widget_class "*<GtkComboBox>*<GtkButton>" style "combobox_button" -widget_class "*<GtkComboBox>*<GtkSeparator>" style "combobox_separator" -widget_class "*HandleBox" style "handlebox" -widget_class "*<GtkTreeView>*<GtkButton>*" style "treeview_header" -widget_class "*<GtkFileChooserDefault>*<GtkToolbar>" style "inline_toolbar" -widget_class "*<GtkFileChooserDefault>*<GtkToolbar>*<GtkButton>" style "button_nohilight" -widget_class "*<GtkComboBoxEntry>*<GtkEntry>" style "combobox_entry" -widget_class "*<GtkComboBoxEntry>*<GtkButton>" style "combobox_entry_button" -widget_class "*<GtkInfoBar>*<GtkButton>" style "button_nohilight" -widget_class "*<GtkNotebook>*<GtkScrolledWindow>*<GtkViewport>" style "notebook_viewport" - -# Entries in notebooks draw with notebook's base color, but not if there's -# something else in the middle that draws gray again -widget_class "*<GtkNotebook>*<GtkEntry>" style "notebook_entry" -widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkEntry>" style "entry" - -widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*<GtkEntry>" style "notebook_combobox_entry" -widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*<GtkEntry>" style "combobox_entry" - -# We also need to avoid changing fg color for the inactive notebook tab labels -widget_class "*<GtkNotebook>.<GtkLabel>" style "notebook_tab_label" - -# GTK tooltips -widget "gtk-tooltip*" style "tooltips" - -# Xchat special cases -widget "*xchat-inputbox" style "entry" - -# GIMP -# Disable gradients completely for GimpSpinScale -class "GimpSpinScale" style "gimp_spin_scale" -# Remove borders from "Wilbert frame" in Gimp -widget_class "*<GimpToolbox>*<GtkFrame>" style "gimp_toolbox_frame" - -# Chrome/Chromium -class "ChromeGtkFrame" style "chrome-gtk-frame" -widget_class "*Chrom*Button*" style "button" -widget_class "*<GtkCustomMenu>*<GtkCustomMenuItem>*" style "chrome_menu_item" - -# We use this weird selector to target an offscreen entry as created -# by Chrome/Chromium to derive the style for its toolbar -widget_class "<GtkEntry>" style "standalone_entry" - -# Eclipse/SWT -widget "gtk-tooltips*" style "eclipse-tooltips" -widget "*swt-toolbar-flat" style "null" - -# Openoffice, Libreoffice -class "GtkWindow" style "toplevel_hack" -widget "*openoffice-toplevel*" style "ooo_stepper_hack" -widget "*openoffice-toplevel*GtkEntry" style "libreoffice_entry" -widget "*openoffice-toplevel*GtkSpinButton" style "libreoffice_entry" -widget "*libreoffice-toplevel*GtkEntry" style "libreoffice_entry" -widget "*libreoffice-toplevel*GtkSpinButton" style "libreoffice_entry" diff --git a/packaging/macosx/Resources/themes/Adwaita/index.theme b/packaging/macosx/Resources/themes/Adwaita/index.theme deleted file mode 100644 index a3bbc428c..000000000 --- a/packaging/macosx/Resources/themes/Adwaita/index.theme +++ /dev/null @@ -1,141 +0,0 @@ -[X-GNOME-Metatheme] -Name=Adwaita -Name[af]=Adwaita -Name[an]=Adwaita -Name[ar]=أدوايتا -Name[as]=Adwaita -Name[be]=Adwaita -Name[bg]=Адвайта -Name[bn_IN]=অদৈত -Name[ca]=Adwaita -Name[ca@valencia]=Adwaita -Name[cs]=Adwaita -Name[da]=Adwaita -Name[de]=Adwaita -Name[el]=Adwaita -Name[en_CA]=Adwaita -Name[en_GB]=Adwaita -Name[eo]=Adwaita -Name[es]=Adwaita -Name[et]=Adwaita -Name[eu]=Adwaita -Name[fa]=آدوایتا -Name[fi]=Adwaita -Name[fr]=Adwaita -Name[fy]=Adwaita -Name[ga]=Adwaita -Name[gl]=Adwaita -Name[gu]=Adwaita -Name[he]=Adwaita -Name[hi]=अद्वैत -Name[hu]=Adwaita -Name[id]=Adwaita -Name[it]=Adwaita -Name[ja]=アドワイチャ -Name[km]=Adwaita -Name[kn]=ಅದ್ವೈತ -Name[ko]=애드와이타 -Name[lt]=Adwaita -Name[lv]=Adwaita -Name[ml]=അദ്വൈതം -Name[mr]=Adwaita -Name[nb]=Adwaita -Name[nl]=Adwaita -Name[or]=Adwaita -Name[pa]=ਅਡਵੇਟਾ -Name[pl]=Adwaita -Name[pt]=Adwaita -Name[pt_BR]=Adwaita -Name[ro]=Adwaita -Name[ru]=Адвайта -Name[sk]=Adwaita -Name[sl]=Adwaita -Name[sr]=Адвајта -Name[sr@latin]=Advajta -Name[sv]=Adwaita -Name[ta]=அத்வைதா -Name[te]=అద్వైత -Name[tg]=Адваита -Name[th]=อัทไวตะ -Name[tr]=Sadece bir tane -Name[ug]=Adwaita -Name[uk]=Адвайта -Name[uz@cyrillic]=Адвайта -Name[vi]=Adwaita -Name[zh_CN]=Adwaita -Name[zh_HK]=唯一 -Name[zh_TW]=唯一 -Type=X-GNOME-Metatheme -Comment=There is only one -Comment[af]=Daar is slegs een -Comment[an]=Solo bi ha que uno -Comment[ar]=هناك واحدة فقط -Comment[as]=কেৱল এটা আছে -Comment[be]=Адзіны і непаўторны -Comment[bg]=Един единствен има само -Comment[bn_IN]=শুধুমাত্র একটি রয়েছে -Comment[ca]=Només n'hi ha un -Comment[ca@valencia]=Només n'hi ha un -Comment[cs]=Je jen jedna -Comment[da]=Der er kun en -Comment[de]=Es gibt nur eines -Comment[el]=Υπάρχει μόνο μία -Comment[en_CA]=There is only one -Comment[en_GB]=There is only one -Comment[eo]=Tie nur unu estas -Comment[es]=Solo existe uno -Comment[et]=Ainult üks ongi -Comment[eu]=Bat bakarrik dago -Comment[fa]=فقط یکی وجود دارد -Comment[fi]=On vain yksi -Comment[fr]=Il n'y en a qu'un seul -Comment[fur]=Al è nome un -Comment[fy]=Der is inkeld ien -Comment[ga]=Níl ach ceann amháin -Comment[gl]=Só existe un -Comment[gu]=ત્યાં ફક્ત એક છે -Comment[he]=האחד והיחיד -Comment[hi]=केवल एक है -Comment[hu]=Csak egy van -Comment[id]=Hanya ada satu -Comment[it]=Il solo e l'unico -Comment[ja]=唯一無二 -Comment[km]=មាន​តែ​មួយ​គត់ -Comment[kn]=ಕೇವಲ ಒಂದು ಮಾತ್ರ ಇದೆ -Comment[ko]=오직 하나 뿐! -Comment[lt]=Yra vienintelė -Comment[lv]=Ir tikai viens -Comment[ml]=ഒരെണ്ണം മാത്രമേ ഉള്ളു -Comment[mr]=फक्त एकाच आहे -Comment[nb]=Det finnes bare én -Comment[nl]=Er is er maar één -Comment[or]=ସେଠାରେ କେବଳ ଗୋଟିଏ ଅଛି -Comment[pa]=ਸਿਰਫ਼ ਇੱਕ ਹੀ ਹੈ -Comment[pl]=Może być tylko jeden -Comment[pt]=Apenas existe um -Comment[pt_BR]=Há apenas um -Comment[ro]=Există doar unul singur -Comment[ru]=Единственная -Comment[sk]=Je len jediná -Comment[sl]=Lahko je le eden -Comment[sr]=Постоји само једна -Comment[sr@latin]=Postoji samo jedna -Comment[sv]=Det finns bara en -Comment[ta]=ஒன்றே ஒன்றூ உள்ளது -Comment[te]=అక్కడ ఒకటే ఉన్నది -Comment[tg]=Танҳо якто мавҷуд аст -Comment[th]=หนึ่งเดียวเท่านั้น -Comment[tr]=Sadece bir tane var -Comment[ug]=پەقەت بىرىلا بار -Comment[uk]=Існує лише одна -Comment[uz@cyrillic]=Фақат битта бор -Comment[vi]=Chỉ có một -Comment[zh_CN]=只有一个 -Comment[zh_HK]=只有唯一一個 -Comment[zh_TW]=只有唯一一個 -Encoding=UTF-8 -GtkTheme=Adwaita -MetacityTheme=Adwaita -IconTheme=gnome -CursorTheme=Adwaita -CursorSize=24 diff --git a/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-2.xml b/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-2.xml deleted file mode 100644 index 6d21d882e..000000000 --- a/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-2.xml +++ /dev/null @@ -1,1604 +0,0 @@ -<?xml version="1.0"?> -<metacity_theme> -<info> - <name>Adwaita</name> - <author>GNOME Art Team <art.gnome.org></author> - <copyright>Â Intel, Â Red Hat, Lapo Calamandrei</copyright> - <date>2010</date> - <description>Default GNOME 3 window theme</description> -</info> - -<!-- meaningfull constants --> - -<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.6" /> -<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> -<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" /> -<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" /> -<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" /> -<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" /> -<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" /> -<!-- color of the button icons --> -<constant name="C_icons_focused" value="gtk:text[SELECTED]" /> -<constant name="C_icons_focused_pressed" value="#ffffff" /> -<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" /> -<constant name="C_icons_unfocused_prelight" value="gtk:bg[NORMAL]" /> -<constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" /> -<constant name="D_icons_unfocused_offset" value="2" /> <!-- offset of the unfocused icons --> -<constant name="D_icons_shrink" value="1" /> <!-- increasing this value makes the icons in buttons smaller --> -<constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger --> -<!-- geometries --> - -<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4"> - <distance name="left_width" value="1" /> - <distance name="right_width" value="1" /> - <distance name="bottom_height" value="2" /> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> - <distance name="title_vertical_pad" value="10"/> - <border name="title_border" left="10" right="10" top="1" bottom="2"/> - <border name="button_border" left="0" right="0" top="1" bottom="2"/> - <aspect_ratio name="button" value="1"/> -</frame_geometry> - -<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal"> - <distance name="left_titlebar_edge" value="1"/> - <distance name="right_titlebar_edge" value="1"/> -</frame_geometry> - -<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <distance name="left_width" value="0" /> - <distance name="right_width" value="0" /> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> - <distance name="title_vertical_pad" value="9"/> <!-- - This needs to be 1 less then the - title_vertical_pad on normal state - or you'll have bigger buttons --> - <border name="title_border" left="10" right="10" top="1" bottom="2"/> - <border name="button_border" left="0" right="0" top="0" bottom="2"/> - <distance name="bottom_height" value="0" /> -</frame_geometry> - -<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> - <distance name="right_width" value="1" /> -</frame_geometry> - -<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> - <distance name="left_width" value="1" /> -</frame_geometry> - -<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <distance name="title_vertical_pad" value="7"/> - <border name="title_border" left="10" right="10" top="0" bottom="1"/> - <border name="button_border" left="0" right="0" top="0" bottom="2"/> -</frame_geometry> - -<frame_geometry name="small_unfocused" parent="small"> - <distance name="left_titlebar_edge" value="1"/> - <distance name="right_titlebar_edge" value="1"/> -</frame_geometry> - -<frame_geometry name="nobuttons" hide_buttons="true" parent="normal"> -</frame_geometry> - -<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > - <distance name="left_width" value="1" /> - <distance name="right_width" value="1" /> - <distance name="bottom_height" value="1" /> - <border name="title_border" left="10" right="10" top="0" bottom="0" /> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <distance name="title_vertical_pad" value="1" /> -</frame_geometry> - -<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal"> - <distance name="title_vertical_pad" value="0"/> -</frame_geometry> - -<!-- drawing operations --> - - <!-- title --> - -<draw_ops name="title_focused"> - <title x="(0 `max` ((width - title_width) / 2)) + 3" - y="(0 `max` ((height - title_height) / 2)) + 2" - color="C_title_focused_hilight" /> - <title x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2)) + 1" - color="C_title_focused" /> -</draw_ops> - -<draw_ops name="title_unfocused"> - <title x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2)) + 1" - color="C_title_unfocused"/> -</draw_ops> - - <!-- window decorations --> - -<draw_ops name="entire_background_focused"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> - -<draw_ops name="entire_background_unfocused"> - <include name="entire_background_focused" /> -</draw_ops> - -<draw_ops name="titlebar_fill_focused"> - <gradient type="vertical" x="0" y="0" width="width" height="height"> - <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" /> - <color value="gtk:bg[NORMAL]"/> - <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> - <color value="blend/gtk:bg[NORMAL]/#000000/0.06" /> - </gradient> -</draw_ops> - -<draw_ops name="titlebar_fill_focused_alt"> - <gradient type="vertical" x="0" y="0" width="width" height="height"> - <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" /> - <!-- <color value="gtk:bg[NORMAL]"/> --> - <!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> --> - <color value="gtk:bg[NORMAL]"/> - </gradient> -</draw_ops> - -<draw_ops name="titlebar_fill_unfocused"> - <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> - -<draw_ops name="titlebar_unfocused"> - <include name="titlebar_fill_unfocused" /> - <line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="hilight"> - <line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" /> - <gradient type="vertical" x="1" y="1" width="1" height="height-4"> - <color value="C_titlebar_focused_hilight" /> - <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> - </gradient> -</draw_ops> - -<draw_ops name="rounded_hilight"> - <line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" /> - <arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7" start_angle="270" extent_angle="90" /> - <arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7" start_angle="0" extent_angle="90" /> - <gradient type="vertical" x="1" y="5" width="1" height="height-9"> - <color value="C_titlebar_focused_hilight" /> - <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> - </gradient> -</draw_ops> - -<draw_ops name="titlebar_focused"> - <include name="titlebar_fill_focused_alt" /> - <include name="hilight" /> -</draw_ops> - -<draw_ops name="titlebar_focused_alt"> - <include name="titlebar_fill_focused_alt" /> - <include name="hilight" /> -</draw_ops> - -<draw_ops name="rounded_titlebar_focused"> - <include name="titlebar_fill_focused_alt" /> - <include name="rounded_hilight" /> -</draw_ops> - -<draw_ops name="rounded_titlebar_focused_alt"> - <include name="titlebar_fill_focused_alt" /> - <include name="rounded_hilight" /> -</draw_ops> - -<draw_ops name="border_focused"> - <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> -</draw_ops> - -<draw_ops name="border_unfocused"> - <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> -</draw_ops> - -<draw_ops name="rounded_border_focused"> - <line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" /> - <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> - <line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" /> - <line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" /> - <arc color="C_border_focused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> - <arc color="C_border_focused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> - <!-- double arcs for darker borders --> - <arc color="C_border_focused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> - <arc color="C_border_focused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> -</draw_ops> - -<draw_ops name="rounded_border_unfocused"> - <line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" /> - <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> - <line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" /> - <line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" /> - <arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> - <arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> - <!-- double arcs for darker borders --> - <arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> - <arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> -</draw_ops> - -<draw_ops name="border_right_focused"> - <line - x1="width-1" y1="0" - x2="width-1" y2="height" - color="C_border_focused" /> -</draw_ops> - -<draw_ops name="border_right_unfocused"> - <line - x1="width" y1="0" - x2="width" y2="height" - color="C_border_unfocused" /> -</draw_ops> - -<draw_ops name="border_left_focused"> - <line - x1="0" y1="0" - x2="0" y2="height" - color="C_border_focused" /> -</draw_ops> - -<draw_ops name="border_left_unfocused"> - <line - x1="0" y1="0" - x2="0" y2="height" - color="C_border_unfocused" /> -</draw_ops> - - <!-- button icons--> - -<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" /> - -<draw_ops name="close_glyph_focused"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="close_shadow_focused"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="close_focused"> - <include name="close_shadow_focused" y="1" /> - <!-- I'm not happy with the current aa I'll draw it twice to make it darker --> - <include name="close_shadow_focused" y="1" /> - <include name="close_glyph_focused" /> -</draw_ops> - -<draw_ops name="close_focused_pressed"> - <include name="close_glyph_focused" y="1" /> -</draw_ops> - -<draw_ops name="close_glyph_unfocused"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="close_unfocused"> - <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> - <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="close_glyph_unfocused_prelight"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="close_unfocused_prelight"> - <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> - <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="close_glyph_unfocused_pressed"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="close_unfocused_pressed"> - <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> - <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_focused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="maximize_shadow_focused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_shadow" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="maximize_focused"> - <include name="maximize_shadow_focused" y="1" /> - <include name="maximize_glyph_focused" /> -</draw_ops> - -<draw_ops name="maximize_focused_pressed"> - <include name="maximize_glyph_focused" y="1" /> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="maximize_unfocused"> - <include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused_prelight"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="maximize_unfocused_prelight"> - <include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused_pressed"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="maximize_unfocused_pressed"> - <include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="minimize_glyph_focused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="minimize_shadow_focused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="minimize_focused"> - <include name="minimize_shadow_focused" y="1" /> - <include name="minimize_glyph_focused" /> -</draw_ops> - -<draw_ops name="minimize_focused_pressed"> - <include name="minimize_glyph_focused" y="1" /> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="minimize_unfocused"> - <include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused_prelight"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="minimize_unfocused_prelight"> - <include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused_pressed"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="minimize_unfocused_pressed"> - <include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="menu_glyph_focused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="menu_shadow_focused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_shadow" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_shadow" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="menu_focused"> - <include name="menu_shadow_focused" y="1" /> - <include name="menu_glyph_focused" /> -</draw_ops> - -<draw_ops name="menu_focused_pressed"> - <include name="menu_glyph_focused" y="1" /> -</draw_ops> - -<draw_ops name="menu_glyph_unfocused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="menu_unfocused"> - <include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="menu_glyph_unfocused_prelight"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="menu_unfocused_prelight"> - <include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="menu_glyph_unfocused_pressed"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="menu_unfocused_pressed"> - <include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="shade_glyph_focused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_focused" /> - <rectangle - x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="shade_shadow_focused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_shadow" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="shade_focused"> - <include name="shade_shadow_focused" y="1" /> - <include name="shade_glyph_focused" /> -</draw_ops> - -<draw_ops name="shade_focused_pressed"> - <include name="shade_glyph_focused" y="1" /> -</draw_ops> - -<draw_ops name="shade_glyph_unfocused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused" /> - <rectangle - x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="shade_unfocused"> - <include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="shade_glyph_unfocused_prelight"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused_prelight" /> - <rectangle - x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="shade_unfocused_prelight"> - <include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="shade_glyph_unfocused_pressed"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused_pressed" /> - <rectangle - x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="shade_unfocused_pressed"> - <include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - - - <!-- button backgrounds --> - -<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> -<constant name="C_button_hilight" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6" /> - -<draw_ops name="button_fill"> <!-- button background gradient --> - <gradient type="vertical" x="0" y="0" width="width" height="height-2"> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.15" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.21" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.27" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.12" /> - </gradient> -</draw_ops> - -<draw_ops name="button_bottom"> - <line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border" /> - <line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_button_hilight" /> -</draw_ops> - -<draw_ops name="button_bevel"> - <gradient type="vertical" x="0" y="0" width="1" height="height-2"> - <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.1"/> - <color value="blend/gtk:bg[NORMAL]/#000000/0.1"/> - </gradient> - <gradient type="vertical" x="width-1" y="0" width="1" height="height-2"> - <color value="C_border_focused"/> - <color value="blend/gtk:bg[NORMAL]/#000000/0.1"/> - </gradient> -</draw_ops> - -<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status --> - <gradient type="vertical" x="0" y="0" width="width" height="height-2"> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.2" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.04" /> - </gradient> -</draw_ops> - -<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status --> - <gradient type="vertical" x="0" y="0" width="width" height="height-2"> - <color value="C_border_focused" /> - <color value="blend/#000000/gtk:bg[NORMAL]/0.75" /> - <color value="blend/#000000/gtk:bg[NORMAL]/0.8" /> - </gradient> -</draw_ops> - -<draw_ops name="button"> - <include name="button_fill" /> - <include name="button_bevel" /> - <include name="button_bottom" /> -</draw_ops> - -<draw_ops name="button_prelight"> - <include name="button_fill_prelight" /> - <include name="button_bevel" /> - <include name="button_bottom" /> -</draw_ops> - -<draw_ops name="button_pressed"> - <include name="button_fill_pressed" /> - <include name="button_bottom" /> -</draw_ops> - -<!-- things get messy here --> - -<draw_ops name="button_inner_right_slice1"> - <clip x="0" y="0" width="width" height="height-5" /> - <include name="button" /> -</draw_ops> -<draw_ops name="button_inner_right_slice2"> - <clip x="1" y="height-5" width="width-1" height="2" /> - <include name="button" /> -</draw_ops> -<draw_ops name="button_inner_right_slice3"> - <clip x="2" y="height-3" width="width-2" height="1" /> - <include name="button" /> -</draw_ops> -<draw_ops name="button_inner_right_slice4"> - <clip x="4" y="height-2" width="width-4" height="2" /> - <include name="button" /> -</draw_ops> - -<draw_ops name="button_inner_right_fill"> - <include name="button_inner_right_slice1" /> - <include name="button_inner_right_slice2" /> - <include name="button_inner_right_slice3" /> - <include name="button_inner_right_slice4" /> -</draw_ops> - -<draw_ops name="button_inner_right_slice1_prelight"> - <clip x="0" y="0" width="width" height="height-5" /> - <include name="button_prelight" /> -</draw_ops> -<draw_ops name="button_inner_right_slice2_prelight"> - <clip x="1" y="height-5" width="width-1" height="2" /> - <include name="button_prelight" /> -</draw_ops> -<draw_ops name="button_inner_right_slice3_prelight"> - <clip x="2" y="height-3" width="width-2" height="1" /> - <include name="button_prelight" /> -</draw_ops> -<draw_ops name="button_inner_right_slice4_prelight"> - <clip x="4" y="height-2" width="width-4" height="2" /> - <include name="button_prelight" /> -</draw_ops> - -<draw_ops name="button_inner_right_fill_prelight"> - <include name="button_inner_right_slice1_prelight" /> - <include name="button_inner_right_slice2_prelight" /> - <include name="button_inner_right_slice3_prelight" /> - <include name="button_inner_right_slice4_prelight" /> -</draw_ops> - -<draw_ops name="button_inner_right_slice1_pressed"> - <clip x="0" y="0" width="width" height="height-5" /> - <include name="button_pressed" /> -</draw_ops> -<draw_ops name="button_inner_right_slice2_pressed"> - <clip x="1" y="height-5" width="width-1" height="2" /> - <include name="button_pressed" /> -</draw_ops> -<draw_ops name="button_inner_right_slice3_pressed"> - <clip x="2" y="height-3" width="width-2" height="1" /> - <include name="button_pressed" /> -</draw_ops> -<draw_ops name="button_inner_right_slice4_pressed"> - <clip x="4" y="height-2" width="width-4" height="2" /> - <include name="button_pressed" /> -</draw_ops> - -<draw_ops name="button_inner_right_fill_pressed"> - <include name="button_inner_right_slice1_pressed" /> - <include name="button_inner_right_slice2_pressed" /> - <include name="button_inner_right_slice3_pressed" /> - <include name="button_inner_right_slice4_pressed" /> -</draw_ops> - - -<draw_ops name="button_inner_right_border"> - <gradient type="vertical" x="0" y="0" width="1" height="height-5"> - <color value="blend/gtk:bg[NORMAL]/#000000/0.06" /> - <color value="blend/gtk:bg[NORMAL]/#000000/0.06" /> - <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> - </gradient> - <arc color="C_button_hilight" x="1" y="height-10" width="9" height="9" start_angle="180" extent_angle="90" /> - <gradient type="vertical" x="1" y="0" width="1" height="height-5"> - <color value="C_border_focused" /> - <color value="C_button_border" /> - </gradient> - <arc color="C_button_border" x="1" y="height-11" width="9" height="9" start_angle="180" extent_angle="90" /> -</draw_ops> - -<draw_ops name="button_inner_right"> - <include name="button_inner_right_fill" /> - <include name="button_inner_right_border" /> -</draw_ops> - -<draw_ops name="button_inner_right_prelight"> - <include name="button_inner_right_fill_prelight" /> - <include name="button_inner_right_border" /> -</draw_ops> - -<draw_ops name="button_inner_right_pressed"> - <include name="button_inner_right_fill_pressed" /> - <include name="button_inner_right_border" /> -</draw_ops> - -<draw_ops name="button_inner_left_slice1"> - <clip x="0" y="0" width="width-1" height="height-5" /> - <include name="button" /> -</draw_ops> -<draw_ops name="button_inner_left_slice2"> - <clip x="0" y="height-5" width="width-2" height="2" /> - <include name="button" /> -</draw_ops> -<draw_ops name="button_inner_left_slice3"> - <clip x="0" y="height-3" width="width-3" height="1" /> - <include name="button" /> -</draw_ops> -<draw_ops name="button_inner_left_slice4"> - <clip x="0" y="height-2" width="width-5" height="2" /> - <include name="button" /> -</draw_ops> - -<draw_ops name="button_inner_left_fill"> - <include name="button_inner_left_slice1" /> - <include name="button_inner_left_slice2" /> - <include name="button_inner_left_slice3" /> - <include name="button_inner_left_slice4" /> -</draw_ops> - -<draw_ops name="button_inner_left_slice1_prelight"> - <clip x="0" y="0" width="width-1" height="height-5" /> - <include name="button_prelight" /> -</draw_ops> -<draw_ops name="button_inner_left_slice2_prelight"> - <clip x="0" y="height-5" width="width-2" height="2" /> - <include name="button_prelight" /> -</draw_ops> -<draw_ops name="button_inner_left_slice3_prelight"> - <clip x="0" y="height-3" width="width-3" height="1" /> - <include name="button_prelight" /> -</draw_ops> -<draw_ops name="button_inner_left_slice4_prelight"> - <clip x="0" y="height-2" width="width-5" height="2" /> - <include name="button_prelight" /> -</draw_ops> - -<draw_ops name="button_inner_left_fill_prelight"> - <include name="button_inner_left_slice1_prelight" /> - <include name="button_inner_left_slice2_prelight" /> - <include name="button_inner_left_slice3_prelight" /> - <include name="button_inner_left_slice4_prelight" /> -</draw_ops> - -<draw_ops name="button_inner_left_slice1_pressed"> - <clip x="0" y="0" width="width-1" height="height-5" /> - <include name="button_pressed" /> -</draw_ops> -<draw_ops name="button_inner_left_slice2_pressed"> - <clip x="0" y="height-5" width="width-2" height="2" /> - <include name="button_pressed" /> -</draw_ops> -<draw_ops name="button_inner_left_slice3_pressed"> - <clip x="0" y="height-3" width="width-3" height="1" /> - <include name="button_pressed" /> -</draw_ops> -<draw_ops name="button_inner_left_slice4_pressed"> - <clip x="0" y="height-2" width="width-5" height="2" /> - <include name="button_pressed" /> -</draw_ops> - -<draw_ops name="button_inner_left_fill_pressed"> - <include name="button_inner_left_slice1_pressed" /> - <include name="button_inner_left_slice2_pressed" /> - <include name="button_inner_left_slice3_pressed" /> - <include name="button_inner_left_slice4_pressed" /> -</draw_ops> - - -<draw_ops name="button_inner_left_border"> - <gradient type="vertical" x="width-1" y="0" width="1" height="height-6"> - <color value="C_titlebar_focused_hilight" /> - <color value="C_button_hilight" /> - </gradient> - <arc color="C_button_hilight" x="width-11" y="height-11" width="10" height="10" start_angle="90" extent_angle="90" /> - <gradient type="vertical" x="width-2" y="0" width="1" height="height-5"> - <color value="C_border_focused" /> - <color value="C_button_border" /> - </gradient> - <arc color="C_button_border" x="width-11" y="height-11" width="9" height="9" start_angle="90" extent_angle="90" /> -</draw_ops> - -<draw_ops name="button_inner_left"> - <include name="button_inner_left_fill" /> - <include name="button_inner_left_border" /> -</draw_ops> - -<draw_ops name="button_inner_left_prelight"> - <include name="button_inner_left_fill_prelight" /> - <include name="button_inner_left_border" /> -</draw_ops> - -<draw_ops name="button_inner_left_pressed"> - <include name="button_inner_left_fill_pressed" /> - <include name="button_inner_left_border" /> -</draw_ops> - -<!-- frame styles --> - -<frame_style name="normal_focused" geometry="normal"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="rounded_border_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> - <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> - <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> - - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> - <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> - <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_unfocused" geometry="normal_unfocused"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="rounded_border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_max_focused" geometry="max"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" /> - <piece position="title" draw_ops="title_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> - <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> - <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> - - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> - <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> - <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_max_unfocused" geometry="max"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_max_shaded_focused" geometry="max"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> - <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> - <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> - - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> - <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> - <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_max_shaded_unfocused" geometry="max"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="dialog_focused" geometry="nobuttons"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="rounded_border_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> - <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> - <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> - - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> - <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> - <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="dialog_unfocused" geometry="nobuttons"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="rounded_border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="modal_dialog_focused" geometry="modal"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="rounded_border_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_right_background" state="normal" draw_ops="button_inner_left"/> - <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/> - <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/> - - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_left_background" state="normal" draw_ops="button_inner_right"/> - <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/> - <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="modal_dialog_unfocused" geometry="modal"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="rounded_border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="utility_focused" geometry="small"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_focused_alt" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="border_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button_inner_left"/> - <button function="left_middle_background" state="prelight" draw_ops="button_inner_left_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_inner_left_pressed"/> - - <button function="right_middle_background" state="normal" draw_ops="button_inner_right"/> - <button function="right_middle_background" state="prelight" draw_ops="button_inner_right_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_inner_right_pressed"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="utility_unfocused" geometry="small_unfocused"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="border_focused" geometry="borderless"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="overlay" draw_ops="border_focused" /> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="border_unfocused" geometry="borderless"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="overlay" draw_ops="border_unfocused" /> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<!-- placeholder for unimplementated styles--> -<frame_style name="blank" geometry="normal"> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<!-- frame style sets --> - -<frame_style_set name="normal_style_set"> - <frame focus="yes" state="normal" resize="both" style="normal_focused"/> - <frame focus="no" state="normal" resize="both" style="normal_unfocused"/> - <frame focus="yes" state="maximized" style="normal_max_focused"/> - <frame focus="no" state="maximized" style="normal_max_unfocused"/> - <frame focus="yes" state="shaded" style="normal_focused"/> - <frame focus="no" state="shaded" style="normal_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/> - <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/> -</frame_style_set> - -<frame_style_set name="dialog_style_set"> - <frame focus="yes" state="normal" resize="both" style="dialog_focused"/> - <frame focus="no" state="normal" resize="both" style="dialog_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="dialog_focused"/> - <frame focus="no" state="shaded" style="dialog_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - -<frame_style_set name="modal_dialog_style_set"> - <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/> - <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="modal_dialog_focused"/> - <frame focus="no" state="shaded" style="modal_dialog_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - -<frame_style_set name="utility_style_set"> - <frame focus="yes" state="normal" resize="both" style="utility_focused"/> - <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="utility_focused"/> - <frame focus="no" state="shaded" style="utility_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - -<frame_style_set name="border_style_set"> - <frame focus="yes" state="normal" resize="both" style="border_focused"/> - <frame focus="no" state="normal" resize="both" style="border_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="blank"/> - <frame focus="no" state="shaded" style="blank"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - - -<!-- windows --> - -<window type="normal" style_set="normal_style_set"/> -<window type="dialog" style_set="dialog_style_set"/> -<window type="modal_dialog" style_set="modal_dialog_style_set"/> -<window type="menu" style_set="utility_style_set"/> -<window type="utility" style_set="utility_style_set"/> -<window type="border" style_set="border_style_set"/> - -</metacity_theme> diff --git a/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-3.xml b/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-3.xml deleted file mode 100644 index 3461401ac..000000000 --- a/packaging/macosx/Resources/themes/Adwaita/metacity-1/metacity-theme-3.xml +++ /dev/null @@ -1,1723 +0,0 @@ -<?xml version="1.0"?> -<metacity_theme> -<info> - <name>Adwaita</name> - <author>GNOME Art Team <art.gnome.org></author> - <copyright>Â Intel, Â Red Hat, Lapo Calamandrei</copyright> - <date>2012</date> - <description>Default GNOME 3 window theme</description> -</info> - -<!-- meaningfull constants --> - -<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.7" /> -<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> -<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" /> -<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" /> -<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" /> -<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" /> -<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" /> -<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" /> -<!-- color of the button icons --> -<constant name="C_icons_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" /> -<constant name="C_icons_pressed" value="gtk:text[SELECTED]" /> -<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" /> -<constant name="C_icons_unfocused_prelight" value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.3" /> -<constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" /> -<constant name="C_icons_shadow" value="gtk:custom(wm_title_shadow,gtk:base[NORMAL])" /> -<constant name="C_separator" value="blend/#000000/gtk:bg[NORMAL]/0.9" /> -<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons --> -<constant name="D_icons_shrink" value="3" /> <!-- increasing this value makes the icons in buttons smaller --> -<constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger --> -<!-- geometries --> - -<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4"> - <distance name="left_width" value="1" /> - <distance name="right_width" value="1" /> - <distance name="bottom_height" value="1" /> - <distance name="left_titlebar_edge" value="1"/> - <distance name="right_titlebar_edge" value="1"/> - <distance name="title_vertical_pad" value="16"/> - <border name="title_border" left="10" right="10" top="0" bottom="2"/> - <border name="button_border" left="0" right="0" top="1" bottom="0"/> - <aspect_ratio name="button" value="1"/> -</frame_geometry> - -<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal"> - <distance name="left_titlebar_edge" value="1"/> - <distance name="right_titlebar_edge" value="1"/> -</frame_geometry> - -<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <distance name="left_width" value="0" /> - <distance name="right_width" value="0" /> - <distance name="left_titlebar_edge" value="1"/> - <distance name="right_titlebar_edge" value="1"/> - <distance name="title_vertical_pad" value="15"/> <!-- - This needs to be 1 less then the - title_vertical_pad on normal state - or you'll have bigger buttons --> - <border name="title_border" left="10" right="10" top="1" bottom="2"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <distance name="bottom_height" value="0" /> -</frame_geometry> - -<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> - <distance name="right_width" value="0" /> -</frame_geometry> - -<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> - <distance name="left_width" value="1" /> -</frame_geometry> - -<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <distance name="title_vertical_pad" value="7"/> - <border name="title_border" left="10" right="10" top="0" bottom="1"/> - <border name="button_border" left="0" right="0" top="0" bottom="2"/> -</frame_geometry> - -<frame_geometry name="small_unfocused" parent="small"> - <distance name="left_titlebar_edge" value="1"/> - <distance name="right_titlebar_edge" value="1"/> -</frame_geometry> - -<frame_geometry name="nobuttons" hide_buttons="true" parent="normal"> -</frame_geometry> - -<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > - <distance name="left_width" value="1" /> - <distance name="right_width" value="1" /> - <distance name="bottom_height" value="1" /> - <border name="title_border" left="10" right="10" top="0" bottom="0" /> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <distance name="title_vertical_pad" value="1" /> -</frame_geometry> - -<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > - <distance name="left_width" value="0" /> - <distance name="right_width" value="0" /> - <distance name="bottom_height" value="0" /> - <distance name="title_vertical_pad" value="0" /> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <border name="title_border" left="0" right="0" top="0" bottom="0" /> -</frame_geometry> - -<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small"> - <distance name="title_vertical_pad" value="5"/> -</frame_geometry> - -<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal"> - <distance name="title_vertical_pad" value="1"/> - <distance name="bottom_height" value="1"/> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> -</frame_geometry> - -<!-- drawing operations --> - - <!-- title --> - -<draw_ops name="title_focused"> - <title version="< 3.1" - x="(0 `max` ((width - title_width) / 2))" - y="(0 `max` ((height - title_height) / 2)) + 2" - color="C_title_focused_hilight" /> - <title version="< 3.1" - x="(0 `max` ((width - title_width) / 2))" - y="(0 `max` ((height - title_height) / 2))" - color="C_title_focused_hilight_dark" /> - <title version="< 3.1" - x="(0 `max` ((width - title_width) / 2))" - y="(0 `max` ((height - title_height) / 2)) + 1" - color="C_title_focused" /> - <title version=">= 3.1" - x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))" - y="(0 `max` ((height - title_height) / 2)) + 2" - ellipsize_width="width" - color="C_title_focused_hilight" /> - <title version=">= 3.1" - x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))" - y="(0 `max` ((height - title_height) / 2))" - ellipsize_width="width" - color="C_title_focused_hilight_dark" /> - <title version=">= 3.1" - x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))" - y="(0 `max` ((height - title_height) / 2)) + 1" - ellipsize_width="width" - color="C_title_focused" /> -</draw_ops> - -<draw_ops name="title_unfocused"> - <title version="< 3.1" - x="(0 `max` ((width - title_width) / 2))" - y="(0 `max` ((height - title_height) / 2)) + 1" - color="C_title_unfocused"/> - <title version=">= 3.1" - x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width)))" - y="(0 `max` ((height - title_height) / 2)) + 1" - ellipsize_width="width" - color="C_title_unfocused"/> -</draw_ops> - - <!-- window decorations --> - -<draw_ops name="entire_background_focused"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> - -<draw_ops name="entire_background_unfocused"> - <include name="entire_background_focused" /> -</draw_ops> - -<draw_ops name="titlebar_fill_focused"> - <gradient type="vertical" x="0" y="0" width="width" height="height"> - <color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" /> - <color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" /> - </gradient> -</draw_ops> - - -<draw_ops name="titlebar_fill_unfocused"> - <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> - -<draw_ops name="hilight"> - <line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" /> - <gradient type="vertical" x="1" y="1" width="1" height="height-4"> - <color value="C_titlebar_focused_hilight" /> - <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> - </gradient> -</draw_ops> - -<draw_ops name="rounded_hilight"> - <line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" /> - <arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7" start_angle="270" extent_angle="90" /> - <arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7" start_angle="0" extent_angle="90" /> - <gradient type="vertical" x="1" y="5" width="1" height="height-9"> - <color value="C_titlebar_focused_hilight" /> - <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> - </gradient> -</draw_ops> - -<draw_ops name="titlebar_focused"> - <include name="titlebar_fill_focused" /> - <include name="hilight" /> -</draw_ops> - -<draw_ops name="rounded_titlebar_focused"> - <include name="titlebar_fill_focused" /> - <include name="rounded_hilight" /> -</draw_ops> - -<draw_ops name="rounded_titlebar_focused_alt"> - <include name="titlebar_fill_focused" /> - <include name="rounded_hilight" /> -</draw_ops> - -<draw_ops name="border_focused"> - <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> -</draw_ops> - -<draw_ops name="border_unfocused"> - <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> -</draw_ops> - -<draw_ops name="rounded_border_focused"> - <line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" /> - <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> - <line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" /> - <line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" /> - <arc color="C_border_focused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> - <arc color="C_border_focused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> - <!-- double arcs for darker borders --> - <arc color="C_border_focused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> - <arc color="C_border_focused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> -</draw_ops> - -<draw_ops name="rounded_border_unfocused"> - <line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" /> - <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> - <line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" /> - <line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" /> - <arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> - <arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> - - <!-- double arcs for darker borders --> - <arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> - <arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" /> -</draw_ops> - - - -<draw_ops name="border_left_focused"> - <line - x1="0" y1="0" - x2="0" y2="height" - color="C_border_focused" /> -</draw_ops> - -<draw_ops name="border_left_unfocused"> - <line - x1="0" y1="0" - x2="0" y2="height" - color="C_border_unfocused" /> -</draw_ops> - - <!-- button icons--> - - -<draw_ops name="close_shadow_focused"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="close_glyph_pressed"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_pressed" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_pressed" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_pressed" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_pressed" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_pressed" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_pressed" /> -</draw_ops> - -<draw_ops name="close_glyph_prelight"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="gtk:text[NORMAL]" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="gtk:text[NORMAL]" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="gtk:text[NORMAL]" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="gtk:text[NORMAL]" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="gtk:text[NORMAL]" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="gtk:text[NORMAL]" /> -</draw_ops> - -<draw_ops name="close_glyph_focused"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="close_focused"> - <include name="close_shadow_focused" y="1" /> - <include name="close_glyph_focused" /> - -</draw_ops> - -<draw_ops name="close_focused_pressed"> - <include name="close_glyph_pressed" y="1" /> -</draw_ops> - -<draw_ops name="close_focused_prelight"> - <include name="close_shadow_focused" y="1" /> - <include name="close_glyph_prelight" /> -</draw_ops> - -<draw_ops name="close_glyph_unfocused"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="close_unfocused"> - <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> - <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="close_glyph_unfocused_prelight"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="close_unfocused_prelight"> - <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> - <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="close_glyph_unfocused_pressed"> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> - <line - x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="close_unfocused_pressed"> - <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> - <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_focused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="maximize_glyph_pressed"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_pressed" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_pressed" /> -</draw_ops> - -<draw_ops name="maximize_glyph_prelight"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="gtk:text[NORMAL]" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="gtk:text[NORMAL]" /> -</draw_ops> - -<draw_ops name="maximize_shadow_focused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_shadow" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="maximize_focused"> - <include name="maximize_shadow_focused" y="1" /> - <include name="maximize_glyph_focused" /> -</draw_ops> - -<draw_ops name="maximize_focused_pressed"> - <include name="maximize_glyph_pressed" y="1" /> -</draw_ops> - -<draw_ops name="maximize_focused_prelight"> - <include name="maximize_shadow_focused" y="1" /> - <include name="maximize_glyph_prelight" /> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="maximize_unfocused"> - <include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused_prelight"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="maximize_unfocused_prelight"> - <include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused_pressed"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="maximize_unfocused_pressed"> - <include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="minimize_glyph_focused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="minimize_glyph_pressed"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_pressed" /> -</draw_ops> - -<draw_ops name="minimize_glyph_prelight"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="gtk:text[NORMAL]" /> -</draw_ops> - -<draw_ops name="minimize_shadow_focused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="minimize_focused"> - <include name="minimize_shadow_focused" y="1" /> - <include name="minimize_glyph_focused" /> -</draw_ops> - -<draw_ops name="minimize_focused_pressed"> - <include name="minimize_glyph_pressed" y="1" /> -</draw_ops> - -<draw_ops name="minimize_focused_prelight"> - <include name="minimize_shadow_focused" y="1" /> - <include name="minimize_glyph_prelight" /> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="minimize_unfocused"> - <include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused_prelight"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="minimize_unfocused_prelight"> - <include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused_pressed"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="minimize_unfocused_pressed"> - <include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="menu_glyph_focused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="menu_shadow_focused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_shadow" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_shadow" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="menu_focused"> - <include name="menu_shadow_focused" y="1" /> - <include name="menu_glyph_focused" /> -</draw_ops> - -<draw_ops name="menu_focused_pressed"> - <include name="menu_glyph_focused" /> -</draw_ops> - -<draw_ops name="menu_glyph_unfocused"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="menu_unfocused"> - <include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="menu_glyph_unfocused_prelight"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="menu_unfocused_prelight"> - <include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="menu_glyph_unfocused_pressed"> - <rectangle - x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="menu_unfocused_pressed"> - <include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="shade_glyph_focused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_focused" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_focused" /> - <rectangle - x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_focused" /> -</draw_ops> - -<draw_ops name="shade_shadow_focused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_shadow" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_shadow" /> -</draw_ops> - -<draw_ops name="shade_focused"> - <include name="shade_shadow_focused" y="1" /> - <include name="shade_glyph_focused" /> -</draw_ops> - -<draw_ops name="shade_focused_pressed"> - <include name="shade_glyph_focused" /> -</draw_ops> - -<draw_ops name="shade_glyph_unfocused"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused" /> - <rectangle - x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused" /> -</draw_ops> - -<draw_ops name="shade_unfocused"> - <include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="shade_glyph_unfocused_prelight"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_prelight" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused_prelight" /> - <rectangle - x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused_prelight" /> -</draw_ops> - -<draw_ops name="shade_unfocused_prelight"> - <include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="shade_glyph_unfocused_pressed"> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" - width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true" - color="C_icons_unfocused_pressed" /> - <rectangle - x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused_pressed" /> - <rectangle - x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" - width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true" - color="C_icons_unfocused_pressed" /> -</draw_ops> - -<draw_ops name="shade_unfocused_pressed"> - <include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - - - <!-- button backgrounds --> - -<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> -<constant name="C_button_hilight" value="gtk:custom(wm_highlight,blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6)" /> - -<draw_ops name="button_border"> - <line x1="7" y1="4" x2="width-8" y2="4" color="C_button_border" /> - <arc color="C_button_border" x="width-9" y="4" width="4" height="4" start_angle="0" extent_angle="90"/> - <line x1="width-5" y1="7" x2="width-5" y2="height-8" color="C_button_border" /> - <arc color="C_button_border" x="width-9" y="height-9" width="4" height="4" start_angle="90" extent_angle="90"/> - <line x1="width-7" y1="height-5" x2="7" y2="height-5" color="C_button_border" /> - <arc color="C_button_border" x="4" y="height-9" width="4" height="4" start_angle="180" extent_angle="90"/> - <line x1="4" y1="7" x2="4" y2="height-8" color="C_button_border" /> - <arc color="C_button_border" x="4" y="4" width="4" height="4" start_angle="270" extent_angle="90"/> - <line x1="width-7" y1="height-4" x2="7" y2="height-4" color="C_title_focused_hilight" /> -</draw_ops> - - -<draw_ops name="button_fill"> <!-- button background gradient --> - -</draw_ops> - -<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status --> - <gradient type="vertical" x="5" y="5" width="width-10" height="height-10"> - <color value="gtk:custom(button_hover_gradient_color_a,gtk:fg[NORMAL])" /> - <color value="gtk:custom(button_hover_gradient_color_b,gtk:fg[NORMAL])" /> - </gradient> - <include name="button_border" /> -</draw_ops> - -<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status --> - <gradient type="vertical" x="5" y="5" width="width-10" height="height-10"> - <color value="gtk:custom(borders,gtk:fg[NORMAL])" /> - <color value="blend/gtk:custom(theme_bg_color,gtk:fg[NORMAL])/#000000/.05" /> - </gradient> - <include name="button_border" /> -</draw_ops> - -<draw_ops name="button"> -</draw_ops> - -<draw_ops name="button_prelight"> - <include name="button_fill_prelight" /> -</draw_ops> - -<draw_ops name="button_pressed"> - <include name="button_fill_pressed" /> -</draw_ops> - -<!-- frame styles --> - -<frame_style name="normal_focused" geometry="normal"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="rounded_border_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="close" state="prelight" draw_ops="close_focused_prelight" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_unfocused" geometry="normal_unfocused"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="rounded_border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_max_focused" geometry="max"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused" /> - <piece position="title" draw_ops="title_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="close" state="prelight" draw_ops="close_focused_prelight" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_max_unfocused" geometry="max"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_max_shaded_focused" geometry="max"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="close" state="prelight" draw_ops="close_focused_prelight" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="normal_max_shaded_unfocused" geometry="max"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="dialog_focused" geometry="nobuttons"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="rounded_border_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="close" state="prelight" draw_ops="close_focused_prelight" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="dialog_unfocused" geometry="nobuttons"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="rounded_border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="modal_dialog_focused" geometry="modal"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="border_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="close" state="prelight" draw_ops="close_focused_prelight" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="modal_dialog_unfocused" geometry="modal"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="utility_focused" geometry="small"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="border_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="close" state="prelight" draw_ops="close_focused_prelight" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="utility_unfocused" geometry="small_unfocused"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="border_focused" geometry="border"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="overlay" draw_ops="border_focused" /> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="border_unfocused" geometry="border"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="overlay" draw_ops="border_unfocused" /> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="borderless" geometry="borderless"> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="attached_focused" geometry="attached"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="border_focused" /> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="attached_unfocused" geometry="attached"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="border_unfocused" /> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="tiled_left_focused" geometry="tiled_left"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused" /> - <piece position="title" draw_ops="title_focused" /> - <!-- <piece position="overlay" draw_ops="border_right_focused" /> --> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="close" state="prelight" draw_ops="close_focused_prelight" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="tiled_left_unfocused" geometry="tiled_left"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <!-- <piece position="overlay" draw_ops="border_right_unfocused" /> --> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="tiled_right_focused" geometry="tiled_right"> - <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused" /> - <piece position="title" draw_ops="title_focused" /> - <piece position="overlay" draw_ops="border_left_focused" /> - <button function="close" state="normal" draw_ops="close_focused" /> - <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="close" state="prelight" draw_ops="close_focused_prelight" /> - <button function="maximize" state="normal" draw_ops="maximize_focused" /> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> - <button function="minimize" state="normal" draw_ops="minimize_focused" /> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> - <button function="menu" state="normal" draw_ops="menu_focused" /> - <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> - - <button function="left_middle_background" state="normal" draw_ops="button"/> - <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/> - <button function="right_middle_background" state="normal" draw_ops="button"/> - <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/> - <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/> - - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<frame_style name="tiled_right_unfocused" geometry="tiled_right"> - <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> - <piece position="title" draw_ops="title_unfocused" /> - <piece position="overlay" draw_ops="border_left_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused" /> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> - <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> - <button function="shade" state="normal" draw_ops="shade_unfocused" /> - <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<!-- placeholder for unimplementated styles--> -<frame_style name="blank" geometry="normal"> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> - <button function="above" state="normal"><draw_ops></draw_ops></button> - <button function="above" state="pressed"><draw_ops></draw_ops></button> - <button function="unabove" state="normal"><draw_ops></draw_ops></button> - <button function="unabove" state="pressed"><draw_ops></draw_ops></button> - <button function="stick" state="normal"><draw_ops></draw_ops></button> - <button function="stick" state="pressed"><draw_ops></draw_ops></button> - <button function="unstick" state="normal"><draw_ops></draw_ops></button> - <button function="unstick" state="pressed"><draw_ops></draw_ops></button> -</frame_style> - -<!-- frame style sets --> - -<frame_style_set name="normal_style_set"> - <frame focus="yes" state="normal" resize="both" style="normal_focused"/> - <frame focus="no" state="normal" resize="both" style="normal_unfocused"/> - <frame focus="yes" state="maximized" style="normal_max_focused"/> - <frame focus="no" state="maximized" style="normal_max_unfocused"/> - <frame focus="yes" state="shaded" style="normal_focused"/> - <frame focus="no" state="shaded" style="normal_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/> - <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/> - <frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/> - <frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/> - <frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/> - <frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/> - <frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/> - <frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/> - <frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/> - <frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/> -</frame_style_set> - -<frame_style_set name="dialog_style_set"> - <frame focus="yes" state="normal" resize="both" style="dialog_focused"/> - <frame focus="no" state="normal" resize="both" style="dialog_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="dialog_focused"/> - <frame focus="no" state="shaded" style="dialog_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - -<frame_style_set name="modal_dialog_style_set"> - <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/> - <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="modal_dialog_focused"/> - <frame focus="no" state="shaded" style="modal_dialog_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - -<frame_style_set name="utility_style_set"> - <frame focus="yes" state="normal" resize="both" style="utility_focused"/> - <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="utility_focused"/> - <frame focus="no" state="shaded" style="utility_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - -<frame_style_set name="border_style_set"> - <frame focus="yes" state="normal" resize="both" style="border_focused"/> - <frame focus="no" state="normal" resize="both" style="border_unfocused"/> - <frame focus="yes" state="maximized" style="borderless"/> - <frame focus="no" state="maximized" style="borderless"/> - <frame focus="yes" state="shaded" style="blank"/> - <frame focus="no" state="shaded" style="blank"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - -<frame_style_set name="attached_style_set"> - <frame focus="yes" state="normal" resize="both" style="attached_focused"/> - <frame focus="no" state="normal" resize="both" style="attached_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="blank"/> - <frame focus="no" state="shaded" style="blank"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> -</frame_style_set> - - -<!-- windows --> - -<window type="normal" style_set="normal_style_set"/> -<window type="dialog" style_set="dialog_style_set"/> -<window type="modal_dialog" style_set="modal_dialog_style_set"/> -<window type="menu" style_set="utility_style_set"/> -<window type="utility" style_set="utility_style_set"/> -<window type="border" style_set="border_style_set"/> -<window version=">= 3.2" type="attached" style_set="attached_style_set"/> - -</metacity_theme> diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 4a851cf56..fcdc1d30b 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -133,10 +133,11 @@ if [ ! -f "$plist" ]; then exit 1 fi -if [ "x$python_dir" == "x" ]; then - echo "Python modules directory not specified." >&2 - - exit 1 +if [ ${add_python} = "true" ]; then + if [ "x$python_dir" == "x" ]; then + echo "Python modules directory not specified." >&2 + exit 1 + fi fi if [ ! -e "$LIBPREFIX" ]; then @@ -273,6 +274,7 @@ for item in Adwaita Clearlooks HighContrast Industrial Raleigh Redmond ThinIce; mkdir -p "$pkgshare/themes/$item" cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" done +(cd "$pkgshare/themes/" && ln -s Adwaita Adwaita-osxapp) # Icons and the rest of the script framework rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" @@ -302,12 +304,11 @@ ModuleFiles=\${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91/pang END_PANGO mkdir -p $pkgetc/fonts -cp -r $LIBPREFIX/etc/fonts/fonts.conf $pkgetc/fonts/ +#cp -r $LIBPREFIX/etc/fonts/fonts.conf $pkgetc/fonts/ cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ +cp -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ +(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/10-autohint.conf . ) -mkdir -p $pkgetc/gtk-2.0 -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/etc/gtk-2.0/gdk-pixbuf.loaders > $pkgetc/gtk-2.0/gdk-pixbuf.loaders -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/etc/gtk-2.0/gtk.immodules > $pkgetc/gtk-2.0/gtk.immodules for item in gnome-vfs-mime-magic gnome-vfs-2.0 do @@ -328,6 +329,10 @@ cp $LIBPREFIX/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/ mkdir -p $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/ +mkdir -p "$pkgetc/gtk-2.0/" +sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkgetc/gtk-2.0/gtk.immodules +sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders.cache > $pkgetc/gtk-2.0/gdk-pixbuf.loaders + cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" cp -r "$LIBPREFIX/share/ImageMagick-6" "$pkgresources/share/" @@ -424,7 +429,7 @@ fixlib () { echo "Skipping to_path for $lib in $1" ;; esac - [ $to_path ] && ${LIBPREFIX}/bin/install_name_tool -change "$lib" "$to_path" "$1" + [ $to_path ] && install_name_tool -change "$lib" "$to_path" "$1" fi done fi -- cgit v1.2.3 From 201771eda26e39fa33b6363318acbe013fc919ad Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 03:24:24 +0200 Subject: .bzrignore: add directories generated for macosx packaging (bzr r13506.1.9) --- .bzrignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.bzrignore b/.bzrignore index 107ffc16a..c85c5284f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -219,3 +219,8 @@ Inkscape.creator Inkscape.creator.user Inkscape.files Inkscape.includes +# osxapp (X11) +build-osxapp +inst-osxapp +packaging/macosx/ScriptExec/build +packaging/macosx/Inkscape.app -- cgit v1.2.3 From dd09c72c57b2960a4336b373ca7262219c5eb11f Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 03:29:43 +0200 Subject: update custom fonts.conf to latest upstream changes (bzr r13506.1.10) --- packaging/macosx/Resources/etc/fonts/fonts.conf | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf index 476aca105..316043814 100644 --- a/packaging/macosx/Resources/etc/fonts/fonts.conf +++ b/packaging/macosx/Resources/etc/fonts/fonts.conf @@ -24,12 +24,14 @@ <!-- Font directory list --> <dir>/usr/share/fonts</dir> - <dir>/usr/X11R6/lib/X11/fonts</dir> + <dir>/usr/X11/lib/X11/fonts</dir> <dir>/opt/local/share/fonts</dir> <dir>/System/Library/Fonts</dir> <dir>/Network/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> + <dir prefix="xdg">fonts</dir> + <!-- the following element will be removed in the future --> <dir>~/.fonts</dir> <!-- @@ -39,7 +41,7 @@ <test qual="any" name="family"> <string>mono</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>monospace</string> </edit> </match> @@ -51,7 +53,7 @@ <test qual="any" name="family"> <string>sans serif</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>sans-serif</string> </edit> </match> @@ -63,7 +65,7 @@ <test qual="any" name="family"> <string>sans</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>sans-serif</string> </edit> </match> @@ -75,6 +77,8 @@ <!-- Font cache directory list --> + <cachedir prefix="xdg">fontconfig</cachedir> + <!-- the following element will be removed in the future --> <cachedir>~/.fontconfig</cachedir> <config> -- cgit v1.2.3 From c1f2cee561acdbd6963c5bf9300953ef40140e8e Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 03:44:01 +0200 Subject: remove support for X11 on Panther and Tiger (Leopard and later use launchd) (bzr r13506.1.11) --- packaging/macosx/Resources/bin/getdisplay.sh | 9 ----- packaging/macosx/Resources/script | 31 --------------- packaging/macosx/ScriptExec/main.c | 59 ++-------------------------- 3 files changed, 3 insertions(+), 96 deletions(-) delete mode 100755 packaging/macosx/Resources/bin/getdisplay.sh diff --git a/packaging/macosx/Resources/bin/getdisplay.sh b/packaging/macosx/Resources/bin/getdisplay.sh deleted file mode 100755 index f7f383348..000000000 --- a/packaging/macosx/Resources/bin/getdisplay.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Author: Aaron Voisine <aaron@voisine.org> - -if [ "$DISPLAY"x == "x" ]; then - echo :0 > /tmp/display.$UID -else - echo $DISPLAY > /tmp/display.$UID -fi diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index 62dcafdf5..b6464de96 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -8,37 +8,6 @@ CWD=`dirname "$0"` # System version: 3 for Panther, 4 for Tiger, 5 for Leopard export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` -# On Leopard, X11.app is installed by default, and will be started -# automatically via launchd. On older systems, we need to start -# X11 ourself. - -# For Panther and Tiger, start X11 -if [[ $VERSION -le 4 ]]; then - # FIXME apparently this removes the xterm that starts with X - # from xinitrc but when is it really used? Should we modify - # the .xinitrc of the user without warning? - ps -wx -ocommand | grep -e '[X]11' > /dev/null - if [ "$?" != "0" -a ! -f "${HOME}/.xinitrc" ]; then - echo "rm -f \"\${HOME}/.xinitrc\"" > "${HOME}/.xinitrc" - sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> "${HOME}/.xinitrc" - fi - - # Start X11 and get DISPLAY - # FIXME: Insecure tmp file usage. Why do we have to copy this to /tmp anyway? - cp -f "$CWD/bin/getdisplay.sh" /tmp/ - rm -f /tmp/display.$UID - open-x11 /tmp/getdisplay.sh || \ - open -a XDarwin /tmp/getdisplay.sh || \ - echo ":0" > /tmp/display.$UID - - while [ "$?" == "0" -a ! -f /tmp/display.$UID ]; do - sleep 1 - done - export DISPLAY=`cat /tmp/display.$UID` - - ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11 -fi - # Warn the user about time-consuming generation of fontconfig caches. test -f "${HOME}/.inkscape-etc/.fccache-new" || exit 12 diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c index e754057a9..c9c6ffaa8 100644 --- a/packaging/macosx/ScriptExec/main.c +++ b/packaging/macosx/ScriptExec/main.c @@ -28,7 +28,7 @@ /* * This app laucher basically takes care of: - * - launching Inkscape and X11 when double-clicked + * - launching Inkscape when double-clicked * - bringing X11 to the top when its icon is clicked in the dock (via a small applescript) * - catch file dropped on icon events (and double-clicked gimp documents) and notify gimp. * - catch quit events performed outside gimp, e.g. on the dock icon. @@ -43,7 +43,7 @@ // Note: including Carbon prevents building the launcher app in x86_64 // used for StandardAlert in RequestUserAttention(), -// RedFatalAlert() and X11FailedHandler() +// RedFatalAlert() #include <Carbon/Carbon.h> #include <CoreFoundation/CoreFoundation.h> @@ -73,7 +73,6 @@ #define kEventClassRedFatalAlert 911 // custom carbon event types -#define kEventKindX11Failed 911 #define kEventKindFCCacheFailed 912 //maximum arguments the script accepts @@ -104,8 +103,6 @@ static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, AppleEvent *reply, long refCon); static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent, AppleEvent *reply, long refCon); -static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData); static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, EventRef theEvent, void *userData); static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, @@ -149,7 +146,6 @@ extern char **environ; int main(int argc, char* argv[]) { OSErr err = noErr; - EventTypeSpec X11events = { kEventClassRedFatalAlert, kEventKindX11Failed }; EventTypeSpec FCCacheEvents = { kEventClassRedFatalAlert, kEventKindFCCacheFailed }; InitCursor(); @@ -169,9 +165,6 @@ int main(int argc, char* argv[]) NewAEEventHandlerUPP(AppReopenAppAEHandler), 0, false); - err += InstallEventHandler(GetApplicationEventTarget(), - NewEventHandlerUPP(X11FailedHandler), 1, - &X11events, NULL, NULL); err += InstallEventHandler(GetApplicationEventTarget(), NewEventHandlerUPP(FCCacheFailedHandler), 1, &FCCacheEvents, NULL, NULL); @@ -268,12 +261,7 @@ static void *Execute (void *arg) taskDone = false; OSErr err = ExecuteScript(scriptPath, &pid); - if (err == (OSErr)11) { - CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindX11Failed, 0, - kEventAttributeNone, &event); - PostEventToQueue(GetMainEventQueue(), event, kEventPriorityStandard); - } - else if (err == (OSErr)12) { + if (err == (OSErr)12) { CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindFCCacheFailed, 0, kEventAttributeNone, &event); PostEventToQueue(GetMainEventQueue(), event, kEventPriorityHigh); @@ -577,47 +565,6 @@ static void OpenURL(Str255 url) } -////////////////////////////////// -// Handler for when X11 fails to start -////////////////////////////////// -static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData) -{ - #pragma unused(theHanderCall, theEvent, userData) - - pthread_join(tid, NULL); - if (odtid) pthread_join(odtid, NULL); - - SInt16 itemHit; - const char *getX11 = "\pGet X11 for Panther"; - - AlertStdAlertParamRec params; - params.movable = true; - params.helpButton = false; - params.filterProc = NULL; - params.defaultText = (StringPtr) kAlertDefaultOKText; - params.cancelText = getX11; - params.otherText = NULL; - params.defaultButton = kAlertStdAlertOKButton; - params.cancelButton = kAlertStdAlertCancelButton; - params.position = kWindowDefaultPosition; - - StandardAlert(kAlertStopAlert, "\pFailed to start X11", - "\pInkscape.app requires XQuartz.", - ¶ms, &itemHit); - - if (itemHit == kAlertStdAlertCancelButton) - { - OpenURL("http://xquartz.macosforge.org/landing/"); - } - - ExitToShell(); - - - return noErr; -} - - // Compile and run a small AppleScript. The code below does no cleanup and no proper error checks // but since it's there until the app is shut down, and since we know the script is okay, // there should not be any problems. -- cgit v1.2.3 From ec4512cf2ed8a9eca189ef6b10ddc996c476825e Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 04:01:31 +0200 Subject: fix copy/paste error in launcher script (bzr r13506.1.12) --- packaging/macosx/Resources/bin/inkscape | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 1dc236c5e..510e91e32 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -120,7 +120,7 @@ sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$PREFDIR/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ > "$PREFDIR/pango.modules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ - > "$PREFDIR/.inkscape-etc/gtk.immodules" + > "$PREFDIR/gtk.immodules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ > "$PREFDIR/gdk-pixbuf.loaders" -- cgit v1.2.3 From 7172f9e4f33dbaf2cecdcd1b0a05bf6213ec1849 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 04:05:32 +0200 Subject: generate GtkStock icon theme when filling the app bundle (bzr r13506.1.13) --- .../src/icons/stock-icons/16/application-exit.png | Bin 0 -> 647 bytes .../icons/stock-icons/16/dialog-information.png | Bin 0 -> 879 bytes .../src/icons/stock-icons/16/document-new.png | Bin 0 -> 569 bytes .../icons/stock-icons/16/document-open-recent.png | Bin 0 -> 892 bytes .../src/icons/stock-icons/16/document-open.png | Bin 0 -> 492 bytes .../stock-icons/16/document-print-preview.png | Bin 0 -> 733 bytes .../src/icons/stock-icons/16/document-print.png | Bin 0 -> 525 bytes .../icons/stock-icons/16/document-properties.png | Bin 0 -> 794 bytes .../icons/stock-icons/16/document-revert-ltr.png | Bin 0 -> 800 bytes .../icons/stock-icons/16/document-revert-rtl.png | Bin 0 -> 794 bytes .../src/icons/stock-icons/16/document-save-as.png | Bin 0 -> 770 bytes .../src/icons/stock-icons/16/document-save.png | Bin 0 -> 652 bytes .../src/icons/stock-icons/16/drive-harddisk.png | Bin 0 -> 832 bytes .../src/icons/stock-icons/16/edit-clear.png | Bin 0 -> 695 bytes .../src/icons/stock-icons/16/edit-copy.png | Bin 0 -> 498 bytes .../src/icons/stock-icons/16/edit-cut.png | Bin 0 -> 876 bytes .../src/icons/stock-icons/16/edit-delete.png | Bin 0 -> 866 bytes .../src/icons/stock-icons/16/edit-find-replace.png | Bin 0 -> 875 bytes .../src/icons/stock-icons/16/edit-find.png | Bin 0 -> 788 bytes .../src/icons/stock-icons/16/edit-paste.png | Bin 0 -> 561 bytes .../src/icons/stock-icons/16/edit-redo-ltr.png | Bin 0 -> 790 bytes .../src/icons/stock-icons/16/edit-redo-rtl.png | Bin 0 -> 808 bytes .../src/icons/stock-icons/16/edit-select-all.png | Bin 0 -> 547 bytes .../src/icons/stock-icons/16/edit-undo-ltr.png | Bin 0 -> 784 bytes .../src/icons/stock-icons/16/edit-undo-rtl.png | Bin 0 -> 764 bytes .../src/icons/stock-icons/16/folder-remote.png | Bin 0 -> 548 bytes .../src/icons/stock-icons/16/folder.png | Bin 0 -> 548 bytes .../stock-icons/16/format-indent-less-ltr.png | Bin 0 -> 594 bytes .../stock-icons/16/format-indent-less-rtl.png | Bin 0 -> 596 bytes .../stock-icons/16/format-indent-more-ltr.png | Bin 0 -> 611 bytes .../stock-icons/16/format-indent-more-rtl.png | Bin 0 -> 604 bytes .../icons/stock-icons/16/format-justify-center.png | Bin 0 -> 393 bytes .../icons/stock-icons/16/format-justify-fill.png | Bin 0 -> 358 bytes .../icons/stock-icons/16/format-justify-left.png | Bin 0 -> 378 bytes .../icons/stock-icons/16/format-justify-right.png | Bin 0 -> 400 bytes .../src/icons/stock-icons/16/format-text-bold.png | Bin 0 -> 649 bytes .../icons/stock-icons/16/format-text-italic.png | Bin 0 -> 665 bytes .../stock-icons/16/format-text-strikethrough.png | Bin 0 -> 656 bytes .../icons/stock-icons/16/format-text-underline.png | Bin 0 -> 645 bytes .../src/icons/stock-icons/16/go-bottom.png | Bin 0 -> 647 bytes .../src/icons/stock-icons/16/go-down.png | Bin 0 -> 598 bytes .../src/icons/stock-icons/16/go-first-ltr.png | Bin 0 -> 632 bytes .../src/icons/stock-icons/16/go-first-rtl.png | Bin 0 -> 653 bytes .../src/icons/stock-icons/16/go-home.png | Bin 0 -> 735 bytes .../src/icons/stock-icons/16/go-jump-ltr.png | Bin 0 -> 811 bytes .../src/icons/stock-icons/16/go-jump-rtl.png | Bin 0 -> 806 bytes .../src/icons/stock-icons/16/go-last-ltr.png | Bin 0 -> 653 bytes .../src/icons/stock-icons/16/go-last-rtl.png | Bin 0 -> 632 bytes .../src/icons/stock-icons/16/go-next-ltr.png | Bin 0 -> 580 bytes .../src/icons/stock-icons/16/go-next-rtl.png | Bin 0 -> 579 bytes .../src/icons/stock-icons/16/go-previous-ltr.png | Bin 0 -> 579 bytes .../src/icons/stock-icons/16/go-previous-rtl.png | Bin 0 -> 580 bytes .../src/icons/stock-icons/16/go-top.png | Bin 0 -> 630 bytes .../src/icons/stock-icons/16/go-up.png | Bin 0 -> 551 bytes .../icons/stock-icons/16/gtk-caps-lock-warning.png | Bin 0 -> 275 bytes .../src/icons/stock-icons/16/gtk-color-picker.png | Bin 0 -> 606 bytes .../src/icons/stock-icons/16/gtk-connect.png | Bin 0 -> 692 bytes .../src/icons/stock-icons/16/gtk-convert.png | Bin 0 -> 677 bytes .../src/icons/stock-icons/16/gtk-disconnect.png | Bin 0 -> 715 bytes .../src/icons/stock-icons/16/gtk-edit.png | Bin 0 -> 755 bytes .../src/icons/stock-icons/16/gtk-font.png | Bin 0 -> 706 bytes .../src/icons/stock-icons/16/gtk-index.png | Bin 0 -> 753 bytes .../stock-icons/16/gtk-orientation-landscape.png | Bin 0 -> 756 bytes .../stock-icons/16/gtk-orientation-portrait.png | Bin 0 -> 543 bytes .../16/gtk-orientation-reverse-landscape.png | Bin 0 -> 751 bytes .../16/gtk-orientation-reverse-portrait.png | Bin 0 -> 557 bytes .../src/icons/stock-icons/16/gtk-page-setup.png | Bin 0 -> 622 bytes .../src/icons/stock-icons/16/gtk-preferences.png | Bin 0 -> 1014 bytes .../src/icons/stock-icons/16/gtk-select-color.png | Bin 0 -> 735 bytes .../src/icons/stock-icons/16/gtk-select-font.png | Bin 0 -> 706 bytes .../src/icons/stock-icons/16/gtk-undelete-ltr.png | Bin 0 -> 962 bytes .../src/icons/stock-icons/16/gtk-undelete-rtl.png | Bin 0 -> 952 bytes .../src/icons/stock-icons/16/help-about.png | Bin 0 -> 704 bytes .../src/icons/stock-icons/16/help-contents.png | Bin 0 -> 1002 bytes .../src/icons/stock-icons/16/image-missing.png | Bin 0 -> 654 bytes .../src/icons/stock-icons/16/list-add.png | Bin 0 -> 260 bytes .../src/icons/stock-icons/16/list-remove.png | Bin 0 -> 210 bytes .../src/icons/stock-icons/16/media-floppy.png | Bin 0 -> 652 bytes .../src/icons/stock-icons/16/media-optical.png | Bin 0 -> 894 bytes .../icons/stock-icons/16/media-playback-pause.png | Bin 0 -> 247 bytes .../stock-icons/16/media-playback-start-ltr.png | Bin 0 -> 542 bytes .../stock-icons/16/media-playback-start-rtl.png | Bin 0 -> 532 bytes .../icons/stock-icons/16/media-playback-stop.png | Bin 0 -> 295 bytes .../src/icons/stock-icons/16/media-record.png | Bin 0 -> 565 bytes .../stock-icons/16/media-seek-backward-ltr.png | Bin 0 -> 502 bytes .../stock-icons/16/media-seek-backward-rtl.png | Bin 0 -> 523 bytes .../stock-icons/16/media-seek-forward-ltr.png | Bin 0 -> 523 bytes .../stock-icons/16/media-seek-forward-rtl.png | Bin 0 -> 502 bytes .../stock-icons/16/media-skip-backward-ltr.png | Bin 0 -> 462 bytes .../stock-icons/16/media-skip-backward-rtl.png | Bin 0 -> 455 bytes .../stock-icons/16/media-skip-forward-ltr.png | Bin 0 -> 455 bytes .../stock-icons/16/media-skip-forward-rtl.png | Bin 0 -> 462 bytes .../src/icons/stock-icons/16/network-idle.png | Bin 0 -> 623 bytes .../src/icons/stock-icons/16/printer-error.png | Bin 0 -> 711 bytes .../src/icons/stock-icons/16/printer-info.png | Bin 0 -> 724 bytes .../src/icons/stock-icons/16/printer-paused.png | Bin 0 -> 689 bytes .../src/icons/stock-icons/16/printer-warning.png | Bin 0 -> 685 bytes .../src/icons/stock-icons/16/process-stop.png | Bin 0 -> 769 bytes .../src/icons/stock-icons/16/system-run.png | Bin 0 -> 902 bytes .../src/icons/stock-icons/16/text-x-generic.png | Bin 0 -> 569 bytes .../icons/stock-icons/16/tools-check-spelling.png | Bin 0 -> 641 bytes .../src/icons/stock-icons/16/user-desktop.png | Bin 0 -> 548 bytes .../src/icons/stock-icons/16/user-home.png | Bin 0 -> 548 bytes .../src/icons/stock-icons/16/view-fullscreen.png | Bin 0 -> 432 bytes .../src/icons/stock-icons/16/view-refresh.png | Bin 0 -> 926 bytes .../src/icons/stock-icons/16/view-restore.png | Bin 0 -> 473 bytes .../icons/stock-icons/16/view-sort-ascending.png | Bin 0 -> 333 bytes .../icons/stock-icons/16/view-sort-descending.png | Bin 0 -> 331 bytes .../src/icons/stock-icons/16/window-close.png | Bin 0 -> 889 bytes .../src/icons/stock-icons/16/zoom-fit-best.png | Bin 0 -> 750 bytes .../src/icons/stock-icons/16/zoom-in.png | Bin 0 -> 785 bytes .../src/icons/stock-icons/16/zoom-original.png | Bin 0 -> 784 bytes .../src/icons/stock-icons/16/zoom-out.png | Bin 0 -> 772 bytes .../src/icons/stock-icons/20/gtk-apply.png | Bin 0 -> 1002 bytes .../src/icons/stock-icons/20/gtk-cancel.png | Bin 0 -> 1067 bytes .../src/icons/stock-icons/20/gtk-no.png | Bin 0 -> 952 bytes .../src/icons/stock-icons/20/gtk-ok.png | Bin 0 -> 963 bytes .../src/icons/stock-icons/20/gtk-yes.png | Bin 0 -> 1044 bytes .../src/icons/stock-icons/20/window-close.png | Bin 0 -> 1224 bytes .../src/icons/stock-icons/24/application-exit.png | Bin 0 -> 967 bytes .../src/icons/stock-icons/24/audio-volume-high.png | Bin 0 -> 1217 bytes .../src/icons/stock-icons/24/audio-volume-low.png | Bin 0 -> 857 bytes .../icons/stock-icons/24/audio-volume-medium.png | Bin 0 -> 1021 bytes .../icons/stock-icons/24/audio-volume-muted.png | Bin 0 -> 910 bytes .../icons/stock-icons/24/dialog-information.png | Bin 0 -> 1420 bytes .../src/icons/stock-icons/24/document-new.png | Bin 0 -> 736 bytes .../icons/stock-icons/24/document-open-recent.png | Bin 0 -> 1561 bytes .../src/icons/stock-icons/24/document-open.png | Bin 0 -> 612 bytes .../stock-icons/24/document-print-preview.png | Bin 0 -> 1244 bytes .../src/icons/stock-icons/24/document-print.png | Bin 0 -> 818 bytes .../icons/stock-icons/24/document-properties.png | Bin 0 -> 1146 bytes .../icons/stock-icons/24/document-revert-ltr.png | Bin 0 -> 1404 bytes .../icons/stock-icons/24/document-revert-rtl.png | Bin 0 -> 1411 bytes .../src/icons/stock-icons/24/document-save-as.png | Bin 0 -> 1206 bytes .../src/icons/stock-icons/24/document-save.png | Bin 0 -> 951 bytes .../src/icons/stock-icons/24/drive-harddisk.png | Bin 0 -> 1360 bytes .../src/icons/stock-icons/24/edit-clear.png | Bin 0 -> 1163 bytes .../src/icons/stock-icons/24/edit-copy.png | Bin 0 -> 697 bytes .../src/icons/stock-icons/24/edit-cut.png | Bin 0 -> 1032 bytes .../src/icons/stock-icons/24/edit-delete.png | Bin 0 -> 1449 bytes .../src/icons/stock-icons/24/edit-find-replace.png | Bin 0 -> 1379 bytes .../src/icons/stock-icons/24/edit-find.png | Bin 0 -> 1238 bytes .../src/icons/stock-icons/24/edit-paste.png | Bin 0 -> 893 bytes .../src/icons/stock-icons/24/edit-redo-ltr.png | Bin 0 -> 1070 bytes .../src/icons/stock-icons/24/edit-redo-rtl.png | Bin 0 -> 1085 bytes .../src/icons/stock-icons/24/edit-select-all.png | Bin 0 -> 717 bytes .../src/icons/stock-icons/24/edit-undo-ltr.png | Bin 0 -> 1052 bytes .../src/icons/stock-icons/24/edit-undo-rtl.png | Bin 0 -> 1035 bytes .../src/icons/stock-icons/24/folder-remote.png | Bin 0 -> 662 bytes .../src/icons/stock-icons/24/folder.png | Bin 0 -> 662 bytes .../stock-icons/24/format-indent-less-ltr.png | Bin 0 -> 843 bytes .../stock-icons/24/format-indent-less-rtl.png | Bin 0 -> 876 bytes .../stock-icons/24/format-indent-more-ltr.png | Bin 0 -> 852 bytes .../stock-icons/24/format-indent-more-rtl.png | Bin 0 -> 870 bytes .../icons/stock-icons/24/format-justify-center.png | Bin 0 -> 490 bytes .../icons/stock-icons/24/format-justify-fill.png | Bin 0 -> 447 bytes .../icons/stock-icons/24/format-justify-left.png | Bin 0 -> 489 bytes .../icons/stock-icons/24/format-justify-right.png | Bin 0 -> 503 bytes .../src/icons/stock-icons/24/format-text-bold.png | Bin 0 -> 947 bytes .../icons/stock-icons/24/format-text-italic.png | Bin 0 -> 971 bytes .../stock-icons/24/format-text-strikethrough.png | Bin 0 -> 966 bytes .../icons/stock-icons/24/format-text-underline.png | Bin 0 -> 969 bytes .../src/icons/stock-icons/24/go-bottom.png | Bin 0 -> 1037 bytes .../src/icons/stock-icons/24/go-down.png | Bin 0 -> 973 bytes .../src/icons/stock-icons/24/go-first-ltr.png | Bin 0 -> 1028 bytes .../src/icons/stock-icons/24/go-first-rtl.png | Bin 0 -> 1061 bytes .../src/icons/stock-icons/24/go-home.png | Bin 0 -> 1050 bytes .../src/icons/stock-icons/24/go-jump-ltr.png | Bin 0 -> 1229 bytes .../src/icons/stock-icons/24/go-jump-rtl.png | Bin 0 -> 1226 bytes .../src/icons/stock-icons/24/go-last-ltr.png | Bin 0 -> 1061 bytes .../src/icons/stock-icons/24/go-last-rtl.png | Bin 0 -> 1028 bytes .../src/icons/stock-icons/24/go-next-ltr.png | Bin 0 -> 906 bytes .../src/icons/stock-icons/24/go-next-rtl.png | Bin 0 -> 915 bytes .../src/icons/stock-icons/24/go-previous-ltr.png | Bin 0 -> 915 bytes .../src/icons/stock-icons/24/go-previous-rtl.png | Bin 0 -> 906 bytes .../src/icons/stock-icons/24/go-top.png | Bin 0 -> 1037 bytes .../src/icons/stock-icons/24/go-up.png | Bin 0 -> 946 bytes .../icons/stock-icons/24/gtk-caps-lock-warning.png | Bin 0 -> 360 bytes .../src/icons/stock-icons/24/gtk-color-picker.png | Bin 0 -> 891 bytes .../src/icons/stock-icons/24/gtk-connect.png | Bin 0 -> 946 bytes .../src/icons/stock-icons/24/gtk-convert.png | Bin 0 -> 1413 bytes .../src/icons/stock-icons/24/gtk-disconnect.png | Bin 0 -> 852 bytes .../src/icons/stock-icons/24/gtk-edit.png | Bin 0 -> 1120 bytes .../src/icons/stock-icons/24/gtk-font.png | Bin 0 -> 1109 bytes .../src/icons/stock-icons/24/gtk-index.png | Bin 0 -> 960 bytes .../stock-icons/24/gtk-orientation-landscape.png | Bin 0 -> 1097 bytes .../stock-icons/24/gtk-orientation-portrait.png | Bin 0 -> 931 bytes .../24/gtk-orientation-reverse-landscape.png | Bin 0 -> 1059 bytes .../24/gtk-orientation-reverse-portrait.png | Bin 0 -> 940 bytes .../src/icons/stock-icons/24/gtk-page-setup.png | Bin 0 -> 1081 bytes .../src/icons/stock-icons/24/gtk-preferences.png | Bin 0 -> 1691 bytes .../src/icons/stock-icons/24/gtk-select-color.png | Bin 0 -> 993 bytes .../src/icons/stock-icons/24/gtk-select-font.png | Bin 0 -> 1109 bytes .../src/icons/stock-icons/24/gtk-undelete-ltr.png | Bin 0 -> 1692 bytes .../src/icons/stock-icons/24/gtk-undelete-rtl.png | Bin 0 -> 1722 bytes .../src/icons/stock-icons/24/help-about.png | Bin 0 -> 982 bytes .../src/icons/stock-icons/24/help-contents.png | Bin 0 -> 1728 bytes .../src/icons/stock-icons/24/image-missing.png | Bin 0 -> 894 bytes .../src/icons/stock-icons/24/list-add.png | Bin 0 -> 571 bytes .../src/icons/stock-icons/24/list-remove.png | Bin 0 -> 369 bytes .../src/icons/stock-icons/24/media-floppy.png | Bin 0 -> 951 bytes .../src/icons/stock-icons/24/media-optical.png | Bin 0 -> 1372 bytes .../icons/stock-icons/24/media-playback-pause.png | Bin 0 -> 383 bytes .../stock-icons/24/media-playback-start-ltr.png | Bin 0 -> 863 bytes .../stock-icons/24/media-playback-start-rtl.png | Bin 0 -> 895 bytes .../icons/stock-icons/24/media-playback-stop.png | Bin 0 -> 400 bytes .../src/icons/stock-icons/24/media-record.png | Bin 0 -> 1063 bytes .../stock-icons/24/media-seek-backward-ltr.png | Bin 0 -> 902 bytes .../stock-icons/24/media-seek-backward-rtl.png | Bin 0 -> 776 bytes .../stock-icons/24/media-seek-forward-ltr.png | Bin 0 -> 776 bytes .../stock-icons/24/media-seek-forward-rtl.png | Bin 0 -> 902 bytes .../stock-icons/24/media-skip-backward-ltr.png | Bin 0 -> 806 bytes .../stock-icons/24/media-skip-backward-rtl.png | Bin 0 -> 848 bytes .../stock-icons/24/media-skip-forward-ltr.png | Bin 0 -> 848 bytes .../stock-icons/24/media-skip-forward-rtl.png | Bin 0 -> 806 bytes .../src/icons/stock-icons/24/network-idle.png | Bin 0 -> 1015 bytes .../src/icons/stock-icons/24/printer-error.png | Bin 0 -> 1130 bytes .../src/icons/stock-icons/24/printer-info.png | Bin 0 -> 1154 bytes .../src/icons/stock-icons/24/printer-paused.png | Bin 0 -> 1096 bytes .../src/icons/stock-icons/24/printer-warning.png | Bin 0 -> 1099 bytes .../src/icons/stock-icons/24/process-stop.png | Bin 0 -> 1043 bytes .../src/icons/stock-icons/24/system-run.png | Bin 0 -> 1592 bytes .../src/icons/stock-icons/24/text-x-generic.png | Bin 0 -> 736 bytes .../icons/stock-icons/24/tools-check-spelling.png | Bin 0 -> 950 bytes .../src/icons/stock-icons/24/user-desktop.png | Bin 0 -> 662 bytes .../src/icons/stock-icons/24/user-home.png | Bin 0 -> 662 bytes .../src/icons/stock-icons/24/view-fullscreen.png | Bin 0 -> 606 bytes .../src/icons/stock-icons/24/view-refresh.png | Bin 0 -> 1466 bytes .../src/icons/stock-icons/24/view-restore.png | Bin 0 -> 677 bytes .../icons/stock-icons/24/view-sort-ascending.png | Bin 0 -> 413 bytes .../icons/stock-icons/24/view-sort-descending.png | Bin 0 -> 379 bytes .../src/icons/stock-icons/24/window-close.png | Bin 0 -> 1453 bytes .../src/icons/stock-icons/24/zoom-fit-best.png | Bin 0 -> 937 bytes .../src/icons/stock-icons/24/zoom-in.png | Bin 0 -> 993 bytes .../src/icons/stock-icons/24/zoom-original.png | Bin 0 -> 962 bytes .../src/icons/stock-icons/24/zoom-out.png | Bin 0 -> 941 bytes .../src/icons/stock-icons/32/gtk-dnd-multiple.png | Bin 0 -> 1215 bytes .../src/icons/stock-icons/32/gtk-dnd.png | Bin 0 -> 1349 bytes .../src/icons/stock-icons/48/dialog-error.png | Bin 0 -> 2828 bytes .../icons/stock-icons/48/dialog-information.png | Bin 0 -> 3259 bytes .../src/icons/stock-icons/48/dialog-password.png | Bin 0 -> 2358 bytes .../src/icons/stock-icons/48/dialog-question.png | Bin 0 -> 2809 bytes .../src/icons/stock-icons/48/dialog-warning.png | Bin 0 -> 2358 bytes packaging/macosx/Resources/etc/gtk-2.0/gtkrc | 2 +- packaging/macosx/Resources/icons/.DS_Store | Bin 6148 -> 0 bytes .../16x16/stock/3floppy_unmount-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/3floppy_unmount.png | 1 - .../icons/GtkStock/16x16/stock/add-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/add.png | 1 - .../16x16/stock/application-exit-symbolic.png | 1 - .../GtkStock/16x16/stock/application-exit.png | Bin 647 -> 0 bytes .../icons/GtkStock/16x16/stock/ascii-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/ascii.png | 1 - .../icons/GtkStock/16x16/stock/bottom-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/bottom.png | 1 - .../16x16/stock/cdrom_unmount-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/cdrom_unmount.png | 1 - .../16x16/stock/cdwriter_unmount-symbolic.png | 1 - .../GtkStock/16x16/stock/cdwriter_unmount.png | 1 - .../GtkStock/16x16/stock/centrejust-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/centrejust.png | 1 - .../16x16/stock/connect_established-symbolic.png | 1 - .../GtkStock/16x16/stock/connect_established.png | 1 - .../GtkStock/16x16/stock/desktop-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/desktop.png | 1 - .../16x16/stock/dialog-information-symbolic.png | 1 - .../GtkStock/16x16/stock/dialog-information.png | Bin 879 -> 0 bytes .../GtkStock/16x16/stock/document-new-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/document-new.png | Bin 569 -> 0 bytes .../16x16/stock/document-open-recent-symbolic.png | 1 - .../GtkStock/16x16/stock/document-open-recent.png | Bin 892 -> 0 bytes .../16x16/stock/document-open-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/document-open.png | Bin 492 -> 0 bytes .../stock/document-print-preview-symbolic.png | 1 - .../16x16/stock/document-print-preview.png | Bin 733 -> 0 bytes .../16x16/stock/document-print-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/document-print.png | Bin 525 -> 0 bytes .../16x16/stock/document-properties-symbolic.png | 1 - .../GtkStock/16x16/stock/document-properties.png | Bin 794 -> 0 bytes .../16x16/stock/document-revert-ltr-symbolic.png | 1 - .../GtkStock/16x16/stock/document-revert-ltr.png | Bin 800 -> 0 bytes .../16x16/stock/document-revert-rtl-symbolic.png | 1 - .../GtkStock/16x16/stock/document-revert-rtl.png | Bin 794 -> 0 bytes .../16x16/stock/document-revert-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/document-revert.png | 1 - .../16x16/stock/document-save-as-symbolic.png | 1 - .../GtkStock/16x16/stock/document-save-as.png | Bin 770 -> 0 bytes .../16x16/stock/document-save-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/document-save.png | Bin 652 -> 0 bytes .../icons/GtkStock/16x16/stock/down-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/down.png | 1 - .../16x16/stock/drive-harddisk-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/drive-harddisk.png | Bin 832 -> 0 bytes .../GtkStock/16x16/stock/dvd_unmount-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/dvd_unmount.png | 1 - .../GtkStock/16x16/stock/edit-clear-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-clear.png | Bin 695 -> 0 bytes .../GtkStock/16x16/stock/edit-copy-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-copy.png | Bin 498 -> 0 bytes .../GtkStock/16x16/stock/edit-cut-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-cut.png | Bin 876 -> 0 bytes .../GtkStock/16x16/stock/edit-delete-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-delete.png | Bin 866 -> 0 bytes .../16x16/stock/edit-find-replace-symbolic.png | 1 - .../GtkStock/16x16/stock/edit-find-replace.png | Bin 875 -> 0 bytes .../GtkStock/16x16/stock/edit-find-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-find.png | Bin 788 -> 0 bytes .../GtkStock/16x16/stock/edit-paste-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-paste.png | Bin 561 -> 0 bytes .../16x16/stock/edit-redo-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-redo-ltr.png | Bin 790 -> 0 bytes .../16x16/stock/edit-redo-rtl-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-redo-rtl.png | Bin 808 -> 0 bytes .../GtkStock/16x16/stock/edit-redo-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-redo.png | 1 - .../16x16/stock/edit-select-all-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-select-all.png | Bin 547 -> 0 bytes .../16x16/stock/edit-undo-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-undo-ltr.png | Bin 784 -> 0 bytes .../16x16/stock/edit-undo-rtl-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-undo-rtl.png | Bin 764 -> 0 bytes .../GtkStock/16x16/stock/edit-undo-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/edit-undo.png | 1 - .../GtkStock/16x16/stock/editclear-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/editclear.png | 1 - .../GtkStock/16x16/stock/editcopy-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/editcopy.png | 1 - .../GtkStock/16x16/stock/editcut-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/editcut.png | 1 - .../GtkStock/16x16/stock/editdelete-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/editdelete.png | 1 - .../GtkStock/16x16/stock/editpaste-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/editpaste.png | 1 - .../icons/GtkStock/16x16/stock/empty-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/empty.png | 1 - .../icons/GtkStock/16x16/stock/exit-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/exit.png | 1 - .../GtkStock/16x16/stock/filefind-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/filefind.png | 1 - .../GtkStock/16x16/stock/filenew-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/filenew.png | 1 - .../GtkStock/16x16/stock/fileopen-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/fileopen.png | 1 - .../GtkStock/16x16/stock/fileprint-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/fileprint.png | 1 - .../16x16/stock/filequickprint-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/filequickprint.png | 1 - .../GtkStock/16x16/stock/filesave-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/filesave.png | 1 - .../GtkStock/16x16/stock/filesaveas-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/filesaveas.png | 1 - .../icons/GtkStock/16x16/stock/find-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/find.png | 1 - .../16x16/stock/folder-remote-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/folder-remote.png | Bin 548 -> 0 bytes .../icons/GtkStock/16x16/stock/folder-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/folder.png | Bin 548 -> 0 bytes .../GtkStock/16x16/stock/folder_home-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/folder_home.png | 1 - .../stock/format-indent-less-ltr-symbolic.png | 1 - .../16x16/stock/format-indent-less-ltr.png | Bin 594 -> 0 bytes .../stock/format-indent-less-rtl-symbolic.png | 1 - .../16x16/stock/format-indent-less-rtl.png | Bin 596 -> 0 bytes .../stock/format-indent-more-ltr-symbolic.png | 1 - .../16x16/stock/format-indent-more-ltr.png | Bin 611 -> 0 bytes .../stock/format-indent-more-rtl-symbolic.png | 1 - .../16x16/stock/format-indent-more-rtl.png | Bin 604 -> 0 bytes .../16x16/stock/format-justify-center-symbolic.png | 1 - .../GtkStock/16x16/stock/format-justify-center.png | Bin 393 -> 0 bytes .../16x16/stock/format-justify-fill-symbolic.png | 1 - .../GtkStock/16x16/stock/format-justify-fill.png | Bin 358 -> 0 bytes .../16x16/stock/format-justify-left-symbolic.png | 1 - .../GtkStock/16x16/stock/format-justify-left.png | Bin 378 -> 0 bytes .../16x16/stock/format-justify-right-symbolic.png | 1 - .../GtkStock/16x16/stock/format-justify-right.png | Bin 400 -> 0 bytes .../16x16/stock/format-text-bold-symbolic.png | 1 - .../GtkStock/16x16/stock/format-text-bold.png | Bin 649 -> 0 bytes .../16x16/stock/format-text-italic-symbolic.png | 1 - .../GtkStock/16x16/stock/format-text-italic.png | Bin 665 -> 0 bytes .../stock/format-text-strikethrough-symbolic.png | 1 - .../16x16/stock/format-text-strikethrough.png | Bin 656 -> 0 bytes .../16x16/stock/format-text-underline-symbolic.png | 1 - .../GtkStock/16x16/stock/format-text-underline.png | Bin 645 -> 0 bytes .../16x16/stock/gnome-dev-cdrom-audio-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-dev-cdrom-audio.png | 1 - .../16x16/stock/gnome-dev-disc-cdr-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-dev-disc-cdr.png | 1 - .../16x16/stock/gnome-dev-disc-cdrw-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-dev-disc-cdrw.png | 1 - .../stock/gnome-dev-disc-dvdr-plus-symbolic.png | 1 - .../16x16/stock/gnome-dev-disc-dvdr-plus.png | 1 - .../16x16/stock/gnome-dev-disc-dvdr-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-dev-disc-dvdr.png | 1 - .../16x16/stock/gnome-dev-disc-dvdram-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-dev-disc-dvdram.png | 1 - .../16x16/stock/gnome-dev-disc-dvdrom-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png | 1 - .../16x16/stock/gnome-dev-disc-dvdrw-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png | 1 - .../16x16/stock/gnome-dev-floppy-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-dev-floppy.png | 1 - .../stock/gnome-dev-harddisk-1394-symbolic.png | 1 - .../16x16/stock/gnome-dev-harddisk-1394.png | 1 - .../16x16/stock/gnome-dev-harddisk-symbolic.png | 1 - .../stock/gnome-dev-harddisk-usb-symbolic.png | 1 - .../16x16/stock/gnome-dev-harddisk-usb.png | 1 - .../GtkStock/16x16/stock/gnome-dev-harddisk.png | 1 - .../16x16/stock/gnome-fs-desktop-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-fs-desktop.png | 1 - .../16x16/stock/gnome-fs-directory-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-fs-directory.png | 1 - .../GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gnome-fs-ftp.png | 1 - .../16x16/stock/gnome-fs-home-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gnome-fs-home.png | 1 - .../GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gnome-fs-nfs.png | 1 - .../16x16/stock/gnome-fs-share-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gnome-fs-share.png | 1 - .../GtkStock/16x16/stock/gnome-fs-smb-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gnome-fs-smb.png | 1 - .../GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gnome-fs-ssh.png | 1 - .../16x16/stock/gnome-mime-text-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gnome-mime-text.png | 1 - .../gnome-mime-x-directory-smb-share-symbolic.png | 1 - .../stock/gnome-mime-x-directory-smb-share.png | 1 - .../16x16/stock/gnome-netstatus-idle-symbolic.png | 1 - .../GtkStock/16x16/stock/gnome-netstatus-idle.png | 1 - .../GtkStock/16x16/stock/gnome-run-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gnome-run.png | 1 - .../GtkStock/16x16/stock/go-bottom-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-bottom.png | Bin 647 -> 0 bytes .../GtkStock/16x16/stock/go-down-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-down.png | Bin 598 -> 0 bytes .../GtkStock/16x16/stock/go-first-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-first-ltr.png | Bin 632 -> 0 bytes .../GtkStock/16x16/stock/go-first-rtl-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-first-rtl.png | Bin 653 -> 0 bytes .../GtkStock/16x16/stock/go-home-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-home.png | Bin 735 -> 0 bytes .../GtkStock/16x16/stock/go-jump-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-jump-ltr.png | Bin 811 -> 0 bytes .../GtkStock/16x16/stock/go-jump-rtl-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-jump-rtl.png | Bin 806 -> 0 bytes .../GtkStock/16x16/stock/go-last-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-last-ltr.png | Bin 653 -> 0 bytes .../GtkStock/16x16/stock/go-last-rtl-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-last-rtl.png | Bin 632 -> 0 bytes .../GtkStock/16x16/stock/go-next-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-next-ltr.png | Bin 580 -> 0 bytes .../GtkStock/16x16/stock/go-next-rtl-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-next-rtl.png | Bin 579 -> 0 bytes .../16x16/stock/go-previous-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-previous-ltr.png | Bin 579 -> 0 bytes .../16x16/stock/go-previous-rtl-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-previous-rtl.png | Bin 580 -> 0 bytes .../icons/GtkStock/16x16/stock/go-top-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/go-top.png | Bin 630 -> 0 bytes .../icons/GtkStock/16x16/stock/go-up-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/go-up.png | Bin 551 -> 0 bytes .../icons/GtkStock/16x16/stock/gohome-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gohome.png | 1 - .../GtkStock/16x16/stock/gtk-about-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-about.png | 1 - .../GtkStock/16x16/stock/gtk-add-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-add.png | 1 - .../GtkStock/16x16/stock/gtk-bold-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-bold.png | 1 - .../GtkStock/16x16/stock/gtk-cancel-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-cancel.png | 1 - .../16x16/stock/gtk-caps-lock-warning-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-caps-lock-warning.png | Bin 275 -> 0 bytes .../GtkStock/16x16/stock/gtk-cdrom-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-cdrom.png | 1 - .../GtkStock/16x16/stock/gtk-clear-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-clear.png | 1 - .../GtkStock/16x16/stock/gtk-close-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-close.png | 1 - .../16x16/stock/gtk-color-picker-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-color-picker.png | Bin 606 -> 0 bytes .../GtkStock/16x16/stock/gtk-connect-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-connect.png | Bin 692 -> 0 bytes .../GtkStock/16x16/stock/gtk-convert-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-convert.png | Bin 677 -> 0 bytes .../GtkStock/16x16/stock/gtk-copy-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-copy.png | 1 - .../GtkStock/16x16/stock/gtk-cut-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-cut.png | 1 - .../GtkStock/16x16/stock/gtk-delete-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-delete.png | 1 - .../16x16/stock/gtk-dialog-info-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-dialog-info.png | 1 - .../16x16/stock/gtk-directory-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-directory.png | 1 - .../16x16/stock/gtk-disconnect-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-disconnect.png | Bin 715 -> 0 bytes .../GtkStock/16x16/stock/gtk-edit-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-edit.png | Bin 755 -> 0 bytes .../GtkStock/16x16/stock/gtk-execute-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-execute.png | 1 - .../16x16/stock/gtk-find-and-replace-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-find-and-replace.png | 1 - .../GtkStock/16x16/stock/gtk-find-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-find.png | 1 - .../GtkStock/16x16/stock/gtk-floppy-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-floppy.png | 1 - .../GtkStock/16x16/stock/gtk-font-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-font.png | Bin 706 -> 0 bytes .../16x16/stock/gtk-fullscreen-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-fullscreen.png | 1 - .../GtkStock/16x16/stock/gtk-go-down-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-go-down.png | 1 - .../GtkStock/16x16/stock/gtk-go-up-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-go-up.png | 1 - .../16x16/stock/gtk-goto-bottom-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-goto-bottom.png | 1 - .../GtkStock/16x16/stock/gtk-goto-top-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-goto-top.png | 1 - .../GtkStock/16x16/stock/gtk-harddisk-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-harddisk.png | 1 - .../GtkStock/16x16/stock/gtk-help-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-help.png | 1 - .../GtkStock/16x16/stock/gtk-home-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-home.png | 1 - .../GtkStock/16x16/stock/gtk-index-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-index.png | Bin 753 -> 0 bytes .../GtkStock/16x16/stock/gtk-italic-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-italic.png | 1 - .../16x16/stock/gtk-justify-center-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-justify-center.png | 1 - .../16x16/stock/gtk-justify-fill-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-justify-fill.png | 1 - .../16x16/stock/gtk-justify-left-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-justify-left.png | 1 - .../16x16/stock/gtk-justify-right-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-justify-right.png | 1 - .../16x16/stock/gtk-leave-fullscreen-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-leave-fullscreen.png | 1 - .../16x16/stock/gtk-media-pause-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-media-pause.png | 1 - .../16x16/stock/gtk-media-record-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-media-record.png | 1 - .../16x16/stock/gtk-media-stop-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-media-stop.png | 1 - .../16x16/stock/gtk-missing-image-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-missing-image.png | 1 - .../GtkStock/16x16/stock/gtk-new-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-new.png | 1 - .../GtkStock/16x16/stock/gtk-open-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-open.png | 1 - .../stock/gtk-orientation-landscape-symbolic.png | 1 - .../16x16/stock/gtk-orientation-landscape.png | Bin 756 -> 0 bytes .../stock/gtk-orientation-portrait-symbolic.png | 1 - .../16x16/stock/gtk-orientation-portrait.png | Bin 543 -> 0 bytes .../gtk-orientation-reverse-landscape-symbolic.png | 1 - .../stock/gtk-orientation-reverse-landscape.png | Bin 751 -> 0 bytes .../gtk-orientation-reverse-portrait-symbolic.png | 1 - .../stock/gtk-orientation-reverse-portrait.png | Bin 557 -> 0 bytes .../16x16/stock/gtk-page-setup-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-page-setup.png | Bin 622 -> 0 bytes .../GtkStock/16x16/stock/gtk-paste-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-paste.png | 1 - .../16x16/stock/gtk-preferences-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-preferences.png | Bin 1014 -> 0 bytes .../16x16/stock/gtk-print-preview-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-print-preview.png | 1 - .../GtkStock/16x16/stock/gtk-print-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-print.png | 1 - .../16x16/stock/gtk-properties-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-properties.png | 1 - .../GtkStock/16x16/stock/gtk-quit-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-quit.png | 1 - .../GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-redo-ltr.png | 1 - .../GtkStock/16x16/stock/gtk-refresh-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-refresh.png | 1 - .../GtkStock/16x16/stock/gtk-remove-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-remove.png | 1 - .../stock/gtk-revert-to-saved-ltr-symbolic.png | 1 - .../16x16/stock/gtk-revert-to-saved-ltr.png | 1 - .../stock/gtk-revert-to-saved-rtl-symbolic.png | 1 - .../16x16/stock/gtk-revert-to-saved-rtl.png | 1 - .../GtkStock/16x16/stock/gtk-save-as-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-save-as.png | 1 - .../GtkStock/16x16/stock/gtk-save-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-save.png | 1 - .../16x16/stock/gtk-select-all-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-select-all.png | 1 - .../16x16/stock/gtk-select-color-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-select-color.png | Bin 735 -> 0 bytes .../16x16/stock/gtk-select-font-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-select-font.png | Bin 706 -> 0 bytes .../16x16/stock/gtk-sort-ascending-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-sort-ascending.png | 1 - .../16x16/stock/gtk-sort-descending-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-sort-descending.png | 1 - .../16x16/stock/gtk-spell-check-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-spell-check.png | 1 - .../GtkStock/16x16/stock/gtk-stop-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-stop.png | 1 - .../16x16/stock/gtk-strikethrough-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-strikethrough.png | 1 - .../16x16/stock/gtk-undelete-ltr-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-undelete-ltr.png | Bin 962 -> 0 bytes .../16x16/stock/gtk-undelete-rtl-symbolic.png | 1 - .../GtkStock/16x16/stock/gtk-undelete-rtl.png | Bin 952 -> 0 bytes .../16x16/stock/gtk-underline-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-underline.png | 1 - .../GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-undo-ltr.png | 1 - .../GtkStock/16x16/stock/gtk-zoom-100-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-zoom-100.png | 1 - .../GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-zoom-fit.png | 1 - .../GtkStock/16x16/stock/gtk-zoom-in-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-zoom-in.png | 1 - .../GtkStock/16x16/stock/gtk-zoom-out-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/gtk-zoom-out.png | 1 - .../GtkStock/16x16/stock/harddrive-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/harddrive.png | 1 - .../GtkStock/16x16/stock/hdd_unmount-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/hdd_unmount.png | 1 - .../GtkStock/16x16/stock/help-about-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/help-about.png | Bin 704 -> 0 bytes .../16x16/stock/help-contents-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/help-contents.png | Bin 1002 -> 0 bytes .../icons/GtkStock/16x16/stock/help-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/help.png | 1 - .../16x16/stock/image-missing-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/image-missing.png | Bin 654 -> 0 bytes .../icons/GtkStock/16x16/stock/info-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/info.png | 1 - .../16x16/stock/inode-directory-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/inode-directory.png | 1 - .../GtkStock/16x16/stock/kfm_home-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/kfm_home.png | 1 - .../GtkStock/16x16/stock/leftjust-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/leftjust.png | 1 - .../GtkStock/16x16/stock/list-add-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/list-add.png | Bin 260 -> 0 bytes .../GtkStock/16x16/stock/list-remove-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/list-remove.png | Bin 210 -> 0 bytes .../GtkStock/16x16/stock/media-cdrom-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/media-cdrom.png | 1 - .../GtkStock/16x16/stock/media-floppy-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/media-floppy.png | Bin 652 -> 0 bytes .../16x16/stock/media-optical-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/media-optical.png | Bin 894 -> 0 bytes .../16x16/stock/media-playback-pause-symbolic.png | 1 - .../GtkStock/16x16/stock/media-playback-pause.png | Bin 247 -> 0 bytes .../stock/media-playback-start-ltr-symbolic.png | 1 - .../16x16/stock/media-playback-start-ltr.png | Bin 542 -> 0 bytes .../stock/media-playback-start-rtl-symbolic.png | 1 - .../16x16/stock/media-playback-start-rtl.png | Bin 532 -> 0 bytes .../16x16/stock/media-playback-stop-symbolic.png | 1 - .../GtkStock/16x16/stock/media-playback-stop.png | Bin 295 -> 0 bytes .../GtkStock/16x16/stock/media-record-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/media-record.png | Bin 565 -> 0 bytes .../stock/media-seek-backward-ltr-symbolic.png | 1 - .../16x16/stock/media-seek-backward-ltr.png | Bin 502 -> 0 bytes .../stock/media-seek-backward-rtl-symbolic.png | 1 - .../16x16/stock/media-seek-backward-rtl.png | Bin 523 -> 0 bytes .../stock/media-seek-forward-ltr-symbolic.png | 1 - .../16x16/stock/media-seek-forward-ltr.png | Bin 523 -> 0 bytes .../stock/media-seek-forward-rtl-symbolic.png | 1 - .../16x16/stock/media-seek-forward-rtl.png | Bin 502 -> 0 bytes .../stock/media-skip-backward-ltr-symbolic.png | 1 - .../16x16/stock/media-skip-backward-ltr.png | Bin 462 -> 0 bytes .../stock/media-skip-backward-rtl-symbolic.png | 1 - .../16x16/stock/media-skip-backward-rtl.png | Bin 455 -> 0 bytes .../stock/media-skip-forward-ltr-symbolic.png | 1 - .../16x16/stock/media-skip-forward-ltr.png | Bin 455 -> 0 bytes .../stock/media-skip-forward-rtl-symbolic.png | 1 - .../16x16/stock/media-skip-forward-rtl.png | Bin 462 -> 0 bytes .../16x16/stock/messagebox_info-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/messagebox_info.png | 1 - .../GtkStock/16x16/stock/mime_ascii-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/mime_ascii.png | 1 - .../icons/GtkStock/16x16/stock/misc-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/misc.png | 1 - .../GtkStock/16x16/stock/network-idle-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/network-idle.png | Bin 623 -> 0 bytes .../GtkStock/16x16/stock/network-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/network.png | 1 - .../GtkStock/16x16/stock/nm-adhoc-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/nm-adhoc.png | 1 - .../16x16/stock/nm-device-wired-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/nm-device-wired.png | 1 - .../16x16/stock/nm-device-wireless-symbolic.png | 1 - .../GtkStock/16x16/stock/nm-device-wireless.png | 1 - .../16x16/stock/package_editors-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/package_editors.png | 1 - .../16x16/stock/package_settings-symbolic.png | 1 - .../GtkStock/16x16/stock/package_settings.png | 1 - .../GtkStock/16x16/stock/player_pause-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/player_pause.png | 1 - .../16x16/stock/player_record-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/player_record.png | 1 - .../GtkStock/16x16/stock/player_stop-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/player_stop.png | 1 - .../16x16/stock/preferences-system-symbolic.png | 1 - .../GtkStock/16x16/stock/preferences-system.png | 1 - .../16x16/stock/printer-error-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/printer-error.png | Bin 711 -> 0 bytes .../GtkStock/16x16/stock/printer-info-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/printer-info.png | Bin 724 -> 0 bytes .../16x16/stock/printer-paused-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/printer-paused.png | Bin 689 -> 0 bytes .../16x16/stock/printer-warning-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/printer-warning.png | Bin 685 -> 0 bytes .../GtkStock/16x16/stock/process-stop-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/process-stop.png | Bin 769 -> 0 bytes .../GtkStock/16x16/stock/redhat-home-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/redhat-home.png | 1 - .../stock/redhat-system_settings-symbolic.png | 1 - .../16x16/stock/redhat-system_settings.png | 1 - .../icons/GtkStock/16x16/stock/redo-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/redo.png | 1 - .../icons/GtkStock/16x16/stock/reload-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/reload.png | 1 - .../GtkStock/16x16/stock/reload3-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/reload3.png | 1 - .../16x16/stock/reload_all_tabs-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/reload_all_tabs.png | 1 - .../GtkStock/16x16/stock/reload_page-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/reload_page.png | 1 - .../icons/GtkStock/16x16/stock/remove-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/remove.png | 1 - .../icons/GtkStock/16x16/stock/revert-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/revert.png | 1 - .../GtkStock/16x16/stock/rightjust-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/rightjust.png | 1 - .../GtkStock/16x16/stock/stock_about-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_about.png | 1 - .../GtkStock/16x16/stock/stock_bottom-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_bottom.png | 1 - .../GtkStock/16x16/stock/stock_close-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_close.png | 1 - .../GtkStock/16x16/stock/stock_copy-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_copy.png | 1 - .../GtkStock/16x16/stock/stock_cut-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_cut.png | 1 - .../GtkStock/16x16/stock/stock_delete-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_delete.png | 1 - .../16x16/stock/stock_dialog-info-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_dialog-info.png | 1 - .../GtkStock/16x16/stock/stock_down-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_down.png | 1 - .../16x16/stock/stock_file-properites-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_file-properites.png | 1 - .../GtkStock/16x16/stock/stock_folder-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_folder.png | 1 - .../16x16/stock/stock_fullscreen-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_fullscreen.png | 1 - .../GtkStock/16x16/stock/stock_help-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_help.png | 1 - .../GtkStock/16x16/stock/stock_home-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_home.png | 1 - .../stock/stock_leave-fullscreen-symbolic.png | 1 - .../16x16/stock/stock_leave-fullscreen.png | 1 - .../16x16/stock/stock_media-pause-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_media-pause.png | 1 - .../16x16/stock/stock_media-rec-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_media-rec.png | 1 - .../16x16/stock/stock_media-stop-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_media-stop.png | 1 - .../16x16/stock/stock_new-text-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_new-text.png | 1 - .../GtkStock/16x16/stock/stock_paste-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_paste.png | 1 - .../16x16/stock/stock_print-preview-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_print-preview.png | 1 - .../GtkStock/16x16/stock/stock_print-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_print.png | 1 - .../16x16/stock/stock_properties-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_properties.png | 1 - .../GtkStock/16x16/stock/stock_redo-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_redo.png | 1 - .../16x16/stock/stock_refresh-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_refresh.png | 1 - .../16x16/stock/stock_save-as-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_save-as.png | 1 - .../GtkStock/16x16/stock/stock_save-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_save.png | 1 - .../stock/stock_search-and-replace-symbolic.png | 1 - .../16x16/stock/stock_search-and-replace.png | 1 - .../GtkStock/16x16/stock/stock_search-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_search.png | 1 - .../16x16/stock/stock_select-all-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_select-all.png | 1 - .../16x16/stock/stock_spellcheck-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_spellcheck.png | 1 - .../GtkStock/16x16/stock/stock_stop-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_stop.png | 1 - .../stock/stock_text-strikethrough-symbolic.png | 1 - .../16x16/stock/stock_text-strikethrough.png | 1 - .../16x16/stock/stock_text_bold-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_text_bold.png | 1 - .../16x16/stock/stock_text_center-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_text_center.png | 1 - .../16x16/stock/stock_text_italic-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_text_italic.png | 1 - .../16x16/stock/stock_text_justify-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_text_justify.png | 1 - .../16x16/stock/stock_text_left-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_text_left.png | 1 - .../16x16/stock/stock_text_right-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_text_right.png | 1 - .../16x16/stock/stock_text_underlined-symbolic.png | 1 - .../GtkStock/16x16/stock/stock_text_underlined.png | 1 - .../GtkStock/16x16/stock/stock_top-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_top.png | 1 - .../GtkStock/16x16/stock/stock_undo-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_undo.png | 1 - .../GtkStock/16x16/stock/stock_up-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_up.png | 1 - .../GtkStock/16x16/stock/stock_zoom-1-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_zoom-1.png | 1 - .../16x16/stock/stock_zoom-in-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_zoom-in.png | 1 - .../16x16/stock/stock_zoom-out-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_zoom-out.png | 1 - .../16x16/stock/stock_zoom-page-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/stock_zoom-page.png | 1 - .../icons/GtkStock/16x16/stock/stop-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/stop.png | 1 - .../16x16/stock/system-floppy-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/system-floppy.png | 1 - .../GtkStock/16x16/stock/system-run-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/system-run.png | Bin 902 -> 0 bytes .../16x16/stock/text-x-generic-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/text-x-generic.png | Bin 569 -> 0 bytes .../GtkStock/16x16/stock/text_bold-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/text_bold.png | 1 - .../GtkStock/16x16/stock/text_italic-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/text_italic.png | 1 - .../GtkStock/16x16/stock/text_strike-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/text_strike.png | 1 - .../GtkStock/16x16/stock/text_under-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/text_under.png | 1 - .../16x16/stock/tools-check-spelling-symbolic.png | 1 - .../GtkStock/16x16/stock/tools-check-spelling.png | Bin 641 -> 0 bytes .../icons/GtkStock/16x16/stock/top-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/top.png | 1 - .../icons/GtkStock/16x16/stock/txt-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/txt.png | 1 - .../icons/GtkStock/16x16/stock/txt2-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/txt2.png | 1 - .../icons/GtkStock/16x16/stock/undo-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/undo.png | 1 - .../GtkStock/16x16/stock/unknown-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/unknown.png | 1 - .../icons/GtkStock/16x16/stock/up-symbolic.png | 1 - .../Resources/icons/GtkStock/16x16/stock/up.png | 1 - .../GtkStock/16x16/stock/user-desktop-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/user-desktop.png | Bin 548 -> 0 bytes .../GtkStock/16x16/stock/user-home-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/user-home.png | Bin 548 -> 0 bytes .../16x16/stock/view-fullscreen-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/view-fullscreen.png | Bin 432 -> 0 bytes .../GtkStock/16x16/stock/view-refresh-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/view-refresh.png | Bin 926 -> 0 bytes .../GtkStock/16x16/stock/view-restore-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/view-restore.png | Bin 473 -> 0 bytes .../16x16/stock/view-sort-ascending-symbolic.png | 1 - .../GtkStock/16x16/stock/view-sort-ascending.png | Bin 333 -> 0 bytes .../16x16/stock/view-sort-descending-symbolic.png | 1 - .../GtkStock/16x16/stock/view-sort-descending.png | Bin 331 -> 0 bytes .../GtkStock/16x16/stock/viewmag+-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/viewmag+.png | 1 - .../GtkStock/16x16/stock/viewmag--symbolic.png | 1 - .../icons/GtkStock/16x16/stock/viewmag-.png | 1 - .../GtkStock/16x16/stock/viewmag1-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/viewmag1.png | 1 - .../GtkStock/16x16/stock/viewmagfit-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/viewmagfit.png | 1 - .../GtkStock/16x16/stock/window-close-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/window-close.png | Bin 889 -> 0 bytes .../16x16/stock/window_fullscreen-symbolic.png | 1 - .../GtkStock/16x16/stock/window_fullscreen.png | 1 - .../16x16/stock/window_nofullscreen-symbolic.png | 1 - .../GtkStock/16x16/stock/window_nofullscreen.png | 1 - .../16x16/stock/xfce-system-exit-symbolic.png | 1 - .../GtkStock/16x16/stock/xfce-system-exit.png | 1 - .../16x16/stock/xfce-system-settings-symbolic.png | 1 - .../GtkStock/16x16/stock/xfce-system-settings.png | 1 - .../GtkStock/16x16/stock/yast_HD-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/yast_HD.png | 1 - .../GtkStock/16x16/stock/yast_idetude-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/yast_idetude.png | 1 - .../16x16/stock/zoom-best-fit-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/zoom-best-fit.png | 1 - .../16x16/stock/zoom-fit-best-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/zoom-fit-best.png | Bin 750 -> 0 bytes .../GtkStock/16x16/stock/zoom-in-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/zoom-in.png | Bin 785 -> 0 bytes .../16x16/stock/zoom-original-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/zoom-original.png | Bin 784 -> 0 bytes .../GtkStock/16x16/stock/zoom-out-symbolic.png | 1 - .../icons/GtkStock/16x16/stock/zoom-out.png | Bin 772 -> 0 bytes .../GtkStock/20x20/stock/gtk-apply-symbolic.png | 1 - .../icons/GtkStock/20x20/stock/gtk-apply.png | Bin 1002 -> 0 bytes .../GtkStock/20x20/stock/gtk-cancel-symbolic.png | 1 - .../icons/GtkStock/20x20/stock/gtk-cancel.png | Bin 1067 -> 0 bytes .../GtkStock/20x20/stock/gtk-close-symbolic.png | 1 - .../icons/GtkStock/20x20/stock/gtk-close.png | 1 - .../icons/GtkStock/20x20/stock/gtk-no-symbolic.png | 1 - .../icons/GtkStock/20x20/stock/gtk-no.png | Bin 952 -> 0 bytes .../icons/GtkStock/20x20/stock/gtk-ok-symbolic.png | 1 - .../icons/GtkStock/20x20/stock/gtk-ok.png | Bin 963 -> 0 bytes .../GtkStock/20x20/stock/gtk-yes-symbolic.png | 1 - .../icons/GtkStock/20x20/stock/gtk-yes.png | Bin 1044 -> 0 bytes .../GtkStock/20x20/stock/stock_close-symbolic.png | 1 - .../icons/GtkStock/20x20/stock/stock_close.png | 1 - .../GtkStock/20x20/stock/window-close-symbolic.png | 1 - .../icons/GtkStock/20x20/stock/window-close.png | Bin 1224 -> 0 bytes .../24x24/stock/3floppy_unmount-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/3floppy_unmount.png | 1 - .../icons/GtkStock/24x24/stock/add-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/add.png | 1 - .../24x24/stock/application-exit-symbolic.png | 1 - .../GtkStock/24x24/stock/application-exit.png | Bin 967 -> 0 bytes .../icons/GtkStock/24x24/stock/ascii-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/ascii.png | 1 - .../24x24/stock/audio-volume-high-symbolic.png | 1 - .../GtkStock/24x24/stock/audio-volume-high.png | Bin 1217 -> 0 bytes .../24x24/stock/audio-volume-low-symbolic.png | 1 - .../GtkStock/24x24/stock/audio-volume-low.png | Bin 857 -> 0 bytes .../24x24/stock/audio-volume-medium-symbolic.png | 1 - .../GtkStock/24x24/stock/audio-volume-medium.png | Bin 1021 -> 0 bytes .../24x24/stock/audio-volume-muted-symbolic.png | 1 - .../GtkStock/24x24/stock/audio-volume-muted.png | Bin 910 -> 0 bytes .../icons/GtkStock/24x24/stock/bottom-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/bottom.png | 1 - .../24x24/stock/cdrom_unmount-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/cdrom_unmount.png | 1 - .../24x24/stock/cdwriter_unmount-symbolic.png | 1 - .../GtkStock/24x24/stock/cdwriter_unmount.png | 1 - .../GtkStock/24x24/stock/centrejust-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/centrejust.png | 1 - .../24x24/stock/connect_established-symbolic.png | 1 - .../GtkStock/24x24/stock/connect_established.png | 1 - .../GtkStock/24x24/stock/desktop-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/desktop.png | 1 - .../24x24/stock/dialog-information-symbolic.png | 1 - .../GtkStock/24x24/stock/dialog-information.png | Bin 1420 -> 0 bytes .../GtkStock/24x24/stock/document-new-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/document-new.png | Bin 736 -> 0 bytes .../24x24/stock/document-open-recent-symbolic.png | 1 - .../GtkStock/24x24/stock/document-open-recent.png | Bin 1561 -> 0 bytes .../24x24/stock/document-open-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/document-open.png | Bin 612 -> 0 bytes .../stock/document-print-preview-symbolic.png | 1 - .../24x24/stock/document-print-preview.png | Bin 1244 -> 0 bytes .../24x24/stock/document-print-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/document-print.png | Bin 818 -> 0 bytes .../24x24/stock/document-properties-symbolic.png | 1 - .../GtkStock/24x24/stock/document-properties.png | Bin 1146 -> 0 bytes .../24x24/stock/document-revert-ltr-symbolic.png | 1 - .../GtkStock/24x24/stock/document-revert-ltr.png | Bin 1404 -> 0 bytes .../24x24/stock/document-revert-rtl-symbolic.png | 1 - .../GtkStock/24x24/stock/document-revert-rtl.png | Bin 1411 -> 0 bytes .../24x24/stock/document-revert-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/document-revert.png | 1 - .../24x24/stock/document-save-as-symbolic.png | 1 - .../GtkStock/24x24/stock/document-save-as.png | Bin 1206 -> 0 bytes .../24x24/stock/document-save-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/document-save.png | Bin 951 -> 0 bytes .../icons/GtkStock/24x24/stock/down-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/down.png | 1 - .../24x24/stock/drive-harddisk-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/drive-harddisk.png | Bin 1360 -> 0 bytes .../GtkStock/24x24/stock/dvd_unmount-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/dvd_unmount.png | 1 - .../GtkStock/24x24/stock/edit-clear-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-clear.png | Bin 1163 -> 0 bytes .../GtkStock/24x24/stock/edit-copy-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-copy.png | Bin 697 -> 0 bytes .../GtkStock/24x24/stock/edit-cut-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-cut.png | Bin 1032 -> 0 bytes .../GtkStock/24x24/stock/edit-delete-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-delete.png | Bin 1449 -> 0 bytes .../24x24/stock/edit-find-replace-symbolic.png | 1 - .../GtkStock/24x24/stock/edit-find-replace.png | Bin 1379 -> 0 bytes .../GtkStock/24x24/stock/edit-find-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-find.png | Bin 1238 -> 0 bytes .../GtkStock/24x24/stock/edit-paste-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-paste.png | Bin 893 -> 0 bytes .../24x24/stock/edit-redo-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-redo-ltr.png | Bin 1070 -> 0 bytes .../24x24/stock/edit-redo-rtl-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-redo-rtl.png | Bin 1085 -> 0 bytes .../GtkStock/24x24/stock/edit-redo-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-redo.png | 1 - .../24x24/stock/edit-select-all-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-select-all.png | Bin 717 -> 0 bytes .../24x24/stock/edit-undo-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-undo-ltr.png | Bin 1052 -> 0 bytes .../24x24/stock/edit-undo-rtl-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-undo-rtl.png | Bin 1035 -> 0 bytes .../GtkStock/24x24/stock/edit-undo-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/edit-undo.png | 1 - .../GtkStock/24x24/stock/editclear-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/editclear.png | 1 - .../GtkStock/24x24/stock/editcopy-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/editcopy.png | 1 - .../GtkStock/24x24/stock/editcut-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/editcut.png | 1 - .../GtkStock/24x24/stock/editdelete-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/editdelete.png | 1 - .../GtkStock/24x24/stock/editpaste-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/editpaste.png | 1 - .../icons/GtkStock/24x24/stock/empty-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/empty.png | 1 - .../icons/GtkStock/24x24/stock/exit-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/exit.png | 1 - .../GtkStock/24x24/stock/filefind-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/filefind.png | 1 - .../GtkStock/24x24/stock/filenew-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/filenew.png | 1 - .../GtkStock/24x24/stock/fileopen-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/fileopen.png | 1 - .../GtkStock/24x24/stock/fileprint-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/fileprint.png | 1 - .../24x24/stock/filequickprint-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/filequickprint.png | 1 - .../GtkStock/24x24/stock/filesave-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/filesave.png | 1 - .../GtkStock/24x24/stock/filesaveas-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/filesaveas.png | 1 - .../icons/GtkStock/24x24/stock/find-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/find.png | 1 - .../24x24/stock/folder-remote-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/folder-remote.png | Bin 662 -> 0 bytes .../icons/GtkStock/24x24/stock/folder-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/folder.png | Bin 662 -> 0 bytes .../GtkStock/24x24/stock/folder_home-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/folder_home.png | 1 - .../stock/format-indent-less-ltr-symbolic.png | 1 - .../24x24/stock/format-indent-less-ltr.png | Bin 843 -> 0 bytes .../stock/format-indent-less-rtl-symbolic.png | 1 - .../24x24/stock/format-indent-less-rtl.png | Bin 876 -> 0 bytes .../stock/format-indent-more-ltr-symbolic.png | 1 - .../24x24/stock/format-indent-more-ltr.png | Bin 852 -> 0 bytes .../stock/format-indent-more-rtl-symbolic.png | 1 - .../24x24/stock/format-indent-more-rtl.png | Bin 870 -> 0 bytes .../24x24/stock/format-justify-center-symbolic.png | 1 - .../GtkStock/24x24/stock/format-justify-center.png | Bin 490 -> 0 bytes .../24x24/stock/format-justify-fill-symbolic.png | 1 - .../GtkStock/24x24/stock/format-justify-fill.png | Bin 447 -> 0 bytes .../24x24/stock/format-justify-left-symbolic.png | 1 - .../GtkStock/24x24/stock/format-justify-left.png | Bin 489 -> 0 bytes .../24x24/stock/format-justify-right-symbolic.png | 1 - .../GtkStock/24x24/stock/format-justify-right.png | Bin 503 -> 0 bytes .../24x24/stock/format-text-bold-symbolic.png | 1 - .../GtkStock/24x24/stock/format-text-bold.png | Bin 947 -> 0 bytes .../24x24/stock/format-text-italic-symbolic.png | 1 - .../GtkStock/24x24/stock/format-text-italic.png | Bin 971 -> 0 bytes .../stock/format-text-strikethrough-symbolic.png | 1 - .../24x24/stock/format-text-strikethrough.png | Bin 966 -> 0 bytes .../24x24/stock/format-text-underline-symbolic.png | 1 - .../GtkStock/24x24/stock/format-text-underline.png | Bin 969 -> 0 bytes .../24x24/stock/gnome-dev-cdrom-audio-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-dev-cdrom-audio.png | 1 - .../24x24/stock/gnome-dev-disc-cdr-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-dev-disc-cdr.png | 1 - .../24x24/stock/gnome-dev-disc-cdrw-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-dev-disc-cdrw.png | 1 - .../stock/gnome-dev-disc-dvdr-plus-symbolic.png | 1 - .../24x24/stock/gnome-dev-disc-dvdr-plus.png | 1 - .../24x24/stock/gnome-dev-disc-dvdr-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-dev-disc-dvdr.png | 1 - .../24x24/stock/gnome-dev-disc-dvdram-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-dev-disc-dvdram.png | 1 - .../24x24/stock/gnome-dev-disc-dvdrom-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png | 1 - .../24x24/stock/gnome-dev-disc-dvdrw-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png | 1 - .../24x24/stock/gnome-dev-floppy-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-dev-floppy.png | 1 - .../stock/gnome-dev-harddisk-1394-symbolic.png | 1 - .../24x24/stock/gnome-dev-harddisk-1394.png | 1 - .../24x24/stock/gnome-dev-harddisk-symbolic.png | 1 - .../stock/gnome-dev-harddisk-usb-symbolic.png | 1 - .../24x24/stock/gnome-dev-harddisk-usb.png | 1 - .../GtkStock/24x24/stock/gnome-dev-harddisk.png | 1 - .../24x24/stock/gnome-fs-desktop-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-fs-desktop.png | 1 - .../24x24/stock/gnome-fs-directory-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-fs-directory.png | 1 - .../GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gnome-fs-ftp.png | 1 - .../24x24/stock/gnome-fs-home-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gnome-fs-home.png | 1 - .../GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gnome-fs-nfs.png | 1 - .../24x24/stock/gnome-fs-share-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gnome-fs-share.png | 1 - .../GtkStock/24x24/stock/gnome-fs-smb-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gnome-fs-smb.png | 1 - .../GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gnome-fs-ssh.png | 1 - .../24x24/stock/gnome-mime-text-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gnome-mime-text.png | 1 - .../gnome-mime-x-directory-smb-share-symbolic.png | 1 - .../stock/gnome-mime-x-directory-smb-share.png | 1 - .../24x24/stock/gnome-netstatus-idle-symbolic.png | 1 - .../GtkStock/24x24/stock/gnome-netstatus-idle.png | 1 - .../GtkStock/24x24/stock/gnome-run-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gnome-run.png | 1 - .../GtkStock/24x24/stock/go-bottom-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-bottom.png | Bin 1037 -> 0 bytes .../GtkStock/24x24/stock/go-down-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-down.png | Bin 973 -> 0 bytes .../GtkStock/24x24/stock/go-first-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-first-ltr.png | Bin 1028 -> 0 bytes .../GtkStock/24x24/stock/go-first-rtl-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-first-rtl.png | Bin 1061 -> 0 bytes .../GtkStock/24x24/stock/go-home-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-home.png | Bin 1050 -> 0 bytes .../GtkStock/24x24/stock/go-jump-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-jump-ltr.png | Bin 1229 -> 0 bytes .../GtkStock/24x24/stock/go-jump-rtl-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-jump-rtl.png | Bin 1226 -> 0 bytes .../GtkStock/24x24/stock/go-last-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-last-ltr.png | Bin 1061 -> 0 bytes .../GtkStock/24x24/stock/go-last-rtl-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-last-rtl.png | Bin 1028 -> 0 bytes .../GtkStock/24x24/stock/go-next-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-next-ltr.png | Bin 906 -> 0 bytes .../GtkStock/24x24/stock/go-next-rtl-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-next-rtl.png | Bin 915 -> 0 bytes .../24x24/stock/go-previous-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-previous-ltr.png | Bin 915 -> 0 bytes .../24x24/stock/go-previous-rtl-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-previous-rtl.png | Bin 906 -> 0 bytes .../icons/GtkStock/24x24/stock/go-top-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/go-top.png | Bin 1037 -> 0 bytes .../icons/GtkStock/24x24/stock/go-up-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/go-up.png | Bin 946 -> 0 bytes .../icons/GtkStock/24x24/stock/gohome-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gohome.png | 1 - .../GtkStock/24x24/stock/gtk-about-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-about.png | 1 - .../GtkStock/24x24/stock/gtk-add-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-add.png | 1 - .../GtkStock/24x24/stock/gtk-bold-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-bold.png | 1 - .../GtkStock/24x24/stock/gtk-cancel-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-cancel.png | 1 - .../24x24/stock/gtk-caps-lock-warning-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-caps-lock-warning.png | Bin 360 -> 0 bytes .../GtkStock/24x24/stock/gtk-cdrom-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-cdrom.png | 1 - .../GtkStock/24x24/stock/gtk-clear-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-clear.png | 1 - .../GtkStock/24x24/stock/gtk-close-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-close.png | 1 - .../24x24/stock/gtk-color-picker-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-color-picker.png | Bin 891 -> 0 bytes .../GtkStock/24x24/stock/gtk-connect-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-connect.png | Bin 946 -> 0 bytes .../GtkStock/24x24/stock/gtk-convert-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-convert.png | Bin 1413 -> 0 bytes .../GtkStock/24x24/stock/gtk-copy-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-copy.png | 1 - .../GtkStock/24x24/stock/gtk-cut-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-cut.png | 1 - .../GtkStock/24x24/stock/gtk-delete-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-delete.png | 1 - .../24x24/stock/gtk-dialog-info-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-dialog-info.png | 1 - .../24x24/stock/gtk-directory-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-directory.png | 1 - .../24x24/stock/gtk-disconnect-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-disconnect.png | Bin 852 -> 0 bytes .../GtkStock/24x24/stock/gtk-edit-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-edit.png | Bin 1120 -> 0 bytes .../GtkStock/24x24/stock/gtk-execute-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-execute.png | 1 - .../24x24/stock/gtk-find-and-replace-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-find-and-replace.png | 1 - .../GtkStock/24x24/stock/gtk-find-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-find.png | 1 - .../GtkStock/24x24/stock/gtk-floppy-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-floppy.png | 1 - .../GtkStock/24x24/stock/gtk-font-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-font.png | Bin 1109 -> 0 bytes .../24x24/stock/gtk-fullscreen-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-fullscreen.png | 1 - .../GtkStock/24x24/stock/gtk-go-down-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-go-down.png | 1 - .../GtkStock/24x24/stock/gtk-go-up-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-go-up.png | 1 - .../24x24/stock/gtk-goto-bottom-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-goto-bottom.png | 1 - .../GtkStock/24x24/stock/gtk-goto-top-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-goto-top.png | 1 - .../GtkStock/24x24/stock/gtk-harddisk-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-harddisk.png | 1 - .../GtkStock/24x24/stock/gtk-help-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-help.png | 1 - .../GtkStock/24x24/stock/gtk-home-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-home.png | 1 - .../GtkStock/24x24/stock/gtk-index-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-index.png | Bin 960 -> 0 bytes .../GtkStock/24x24/stock/gtk-italic-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-italic.png | 1 - .../24x24/stock/gtk-justify-center-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-justify-center.png | 1 - .../24x24/stock/gtk-justify-fill-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-justify-fill.png | 1 - .../24x24/stock/gtk-justify-left-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-justify-left.png | 1 - .../24x24/stock/gtk-justify-right-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-justify-right.png | 1 - .../24x24/stock/gtk-leave-fullscreen-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-leave-fullscreen.png | 1 - .../24x24/stock/gtk-media-pause-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-media-pause.png | 1 - .../24x24/stock/gtk-media-record-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-media-record.png | 1 - .../24x24/stock/gtk-media-stop-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-media-stop.png | 1 - .../24x24/stock/gtk-missing-image-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-missing-image.png | 1 - .../GtkStock/24x24/stock/gtk-new-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-new.png | 1 - .../GtkStock/24x24/stock/gtk-open-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-open.png | 1 - .../stock/gtk-orientation-landscape-symbolic.png | 1 - .../24x24/stock/gtk-orientation-landscape.png | Bin 1097 -> 0 bytes .../stock/gtk-orientation-portrait-symbolic.png | 1 - .../24x24/stock/gtk-orientation-portrait.png | Bin 931 -> 0 bytes .../gtk-orientation-reverse-landscape-symbolic.png | 1 - .../stock/gtk-orientation-reverse-landscape.png | Bin 1059 -> 0 bytes .../gtk-orientation-reverse-portrait-symbolic.png | 1 - .../stock/gtk-orientation-reverse-portrait.png | Bin 940 -> 0 bytes .../24x24/stock/gtk-page-setup-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-page-setup.png | Bin 1081 -> 0 bytes .../GtkStock/24x24/stock/gtk-paste-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-paste.png | 1 - .../24x24/stock/gtk-preferences-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-preferences.png | Bin 1691 -> 0 bytes .../24x24/stock/gtk-print-preview-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-print-preview.png | 1 - .../GtkStock/24x24/stock/gtk-print-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-print.png | 1 - .../24x24/stock/gtk-properties-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-properties.png | 1 - .../GtkStock/24x24/stock/gtk-quit-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-quit.png | 1 - .../GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-redo-ltr.png | 1 - .../GtkStock/24x24/stock/gtk-refresh-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-refresh.png | 1 - .../GtkStock/24x24/stock/gtk-remove-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-remove.png | 1 - .../stock/gtk-revert-to-saved-ltr-symbolic.png | 1 - .../24x24/stock/gtk-revert-to-saved-ltr.png | 1 - .../stock/gtk-revert-to-saved-rtl-symbolic.png | 1 - .../24x24/stock/gtk-revert-to-saved-rtl.png | 1 - .../GtkStock/24x24/stock/gtk-save-as-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-save-as.png | 1 - .../GtkStock/24x24/stock/gtk-save-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-save.png | 1 - .../24x24/stock/gtk-select-all-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-select-all.png | 1 - .../24x24/stock/gtk-select-color-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-select-color.png | Bin 993 -> 0 bytes .../24x24/stock/gtk-select-font-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-select-font.png | Bin 1109 -> 0 bytes .../24x24/stock/gtk-sort-ascending-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-sort-ascending.png | 1 - .../24x24/stock/gtk-sort-descending-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-sort-descending.png | 1 - .../24x24/stock/gtk-spell-check-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-spell-check.png | 1 - .../GtkStock/24x24/stock/gtk-stop-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-stop.png | 1 - .../24x24/stock/gtk-strikethrough-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-strikethrough.png | 1 - .../24x24/stock/gtk-undelete-ltr-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-undelete-ltr.png | Bin 1692 -> 0 bytes .../24x24/stock/gtk-undelete-rtl-symbolic.png | 1 - .../GtkStock/24x24/stock/gtk-undelete-rtl.png | Bin 1722 -> 0 bytes .../24x24/stock/gtk-underline-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-underline.png | 1 - .../GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-undo-ltr.png | 1 - .../GtkStock/24x24/stock/gtk-zoom-100-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-zoom-100.png | 1 - .../GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-zoom-fit.png | 1 - .../GtkStock/24x24/stock/gtk-zoom-in-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-zoom-in.png | 1 - .../GtkStock/24x24/stock/gtk-zoom-out-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/gtk-zoom-out.png | 1 - .../GtkStock/24x24/stock/harddrive-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/harddrive.png | 1 - .../GtkStock/24x24/stock/hdd_unmount-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/hdd_unmount.png | 1 - .../GtkStock/24x24/stock/help-about-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/help-about.png | Bin 982 -> 0 bytes .../24x24/stock/help-contents-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/help-contents.png | Bin 1728 -> 0 bytes .../icons/GtkStock/24x24/stock/help-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/help.png | 1 - .../24x24/stock/image-missing-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/image-missing.png | Bin 894 -> 0 bytes .../icons/GtkStock/24x24/stock/info-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/info.png | 1 - .../24x24/stock/inode-directory-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/inode-directory.png | 1 - .../GtkStock/24x24/stock/kfm_home-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/kfm_home.png | 1 - .../GtkStock/24x24/stock/leftjust-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/leftjust.png | 1 - .../GtkStock/24x24/stock/list-add-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/list-add.png | Bin 571 -> 0 bytes .../GtkStock/24x24/stock/list-remove-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/list-remove.png | Bin 369 -> 0 bytes .../GtkStock/24x24/stock/media-cdrom-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/media-cdrom.png | 1 - .../GtkStock/24x24/stock/media-floppy-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/media-floppy.png | Bin 951 -> 0 bytes .../24x24/stock/media-optical-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/media-optical.png | Bin 1372 -> 0 bytes .../24x24/stock/media-playback-pause-symbolic.png | 1 - .../GtkStock/24x24/stock/media-playback-pause.png | Bin 383 -> 0 bytes .../stock/media-playback-start-ltr-symbolic.png | 1 - .../24x24/stock/media-playback-start-ltr.png | Bin 863 -> 0 bytes .../stock/media-playback-start-rtl-symbolic.png | 1 - .../24x24/stock/media-playback-start-rtl.png | Bin 895 -> 0 bytes .../24x24/stock/media-playback-stop-symbolic.png | 1 - .../GtkStock/24x24/stock/media-playback-stop.png | Bin 400 -> 0 bytes .../GtkStock/24x24/stock/media-record-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/media-record.png | Bin 1063 -> 0 bytes .../stock/media-seek-backward-ltr-symbolic.png | 1 - .../24x24/stock/media-seek-backward-ltr.png | Bin 902 -> 0 bytes .../stock/media-seek-backward-rtl-symbolic.png | 1 - .../24x24/stock/media-seek-backward-rtl.png | Bin 776 -> 0 bytes .../stock/media-seek-forward-ltr-symbolic.png | 1 - .../24x24/stock/media-seek-forward-ltr.png | Bin 776 -> 0 bytes .../stock/media-seek-forward-rtl-symbolic.png | 1 - .../24x24/stock/media-seek-forward-rtl.png | Bin 902 -> 0 bytes .../stock/media-skip-backward-ltr-symbolic.png | 1 - .../24x24/stock/media-skip-backward-ltr.png | Bin 806 -> 0 bytes .../stock/media-skip-backward-rtl-symbolic.png | 1 - .../24x24/stock/media-skip-backward-rtl.png | Bin 848 -> 0 bytes .../stock/media-skip-forward-ltr-symbolic.png | 1 - .../24x24/stock/media-skip-forward-ltr.png | Bin 848 -> 0 bytes .../stock/media-skip-forward-rtl-symbolic.png | 1 - .../24x24/stock/media-skip-forward-rtl.png | Bin 806 -> 0 bytes .../24x24/stock/messagebox_info-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/messagebox_info.png | 1 - .../GtkStock/24x24/stock/mime_ascii-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/mime_ascii.png | 1 - .../icons/GtkStock/24x24/stock/misc-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/misc.png | 1 - .../GtkStock/24x24/stock/network-idle-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/network-idle.png | Bin 1015 -> 0 bytes .../GtkStock/24x24/stock/network-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/network.png | 1 - .../GtkStock/24x24/stock/nm-adhoc-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/nm-adhoc.png | 1 - .../24x24/stock/nm-device-wired-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/nm-device-wired.png | 1 - .../24x24/stock/nm-device-wireless-symbolic.png | 1 - .../GtkStock/24x24/stock/nm-device-wireless.png | 1 - .../24x24/stock/package_editors-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/package_editors.png | 1 - .../24x24/stock/package_settings-symbolic.png | 1 - .../GtkStock/24x24/stock/package_settings.png | 1 - .../GtkStock/24x24/stock/player_pause-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/player_pause.png | 1 - .../24x24/stock/player_record-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/player_record.png | 1 - .../GtkStock/24x24/stock/player_stop-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/player_stop.png | 1 - .../24x24/stock/preferences-system-symbolic.png | 1 - .../GtkStock/24x24/stock/preferences-system.png | 1 - .../24x24/stock/printer-error-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/printer-error.png | Bin 1130 -> 0 bytes .../GtkStock/24x24/stock/printer-info-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/printer-info.png | Bin 1154 -> 0 bytes .../24x24/stock/printer-paused-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/printer-paused.png | Bin 1096 -> 0 bytes .../24x24/stock/printer-warning-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/printer-warning.png | Bin 1099 -> 0 bytes .../GtkStock/24x24/stock/process-stop-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/process-stop.png | Bin 1043 -> 0 bytes .../GtkStock/24x24/stock/redhat-home-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/redhat-home.png | 1 - .../stock/redhat-system_settings-symbolic.png | 1 - .../24x24/stock/redhat-system_settings.png | 1 - .../icons/GtkStock/24x24/stock/redo-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/redo.png | 1 - .../icons/GtkStock/24x24/stock/reload-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/reload.png | 1 - .../GtkStock/24x24/stock/reload3-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/reload3.png | 1 - .../24x24/stock/reload_all_tabs-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/reload_all_tabs.png | 1 - .../GtkStock/24x24/stock/reload_page-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/reload_page.png | 1 - .../icons/GtkStock/24x24/stock/remove-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/remove.png | 1 - .../icons/GtkStock/24x24/stock/revert-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/revert.png | 1 - .../GtkStock/24x24/stock/rightjust-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/rightjust.png | 1 - .../GtkStock/24x24/stock/stock_about-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_about.png | 1 - .../GtkStock/24x24/stock/stock_bottom-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_bottom.png | 1 - .../GtkStock/24x24/stock/stock_close-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_close.png | 1 - .../GtkStock/24x24/stock/stock_copy-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_copy.png | 1 - .../GtkStock/24x24/stock/stock_cut-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_cut.png | 1 - .../GtkStock/24x24/stock/stock_delete-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_delete.png | 1 - .../24x24/stock/stock_dialog-info-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_dialog-info.png | 1 - .../GtkStock/24x24/stock/stock_down-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_down.png | 1 - .../24x24/stock/stock_file-properites-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_file-properites.png | 1 - .../GtkStock/24x24/stock/stock_folder-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_folder.png | 1 - .../24x24/stock/stock_fullscreen-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_fullscreen.png | 1 - .../GtkStock/24x24/stock/stock_help-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_help.png | 1 - .../GtkStock/24x24/stock/stock_home-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_home.png | 1 - .../stock/stock_leave-fullscreen-symbolic.png | 1 - .../24x24/stock/stock_leave-fullscreen.png | 1 - .../24x24/stock/stock_media-pause-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_media-pause.png | 1 - .../24x24/stock/stock_media-rec-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_media-rec.png | 1 - .../24x24/stock/stock_media-stop-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_media-stop.png | 1 - .../24x24/stock/stock_new-text-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_new-text.png | 1 - .../GtkStock/24x24/stock/stock_paste-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_paste.png | 1 - .../24x24/stock/stock_print-preview-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_print-preview.png | 1 - .../GtkStock/24x24/stock/stock_print-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_print.png | 1 - .../24x24/stock/stock_properties-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_properties.png | 1 - .../GtkStock/24x24/stock/stock_redo-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_redo.png | 1 - .../24x24/stock/stock_refresh-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_refresh.png | 1 - .../24x24/stock/stock_save-as-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_save-as.png | 1 - .../GtkStock/24x24/stock/stock_save-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_save.png | 1 - .../stock/stock_search-and-replace-symbolic.png | 1 - .../24x24/stock/stock_search-and-replace.png | 1 - .../GtkStock/24x24/stock/stock_search-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_search.png | 1 - .../24x24/stock/stock_select-all-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_select-all.png | 1 - .../24x24/stock/stock_spellcheck-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_spellcheck.png | 1 - .../GtkStock/24x24/stock/stock_stop-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_stop.png | 1 - .../stock/stock_text-strikethrough-symbolic.png | 1 - .../24x24/stock/stock_text-strikethrough.png | 1 - .../24x24/stock/stock_text_bold-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_text_bold.png | 1 - .../24x24/stock/stock_text_center-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_text_center.png | 1 - .../24x24/stock/stock_text_italic-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_text_italic.png | 1 - .../24x24/stock/stock_text_justify-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_text_justify.png | 1 - .../24x24/stock/stock_text_left-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_text_left.png | 1 - .../24x24/stock/stock_text_right-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_text_right.png | 1 - .../24x24/stock/stock_text_underlined-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_text_underlined.png | 1 - .../GtkStock/24x24/stock/stock_top-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_top.png | 1 - .../GtkStock/24x24/stock/stock_undo-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_undo.png | 1 - .../GtkStock/24x24/stock/stock_up-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_up.png | 1 - .../24x24/stock/stock_volume-0-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_volume-0.png | 1 - .../24x24/stock/stock_volume-max-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_volume-max.png | 1 - .../24x24/stock/stock_volume-med-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_volume-med.png | 1 - .../24x24/stock/stock_volume-min-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_volume-min.png | 1 - .../24x24/stock/stock_volume-mute-symbolic.png | 1 - .../GtkStock/24x24/stock/stock_volume-mute.png | 1 - .../GtkStock/24x24/stock/stock_volume-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_volume.png | 1 - .../GtkStock/24x24/stock/stock_zoom-1-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_zoom-1.png | 1 - .../24x24/stock/stock_zoom-in-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_zoom-in.png | 1 - .../24x24/stock/stock_zoom-out-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_zoom-out.png | 1 - .../24x24/stock/stock_zoom-page-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/stock_zoom-page.png | 1 - .../icons/GtkStock/24x24/stock/stop-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/stop.png | 1 - .../24x24/stock/system-floppy-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/system-floppy.png | 1 - .../GtkStock/24x24/stock/system-run-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/system-run.png | Bin 1592 -> 0 bytes .../24x24/stock/text-x-generic-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/text-x-generic.png | Bin 736 -> 0 bytes .../GtkStock/24x24/stock/text_bold-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/text_bold.png | 1 - .../GtkStock/24x24/stock/text_italic-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/text_italic.png | 1 - .../GtkStock/24x24/stock/text_strike-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/text_strike.png | 1 - .../GtkStock/24x24/stock/text_under-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/text_under.png | 1 - .../24x24/stock/tools-check-spelling-symbolic.png | 1 - .../GtkStock/24x24/stock/tools-check-spelling.png | Bin 950 -> 0 bytes .../icons/GtkStock/24x24/stock/top-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/top.png | 1 - .../icons/GtkStock/24x24/stock/txt-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/txt.png | 1 - .../icons/GtkStock/24x24/stock/txt2-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/txt2.png | 1 - .../icons/GtkStock/24x24/stock/undo-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/undo.png | 1 - .../GtkStock/24x24/stock/unknown-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/unknown.png | 1 - .../icons/GtkStock/24x24/stock/up-symbolic.png | 1 - .../Resources/icons/GtkStock/24x24/stock/up.png | 1 - .../GtkStock/24x24/stock/user-desktop-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/user-desktop.png | Bin 662 -> 0 bytes .../GtkStock/24x24/stock/user-home-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/user-home.png | Bin 662 -> 0 bytes .../24x24/stock/view-fullscreen-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/view-fullscreen.png | Bin 606 -> 0 bytes .../GtkStock/24x24/stock/view-refresh-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/view-refresh.png | Bin 1466 -> 0 bytes .../GtkStock/24x24/stock/view-restore-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/view-restore.png | Bin 677 -> 0 bytes .../24x24/stock/view-sort-ascending-symbolic.png | 1 - .../GtkStock/24x24/stock/view-sort-ascending.png | Bin 413 -> 0 bytes .../24x24/stock/view-sort-descending-symbolic.png | 1 - .../GtkStock/24x24/stock/view-sort-descending.png | Bin 379 -> 0 bytes .../GtkStock/24x24/stock/viewmag+-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/viewmag+.png | 1 - .../GtkStock/24x24/stock/viewmag--symbolic.png | 1 - .../icons/GtkStock/24x24/stock/viewmag-.png | 1 - .../GtkStock/24x24/stock/viewmag1-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/viewmag1.png | 1 - .../GtkStock/24x24/stock/viewmagfit-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/viewmagfit.png | 1 - .../GtkStock/24x24/stock/window-close-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/window-close.png | Bin 1453 -> 0 bytes .../24x24/stock/window_fullscreen-symbolic.png | 1 - .../GtkStock/24x24/stock/window_fullscreen.png | 1 - .../24x24/stock/window_nofullscreen-symbolic.png | 1 - .../GtkStock/24x24/stock/window_nofullscreen.png | 1 - .../24x24/stock/xfce-system-exit-symbolic.png | 1 - .../GtkStock/24x24/stock/xfce-system-exit.png | 1 - .../24x24/stock/xfce-system-settings-symbolic.png | 1 - .../GtkStock/24x24/stock/xfce-system-settings.png | 1 - .../GtkStock/24x24/stock/yast_HD-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/yast_HD.png | 1 - .../GtkStock/24x24/stock/yast_idetude-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/yast_idetude.png | 1 - .../24x24/stock/zoom-best-fit-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/zoom-best-fit.png | 1 - .../24x24/stock/zoom-fit-best-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/zoom-fit-best.png | Bin 937 -> 0 bytes .../GtkStock/24x24/stock/zoom-in-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/zoom-in.png | Bin 993 -> 0 bytes .../24x24/stock/zoom-original-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/zoom-original.png | Bin 962 -> 0 bytes .../GtkStock/24x24/stock/zoom-out-symbolic.png | 1 - .../icons/GtkStock/24x24/stock/zoom-out.png | Bin 941 -> 0 bytes .../32x32/stock/gtk-dnd-multiple-symbolic.png | 1 - .../GtkStock/32x32/stock/gtk-dnd-multiple.png | Bin 1215 -> 0 bytes .../GtkStock/32x32/stock/gtk-dnd-symbolic.png | 1 - .../icons/GtkStock/32x32/stock/gtk-dnd.png | Bin 1349 -> 0 bytes .../GtkStock/48x48/stock/dialog-error-symbolic.png | 1 - .../icons/GtkStock/48x48/stock/dialog-error.png | Bin 2828 -> 0 bytes .../48x48/stock/dialog-information-symbolic.png | 1 - .../GtkStock/48x48/stock/dialog-information.png | Bin 3259 -> 0 bytes .../48x48/stock/dialog-password-symbolic.png | 1 - .../icons/GtkStock/48x48/stock/dialog-password.png | Bin 2358 -> 0 bytes .../48x48/stock/dialog-question-symbolic.png | 1 - .../icons/GtkStock/48x48/stock/dialog-question.png | Bin 2809 -> 0 bytes .../48x48/stock/dialog-warning-symbolic.png | 1 - .../icons/GtkStock/48x48/stock/dialog-warning.png | Bin 2358 -> 0 bytes .../icons/GtkStock/48x48/stock/error-symbolic.png | 1 - .../Resources/icons/GtkStock/48x48/stock/error.png | 1 - .../stock/gtk-dialog-authentication-symbolic.png | 1 - .../48x48/stock/gtk-dialog-authentication.png | 1 - .../48x48/stock/gtk-dialog-error-symbolic.png | 1 - .../GtkStock/48x48/stock/gtk-dialog-error.png | 1 - .../48x48/stock/gtk-dialog-info-symbolic.png | 1 - .../icons/GtkStock/48x48/stock/gtk-dialog-info.png | 1 - .../48x48/stock/gtk-dialog-question-symbolic.png | 1 - .../GtkStock/48x48/stock/gtk-dialog-question.png | 1 - .../48x48/stock/gtk-dialog-warning-symbolic.png | 1 - .../GtkStock/48x48/stock/gtk-dialog-warning.png | 1 - .../GtkStock/48x48/stock/important-symbolic.png | 1 - .../icons/GtkStock/48x48/stock/important.png | 1 - .../icons/GtkStock/48x48/stock/info-symbolic.png | 1 - .../Resources/icons/GtkStock/48x48/stock/info.png | 1 - .../48x48/stock/messagebox_critical-symbolic.png | 1 - .../GtkStock/48x48/stock/messagebox_critical.png | 1 - .../48x48/stock/messagebox_info-symbolic.png | 1 - .../icons/GtkStock/48x48/stock/messagebox_info.png | 1 - .../48x48/stock/messagebox_warning-symbolic.png | 1 - .../GtkStock/48x48/stock/messagebox_warning.png | 1 - .../48x48/stock/stock_dialog-error-symbolic.png | 1 - .../GtkStock/48x48/stock/stock_dialog-error.png | 1 - .../48x48/stock/stock_dialog-info-symbolic.png | 1 - .../GtkStock/48x48/stock/stock_dialog-info.png | 1 - .../48x48/stock/stock_dialog-question-symbolic.png | 1 - .../GtkStock/48x48/stock/stock_dialog-question.png | 1 - .../48x48/stock/stock_dialog-warning-symbolic.png | 1 - .../GtkStock/48x48/stock/stock_dialog-warning.png | 1 - .../Resources/icons/GtkStock/icon-theme.cache | Bin 38464 -> 0 bytes .../macosx/Resources/icons/GtkStock/index.theme | 34 ----- packaging/macosx/create-stock-icon-theme.sh | 165 +++++++++++++++++++++ packaging/macosx/osx-app.sh | 12 +- 1641 files changed, 177 insertions(+), 1185 deletions(-) create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png create mode 100644 packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png delete mode 100644 packaging/macosx/Resources/icons/.DS_Store delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/add-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/add.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/down-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/down.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/find-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/find.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/help.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/network.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/top-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/top.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/up-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/up.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag--symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag-.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/add-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/add.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/down-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/down.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/find-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/find.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/help.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/network.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/top-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/top.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/up-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/up.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag--symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag-.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning-symbolic.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/error-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/error.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/important-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/important.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning-symbolic.png delete mode 120000 packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning.png delete mode 100644 packaging/macosx/Resources/icons/GtkStock/icon-theme.cache delete mode 100644 packaging/macosx/Resources/icons/GtkStock/index.theme create mode 100755 packaging/macosx/create-stock-icon-theme.sh diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png new file mode 100644 index 000000000..d070809f1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png new file mode 100644 index 000000000..df87def2f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png new file mode 100644 index 000000000..7cd94435a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png new file mode 100644 index 000000000..61543990d Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png new file mode 100644 index 000000000..476185370 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png new file mode 100644 index 000000000..45b44f324 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png new file mode 100644 index 000000000..5997b9222 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png new file mode 100644 index 000000000..65d22e4fb Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png new file mode 100644 index 000000000..026014ca3 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png new file mode 100644 index 000000000..aaea1ff39 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png new file mode 100644 index 000000000..3409adc7a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png new file mode 100644 index 000000000..18b7d2419 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png new file mode 100644 index 000000000..b714d86e2 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png new file mode 100644 index 000000000..49ae8db9c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png new file mode 100644 index 000000000..8dd48c494 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png new file mode 100644 index 000000000..ff87558fc Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png new file mode 100644 index 000000000..2c5a46733 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png new file mode 100644 index 000000000..fca34f52a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png new file mode 100644 index 000000000..e9a40950b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png new file mode 100644 index 000000000..24588a3a4 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png new file mode 100644 index 000000000..f7923083b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png new file mode 100644 index 000000000..7c6c250b6 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png new file mode 100644 index 000000000..e3bd4ba72 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png new file mode 100644 index 000000000..b0c8a48d7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png new file mode 100644 index 000000000..13e061e09 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png new file mode 100644 index 000000000..14ed14a12 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png new file mode 100644 index 000000000..14ed14a12 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png new file mode 100644 index 000000000..776f5767e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png new file mode 100644 index 000000000..18ededbfc Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png new file mode 100644 index 000000000..b00e21840 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png new file mode 100644 index 000000000..015c495ef Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png new file mode 100644 index 000000000..57d6a0e35 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png new file mode 100644 index 000000000..a416b25ab Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png new file mode 100644 index 000000000..9a7abf7ff Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png new file mode 100644 index 000000000..15b507332 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png new file mode 100644 index 000000000..7e2c5dba9 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png new file mode 100644 index 000000000..867df5ded Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png new file mode 100644 index 000000000..8a844a3a9 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png new file mode 100644 index 000000000..35bcc8127 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png new file mode 100644 index 000000000..69aaafc2c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png new file mode 100644 index 000000000..dcde30f02 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png new file mode 100644 index 000000000..689ba0a96 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png new file mode 100644 index 000000000..a653e10ed Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png new file mode 100644 index 000000000..fadd43dc3 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png new file mode 100644 index 000000000..0f0f57a1a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png new file mode 100644 index 000000000..0f03be58d Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png new file mode 100644 index 000000000..a653e10ed Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png new file mode 100644 index 000000000..689ba0a96 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png new file mode 100644 index 000000000..5b9e3f0d1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png new file mode 100644 index 000000000..9e77ac2ea Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png new file mode 100644 index 000000000..9e77ac2ea Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png new file mode 100644 index 000000000..5b9e3f0d1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png new file mode 100644 index 000000000..0a3b1bfba Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png new file mode 100644 index 000000000..432225f51 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png new file mode 100644 index 000000000..0dfa41876 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png new file mode 100644 index 000000000..24233cde0 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png new file mode 100644 index 000000000..097969a7c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png new file mode 100644 index 000000000..e4d912579 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png new file mode 100644 index 000000000..3dece1068 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png new file mode 100644 index 000000000..c5da3f9fb Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png new file mode 100644 index 000000000..2514b6167 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png new file mode 100644 index 000000000..0967a61c3 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png new file mode 100644 index 000000000..748bb502d Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png new file mode 100644 index 000000000..94f078d91 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png new file mode 100644 index 000000000..2a732a6ee Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png new file mode 100644 index 000000000..c79cea355 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png new file mode 100644 index 000000000..61b46d998 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png new file mode 100644 index 000000000..9703a40df Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png new file mode 100644 index 000000000..2c764b374 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png new file mode 100644 index 000000000..2514b6167 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png new file mode 100644 index 000000000..cc58d0fb5 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png new file mode 100644 index 000000000..a312dd854 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png new file mode 100644 index 000000000..010d294a7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png new file mode 100644 index 000000000..20ae955c3 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png new file mode 100644 index 000000000..84b26afd6 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png new file mode 100644 index 000000000..9cd9e5cf2 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png new file mode 100644 index 000000000..0ed9c2210 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png new file mode 100644 index 000000000..18b7d2419 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png new file mode 100644 index 000000000..922f452f1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png new file mode 100644 index 000000000..8b70f471a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png new file mode 100644 index 000000000..e7e2584db Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png new file mode 100644 index 000000000..e3cb29165 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png new file mode 100644 index 000000000..c844e8322 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png new file mode 100644 index 000000000..93b2ec100 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png new file mode 100644 index 000000000..4972cb7ba Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png new file mode 100644 index 000000000..a02022474 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png new file mode 100644 index 000000000..a02022474 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png new file mode 100644 index 000000000..4972cb7ba Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png new file mode 100644 index 000000000..67dbb2e16 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png new file mode 100644 index 000000000..08ad0b69a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png new file mode 100644 index 000000000..08ad0b69a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png new file mode 100644 index 000000000..67dbb2e16 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png new file mode 100644 index 000000000..e74e060ea Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png new file mode 100644 index 000000000..934ee68d3 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png new file mode 100644 index 000000000..8e2ab7487 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png new file mode 100644 index 000000000..ebd5ac60c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png new file mode 100644 index 000000000..52410c38d Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png new file mode 100644 index 000000000..d88fed703 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png new file mode 100644 index 000000000..c9c48d6a3 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png new file mode 100644 index 000000000..7cd94435a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png new file mode 100644 index 000000000..32dcc2e63 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png new file mode 100644 index 000000000..14ed14a12 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png new file mode 100644 index 000000000..14ed14a12 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png new file mode 100644 index 000000000..b9e9ea632 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png new file mode 100644 index 000000000..e9ea8c4e5 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png new file mode 100644 index 000000000..49966a996 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png new file mode 100644 index 000000000..3f8fd257f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png new file mode 100644 index 000000000..a8aa70584 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png new file mode 100644 index 000000000..52f58630f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png new file mode 100644 index 000000000..adbf7f3a2 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png new file mode 100644 index 000000000..6b1b94336 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png new file mode 100644 index 000000000..92dddd2ea Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png new file mode 100644 index 000000000..ddc1eb136 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png new file mode 100644 index 000000000..afca0732a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png new file mode 100644 index 000000000..0a395c099 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png new file mode 100644 index 000000000..2a7da6e2a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png new file mode 100644 index 000000000..c08115f62 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png new file mode 100644 index 000000000..e56236638 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png new file mode 100644 index 000000000..a13d1984b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png new file mode 100644 index 000000000..0c9de64ba Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png new file mode 100644 index 000000000..7de1e0e4f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png new file mode 100644 index 000000000..4152b6c9f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png new file mode 100644 index 000000000..8d899cfa5 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png new file mode 100644 index 000000000..6902efdc6 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png new file mode 100644 index 000000000..b66871a94 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png new file mode 100644 index 000000000..c89e797b7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png new file mode 100644 index 000000000..5edf531e3 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png new file mode 100644 index 000000000..312e1187f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png new file mode 100644 index 000000000..7f405de58 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png new file mode 100644 index 000000000..05d22d7a8 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png new file mode 100644 index 000000000..297c86b0c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png new file mode 100644 index 000000000..3046794e7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png new file mode 100644 index 000000000..46435e1a0 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png new file mode 100644 index 000000000..5da8a02dc Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png new file mode 100644 index 000000000..7ef7685f4 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png new file mode 100644 index 000000000..1be6b6c88 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png new file mode 100644 index 000000000..590f673db Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png new file mode 100644 index 000000000..a1178e64f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png new file mode 100644 index 000000000..82b105f80 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png new file mode 100644 index 000000000..e375b894e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png new file mode 100644 index 000000000..ed81e5a82 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png new file mode 100644 index 000000000..5c83fb689 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png new file mode 100644 index 000000000..e938c3e99 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png new file mode 100644 index 000000000..3da43f0c0 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png new file mode 100644 index 000000000..f2c1a50a1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png new file mode 100644 index 000000000..1fc5b8282 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png new file mode 100644 index 000000000..3b12a233a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png new file mode 100644 index 000000000..3ba7d6240 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png new file mode 100644 index 000000000..28b68f338 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png new file mode 100644 index 000000000..28b68f338 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png new file mode 100644 index 000000000..36d231434 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png new file mode 100644 index 000000000..a6f7dc19b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png new file mode 100644 index 000000000..7e3656dc4 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png new file mode 100644 index 000000000..5527663fd Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png new file mode 100644 index 000000000..35579d553 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png new file mode 100644 index 000000000..eaf9a460b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png new file mode 100644 index 000000000..07db84109 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png new file mode 100644 index 000000000..9bbd47ca0 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png new file mode 100644 index 000000000..9869fb8b1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png new file mode 100644 index 000000000..8842b5aa7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png new file mode 100644 index 000000000..04d464e28 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png new file mode 100644 index 000000000..be0906d8a Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png new file mode 100644 index 000000000..79994416e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png new file mode 100644 index 000000000..2a0a8ea2c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png new file mode 100644 index 000000000..e44f9b612 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png new file mode 100644 index 000000000..3ba5c4ba7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png new file mode 100644 index 000000000..a2e0b3c96 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png new file mode 100644 index 000000000..9b639939f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png new file mode 100644 index 000000000..80068face Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png new file mode 100644 index 000000000..3ba5c4ba7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png new file mode 100644 index 000000000..e44f9b612 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png new file mode 100644 index 000000000..727ff37f2 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png new file mode 100644 index 000000000..23b89b761 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png new file mode 100644 index 000000000..23b89b761 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png new file mode 100644 index 000000000..727ff37f2 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png new file mode 100644 index 000000000..9b98fd26f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png new file mode 100644 index 000000000..3df5fe511 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png new file mode 100644 index 000000000..ca76d509b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png new file mode 100644 index 000000000..fd97f343c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png new file mode 100644 index 000000000..97f2143fb Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png new file mode 100644 index 000000000..da8194fa8 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png new file mode 100644 index 000000000..883a003bc Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png new file mode 100644 index 000000000..f429e1015 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png new file mode 100644 index 000000000..cde0e8698 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png new file mode 100644 index 000000000..9ddbe9b8e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png new file mode 100644 index 000000000..fcf7f2a49 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png new file mode 100644 index 000000000..cb7b760bc Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png new file mode 100644 index 000000000..69ade2524 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png new file mode 100644 index 000000000..c309a6d82 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png new file mode 100644 index 000000000..9acf0d5ff Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png new file mode 100644 index 000000000..2596f3cc5 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png new file mode 100644 index 000000000..0e71c35d7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png new file mode 100644 index 000000000..cde0e8698 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png new file mode 100644 index 000000000..bccc39e7c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png new file mode 100644 index 000000000..22023b853 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png new file mode 100644 index 000000000..063d0df43 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png new file mode 100644 index 000000000..b00fbd8c1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png new file mode 100644 index 000000000..90e26e5bc Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png new file mode 100644 index 000000000..2f8b70d9c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png new file mode 100644 index 000000000..0bd69c92c Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png new file mode 100644 index 000000000..7ef7685f4 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png new file mode 100644 index 000000000..c4358f5f8 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png new file mode 100644 index 000000000..6187ba6d2 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png new file mode 100644 index 000000000..0f5348900 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png new file mode 100644 index 000000000..036f05f55 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png new file mode 100644 index 000000000..9e54ef3f5 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png new file mode 100644 index 000000000..d1b25c2f1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png new file mode 100644 index 000000000..508808285 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png new file mode 100644 index 000000000..4a1bdf89b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png new file mode 100644 index 000000000..4a1bdf89b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png new file mode 100644 index 000000000..508808285 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png new file mode 100644 index 000000000..c3a649f4e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png new file mode 100644 index 000000000..3da34257d Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png new file mode 100644 index 000000000..3da34257d Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png new file mode 100644 index 000000000..c3a649f4e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png new file mode 100644 index 000000000..a6f14418b Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png new file mode 100644 index 000000000..28517473d Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png new file mode 100644 index 000000000..13304368e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png new file mode 100644 index 000000000..da6df48a9 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png new file mode 100644 index 000000000..dd70e0be9 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png new file mode 100644 index 000000000..54e1cb3e9 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png new file mode 100644 index 000000000..2b11b5075 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png new file mode 100644 index 000000000..c89e797b7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png new file mode 100644 index 000000000..2574c181f Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png new file mode 100644 index 000000000..28b68f338 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png new file mode 100644 index 000000000..28b68f338 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png new file mode 100644 index 000000000..21462fe0e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png new file mode 100644 index 000000000..09b5df1d1 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png new file mode 100644 index 000000000..ff9c2289d Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png new file mode 100644 index 000000000..44c871133 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png new file mode 100644 index 000000000..d498a59a5 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png new file mode 100644 index 000000000..312b84dae Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png new file mode 100644 index 000000000..dfbdf9b6e Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png new file mode 100644 index 000000000..3a386fae7 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png new file mode 100644 index 000000000..499cbd6c6 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png new file mode 100644 index 000000000..22afd1951 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png new file mode 100644 index 000000000..dc09283f4 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png new file mode 100644 index 000000000..c58e5a6f4 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png new file mode 100644 index 000000000..cb03e5420 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png new file mode 100644 index 000000000..d73990ecc Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png new file mode 100644 index 000000000..f81198437 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png new file mode 100644 index 000000000..14dbd9cac Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png differ diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png new file mode 100644 index 000000000..827a33918 Binary files /dev/null and b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png differ diff --git a/packaging/macosx/Resources/etc/gtk-2.0/gtkrc b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc index b55f67c65..5babb9b17 100644 --- a/packaging/macosx/Resources/etc/gtk-2.0/gtkrc +++ b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc @@ -2,7 +2,7 @@ # gtkrc file for Inkscape.app (X11) # -gtk-theme-name = "Adwaita-osxapp" +gtk-theme-name = "Adwaita" gtk-font-name = "Lucida Grande 9" gtk-icon-theme-name = "GtkStock" diff --git a/packaging/macosx/Resources/icons/.DS_Store b/packaging/macosx/Resources/icons/.DS_Store deleted file mode 100644 index fa2ecbea7..000000000 Binary files a/packaging/macosx/Resources/icons/.DS_Store and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount-symbolic.png deleted file mode 120000 index 198cfb326..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -3floppy_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/3floppy_unmount.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add-symbolic.png deleted file mode 120000 index f26caeafb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add.png deleted file mode 120000 index 7d4c8781d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/add.png +++ /dev/null @@ -1 +0,0 @@ -list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit-symbolic.png deleted file mode 120000 index 0ecb0b9ba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit.png deleted file mode 100644 index d070809f1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/application-exit.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii-symbolic.png deleted file mode 120000 index 306ee6a20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -ascii.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/ascii.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom-symbolic.png deleted file mode 120000 index faf41843c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom.png deleted file mode 120000 index c58ca3d0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/bottom.png +++ /dev/null @@ -1 +0,0 @@ -go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount-symbolic.png deleted file mode 120000 index 675a3d8d5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -cdrom_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdrom_unmount.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount-symbolic.png deleted file mode 120000 index 69e9cb48e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -cdwriter_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/cdwriter_unmount.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust-symbolic.png deleted file mode 120000 index 337ad727a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -centrejust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust.png deleted file mode 120000 index 980c099ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/centrejust.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established-symbolic.png deleted file mode 120000 index 5beb19d41..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -connect_established.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/connect_established.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop-symbolic.png deleted file mode 120000 index 3c4032691..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop.png deleted file mode 120000 index 200ab00ab..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/desktop.png +++ /dev/null @@ -1 +0,0 @@ -user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information-symbolic.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information.png deleted file mode 100644 index df87def2f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dialog-information.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new-symbolic.png deleted file mode 120000 index 446977ddc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new.png deleted file mode 100644 index 7cd94435a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-new.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent-symbolic.png deleted file mode 120000 index f10003637..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-open-recent.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent.png deleted file mode 100644 index 61543990d..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-recent.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-symbolic.png deleted file mode 120000 index f58170cc1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open.png deleted file mode 100644 index 476185370..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-open.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview-symbolic.png deleted file mode 120000 index 9dfea717c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview.png deleted file mode 100644 index 45b44f324..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-preview.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-symbolic.png deleted file mode 120000 index 863a49fc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print.png deleted file mode 100644 index 5997b9222..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-print.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties-symbolic.png deleted file mode 120000 index b447aa240..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties.png deleted file mode 100644 index 65d22e4fb..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-properties.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr-symbolic.png deleted file mode 120000 index ac1bd52d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-revert-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr.png deleted file mode 100644 index 026014ca3..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl-symbolic.png deleted file mode 120000 index f56254a08..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-revert-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl.png deleted file mode 100644 index aaea1ff39..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-symbolic.png deleted file mode 120000 index 35c2c00a5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert.png deleted file mode 120000 index ac1bd52d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-revert.png +++ /dev/null @@ -1 +0,0 @@ -document-revert-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as-symbolic.png deleted file mode 120000 index 6f8088857..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as.png deleted file mode 100644 index 3409adc7a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-as.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-symbolic.png deleted file mode 120000 index b1240e18d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save.png deleted file mode 100644 index 18b7d2419..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/document-save.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down-symbolic.png deleted file mode 120000 index 0bef6f6e8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down.png deleted file mode 120000 index 5240b846d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/down.png +++ /dev/null @@ -1 +0,0 @@ -go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk-symbolic.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk.png deleted file mode 100644 index b714d86e2..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/drive-harddisk.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount-symbolic.png deleted file mode 120000 index 041480d09..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dvd_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/dvd_unmount.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear-symbolic.png deleted file mode 120000 index f230219f3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear.png deleted file mode 100644 index 49ae8db9c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-clear.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy-symbolic.png deleted file mode 120000 index e106cb543..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy.png deleted file mode 100644 index 8dd48c494..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-copy.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut-symbolic.png deleted file mode 120000 index 32b03023c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut.png deleted file mode 100644 index ff87558fc..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-cut.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete-symbolic.png deleted file mode 120000 index bb0a74a58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete.png deleted file mode 100644 index 2c5a46733..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-delete.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace-symbolic.png deleted file mode 120000 index e4057afed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace.png deleted file mode 100644 index fca34f52a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-replace.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-symbolic.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find.png deleted file mode 100644 index e9a40950b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-find.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste-symbolic.png deleted file mode 120000 index 2f55649f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste.png deleted file mode 100644 index 24588a3a4..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-paste.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr-symbolic.png deleted file mode 120000 index 687ee4f05..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr.png deleted file mode 100644 index f7923083b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl-symbolic.png deleted file mode 120000 index 0f38059a6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl.png deleted file mode 100644 index 7c6c250b6..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-symbolic.png deleted file mode 120000 index 0061b57c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo.png deleted file mode 120000 index 687ee4f05..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-redo.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all-symbolic.png deleted file mode 120000 index 30033c765..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all.png deleted file mode 100644 index e3bd4ba72..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-select-all.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr-symbolic.png deleted file mode 120000 index 3043c4fa7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr.png deleted file mode 100644 index b0c8a48d7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl-symbolic.png deleted file mode 120000 index 4020ce799..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl.png deleted file mode 100644 index 13e061e09..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-symbolic.png deleted file mode 120000 index 62d2a953e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo.png deleted file mode 120000 index 3043c4fa7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/edit-undo.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear-symbolic.png deleted file mode 120000 index 29ba74e20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editclear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear.png deleted file mode 120000 index f230219f3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editclear.png +++ /dev/null @@ -1 +0,0 @@ -edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy-symbolic.png deleted file mode 120000 index 6a91dbe20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editcopy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy.png deleted file mode 120000 index e106cb543..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcopy.png +++ /dev/null @@ -1 +0,0 @@ -edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut-symbolic.png deleted file mode 120000 index 778447500..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editcut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut.png deleted file mode 120000 index 32b03023c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editcut.png +++ /dev/null @@ -1 +0,0 @@ -edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete-symbolic.png deleted file mode 120000 index a94cb85d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editdelete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete.png deleted file mode 120000 index bb0a74a58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editdelete.png +++ /dev/null @@ -1 +0,0 @@ -edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste-symbolic.png deleted file mode 120000 index 3c44aa574..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editpaste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste.png deleted file mode 120000 index 2f55649f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/editpaste.png +++ /dev/null @@ -1 +0,0 @@ -edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty-symbolic.png deleted file mode 120000 index 1350bab17..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -empty.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/empty.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit-symbolic.png deleted file mode 120000 index 4eb2fd526..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit.png deleted file mode 120000 index 0ecb0b9ba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/exit.png +++ /dev/null @@ -1 +0,0 @@ -application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind-symbolic.png deleted file mode 120000 index af3ede396..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filefind.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filefind.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew-symbolic.png deleted file mode 120000 index c52f9eaf8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filenew.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew.png deleted file mode 120000 index 446977ddc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filenew.png +++ /dev/null @@ -1 +0,0 @@ -document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen-symbolic.png deleted file mode 120000 index 99c3ecd92..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -fileopen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen.png deleted file mode 120000 index f58170cc1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileopen.png +++ /dev/null @@ -1 +0,0 @@ -document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint-symbolic.png deleted file mode 120000 index b7c96eb8a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -fileprint.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint.png deleted file mode 120000 index 863a49fc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/fileprint.png +++ /dev/null @@ -1 +0,0 @@ -document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint-symbolic.png deleted file mode 120000 index 03fba13fe..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filequickprint.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint.png deleted file mode 120000 index 9dfea717c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filequickprint.png +++ /dev/null @@ -1 +0,0 @@ -document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave-symbolic.png deleted file mode 120000 index 287a9600a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filesave.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave.png deleted file mode 120000 index b1240e18d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesave.png +++ /dev/null @@ -1 +0,0 @@ -document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas-symbolic.png deleted file mode 120000 index 805ae83a2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filesaveas.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas.png deleted file mode 120000 index 6f8088857..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/filesaveas.png +++ /dev/null @@ -1 +0,0 @@ -document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find-symbolic.png deleted file mode 120000 index 2e3266774..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/find.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote-symbolic.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote.png deleted file mode 100644 index 14ed14a12..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-remote.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-symbolic.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder.png deleted file mode 100644 index 14ed14a12..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home-symbolic.png deleted file mode 120000 index 137e7d5ed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -folder_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home.png deleted file mode 120000 index 8c668dc1c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/folder_home.png +++ /dev/null @@ -1 +0,0 @@ -user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr-symbolic.png deleted file mode 120000 index a33b3ffac..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-indent-less-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr.png deleted file mode 100644 index 776f5767e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl-symbolic.png deleted file mode 120000 index d5c1b473d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-indent-less-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl.png deleted file mode 100644 index 18ededbfc..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-less-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr-symbolic.png deleted file mode 120000 index 5c9aeec8b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-indent-more-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr.png deleted file mode 100644 index b00e21840..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl-symbolic.png deleted file mode 120000 index e0ee3f7d7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-indent-more-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl.png deleted file mode 100644 index 015c495ef..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-indent-more-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center-symbolic.png deleted file mode 120000 index 980c099ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center.png deleted file mode 100644 index 57d6a0e35..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-center.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill-symbolic.png deleted file mode 120000 index f1d9574cf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill.png deleted file mode 100644 index a416b25ab..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-fill.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left-symbolic.png deleted file mode 120000 index 2da25a167..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left.png deleted file mode 100644 index 9a7abf7ff..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-left.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right-symbolic.png deleted file mode 120000 index 017868ada..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right.png deleted file mode 100644 index 15b507332..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-justify-right.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold-symbolic.png deleted file mode 120000 index ef50053bd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold.png deleted file mode 100644 index 7e2c5dba9..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-bold.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic-symbolic.png deleted file mode 120000 index 1ee2a31f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic.png deleted file mode 100644 index 867df5ded..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-italic.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough-symbolic.png deleted file mode 120000 index 9ff9a3776..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough.png deleted file mode 100644 index 8a844a3a9..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-strikethrough.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline-symbolic.png deleted file mode 120000 index 4f5b1549c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline.png deleted file mode 100644 index 35bcc8127..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/format-text-underline.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio-symbolic.png deleted file mode 120000 index cce40e357..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-cdrom-audio.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-cdrom-audio.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr-symbolic.png deleted file mode 120000 index fc19d096d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-cdr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdr.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw-symbolic.png deleted file mode 120000 index 3254f0b9a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-cdrw.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-cdrw.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus-symbolic.png deleted file mode 120000 index 0babfc593..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdr-plus.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-plus.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-symbolic.png deleted file mode 120000 index e5acfa688..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdr.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram-symbolic.png deleted file mode 120000 index 3d65c827f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdram.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdram.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom-symbolic.png deleted file mode 120000 index 096e10ac3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrom.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw-symbolic.png deleted file mode 120000 index 6f333e959..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdrw.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-disc-dvdrw.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy-symbolic.png deleted file mode 120000 index ca93a31ac..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-floppy.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394-symbolic.png deleted file mode 120000 index 709dd9407..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-harddisk-1394.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-1394.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-symbolic.png deleted file mode 120000 index 15fcbea7a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb-symbolic.png deleted file mode 120000 index 00cd3cdf1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-harddisk-usb.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk-usb.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-dev-harddisk.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop-symbolic.png deleted file mode 120000 index 1de17f537..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop.png deleted file mode 120000 index 200ab00ab..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-desktop.png +++ /dev/null @@ -1 +0,0 @@ -user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory-symbolic.png deleted file mode 120000 index d9bddcf2b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-directory.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png deleted file mode 120000 index a941c98ed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-ftp.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ftp.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home-symbolic.png deleted file mode 120000 index 42a0ae6a3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home.png deleted file mode 120000 index 8c668dc1c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-home.png +++ /dev/null @@ -1 +0,0 @@ -user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png deleted file mode 120000 index b433450d1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-nfs.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-nfs.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share-symbolic.png deleted file mode 120000 index d9a60f49d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-share.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-share.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb-symbolic.png deleted file mode 120000 index 4f3d4e258..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-smb.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-smb.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png deleted file mode 120000 index 51ce27214..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-ssh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-fs-ssh.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text-symbolic.png deleted file mode 120000 index 2d6a92f63..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-mime-text.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-text.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share-symbolic.png deleted file mode 120000 index 146decd75..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-mime-x-directory-smb-share.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-mime-x-directory-smb-share.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle-symbolic.png deleted file mode 120000 index a24805021..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-netstatus-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-netstatus-idle.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run-symbolic.png deleted file mode 120000 index 729e469c4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run.png deleted file mode 120000 index 9daf3feba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gnome-run.png +++ /dev/null @@ -1 +0,0 @@ -system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom-symbolic.png deleted file mode 120000 index c58ca3d0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom.png deleted file mode 100644 index 69aaafc2c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-bottom.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down-symbolic.png deleted file mode 120000 index 5240b846d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down.png deleted file mode 100644 index dcde30f02..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-down.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr-symbolic.png deleted file mode 120000 index cd10b29f9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-first-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr.png deleted file mode 100644 index 689ba0a96..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl-symbolic.png deleted file mode 120000 index c27895ff9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-first-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl.png deleted file mode 100644 index a653e10ed..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-first-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home-symbolic.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home.png deleted file mode 100644 index fadd43dc3..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-home.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr-symbolic.png deleted file mode 120000 index 1e84cdb4b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-jump-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr.png deleted file mode 100644 index 0f0f57a1a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl-symbolic.png deleted file mode 120000 index da4dbb50a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-jump-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl.png deleted file mode 100644 index 0f03be58d..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-jump-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr-symbolic.png deleted file mode 120000 index e9a0b1bfb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-last-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr.png deleted file mode 100644 index a653e10ed..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl-symbolic.png deleted file mode 120000 index d10cbddc0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-last-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl.png deleted file mode 100644 index 689ba0a96..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-last-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr-symbolic.png deleted file mode 120000 index ba611e6ec..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-next-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr.png deleted file mode 100644 index 5b9e3f0d1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl-symbolic.png deleted file mode 120000 index 5d7e220ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-next-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl.png deleted file mode 100644 index 9e77ac2ea..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-next-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr-symbolic.png deleted file mode 120000 index e28ad36ea..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-previous-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr.png deleted file mode 100644 index 9e77ac2ea..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl-symbolic.png deleted file mode 120000 index 4b0816229..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-previous-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl.png deleted file mode 100644 index 5b9e3f0d1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-previous-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top-symbolic.png deleted file mode 120000 index 3b5b7d6e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top.png deleted file mode 100644 index 0a3b1bfba..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-top.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up-symbolic.png deleted file mode 120000 index 4a1025d4a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up.png deleted file mode 100644 index 432225f51..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/go-up.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome-symbolic.png deleted file mode 120000 index f31e7772d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gohome.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gohome.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about-symbolic.png deleted file mode 120000 index 474a4323d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about.png deleted file mode 120000 index dd431b5e8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-about.png +++ /dev/null @@ -1 +0,0 @@ -help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add-symbolic.png deleted file mode 120000 index 4a50663ad..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add.png deleted file mode 120000 index 7d4c8781d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-add.png +++ /dev/null @@ -1 +0,0 @@ -list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold-symbolic.png deleted file mode 120000 index 8053f9c7a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold.png deleted file mode 120000 index ef50053bd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-bold.png +++ /dev/null @@ -1 +0,0 @@ -format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel-symbolic.png deleted file mode 120000 index e726007ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-cancel.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cancel.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning-symbolic.png deleted file mode 120000 index ae89400c9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-caps-lock-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning.png deleted file mode 100644 index 0dfa41876..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-caps-lock-warning.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom-symbolic.png deleted file mode 120000 index fcc64806d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-cdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cdrom.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear-symbolic.png deleted file mode 120000 index f04e3f792..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear.png deleted file mode 120000 index f230219f3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-clear.png +++ /dev/null @@ -1 +0,0 @@ -edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close-symbolic.png deleted file mode 120000 index a3ced3a8e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-close.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker-symbolic.png deleted file mode 120000 index cb3926ffb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-color-picker.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker.png deleted file mode 100644 index 24233cde0..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-color-picker.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect-symbolic.png deleted file mode 120000 index 2fc301882..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-connect.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect.png deleted file mode 100644 index 097969a7c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-connect.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert-symbolic.png deleted file mode 120000 index 7f053d572..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-convert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert.png deleted file mode 100644 index e4d912579..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-convert.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy-symbolic.png deleted file mode 120000 index 674753224..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy.png deleted file mode 120000 index e106cb543..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-copy.png +++ /dev/null @@ -1 +0,0 @@ -edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut-symbolic.png deleted file mode 120000 index f55e67fcf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut.png deleted file mode 120000 index 32b03023c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-cut.png +++ /dev/null @@ -1 +0,0 @@ -edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete-symbolic.png deleted file mode 120000 index cb17163af..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete.png deleted file mode 120000 index bb0a74a58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-delete.png +++ /dev/null @@ -1 +0,0 @@ -edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info-symbolic.png deleted file mode 120000 index 70ccbc7aa..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-dialog-info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory-symbolic.png deleted file mode 120000 index f5a4d8dad..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-directory.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect-symbolic.png deleted file mode 120000 index 911f3c46b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-disconnect.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect.png deleted file mode 100644 index 3dece1068..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-disconnect.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit-symbolic.png deleted file mode 120000 index a09517d38..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-edit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit.png deleted file mode 100644 index c5da3f9fb..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-edit.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute-symbolic.png deleted file mode 120000 index d777d5f7a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-execute.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute.png deleted file mode 120000 index 9daf3feba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-execute.png +++ /dev/null @@ -1 +0,0 @@ -system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace-symbolic.png deleted file mode 120000 index a03f9c58b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-find-and-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace.png deleted file mode 120000 index e4057afed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-and-replace.png +++ /dev/null @@ -1 +0,0 @@ -edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-symbolic.png deleted file mode 120000 index 925deda81..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-find.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy-symbolic.png deleted file mode 120000 index eb899acc8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-floppy.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font-symbolic.png deleted file mode 120000 index 191b8aecf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-font.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font.png deleted file mode 100644 index 2514b6167..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-font.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen-symbolic.png deleted file mode 120000 index 673d2e6b1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen.png deleted file mode 120000 index 37aaf877e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down-symbolic.png deleted file mode 120000 index c0f84c886..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down.png deleted file mode 120000 index 5240b846d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-down.png +++ /dev/null @@ -1 +0,0 @@ -go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up-symbolic.png deleted file mode 120000 index ee76eec61..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up.png deleted file mode 120000 index 4a1025d4a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-go-up.png +++ /dev/null @@ -1 +0,0 @@ -go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom-symbolic.png deleted file mode 120000 index 27ab77552..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-goto-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom.png deleted file mode 120000 index c58ca3d0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-bottom.png +++ /dev/null @@ -1 +0,0 @@ -go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top-symbolic.png deleted file mode 120000 index 32ee14e66..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-goto-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top.png deleted file mode 120000 index 3b5b7d6e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-goto-top.png +++ /dev/null @@ -1 +0,0 @@ -go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk-symbolic.png deleted file mode 120000 index 152e871f3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-harddisk.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help-symbolic.png deleted file mode 120000 index 796d97c74..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help.png deleted file mode 120000 index af8d871de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-help.png +++ /dev/null @@ -1 +0,0 @@ -help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home-symbolic.png deleted file mode 120000 index 0f0054316..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-home.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index-symbolic.png deleted file mode 120000 index 1635a9d2b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-index.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index.png deleted file mode 100644 index 0967a61c3..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-index.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic-symbolic.png deleted file mode 120000 index 5a22fc560..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic.png deleted file mode 120000 index 1ee2a31f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-italic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center-symbolic.png deleted file mode 120000 index 2057ae4d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center.png deleted file mode 120000 index 980c099ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-center.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill-symbolic.png deleted file mode 120000 index ad45b34dc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill.png deleted file mode 120000 index f1d9574cf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-fill.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left-symbolic.png deleted file mode 120000 index a4ee605d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left.png deleted file mode 120000 index 2da25a167..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-left.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right-symbolic.png deleted file mode 120000 index 15dddca14..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right.png deleted file mode 120000 index 017868ada..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-justify-right.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen-symbolic.png deleted file mode 120000 index bc1251b2a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-leave-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen.png deleted file mode 120000 index 5b9d8f68b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-leave-fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause-symbolic.png deleted file mode 120000 index e4880de80..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-media-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause.png deleted file mode 120000 index 0ef65d6d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-pause.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record-symbolic.png deleted file mode 120000 index 6518a86a1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record.png deleted file mode 120000 index 91f5c6f4d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-record.png +++ /dev/null @@ -1 +0,0 @@ -media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop-symbolic.png deleted file mode 120000 index b42b748dd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-media-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop.png deleted file mode 120000 index 423c7cf20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-media-stop.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image-symbolic.png deleted file mode 120000 index 16ed32178..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-missing-image.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image.png deleted file mode 120000 index 344617bac..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-missing-image.png +++ /dev/null @@ -1 +0,0 @@ -image-missing.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new-symbolic.png deleted file mode 120000 index 913a6a7d3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new.png deleted file mode 120000 index 446977ddc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-new.png +++ /dev/null @@ -1 +0,0 @@ -document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open-symbolic.png deleted file mode 120000 index 340a617d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open.png deleted file mode 120000 index f58170cc1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-open.png +++ /dev/null @@ -1 +0,0 @@ -document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape-symbolic.png deleted file mode 120000 index 95e896d4c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-orientation-landscape.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape.png deleted file mode 100644 index 748bb502d..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-landscape.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait-symbolic.png deleted file mode 120000 index 2dc258bb5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-orientation-portrait.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait.png deleted file mode 100644 index 94f078d91..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-portrait.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape-symbolic.png deleted file mode 120000 index a6f0b4411..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-orientation-reverse-landscape.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape.png deleted file mode 100644 index 2a732a6ee..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-landscape.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait-symbolic.png deleted file mode 120000 index 1c8965166..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-orientation-reverse-portrait.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait.png deleted file mode 100644 index c79cea355..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-orientation-reverse-portrait.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup-symbolic.png deleted file mode 120000 index ff4533cc1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-page-setup.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup.png deleted file mode 100644 index 61b46d998..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-page-setup.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste-symbolic.png deleted file mode 120000 index 892561ea8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste.png deleted file mode 120000 index 2f55649f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-paste.png +++ /dev/null @@ -1 +0,0 @@ -edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences-symbolic.png deleted file mode 120000 index 5acf3b2f2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-preferences.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences.png deleted file mode 100644 index 9703a40df..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-preferences.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview-symbolic.png deleted file mode 120000 index 8fe93e04e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview.png deleted file mode 120000 index 9dfea717c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-preview.png +++ /dev/null @@ -1 +0,0 @@ -document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-symbolic.png deleted file mode 120000 index 95ed2ec91..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print.png deleted file mode 120000 index 863a49fc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-print.png +++ /dev/null @@ -1 +0,0 @@ -document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties-symbolic.png deleted file mode 120000 index 5c3325bfc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties.png deleted file mode 120000 index b447aa240..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-properties.png +++ /dev/null @@ -1 +0,0 @@ -document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit-symbolic.png deleted file mode 120000 index e599db624..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-quit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit.png deleted file mode 120000 index 0ecb0b9ba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-quit.png +++ /dev/null @@ -1 +0,0 @@ -application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png deleted file mode 120000 index d006923b8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr.png deleted file mode 120000 index 0061b57c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-redo-ltr.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh-symbolic.png deleted file mode 120000 index 38cbfeb52..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-refresh.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove-symbolic.png deleted file mode 120000 index 2e165cfdc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove.png deleted file mode 120000 index 1336403b3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-remove.png +++ /dev/null @@ -1 +0,0 @@ -list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr-symbolic.png deleted file mode 120000 index 39a6d5698..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-revert-to-saved-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr.png deleted file mode 120000 index 35c2c00a5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-ltr.png +++ /dev/null @@ -1 +0,0 @@ -document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl-symbolic.png deleted file mode 120000 index 77c9eaa81..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-revert-to-saved-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl.png deleted file mode 120000 index 35c2c00a5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-revert-to-saved-rtl.png +++ /dev/null @@ -1 +0,0 @@ -document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as-symbolic.png deleted file mode 120000 index a7410d076..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as.png deleted file mode 120000 index 6f8088857..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-as.png +++ /dev/null @@ -1 +0,0 @@ -document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-symbolic.png deleted file mode 120000 index 8eeb98b14..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save.png deleted file mode 120000 index b1240e18d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-save.png +++ /dev/null @@ -1 +0,0 @@ -document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all-symbolic.png deleted file mode 120000 index 2711e9b55..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all.png deleted file mode 120000 index 30033c765..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-all.png +++ /dev/null @@ -1 +0,0 @@ -edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color-symbolic.png deleted file mode 120000 index 367390596..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-select-color.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color.png deleted file mode 100644 index 2c764b374..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-color.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font-symbolic.png deleted file mode 120000 index a4983fc58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-select-font.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font.png deleted file mode 100644 index 2514b6167..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-select-font.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending-symbolic.png deleted file mode 120000 index 30ddf10fa..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending.png deleted file mode 120000 index 28dd3cde5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-ascending.png +++ /dev/null @@ -1 +0,0 @@ -view-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending-symbolic.png deleted file mode 120000 index 794f2156f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending.png deleted file mode 120000 index 578592d3b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-sort-descending.png +++ /dev/null @@ -1 +0,0 @@ -view-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check-symbolic.png deleted file mode 120000 index bdf2c4c70..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-spell-check.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check.png deleted file mode 120000 index 23b82da94..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-spell-check.png +++ /dev/null @@ -1 +0,0 @@ -tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop-symbolic.png deleted file mode 120000 index 7c9bdc3d3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-stop.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough-symbolic.png deleted file mode 120000 index 6221ce0a3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough.png deleted file mode 120000 index 9ff9a3776..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-strikethrough.png +++ /dev/null @@ -1 +0,0 @@ -format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr-symbolic.png deleted file mode 120000 index 0877291c0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-undelete-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr.png deleted file mode 100644 index cc58d0fb5..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl-symbolic.png deleted file mode 120000 index 3844ffd1a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-undelete-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl.png deleted file mode 100644 index a312dd854..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undelete-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline-symbolic.png deleted file mode 120000 index 9c10f2b4f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline.png deleted file mode 120000 index 4f5b1549c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-underline.png +++ /dev/null @@ -1 +0,0 @@ -format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png deleted file mode 120000 index eb2a153d3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr.png deleted file mode 120000 index 62d2a953e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-undo-ltr.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100-symbolic.png deleted file mode 120000 index 0615da6a2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-zoom-100.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100.png deleted file mode 120000 index bfeb09ed1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-100.png +++ /dev/null @@ -1 +0,0 @@ -zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png deleted file mode 120000 index b399469e7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-zoom-fit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-fit.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in-symbolic.png deleted file mode 120000 index 65c933a16..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in.png deleted file mode 120000 index ee0a4b39d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-in.png +++ /dev/null @@ -1 +0,0 @@ -zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out-symbolic.png deleted file mode 120000 index bd5b889a6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out.png deleted file mode 120000 index be243b08a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/gtk-zoom-out.png +++ /dev/null @@ -1 +0,0 @@ -zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive-symbolic.png deleted file mode 120000 index 0245415f2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -harddrive.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/harddrive.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount-symbolic.png deleted file mode 120000 index 0f5bce8a1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -hdd_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/hdd_unmount.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about-symbolic.png deleted file mode 120000 index dd431b5e8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about.png deleted file mode 100644 index 010d294a7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-about.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents-symbolic.png deleted file mode 120000 index af8d871de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents.png deleted file mode 100644 index 20ae955c3..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-contents.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-symbolic.png deleted file mode 120000 index 102ea55da..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help.png deleted file mode 120000 index af8d871de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/help.png +++ /dev/null @@ -1 +0,0 @@ -help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing-symbolic.png deleted file mode 120000 index 344617bac..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -image-missing.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing.png deleted file mode 100644 index 84b26afd6..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/image-missing.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info-symbolic.png deleted file mode 120000 index ad789b531..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory-symbolic.png deleted file mode 120000 index d8f486403..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -inode-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/inode-directory.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home-symbolic.png deleted file mode 120000 index b2008e9c4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -kfm_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/kfm_home.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust-symbolic.png deleted file mode 120000 index c8d6c19de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -leftjust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust.png deleted file mode 120000 index 2da25a167..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/leftjust.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add-symbolic.png deleted file mode 120000 index 7d4c8781d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add.png deleted file mode 100644 index 9cd9e5cf2..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-add.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove-symbolic.png deleted file mode 120000 index 1336403b3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove.png deleted file mode 100644 index 0ed9c2210..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/list-remove.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom-symbolic.png deleted file mode 120000 index 848507774..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-cdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-cdrom.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy-symbolic.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy.png deleted file mode 100644 index 18b7d2419..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-floppy.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical-symbolic.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical.png deleted file mode 100644 index 922f452f1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-optical.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause-symbolic.png deleted file mode 120000 index 0ef65d6d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause.png deleted file mode 100644 index 8b70f471a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-pause.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr-symbolic.png deleted file mode 120000 index 1265a5a32..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-start-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr.png deleted file mode 100644 index e7e2584db..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl-symbolic.png deleted file mode 120000 index 956b43d14..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-start-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl.png deleted file mode 100644 index e3cb29165..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-start-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop-symbolic.png deleted file mode 120000 index 423c7cf20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop.png deleted file mode 100644 index c844e8322..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-playback-stop.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record-symbolic.png deleted file mode 120000 index 91f5c6f4d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record.png deleted file mode 100644 index 93b2ec100..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-record.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr-symbolic.png deleted file mode 120000 index 64288c383..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-seek-backward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr.png deleted file mode 100644 index 4972cb7ba..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl-symbolic.png deleted file mode 120000 index 9863a32f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-seek-backward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl.png deleted file mode 100644 index a02022474..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-backward-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr-symbolic.png deleted file mode 120000 index a7ca942c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-seek-forward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr.png deleted file mode 100644 index a02022474..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl-symbolic.png deleted file mode 120000 index 7829cab85..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-seek-forward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl.png deleted file mode 100644 index 4972cb7ba..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-seek-forward-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr-symbolic.png deleted file mode 120000 index cea15b4f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-skip-backward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr.png deleted file mode 100644 index 67dbb2e16..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl-symbolic.png deleted file mode 120000 index 11db21ad5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-skip-backward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl.png deleted file mode 100644 index 08ad0b69a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-backward-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr-symbolic.png deleted file mode 120000 index bd7416fbd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-skip-forward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr.png deleted file mode 100644 index 08ad0b69a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl-symbolic.png deleted file mode 120000 index 0ea17ba14..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-skip-forward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl.png deleted file mode 100644 index 67dbb2e16..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/media-skip-forward-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info-symbolic.png deleted file mode 120000 index bfc646ad5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -messagebox_info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/messagebox_info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii-symbolic.png deleted file mode 120000 index 12b223390..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -mime_ascii.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/mime_ascii.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc-symbolic.png deleted file mode 120000 index af684393f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -misc.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/misc.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle-symbolic.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle.png deleted file mode 100644 index e74e060ea..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-idle.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-symbolic.png deleted file mode 120000 index a14428c62..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -network.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/network.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc-symbolic.png deleted file mode 120000 index 34044c00c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -nm-adhoc.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-adhoc.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired-symbolic.png deleted file mode 120000 index 6a9e23c0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -nm-device-wired.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wired.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless-symbolic.png deleted file mode 120000 index e650e72e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -nm-device-wireless.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/nm-device-wireless.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors-symbolic.png deleted file mode 120000 index 809305555..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -package_editors.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_editors.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings-symbolic.png deleted file mode 120000 index f7f21ce34..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -package_settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings.png deleted file mode 120000 index 1d8138d22..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/package_settings.png +++ /dev/null @@ -1 +0,0 @@ -preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause-symbolic.png deleted file mode 120000 index f6af01a48..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -player_pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause.png deleted file mode 120000 index 0ef65d6d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_pause.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record-symbolic.png deleted file mode 120000 index 5607649cd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -player_record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record.png deleted file mode 120000 index 91f5c6f4d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_record.png +++ /dev/null @@ -1 +0,0 @@ -media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop-symbolic.png deleted file mode 120000 index 13f0c5aad..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -player_stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop.png deleted file mode 120000 index 423c7cf20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/player_stop.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system-symbolic.png deleted file mode 120000 index 1d8138d22..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system.png deleted file mode 120000 index 5acf3b2f2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/preferences-system.png +++ /dev/null @@ -1 +0,0 @@ -gtk-preferences.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error-symbolic.png deleted file mode 120000 index cffd04483..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -printer-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error.png deleted file mode 100644 index 934ee68d3..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-error.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info-symbolic.png deleted file mode 120000 index aaa23147e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -printer-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info.png deleted file mode 100644 index 8e2ab7487..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-info.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused-symbolic.png deleted file mode 120000 index ba165131c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -printer-paused.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused.png deleted file mode 100644 index ebd5ac60c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-paused.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning-symbolic.png deleted file mode 120000 index 6575a3557..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -printer-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning.png deleted file mode 100644 index 52410c38d..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/printer-warning.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop-symbolic.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop.png deleted file mode 100644 index d88fed703..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/process-stop.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home-symbolic.png deleted file mode 120000 index 9d96edc09..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -redhat-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-home.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings-symbolic.png deleted file mode 120000 index 99d35dedc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -redhat-system_settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings.png deleted file mode 120000 index 1d8138d22..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redhat-system_settings.png +++ /dev/null @@ -1 +0,0 @@ -preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo-symbolic.png deleted file mode 120000 index 4d893d44a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo.png deleted file mode 120000 index 0061b57c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/redo.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload-symbolic.png deleted file mode 120000 index b51c479ad..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -reload.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3-symbolic.png deleted file mode 120000 index 160584a15..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -reload3.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload3.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs-symbolic.png deleted file mode 120000 index 4edfb5a4c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -reload_all_tabs.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_all_tabs.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page-symbolic.png deleted file mode 120000 index e8fdb1ec3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -reload_page.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/reload_page.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove-symbolic.png deleted file mode 120000 index 584599bf0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove.png deleted file mode 120000 index 1336403b3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/remove.png +++ /dev/null @@ -1 +0,0 @@ -list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert-symbolic.png deleted file mode 120000 index 00f6de08c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert.png deleted file mode 120000 index 35c2c00a5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/revert.png +++ /dev/null @@ -1 +0,0 @@ -document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust-symbolic.png deleted file mode 120000 index 4827d0f19..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -rightjust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust.png deleted file mode 120000 index 017868ada..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/rightjust.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about-symbolic.png deleted file mode 120000 index 47f3160cc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about.png deleted file mode 120000 index dd431b5e8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_about.png +++ /dev/null @@ -1 +0,0 @@ -help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom-symbolic.png deleted file mode 120000 index 7738c9958..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom.png deleted file mode 120000 index c58ca3d0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_bottom.png +++ /dev/null @@ -1 +0,0 @@ -go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close-symbolic.png deleted file mode 120000 index 462194393..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_close.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy-symbolic.png deleted file mode 120000 index d4fe9b004..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy.png deleted file mode 120000 index e106cb543..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_copy.png +++ /dev/null @@ -1 +0,0 @@ -edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut-symbolic.png deleted file mode 120000 index 6f34159d0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut.png deleted file mode 120000 index 32b03023c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_cut.png +++ /dev/null @@ -1 +0,0 @@ -edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete-symbolic.png deleted file mode 120000 index 54b0ede76..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete.png deleted file mode 120000 index bb0a74a58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_delete.png +++ /dev/null @@ -1 +0,0 @@ -edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info-symbolic.png deleted file mode 120000 index 5b4fe4bc6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_dialog-info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down-symbolic.png deleted file mode 120000 index 56d981416..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down.png deleted file mode 120000 index 5240b846d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_down.png +++ /dev/null @@ -1 +0,0 @@ -go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites-symbolic.png deleted file mode 120000 index 2c81081ca..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_file-properites.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites.png deleted file mode 120000 index b447aa240..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_file-properites.png +++ /dev/null @@ -1 +0,0 @@ -document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder-symbolic.png deleted file mode 120000 index 5376f31f6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_folder.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen-symbolic.png deleted file mode 120000 index 31893cedd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen.png deleted file mode 120000 index 37aaf877e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help-symbolic.png deleted file mode 120000 index f4d63feef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help.png deleted file mode 120000 index af8d871de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_help.png +++ /dev/null @@ -1 +0,0 @@ -help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home-symbolic.png deleted file mode 120000 index faf057c43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_home.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen-symbolic.png deleted file mode 120000 index 00f3f4f77..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_leave-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen.png deleted file mode 120000 index 5b9d8f68b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_leave-fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause-symbolic.png deleted file mode 120000 index fcf5ee6aa..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_media-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause.png deleted file mode 120000 index 0ef65d6d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-pause.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec-symbolic.png deleted file mode 120000 index 3703897de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_media-rec.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec.png deleted file mode 120000 index 91f5c6f4d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-rec.png +++ /dev/null @@ -1 +0,0 @@ -media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop-symbolic.png deleted file mode 120000 index d3284d99b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_media-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop.png deleted file mode 120000 index 423c7cf20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_media-stop.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text-symbolic.png deleted file mode 120000 index df5c64b6e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_new-text.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text.png deleted file mode 120000 index 446977ddc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_new-text.png +++ /dev/null @@ -1 +0,0 @@ -document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste-symbolic.png deleted file mode 120000 index d031aef3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste.png deleted file mode 120000 index 2f55649f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_paste.png +++ /dev/null @@ -1 +0,0 @@ -edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview-symbolic.png deleted file mode 120000 index cb72d5f96..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview.png deleted file mode 120000 index 9dfea717c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-preview.png +++ /dev/null @@ -1 +0,0 @@ -document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-symbolic.png deleted file mode 120000 index 5ea564c1c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print.png deleted file mode 120000 index 863a49fc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_print.png +++ /dev/null @@ -1 +0,0 @@ -document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties-symbolic.png deleted file mode 120000 index cead9f906..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties.png deleted file mode 120000 index b447aa240..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_properties.png +++ /dev/null @@ -1 +0,0 @@ -document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo-symbolic.png deleted file mode 120000 index 3abd89311..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo.png deleted file mode 120000 index 0061b57c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_redo.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh-symbolic.png deleted file mode 120000 index e617eefc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_refresh.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as-symbolic.png deleted file mode 120000 index dfda8bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as.png deleted file mode 120000 index 6f8088857..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-as.png +++ /dev/null @@ -1 +0,0 @@ -document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-symbolic.png deleted file mode 120000 index 08802a248..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save.png deleted file mode 120000 index b1240e18d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_save.png +++ /dev/null @@ -1 +0,0 @@ -document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace-symbolic.png deleted file mode 120000 index 539fd27e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_search-and-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace.png deleted file mode 120000 index e4057afed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-and-replace.png +++ /dev/null @@ -1 +0,0 @@ -edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-symbolic.png deleted file mode 120000 index 34bffb533..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_search.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_search.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all-symbolic.png deleted file mode 120000 index 49d937f83..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all.png deleted file mode 120000 index 30033c765..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_select-all.png +++ /dev/null @@ -1 +0,0 @@ -edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck-symbolic.png deleted file mode 120000 index afb170689..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_spellcheck.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck.png deleted file mode 120000 index 23b82da94..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_spellcheck.png +++ /dev/null @@ -1 +0,0 @@ -tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop-symbolic.png deleted file mode 120000 index e6673c5a3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_stop.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough-symbolic.png deleted file mode 120000 index 0d1cedb91..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough.png deleted file mode 120000 index 9ff9a3776..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text-strikethrough.png +++ /dev/null @@ -1 +0,0 @@ -format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold-symbolic.png deleted file mode 120000 index b34d8bcde..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold.png deleted file mode 120000 index ef50053bd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_bold.png +++ /dev/null @@ -1 +0,0 @@ -format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center-symbolic.png deleted file mode 120000 index 39bd0f289..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center.png deleted file mode 120000 index 980c099ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_center.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic-symbolic.png deleted file mode 120000 index eb525bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic.png deleted file mode 120000 index 1ee2a31f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_italic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify-symbolic.png deleted file mode 120000 index 2db29cb19..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_justify.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify.png deleted file mode 120000 index f1d9574cf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_justify.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left-symbolic.png deleted file mode 120000 index 314710b94..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left.png deleted file mode 120000 index 2da25a167..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_left.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right-symbolic.png deleted file mode 120000 index 997c4e491..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right.png deleted file mode 120000 index 017868ada..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_right.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined-symbolic.png deleted file mode 120000 index f57dd0345..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_underlined.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined.png deleted file mode 120000 index 4f5b1549c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_text_underlined.png +++ /dev/null @@ -1 +0,0 @@ -format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top-symbolic.png deleted file mode 120000 index 142c86cb8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top.png deleted file mode 120000 index 3b5b7d6e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_top.png +++ /dev/null @@ -1 +0,0 @@ -go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo-symbolic.png deleted file mode 120000 index 94134ab91..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo.png deleted file mode 120000 index 62d2a953e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_undo.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up-symbolic.png deleted file mode 120000 index 85fa025ce..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up.png deleted file mode 120000 index 4a1025d4a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_up.png +++ /dev/null @@ -1 +0,0 @@ -go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1-symbolic.png deleted file mode 120000 index 15aa66135..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_zoom-1.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1.png deleted file mode 120000 index bfeb09ed1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-1.png +++ /dev/null @@ -1 +0,0 @@ -zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in-symbolic.png deleted file mode 120000 index e2bc92819..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in.png deleted file mode 120000 index ee0a4b39d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-in.png +++ /dev/null @@ -1 +0,0 @@ -zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out-symbolic.png deleted file mode 120000 index 3c633a495..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out.png deleted file mode 120000 index be243b08a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-out.png +++ /dev/null @@ -1 +0,0 @@ -zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page-symbolic.png deleted file mode 120000 index 3c75afc9e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_zoom-page.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stock_zoom-page.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop-symbolic.png deleted file mode 120000 index 6222e6f71..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/stop.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy-symbolic.png deleted file mode 120000 index 1b471b958..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -system-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-floppy.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run-symbolic.png deleted file mode 120000 index 9daf3feba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run.png deleted file mode 100644 index c9c48d6a3..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/system-run.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic-symbolic.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic.png deleted file mode 100644 index 7cd94435a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text-x-generic.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold-symbolic.png deleted file mode 120000 index 7297aca53..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text_bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold.png deleted file mode 120000 index ef50053bd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_bold.png +++ /dev/null @@ -1 +0,0 @@ -format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic-symbolic.png deleted file mode 120000 index 567390a7e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text_italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic.png deleted file mode 120000 index 1ee2a31f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_italic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike-symbolic.png deleted file mode 120000 index 67e697102..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text_strike.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike.png deleted file mode 120000 index 9ff9a3776..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_strike.png +++ /dev/null @@ -1 +0,0 @@ -format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under-symbolic.png deleted file mode 120000 index 0032f1112..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text_under.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under.png deleted file mode 120000 index 4f5b1549c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/text_under.png +++ /dev/null @@ -1 +0,0 @@ -format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling-symbolic.png deleted file mode 120000 index 23b82da94..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling.png deleted file mode 100644 index 32dcc2e63..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/tools-check-spelling.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top-symbolic.png deleted file mode 120000 index 315e75e61..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top.png deleted file mode 120000 index 3b5b7d6e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/top.png +++ /dev/null @@ -1 +0,0 @@ -go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt-symbolic.png deleted file mode 120000 index 8ac1daefb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -txt.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2-symbolic.png deleted file mode 120000 index 387710868..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -txt2.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/txt2.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo-symbolic.png deleted file mode 120000 index 28c818a0e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo.png deleted file mode 120000 index 62d2a953e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/undo.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown-symbolic.png deleted file mode 120000 index b1754e727..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -unknown.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/unknown.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up-symbolic.png deleted file mode 120000 index 3a33d8bde..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up.png deleted file mode 120000 index 4a1025d4a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/up.png +++ /dev/null @@ -1 +0,0 @@ -go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop-symbolic.png deleted file mode 120000 index 200ab00ab..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop.png deleted file mode 100644 index 14ed14a12..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-desktop.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home-symbolic.png deleted file mode 120000 index 8c668dc1c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home.png deleted file mode 100644 index 14ed14a12..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/user-home.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen-symbolic.png deleted file mode 120000 index 37aaf877e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen.png deleted file mode 100644 index b9e9ea632..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-fullscreen.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh-symbolic.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh.png deleted file mode 100644 index e9ea8c4e5..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-refresh.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore-symbolic.png deleted file mode 120000 index 5b9d8f68b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore.png deleted file mode 100644 index 49966a996..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-restore.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending-symbolic.png deleted file mode 120000 index 28dd3cde5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending.png deleted file mode 100644 index 3f8fd257f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-ascending.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending-symbolic.png deleted file mode 120000 index 578592d3b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending.png deleted file mode 100644 index a8aa70584..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/view-sort-descending.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+-symbolic.png deleted file mode 120000 index 920bdf9e9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -viewmag+.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+.png deleted file mode 120000 index ee0a4b39d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag+.png +++ /dev/null @@ -1 +0,0 @@ -zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag--symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag--symbolic.png deleted file mode 120000 index 604b33d4b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag--symbolic.png +++ /dev/null @@ -1 +0,0 @@ -viewmag-.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag-.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag-.png deleted file mode 120000 index be243b08a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag-.png +++ /dev/null @@ -1 +0,0 @@ -zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1-symbolic.png deleted file mode 120000 index 14537edeb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -viewmag1.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1.png deleted file mode 120000 index bfeb09ed1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmag1.png +++ /dev/null @@ -1 +0,0 @@ -zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit-symbolic.png deleted file mode 120000 index 4530444b9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -viewmagfit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/viewmagfit.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close-symbolic.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close.png deleted file mode 100644 index 52f58630f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window-close.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen-symbolic.png deleted file mode 120000 index 5e184b6c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -window_fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen.png deleted file mode 120000 index 37aaf877e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen-symbolic.png deleted file mode 120000 index 07b973d67..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -window_nofullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen.png deleted file mode 120000 index 5b9d8f68b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/window_nofullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit-symbolic.png deleted file mode 120000 index 214adf7fb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -xfce-system-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit.png deleted file mode 120000 index 0ecb0b9ba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-exit.png +++ /dev/null @@ -1 +0,0 @@ -application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings-symbolic.png deleted file mode 120000 index 28a6ef505..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -xfce-system-settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings.png deleted file mode 120000 index 1d8138d22..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/xfce-system-settings.png +++ /dev/null @@ -1 +0,0 @@ -preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD-symbolic.png deleted file mode 120000 index 5de487b88..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -yast_HD.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_HD.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude-symbolic.png deleted file mode 120000 index a2fdbdd54..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -yast_idetude.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/yast_idetude.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit-symbolic.png deleted file mode 120000 index 181b01518..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-best-fit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-best-fit.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best-symbolic.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best.png deleted file mode 100644 index adbf7f3a2..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-fit-best.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in-symbolic.png deleted file mode 120000 index ee0a4b39d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in.png deleted file mode 100644 index 6b1b94336..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-in.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original-symbolic.png deleted file mode 120000 index bfeb09ed1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original.png deleted file mode 100644 index 92dddd2ea..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-original.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out-symbolic.png deleted file mode 120000 index be243b08a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out.png deleted file mode 100644 index ddc1eb136..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/16x16/stock/zoom-out.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply-symbolic.png deleted file mode 120000 index aa966d9c4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-apply.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply.png deleted file mode 100644 index afca0732a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-apply.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel-symbolic.png deleted file mode 120000 index e726007ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-cancel.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel.png deleted file mode 100644 index 0a395c099..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-cancel.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close-symbolic.png deleted file mode 120000 index a3ced3a8e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-close.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no-symbolic.png deleted file mode 120000 index 4cfdaae9e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-no.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no.png deleted file mode 100644 index 2a7da6e2a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-no.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok-symbolic.png deleted file mode 120000 index 048d27332..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-ok.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok.png deleted file mode 100644 index c08115f62..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-ok.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes-symbolic.png deleted file mode 120000 index bb3ef9b17..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-yes.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes.png deleted file mode 100644 index e56236638..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/gtk-yes.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close-symbolic.png deleted file mode 120000 index 462194393..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/stock_close.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close-symbolic.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close.png b/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close.png deleted file mode 100644 index a13d1984b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/20x20/stock/window-close.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount-symbolic.png deleted file mode 120000 index 198cfb326..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -3floppy_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/3floppy_unmount.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add-symbolic.png deleted file mode 120000 index f26caeafb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add.png deleted file mode 120000 index 7d4c8781d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/add.png +++ /dev/null @@ -1 +0,0 @@ -list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit-symbolic.png deleted file mode 120000 index 0ecb0b9ba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit.png deleted file mode 100644 index 0c9de64ba..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/application-exit.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii-symbolic.png deleted file mode 120000 index 306ee6a20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -ascii.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/ascii.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high-symbolic.png deleted file mode 120000 index 3dc4302d0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-high.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high.png deleted file mode 100644 index 7de1e0e4f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-high.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low-symbolic.png deleted file mode 120000 index dd3d1eea4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-low.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low.png deleted file mode 100644 index 4152b6c9f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-low.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium-symbolic.png deleted file mode 120000 index 3e599b49d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-medium.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium.png deleted file mode 100644 index 8d899cfa5..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-medium.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted-symbolic.png deleted file mode 120000 index 8aeeb8edd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-muted.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted.png deleted file mode 100644 index 6902efdc6..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/audio-volume-muted.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom-symbolic.png deleted file mode 120000 index faf41843c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom.png deleted file mode 120000 index c58ca3d0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/bottom.png +++ /dev/null @@ -1 +0,0 @@ -go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount-symbolic.png deleted file mode 120000 index 675a3d8d5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -cdrom_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdrom_unmount.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount-symbolic.png deleted file mode 120000 index 69e9cb48e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -cdwriter_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/cdwriter_unmount.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust-symbolic.png deleted file mode 120000 index 337ad727a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -centrejust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust.png deleted file mode 120000 index 980c099ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/centrejust.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established-symbolic.png deleted file mode 120000 index 5beb19d41..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -connect_established.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/connect_established.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop-symbolic.png deleted file mode 120000 index 3c4032691..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop.png deleted file mode 120000 index 200ab00ab..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/desktop.png +++ /dev/null @@ -1 +0,0 @@ -user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information-symbolic.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information.png deleted file mode 100644 index b66871a94..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dialog-information.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new-symbolic.png deleted file mode 120000 index 446977ddc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new.png deleted file mode 100644 index c89e797b7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-new.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent-symbolic.png deleted file mode 120000 index f10003637..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-open-recent.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent.png deleted file mode 100644 index 5edf531e3..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-recent.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-symbolic.png deleted file mode 120000 index f58170cc1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open.png deleted file mode 100644 index 312e1187f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-open.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview-symbolic.png deleted file mode 120000 index 9dfea717c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview.png deleted file mode 100644 index 7f405de58..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-preview.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-symbolic.png deleted file mode 120000 index 863a49fc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print.png deleted file mode 100644 index 05d22d7a8..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-print.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties-symbolic.png deleted file mode 120000 index b447aa240..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties.png deleted file mode 100644 index 297c86b0c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-properties.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr-symbolic.png deleted file mode 120000 index ac1bd52d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-revert-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr.png deleted file mode 100644 index 3046794e7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl-symbolic.png deleted file mode 120000 index f56254a08..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-revert-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl.png deleted file mode 100644 index 46435e1a0..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-symbolic.png deleted file mode 120000 index 35c2c00a5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert.png deleted file mode 120000 index ac1bd52d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-revert.png +++ /dev/null @@ -1 +0,0 @@ -document-revert-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as-symbolic.png deleted file mode 120000 index 6f8088857..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as.png deleted file mode 100644 index 5da8a02dc..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-as.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-symbolic.png deleted file mode 120000 index b1240e18d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save.png deleted file mode 100644 index 7ef7685f4..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/document-save.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down-symbolic.png deleted file mode 120000 index 0bef6f6e8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down.png deleted file mode 120000 index 5240b846d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/down.png +++ /dev/null @@ -1 +0,0 @@ -go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk-symbolic.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk.png deleted file mode 100644 index 1be6b6c88..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/drive-harddisk.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount-symbolic.png deleted file mode 120000 index 041480d09..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dvd_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/dvd_unmount.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear-symbolic.png deleted file mode 120000 index f230219f3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear.png deleted file mode 100644 index 590f673db..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-clear.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy-symbolic.png deleted file mode 120000 index e106cb543..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy.png deleted file mode 100644 index a1178e64f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-copy.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut-symbolic.png deleted file mode 120000 index 32b03023c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut.png deleted file mode 100644 index 82b105f80..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-cut.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete-symbolic.png deleted file mode 120000 index bb0a74a58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete.png deleted file mode 100644 index e375b894e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-delete.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace-symbolic.png deleted file mode 120000 index e4057afed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace.png deleted file mode 100644 index ed81e5a82..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-replace.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-symbolic.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find.png deleted file mode 100644 index 5c83fb689..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-find.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste-symbolic.png deleted file mode 120000 index 2f55649f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste.png deleted file mode 100644 index e938c3e99..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-paste.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr-symbolic.png deleted file mode 120000 index 687ee4f05..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr.png deleted file mode 100644 index 3da43f0c0..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl-symbolic.png deleted file mode 120000 index 0f38059a6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl.png deleted file mode 100644 index f2c1a50a1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-symbolic.png deleted file mode 120000 index 0061b57c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo.png deleted file mode 120000 index 687ee4f05..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-redo.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all-symbolic.png deleted file mode 120000 index 30033c765..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all.png deleted file mode 100644 index 1fc5b8282..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-select-all.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr-symbolic.png deleted file mode 120000 index 3043c4fa7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr.png deleted file mode 100644 index 3b12a233a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl-symbolic.png deleted file mode 120000 index 4020ce799..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl.png deleted file mode 100644 index 3ba7d6240..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-symbolic.png deleted file mode 120000 index 62d2a953e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo.png deleted file mode 120000 index 3043c4fa7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/edit-undo.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear-symbolic.png deleted file mode 120000 index 29ba74e20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editclear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear.png deleted file mode 120000 index f230219f3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editclear.png +++ /dev/null @@ -1 +0,0 @@ -edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy-symbolic.png deleted file mode 120000 index 6a91dbe20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editcopy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy.png deleted file mode 120000 index e106cb543..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcopy.png +++ /dev/null @@ -1 +0,0 @@ -edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut-symbolic.png deleted file mode 120000 index 778447500..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editcut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut.png deleted file mode 120000 index 32b03023c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editcut.png +++ /dev/null @@ -1 +0,0 @@ -edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete-symbolic.png deleted file mode 120000 index a94cb85d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editdelete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete.png deleted file mode 120000 index bb0a74a58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editdelete.png +++ /dev/null @@ -1 +0,0 @@ -edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste-symbolic.png deleted file mode 120000 index 3c44aa574..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -editpaste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste.png deleted file mode 120000 index 2f55649f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/editpaste.png +++ /dev/null @@ -1 +0,0 @@ -edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty-symbolic.png deleted file mode 120000 index 1350bab17..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -empty.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/empty.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit-symbolic.png deleted file mode 120000 index 4eb2fd526..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit.png deleted file mode 120000 index 0ecb0b9ba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/exit.png +++ /dev/null @@ -1 +0,0 @@ -application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind-symbolic.png deleted file mode 120000 index af3ede396..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filefind.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filefind.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew-symbolic.png deleted file mode 120000 index c52f9eaf8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filenew.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew.png deleted file mode 120000 index 446977ddc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filenew.png +++ /dev/null @@ -1 +0,0 @@ -document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen-symbolic.png deleted file mode 120000 index 99c3ecd92..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -fileopen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen.png deleted file mode 120000 index f58170cc1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileopen.png +++ /dev/null @@ -1 +0,0 @@ -document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint-symbolic.png deleted file mode 120000 index b7c96eb8a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -fileprint.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint.png deleted file mode 120000 index 863a49fc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/fileprint.png +++ /dev/null @@ -1 +0,0 @@ -document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint-symbolic.png deleted file mode 120000 index 03fba13fe..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filequickprint.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint.png deleted file mode 120000 index 9dfea717c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filequickprint.png +++ /dev/null @@ -1 +0,0 @@ -document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave-symbolic.png deleted file mode 120000 index 287a9600a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filesave.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave.png deleted file mode 120000 index b1240e18d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesave.png +++ /dev/null @@ -1 +0,0 @@ -document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas-symbolic.png deleted file mode 120000 index 805ae83a2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -filesaveas.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas.png deleted file mode 120000 index 6f8088857..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/filesaveas.png +++ /dev/null @@ -1 +0,0 @@ -document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find-symbolic.png deleted file mode 120000 index 2e3266774..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/find.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote-symbolic.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote.png deleted file mode 100644 index 28b68f338..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-remote.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-symbolic.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder.png deleted file mode 100644 index 28b68f338..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home-symbolic.png deleted file mode 120000 index 137e7d5ed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -folder_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home.png deleted file mode 120000 index 8c668dc1c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/folder_home.png +++ /dev/null @@ -1 +0,0 @@ -user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr-symbolic.png deleted file mode 120000 index a33b3ffac..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-indent-less-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr.png deleted file mode 100644 index 36d231434..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl-symbolic.png deleted file mode 120000 index d5c1b473d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-indent-less-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl.png deleted file mode 100644 index a6f7dc19b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-less-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr-symbolic.png deleted file mode 120000 index 5c9aeec8b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-indent-more-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr.png deleted file mode 100644 index 7e3656dc4..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl-symbolic.png deleted file mode 120000 index e0ee3f7d7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-indent-more-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl.png deleted file mode 100644 index 5527663fd..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-indent-more-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center-symbolic.png deleted file mode 120000 index 980c099ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center.png deleted file mode 100644 index 35579d553..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-center.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill-symbolic.png deleted file mode 120000 index f1d9574cf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill.png deleted file mode 100644 index eaf9a460b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-fill.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left-symbolic.png deleted file mode 120000 index 2da25a167..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left.png deleted file mode 100644 index 07db84109..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-left.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right-symbolic.png deleted file mode 120000 index 017868ada..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right.png deleted file mode 100644 index 9bbd47ca0..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-justify-right.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold-symbolic.png deleted file mode 120000 index ef50053bd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold.png deleted file mode 100644 index 9869fb8b1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-bold.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic-symbolic.png deleted file mode 120000 index 1ee2a31f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic.png deleted file mode 100644 index 8842b5aa7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-italic.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough-symbolic.png deleted file mode 120000 index 9ff9a3776..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough.png deleted file mode 100644 index 04d464e28..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-strikethrough.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline-symbolic.png deleted file mode 120000 index 4f5b1549c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline.png deleted file mode 100644 index be0906d8a..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/format-text-underline.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio-symbolic.png deleted file mode 120000 index cce40e357..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-cdrom-audio.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-cdrom-audio.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr-symbolic.png deleted file mode 120000 index fc19d096d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-cdr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdr.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw-symbolic.png deleted file mode 120000 index 3254f0b9a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-cdrw.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-cdrw.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus-symbolic.png deleted file mode 120000 index 0babfc593..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdr-plus.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-plus.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-symbolic.png deleted file mode 120000 index e5acfa688..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdr.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram-symbolic.png deleted file mode 120000 index 3d65c827f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdram.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdram.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom-symbolic.png deleted file mode 120000 index 096e10ac3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrom.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw-symbolic.png deleted file mode 120000 index 6f333e959..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-disc-dvdrw.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-disc-dvdrw.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy-symbolic.png deleted file mode 120000 index ca93a31ac..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-floppy.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394-symbolic.png deleted file mode 120000 index 709dd9407..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-harddisk-1394.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-1394.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-symbolic.png deleted file mode 120000 index 15fcbea7a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb-symbolic.png deleted file mode 120000 index 00cd3cdf1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-dev-harddisk-usb.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk-usb.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-dev-harddisk.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop-symbolic.png deleted file mode 120000 index 1de17f537..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop.png deleted file mode 120000 index 200ab00ab..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-desktop.png +++ /dev/null @@ -1 +0,0 @@ -user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory-symbolic.png deleted file mode 120000 index d9bddcf2b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-directory.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png deleted file mode 120000 index a941c98ed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-ftp.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ftp.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home-symbolic.png deleted file mode 120000 index 42a0ae6a3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home.png deleted file mode 120000 index 8c668dc1c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-home.png +++ /dev/null @@ -1 +0,0 @@ -user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png deleted file mode 120000 index b433450d1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-nfs.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-nfs.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share-symbolic.png deleted file mode 120000 index d9a60f49d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-share.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-share.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb-symbolic.png deleted file mode 120000 index 4f3d4e258..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-smb.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-smb.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png deleted file mode 120000 index 51ce27214..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-fs-ssh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-fs-ssh.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text-symbolic.png deleted file mode 120000 index 2d6a92f63..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-mime-text.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-text.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share-symbolic.png deleted file mode 120000 index 146decd75..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-mime-x-directory-smb-share.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-mime-x-directory-smb-share.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle-symbolic.png deleted file mode 120000 index a24805021..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-netstatus-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-netstatus-idle.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run-symbolic.png deleted file mode 120000 index 729e469c4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gnome-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run.png deleted file mode 120000 index 9daf3feba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gnome-run.png +++ /dev/null @@ -1 +0,0 @@ -system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom-symbolic.png deleted file mode 120000 index c58ca3d0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom.png deleted file mode 100644 index 79994416e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-bottom.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down-symbolic.png deleted file mode 120000 index 5240b846d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down.png deleted file mode 100644 index 2a0a8ea2c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-down.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr-symbolic.png deleted file mode 120000 index cd10b29f9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-first-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr.png deleted file mode 100644 index e44f9b612..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl-symbolic.png deleted file mode 120000 index c27895ff9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-first-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl.png deleted file mode 100644 index 3ba5c4ba7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-first-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home-symbolic.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home.png deleted file mode 100644 index a2e0b3c96..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-home.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr-symbolic.png deleted file mode 120000 index 1e84cdb4b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-jump-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr.png deleted file mode 100644 index 9b639939f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl-symbolic.png deleted file mode 120000 index da4dbb50a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-jump-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl.png deleted file mode 100644 index 80068face..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-jump-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr-symbolic.png deleted file mode 120000 index e9a0b1bfb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-last-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr.png deleted file mode 100644 index 3ba5c4ba7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl-symbolic.png deleted file mode 120000 index d10cbddc0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-last-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl.png deleted file mode 100644 index e44f9b612..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-last-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr-symbolic.png deleted file mode 120000 index ba611e6ec..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-next-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr.png deleted file mode 100644 index 727ff37f2..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl-symbolic.png deleted file mode 120000 index 5d7e220ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-next-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl.png deleted file mode 100644 index 23b89b761..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-next-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr-symbolic.png deleted file mode 120000 index e28ad36ea..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-previous-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr.png deleted file mode 100644 index 23b89b761..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl-symbolic.png deleted file mode 120000 index 4b0816229..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-previous-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl.png deleted file mode 100644 index 727ff37f2..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-previous-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top-symbolic.png deleted file mode 120000 index 3b5b7d6e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top.png deleted file mode 100644 index 9b98fd26f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-top.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up-symbolic.png deleted file mode 120000 index 4a1025d4a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up.png deleted file mode 100644 index 3df5fe511..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/go-up.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome-symbolic.png deleted file mode 120000 index f31e7772d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gohome.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gohome.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about-symbolic.png deleted file mode 120000 index 474a4323d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about.png deleted file mode 120000 index dd431b5e8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-about.png +++ /dev/null @@ -1 +0,0 @@ -help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add-symbolic.png deleted file mode 120000 index 4a50663ad..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add.png deleted file mode 120000 index 7d4c8781d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-add.png +++ /dev/null @@ -1 +0,0 @@ -list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold-symbolic.png deleted file mode 120000 index 8053f9c7a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold.png deleted file mode 120000 index ef50053bd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-bold.png +++ /dev/null @@ -1 +0,0 @@ -format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel-symbolic.png deleted file mode 120000 index e726007ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-cancel.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cancel.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning-symbolic.png deleted file mode 120000 index ae89400c9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-caps-lock-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning.png deleted file mode 100644 index ca76d509b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-caps-lock-warning.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom-symbolic.png deleted file mode 120000 index fcc64806d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-cdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cdrom.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear-symbolic.png deleted file mode 120000 index f04e3f792..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear.png deleted file mode 120000 index f230219f3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-clear.png +++ /dev/null @@ -1 +0,0 @@ -edit-clear.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close-symbolic.png deleted file mode 120000 index a3ced3a8e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-close.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker-symbolic.png deleted file mode 120000 index cb3926ffb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-color-picker.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker.png deleted file mode 100644 index fd97f343c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-color-picker.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect-symbolic.png deleted file mode 120000 index 2fc301882..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-connect.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect.png deleted file mode 100644 index 97f2143fb..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-connect.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert-symbolic.png deleted file mode 120000 index 7f053d572..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-convert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert.png deleted file mode 100644 index da8194fa8..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-convert.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy-symbolic.png deleted file mode 120000 index 674753224..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy.png deleted file mode 120000 index e106cb543..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-copy.png +++ /dev/null @@ -1 +0,0 @@ -edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut-symbolic.png deleted file mode 120000 index f55e67fcf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut.png deleted file mode 120000 index 32b03023c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-cut.png +++ /dev/null @@ -1 +0,0 @@ -edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete-symbolic.png deleted file mode 120000 index cb17163af..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete.png deleted file mode 120000 index bb0a74a58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-delete.png +++ /dev/null @@ -1 +0,0 @@ -edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info-symbolic.png deleted file mode 120000 index 70ccbc7aa..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-dialog-info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory-symbolic.png deleted file mode 120000 index f5a4d8dad..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-directory.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect-symbolic.png deleted file mode 120000 index 911f3c46b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-disconnect.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect.png deleted file mode 100644 index 883a003bc..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-disconnect.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit-symbolic.png deleted file mode 120000 index a09517d38..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-edit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit.png deleted file mode 100644 index f429e1015..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-edit.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute-symbolic.png deleted file mode 120000 index d777d5f7a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-execute.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute.png deleted file mode 120000 index 9daf3feba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-execute.png +++ /dev/null @@ -1 +0,0 @@ -system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace-symbolic.png deleted file mode 120000 index a03f9c58b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-find-and-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace.png deleted file mode 120000 index e4057afed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-and-replace.png +++ /dev/null @@ -1 +0,0 @@ -edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-symbolic.png deleted file mode 120000 index 925deda81..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-find.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy-symbolic.png deleted file mode 120000 index eb899acc8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-floppy.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font-symbolic.png deleted file mode 120000 index 191b8aecf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-font.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font.png deleted file mode 100644 index cde0e8698..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-font.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen-symbolic.png deleted file mode 120000 index 673d2e6b1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen.png deleted file mode 120000 index 37aaf877e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down-symbolic.png deleted file mode 120000 index c0f84c886..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down.png deleted file mode 120000 index 5240b846d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-down.png +++ /dev/null @@ -1 +0,0 @@ -go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up-symbolic.png deleted file mode 120000 index ee76eec61..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up.png deleted file mode 120000 index 4a1025d4a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-go-up.png +++ /dev/null @@ -1 +0,0 @@ -go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom-symbolic.png deleted file mode 120000 index 27ab77552..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-goto-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom.png deleted file mode 120000 index c58ca3d0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-bottom.png +++ /dev/null @@ -1 +0,0 @@ -go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top-symbolic.png deleted file mode 120000 index 32ee14e66..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-goto-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top.png deleted file mode 120000 index 3b5b7d6e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-goto-top.png +++ /dev/null @@ -1 +0,0 @@ -go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk-symbolic.png deleted file mode 120000 index 152e871f3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-harddisk.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help-symbolic.png deleted file mode 120000 index 796d97c74..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help.png deleted file mode 120000 index af8d871de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-help.png +++ /dev/null @@ -1 +0,0 @@ -help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home-symbolic.png deleted file mode 120000 index 0f0054316..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-home.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index-symbolic.png deleted file mode 120000 index 1635a9d2b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-index.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index.png deleted file mode 100644 index 9ddbe9b8e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-index.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic-symbolic.png deleted file mode 120000 index 5a22fc560..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic.png deleted file mode 120000 index 1ee2a31f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-italic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center-symbolic.png deleted file mode 120000 index 2057ae4d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center.png deleted file mode 120000 index 980c099ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-center.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill-symbolic.png deleted file mode 120000 index ad45b34dc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill.png deleted file mode 120000 index f1d9574cf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-fill.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left-symbolic.png deleted file mode 120000 index a4ee605d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left.png deleted file mode 120000 index 2da25a167..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-left.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right-symbolic.png deleted file mode 120000 index 15dddca14..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right.png deleted file mode 120000 index 017868ada..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-justify-right.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen-symbolic.png deleted file mode 120000 index bc1251b2a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-leave-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen.png deleted file mode 120000 index 5b9d8f68b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-leave-fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause-symbolic.png deleted file mode 120000 index e4880de80..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-media-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause.png deleted file mode 120000 index 0ef65d6d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-pause.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record-symbolic.png deleted file mode 120000 index 6518a86a1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record.png deleted file mode 120000 index 91f5c6f4d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-record.png +++ /dev/null @@ -1 +0,0 @@ -media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop-symbolic.png deleted file mode 120000 index b42b748dd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-media-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop.png deleted file mode 120000 index 423c7cf20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-media-stop.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image-symbolic.png deleted file mode 120000 index 16ed32178..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-missing-image.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image.png deleted file mode 120000 index 344617bac..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-missing-image.png +++ /dev/null @@ -1 +0,0 @@ -image-missing.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new-symbolic.png deleted file mode 120000 index 913a6a7d3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new.png deleted file mode 120000 index 446977ddc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-new.png +++ /dev/null @@ -1 +0,0 @@ -document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open-symbolic.png deleted file mode 120000 index 340a617d6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open.png deleted file mode 120000 index f58170cc1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-open.png +++ /dev/null @@ -1 +0,0 @@ -document-open.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape-symbolic.png deleted file mode 120000 index 95e896d4c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-orientation-landscape.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape.png deleted file mode 100644 index fcf7f2a49..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-landscape.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait-symbolic.png deleted file mode 120000 index 2dc258bb5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-orientation-portrait.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait.png deleted file mode 100644 index cb7b760bc..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-portrait.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape-symbolic.png deleted file mode 120000 index a6f0b4411..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-orientation-reverse-landscape.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape.png deleted file mode 100644 index 69ade2524..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-landscape.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait-symbolic.png deleted file mode 120000 index 1c8965166..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-orientation-reverse-portrait.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait.png deleted file mode 100644 index c309a6d82..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-orientation-reverse-portrait.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup-symbolic.png deleted file mode 120000 index ff4533cc1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-page-setup.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup.png deleted file mode 100644 index 9acf0d5ff..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-page-setup.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste-symbolic.png deleted file mode 120000 index 892561ea8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste.png deleted file mode 120000 index 2f55649f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-paste.png +++ /dev/null @@ -1 +0,0 @@ -edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences-symbolic.png deleted file mode 120000 index 5acf3b2f2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-preferences.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences.png deleted file mode 100644 index 2596f3cc5..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-preferences.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview-symbolic.png deleted file mode 120000 index 8fe93e04e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview.png deleted file mode 120000 index 9dfea717c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-preview.png +++ /dev/null @@ -1 +0,0 @@ -document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-symbolic.png deleted file mode 120000 index 95ed2ec91..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print.png deleted file mode 120000 index 863a49fc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-print.png +++ /dev/null @@ -1 +0,0 @@ -document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties-symbolic.png deleted file mode 120000 index 5c3325bfc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties.png deleted file mode 120000 index b447aa240..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-properties.png +++ /dev/null @@ -1 +0,0 @@ -document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit-symbolic.png deleted file mode 120000 index e599db624..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-quit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit.png deleted file mode 120000 index 0ecb0b9ba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-quit.png +++ /dev/null @@ -1 +0,0 @@ -application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png deleted file mode 120000 index d006923b8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-redo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr.png deleted file mode 120000 index 0061b57c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-redo-ltr.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh-symbolic.png deleted file mode 120000 index 38cbfeb52..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-refresh.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove-symbolic.png deleted file mode 120000 index 2e165cfdc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove.png deleted file mode 120000 index 1336403b3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-remove.png +++ /dev/null @@ -1 +0,0 @@ -list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr-symbolic.png deleted file mode 120000 index 39a6d5698..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-revert-to-saved-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr.png deleted file mode 120000 index 35c2c00a5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-ltr.png +++ /dev/null @@ -1 +0,0 @@ -document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl-symbolic.png deleted file mode 120000 index 77c9eaa81..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-revert-to-saved-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl.png deleted file mode 120000 index 35c2c00a5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-revert-to-saved-rtl.png +++ /dev/null @@ -1 +0,0 @@ -document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as-symbolic.png deleted file mode 120000 index a7410d076..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as.png deleted file mode 120000 index 6f8088857..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-as.png +++ /dev/null @@ -1 +0,0 @@ -document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-symbolic.png deleted file mode 120000 index 8eeb98b14..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save.png deleted file mode 120000 index b1240e18d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-save.png +++ /dev/null @@ -1 +0,0 @@ -document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all-symbolic.png deleted file mode 120000 index 2711e9b55..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all.png deleted file mode 120000 index 30033c765..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-all.png +++ /dev/null @@ -1 +0,0 @@ -edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color-symbolic.png deleted file mode 120000 index 367390596..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-select-color.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color.png deleted file mode 100644 index 0e71c35d7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-color.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font-symbolic.png deleted file mode 120000 index a4983fc58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-select-font.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font.png deleted file mode 100644 index cde0e8698..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-select-font.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending-symbolic.png deleted file mode 120000 index 30ddf10fa..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending.png deleted file mode 120000 index 28dd3cde5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-ascending.png +++ /dev/null @@ -1 +0,0 @@ -view-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending-symbolic.png deleted file mode 120000 index 794f2156f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending.png deleted file mode 120000 index 578592d3b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-sort-descending.png +++ /dev/null @@ -1 +0,0 @@ -view-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check-symbolic.png deleted file mode 120000 index bdf2c4c70..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-spell-check.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check.png deleted file mode 120000 index 23b82da94..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-spell-check.png +++ /dev/null @@ -1 +0,0 @@ -tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop-symbolic.png deleted file mode 120000 index 7c9bdc3d3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-stop.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough-symbolic.png deleted file mode 120000 index 6221ce0a3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough.png deleted file mode 120000 index 9ff9a3776..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-strikethrough.png +++ /dev/null @@ -1 +0,0 @@ -format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr-symbolic.png deleted file mode 120000 index 0877291c0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-undelete-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr.png deleted file mode 100644 index bccc39e7c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl-symbolic.png deleted file mode 120000 index 3844ffd1a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-undelete-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl.png deleted file mode 100644 index 22023b853..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undelete-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline-symbolic.png deleted file mode 120000 index 9c10f2b4f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline.png deleted file mode 120000 index 4f5b1549c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-underline.png +++ /dev/null @@ -1 +0,0 @@ -format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png deleted file mode 120000 index eb2a153d3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-undo-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr.png deleted file mode 120000 index 62d2a953e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-undo-ltr.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100-symbolic.png deleted file mode 120000 index 0615da6a2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-zoom-100.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100.png deleted file mode 120000 index bfeb09ed1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-100.png +++ /dev/null @@ -1 +0,0 @@ -zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png deleted file mode 120000 index b399469e7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-zoom-fit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-fit.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in-symbolic.png deleted file mode 120000 index 65c933a16..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in.png deleted file mode 120000 index ee0a4b39d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-in.png +++ /dev/null @@ -1 +0,0 @@ -zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out-symbolic.png deleted file mode 120000 index bd5b889a6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out.png deleted file mode 120000 index be243b08a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/gtk-zoom-out.png +++ /dev/null @@ -1 +0,0 @@ -zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive-symbolic.png deleted file mode 120000 index 0245415f2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -harddrive.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/harddrive.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount-symbolic.png deleted file mode 120000 index 0f5bce8a1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -hdd_unmount.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/hdd_unmount.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about-symbolic.png deleted file mode 120000 index dd431b5e8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about.png deleted file mode 100644 index 063d0df43..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-about.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents-symbolic.png deleted file mode 120000 index af8d871de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents.png deleted file mode 100644 index b00fbd8c1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-contents.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-symbolic.png deleted file mode 120000 index 102ea55da..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help.png deleted file mode 120000 index af8d871de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/help.png +++ /dev/null @@ -1 +0,0 @@ -help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing-symbolic.png deleted file mode 120000 index 344617bac..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -image-missing.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing.png deleted file mode 100644 index 90e26e5bc..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/image-missing.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info-symbolic.png deleted file mode 120000 index ad789b531..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory-symbolic.png deleted file mode 120000 index d8f486403..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -inode-directory.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/inode-directory.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home-symbolic.png deleted file mode 120000 index b2008e9c4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -kfm_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/kfm_home.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust-symbolic.png deleted file mode 120000 index c8d6c19de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -leftjust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust.png deleted file mode 120000 index 2da25a167..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/leftjust.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add-symbolic.png deleted file mode 120000 index 7d4c8781d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -list-add.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add.png deleted file mode 100644 index 2f8b70d9c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-add.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove-symbolic.png deleted file mode 120000 index 1336403b3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove.png deleted file mode 100644 index 0bd69c92c..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/list-remove.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom-symbolic.png deleted file mode 120000 index 848507774..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-cdrom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-cdrom.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy-symbolic.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy.png deleted file mode 100644 index 7ef7685f4..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-floppy.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical-symbolic.png deleted file mode 120000 index dcb92bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-optical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical.png deleted file mode 100644 index c4358f5f8..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-optical.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause-symbolic.png deleted file mode 120000 index 0ef65d6d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause.png deleted file mode 100644 index 6187ba6d2..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-pause.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr-symbolic.png deleted file mode 120000 index 1265a5a32..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-start-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr.png deleted file mode 100644 index 0f5348900..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl-symbolic.png deleted file mode 120000 index 956b43d14..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-start-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl.png deleted file mode 100644 index 036f05f55..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-start-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop-symbolic.png deleted file mode 120000 index 423c7cf20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop.png deleted file mode 100644 index 9e54ef3f5..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-playback-stop.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record-symbolic.png deleted file mode 120000 index 91f5c6f4d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record.png deleted file mode 100644 index d1b25c2f1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-record.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr-symbolic.png deleted file mode 120000 index 64288c383..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-seek-backward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr.png deleted file mode 100644 index 508808285..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl-symbolic.png deleted file mode 120000 index 9863a32f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-seek-backward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl.png deleted file mode 100644 index 4a1bdf89b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-backward-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr-symbolic.png deleted file mode 120000 index a7ca942c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-seek-forward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr.png deleted file mode 100644 index 4a1bdf89b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl-symbolic.png deleted file mode 120000 index 7829cab85..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-seek-forward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl.png deleted file mode 100644 index 508808285..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-seek-forward-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr-symbolic.png deleted file mode 120000 index cea15b4f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-skip-backward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr.png deleted file mode 100644 index c3a649f4e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl-symbolic.png deleted file mode 120000 index 11db21ad5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-skip-backward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl.png deleted file mode 100644 index 3da34257d..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-backward-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr-symbolic.png deleted file mode 120000 index bd7416fbd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-skip-forward-ltr.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr.png deleted file mode 100644 index 3da34257d..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-ltr.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl-symbolic.png deleted file mode 120000 index 0ea17ba14..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -media-skip-forward-rtl.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl.png deleted file mode 100644 index c3a649f4e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/media-skip-forward-rtl.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info-symbolic.png deleted file mode 120000 index bfc646ad5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -messagebox_info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/messagebox_info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii-symbolic.png deleted file mode 120000 index 12b223390..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -mime_ascii.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/mime_ascii.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc-symbolic.png deleted file mode 120000 index af684393f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -misc.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/misc.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle-symbolic.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle.png deleted file mode 100644 index a6f14418b..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-idle.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-symbolic.png deleted file mode 120000 index a14428c62..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -network.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network.png deleted file mode 120000 index 95ff6aad8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/network.png +++ /dev/null @@ -1 +0,0 @@ -folder-remote.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc-symbolic.png deleted file mode 120000 index 34044c00c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -nm-adhoc.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-adhoc.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired-symbolic.png deleted file mode 120000 index 6a9e23c0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -nm-device-wired.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wired.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless-symbolic.png deleted file mode 120000 index e650e72e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -nm-device-wireless.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless.png deleted file mode 120000 index ca31ae7fd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/nm-device-wireless.png +++ /dev/null @@ -1 +0,0 @@ -network-idle.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors-symbolic.png deleted file mode 120000 index 809305555..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -package_editors.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_editors.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings-symbolic.png deleted file mode 120000 index f7f21ce34..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -package_settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings.png deleted file mode 120000 index 1d8138d22..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/package_settings.png +++ /dev/null @@ -1 +0,0 @@ -preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause-symbolic.png deleted file mode 120000 index f6af01a48..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -player_pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause.png deleted file mode 120000 index 0ef65d6d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_pause.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record-symbolic.png deleted file mode 120000 index 5607649cd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -player_record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record.png deleted file mode 120000 index 91f5c6f4d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_record.png +++ /dev/null @@ -1 +0,0 @@ -media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop-symbolic.png deleted file mode 120000 index 13f0c5aad..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -player_stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop.png deleted file mode 120000 index 423c7cf20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/player_stop.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system-symbolic.png deleted file mode 120000 index 1d8138d22..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system.png deleted file mode 120000 index 5acf3b2f2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/preferences-system.png +++ /dev/null @@ -1 +0,0 @@ -gtk-preferences.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error-symbolic.png deleted file mode 120000 index cffd04483..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -printer-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error.png deleted file mode 100644 index 28517473d..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-error.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info-symbolic.png deleted file mode 120000 index aaa23147e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -printer-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info.png deleted file mode 100644 index 13304368e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-info.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused-symbolic.png deleted file mode 120000 index ba165131c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -printer-paused.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused.png deleted file mode 100644 index da6df48a9..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-paused.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning-symbolic.png deleted file mode 120000 index 6575a3557..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -printer-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning.png deleted file mode 100644 index dd70e0be9..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/printer-warning.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop-symbolic.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop.png deleted file mode 100644 index 54e1cb3e9..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/process-stop.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home-symbolic.png deleted file mode 120000 index 9d96edc09..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -redhat-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-home.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings-symbolic.png deleted file mode 120000 index 99d35dedc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -redhat-system_settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings.png deleted file mode 120000 index 1d8138d22..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redhat-system_settings.png +++ /dev/null @@ -1 +0,0 @@ -preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo-symbolic.png deleted file mode 120000 index 4d893d44a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo.png deleted file mode 120000 index 0061b57c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/redo.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload-symbolic.png deleted file mode 120000 index b51c479ad..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -reload.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3-symbolic.png deleted file mode 120000 index 160584a15..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -reload3.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload3.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs-symbolic.png deleted file mode 120000 index 4edfb5a4c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -reload_all_tabs.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_all_tabs.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page-symbolic.png deleted file mode 120000 index e8fdb1ec3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -reload_page.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/reload_page.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove-symbolic.png deleted file mode 120000 index 584599bf0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove.png deleted file mode 120000 index 1336403b3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/remove.png +++ /dev/null @@ -1 +0,0 @@ -list-remove.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert-symbolic.png deleted file mode 120000 index 00f6de08c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert.png deleted file mode 120000 index 35c2c00a5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/revert.png +++ /dev/null @@ -1 +0,0 @@ -document-revert.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust-symbolic.png deleted file mode 120000 index 4827d0f19..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -rightjust.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust.png deleted file mode 120000 index 017868ada..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/rightjust.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about-symbolic.png deleted file mode 120000 index 47f3160cc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about.png deleted file mode 120000 index dd431b5e8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_about.png +++ /dev/null @@ -1 +0,0 @@ -help-about.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom-symbolic.png deleted file mode 120000 index 7738c9958..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom.png deleted file mode 120000 index c58ca3d0f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_bottom.png +++ /dev/null @@ -1 +0,0 @@ -go-bottom.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close-symbolic.png deleted file mode 120000 index 462194393..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_close.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy-symbolic.png deleted file mode 120000 index d4fe9b004..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy.png deleted file mode 120000 index e106cb543..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_copy.png +++ /dev/null @@ -1 +0,0 @@ -edit-copy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut-symbolic.png deleted file mode 120000 index 6f34159d0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut.png deleted file mode 120000 index 32b03023c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_cut.png +++ /dev/null @@ -1 +0,0 @@ -edit-cut.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete-symbolic.png deleted file mode 120000 index 54b0ede76..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete.png deleted file mode 120000 index bb0a74a58..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_delete.png +++ /dev/null @@ -1 +0,0 @@ -edit-delete.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info-symbolic.png deleted file mode 120000 index 5b4fe4bc6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_dialog-info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down-symbolic.png deleted file mode 120000 index 56d981416..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down.png deleted file mode 120000 index 5240b846d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_down.png +++ /dev/null @@ -1 +0,0 @@ -go-down.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites-symbolic.png deleted file mode 120000 index 2c81081ca..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_file-properites.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites.png deleted file mode 120000 index b447aa240..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_file-properites.png +++ /dev/null @@ -1 +0,0 @@ -document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder-symbolic.png deleted file mode 120000 index 5376f31f6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder.png deleted file mode 120000 index 6b18cab33..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_folder.png +++ /dev/null @@ -1 +0,0 @@ -folder.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen-symbolic.png deleted file mode 120000 index 31893cedd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen.png deleted file mode 120000 index 37aaf877e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help-symbolic.png deleted file mode 120000 index f4d63feef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_help.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help.png deleted file mode 120000 index af8d871de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_help.png +++ /dev/null @@ -1 +0,0 @@ -help-contents.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home-symbolic.png deleted file mode 120000 index faf057c43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home.png deleted file mode 120000 index 718c1b215..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_home.png +++ /dev/null @@ -1 +0,0 @@ -go-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen-symbolic.png deleted file mode 120000 index 00f3f4f77..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_leave-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen.png deleted file mode 120000 index 5b9d8f68b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_leave-fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause-symbolic.png deleted file mode 120000 index fcf5ee6aa..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_media-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause.png deleted file mode 120000 index 0ef65d6d9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-pause.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-pause.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec-symbolic.png deleted file mode 120000 index 3703897de..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_media-rec.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec.png deleted file mode 120000 index 91f5c6f4d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-rec.png +++ /dev/null @@ -1 +0,0 @@ -media-record.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop-symbolic.png deleted file mode 120000 index d3284d99b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_media-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop.png deleted file mode 120000 index 423c7cf20..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_media-stop.png +++ /dev/null @@ -1 +0,0 @@ -media-playback-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text-symbolic.png deleted file mode 120000 index df5c64b6e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_new-text.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text.png deleted file mode 120000 index 446977ddc..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_new-text.png +++ /dev/null @@ -1 +0,0 @@ -document-new.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste-symbolic.png deleted file mode 120000 index d031aef3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste.png deleted file mode 120000 index 2f55649f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_paste.png +++ /dev/null @@ -1 +0,0 @@ -edit-paste.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview-symbolic.png deleted file mode 120000 index cb72d5f96..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview.png deleted file mode 120000 index 9dfea717c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-preview.png +++ /dev/null @@ -1 +0,0 @@ -document-print-preview.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-symbolic.png deleted file mode 120000 index 5ea564c1c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print.png deleted file mode 120000 index 863a49fc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_print.png +++ /dev/null @@ -1 +0,0 @@ -document-print.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties-symbolic.png deleted file mode 120000 index cead9f906..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties.png deleted file mode 120000 index b447aa240..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_properties.png +++ /dev/null @@ -1 +0,0 @@ -document-properties.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo-symbolic.png deleted file mode 120000 index 3abd89311..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo.png deleted file mode 120000 index 0061b57c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_redo.png +++ /dev/null @@ -1 +0,0 @@ -edit-redo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh-symbolic.png deleted file mode 120000 index e617eefc4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_refresh.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as-symbolic.png deleted file mode 120000 index dfda8bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as.png deleted file mode 120000 index 6f8088857..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-as.png +++ /dev/null @@ -1 +0,0 @@ -document-save-as.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-symbolic.png deleted file mode 120000 index 08802a248..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save.png deleted file mode 120000 index b1240e18d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_save.png +++ /dev/null @@ -1 +0,0 @@ -document-save.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace-symbolic.png deleted file mode 120000 index 539fd27e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_search-and-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace.png deleted file mode 120000 index e4057afed..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-and-replace.png +++ /dev/null @@ -1 +0,0 @@ -edit-find-replace.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-symbolic.png deleted file mode 120000 index 34bffb533..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_search.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search.png deleted file mode 120000 index dd4136811..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_search.png +++ /dev/null @@ -1 +0,0 @@ -edit-find.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all-symbolic.png deleted file mode 120000 index 49d937f83..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all.png deleted file mode 120000 index 30033c765..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_select-all.png +++ /dev/null @@ -1 +0,0 @@ -edit-select-all.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck-symbolic.png deleted file mode 120000 index afb170689..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_spellcheck.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck.png deleted file mode 120000 index 23b82da94..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_spellcheck.png +++ /dev/null @@ -1 +0,0 @@ -tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop-symbolic.png deleted file mode 120000 index e6673c5a3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_stop.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough-symbolic.png deleted file mode 120000 index 0d1cedb91..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough.png deleted file mode 120000 index 9ff9a3776..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text-strikethrough.png +++ /dev/null @@ -1 +0,0 @@ -format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold-symbolic.png deleted file mode 120000 index b34d8bcde..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold.png deleted file mode 120000 index ef50053bd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_bold.png +++ /dev/null @@ -1 +0,0 @@ -format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center-symbolic.png deleted file mode 120000 index 39bd0f289..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center.png deleted file mode 120000 index 980c099ef..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_center.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-center.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic-symbolic.png deleted file mode 120000 index eb525bea2..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic.png deleted file mode 120000 index 1ee2a31f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_italic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify-symbolic.png deleted file mode 120000 index 2db29cb19..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_justify.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify.png deleted file mode 120000 index f1d9574cf..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_justify.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-fill.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left-symbolic.png deleted file mode 120000 index 314710b94..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left.png deleted file mode 120000 index 2da25a167..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_left.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-left.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right-symbolic.png deleted file mode 120000 index 997c4e491..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right.png deleted file mode 120000 index 017868ada..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_right.png +++ /dev/null @@ -1 +0,0 @@ -format-justify-right.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined-symbolic.png deleted file mode 120000 index f57dd0345..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_text_underlined.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined.png deleted file mode 120000 index 4f5b1549c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_text_underlined.png +++ /dev/null @@ -1 +0,0 @@ -format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top-symbolic.png deleted file mode 120000 index 142c86cb8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top.png deleted file mode 120000 index 3b5b7d6e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_top.png +++ /dev/null @@ -1 +0,0 @@ -go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo-symbolic.png deleted file mode 120000 index 94134ab91..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo.png deleted file mode 120000 index 62d2a953e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_undo.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up-symbolic.png deleted file mode 120000 index 85fa025ce..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up.png deleted file mode 120000 index 4a1025d4a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_up.png +++ /dev/null @@ -1 +0,0 @@ -go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0-symbolic.png deleted file mode 120000 index 2fef47746..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_volume-0.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0.png deleted file mode 120000 index dd3d1eea4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-0.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-low.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max-symbolic.png deleted file mode 120000 index dad717d7c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_volume-max.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max.png deleted file mode 120000 index 3dc4302d0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-max.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-high.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med-symbolic.png deleted file mode 120000 index 70c0749e7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_volume-med.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med.png deleted file mode 120000 index 3e599b49d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-med.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-medium.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min-symbolic.png deleted file mode 120000 index 37d105ad7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_volume-min.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min.png deleted file mode 120000 index dd3d1eea4..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-min.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-low.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute-symbolic.png deleted file mode 120000 index 64de2b478..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_volume-mute.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute.png deleted file mode 120000 index 8aeeb8edd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-mute.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-muted.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-symbolic.png deleted file mode 120000 index ca538ec75..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_volume.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume.png deleted file mode 120000 index 3dc4302d0..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_volume.png +++ /dev/null @@ -1 +0,0 @@ -audio-volume-high.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1-symbolic.png deleted file mode 120000 index 15aa66135..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_zoom-1.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1.png deleted file mode 120000 index bfeb09ed1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-1.png +++ /dev/null @@ -1 +0,0 @@ -zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in-symbolic.png deleted file mode 120000 index e2bc92819..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in.png deleted file mode 120000 index ee0a4b39d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-in.png +++ /dev/null @@ -1 +0,0 @@ -zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out-symbolic.png deleted file mode 120000 index 3c633a495..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out.png deleted file mode 120000 index be243b08a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-out.png +++ /dev/null @@ -1 +0,0 @@ -zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page-symbolic.png deleted file mode 120000 index 3c75afc9e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_zoom-page.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stock_zoom-page.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop-symbolic.png deleted file mode 120000 index 6222e6f71..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop.png deleted file mode 120000 index 4e46eca45..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/stop.png +++ /dev/null @@ -1 +0,0 @@ -process-stop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy-symbolic.png deleted file mode 120000 index 1b471b958..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -system-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy.png deleted file mode 120000 index 279b7346f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-floppy.png +++ /dev/null @@ -1 +0,0 @@ -media-floppy.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run-symbolic.png deleted file mode 120000 index 9daf3feba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -system-run.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run.png deleted file mode 100644 index 2b11b5075..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/system-run.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic-symbolic.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic.png deleted file mode 100644 index c89e797b7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text-x-generic.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold-symbolic.png deleted file mode 120000 index 7297aca53..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text_bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold.png deleted file mode 120000 index ef50053bd..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_bold.png +++ /dev/null @@ -1 +0,0 @@ -format-text-bold.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic-symbolic.png deleted file mode 120000 index 567390a7e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text_italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic.png deleted file mode 120000 index 1ee2a31f8..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_italic.png +++ /dev/null @@ -1 +0,0 @@ -format-text-italic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike-symbolic.png deleted file mode 120000 index 67e697102..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text_strike.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike.png deleted file mode 120000 index 9ff9a3776..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_strike.png +++ /dev/null @@ -1 +0,0 @@ -format-text-strikethrough.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under-symbolic.png deleted file mode 120000 index 0032f1112..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -text_under.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under.png deleted file mode 120000 index 4f5b1549c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/text_under.png +++ /dev/null @@ -1 +0,0 @@ -format-text-underline.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling-symbolic.png deleted file mode 120000 index 23b82da94..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -tools-check-spelling.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling.png deleted file mode 100644 index 2574c181f..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/tools-check-spelling.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top-symbolic.png deleted file mode 120000 index 315e75e61..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top.png deleted file mode 120000 index 3b5b7d6e5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/top.png +++ /dev/null @@ -1 +0,0 @@ -go-top.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt-symbolic.png deleted file mode 120000 index 8ac1daefb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -txt.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2-symbolic.png deleted file mode 120000 index 387710868..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -txt2.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/txt2.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo-symbolic.png deleted file mode 120000 index 28c818a0e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo.png deleted file mode 120000 index 62d2a953e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/undo.png +++ /dev/null @@ -1 +0,0 @@ -edit-undo.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown-symbolic.png deleted file mode 120000 index b1754e727..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -unknown.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown.png deleted file mode 120000 index 3a5efdf43..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/unknown.png +++ /dev/null @@ -1 +0,0 @@ -text-x-generic.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up-symbolic.png deleted file mode 120000 index 3a33d8bde..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up.png deleted file mode 120000 index 4a1025d4a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/up.png +++ /dev/null @@ -1 +0,0 @@ -go-up.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop-symbolic.png deleted file mode 120000 index 200ab00ab..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -user-desktop.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop.png deleted file mode 100644 index 28b68f338..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-desktop.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home-symbolic.png deleted file mode 120000 index 8c668dc1c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -user-home.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home.png deleted file mode 100644 index 28b68f338..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/user-home.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen-symbolic.png deleted file mode 120000 index 37aaf877e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen.png deleted file mode 100644 index 21462fe0e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-fullscreen.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh-symbolic.png deleted file mode 120000 index 521b94e2e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-refresh.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh.png deleted file mode 100644 index 09b5df1d1..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-refresh.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore-symbolic.png deleted file mode 120000 index 5b9d8f68b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore.png deleted file mode 100644 index ff9c2289d..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-restore.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending-symbolic.png deleted file mode 120000 index 28dd3cde5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-sort-ascending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending.png deleted file mode 100644 index 44c871133..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-ascending.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending-symbolic.png deleted file mode 120000 index 578592d3b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -view-sort-descending.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending.png deleted file mode 100644 index d498a59a5..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/view-sort-descending.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+-symbolic.png deleted file mode 120000 index 920bdf9e9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -viewmag+.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+.png deleted file mode 120000 index ee0a4b39d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag+.png +++ /dev/null @@ -1 +0,0 @@ -zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag--symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag--symbolic.png deleted file mode 120000 index 604b33d4b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag--symbolic.png +++ /dev/null @@ -1 +0,0 @@ -viewmag-.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag-.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag-.png deleted file mode 120000 index be243b08a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag-.png +++ /dev/null @@ -1 +0,0 @@ -zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1-symbolic.png deleted file mode 120000 index 14537edeb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -viewmag1.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1.png deleted file mode 120000 index bfeb09ed1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmag1.png +++ /dev/null @@ -1 +0,0 @@ -zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit-symbolic.png deleted file mode 120000 index 4530444b9..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -viewmagfit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/viewmagfit.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close-symbolic.png deleted file mode 120000 index f8a647d3d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -window-close.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close.png deleted file mode 100644 index 312b84dae..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window-close.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen-symbolic.png deleted file mode 120000 index 5e184b6c7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -window_fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen.png deleted file mode 120000 index 37aaf877e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_fullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-fullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen-symbolic.png deleted file mode 120000 index 07b973d67..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -window_nofullscreen.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen.png deleted file mode 120000 index 5b9d8f68b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/window_nofullscreen.png +++ /dev/null @@ -1 +0,0 @@ -view-restore.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit-symbolic.png deleted file mode 120000 index 214adf7fb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -xfce-system-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit.png deleted file mode 120000 index 0ecb0b9ba..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-exit.png +++ /dev/null @@ -1 +0,0 @@ -application-exit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings-symbolic.png deleted file mode 120000 index 28a6ef505..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -xfce-system-settings.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings.png deleted file mode 120000 index 1d8138d22..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/xfce-system-settings.png +++ /dev/null @@ -1 +0,0 @@ -preferences-system.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD-symbolic.png deleted file mode 120000 index 5de487b88..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -yast_HD.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_HD.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude-symbolic.png deleted file mode 120000 index a2fdbdd54..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -yast_idetude.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude.png deleted file mode 120000 index 5ae622860..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/yast_idetude.png +++ /dev/null @@ -1 +0,0 @@ -drive-harddisk.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit-symbolic.png deleted file mode 120000 index 181b01518..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-best-fit.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-best-fit.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best-symbolic.png deleted file mode 120000 index 9b4965a87..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-fit-best.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best.png deleted file mode 100644 index dfbdf9b6e..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-fit-best.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in-symbolic.png deleted file mode 120000 index ee0a4b39d..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-in.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in.png deleted file mode 100644 index 3a386fae7..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-in.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original-symbolic.png deleted file mode 120000 index bfeb09ed1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-original.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original.png deleted file mode 100644 index 499cbd6c6..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-original.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out-symbolic.png deleted file mode 120000 index be243b08a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -zoom-out.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out.png b/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out.png deleted file mode 100644 index 22afd1951..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/24x24/stock/zoom-out.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple-symbolic.png deleted file mode 120000 index 0bf3991f5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dnd-multiple.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple.png b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple.png deleted file mode 100644 index dc09283f4..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-multiple.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-symbolic.png deleted file mode 120000 index b0e9ec3d7..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dnd.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd.png b/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd.png deleted file mode 100644 index c58e5a6f4..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/32x32/stock/gtk-dnd.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error-symbolic.png deleted file mode 120000 index ab8db5ec3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error.png deleted file mode 100644 index cb03e5420..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-error.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information-symbolic.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information.png deleted file mode 100644 index d73990ecc..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-information.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password-symbolic.png deleted file mode 120000 index c9e65253c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dialog-password.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password.png deleted file mode 100644 index f81198437..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-password.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question-symbolic.png deleted file mode 120000 index 80b9b28c1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question.png deleted file mode 100644 index 14dbd9cac..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-question.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning-symbolic.png deleted file mode 120000 index 91cec009b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning.png deleted file mode 100644 index 827a33918..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/dialog-warning.png and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error-symbolic.png deleted file mode 120000 index 39fca4944..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error.png deleted file mode 120000 index ab8db5ec3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/error.png +++ /dev/null @@ -1 +0,0 @@ -dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication-symbolic.png deleted file mode 120000 index 51ce2e75e..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dialog-authentication.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication.png deleted file mode 120000 index c9e65253c..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-authentication.png +++ /dev/null @@ -1 +0,0 @@ -dialog-password.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error-symbolic.png deleted file mode 120000 index e5f28e590..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error.png deleted file mode 120000 index ab8db5ec3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-error.png +++ /dev/null @@ -1 +0,0 @@ -dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info-symbolic.png deleted file mode 120000 index 70ccbc7aa..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question-symbolic.png deleted file mode 120000 index 40bbebc0a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question.png deleted file mode 120000 index 80b9b28c1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-question.png +++ /dev/null @@ -1 +0,0 @@ -dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning-symbolic.png deleted file mode 120000 index 0a6758972..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -gtk-dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning.png deleted file mode 120000 index 91cec009b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/gtk-dialog-warning.png +++ /dev/null @@ -1 +0,0 @@ -dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important-symbolic.png deleted file mode 120000 index e90fb7379..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -important.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important.png deleted file mode 120000 index 91cec009b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/important.png +++ /dev/null @@ -1 +0,0 @@ -dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info-symbolic.png deleted file mode 120000 index ad789b531..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical-symbolic.png deleted file mode 120000 index d94c949fb..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -messagebox_critical.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical.png deleted file mode 120000 index ab8db5ec3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_critical.png +++ /dev/null @@ -1 +0,0 @@ -dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info-symbolic.png deleted file mode 120000 index bfc646ad5..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -messagebox_info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning-symbolic.png deleted file mode 120000 index a153cb75b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -messagebox_warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning.png deleted file mode 120000 index 91cec009b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/messagebox_warning.png +++ /dev/null @@ -1 +0,0 @@ -dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error-symbolic.png deleted file mode 120000 index 561c74e6a..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error.png deleted file mode 120000 index ab8db5ec3..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-error.png +++ /dev/null @@ -1 +0,0 @@ -dialog-error.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info-symbolic.png deleted file mode 120000 index 5b4fe4bc6..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_dialog-info.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info.png deleted file mode 120000 index 5faec85f1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-info.png +++ /dev/null @@ -1 +0,0 @@ -dialog-information.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question-symbolic.png deleted file mode 120000 index 18fb1c428..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question.png deleted file mode 120000 index 80b9b28c1..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-question.png +++ /dev/null @@ -1 +0,0 @@ -dialog-question.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning-symbolic.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning-symbolic.png deleted file mode 120000 index b140b7938..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -stock_dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning.png b/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning.png deleted file mode 120000 index 91cec009b..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/48x48/stock/stock_dialog-warning.png +++ /dev/null @@ -1 +0,0 @@ -dialog-warning.png \ No newline at end of file diff --git a/packaging/macosx/Resources/icons/GtkStock/icon-theme.cache b/packaging/macosx/Resources/icons/GtkStock/icon-theme.cache deleted file mode 100644 index f0a1f2e23..000000000 Binary files a/packaging/macosx/Resources/icons/GtkStock/icon-theme.cache and /dev/null differ diff --git a/packaging/macosx/Resources/icons/GtkStock/index.theme b/packaging/macosx/Resources/icons/GtkStock/index.theme deleted file mode 100644 index 04adf411f..000000000 --- a/packaging/macosx/Resources/icons/GtkStock/index.theme +++ /dev/null @@ -1,34 +0,0 @@ -[Icon Theme] -Name=GtkStock -Inherits=hicolor -Comment=Gtk Stock Icons for Inkscape.app -Example=folder - -# Directory list -Directories=16x16/stock,20x20/stock,24x24/stock,32x32/stock,48x48/stock, - -[16x16/stock] -Size=16 -Context=Stock -Type=fixed - -[20x20/stock] -Size=20 -Context=Stock -Type=fixed - -[24x24/stock] -Size=24 -Context=Stock -Type=fixed - -[32x32/stock] -Size=32 -Context=Stock -Type=fixed - -[48x48/stock] -Size=48 -Context=Stock -Type=fixed - diff --git a/packaging/macosx/create-stock-icon-theme.sh b/packaging/macosx/create-stock-icon-theme.sh new file mode 100755 index 000000000..de3d4d94b --- /dev/null +++ b/packaging/macosx/create-stock-icon-theme.sh @@ -0,0 +1,165 @@ +#!/usr/bin/env bash +# +# +# Create new icon theme based on GTK+ stock icons +# +# Copyright (C) 2014 ~suv +# + + +# config +#--------------------------------------------------------- + +if [ -z $LIBPREFIX ]; then + LIBPREFIX="$MP_QUARTZ_PREFIX" +fi +if [ -z $stock_src ]; then + stock_src="$(pwd)/stock-icons" +fi + + +# setup +#--------------------------------------------------------- + +map_legacy_icons="$LIBPREFIX/libexec/icon-name-mapping" +if [ ! -x "$map_legacy_icons" ]; then + echo "Install icon-naming-utils" + exit 1 +fi + +if [ ! -d "$stock_src" ]; then + echo "extra icons not found." + exit 1 +fi + +ICONDIR="$1" +icon_theme_dir="$(dirname "$ICONDIR")" +if [ ! -d "$icon_theme_dir" ] ; then + mkdir -p "$icon_theme_dir" +fi +icon_theme_name="$(basename "$ICONDIR")" +if [ -z "$icon_theme_name" ]; then + echo "Not a valid icon theme name." + exit 1 +fi +theme_color="$2" + +contexts="actions animations apps categories devices emblems emotes mimetypes places status" +gtk_stock_sizes="16 20 24 32 48" + +orig_dir="$(pwd)" +cd "$icon_theme_dir" +current_dir="$(pwd)" + +index_file="${icon_theme_name}/index.theme" + + +# Remove a previously existing icon theme if necessary +#--------------------------------------------------------- + +if [ -d "$icon_theme_name" ]; then + echo "Removing previous $icon_theme_name" + rm -R "$icon_theme_name" +fi + + +# create new icon theme structure +#--------------------------------------------------------- + +mkdir -p "$icon_theme_name" +for size in $gtk_stock_sizes; do + mkdir "${icon_theme_name}/${size}x${size}" +done + + +# copy stock icons +#--------------------------------------------------------- + +for size in $gtk_stock_sizes; do + cp -RP "${stock_src}/$size" "${icon_theme_name}/${size}x${size}/stock" +done + +# workarounds for broken icons (bug #1269698) +#--------------------------------------------------------- + +for size in $gtk_stock_sizes; do + cd "${icon_theme_name}/${size}x${size}/stock" + # directional icons + for di in "edit-undo" "edit-redo" "document-revert"; do + if [ -f "${di}-ltr.png" ]; then + if [ ! -e "${di}.png" ]; then + ln -s "${di}-ltr.png" "${di}.png" + fi + fi + done + # misc failed lookups + for di in "preferences"; do + if [ -f "gtk-${di}.png" ]; then + if [ ! -e "${di}-system.png" ]; then + ln -s "gtk-${di}.png" "${di}-system.png" + fi + fi + done + cd "$current_dir" +done + +# create links (round 1) +#--------------------------------------------------------- + +for size in $gtk_stock_sizes; do + cd "${icon_theme_name}/${size}x${size}" + for ct in $contexts; do + echo "size: $size context: $ct" + mv "stock" "$ct" + $map_legacy_icons -c "$ct" + mv $ct "stock" + done + cd "$current_dir" +done + + +# create links (round 2) +#--------------------------------------------------------- + +for size in $gtk_stock_sizes; do + cd "${icon_theme_name}/${size}x${size}/stock" + for icon_file in *.png; do + [ -s $icon_file ] && ln -s "$icon_file" "$(basename $icon_file .png)"-symbolic.png + done + cd "$current_dir" +done + + +# create new index.theme +#--------------------------------------------------------- + +dir_list= +for size in $gtk_stock_sizes; do + dir_list="${dir_list}${size}x${size}/stock," +done + +cat > "$index_file" <<End-of-message +[Icon Theme] +Name=$icon_theme_name +Inherits=hicolor +Comment=Gtk Stock Icons for Inkscape.app +Example=folder + +# Directory list +Directories=$dir_list + +End-of-message + +for size in $gtk_stock_sizes; do + cat >> "$index_file" << End-of-message +[${size}x${size}/stock] +Size=${size} +Context=Stock +Type=fixed + +End-of-message +done + + +#--------------------------------------------------------- +# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index fcdc1d30b..00cf75cd4 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -202,6 +202,11 @@ fi # Set the 'macosx' directory, usually the current directory. resdir=`pwd` +# Custom resources used for symbolic icons and dark theme +if [ -z "$custom_res" ] ; then + custom_res="${resdir}/Resources-extras" +fi + # Prepare Package #---------------------------------------------------------- @@ -268,13 +273,18 @@ cp -rp "$LIBPREFIX/share/mime" "$pkgresources/share/" mkdir -p "$pkgresources/share/icons/hicolor" cp "$LIBPREFIX/share/icons/hicolor/index.theme" "$pkgresources/share/icons/hicolor" +# GTK+ stock icons with legacy icon mapping +echo "Creating GtkStock icon theme ..." +stock_src="${custom_res}/src/icons/stock-icons" \ + ./create-stock-icon-theme.sh "${pkgshare}/icons/GtkStock" +gtk-update-icon-cache --index-only "${pkgshare}/icons/GtkStock" + # GTK+ themes cp -RP "$LIBPREFIX/share/gtk-engines" "$pkgshare/" for item in Adwaita Clearlooks HighContrast Industrial Raleigh Redmond ThinIce; do mkdir -p "$pkgshare/themes/$item" cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" done -(cd "$pkgshare/themes/" && ln -s Adwaita Adwaita-osxapp) # Icons and the rest of the script framework rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" -- cgit v1.2.3 From e47631e23b2a86470e4e801561068e04f779a927 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 04:10:47 +0200 Subject: follow-up to previous commit (adjust fallback for LIBPREFIX, adjust comment) (bzr r13506.1.14) --- packaging/macosx/create-stock-icon-theme.sh | 2 +- packaging/macosx/osx-app.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/create-stock-icon-theme.sh b/packaging/macosx/create-stock-icon-theme.sh index de3d4d94b..6ca3d5772 100755 --- a/packaging/macosx/create-stock-icon-theme.sh +++ b/packaging/macosx/create-stock-icon-theme.sh @@ -11,7 +11,7 @@ #--------------------------------------------------------- if [ -z $LIBPREFIX ]; then - LIBPREFIX="$MP_QUARTZ_PREFIX" + LIBPREFIX="/opt/local-x11" fi if [ -z $stock_src ]; then stock_src="$(pwd)/stock-icons" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 00cf75cd4..848b70080 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -202,7 +202,7 @@ fi # Set the 'macosx' directory, usually the current directory. resdir=`pwd` -# Custom resources used for symbolic icons and dark theme +# Custom resources used to generate resources during app bundle creation. if [ -z "$custom_res" ] ; then custom_res="${resdir}/Resources-extras" fi -- cgit v1.2.3 From 38704943098b40869a7761bec59bf443f38dd50e Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 04:27:21 +0200 Subject: fontconfig: fix copying of conf.avail; disable bitmap fonts (see bug #714859) (bzr r13506.1.15) --- packaging/macosx/osx-app.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 848b70080..5b147cb8e 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -314,10 +314,11 @@ ModuleFiles=\${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91/pang END_PANGO mkdir -p $pkgetc/fonts -#cp -r $LIBPREFIX/etc/fonts/fonts.conf $pkgetc/fonts/ cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ +mkdir -p $pkgshare/fontconfig cp -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ -(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/10-autohint.conf . ) +(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/10-autohint.conf) +(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/70-no-bitmaps.conf) for item in gnome-vfs-mime-magic gnome-vfs-2.0 -- cgit v1.2.3 From 1cabe7fe34f3012599169d8c112db4393d5d929d Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 04:43:31 +0200 Subject: ScriptExec: cleanup (remove defined but not used function) (bzr r13506.1.16) --- packaging/macosx/ScriptExec/main.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c index c9c6ffaa8..0e4efd4e8 100644 --- a/packaging/macosx/ScriptExec/main.c +++ b/packaging/macosx/ScriptExec/main.c @@ -542,29 +542,6 @@ static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent, } -static void OpenURL(Str255 url) -{ - // Use Internet Config to hand the URL to the appropriate application, as - // set by the user in the Internet Preferences pane. - ICInstance icInstance; - // Applications creator code: - OSType signature = 'Inks'; - OSStatus error = ICStart( &icInstance, signature ); - if ( error == noErr ) - { - ConstStr255Param hint = 0x0; - const char* data = url; - long length = strlen(url); - long start = 0; - long end = length; - // Don't bother testing return value (error); launched application will - // report problems. - ICLaunchURL( icInstance, hint, data, length, &start, &end ); - ICStop( icInstance ); - } -} - - // Compile and run a small AppleScript. The code below does no cleanup and no proper error checks // but since it's there until the app is shut down, and since we know the script is okay, // there should not be any problems. -- cgit v1.2.3 From c65f6a562ec06e045ad352b952ee19f738deddb6 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 05:13:01 +0200 Subject: macosx packaging: a few minor changes (bzr r13506.1.17) --- packaging/macosx/Resources/bin/inkscape | 12 ++++++------ packaging/macosx/osx-app.sh | 10 ---------- packaging/macosx/osx-build.sh | 3 ++- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 510e91e32..ea52602a2 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -88,9 +88,9 @@ if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] then LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ sed 's/_.*//'` - echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 else - echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 fi # NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape @@ -98,7 +98,7 @@ fi if [ "x$LANGSTR" == "x" ] then # override broken script - echo "Overriding empty LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 export LANG="en_US.UTF-8" else tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ @@ -106,14 +106,14 @@ else if [ "x$tmpLANG" == "x" ] then # override broken script - echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 + [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 export LANG="en_US.UTF-8" else - echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 + [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 export LANG="$tmpLANG.UTF-8" fi fi -echo "Setting Language: $LANG" 1>&2 +[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$PREFDIR/pangorc" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 5b147cb8e..c3af0f5d2 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -225,16 +225,6 @@ mkdir -p "$pkgshare" mkdir -p "$pkglocale" mkdir -p "$pkgpython" -mkdir -p "$pkgresources/Dutch.lprj" -mkdir -p "$pkgresources/English.lprj" -mkdir -p "$pkgresources/French.lprj" -mkdir -p "$pkgresources/German.lprj" -mkdir -p "$pkgresources/Italian.lprj" -mkdir -p "$pkgresources/Spanish.lprj" -mkdir -p "$pkgresources/fi.lprj" -mkdir -p "$pkgresources/no.lprj" -mkdir -p "$pkgresources/sv.lprj" - # Build and add the launcher #---------------------------------------------------------- ( diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index a3e87c0e7..e0b5e955a 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -183,6 +183,7 @@ fi REVISION=$(bzr revno) ARCH=$(arch) TARGETVERSION=$(/usr/bin/sw_vers | fgrep ProductVersion | tr -d \ | cut -d: -f2) +TARGETARCH=$ARCH NEWNAME="Inkscape-r$REVISION-$TARGETVERSION-$TARGETARCH" DMGFILE="$NEWNAME.dmg" @@ -320,7 +321,7 @@ Included dependency versions: Poppler `checkversion poppler-cairo` LittleCMS `checkversion lcms` GnomeVFS `checkversion gnome-vfs-2.0` - LibWPG `checkversion libwpg-0.1` + LibWPG `checkversion libwpg-0.2` Configure options: $CONFFLAGS" > $INFOFILE if [[ "$STRIP" == "t" ]]; then -- cgit v1.2.3 From d49572f664e1db84106a7424514eb9e92660be86 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 05:18:49 +0200 Subject: Enable lcms2 support on OS X (bzr r13506.1.19) --- configure.ac | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 45abd1973..c6bbc33f0 100644 --- a/configure.ac +++ b/configure.ac @@ -389,10 +389,7 @@ if test "x$enable_lcms" = "xno"; then have_lcms2=no else # Have to test LittleCms presence - if test "x${platform_osx}" != "xyes"; then - # lcms 2.2 & 2.3 have problems on OSX - PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no") - fi + PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no") if test "x${have_lcms2}" = "xyes"; then LIBS="$LIBS $LCMS2_LIBS" -- cgit v1.2.3 From 6f9d4072f2b664ca790428ea1ce0b349f3eb4544 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 13:46:30 +0200 Subject: revert PREFDIR changes because ~/.inkscape-etc is still referenced elsewhere. (bzr r13506.1.20) --- packaging/macosx/Resources/bin/inkscape | 17 ++++++++--------- packaging/macosx/osx-app.sh | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index ea52602a2..dd0fa5bae 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -42,13 +42,12 @@ export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # No longer required if path rewriting has been conducted. # export DYLD_LIBRARY_PATH="$TOP/lib" -PREFDIR="${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91" -mkdir -p "$PREFDIR" +mkdir -p "${HOME}/.inkscape-etc" export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="$PREFDIR/pangorc" -export GTK_IM_MODULE_FILE="$PREFDIR/gtk.immodules" -export GDK_PIXBUF_MODULE_FILE="$PREFDIR/gdk-pixbuf.loaders" +export PANGO_RC_FILE="${HOME}/.inkscape-etc/pangorc" +export GTK_IM_MODULE_FILE="${HOME}/.inkscape-etc/gtk.immodules" +export GDK_PIXBUF_MODULE_FILE="${HOME}/.inkscape-etc/gdk-pixbuf.loaders" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" @@ -116,12 +115,12 @@ fi [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" -sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$PREFDIR/pangorc" +sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "$PREFDIR/pango.modules" + > "${HOME}/.inkscape-etc/pango.modules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ - > "$PREFDIR/gtk.immodules" + > "${HOME}/.inkscape-etc/gtk.immodules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ - > "$PREFDIR/gdk-pixbuf.loaders" + > "${HOME}/.inkscape-etc/gdk-pixbuf.loaders" exec "$CWD/inkscape-bin" "$@" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index c3af0f5d2..5254f9934 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -300,7 +300,7 @@ mkdir -p $pkgetc/pango sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $LIBPREFIX/etc/pango/pango.modules > $pkgetc/pango/pango.modules cat > $pkgetc/pango/pangorc <<END_PANGO [Pango] -ModuleFiles=\${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91/pango.modules +ModuleFiles=\${HOME}/.inkscape-etc/pango.modules END_PANGO mkdir -p $pkgetc/fonts -- cgit v1.2.3 From d73bfb898c94b5433068ff5816a347abf090e7dd Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 14:22:02 +0200 Subject: update name and location of loader caches (upstream changes) (bzr r13506.1.21) --- packaging/macosx/Resources/bin/inkscape | 12 ++++++------ packaging/macosx/osx-app.sh | 14 ++++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index dd0fa5bae..207a4a8a4 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -46,8 +46,8 @@ mkdir -p "${HOME}/.inkscape-etc" export FONTCONFIG_PATH="$TOP/etc/fonts" export PANGO_RC_FILE="${HOME}/.inkscape-etc/pangorc" -export GTK_IM_MODULE_FILE="${HOME}/.inkscape-etc/gtk.immodules" -export GDK_PIXBUF_MODULE_FILE="${HOME}/.inkscape-etc/gdk-pixbuf.loaders" +export GTK_IM_MODULE_FILE="${HOME}/.inkscape-etc/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="${HOME}/.inkscape-etc/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" @@ -118,9 +118,9 @@ export LC_ALL="$LANG" sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ > "${HOME}/.inkscape-etc/pango.modules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ - > "${HOME}/.inkscape-etc/gtk.immodules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ - > "${HOME}/.inkscape-etc/gdk-pixbuf.loaders" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ + > "${HOME}/.inkscape-etc/immodules.cache" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ + > "${HOME}/.inkscape-etc/loaders.cache" exec "$CWD/inkscape-bin" "$@" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 5254f9934..435d5c541 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -327,12 +327,14 @@ cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ mkdir -p $pkglib/gnome-vfs-2.0/modules cp $LIBPREFIX/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/ -mkdir -p $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders -cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/ - -mkdir -p "$pkgetc/gtk-2.0/" -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkgetc/gtk-2.0/gtk.immodules -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders.cache > $pkgetc/gtk-2.0/gdk-pixbuf.loaders +gdk_pixbuf_version=`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0` +mkdir -p $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders +cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/ + +sed -e "s,__gtk_version__,$gtk_version,g" -i "" $pkgbin/inkscape +sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" $pkgbin/inkscape +sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkglib/gtk-2.0/$gtk_version/immodules.cache +sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache > $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" cp -r "$LIBPREFIX/share/ImageMagick-6" "$pkgresources/share/" -- cgit v1.2.3 From 6c1a6610cc1db07396ad83d53ee4beb5c3ba7a2d Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 14:47:24 +0200 Subject: prepare to use XDG Base Directory Specification for user files (bzr r13506.1.22) --- packaging/macosx/Resources/bin/inkscape | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 207a4a8a4..9f60231d6 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -42,12 +42,22 @@ export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # No longer required if path rewriting has been conducted. # export DYLD_LIBRARY_PATH="$TOP/lib" -mkdir -p "${HOME}/.inkscape-etc" +XDG_CACHE_HOME="${HOME}/.cache" +XDG_CONFIG_HOME="${HOME}/.config" +XDG_DATA_HOME="${HOME}/.local/share" + +mkdir -p "$XDG_CACHE_HOME" +mkdir -p "$XDG_CONFIG_HOME" +mkdir -p "$XDG_DATA_HOME" + +#INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" +INK_CACHE_DIR="${HOME}/.inkscape-etc" +mkdir -p "$INK_CACHE_DIR" export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="${HOME}/.inkscape-etc/pangorc" -export GTK_IM_MODULE_FILE="${HOME}/.inkscape-etc/immodules.cache" -export GDK_PIXBUF_MODULE_FILE="${HOME}/.inkscape-etc/loaders.cache" +export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" +export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" @@ -115,12 +125,12 @@ fi [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" -sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" +sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${HOME}/.inkscape-etc/pango.modules" + > "${INK_CACHE_DIR}/pango.modules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ - > "${HOME}/.inkscape-etc/immodules.cache" + > "${INK_CACHE_DIR}/immodules.cache" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ - > "${HOME}/.inkscape-etc/loaders.cache" + > "${INK_CACHE_DIR}/loaders.cache" exec "$CWD/inkscape-bin" "$@" -- cgit v1.2.3 From 08c216563001beb88226d75384e7436c81a5d70e Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 15:06:40 +0200 Subject: use $XDG_CACHE_HOME/inkscape instead of ~/.inkscape-etc for generated rc and loader cache files (bzr r13506.1.23) --- packaging/macosx/Resources/bin/inkscape | 12 ++++++------ packaging/macosx/Resources/script | 4 +++- packaging/macosx/ScriptExec/main.c | 5 +++-- packaging/macosx/osx-app.sh | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 9f60231d6..282752c1a 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -42,16 +42,16 @@ export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # No longer required if path rewriting has been conducted. # export DYLD_LIBRARY_PATH="$TOP/lib" -XDG_CACHE_HOME="${HOME}/.cache" -XDG_CONFIG_HOME="${HOME}/.config" -XDG_DATA_HOME="${HOME}/.local/share" +export XDG_CACHE_HOME="${HOME}/.cache" +export XDG_CONFIG_HOME="${HOME}/.config" +export XDG_DATA_HOME="${HOME}/.local/share" mkdir -p "$XDG_CACHE_HOME" mkdir -p "$XDG_CONFIG_HOME" mkdir -p "$XDG_DATA_HOME" -#INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" -INK_CACHE_DIR="${HOME}/.inkscape-etc" +INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" +#INK_CACHE_DIR="${HOME}/.inkscape-etc" mkdir -p "$INK_CACHE_DIR" export FONTCONFIG_PATH="$TOP/etc/fonts" @@ -125,7 +125,7 @@ fi [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" -sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" +sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ > "${INK_CACHE_DIR}/pango.modules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index b6464de96..b1450bc17 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -9,7 +9,9 @@ CWD=`dirname "$0"` export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` # Warn the user about time-consuming generation of fontconfig caches. -test -f "${HOME}/.inkscape-etc/.fccache-new" || exit 12 +# TODO: Somehow keep in sync with ScriptExec and bin/inkscape. +# Ideally refer to $XDG_CACHE_HOME/inkscape everywhere, but how? +test -f "${HOME}/.cache/inkscape/.fccache-new" || exit 12 diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c index 0e4efd4e8..37b3a4ff3 100644 --- a/packaging/macosx/ScriptExec/main.c +++ b/packaging/macosx/ScriptExec/main.c @@ -241,8 +241,9 @@ static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, ShowFirstStartWarningDialog(); // Note that we've seen the warning. - system("test -d \"$HOME/.inkscape-etc\" || mkdir -p \"$HOME/.inkscape-etc\"; " - "touch \"$HOME/.inkscape-etc/.fccache-new\""); + // TODO: somehow make this aware of $XDG_CACHE_HOME as set in the launcher + system("test -d \"$HOME/.cache/inkscape\" || mkdir -p \"$HOME/.cache/inkscape\"; " + "touch \"$HOME/.cache/inkscape/.fccache-new\""); // Rerun now. OSErr err = ExecuteScript(scriptPath, &pid); ExitToShell(); diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 435d5c541..d39bee144 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -300,7 +300,7 @@ mkdir -p $pkgetc/pango sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $LIBPREFIX/etc/pango/pango.modules > $pkgetc/pango/pango.modules cat > $pkgetc/pango/pangorc <<END_PANGO [Pango] -ModuleFiles=\${HOME}/.inkscape-etc/pango.modules +ModuleFiles=\${INK_CACHE_DIR}/pango.modules END_PANGO mkdir -p $pkgetc/fonts -- cgit v1.2.3 From 0ecf87014ce8c02a621460760653a2b8870bcddc Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 15:09:30 +0200 Subject: cleanup: remove unused variables and outdated comments (bzr r13506.1.24) --- packaging/macosx/Resources/bin/inkscape | 4 ---- packaging/macosx/Resources/script | 3 --- 2 files changed, 7 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 282752c1a..40e44f49d 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -39,9 +39,6 @@ PYTHON_VERS=`python -V 2>&1 | cut -c 8-10` export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # NB: we are only preprending some stuff to the default python path so if the directory does not exist it should not harm the rest -# No longer required if path rewriting has been conducted. -# export DYLD_LIBRARY_PATH="$TOP/lib" - export XDG_CACHE_HOME="${HOME}/.cache" export XDG_CONFIG_HOME="${HOME}/.config" export XDG_DATA_HOME="${HOME}/.local/share" @@ -51,7 +48,6 @@ mkdir -p "$XDG_CONFIG_HOME" mkdir -p "$XDG_DATA_HOME" INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" -#INK_CACHE_DIR="${HOME}/.inkscape-etc" mkdir -p "$INK_CACHE_DIR" export FONTCONFIG_PATH="$TOP/etc/fonts" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index b1450bc17..33d5a6c50 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -5,9 +5,6 @@ CWD=`dirname "$0"` -# System version: 3 for Panther, 4 for Tiger, 5 for Leopard -export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` - # Warn the user about time-consuming generation of fontconfig caches. # TODO: Somehow keep in sync with ScriptExec and bin/inkscape. # Ideally refer to $XDG_CACHE_HOME/inkscape everywhere, but how? -- cgit v1.2.3 From 5ccd52b2d1c8ec1b04a24c9da81d6c91a4273c4f Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 15:14:03 +0200 Subject: add TODO comment to Resources/bin/inkscape too (bzr r13506.1.25) --- packaging/macosx/Resources/bin/inkscape | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 40e44f49d..a7baac64b 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -47,6 +47,7 @@ mkdir -p "$XDG_CACHE_HOME" mkdir -p "$XDG_CONFIG_HOME" mkdir -p "$XDG_DATA_HOME" +# TODO: keep in sync with ScriptExec and Resources/script INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" mkdir -p "$INK_CACHE_DIR" -- cgit v1.2.3 From bec0a3b7e0a10473bdb3290b6e763969edc0b160 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 15:57:00 +0200 Subject: Reorg Resources folder: move inkscape's shared resources into Resources/share/inkscape (bzr r13506.1.26) --- packaging/macosx/Resources/bin/inkscape | 6 +++--- packaging/macosx/osx-app.sh | 11 ++++++----- src/path-prefix.h | 34 ++++++++++++++++----------------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index a7baac64b..8dd41a03b 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -57,6 +57,7 @@ export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" +export GTK_PATH="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" export XDG_DATA_DIRS="$TOP/share" @@ -72,10 +73,9 @@ export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/sh export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" -export INKSCAPE_SHAREDIR="$TOP" -# TODO: move the share directory to a its own folder to make things a bit cleaner in the app bundle +export INKSCAPE_SHAREDIR="$TOP/share/inkscape" export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" -export INKSCAPE_LOCALEDIR="$TOP/locale" +export INKSCAPE_LOCALEDIR="$TOP/share/locale" # Handle the case where the directory storing Inkscape has special characters # ('#', '&', '|') in the name. These need to be escaped to work properly for diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index d39bee144..ff0c68687 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -214,12 +214,14 @@ pkgexec="$package/Contents/MacOS" pkgbin="$package/Contents/Resources/bin" pkgshare="$package/Contents/Resources/share" pkglib="$package/Contents/Resources/lib" -pkglocale="$package/Contents/Resources/locale" +pkgetc="$package/Contents/Resources/etc" +pkglocale="$package/Contents/Resources/share/locale" pkgpython="$package/Contents/Resources/python/site-packages/" pkgresources="$package/Contents/Resources" mkdir -p "$pkgexec" mkdir -p "$pkgbin" +mkdir -p "$pkgetc" mkdir -p "$pkglib" mkdir -p "$pkgshare" mkdir -p "$pkglocale" @@ -251,13 +253,13 @@ cp -v "$binary" "$binpath" # TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not # Share files -rsync -av "$binary_dir/../share/$binary_name"/* "$pkgresources/" +rsync -av "$binary_dir/../share/$binary_name"/* "$pkgshare/$binary_name" cp "$plist" "$package/Contents/Info.plist" -rsync -av "$binary_dir/../share/locale"/* "$pkgresources/locale" +rsync -av "$binary_dir/../share/locale"/* "$pkglocale" # Copy GTK shared mime information mkdir -p "$pkgresources/share" -cp -rp "$LIBPREFIX/share/mime" "$pkgresources/share/" +cp -rp "$LIBPREFIX/share/mime" "$pkgshare/" # Copy GTK hicolor icon theme index file mkdir -p "$pkgresources/share/icons/hicolor" @@ -293,7 +295,6 @@ fi echo "APPLInks" > $package/Contents/PkgInfo # Pull in extra requirements for Pango and GTK -pkgetc="$package/Contents/Resources/etc" mkdir -p $pkgetc/pango # Need to adjust path and quote in case of spaces in path. diff --git a/src/path-prefix.h b/src/path-prefix.h index be57ae354..4c31b629c 100644 --- a/src/path-prefix.h +++ b/src/path-prefix.h @@ -66,23 +66,23 @@ extern "C" { # define CREATE_PALETTESDIR WIN32_DATADIR("create\\swatches") # define CREATE_PATTERNSDIR WIN32_DATADIR("create\\patterns\\vector") # elif defined ENABLE_OSX_APP_LOCATIONS -# define INKSCAPE_APPICONDIR "Contents/Resources/pixmaps" -# define INKSCAPE_ATTRRELDIR "Contents/Resources/attributes" -# define INKSCAPE_BINDDIR "Contents/Resources/bind" -# define INKSCAPE_EXAMPLESDIR "Contents/Resources/examples" -# define INKSCAPE_EXTENSIONDIR "Contents/Resources/extensions" -# define INKSCAPE_FILTERDIR "Contents/Resources/filters" -# define INKSCAPE_GRADIENTSDIR "Contents/Resources/gradients" -# define INKSCAPE_KEYSDIR "Contents/Resources/keys" -# define INKSCAPE_PIXMAPDIR "Contents/Resources/icons" -# define INKSCAPE_MARKERSDIR "Contents/Resources/markers" -# define INKSCAPE_PALETTESDIR "Contents/Resources/palettes" -# define INKSCAPE_PATTERNSDIR "Contents/Resources/patterns" -# define INKSCAPE_SCREENSDIR "Contents/Resources/screens" -# define INKSCAPE_SYMBOLSDIR "Contents/Resources/symbols" -# define INKSCAPE_TUTORIALSDIR "Contents/Resources/tutorials" -# define INKSCAPE_TEMPLATESDIR "Contents/Resources/templates" -# define INKSCAPE_UIDIR "Contents/Resources/ui" +# define INKSCAPE_APPICONDIR "Contents/Resources/share/pixmaps" +# define INKSCAPE_ATTRRELDIR "Contents/Resources/share/inkscape/attributes" +# define INKSCAPE_BINDDIR "Contents/Resources/share/inkscape/bind" +# define INKSCAPE_EXAMPLESDIR "Contents/Resources/share/inkscape/examples" +# define INKSCAPE_EXTENSIONDIR "Contents/Resources/share/inkscape/extensions" +# define INKSCAPE_FILTERDIR "Contents/Resources/share/inkscape/filters" +# define INKSCAPE_GRADIENTSDIR "Contents/Resources/share/inkscape/gradients" +# define INKSCAPE_KEYSDIR "Contents/Resources/share/inkscape/keys" +# define INKSCAPE_PIXMAPDIR "Contents/Resources/share/inkscape/icons" +# define INKSCAPE_MARKERSDIR "Contents/Resources/share/inkscape/markers" +# define INKSCAPE_PALETTESDIR "Contents/Resources/share/inkscape/palettes" +# define INKSCAPE_PATTERNSDIR "Contents/Resources/share/inkscape/patterns" +# define INKSCAPE_SCREENSDIR "Contents/Resources/share/inkscape/screens" +# define INKSCAPE_SYMBOLSDIR "Contents/Resources/share/inkscape/symbols" +# define INKSCAPE_TUTORIALSDIR "Contents/Resources/share/inkscape/tutorials" +# define INKSCAPE_TEMPLATESDIR "Contents/Resources/share/inkscape/templates" +# define INKSCAPE_UIDIR "Contents/Resources/share/inkscape/ui" //CREATE V0.1 support # define CREATE_GRADIENTSDIR "/Library/Application Support/create/gradients/gimp" # define CREATE_PALETTESDIR "/Library/Application Support/create/swatches" -- cgit v1.2.3 From e76d19247cbe72cbdb3b89d7712447738dd84d56 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 16:53:17 +0200 Subject: include fontconfig's fonts.dtd (fonts.conf is custom and copied from Resources/etc/fonts) (bzr r13506.1.27) --- packaging/macosx/osx-app.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index ff0c68687..aca23c416 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -304,7 +304,9 @@ cat > $pkgetc/pango/pangorc <<END_PANGO ModuleFiles=\${INK_CACHE_DIR}/pango.modules END_PANGO +# We use a modified fonts.conf file so only need the dtd mkdir -p $pkgetc/fonts +cp $LIBPREFIX/etc/fonts/fonts.dtd $pkgetc/fonts/ cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ mkdir -p $pkgshare/fontconfig cp -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ -- cgit v1.2.3 From d62ebe7d9d0fa50204d44da29920da8bcbac92ad Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 17:12:34 +0200 Subject: Resources/script: improve cli support (rel path to script) - thx Liam for the reminder\! (bzr r13506.1.28) --- packaging/macosx/Resources/script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index 33d5a6c50..4a1d0b1a7 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -3,7 +3,7 @@ # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> -CWD=`dirname "$0"` +CWD="$(cd "$(dirname "$0")" && pwd)" # Warn the user about time-consuming generation of fontconfig caches. # TODO: Somehow keep in sync with ScriptExec and bin/inkscape. -- cgit v1.2.3 From 546190d116dc134c5608b9e890d69b8c5d256856 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 17:43:51 +0200 Subject: launcher scripts: rewrite command substitution, keep both scripts in sync (bzr r13506.1.29) --- packaging/macosx/Resources/openDoc | 11 ++--------- packaging/macosx/Resources/script | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc index fd37dd128..c74a16442 100755 --- a/packaging/macosx/Resources/openDoc +++ b/packaging/macosx/Resources/openDoc @@ -3,15 +3,8 @@ # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> -CWD="`dirname \"$0\"`" +CWD="$(cd "$(dirname "$0")" && pwd)" -# System version: 3 for Panther, 4 for Tiger, 5 for Leopard -export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` - -if [[ $VERSION -le 4 ]]; then - export "DISPLAY=`cat /tmp/display.$UID`" -fi - -BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//'`" +BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//')" cd "$BASE" exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index 4a1d0b1a7..5d5bab2ea 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -12,7 +12,7 @@ test -f "${HOME}/.cache/inkscape/.fccache-new" || exit 12 -BASE=`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'` +BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//')" cd "$BASE" exec "$CWD/bin/inkscape" "$@" # TODO examine whether it would be wisest to move the code from inkscape shell -- cgit v1.2.3 From b5af763c9c21cbc803a0ee4a4d40b6facf969610 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 17:44:25 +0200 Subject: fontconfig: location of fonts.dtd has changed, fix it. (bzr r13506.1.30) --- packaging/macosx/osx-app.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index aca23c416..31640546a 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -305,8 +305,9 @@ ModuleFiles=\${INK_CACHE_DIR}/pango.modules END_PANGO # We use a modified fonts.conf file so only need the dtd +mkdir -p $pkgshare/xml/fontconfig +cp $LIBPREFIX/share/xml/fontconfig/fonts.dtd $pkgshare/xml/fontconfig mkdir -p $pkgetc/fonts -cp $LIBPREFIX/etc/fonts/fonts.dtd $pkgetc/fonts/ cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ mkdir -p $pkgshare/fontconfig cp -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ -- cgit v1.2.3 From 460fc721d313b81caf28947cf157c0b20594d26a Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 18:54:18 +0200 Subject: osx-build.sh: use system compilers and compiler flags known to work, depending on OS X version (bzr r13506.1.31) --- packaging/macosx/osx-build.sh | 58 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index e0b5e955a..c696e0c43 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -22,7 +22,7 @@ # User modifiable parameters #---------------------------------------------------------- # Configure flags -CONFFLAGS="--enable-osxapp --enable-localinstall" +CONFFLAGS="--enable-osxapp" # Libraries prefix (Warning: NO trailing slash) if [ -z "$LIBPREFIX" ]; then LIBPREFIX="/opt/local-x11" @@ -151,6 +151,13 @@ done # OSXMINORVER=`/usr/bin/sw_vers | grep ProductVersion | cut -d' ' -f2 | cut -f1-2 -d.` +# OS X version +OSXVERSION="$(/usr/bin/sw_vers | grep ProductVersion | cut -f2)" +OSXMINORVER="$(echo "$OSXVERSION" | cut -d. -f 1,2)" +OSXMINORNO="$(echo "$OSXVERSION" | cut -d. -f2)" +OSXPOINTNO="$(echo "$OSXVERSION" | cut -d. -f3)" +ARCH="$(uname -a | awk '{print $NF;}')" + # Set environment variables # ---------------------------------------------------------- export LIBPREFIX @@ -159,11 +166,50 @@ export LIBPREFIX # automake seach path export CPATH="$LIBPREFIX/include" # configure search path -export CPPFLAGS="-I$LIBPREFIX/include" -export LDFLAGS="-L$LIBPREFIX/lib" +export CPPFLAGS="$CPPFLAGS -I$LIBPREFIX/include" +export LDFLAGS="$LDFLAGS -L$LIBPREFIX/lib" # compiler arguments -export CFLAGS="-pipe -Os" -export CXXFLAGS="$CFLAGS -Wno-cast-align" +export CFLAGS="$CFLAGS -pipe -Os" +#export CXXFLAGS="$CFLAGS -Wno-cast-align" + +# compiler +# TODO: detailed configure flags for each OS X version (Mavericks!) +if [ "$OSXMINORNO" -gt "8" ]; then + ## Apple's clang on Mavericks and later + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" + export CLAGS="$CFLAGS -arch $ARCH" + export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" +elif [ "$OSXMINORNO" -gt "7" ]; then + ## Apple's clang on Mountain Lion and later + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" + export CLAGS="$CFLAGS -arch $ARCH" + export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libstdc++" +elif [ "$OSXMINORNO" -gt "6" ]; then + ## Apple's clang on Lion and later + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" + export CLAGS="$CFLAGS -arch $ARCH" + export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11 +elif [ "$OSXMINORNO" -gt "5" ]; then + ## Apple's LLVM-GCC 4.2.1 on Snow Leopard and later + export CC="/usr/bin/llvm-gcc-4.2" + export CXX="/usr/bin/llvm-g++-4.2" + export CLAGS="$CFLAGS -arch $ARCH" + export CXXFLAGS="$CFLAGS" + CONFFLAGS="--disable-openmp $CONFFLAGS" +elif [ "$OSXMINORNO" -eq "5" ]; then + ## Apple's GCC 4.2.1 on Leopard + export CC="/usr/bin/gcc-4.2" + export CXX="/usr/bin/g++-4.2" + export CLAGS="$CFLAGS -arch $ARCH" + export CXXFLAGS="$CFLAGS" + CONFFLAGS="--disable-openmp $CONFFLAGS" +else + echo "Unsupported OS X version." + exit 1 +fi # Actions # ---------------------------------------------------------- @@ -203,7 +249,7 @@ fi if [[ "$CONFIGURE" == "t" ]] then - ALLCONFFLAGS="$CONFFLAGS --prefix=$INSTALLPREFIX" + ALLCONFFLAGS="$CONFFLAGS --prefix=$INSTALLPREFIX --enable-localinstall" cd $SRCROOT if [ ! -f configure ] then -- cgit v1.2.3 From 94878add856d69e31f24dd549185d47928de397d Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 19:26:50 +0200 Subject: osx-build.sh: refactor for easier maintenance (don't hard-code build prefix in several locations) (bzr r13506.1.32) --- packaging/macosx/osx-build.sh | 81 ++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 24 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index c696e0c43..1b220576c 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -81,13 +81,15 @@ Compilation script for Inkscape on Mac OS X. # Parameters #---------------------------------------------------------- # Paths -HERE=`pwd` -SRCROOT=$HERE/../.. # we are currently in packaging/macosx +HERE="$(pwd)" +SRCROOT="$(cd ../.. && pwd)" # we are currently in packaging/macosx # Defaults -if [ "$INSTALLPREFIX" = "" ] -then - INSTALLPREFIX=$SRCROOT/inst-osxapp/ +if [ -z "$BUILDPREFIX" ]; then + BUILDPREFIX="$SRCROOT/build-osxapp/" +fi +if [ -z "$INSTALLPREFIX" ]; then + INSTALLPREFIX="$SRCROOT/inst-osxapp/" fi BZRUPDATE="f" AUTOGEN="f" @@ -170,7 +172,6 @@ export CPPFLAGS="$CPPFLAGS -I$LIBPREFIX/include" export LDFLAGS="$LDFLAGS -L$LIBPREFIX/lib" # compiler arguments export CFLAGS="$CFLAGS -pipe -Os" -#export CXXFLAGS="$CFLAGS -Wno-cast-align" # compiler # TODO: detailed configure flags for each OS X version (Mavericks!) @@ -211,6 +212,42 @@ else exit 1 fi +# Utility functions +# ---------------------------------------------------------- +function getinkscapeinfo () { + # Fetch some information + osxapp_domain="$BUILDPREFIX/Info" + INKVERSION="$(defaults read $osxapp_domain CFBundleVersion)" + [ $? -ne 0 ] && INKVERSION="devel" + REVISION="$(bzr revno)" + [ $? -ne 0 ] && REVISION="" || REVISION="-r$REVISION" + + if [[ "$OSXMINORVER" == "10.5" ]]; then + TARGETNAME="LEOPARD+" + TARGETVERSION="10.5" + elif [[ "$OSXMINORVER" == "10.6" ]]; then + TARGETNAME="SNOW LEOPARD+" + TARGETVERSION="10.6" + elif [[ "$OSXMINORVER" == "10.7" ]]; then + TARGETNAME="LION+" + TARGETVERSION="10.7" + elif [[ "$OSXMINORVER" == "10.8" ]]; then + TARGETNAME="MOUTAIN LION+" + TARGETVERSION="10.8" + elif [[ "$OSXMINORVER" == "10.9" ]]; then + TARGETNAME="MAVERICKS+" + TARGETVERSION="10.9" + else + echo "Unsupported OS X version." + exit 1 + fi + + TARGETARCH="$ARCH" + NEWNAME="Inkscape-$INKVERSION$REVISION-$TARGETVERSION-$TARGETARCH" + DMGFILE="$NEWNAME.dmg" + INFOFILE="$NEWNAME-info.txt" +} + # Actions # ---------------------------------------------------------- if [[ "$BZRUPDATE" == "t" ]] @@ -225,16 +262,6 @@ then cd $HERE fi -# Fetch some information -REVISION=$(bzr revno) -ARCH=$(arch) -TARGETVERSION=$(/usr/bin/sw_vers | fgrep ProductVersion | tr -d \ | cut -d: -f2) -TARGETARCH=$ARCH - -NEWNAME="Inkscape-r$REVISION-$TARGETVERSION-$TARGETARCH" -DMGFILE="$NEWNAME.dmg" -INFOFILE="$NEWNAME-info.txt" - if [[ "$AUTOGEN" == "t" ]] then cd $SRCROOT @@ -251,13 +278,17 @@ if [[ "$CONFIGURE" == "t" ]] then ALLCONFFLAGS="$CONFFLAGS --prefix=$INSTALLPREFIX --enable-localinstall" cd $SRCROOT - if [ ! -f configure ] + if [ ! -d $BUILDPREFIX ] + then + mkdir $BUILDPREFIX || exit 1 + fi + cd $BUILDPREFIX + if [ ! -f $SRCROOT/configure ] then echo "Configure script not found in $SRCROOT. Run '$0 autogen' first" exit 1 fi - mkdir -p build-osxapp; cd build-osxapp - ../configure $ALLCONFFLAGS + $SRCROOT/configure $ALLCONFFLAGS status=$? if [[ $status -ne 0 ]]; then echo -e "\nConfigure failed" @@ -268,7 +299,8 @@ fi if [[ "$BUILD" == "t" ]] then - cd $SRCROOT/build-osxapp + cd $BUILDPREFIX || exit 1 + touch "$SRCROOT/src/main.cpp" "$SRCROOT/src/ui/dialog/aboutbox.cpp" make -j $NJOBS status=$? if [[ $status -ne 0 ]]; then @@ -280,7 +312,7 @@ fi if [[ "$INSTALL" == "t" ]] then - cd $SRCROOT/build-osxapp + cd $BUILDPREFIX || exit 1 make install status=$? if [[ $status -ne 0 ]]; then @@ -299,9 +331,9 @@ then echo "The inkscape executable \"$INSTALLPREFIX/bin/inkscape\" cound not be found." exit 1 fi - if [ ! -e $SRCROOT/build-osxapp/Info.plist ] + if [ ! -e $BUILDPREFIX/Info.plist ] then - echo "The file \"$SRCROOT/build-osxapp/Info.plist\" could not be found, please re-run configure." + echo "The file \"$BUILDPREFIX/Info.plist\" could not be found, please re-run configure." exit 1 fi @@ -312,7 +344,7 @@ then fi # Create app bundle - ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $SRCROOT/build-osxapp/Info.plist $PYTHON_MODULES + ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $BUILDPREFIX/Info.plist $PYTHON_MODULES status=$? if [[ $status -ne 0 ]]; then echo -e "\nApplication bundle creation failed" @@ -331,6 +363,7 @@ function checkversion { if [[ "$DISTRIB" == "t" ]] then + getinkscapeinfo # Create dmg bundle ./osx-dmg.sh -p "Inkscape.app" status=$? -- cgit v1.2.3 From 67a2458a2c116f87ebc81d91680684381db2c471 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 20:13:08 +0200 Subject: osx-build.sh: refactor OS X version tests (thx Liam) (bzr r13506.1.33) --- packaging/macosx/osx-build.sh | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 1b220576c..fab5c6a99 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -155,9 +155,9 @@ done # OS X version OSXVERSION="$(/usr/bin/sw_vers | grep ProductVersion | cut -f2)" -OSXMINORVER="$(echo "$OSXVERSION" | cut -d. -f 1,2)" -OSXMINORNO="$(echo "$OSXVERSION" | cut -d. -f2)" -OSXPOINTNO="$(echo "$OSXVERSION" | cut -d. -f3)" +OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)" +OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)" +OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)" ARCH="$(uname -a | awk '{print $NF;}')" # Set environment variables @@ -177,24 +177,32 @@ export CFLAGS="$CFLAGS -pipe -Os" # TODO: detailed configure flags for each OS X version (Mavericks!) if [ "$OSXMINORNO" -gt "8" ]; then ## Apple's clang on Mavericks and later + TARGETNAME="MAVERICKS+" + TARGETVERSION="10.9" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" export CLAGS="$CFLAGS -arch $ARCH" export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" elif [ "$OSXMINORNO" -gt "7" ]; then ## Apple's clang on Mountain Lion and later + TARGETNAME="MOUTAIN LION+" + TARGETVERSION="10.8" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" export CLAGS="$CFLAGS -arch $ARCH" export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libstdc++" elif [ "$OSXMINORNO" -gt "6" ]; then ## Apple's clang on Lion and later + TARGETNAME="LION+" + TARGETVERSION="10.7" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" export CLAGS="$CFLAGS -arch $ARCH" export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11 elif [ "$OSXMINORNO" -gt "5" ]; then ## Apple's LLVM-GCC 4.2.1 on Snow Leopard and later + TARGETNAME="SNOW LEOPARD+" + TARGETVERSION="10.6" export CC="/usr/bin/llvm-gcc-4.2" export CXX="/usr/bin/llvm-g++-4.2" export CLAGS="$CFLAGS -arch $ARCH" @@ -202,6 +210,8 @@ elif [ "$OSXMINORNO" -gt "5" ]; then CONFFLAGS="--disable-openmp $CONFFLAGS" elif [ "$OSXMINORNO" -eq "5" ]; then ## Apple's GCC 4.2.1 on Leopard + TARGETNAME="LEOPARD+" + TARGETVERSION="10.5" export CC="/usr/bin/gcc-4.2" export CXX="/usr/bin/g++-4.2" export CLAGS="$CFLAGS -arch $ARCH" @@ -215,37 +225,18 @@ fi # Utility functions # ---------------------------------------------------------- function getinkscapeinfo () { - # Fetch some information + osxapp_domain="$BUILDPREFIX/Info" INKVERSION="$(defaults read $osxapp_domain CFBundleVersion)" [ $? -ne 0 ] && INKVERSION="devel" REVISION="$(bzr revno)" [ $? -ne 0 ] && REVISION="" || REVISION="-r$REVISION" - if [[ "$OSXMINORVER" == "10.5" ]]; then - TARGETNAME="LEOPARD+" - TARGETVERSION="10.5" - elif [[ "$OSXMINORVER" == "10.6" ]]; then - TARGETNAME="SNOW LEOPARD+" - TARGETVERSION="10.6" - elif [[ "$OSXMINORVER" == "10.7" ]]; then - TARGETNAME="LION+" - TARGETVERSION="10.7" - elif [[ "$OSXMINORVER" == "10.8" ]]; then - TARGETNAME="MOUTAIN LION+" - TARGETVERSION="10.8" - elif [[ "$OSXMINORVER" == "10.9" ]]; then - TARGETNAME="MAVERICKS+" - TARGETVERSION="10.9" - else - echo "Unsupported OS X version." - exit 1 - fi - TARGETARCH="$ARCH" NEWNAME="Inkscape-$INKVERSION$REVISION-$TARGETVERSION-$TARGETARCH" DMGFILE="$NEWNAME.dmg" INFOFILE="$NEWNAME-info.txt" + } # Actions -- cgit v1.2.3 From 512dfe58dfb16fbc8379ec1b076aa0be2decf796 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 20 Aug 2014 20:25:04 +0200 Subject: launcher scripts: we introduced bashism for command substitution, make sure the shell can handle it (bzr r13506.1.34) --- packaging/macosx/Resources/openDoc | 2 +- packaging/macosx/Resources/script | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc index c74a16442..fde8276b1 100755 --- a/packaging/macosx/Resources/openDoc +++ b/packaging/macosx/Resources/openDoc @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index 5d5bab2ea..a418cca45 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> -- cgit v1.2.3 From 7550e6f258832594ec9e80144cd9f09bcd4fd5ef Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Thu, 21 Aug 2014 12:24:31 +0200 Subject: build scripts: refactor tests based on OS X version (bzr r13506.1.35) --- packaging/macosx/osx-app.sh | 31 +++++++++------ packaging/macosx/osx-build.sh | 92 ++++++++++++++++++++++++++----------------- 2 files changed, 75 insertions(+), 48 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 31640546a..aadc06e68 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -111,7 +111,9 @@ done echo -e "\n\033[1mCREATE INKSCAPE APP BUNDLE\033[0m\n" + # Safety tests +#---------------------------------------------------------- if [ "x$binary" == "x" ]; then echo "Inkscape binary path not specified." >&2 @@ -172,19 +174,25 @@ if [ ! -e "$LIBPREFIX/lib/aspell-0.60/en.dat" ]; then fi +# OS X version +#---------------------------------------------------------- +OSXVERSION="$(/usr/bin/sw_vers | grep ProductVersion | cut -f2)" +OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)" +OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)" +OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)" +ARCH="$(uname -a | awk '{print $NF;}')" + + +# Setup +#---------------------------------------------------------- # Handle some version specific details. -VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` -if [ "$VERSION" -ge "4" ]; then - # We're on Tiger (10.4) or later. - # XCode behaves a little differently in Tiger and later. +if [ "$OSXMINORNO" -le "4" ]; then + echo "Note: Inkscape packaging requires Mac OS X 10.5 Leopard or later." + exit 1 +else # if [ "$OSXMINORNO" -ge "5" ]; then XCODEFLAGS="-configuration Deployment" SCRIPTEXECDIR="ScriptExec/build/Deployment/ScriptExec.app/Contents/MacOS" EXTRALIBS="" -else - # Panther (10.3) or earlier. - XCODEFLAGS="-buildstyle Deployment" - SCRIPTEXECDIR="ScriptExec/build/ScriptExec.app/Contents/MacOS" - EXTRALIBS="" fi @@ -212,9 +220,9 @@ fi #---------------------------------------------------------- pkgexec="$package/Contents/MacOS" pkgbin="$package/Contents/Resources/bin" -pkgshare="$package/Contents/Resources/share" -pkglib="$package/Contents/Resources/lib" pkgetc="$package/Contents/Resources/etc" +pkglib="$package/Contents/Resources/lib" +pkgshare="$package/Contents/Resources/share" pkglocale="$package/Contents/Resources/share/locale" pkgpython="$package/Contents/Resources/python/site-packages/" pkgresources="$package/Contents/Resources" @@ -227,6 +235,7 @@ mkdir -p "$pkgshare" mkdir -p "$pkglocale" mkdir -p "$pkgpython" + # Build and add the launcher #---------------------------------------------------------- ( diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index fab5c6a99..b82b038c8 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -151,9 +151,8 @@ do shift 1 done -# OSXMINORVER=`/usr/bin/sw_vers | grep ProductVersion | cut -d' ' -f2 | cut -f1-2 -d.` - # OS X version +# ---------------------------------------------------------- OSXVERSION="$(/usr/bin/sw_vers | grep ProductVersion | cut -f2)" OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)" OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)" @@ -173,53 +172,72 @@ export LDFLAGS="$LDFLAGS -L$LIBPREFIX/lib" # compiler arguments export CFLAGS="$CFLAGS -pipe -Os" -# compiler -# TODO: detailed configure flags for each OS X version (Mavericks!) -if [ "$OSXMINORNO" -gt "8" ]; then - ## Apple's clang on Mavericks and later - TARGETNAME="MAVERICKS+" - TARGETVERSION="10.9" +# Use system compiler and compiler flags which are known to work: +if [ "$OSXMINORNO" -le "4" ]; then + echo "Note: Inkscape packaging requires Mac OS X 10.5 Leopard or later." + exit 1 +elif [ "$OSXMINORNO" -eq "5" ]; then + ## Apple's GCC 4.2.1 on Leopard + TARGETNAME="LEOPARD" + TARGETVERSION="10.5" + export CC="/usr/bin/gcc-4.2" + export CXX="/usr/bin/g++-4.2" + export CLAGS="$CFLAGS -arch $ARCH" + export CXXFLAGS="$CFLAGS" + CONFFLAGS="--disable-openmp $CONFFLAGS" +elif [ "$OSXMINORNO" -eq "6" ]; then + ## Apple's LLVM-GCC 4.2.1 on Snow Leopard + TARGETNAME="SNOW LEOPARD" + TARGETVERSION="10.6" + export CC="/usr/bin/llvm-gcc-4.2" + export CXX="/usr/bin/llvm-g++-4.2" + export CLAGS="$CFLAGS -arch $ARCH" + export CXXFLAGS="$CFLAGS" + CONFFLAGS="--disable-openmp $CONFFLAGS" +elif [ "$OSXMINORNO" -eq "7" ]; then + ## Apple's clang on Lion and later + TARGETNAME="LION" + TARGETVERSION="10.7" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" export CLAGS="$CFLAGS -arch $ARCH" - export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" -elif [ "$OSXMINORNO" -gt "7" ]; then - ## Apple's clang on Mountain Lion and later - TARGETNAME="MOUTAIN LION+" + export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11 +elif [ "$OSXMINORNO" -eq "8" ]; then + ## Apple's clang on Mountain Lion + TARGETNAME="MOUTAIN LION" TARGETVERSION="10.8" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" export CLAGS="$CFLAGS -arch $ARCH" - export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libstdc++" -elif [ "$OSXMINORNO" -gt "6" ]; then - ## Apple's clang on Lion and later - TARGETNAME="LION+" - TARGETVERSION="10.7" + export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libstdc++" +elif [ "$OSXMINORNO" -eq "9" ]; then + ## Apple's clang on Mavericks + TARGETNAME="MAVERICKS" + TARGETVERSION="10.9" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" export CLAGS="$CFLAGS -arch $ARCH" - export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11 -elif [ "$OSXMINORNO" -gt "5" ]; then - ## Apple's LLVM-GCC 4.2.1 on Snow Leopard and later - TARGETNAME="SNOW LEOPARD+" - TARGETVERSION="10.6" - export CC="/usr/bin/llvm-gcc-4.2" - export CXX="/usr/bin/llvm-g++-4.2" + export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" +elif [ "$OSXMINORNO" -eq "10" ]; then + ## Apple's clang on Yosemite + TARGETNAME="YOSEMITE" + TARGETVERSION="10.10" + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" export CLAGS="$CFLAGS -arch $ARCH" - export CXXFLAGS="$CFLAGS" - CONFFLAGS="--disable-openmp $CONFFLAGS" -elif [ "$OSXMINORNO" -eq "5" ]; then - ## Apple's GCC 4.2.1 on Leopard - TARGETNAME="LEOPARD+" - TARGETVERSION="10.5" - export CC="/usr/bin/gcc-4.2" - export CXX="/usr/bin/g++-4.2" + export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" + echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION" + echo " Inkscape packaging has not been tested on ${TARGETNAME}." +else # if [ "$OSXMINORNO" -ge "11" ]; then + ## Apple's clang after Yosemite? + TARGETNAME="UNKNOWN" + TARGETVERSION="10.XX" + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" export CLAGS="$CFLAGS -arch $ARCH" - export CXXFLAGS="$CFLAGS" - CONFFLAGS="--disable-openmp $CONFFLAGS" -else - echo "Unsupported OS X version." - exit 1 + export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" + echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION" + echo " Inkscape packaging has not been tested on this unknown version of OS X (${OSXVERSION})." fi # Utility functions -- cgit v1.2.3 From b0641984cc0670a084bc5945e28100b154f57178 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Thu, 21 Aug 2014 12:26:09 +0200 Subject: launcher scripts: move fc-cache alert to script, define xdg setup in single location and source it from script and openDoc (bzr r13506.1.36) --- packaging/macosx/Resources/alert_fccache.sh | 24 ++++++++++++++++++++++++ packaging/macosx/Resources/bin/inkscape | 17 ++++++----------- packaging/macosx/Resources/openDoc | 3 +++ packaging/macosx/Resources/script | 14 +++++++------- packaging/macosx/Resources/xdg_setup.sh | 13 +++++++++++++ packaging/macosx/ScriptExec/main.c | 2 +- 6 files changed, 54 insertions(+), 19 deletions(-) create mode 100755 packaging/macosx/Resources/alert_fccache.sh create mode 100755 packaging/macosx/Resources/xdg_setup.sh diff --git a/packaging/macosx/Resources/alert_fccache.sh b/packaging/macosx/Resources/alert_fccache.sh new file mode 100755 index 000000000..110c89940 --- /dev/null +++ b/packaging/macosx/Resources/alert_fccache.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +ALERT_SCRIPT="$(cat << EOM +try + tell application "SystemUIServer" + display dialog "While Inkscape is open, its windows can be displayed or hidden by displaying or hiding the X11 application. + +The first time this version of Inkscape is run it may take several minutes before the main window is displayed while font caches are built." buttons {"OK"} default button 1 with icon 2 + end tell +end try +EOM)" + +if [ -z "$INK_CACHE_DIR" ]; then + export INK_CACHE_DIR="${HOME}/.cache/inkscape" + mkdir -p "$INK_CACHE_DIR" + [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" +fi + +# Warn the user about time-consuming generation of fontconfig caches. +if [ ! -f "${INK_CACHE_DIR}/.fccache-new" ]; then + alert_result=$(osascript -e "$ALERT_SCRIPT") + mkdir -p "$INK_CACHE_DIR" + touch "${INK_CACHE_DIR}/.fccache-new" +fi diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 8dd41a03b..59d6f0953 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -39,17 +39,12 @@ PYTHON_VERS=`python -V 2>&1 | cut -c 8-10` export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # NB: we are only preprending some stuff to the default python path so if the directory does not exist it should not harm the rest -export XDG_CACHE_HOME="${HOME}/.cache" -export XDG_CONFIG_HOME="${HOME}/.config" -export XDG_DATA_HOME="${HOME}/.local/share" - -mkdir -p "$XDG_CACHE_HOME" -mkdir -p "$XDG_CONFIG_HOME" -mkdir -p "$XDG_DATA_HOME" - -# TODO: keep in sync with ScriptExec and Resources/script -INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" -mkdir -p "$INK_CACHE_DIR" +# fallback +if [ -z "$INK_CACHE_DIR" ]; then + INK_CACHE_DIR="${HOME}/.cache/inkscape" + mkdir -p "$INK_CACHE_DIR" + [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" +fi export FONTCONFIG_PATH="$TOP/etc/fonts" export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc index fde8276b1..63e803540 100755 --- a/packaging/macosx/Resources/openDoc +++ b/packaging/macosx/Resources/openDoc @@ -2,9 +2,12 @@ # # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> +# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> CWD="$(cd "$(dirname "$0")" && pwd)" +source "${CWD}/xdg_setup.sh" + BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//')" cd "$BASE" exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index a418cca45..de839484d 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -2,21 +2,21 @@ # # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> +# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> -CWD="$(cd "$(dirname "$0")" && pwd)" - -# Warn the user about time-consuming generation of fontconfig caches. -# TODO: Somehow keep in sync with ScriptExec and bin/inkscape. -# Ideally refer to $XDG_CACHE_HOME/inkscape everywhere, but how? -test -f "${HOME}/.cache/inkscape/.fccache-new" || exit 12 +#export _DEBUG=true +CWD="$(cd "$(dirname "$0")" && pwd)" +source "${CWD}/xdg_setup.sh" +source "${CWD}/alert_fccache.sh" BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//')" cd "$BASE" -exec "$CWD/bin/inkscape" "$@" + # TODO examine whether it would be wisest to move the code from inkscape shell # script and getdisplay.sh to here and only keep the real binary in bin. This # may make things easier on Leopard and may also help using Inkscape on the # command line. +exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/xdg_setup.sh b/packaging/macosx/Resources/xdg_setup.sh new file mode 100755 index 000000000..ec7fca648 --- /dev/null +++ b/packaging/macosx/Resources/xdg_setup.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +export XDG_CACHE_HOME="${HOME}/.cache" +export XDG_CONFIG_HOME="${HOME}/.config" +export XDG_DATA_HOME="${HOME}/.local/share" + +mkdir -p "$XDG_CACHE_HOME" +mkdir -p "$XDG_CONFIG_HOME" +mkdir -p "$XDG_DATA_HOME" + +export INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" +mkdir -p "$INK_CACHE_DIR" + diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c index 37b3a4ff3..e3f066d70 100644 --- a/packaging/macosx/ScriptExec/main.c +++ b/packaging/macosx/ScriptExec/main.c @@ -227,6 +227,7 @@ static void ShowFirstStartWarningDialog(void) ////////////////////////////////// // Handler for when fontconfig caches need to be generated +// TODO: remove (alert and touch moved to launcher script) ////////////////////////////////// static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, EventRef theEvent, void *userData) @@ -241,7 +242,6 @@ static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, ShowFirstStartWarningDialog(); // Note that we've seen the warning. - // TODO: somehow make this aware of $XDG_CACHE_HOME as set in the launcher system("test -d \"$HOME/.cache/inkscape\" || mkdir -p \"$HOME/.cache/inkscape\"; " "touch \"$HOME/.cache/inkscape/.fccache-new\""); // Rerun now. -- cgit v1.2.3 From 4f18d26eb3ac1998db8a20588eec540c2fbe30b7 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Thu, 21 Aug 2014 14:58:29 +0200 Subject: Refactor packaging of python modules; (bzr r13506.1.37) --- packaging/macosx/Resources/bin/inkscape | 28 ++++++++----- packaging/macosx/osx-app.sh | 74 +++++++++++++++++++++++++++------ 2 files changed, 79 insertions(+), 23 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 59d6f0953..b1ff5a85a 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -27,19 +27,25 @@ export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.fram # over one that may be installed be Macports, Fink or some other means. export PATH="/usr/bin:$PATH" -# On Snow Leopard, use the 32-bit version of python from Universal build. -# This is because our bundled i386 python libraries are 32-bit only. -export VERSIONER_PYTHON_VERSION=2.6 -export VERSIONER_PYTHON_PREFER_32_BIT=yes - - # Setup PYTHONPATH to use python modules shipped with Inkscape -ARCH=`arch` -PYTHON_VERS=`python -V 2>&1 | cut -c 8-10` -export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" -# NB: we are only preprending some stuff to the default python path so if the directory does not exist it should not harm the rest +OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" +build_arch=__build_arch__ +if [ $OSXMINORNO -gt "5" ]; then + if [ $OSXMINORNO -eq "6" ]; then + export VERSIONER_PYTHON_VERSION=2.6 + else # if [ $OSXMINORNO -ge "7" ]; then + export VERSIONER_PYTHON_VERSION=2.7 + fi + if [ $build_arch = "i386" ]; then + export VERSIONER_PYTHON_PREFER_32_BIT=yes + else # build & runtime arch x86_64 + export VERSIONER_PYTHON_PREFER_32_BIT=no + fi +fi +PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" +export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" -# fallback +# fallback for missing $INK_CACHE_DIR if [ -z "$INK_CACHE_DIR" ]; then INK_CACHE_DIR="${HOME}/.cache/inkscape" mkdir -p "$INK_CACHE_DIR" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index aadc06e68..696f137fa 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -35,7 +35,7 @@ # Defaults strip=false -add_python=false +add_python=true #false python_dir="" # If LIBPREFIX is not already set (by osx-build.sh for example) set it to blank (one should use the command line argument to set it correctly) @@ -135,12 +135,12 @@ if [ ! -f "$plist" ]; then exit 1 fi -if [ ${add_python} = "true" ]; then - if [ "x$python_dir" == "x" ]; then - echo "Python modules directory not specified." >&2 - exit 1 - fi -fi +# if [ ${add_python} = "true" ]; then +# if [ "x$python_dir" == "x" ]; then +# echo "Python modules directory not specified." >&2 +# exit 1 +# fi +# fi if [ ! -e "$LIBPREFIX" ]; then echo "Cannot find the directory containing the libraires: $LIBPREFIX" >&2 @@ -224,7 +224,7 @@ pkgetc="$package/Contents/Resources/etc" pkglib="$package/Contents/Resources/lib" pkgshare="$package/Contents/Resources/share" pkglocale="$package/Contents/Resources/share/locale" -pkgpython="$package/Contents/Resources/python/site-packages/" +#pkgpython="$package/Contents/Resources/python/site-packages/" pkgresources="$package/Contents/Resources" mkdir -p "$pkgexec" @@ -233,7 +233,21 @@ mkdir -p "$pkgetc" mkdir -p "$pkglib" mkdir -p "$pkgshare" mkdir -p "$pkglocale" -mkdir -p "$pkgpython" +#mkdir -p "$pkgpython" + + +# utility +#---------------------------------------------------------- + +if [ $verbose_mode ] ; then + cp_cmd="/bin/cp -v" + ln_cmd="/bin/ln -sv" + rsync_cmd="/usr/bin/rsync -av" +else + cp_cmd="/bin/cp" + ln_cmd="/bin/ln -s" + rsync_cmd="/usr/bin/rsync -a" +fi # Build and add the launcher @@ -296,9 +310,42 @@ sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" $pkgbin/inkscape # Add python modules if requested if [ ${add_python} = "true" ]; then - # copy python site-packages. They need to be organized in a hierarchical set of directories, by architecture and python major+minor version, e.g. i386/2.3/ for Ptyhon 2.3 on Intel - cp -rvf "$python_dir"/* "$pkgpython" + function install_py_modules () + { + # lxml + $cp_cmd -RL "$packages_path/lxml" "$pkgpython" + # numpy + $cp_cmd -RL "$packages_path/numpy" "$pkgpython" + $cp_cmd -RL "$packages_path/nose" "$pkgpython" + # UniConvertor + $cp_cmd -RL "$packages_path/sk1libs" "$pkgpython" + $cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython" + # cleanup python modules + find "$pkgpython" -name *.pyc -print0 | xargs -0 rm -f + find "$pkgpython" -name *.pyo -print0 | xargs -0 rm -f + + # TODO: test whether to remove hard-coded paths from *.la files or to exclude them altogether + for la_file in $(find "$pkgpython" -name *.la); do + sed -e "s,libdir=\'.*\',libdir=\'\',g" -i "" "$la_file" + done + } + + if [ $OSXMINORNO -eq "5" ]; then + PYTHON_VERSIONS=("2.5" "2.6" "2.7") + elif [ $OSXMINORNO -eq "6" ]; then + PYTHON_VERSIONS=("2.6" "2.7") + else # if [ $OSXMINORNO -ge "7" ]; then + PYTHON_VERSIONS=("2.7") + fi + for PYTHON_VER in $PYTHON_VERSIONS; do + python_dir="$(${LIBPREFIX}/bin/python${PYTHON_VER}-config --prefix)" + packages_path="${python_dir}/lib/python${PYTHON_VER}/site-packages" + pkgpython="${pkglib}/python${PYTHON_VER}/site-packages" + mkdir -p $pkgpython + install_py_modules + done fi +sed -e "s,__build_arch__,$ARCH,g" -i "" $pkgbin/inkscape # PkgInfo must match bundle type and creator code from Info.plist echo "APPLInks" > $package/Contents/PkgInfo @@ -358,7 +405,10 @@ cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" # Copy all linked libraries into the bundle #---------------------------------------------------------- # get list of *.so modules from python modules -python_libs="$(find $pkgpython -name *.so -or -name *.dylib)" +python_libs="" +for PYTHON_VER in "2.5" "2.6" "2.7"; do + python_libs="$python_libs $(find "${pkglib}/python${PYTHON_VER}" -name *.so -or -name *.dylib)" +done # get list of included binary executables extra_bin=$(find $pkgbin -exec file {} \; | grep executable | grep -v text | cut -d: -f1) -- cgit v1.2.3 -- cgit v1.2.3 From 5e862dd1f6841b0714505b129a514a1a2cff926b Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Thu, 21 Aug 2014 15:44:13 +0200 Subject: add custom ports for Inkscape.app (Python 2.6.1 to be used on Leopard and SL, UniConvertor 1.1.5) (bzr r13506.1.39) --- packaging/macosx/ports/lang/python26/Portfile | 158 +++++++++++++++++++++ .../lang/python26/files/patch-Lib-cgi.py.diff | 18 +++ .../files/patch-Lib-distutils-dist.py.diff | 51 +++++++ .../python26/files/patch-Mac-IDLE-Makefile.in.diff | 11 ++ .../lang/python26/files/patch-Mac-Makefile.in.diff | 11 ++ .../patch-Mac-PythonLauncher-Makefile.in.diff | 11 ++ .../files/patch-Mac-Tools-Doc-setup.py.diff | 11 ++ .../lang/python26/files/patch-Makefile.pre.in.diff | 31 ++++ .../ports/lang/python26/files/patch-setup.py.diff | 16 +++ .../macosx/ports/lang/python26/files/pyconfig.ed | 2 + .../macosx/ports/lang/python26/files/python26 | 12 ++ .../macosx/ports/lang/python26/files/version.plist | 16 +++ packaging/macosx/ports/python/py-sk1libs/Portfile | 62 ++++++++ ...atch-src-imaging-libimagingft-_imagingft.c.diff | 16 +++ .../py-sk1libs/files/patch-src-utils-fs.py.diff | 26 ++++ .../macosx/ports/python/py-uniconvertor/Portfile | 46 ++++++ 16 files changed, 498 insertions(+) create mode 100644 packaging/macosx/ports/lang/python26/Portfile create mode 100644 packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff create mode 100644 packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff create mode 100644 packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff create mode 100644 packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff create mode 100644 packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff create mode 100644 packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff create mode 100644 packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff create mode 100644 packaging/macosx/ports/lang/python26/files/patch-setup.py.diff create mode 100644 packaging/macosx/ports/lang/python26/files/pyconfig.ed create mode 100644 packaging/macosx/ports/lang/python26/files/python26 create mode 100644 packaging/macosx/ports/lang/python26/files/version.plist create mode 100644 packaging/macosx/ports/python/py-sk1libs/Portfile create mode 100644 packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff create mode 100644 packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff create mode 100644 packaging/macosx/ports/python/py-uniconvertor/Portfile diff --git a/packaging/macosx/ports/lang/python26/Portfile b/packaging/macosx/ports/lang/python26/Portfile new file mode 100644 index 000000000..93929fd80 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/Portfile @@ -0,0 +1,158 @@ +# $Id: Portfile 49077 2009-04-03 07:13:13Z erickt@macports.org $ + +PortSystem 1.0 +PortGroup select 1.0 + +name python26 +version 2.6.1 +revision 2 +set major [lindex [split $version .] 0] +set branch [join [lrange [split ${version} .] 0 1] .] +categories lang +platforms darwin +maintainers blb mcalhoun + +description An interpreted, object-oriented programming language +long_description Python is an interpreted, interactive, object-oriented \ + programming language. + +homepage http://www.python.org/ +master_sites ${homepage}/ftp/python/${version}/ \ + ftp://ftp.python.org/pub/python/${version}/ + +distname Python-${version} +use_bzip2 yes + +checksums md5 e81c2f0953aa60f8062c05a4673f2be0 \ + sha1 419f0cb29e9713ea861dde8c43d107c51329e57b \ + rmd160 497dafaca9c150fca611b0175eeb13c2fc4d3e2d + +# patch-Lib-distutils-dist.py.diff comes from +# <http://bugs.python.org/issue1180> +patchfiles patch-Makefile.pre.in.diff \ + patch-setup.py.diff \ + patch-Lib-cgi.py.diff \ + patch-Lib-distutils-dist.py.diff \ + patch-Mac-IDLE-Makefile.in.diff \ + patch-Mac-Makefile.in.diff \ + patch-Mac-PythonLauncher-Makefile.in.diff \ + patch-Mac-Tools-Doc-setup.py.diff + +depends_lib port:gettext port:zlib port:openssl port:tk \ + port:sqlite3 port:db46 port:ncurses port:gdbm \ + port:bzip2 port:readline + +configure.args --enable-framework=${frameworks_dir} \ + --enable-ipv6 + +use_parallel_build no + +post-patch { + reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Lib/cgi.py + reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|g" \ + ${worksrcpath}/Mac/Makefile.in ${worksrcpath}/Mac/IDLE/Makefile.in \ + ${worksrcpath}/Mac/Tools/Doc/setup.py \ + ${worksrcpath}/Mac/PythonLauncher/Makefile.in + + # See http://trac.macports.org/changeset/37861 + reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \ + ${worksrcpath}/Mac/PythonLauncher/Makefile.in +} + +build.target all + +test.run yes +test.target test + +destroot.target frameworkinstall maninstall + +# ensure that correct compiler is used +build.args-append MAKE="${build.cmd} CC=${configure.cc}" +destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}" + +select.group python +select.file ${filespath}/python[string map {. {}} ${branch}] + +post-destroot { + set framewpath ${frameworks_dir}/Python.framework + set framewdir ${framewpath}/Versions/${branch} + + foreach dir { Headers Resources Python Versions/Current } { + file delete ${destroot}${framewpath}/${dir} + } + + ln -s ${framewdir}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1 + + # Without this, LINKFORSHARED is set to + # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) + # (this becomes Python.framework/Versions/2.6/Python) which doesn't + # quite work (see ticket #15099); instead specifically list the + # full path to the proper Python framework file (which becomes + # ${prefix}/Library/Frameworks/Python.framework/Versions/2.6/Python) + reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile + + # The framework version.plist isn't currently being installed so + # we'll copy ours for now (see http://trac.macports.org/ticket/18773 and + # http://bugs.python.org/issue4937) + xinstall -m 644 ${filespath}/version.plist \ + ${destroot}${framewdir}/Resources/version.plist +} + +post-activate { + ui_msg "\nTo fully complete your installation and make python $branch the default, please run +\n\tsudo port install python_select \ +\n\tsudo python_select $name\n" +} + +platform darwin { + post-configure { + # See http://trac.macports.org/ticket/18376 + system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.ed" + } +} + +platform darwin 7 { + # there is no SystemStubs on 10.3 + post-patch { + reinplace "s|-lSystemStubs||g" ${worksrcpath}/configure \ + ${worksrcpath}/configure.in + } + post-configure { + reinplace "s|-lSystemStubs||g" ${worksrcpath}/Makefile.pre.in \ + ${worksrcpath}/Makefile.pre ${worksrcpath}/Makefile + } + # To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth at gmail.com, ticket #13322) + configure.ldflags-append "-lcc_dynamic" +} + +platform darwin 10 { + configure.compiler gcc-4.2 +} + +variant universal { + post-patch { + set universal_arch_flags {} + set arch_run_32bit {} + foreach arch ${universal_archs} { + lappend universal_arch_flags -arch ${arch} + if { ${arch}=="i386" || ${arch}=="ppc" } { + lappend arch_run_32bit -${arch} + } + } + reinplace \ + "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \ + ${worksrcpath}/configure + reinplace \ + "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \ + ${worksrcpath}/configure + } + configure.args-append --enable-universalsdk=${universal_sysroot} +} + +variant ucs4 description {Enable support for UCS4} { + configure.args-append --enable-unicode=ucs4 +} + +#livecheck.check regex +#livecheck.url ${homepage}download/releases/ +#livecheck.regex Python (${branch}(?:\\.\\d+)*) diff --git a/packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff b/packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff new file mode 100644 index 000000000..fb861bc82 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff @@ -0,0 +1,18 @@ +--- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200 ++++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200 +@@ -1,13 +1,6 @@ +-#! /usr/local/bin/python ++#! @@PREFIX@@/bin/python2.6 + +-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is +-# intentionally NOT "/usr/bin/env python". On many systems +-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI +-# scripts, and /usr/local/bin is the default directory where Python is +-# installed, so /usr/bin/env would be unable to find python. Granted, +-# binary installations by Linux vendors often install Python in +-# /usr/bin. So let those vendors patch cgi.py to match their choice +-# of installation. ++# NOTE: /usr/local/bin/python patched for MacPorts installation + + """Support module for CGI (Common Gateway Interface) scripts. + diff --git a/packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff b/packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff new file mode 100644 index 000000000..45276c555 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff @@ -0,0 +1,51 @@ +--- Lib/distutils/dist.py.orig 2008-09-03 05:13:56.000000000 -0600 ++++ Lib/distutils/dist.py 2008-10-03 18:33:47.000000000 -0600 +@@ -60,6 +60,7 @@ + ('quiet', 'q', "run quietly (turns verbosity off)"), + ('dry-run', 'n', "don't actually do anything"), + ('help', 'h', "show detailed help message"), ++ ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'), + ] + + # 'common_usage' is a short (2-3 line) string describing the common +@@ -267,6 +268,12 @@ + else: + sys.stderr.write(msg + "\n") + ++ # no-user-cfg is handled before other command line args ++ # because other args override the config files, and this ++ # one is needed before we can load the config files. ++ # If attrs['script_args'] wasn't passed, assume false. ++ self.want_user_cfg = '--no-user-cfg' not in (self.script_args or []) ++ + self.finalize_options() + + # __init__ () +@@ -327,6 +334,9 @@ + Distutils __inst__.py file lives), a file in the user's home + directory named .pydistutils.cfg on Unix and pydistutils.cfg + on Windows/Mac, and setup.cfg in the current directory. ++ ++ The file in the user's home directory can be disabled with the ++ --no-user-cfg option. + """ + files = [] + check_environ() +@@ -347,7 +357,7 @@ + + # And look for the user config file + user_file = os.path.join(os.path.expanduser('~'), user_filename) +- if os.path.isfile(user_file): ++ if self.want_user_cfg and os.path.isfile(user_file): + files.append(user_file) + + # All platforms support local setup.cfg +@@ -355,6 +365,8 @@ + if os.path.isfile(local_file): + files.append(local_file) + ++ if DEBUG: ++ print "using config files: %s" % ', '.join(files) + return files + + # find_config_files () diff --git a/packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff b/packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff new file mode 100644 index 000000000..bafcf4715 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff @@ -0,0 +1,11 @@ +--- Mac/IDLE/Makefile.in.orig 2008-07-17 23:48:03.000000000 -0600 ++++ Mac/IDLE/Makefile.in 2008-10-04 19:50:50.000000000 -0600 +@@ -22,7 +22,7 @@ + + BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py + +-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) ++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION) + + all: IDLE.app + diff --git a/packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff b/packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff new file mode 100644 index 000000000..cfa5f88ff --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff @@ -0,0 +1,11 @@ +--- Mac/Makefile.in.orig 2008-07-22 01:06:33.000000000 -0600 ++++ Mac/Makefile.in 2008-10-04 19:51:40.000000000 -0600 +@@ -18,7 +18,7 @@ + + # These are normally glimpsed from the previous set + bindir=$(prefix)/bin +-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) ++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION) + APPINSTALLDIR=$(prefix)/Resources/Python.app + + # Variables for installing the "normal" unix binaries diff --git a/packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff b/packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff new file mode 100644 index 000000000..be74da903 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff @@ -0,0 +1,11 @@ +--- Mac/PythonLauncher/Makefile.in.orig 2008-05-02 13:58:56.000000000 -0600 ++++ Mac/PythonLauncher/Makefile.in 2008-10-04 19:52:27.000000000 -0600 +@@ -21,7 +21,7 @@ + + BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py + +-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) ++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION) + OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o + + all: Python\ Launcher.app diff --git a/packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff b/packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff new file mode 100644 index 000000000..63e4e11d2 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff @@ -0,0 +1,11 @@ +--- Mac/Tools/Doc/setup.py.diff 2008-03-29 09:24:25.000000000 -0600 ++++ Mac/Tools/Doc/setup.py 2008-10-04 19:53:40.000000000 -0600 +@@ -30,7 +30,7 @@ + + MAJOR_VERSION='2.4' + MINOR_VERSION='2.4.1' +-DESTDIR='/Applications/MacPython-%s/PythonIDE.app/Contents/Resources/English.lproj/PythonDocumentation' % MAJOR_VERSION ++DESTDIR='@@APPLICATIONS_DIR@@/MacPython-%s/PythonIDE.app/Contents/Resources/English.lproj/PythonDocumentation' % MAJOR_VERSION + + class DocBuild(build): + def initialize_options(self): diff --git a/packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff b/packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff new file mode 100644 index 000000000..60cd69706 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff @@ -0,0 +1,31 @@ +--- Makefile.pre.in.orig 2008-06-19 20:47:03.000000000 -0600 ++++ Makefile.pre.in 2008-07-28 19:57:15.000000000 -0600 +@@ -394,8 +394,8 @@ + # Build the shared modules + sharedmods: $(BUILDPYTHON) + @case $$MAKEFLAGS in \ +- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ +- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ ++ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \ ++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \ + esac + + # Build static library +@@ -993,7 +993,7 @@ + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: +- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ ++ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +@@ -1073,7 +1073,7 @@ + # This installs a few of the useful scripts in Tools/scripts + scriptsinstall: + SRCDIR=$(srcdir) $(RUNSHARED) \ +- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ ++ ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py --no-user-cfg install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --root=/$(DESTDIR) diff --git a/packaging/macosx/ports/lang/python26/files/patch-setup.py.diff b/packaging/macosx/ports/lang/python26/files/patch-setup.py.diff new file mode 100644 index 000000000..3acb4ac2b --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-setup.py.diff @@ -0,0 +1,16 @@ +--- setup.py.orig 2008-09-29 18:15:45.000000000 -0600 ++++ setup.py 2008-11-30 23:13:09.000000000 -0700 +@@ -1506,13 +1506,7 @@ + def detect_tkinter(self, inc_dirs, lib_dirs): + # The _tkinter module. + +- # Rather than complicate the code below, detecting and building +- # AquaTk is a separate method. Only one Tkinter will be built on +- # Darwin - either AquaTk, if it is found, or X11 based Tk. + platform = self.get_platform() +- if (platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without diff --git a/packaging/macosx/ports/lang/python26/files/pyconfig.ed b/packaging/macosx/ports/lang/python26/files/pyconfig.ed new file mode 100644 index 000000000..671d0d560 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/pyconfig.ed @@ -0,0 +1,2 @@ +g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */, +w diff --git a/packaging/macosx/ports/lang/python26/files/python26 b/packaging/macosx/ports/lang/python26/files/python26 new file mode 100644 index 000000000..5be5fa655 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/python26 @@ -0,0 +1,12 @@ +bin/python2.6 +bin/pythonw2.6 +bin/python2.6-config +bin/idle2.6 +bin/pydoc2.6 +bin/smtpd2.6.py +- +share/man/man1/python2.6.1.gz +${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6 +${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Headers +${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Resources +${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Python diff --git a/packaging/macosx/ports/lang/python26/files/version.plist b/packaging/macosx/ports/lang/python26/files/version.plist new file mode 100644 index 000000000..acdfe5bac --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/version.plist @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildVersion</key> + <string>1</string> + <key>CFBundleShortVersionString</key> + <string>2.6.1</string> + <key>CFBundleVersion</key> + <string>2.6.1</string> + <key>ProjectName</key> + <string>Python</string> + <key>SourceVersion</key> + <string>2.6.1</string> +</dict> +</plist> diff --git a/packaging/macosx/ports/python/py-sk1libs/Portfile b/packaging/macosx/ports/python/py-sk1libs/Portfile new file mode 100644 index 000000000..1e9c01d63 --- /dev/null +++ b/packaging/macosx/ports/python/py-sk1libs/Portfile @@ -0,0 +1,62 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 +PortGroup python 1.0 + +name py-sk1libs +version 0.9.1 +revision 101 +license LGPL-2 +maintainers nomaintainer +categories python graphics +platforms darwin +homepage http://sk1project.org/ + +description Set of python non-GUI extensions for sK1 Project + +long_description \ + sk1libs is a set of python non-GUI extensions for sK1 Project. \ + The package includes multiplatform non-GUI extensions which are \ + usually native extensions. + +distname sk1libs-${version} +# MacPorts does not properly support URLs with a get parameter. +# Workaround for this bug: https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams +master_sites http://sk1project.org/dc.php?target=${distfiles}&dummy= + +checksums md5 e18088bbc8a105e7535a96f40b80f284 \ + sha1 dd948558128bb6547b1f277087bf3066104912da \ + rmd160 38f22205e0b5b6078e31ec6dc4c1d93845533046 + +python.versions 25 26 27 + +if {$subport != $name} { + + depends_lib-append \ + port:freetype \ + port:jpeg \ + port:lcms \ + port:zlib + + depends_run-append \ + port:py${python.version}-pil + + variant Pillow { + depends_run-delete port:py${python.version}-pil + depends_run-append port:py${python.version}-Pillow + } + + patchfiles \ + patch-src-utils-fs.py.diff \ + patch-src-imaging-libimagingft-_imagingft.c.diff + + post-patch { + reinplace "s|'/usr/include/freetype2'|'${prefix}/include/freetype2'|g" ${worksrcpath}/setup.py + reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/src/utils/fs.py + } +} + +livecheck.type regex +livecheck.url http://sk1project.org/modules.php?name=Products&product=uniconvertor&op=download +livecheck.regex "sk1libs-(\\d+(?:\\.\\d+)*)${extract.suffix}" diff --git a/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff new file mode 100644 index 000000000..1d69461a3 --- /dev/null +++ b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff @@ -0,0 +1,16 @@ +--- src/imaging/libimagingft/_imagingft.c.orig 2014-07-13 00:37:57.000000000 +0200 ++++ src/imaging/libimagingft/_imagingft.c 2014-07-13 00:41:08.000000000 +0200 +@@ -70,7 +70,13 @@ + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++/* freetype 2.1 and newer */ ++#include FT_ERRORS_H ++#else ++/* freetype 2.0 */ + #include <freetype/fterrors.h> ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff new file mode 100644 index 000000000..541935e71 --- /dev/null +++ b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff @@ -0,0 +1,26 @@ +--- src/utils/fs.py.orig 2010-05-23 12:46:21.000000000 +0200 ++++ src/utils/fs.py 2013-01-18 15:40:02.000000000 +0100 +@@ -220,8 +220,14 @@ + finally: + _winreg.CloseKey( k ) + if system.get_os_family()==system.MACOSX: +- #FIXME: It's a stub. The paths should be more exact. +- return ['/',] ++ return ['__PREFIX__/share/fonts', ++ '/usr/share/fonts', ++ '/opt/X11/lib/X11/fonts', ++ '/System/Library/Fonts', ++ '/Network/Library/Fonts', ++ '/Library/Fonts', ++ os.path.expanduser("~/Library/Fonts"), ++ os.path.expanduser("~/.fonts")] + + + DIRECTORY_OBJECT=0 +@@ -311,4 +317,4 @@ + if __name__ == '__main__': + _test() + +- +\ No newline at end of file ++ diff --git a/packaging/macosx/ports/python/py-uniconvertor/Portfile b/packaging/macosx/ports/python/py-uniconvertor/Portfile new file mode 100644 index 000000000..2c4a22ca0 --- /dev/null +++ b/packaging/macosx/ports/python/py-uniconvertor/Portfile @@ -0,0 +1,46 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 +PortGroup python 1.0 + +name py-uniconvertor +version 1.1.5 +revision 100 +license LGPL-2 GPL-2 +maintainers nomaintainer +categories python graphics +platforms darwin +homepage http://sk1project.org/modules.php?name=Products&product=uniconvertor + +description universal vector graphics translator. + +long_description \ + UniConvertor is a universal vector graphics translator. It is a command \ + line tool which uses sK1 object model to convert one format to another. \ + Supported input formats include CorelDraw v7-X4 (CDR/CDT/CCX/CDRX/CMX), \ + Adobe Illustrator v5-9 (AI), PS, EPS, CGM, WMF, XFIG, SVG, SK, SK1, AFF. \ + Supported output formats include Adobe Illustrator AI, PS, CGM, WMF, \ + SVG, SK, SK1, PDF. + +distname uniconvertor-${version} +# MacPorts does not properly support URLs with a get parameter. +# Workaround for this bug: https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams +master_sites http://sk1project.org/dc.php?target=${distfiles}&dummy= + +checksums md5 d1272315a58304ece2ff588834e23f72 \ + sha1 51ec7c4487048c3357ed95cdb4ab3524018a2c9e \ + rmd160 86211bdb7b7af7611a9db4a2e2f6101995af6850 + +python.versions 25 26 27 + +if {$subport != $name} { + + depends_lib-append \ + port:py${python.version}-sk1libs + +} + +livecheck.type regex +livecheck.url http://sk1project.org/modules.php?name=Products&product=uniconvertor&op=download +livecheck.regex "uniconvertor-(\\d+(?:\\.\\d+)*)${extract.suffix}" -- cgit v1.2.3 From 963a90531a042d793f0f2e0fddbe9df0de35bf6d Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Thu, 21 Aug 2014 19:18:39 +0200 Subject: add poppler data to bundle, fix relocation support (see bug #956282) (bzr r13506.1.40) --- packaging/macosx/Resources/bin/inkscape | 1 + packaging/macosx/osx-app.sh | 3 +++ src/extension/internal/pdfinput/pdf-input.cpp | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index b1ff5a85a..dcdeb0aaf 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -63,6 +63,7 @@ export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" export XDG_DATA_DIRS="$TOP/share" export ASPELL_CONF="prefix $TOP;" +export POPPLER_DATADIR="$TOP/share/poppler" # Note: This requires the path with the exact ImageMagic version number. # Also, that ImageMagick will only work if it does not find a diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 696f137fa..73e4714fc 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -402,6 +402,9 @@ cp -r "$LIBPREFIX/share/ImageMagick-6" "$pkgresources/share/" # Copy aspell dictionary files: cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" +# Copy Poppler data: +cp -r "$LIBPREFIX/share/poppler" "$pkgshare" + # Copy all linked libraries into the bundle #---------------------------------------------------------- # get list of *.so modules from python modules diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 63581bd8a..cbdaf9d20 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -647,7 +647,31 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { // Initialize the globalParams variable for poppler if (!globalParams) { +#ifdef ENABLE_OSX_APP_LOCATIONS + // + // data files for poppler are not relocatable (loaded from + // path defined at build time). This fails to work with relocatable + // application bundles for OS X. + // + // Workaround: + // 1. define $POPPLER_DATADIR env variable in app launcher script + // 2. pass custom $POPPLER_DATADIR via poppler's GlobalParams() + // + // relevant poppler commit: + // <http://cgit.freedesktop.org/poppler/poppler/commit/?id=869584a84eed507775ff1c3183fe484c14b6f77b> + // + // FIXES: Inkscape bug #956282, #1264793 + // TODO: report RFE upstream (full relocation support for OS X packaging) + // + gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR"); + if (poppler_datadir != NULL) { + globalParams = new GlobalParams(poppler_datadir); + } else { + globalParams = new GlobalParams(); + } +#else globalParams = new GlobalParams(); +#endif // ENABLE_OSX_APP_LOCATIONS } // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from glib gstdio.c #ifndef WIN32 -- cgit v1.2.3 From 283fe27cad31ea1eee54fd929717e72fd0855d96 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Thu, 21 Aug 2014 20:53:13 +0200 Subject: Improve relocation support for ImageMagick libs and modules (bzr r13506.1.41) --- packaging/macosx/Resources/bin/inkscape | 2 +- packaging/macosx/osx-app.sh | 29 ++++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index dcdeb0aaf..8ea68c992 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -71,7 +71,7 @@ export POPPLER_DATADIR="$TOP/share/poppler" # installed. Luckily, this is very unlikely given the extra long # and strangely named install prefix we use. # The actual version is inserted by the packaging script. -export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER/config" +export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 73e4714fc..3fb1585e1 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -304,10 +304,6 @@ done # Icons and the rest of the script framework rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" -# Update the ImageMagick path in startup script. -IMAGEMAGICKVER=`pkg-config --modversion ImageMagick` -sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" $pkgbin/inkscape - # Add python modules if requested if [ ${add_python} = "true" ]; then function install_py_modules () @@ -396,8 +392,31 @@ sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" $pkgbin/inkscape sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkglib/gtk-2.0/$gtk_version/immodules.cache sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache > $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache +# ImageMagick version +IMAGEMAGICKVER="$(pkg-config --modversion ImageMagick)" +IMAGEMAGICKVER_MAJOR="$(cut -d. -f1 <<< "$IMAGEMAGICKVER")" + +# ImageMagick data +# include *.la files for main libs too +for item in "$LIBPREFIX/lib/libMagick"*.la; do + cp "$item" "$pkglib/" +done +# ImageMagick modules cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" -cp -r "$LIBPREFIX/share/ImageMagick-6" "$pkgresources/share/" +cp -r "$LIBPREFIX/etc/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgetc/" +cp -r "$LIBPREFIX/share/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgshare/" +# REQUIRED: remove hard-coded paths from *.la files +for la_file in "$pkglib/libMagick"*.la; do + sed -e "s,$LIBPREFIX/lib,,g" -i "" "$la_file" +done +for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders"/*.la; do + sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders,,g" -i "" "$la_file" +done +for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters"/*.la; do + sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters,,g" -i "" "$la_file" +done +sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" $pkgbin/inkscape +sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" $pkgbin/inkscape # Copy aspell dictionary files: cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" -- cgit v1.2.3 From 699d4d8ac94550d385d1763f010828fa5c65fb3c Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 22 Aug 2014 07:23:08 +0200 Subject: Use Inkscape icon for osascript dialog (bzr r13506.1.42) --- packaging/macosx/Resources/alert_fccache.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/Resources/alert_fccache.sh b/packaging/macosx/Resources/alert_fccache.sh index 110c89940..50038b2ac 100755 --- a/packaging/macosx/Resources/alert_fccache.sh +++ b/packaging/macosx/Resources/alert_fccache.sh @@ -2,10 +2,14 @@ ALERT_SCRIPT="$(cat << EOM try - tell application "SystemUIServer" + set parent_path to "$CWD" + set icon_path to POSIX path of (parent_path & "/Inkscape.icns") + set front_app to ((path to frontmost application) as text) + tell application front_app display dialog "While Inkscape is open, its windows can be displayed or hidden by displaying or hiding the X11 application. -The first time this version of Inkscape is run it may take several minutes before the main window is displayed while font caches are built." buttons {"OK"} default button 1 with icon 2 +The first time this version of Inkscape is run it may take several minutes before the main window is displayed while font caches are built." buttons {"OK"} default button 1 with title "Inkscape on OS X" with icon POSIX file icon_path + activate end tell end try EOM)" -- cgit v1.2.3 From 457b72ec3ce08e11d6beb6bf39e7c13b3c47900b Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 25 Aug 2014 01:20:48 +0200 Subject: osx-build.sh: if repo is checkout use 'bzr update', else 'bzr pull'. (is there a better way to check binding state with bzr?) (bzr r13506.1.43) --- packaging/macosx/osx-build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index b82b038c8..8c759b6e1 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -262,7 +262,14 @@ function getinkscapeinfo () { if [[ "$BZRUPDATE" == "t" ]] then cd $SRCROOT - bzr pull + if [ -z "$(bzr info | grep "checkout")" ]; then + echo "repo is unbound (branch)" + update_cmd="bzr pull" + else + echo "repo is bound (checkout)" + update_cmd="bzr update" + fi + $update_cmd status=$? if [[ $status -ne 0 ]]; then echo -e "\nBZR update failed" -- cgit v1.2.3 From d9e2b563ce77cdaca43171c91bfd3659e049b45e Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 25 Aug 2014 01:21:16 +0200 Subject: add debug options to launcher script (bzr r13506.1.44) --- packaging/macosx/Resources/bin/inkscape | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 8ea68c992..d0c55906d 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -6,6 +6,20 @@ # Jean-Olivier Irisson <jo.irisson@gmail.com> # +if test "x$GTK_DEBUG_LAUNCHER" != x; then + set -x +fi + +if test "x$GTK_DEBUG_GDB" != x; then + EXEC="gdb --args" +elif test "x$GTK_DEBUG_LLDB" != x; then + EXEC="lldb -- " +elif test "x$GTK_DEBUG_DTRUSS" != x; then + EXEC="dtruss" +else + EXEC=exec +fi + CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo \"$PWD\")`" # e.g. /Applications/Inkscape.app/Contents/Resources/bin TOP="`dirname \"$CWD\"`" @@ -132,4 +146,8 @@ sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ > "${INK_CACHE_DIR}/loaders.cache" -exec "$CWD/inkscape-bin" "$@" +if [ "x$GTK_DEBUG_SHELL" != "x" ]; then + exec bash +else + $EXEC "$CWD/inkscape-bin" "$@" +fi -- cgit v1.2.3 From 756b0bc2bc38ea91615f3a34608328c1e8b15ae3 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 25 Aug 2014 01:22:19 +0200 Subject: osx-app.sh: check for python_dir if 'add_python' is true (needs fixing) (bzr r13506.1.45) --- packaging/macosx/osx-app.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 3fb1585e1..5bb2a5340 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -135,12 +135,19 @@ if [ ! -f "$plist" ]; then exit 1 fi -# if [ ${add_python} = "true" ]; then -# if [ "x$python_dir" == "x" ]; then -# echo "Python modules directory not specified." >&2 -# exit 1 -# fi -# fi +if [ ${add_python} = "true" ]; then + if [ "x$python_dir" == "x" ]; then + echo "Python modules will be copied from MacPorts tree." + else + if [ ! -e "$python_dir" ]; then + echo "Python modules directory \""$python_dir"\" not found." >&2 + exit 1 + else + # TODO: check directoy structure and reject old one based on ppc/i386 + echo "Python modules will be copied from $python_dir." + fi + fi +fi if [ ! -e "$LIBPREFIX" ]; then echo "Cannot find the directory containing the libraires: $LIBPREFIX" >&2 -- cgit v1.2.3 From 4a6dfa29131adb8c7470ab66a839d144b02542e5 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 26 Aug 2014 10:41:57 +0200 Subject: librevenge: update to latest patch from bug #1323592 (support old and new versions of libwpg, libcdr and libvisio ) (bzr r13398.1.7) --- configure.ac | 75 +++++++++++++++++++++++++++++++----- src/extension/internal/cdr-input.cpp | 34 ++++++++++++---- src/extension/internal/vsd-input.cpp | 35 +++++++++++++---- src/extension/internal/wpg-input.cpp | 50 +++++++++++++++++++----- src/ui/dialog/symbols.cpp | 24 ++++++++++-- 5 files changed, 179 insertions(+), 39 deletions(-) diff --git a/configure.ac b/configure.ac index d178d19fe..5d4e0bc13 100644 --- a/configure.ac +++ b/configure.ac @@ -531,14 +531,33 @@ AC_ARG_ENABLE(wpg, with_libwpg=no if test "x$enable_wpg" = "xyes"; then - PKG_CHECK_MODULES(LIBWPG, libwpg-0.3 librevenge-0.0 librevenge-stream-0.0, with_libwpg=yes, with_libwpg=no) + dnl ************************************************************** + dnl Try using librevenge framework first. Fall back to old libs + dnl if unavailable. + dnl TODO: Drop subsequent tests once this is widespread in distros + dnl ************************************************************** + PKG_CHECK_MODULES(LIBWPG03, libwpg-0.3 librevenge-0.0 librevenge-stream-0.0, with_libwpg03=yes, with_libwpg03=no) + if test "x$with_libwpg03" = "xyes"; then + AC_DEFINE(WITH_LIBWPG03,1,[Build using libwpg 0.3.x]) + with_libwpg=yes + AC_SUBST(LIBWPG_LIBS, $LIBWPG03_LIBS) + AC_SUBST(LIBWPG_CFLAGS, $LIBWPG03_CFLAGS) + else + PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no) + if test "x$with_libwpg02" = "xyes"; then + AC_DEFINE(WITH_LIBWPG02,1,[Build using libwpg 0.2.x]) + with_libwpg=yes + AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS) + AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS) + fi + fi if test "x$with_libwpg" = "xyes"; then AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg]) fi fi -AC_SUBST(LIBWPG_LIBS) -AC_SUBST(LIBWPG_CFLAGS) +AM_CONDITIONAL(WITH_LIBWPG03, test "x$with_libwpg03" = "xyes") +AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes") AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes") dnl ******************************** @@ -552,14 +571,33 @@ AC_ARG_ENABLE(visio, with_libvisio=no if test "x$enable_visio" = "xyes"; then - PKG_CHECK_MODULES(LIBVISIO, libvisio-0.1 librevenge-0.0 librevenge-stream-0.0, with_libvisio=yes, with_libvisio=no) + dnl ************************************************************** + dnl Try using librevenge framework first. Fall back to old libs + dnl if unavailable. + dnl TODO: Drop subsequent tests once this is widespread in distros + dnl ************************************************************** + PKG_CHECK_MODULES(LIBVISIO01, libvisio-0.1 librevenge-0.0 librevenge-stream-0.0, with_libvisio01=yes, with_libvisio01=no) + if test "x$with_libvisio01" = "xyes"; then + AC_DEFINE(WITH_LIBVISIO01,1,[Build using libvisio 0.1.x]) + with_libvisio=yes + AC_SUBST(LIBVISIO_LIBS, $LIBVISIO01_LIBS) + AC_SUBST(LIBVISIO_CFLAGS, $LIBVISIO01_CFLAGS) + else + PKG_CHECK_MODULES(LIBVISIO00, libvisio-0.0 >= 0.0.20 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libvisio00=yes, with_libvisio00=no) + if test "x$with_libvisio00" = "xyes"; then + AC_DEFINE(WITH_LIBVISIO00,1,[Build using libvisio 0.0.x]) + with_libvisio=yes + AC_SUBST(LIBVISIO_LIBS, $LIBVISIO00_LIBS) + AC_SUBST(LIBVISIO_CFLAGS, $LIBVISIO00_CFLAGS) + fi + fi if test "x$with_libvisio" = "xyes"; then AC_DEFINE(WITH_LIBVISIO,1,[Build in libvisio]) fi fi -AC_SUBST(LIBVISIO_LIBS) -AC_SUBST(LIBVISIO_CFLAGS) +AM_CONDITIONAL(WITH_LIBVISIO01, test "x$with_libvisio01" = "xyes") +AM_CONDITIONAL(WITH_LIBVISIO00, test "x$with_libvisio00" = "xyes") AM_CONDITIONAL(WITH_LIBVISIO, test "x$with_libvisio" = "xyes") dnl ******************************** @@ -573,14 +611,33 @@ AC_ARG_ENABLE(cdr, with_libcdr=no if test "x$enable_cdr" = "xyes"; then - PKG_CHECK_MODULES(LIBCDR, libcdr-0.1 librevenge-0.0 librevenge-stream-0.0, with_libcdr=yes, with_libcdr=no) + dnl ************************************************************** + dnl Try using librevenge framework first. Fall back to old libs + dnl if unavailable. + dnl TODO: Drop subsequent tests once this is widespread in distros + dnl ************************************************************** + PKG_CHECK_MODULES(LIBCDR01, libcdr-0.1 librevenge-0.0 librevenge-stream-0.0, with_libcdr01=yes, with_libcdr01=no) + if test "x$with_libcdr01" = "xyes"; then + AC_DEFINE(WITH_LIBCDR01,1,[Build using libcdr 0.1.x]) + with_libcdr=yes + AC_SUBST(LIBCDR_LIBS, $LIBCDR01_LIBS) + AC_SUBST(LIBCDR_CFLAGS, $LIBCDR01_CFLAGS) + else + PKG_CHECK_MODULES(LIBCDR00, libcdr-0.0 >= 0.0.3 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libcdr00=yes, with_libcdr00=no) + if test "x$with_libcdr00" = "xyes"; then + AC_DEFINE(WITH_LIBCDR00,1,[Build using libcdr 0.0.x]) + with_libcdr=yes + AC_SUBST(LIBCDR_LIBS, $LIBCDR00_LIBS) + AC_SUBST(LIBCDR_CFLAGS, $LIBCDR00_CFLAGS) + fi + fi if test "x$with_libcdr" = "xyes"; then AC_DEFINE(WITH_LIBCDR,1,[Build in libcdr]) fi fi -AC_SUBST(LIBCDR_LIBS) -AC_SUBST(LIBCDR_CFLAGS) +AM_CONDITIONAL(WITH_LIBCDR01, test "x$with_libcdr01" = "xyes") +AM_CONDITIONAL(WITH_LIBCDR00, test "x$with_libcdr00" = "xyes") AM_CONDITIONAL(WITH_LIBCDR, test "x$with_libcdr" = "xyes") dnl ****************************** diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index c4f251361..748bf4477 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -24,7 +24,21 @@ #include <cstring> #include <libcdr/libcdr.h> -#include <librevenge-stream/librevenge-stream.h> + +// TODO: Drop this check when librevenge is widespread. +#if WITH_LIBCDR01 + #include <librevenge-stream/librevenge-stream.h> + + using librevenge::RVNGString; + using librevenge::RVNGFileStream; + using librevenge::RVNGStringVector; +#else + #include <libwpd-stream/libwpd-stream.h> + + typedef WPXString RVNGString; + typedef WPXFileStream RVNGFileStream; + typedef libcdr::CDRStringVector RVNGStringVector; +#endif #include <gtkmm/alignment.h> #include <gtkmm/comboboxtext.h> @@ -60,7 +74,7 @@ namespace Internal { class CdrImportDialog : public Gtk::Dialog { public: - CdrImportDialog(const std::vector<librevenge::RVNGString> &vec); + CdrImportDialog(const std::vector<RVNGString> &vec); virtual ~CdrImportDialog(); bool showDialog(); @@ -86,12 +100,12 @@ private: class Gtk::VBox * vbox2; class Gtk::Widget * _previewArea; - const std::vector<librevenge::RVNGString> &_vec; // Document to be imported + const std::vector<RVNGString> &_vec; // Document to be imported unsigned _current_page; // Current selected page int _preview_width, _preview_height; // Size of the preview area }; -CdrImportDialog::CdrImportDialog(const std::vector<librevenge::RVNGString> &vec) +CdrImportDialog::CdrImportDialog(const std::vector<RVNGString> &vec) : _vec(vec), _current_page(1) { int num_pages = _vec.size(); @@ -210,16 +224,20 @@ void CdrImportDialog::_setPreviewPage(unsigned page) SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - librevenge::RVNGFileStream input(uri); + RVNGFileStream input(uri); if (!libcdr::CDRDocument::isSupported(&input)) { return NULL; } - librevenge::RVNGStringVector output; + RVNGStringVector output; +#if WITH_LIBCDR01 librevenge::RVNGSVGDrawingGenerator generator(output, "svg"); if (!libcdr::CDRDocument::parse(&input, &generator)) { +#else + if (!libcdr::CDRDocument::generateSVG(&input, output)) { +#endif return NULL; } @@ -227,9 +245,9 @@ SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u return NULL; } - std::vector<librevenge::RVNGString> tmpSVGOutput; + std::vector<RVNGString> tmpSVGOutput; for (unsigned i=0; i<output.size(); ++i) { - librevenge::RVNGString tmpString("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); + RVNGString tmpString("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); tmpString.append(output[i]); tmpSVGOutput.push_back(tmpString); } diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index b7e8669b8..674997d54 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -24,7 +24,22 @@ #include <cstring> #include <libvisio/libvisio.h> -#include <librevenge-stream/librevenge-stream.h> + +// TODO: Drop this check when librevenge is widespread. +#if WITH_LIBVISIO01 + #include <librevenge-stream/librevenge-stream.h> + + using librevenge::RVNGString; + using librevenge::RVNGFileStream; + using librevenge::RVNGStringVector; +#else + #include <libwpd-stream/libwpd-stream.h> + + typedef WPXString RVNGString; + typedef WPXFileStream RVNGFileStream; + typedef libvisio::VSDStringVector RVNGStringVector; +#endif + #include <gtkmm/alignment.h> #include <gtkmm/comboboxtext.h> @@ -59,7 +74,7 @@ namespace Internal { class VsdImportDialog : public Gtk::Dialog { public: - VsdImportDialog(const std::vector<librevenge::RVNGString> &vec); + VsdImportDialog(const std::vector<RVNGString> &vec); virtual ~VsdImportDialog(); bool showDialog(); @@ -85,12 +100,12 @@ private: class Gtk::VBox * vbox2; class Gtk::Widget * _previewArea; - const std::vector<librevenge::RVNGString> &_vec; // Document to be imported + const std::vector<RVNGString> &_vec; // Document to be imported unsigned _current_page; // Current selected page int _preview_width, _preview_height; // Size of the preview area }; -VsdImportDialog::VsdImportDialog(const std::vector<librevenge::RVNGString> &vec) +VsdImportDialog::VsdImportDialog(const std::vector<RVNGString> &vec) : _vec(vec), _current_page(1) { int num_pages = _vec.size(); @@ -209,16 +224,20 @@ void VsdImportDialog::_setPreviewPage(unsigned page) SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - librevenge::RVNGFileStream input(uri); + RVNGFileStream input(uri); if (!libvisio::VisioDocument::isSupported(&input)) { return NULL; } - librevenge::RVNGStringVector output; + RVNGStringVector output; +#if WITH_LIBVISIO01 librevenge::RVNGSVGDrawingGenerator generator(output, "svg"); if (!libvisio::VisioDocument::parse(&input, &generator)) { +#else + if (!libvisio::VisioDocument::generateSVG(&input, output)) { +#endif return NULL; } @@ -226,9 +245,9 @@ SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u return NULL; } - std::vector<librevenge::RVNGString> tmpSVGOutput; + std::vector<RVNGString> tmpSVGOutput; for (unsigned i=0; i<output.size(); ++i) { - librevenge::RVNGString tmpString("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); + RVNGString tmpString("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); tmpString.append(output[i]); tmpSVGOutput.push_back(tmpString); } diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index c10926361..12d86a99a 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -52,8 +52,25 @@ #include "util/units.h" #include <cstring> +// Take a guess and fallback to 0.2.x if no configure has run +#if !defined(WITH_LIBWPG03) && !defined(WITH_LIBWPG02) +#define WITH_LIBWPG02 1 +#endif + #include "libwpg/libwpg.h" -#include "librevenge-stream/librevenge-stream.h" +#if WITH_LIBWPG03 + #include <librevenge-stream/librevenge-stream.h> + + using librevenge::RVNGString; + using librevenge::RVNGFileStream; + using librevenge::RVNGInputStream; +#else + #include "libwpd-stream/libwpd-stream.h" + + typedef WPXString RVNGString; + typedef WPXFileStream RVNGFileStream; + typedef WPXInputStream RVNGInputStream; +#endif using namespace libwpg; @@ -64,9 +81,15 @@ namespace Internal { SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(uri); + RVNGInputStream* input = new RVNGFileStream(uri); +#if WITH_LIBWPG03 if (input->isStructured()) { - librevenge::RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN"); + RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN"); +#else + if (input->isOLEStream()) { + RVNGInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN"); +#endif + if (olestream) { delete input; input = olestream; @@ -81,17 +104,24 @@ SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u return NULL; } - librevenge::RVNGStringVector vec; - librevenge::RVNGSVGDrawingGenerator generator(vec, ""); +#if WITH_LIBWPG03 + librevenge::RVNGStringVector vec; + librevenge::RVNGSVGDrawingGenerator generator(vec, ""); - if (!libwpg::WPGraphics::parse(input, &generator) || vec.empty() || vec[0].empty()) - { + if (!libwpg::WPGraphics::parse(input, &generator) || vec.empty() || vec[0].empty()) { delete input; return NULL; - } + } - librevenge::RVNGString output("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); - output.append(vec[0]); + RVNGString output("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); + output.append(vec[0]); +#else + RVNGString output; + if (!libwpg::WPGraphics::generateSVG(input, output)) { + delete input; + return NULL; + } +#endif //printf("I've got a doc: \n%s", painter.document.c_str()); diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 27e40f552..a9cf8d068 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -62,8 +62,20 @@ #include "widgets/icon.h" #ifdef WITH_LIBVISIO -#include <libvisio/libvisio.h> -#include <librevenge-stream/librevenge-stream.h> + #include <libvisio/libvisio.h> + + // TODO: Drop this check when librevenge is widespread. + #if WITH_LIBVISIO01 + #include <librevenge-stream/librevenge-stream.h> + + using librevenge::RVNGFileStream; + using librevenge::RVNGStringVector; + #else + #include <libwpd-stream/libwpd-stream.h> + + typedef WPXFileStream RVNGFileStream; + typedef libvisio::VSDStringVector RVNGStringVector; + #endif #endif #include "verbs.h" @@ -495,16 +507,20 @@ void SymbolsDialog::iconChanged() { // Read Visio stencil files SPDocument* read_vss( gchar* fullname, gchar* filename ) { - librevenge::RVNGFileStream input(fullname); + RVNGFileStream input(fullname); if (!libvisio::VisioDocument::isSupported(&input)) { return NULL; } - librevenge::RVNGStringVector output; + RVNGStringVector output; +#if WITH_LIBVISIO01 librevenge::RVNGSVGDrawingGenerator generator(output, "svg"); if (!libvisio::VisioDocument::parseStencils(&input, &generator)) { +#else + if (!libvisio::VisioDocument::generateSVGStencils(&input, output)) { +#endif return NULL; } -- cgit v1.2.3 From ae1fe74542858e21d1a605bd9ec1d021e5c9b418 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 26 Aug 2014 15:59:46 +0200 Subject: osx-app.sh: test awk and require gawk if too old (bzr r13506.1.47) --- packaging/macosx/osx-app.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 5bb2a5340..87e6391e1 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -180,6 +180,20 @@ if [ ! -e "$LIBPREFIX/lib/aspell-0.60/en.dat" ]; then exit 1 fi +# awk on Leopard fails in fixlib(), test earlier and require gawk if test fails +awk_test="$(echo "/lib" | awk -F/ '{for (i=1;i<NF;i++) sub($i,".."); sub($NF,"",$0); print $0}')" +if [ -z "$awk_test" ]; then + if [ ! -x "$LIBPREFIX/bin/gawk" ]; then + echo "awk provided by system is too old, please install gawk and try again" >&2 + exit 1 + else + awk_cmd="$LIBPREFIX/bin/gawk" + fi +else + awk_cmd="awk" +fi +unset awk_test + # OS X version #---------------------------------------------------------- @@ -491,7 +505,7 @@ fixlib () { lib) # TODO: verfiy correct/expected install name for relocated libs to_id="$package/Contents/Resources$filePath/$1" - loader_to_res="$(echo $filePath | gawk -F/ '{for (i=1;i<NF;i++) sub($i,".."); sub($NF,"",$0); print $0}')" + loader_to_res="$(echo $filePath | $awk_cmd -F/ '{for (i=1;i<NF;i++) sub($i,".."); sub($NF,"",$0); print $0}')" ;; bin) loader_to_res="../" @@ -507,7 +521,7 @@ fixlib () { for lib in $fileLibs; do first="$(echo $lib | cut -d/ -f1-3)" if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /opt/X11 -a $first != /System/Library ]; then - lib_prefix_levels="$(echo $lib | awk -F/ '{for (i=NF;i>0;i--) if($i=="lib") j=i; print j}')" + lib_prefix_levels="$(echo $lib | $awk_cmd -F/ '{for (i=NF;i>0;i--) if($i=="lib") j=i; print j}')" res_to_lib="$(echo $lib | cut -d/ -f$lib_prefix_levels-)" unset to_path case $fileType in -- cgit v1.2.3 From 81980fa16605ce8ffb4c024b4c248f66fbced741 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 2 Sep 2014 04:44:29 +0200 Subject: add more custom portfiles for Leopard and Python 2.5 (bzr r13506.1.49) --- packaging/macosx/ports/python/py25-Pillow/Portfile | 77 ++++++++ .../py25-Pillow/files/patch-_imagingft.c.diff | 14 ++ .../py25-Pillow/files/patch-setup.py-v1.7.8.diff | 83 +++++++++ packaging/macosx/ports/python/py25-numpy/Portfile | 206 +++++++++++++++++++++ .../py25-numpy/files/patch-f2py_setup.py.diff | 29 +++ .../py25-numpy/files/patch-fcompiler_g95.diff | 11 ++ ...atch-numpy_distutils_fcompiler___init__.py.diff | 30 +++ .../files/patch-numpy_linalg_setup.py.diff | 10 + .../python/py25-numpy/files/patch-setup.py.diff | 34 ++++ .../ports/python/py25-numpy/files/wrapper-template | 143 ++++++++++++++ 10 files changed, 637 insertions(+) create mode 100644 packaging/macosx/ports/python/py25-Pillow/Portfile create mode 100644 packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff create mode 100644 packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff create mode 100644 packaging/macosx/ports/python/py25-numpy/Portfile create mode 100644 packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff create mode 100644 packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff create mode 100644 packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff create mode 100644 packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff create mode 100644 packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff create mode 100755 packaging/macosx/ports/python/py25-numpy/files/wrapper-template diff --git a/packaging/macosx/ports/python/py25-Pillow/Portfile b/packaging/macosx/ports/python/py25-Pillow/Portfile new file mode 100644 index 000000000..85363b206 --- /dev/null +++ b/packaging/macosx/ports/python/py25-Pillow/Portfile @@ -0,0 +1,77 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 104088 2013-03-15 14:39:56Z stromnov@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 + +name py25-Pillow +set real_name py-Pillow +version 1.7.8 +revision 100 +categories-append devel +platforms darwin +license BSD + +python.versions 25 +python.version 25 + +maintainers stromnov openmaintainer + +description Python Imaging Library (fork) + +long_description ${description} + +homepage http://github.com/python-imaging/Pillow +master_sites http://pypi.python.org/packages/source/P/Pillow/ + +distname Pillow-${version} +use_zip yes + +checksums rmd160 e52cec02d943951a80d30b32b1764cb3ae87b283 \ + sha256 907f5342b1df1d277dcc10df2aeabc61099e5a07e0676b9fcd1bb7379890c0ee + +if {$subport == $name} { + conflicts py${python.version}-pil + + depends_build port:py${python.version}-setuptools + depends_lib-append \ + port:zlib \ + port:jpeg \ + port:tiff \ + port:lcms \ + port:webp \ + port:freetype + + patchfiles patch-setup.py-v1.7.8.diff \ + patch-_imagingft.c.diff + + post-patch { + reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py + } + + livecheck.type none +} else { + livecheck.type regex + livecheck.url ${master_sites} + livecheck.regex "Pillow-(\\d+(?:\\.\\d+)*)${extract.suffix}" +} + +variant quartz conflicts x11 tkinter { + # tkinter doesn't build +} + +variant x11 conflicts quartz { + # tkinter does build +} + +variant tkinter description {with tkinter support} { + if {$subport == $name} { + depends_lib-append port:py${python.version}-tkinter + } +} + +#if { ![variant_isset quartz] } { +# default_variants-append +tkinter +#} + +default_variants -tkinter diff --git a/packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff b/packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff new file mode 100644 index 000000000..99f72a8c9 --- /dev/null +++ b/packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff @@ -0,0 +1,14 @@ +--- _imagingft.c.orig 2013-11-27 16:07:53.000000000 +0400 ++++ _imagingft.c 2013-11-27 16:12:01.000000000 +0400 +@@ -70,7 +70,11 @@ + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++#include FT_ERRORS_H ++#else + #include <freetype/fterrors.h> ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff b/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff new file mode 100644 index 000000000..2f4b797f6 --- /dev/null +++ b/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff @@ -0,0 +1,83 @@ +--- setup.py.orig 2014-09-02 02:51:22.000000000 +0200 ++++ setup.py 2014-09-02 02:53:51.000000000 +0200 +@@ -100,18 +100,9 @@ + "/usr/lib", "python%s" % sys.version[:3], "config")) + + elif sys.platform == "darwin": +- # attempt to make sure we pick freetype2 over other versions +- _add_directory(include_dirs, "/sw/include/freetype2") +- _add_directory(include_dirs, "/sw/lib/freetype2/include") +- # fink installation directories +- _add_directory(library_dirs, "/sw/lib") +- _add_directory(include_dirs, "/sw/include") + # darwin ports installation directories +- _add_directory(library_dirs, "/opt/local/lib") +- _add_directory(include_dirs, "/opt/local/include") +- # freetype2 ships with X11 +- _add_directory(library_dirs, "/usr/X11/lib") +- _add_directory(include_dirs, "/usr/X11/include") ++ _add_directory(library_dirs, "@prefix@/lib") ++ _add_directory(include_dirs, "@prefix@/include") + + elif sys.platform.startswith("linux"): + if platform.processor() == "x86_64": +@@ -126,9 +117,6 @@ + # work ;-) + self.add_multiarch_paths() + +- _add_directory(library_dirs, "/usr/local/lib") +- # FIXME: check /opt/stuff directories here? +- + prefix = sysconfig.get_config_var("prefix") + if prefix: + _add_directory(library_dirs, os.path.join(prefix, "lib")) +@@ -180,19 +168,6 @@ + # + # add standard directories + +- # look for tcl specific subdirectory (e.g debian) +- if _tkinter: +- tcl_dir = "/usr/include/tcl" + TCL_VERSION +- if os.path.isfile(os.path.join(tcl_dir, "tk.h")): +- _add_directory(include_dirs, tcl_dir) +- +- # standard locations +- _add_directory(library_dirs, "/usr/local/lib") +- _add_directory(include_dirs, "/usr/local/include") +- +- _add_directory(library_dirs, "/usr/lib") +- _add_directory(include_dirs, "/usr/include") +- + # + # insert new dirs *before* default libs, to avoid conflicts + # between Python PYD stub libs and real libraries +@@ -307,28 +282,7 @@ + exts.append(Extension( + "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra)) + +- if sys.platform == "darwin": +- # locate Tcl/Tk frameworks +- frameworks = [] +- framework_roots = [ +- "/Library/Frameworks", +- "/System/Library/Frameworks"] +- for root in framework_roots: +- if (os.path.exists(os.path.join(root, "Tcl.framework")) and +- os.path.exists(os.path.join(root, "Tk.framework"))): +- print("--- using frameworks at %s" % root) +- frameworks = ["-framework", "Tcl", "-framework", "Tk"] +- dir = os.path.join(root, "Tcl.framework", "Headers") +- _add_directory(self.compiler.include_dirs, dir, 0) +- dir = os.path.join(root, "Tk.framework", "Headers") +- _add_directory(self.compiler.include_dirs, dir, 1) +- break +- if frameworks: +- exts.append(Extension( +- "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], +- extra_compile_args=frameworks, extra_link_args=frameworks)) +- feature.tcl = feature.tk = 1 # mark as present +- elif feature.tcl and feature.tk: ++ if feature.tcl and feature.tk: + exts.append(Extension( + "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], + libraries=[feature.tcl, feature.tk])) diff --git a/packaging/macosx/ports/python/py25-numpy/Portfile b/packaging/macosx/ports/python/py25-numpy/Portfile new file mode 100644 index 000000000..169c1d2ec --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/Portfile @@ -0,0 +1,206 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4 +# $Id: Portfile 113172 2013-11-11 10:24:44Z jeremyhu@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 +PortGroup github 1.0 + +github.setup numpy numpy 1.7.1 v +name py25-numpy +revision 1 +dist_subdir ${name}/${version}_1 + +categories-append math +license BSD +platforms darwin +maintainers dh michaelld openmaintainer +description The core utilities for the scientific library scipy for Python +long_description ${description} + +checksums rmd160 16df4216f40b22077e1f14cc41b8c8ae486b45af \ + sha256 14964724915e5fa1ed34d2cdb93eed5a86bc16edd4a1203cf521ad8bbbcb5215 + +python.versions 25 + +if {$subport == $name} { + patchfiles patch-f2py_setup.py.diff \ + patch-numpy_distutils_fcompiler___init__.py.diff \ + patch-fcompiler_g95.diff + + depends_lib-append port:fftw-3 \ + port:py${python.version}-nose + + # http://trac.macports.org/ticket/34562 + destroot.env-append \ + CC="${configure.cc}" \ + CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \ + CXX="${configure.cxx}" \ + CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \ + OBJC="${configure.objc}" \ + OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \ + LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" + + build.env-append ARCHFLAGS="[get_canonical_archflags ld]" + destroot.env-append ARCHFLAGS="[get_canonical_archflags ld]" + + variant atlas description {Use the MacPorts' ATLAS libraries \ + instead of Apple's Accelerate framework} { + build.env-append ATLAS=${prefix}/lib \ + LAPACK=${prefix}/lib \ + BLAS=${prefix}/lib + destroot.env-append ATLAS=${prefix}/lib \ + LAPACK=${prefix}/lib \ + BLAS=${prefix}/lib + depends_lib-append port:atlas + + if {[variant_isset universal]} { + python.set_compiler no + } + } + + # when using ATLAS (whether by default or specified by the user via + # the +atlas variant) ... + set gcc_version "" + if {[variant_isset atlas]} { + + # see if the user has set -gcc4X to disable using MacPorts' + # compiler; if not, either use what the user set (as +gcc4X) or + # default to gcc47. + + variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 \ + description {Use the gcc43 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.3 + } + + variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 \ + description {Use the gcc44 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.4 + } + + variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 \ + description {Use the gcc45 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.5 + } + + variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 \ + description {Use the gcc46 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.6 + } + + variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 \ + description {Use the gcc47 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.7 + } + + variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 \ + description {Use the gcc48 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.8 + } + + if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc48]} { + default_variants +gcc47 + } + + if {[variant_isset gcc43]} { + set gcc_version "4.3" + } elseif {[variant_isset gcc44]} { + set gcc_version "4.4" + } elseif {[variant_isset gcc45]} { + set gcc_version "4.5" + } elseif {[variant_isset gcc46]} { + set gcc_version "4.6" + } elseif {[variant_isset gcc47]} { + set gcc_version "4.7" + } elseif {[variant_isset gcc48]} { + set gcc_version "4.8" + } + + # when using non-Apple GCC for universal install, it can + # create binaries only for the native OS architecture, at + # either 32 or 64 bits. Restrict the supported archs + # accordingly. + if {${os.arch} == "i386"} { + supported_archs i386 x86_64 + } elseif {${os.arch} == "powerpc"} { + supported_archs ppc ppc64 + } + + # include all the correct GCC4X port + depends_lib-append port:gcc[join [split ${gcc_version} "."] ""] + + # force LDFLAGS for correct linking of the linalg module + # for non-Apple GCC compilers + patchfiles-append patch-numpy_linalg_setup.py.diff + + if {${gcc_version} == ""} { + # user specified -gcc4X but +atlas (either as default or + # explicitly); do not allow since it might lead to + # undetermined runtime execution. + return -code error \ +"\n\nWhen using the +atlas variant (either as the default or setting +explicitly), one of the +gcc4X variants must be selected.\n" + } + + } else { + variant universal { + patchfiles-append patch-setup.py.diff + } + } + + post-patch { + reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \ + ${worksrcpath}/numpy/f2py/setup.py + + if {[variant_isset universal] && [variant_isset atlas]} { + # Prepare wrappers + file copy -force ${filespath}/wrapper-template \ + ${worksrcpath}/c-wrapper + file copy -force ${filespath}/wrapper-template \ + ${worksrcpath}/f-wrapper + file copy -force ${filespath}/wrapper-template \ + ${worksrcpath}/cxx-wrapper + + reinplace "s|@@@|${configure.cc}|" ${worksrcpath}/c-wrapper + reinplace "s|---|\\\\.c|" ${worksrcpath}/c-wrapper + reinplace "s|&&&|${prefix}|" ${worksrcpath}/c-wrapper + + reinplace "s|@@@|${configure.cxx}|" ${worksrcpath}/cxx-wrapper + reinplace "s#---#(\\\\.C|\\\\.cpp|\\\\.cc)#" \ + ${worksrcpath}/cxx-wrapper + reinplace "s|&&&|${prefix}|" ${worksrcpath}/cxx-wrapper + + reinplace "s|@@@|${configure.f90}|" ${worksrcpath}/f-wrapper + reinplace "s|---|\\\\.f|" ${worksrcpath}/f-wrapper + reinplace "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper + + build.env-append CC="${worksrcpath}/c-wrapper" \ + CXX="${worksrcpath}/cxx-wrapper" \ + F77="${worksrcpath}/f-wrapper" \ + F90="${worksrcpath}/f-wrapper" + + destroot.env-append CC="${worksrcpath}/c-wrapper" \ + CXX="${worksrcpath}/cxx-wrapper" \ + F77="${worksrcpath}/f-wrapper" \ + F90="${worksrcpath}/f-wrapper" + } + + if {[variant_isset atlas]} { + # We must link against libSatlas or libTatlas, not libAtlas + if {[file exists ${prefix}/lib/libtatlas.dylib]} { + reinplace -E \ + "s|_lib_atlas = \\\['atlas'\\\]|_lib_atlas = \\\['tatlas'\\\]|" \ + ${worksrcpath}/numpy/distutils/system_info.py + } elseif {[file exists ${prefix}/lib/libsatlas.dylib]} { + reinplace -E \ + "s|_lib_atlas = \\\['atlas'\\\]|_lib_atlas = \\\['satlas'\\\]|" \ + ${worksrcpath}/numpy/distutils/system_info.py + } else { + return -code error "Unable to find Atlas dylibs. Bailing out." + } + } + } + + livecheck.type none +} else { + livecheck.regex archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}" +} diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff new file mode 100644 index 000000000..5b8f2a28f --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff @@ -0,0 +1,29 @@ +--- numpy/f2py/setup.py.orig 2013-02-10 00:51:36.000000000 +0400 ++++ numpy/f2py/setup.py 2013-03-19 15:27:15.000000000 +0400 +@@ -41,7 +41,7 @@ + config.make_svn_version_py() + + def generate_f2py_py(build_dir): +- f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:] ++ f2py_exe = 'f2py' + if f2py_exe[-4:]=='.exe': + f2py_exe = f2py_exe[:-4] + '.py' + if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py': +@@ -51,7 +51,7 @@ + log.info('Creating %s', target) + f = open(target,'w') + f.write('''\ +-#!/usr/bin/env %s ++#!@@MPORTS_PYTHON@@ + # See http://cens.ioc.ee/projects/f2py2e/ + import os, sys + for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]: +@@ -75,7 +75,7 @@ + sys.stderr.write("Unknown mode: " + repr(mode) + "\\n") + sys.exit(1) + main() +-'''%(os.path.basename(sys.executable))) ++''') + f.close() + return target + diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff new file mode 100644 index 000000000..2640a530b --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff @@ -0,0 +1,11 @@ +--- numpy/distutils/fcompiler/__init__.py.orig 2013-03-19 13:35:03.000000000 +0400 ++++ numpy/distutils/fcompiler/__init__.py 2013-03-19 13:35:27.000000000 +0400 +@@ -708,7 +708,7 @@ + ('cygwin.*', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95')), + ('linux.*', ('gnu95','intel','lahey','pg','absoft','nag','vast','compaq', + 'intele','intelem','gnu','g95','pathf95')), +- ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), ++ ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')), + ('sunos.*', ('sun','gnu','gnu95','g95')), + ('irix.*', ('mips','gnu','gnu95',)), + ('aix.*', ('ibm','gnu','gnu95',)), diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff new file mode 100644 index 000000000..4f73dcfc9 --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff @@ -0,0 +1,30 @@ +--- numpy/distutils/fcompiler/__init__.py.orig 2013-10-31 13:24:12.000000000 +0400 ++++ numpy/distutils/fcompiler/__init__.py 2013-10-31 13:45:03.000000000 +0400 +@@ -815,7 +815,7 @@ + return compiler_type + + # Flag to avoid rechecking for Fortran compiler every time +-failed_fcompiler = False ++failed_fcompilers = [] + + def new_fcompiler(plat=None, + compiler=None, +@@ -828,7 +828,8 @@ + platform/compiler combination. + """ + global failed_fcompiler +- if failed_fcompiler: ++ fcompiler_key = (plat, compiler) ++ if fcompiler_key in failed_fcompilers: + return None + + load_all_fcompiler_classes() +@@ -848,7 +849,7 @@ + msg = msg + " Supported compilers are: %s)" \ + % (','.join(fcompiler_class.keys())) + log.warn(msg) +- failed_fcompiler = True ++ failed_fcompilers.append(fcompiler_key) + return None + + compiler = klass(verbose=verbose, dry_run=dry_run, force=force) diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff new file mode 100644 index 000000000..0b06883a4 --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff @@ -0,0 +1,10 @@ +--- numpy/linalg/setup.py.orig 2010-09-14 11:44:21.000000000 -0400 ++++ numpy/linalg/setup.py 2010-09-14 11:45:01.000000000 -0400 +@@ -27,6 +27,7 @@ + 'zlapack_lite.c', 'dlapack_lite.c', + 'blas_lite.c', 'dlamch.c', + 'f2c_lite.c','f2c.h'], ++ extra_link_args=['-undefined dynamic_lookup -bundle'], + extra_info = lapack_info + ) + diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff new file mode 100644 index 000000000..04e3cdd7a --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff @@ -0,0 +1,34 @@ +--- numpy/core/setup.py.orig 2009-04-05 04:09:20.000000000 -0400 ++++ numpy/core/setup.py 2009-04-08 19:53:45.000000000 -0400 +@@ -309,7 +309,14 @@ + if isinstance(d,str): + target_f.write('#define %s\n' % (d)) + else: +- target_f.write('#define %s %s\n' % (d[0],d[1])) ++ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T': ++ target_f.write('#define %s %s\n' % (d[0],d[1])) ++ else: ++ target_f.write('#ifdef __LP64__\n') ++ target_f.write('#define %s %s\n' % (d[0],8)) ++ target_f.write('#else\n') ++ target_f.write('#define %s %s\n' % (d[0],4)) ++ target_f.write('#endif\n') + + # define inline to our keyword, or nothing + target_f.write('#ifndef __cplusplus\n') +@@ -393,7 +393,14 @@ + if isinstance(d,str): + target_f.write('#define %s\n' % (d)) + else: +- target_f.write('#define %s %s\n' % (d[0],d[1])) ++ if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T': ++ target_f.write('#define %s %s\n' % (d[0],d[1])) ++ else: ++ target_f.write('#ifdef __LP64__\n') ++ target_f.write('#define %s %s\n' % (d[0],8)) ++ target_f.write('#else\n') ++ target_f.write('#define %s %s\n' % (d[0],4)) ++ target_f.write('#endif\n') + + # define NPY_INLINE to recognized keyword + target_f.write('#define NPY_INLINE %s\n' % inline) diff --git a/packaging/macosx/ports/python/py25-numpy/files/wrapper-template b/packaging/macosx/ports/python/py25-numpy/files/wrapper-template new file mode 100755 index 000000000..48936d107 --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/wrapper-template @@ -0,0 +1,143 @@ +#!/bin/sh +COMPILER='@@@' +SUFFIX='---' +PREFIX='&&&' +OUTPUT_O='NO' +OUTPUT='' +NAMED_OUTPUT='' +LASTFILE='' +INTEL='NO' +SIZE32='NO' +SIZE64='NO' +NEWARGS='' + +SKIP='NO' + +for arg in $@ +do + if [ $SKIP = 'ARCH' ]; then + # intercept -arch option and set SIZEXX + SKIP='NO' + if [ $arg = 'x86_64' ] || [ $arg = 'ppc64' ]; then + SIZE64='YES' + else + SIZE32='YES' + fi + + # which architecture are we compiling for? + if [ $arg = 'x86_64' ] || [ $arg = 'i386' ]; then + INTEL='YES' + fi + + elif [ $arg = '-arch' ]; then + SKIP='ARCH' + + elif [ $arg = '--version' ]; then + ${COMPILER} --version + exit 0 + + else + NEWARGS+="$arg " + + # if the -c option is given, the output is .o + if [ $arg = '-c' ]; then + OUTPUT_O='YES' + fi + + # if the output file is given by a -o option, record it + if [ $SKIP = 'O' ]; then + SKIP='NO' + NAMED_OUTPUT=$arg + fi + + if [ $arg = '-o' ]; then + SKIP='O' + fi + + # Note each file ending by ${SUFFIX} and remember the last one + # Transform them in .o + if `echo $arg | grep -q "${SUFFIX}$"`; then + LASTFILE=$arg + OUTPUT+=`echo $arg | sed "s/${SUFFIX}/\.o/"` + OUTPUT+=' ' + fi + fi +done + +# What is the output? + +if [ ${NAMED_OUTPUT}"X" != "X" ]; then + OUTPUT=$NAMED_OUTPUT + +elif [ $OUTPUT_O = 'NO' ]; then + # It is an executable whose is name is the LASTFILE without suffix + OUTPUT=`echo ${LASTFILE} | sed "s/${SUFFIX}//"` +fi + +# Othewise, the output is just the ${OUTPUT} variable as computed before + +# For some reason, -dynamiclib and -lpython2.6 are missing when linking +# .so files. Add them, except if -bundle is set (incompatible switches) +if [ `echo $OUTPUT | sed -E 's|.*\.||'` = "so" ] && \ + ! `echo $NEWARGS | grep -q bundle`; then + NEWARGS="${NEWARGS} ${PREFIX}/lib/libpython2.6.dylib -dynamiclib" +fi + +# Now, compile + +if [ $SIZE32 = 'NO' ] && [ $SIZE64 = 'NO' ]; then + # No size indication given, just proceed with default + if `${COMPILER} $NEWARGS`; then + exit 0 + else + exit 1 + fi + +elif [ $SIZE32 = 'YES' ] && [ $SIZE64 = 'NO' ]; then + # 32-bit + if `${COMPILER} -m32 $NEWARGS`; then + exit 0 + else + exit 1 + fi + +elif [ $SIZE32 = 'NO' ] && [ $SIZE64 = 'YES' ]; then + # 64-bit + if `${COMPILER} -m64 $NEWARGS`; then + exit 0 + else + exit 1 + fi + +else + # Universal case + if `${COMPILER} -m32 $NEWARGS`; then + for filename in ${OUTPUT} + do + mv ${filename} ${filename}.32 + done + + if `${COMPILER} -m64 $NEWARGS`; then + for filename in ${OUTPUT} + do + mv ${filename} ${filename}.64 + if [ $INTEL = 'YES' ]; then + lipo -create -arch x86_64 ${filename}.64 \ + -arch i386 ${filename}.32 \ + -output ${filename} + else + lipo -create -arch ppc64 ${filename}.64 \ + -arch ppc ${filename}.32 \ + -output ${filename} + fi + + rm -f ${filename}.32 ${filename}.64 + done + else + exit 1 + fi + else + exit 1 + fi +fi +exit 0 -- cgit v1.2.3 From 17b5820427aba6feef34f27e1134c9c32f1a54bf Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 2 Sep 2014 04:46:25 +0200 Subject: Fix python module bundling for Python 2.5 and 2.6. Support custom location for python modules (default is from MacPorts) (bzr r13506.1.50) --- packaging/macosx/osx-app.sh | 53 +++++++++++++++++++++++++++++++------------ packaging/macosx/osx-build.sh | 4 ++-- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 87e6391e1..ea9c3a4d2 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -35,7 +35,7 @@ # Defaults strip=false -add_python=true #false +add_python=true python_dir="" # If LIBPREFIX is not already set (by osx-build.sh for example) set it to blank (one should use the command line argument to set it correctly) @@ -136,15 +136,20 @@ if [ ! -f "$plist" ]; then fi if [ ${add_python} = "true" ]; then - if [ "x$python_dir" == "x" ]; then + if [ -z "$python_dir" ]; then echo "Python modules will be copied from MacPorts tree." else if [ ! -e "$python_dir" ]; then echo "Python modules directory \""$python_dir"\" not found." >&2 exit 1 else - # TODO: check directoy structure and reject old one based on ppc/i386 - echo "Python modules will be copied from $python_dir." + if [ -e "$python_dir/i386" -o -e "$python_dir/ppc" ]; then + echo "Outdated structure in custom python modules detected," + echo "not compatible with current packaging." + exit 1 + else + echo "Python modules will be copied from $python_dir." + fi fi fi fi @@ -332,9 +337,16 @@ if [ ${add_python} = "true" ]; then # lxml $cp_cmd -RL "$packages_path/lxml" "$pkgpython" # numpy - $cp_cmd -RL "$packages_path/numpy" "$pkgpython" $cp_cmd -RL "$packages_path/nose" "$pkgpython" + $cp_cmd -RL "$packages_path/numpy" "$pkgpython" # UniConvertor + $cp_cmd -RL "$packages_path/PIL" "$pkgpython" + if [ "$PYTHON_VER" == "2.5" ]; then + $cp_cmd -RL "$packages_path/_imaging.so" "$pkgpython" + $cp_cmd -RL "$packages_path/_imagingcms.so" "$pkgpython" + $cp_cmd -RL "$packages_path/_imagingft.so" "$pkgpython" + $cp_cmd -RL "$packages_path/_imagingmath.so" "$pkgpython" + fi $cp_cmd -RL "$packages_path/sk1libs" "$pkgpython" $cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython" # cleanup python modules @@ -348,19 +360,30 @@ if [ ${add_python} = "true" ]; then } if [ $OSXMINORNO -eq "5" ]; then - PYTHON_VERSIONS=("2.5" "2.6" "2.7") + PYTHON_VERSIONS="2.5 2.6 2.7" elif [ $OSXMINORNO -eq "6" ]; then - PYTHON_VERSIONS=("2.6" "2.7") + PYTHON_VERSIONS="2.6 2.7" else # if [ $OSXMINORNO -ge "7" ]; then - PYTHON_VERSIONS=("2.7") + PYTHON_VERSIONS="2.7" + fi + if [ -z "$python_dir" ]; then + for PYTHON_VER in $PYTHON_VERSIONS; do + python_dir="$(${LIBPREFIX}/bin/python${PYTHON_VER}-config --prefix)" + packages_path="${python_dir}/lib/python${PYTHON_VER}/site-packages" + pkgpython="${pkglib}/python${PYTHON_VER}/site-packages" + mkdir -p $pkgpython + install_py_modules + done + else + # copy custom python site-packages. + # They need to be organized in a hierarchical set of directories by python major+minor version: + # - ${python_dir}/python2.5/site-packages/lxml + # - ${python_dir}/python2.5/site-packages/nose + # - ${python_dir}/python2.5/site-packages/numpy + # - ${python_dir}/python2.6/site-packages/lxml + # - ... + cp -rvf "$python_dir"/* "$pkglib" fi - for PYTHON_VER in $PYTHON_VERSIONS; do - python_dir="$(${LIBPREFIX}/bin/python${PYTHON_VER}-config --prefix)" - packages_path="${python_dir}/lib/python${PYTHON_VER}/site-packages" - pkgpython="${pkglib}/python${PYTHON_VER}/site-packages" - mkdir -p $pkgpython - install_py_modules - done fi sed -e "s,__build_arch__,$ARCH,g" -i "" $pkgbin/inkscape diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 8c759b6e1..961a90d2d 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -70,11 +70,11 @@ Compilation script for Inkscape on Mac OS X. \033[1m$0 conf build install\033[0m configure, build and install a dowloaded version of Inkscape in the default directory, keeping debugging information. - \033[1m$0 u a c b -p ~ i -s -py ~/site-packages/ p d\033[0m + \033[1m$0 u a c b -p ~ i -s -py ~/python_modules/ p d\033[0m update an bzr checkout, prepare configure script, configure, build and install Inkscape in the user home directory (~). Then package Inkscape without debugging information, - with python packages from ~/site-packages/ and prepare + with python packages from ~/python_modules/ and prepare a dmg for distribution." } -- cgit v1.2.3 From 16d97c75951cac9aa577e83c02758815a350444a Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 2 Sep 2014 05:03:03 +0200 Subject: update copyright year, authors; fix whitespace (bzr r13506.1.51) --- packaging/macosx/Resources/bin/inkscape | 1 + packaging/macosx/osx-app.sh | 6 ++++-- packaging/macosx/osx-build.sh | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index d0c55906d..0b7e85ce8 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -4,6 +4,7 @@ # Inkscape Modifications: # Michael Wybrow <mjwybrow@users.sourceforge.net> # Jean-Olivier Irisson <jo.irisson@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> # if test "x$GTK_DEBUG_LAUNCHER" != x; then diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index ea9c3a4d2..6d6d2a87e 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -15,12 +15,14 @@ # Kees Cook <kees@outflux.net> # Michael Wybrow <mjwybrow@users.sourceforge.net> # Jean-Olivier Irisson <jo.irisson@gmail.com> -# Liam P. White <inkscapebrony@gmail.com> +# Liam P. White <inkscapebrony@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> # # Copyright (C) 2005 Kees Cook # Copyright (C) 2005-2009 Michael Wybrow # Copyright (C) 2007-2009 Jean-Olivier Irisson # Copyright (C) 2014 Liam P. White +# Copyright (C) 2014 ~suv # # Released under GNU GPL, read the file 'COPYING' for more information # @@ -495,7 +497,7 @@ while $endl; do $pkglib/ImageMagick-$IMAGEMAGICK_VER/modules-Q16/{filters,coders}/*.so \ $pkglib/*.{dylib,so} \ $pkgbin/*.so \ - $python_libs \ + $python_libs \ $extra_bin \ 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq)" cp -f $libs "$pkglib" diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 961a90d2d..9d9bc07b9 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -8,12 +8,13 @@ # # Authors: # Jean-Olivier Irisson <jo.irisson@gmail.com> -# Liam P. White <inkscapebrony@gmail.com> +# Liam P. White <inkscapebrony@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> # with information from # Kees Cook # Michael Wybrow # -# Copyright (C) 2006-2010 +# Copyright (C) 2006-2014 # Released under GNU GPL, read the file 'COPYING' for more information # -- cgit v1.2.3 From 8e669dd194967a8f59a2ef3a53bf758f1bbb7eba Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 2 Sep 2014 16:24:00 +0200 Subject: add GTK+ backend to DMG filename, info file (bzr r13506.1.53) --- packaging/macosx/osx-build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 9d9bc07b9..db3b30249 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -251,8 +251,10 @@ function getinkscapeinfo () { REVISION="$(bzr revno)" [ $? -ne 0 ] && REVISION="" || REVISION="-r$REVISION" + gtk_target=`pkg-config --variable=target gtk+-2.0 2>/dev/null` + TARGETARCH="$ARCH" - NEWNAME="Inkscape-$INKVERSION$REVISION-$TARGETVERSION-$TARGETARCH" + NEWNAME="Inkscape-$INKVERSION$REVISION-$gtk_target-$TARGETVERSION-$TARGETARCH" DMGFILE="$NEWNAME.dmg" INFOFILE="$NEWNAME-info.txt" @@ -399,7 +401,8 @@ Build system information: OS X Version $OSXVERSION Architecture $ARCH MacPorts Ver `port version | cut -f2 -d \ ` - GCC `$CXX --version | grep GCC` + GCC `$CXX --version | head -1` + GTK+ backend $gtk_target Included dependency versions: GTK `checkversion gtk+-2.0` GTKmm `checkversion gtkmm-2.4` -- cgit v1.2.3 From fb656381e443abac5d33111d38bf95d5fa3c9376 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 3 Sep 2014 00:04:23 +0200 Subject: osx-build.sh: don't attempt to update a bound branch (bzr r13506.1.54) --- packaging/macosx/osx-build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index db3b30249..135c6e2d9 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -267,12 +267,12 @@ then cd $SRCROOT if [ -z "$(bzr info | grep "checkout")" ]; then echo "repo is unbound (branch)" - update_cmd="bzr pull" + bzr pull else echo "repo is bound (checkout)" - update_cmd="bzr update" + echo '... please update bound branch manually.' + false fi - $update_cmd status=$? if [[ $status -ne 0 ]]; then echo -e "\nBZR update failed" -- cgit v1.2.3 From ae2c67ac8b6c0a03457042abb8e4cab728aae8a5 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 3 Sep 2014 00:07:52 +0200 Subject: Simplify nested structure of launcher scripts (needs testing) (bzr r13506.1.55) --- packaging/macosx/Resources/bin/inkscape | 154 ------------------------------ packaging/macosx/Resources/openDoc | 14 +-- packaging/macosx/Resources/script | 161 ++++++++++++++++++++++++++++++-- packaging/macosx/osx-app.sh | 12 +-- 4 files changed, 160 insertions(+), 181 deletions(-) delete mode 100755 packaging/macosx/Resources/bin/inkscape mode change 100755 => 120000 packaging/macosx/Resources/openDoc diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape deleted file mode 100755 index 0b7e85ce8..000000000 --- a/packaging/macosx/Resources/bin/inkscape +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/sh -# -# Author: Aaron Voisine <aaron@voisine.org> -# Inkscape Modifications: -# Michael Wybrow <mjwybrow@users.sourceforge.net> -# Jean-Olivier Irisson <jo.irisson@gmail.com> -# ~suv <suv-sf@users.sourceforge.net> -# - -if test "x$GTK_DEBUG_LAUNCHER" != x; then - set -x -fi - -if test "x$GTK_DEBUG_GDB" != x; then - EXEC="gdb --args" -elif test "x$GTK_DEBUG_LLDB" != x; then - EXEC="lldb -- " -elif test "x$GTK_DEBUG_DTRUSS" != x; then - EXEC="dtruss" -else - EXEC=exec -fi - -CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo \"$PWD\")`" -# e.g. /Applications/Inkscape.app/Contents/Resources/bin -TOP="`dirname \"$CWD\"`" -# e.g. /Applications/Inkscape.app/Contents/Resources - - -# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. -# People should really use ~/.macosx/environment.plist to set environment variables as explained by Apple: -# http://developer.apple.com/qa/qa2001/qa1067.html -# but since no one does, we correct this by making the 'classic' PATH additions here: -# /usr/local/bin which, though standard, doesn't seem to be in the PATH -# newer python as recommended by MacPython http://www.python.org/download/mac/ -# Fink -# MacPorts (former DarwinPorts) -# LaTeX distribution for Mac OS X -export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH" - -# Put /usr/bin at beginning of path so we make sure we use Apple's python -# over one that may be installed be Macports, Fink or some other means. -export PATH="/usr/bin:$PATH" - -# Setup PYTHONPATH to use python modules shipped with Inkscape -OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" -build_arch=__build_arch__ -if [ $OSXMINORNO -gt "5" ]; then - if [ $OSXMINORNO -eq "6" ]; then - export VERSIONER_PYTHON_VERSION=2.6 - else # if [ $OSXMINORNO -ge "7" ]; then - export VERSIONER_PYTHON_VERSION=2.7 - fi - if [ $build_arch = "i386" ]; then - export VERSIONER_PYTHON_PREFER_32_BIT=yes - else # build & runtime arch x86_64 - export VERSIONER_PYTHON_PREFER_32_BIT=no - fi -fi -PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" -export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" - -# fallback for missing $INK_CACHE_DIR -if [ -z "$INK_CACHE_DIR" ]; then - INK_CACHE_DIR="${HOME}/.cache/inkscape" - mkdir -p "$INK_CACHE_DIR" - [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" -fi - -export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" -export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" -export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" -export GTK_DATA_PREFIX="$TOP" -export GTK_EXE_PREFIX="$TOP" -export GTK_PATH="$TOP" -export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" -export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" -export XDG_DATA_DIRS="$TOP/share" -export ASPELL_CONF="prefix $TOP;" -export POPPLER_DATADIR="$TOP/share/poppler" - -# Note: This requires the path with the exact ImageMagic version number. -# Also, that ImageMagick will only work if it does not find a -# version installed into the same PREFIX as it was originally -# installed. Luckily, this is very unlikely given the extra long -# and strangely named install prefix we use. -# The actual version is inserted by the packaging script. -export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" -export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" -export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" - -export INKSCAPE_SHAREDIR="$TOP/share/inkscape" -export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" -export INKSCAPE_LOCALEDIR="$TOP/share/locale" - -# Handle the case where the directory storing Inkscape has special characters -# ('#', '&', '|') in the name. These need to be escaped to work properly for -# various configuration files. -ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'` - -# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) -if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then - export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" -fi - -# If the AppleCollationOrder preference doesn't exist, we fall back to using -# the AppleLocale preference. -LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` -if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] -then - LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ - sed 's/_.*//'` - [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 -else - [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 -fi - -# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape -# to crash on startup in locale_from_utf8(). -if [ "x$LANGSTR" == "x" ] -then - # override broken script - [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 - export LANG="en_US.UTF-8" -else - tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ - tail -n1 | sed 's/\./ /' | awk '{print $2}'`" - if [ "x$tmpLANG" == "x" ] - then - # override broken script - [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 - export LANG="en_US.UTF-8" - else - [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 - export LANG="$tmpLANG.UTF-8" - fi -fi -[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 -export LC_ALL="$LANG" - -sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${INK_CACHE_DIR}/pango.modules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ - > "${INK_CACHE_DIR}/immodules.cache" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ - > "${INK_CACHE_DIR}/loaders.cache" - -if [ "x$GTK_DEBUG_SHELL" != "x" ]; then - exec bash -else - $EXEC "$CWD/inkscape-bin" "$@" -fi diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc deleted file mode 100755 index 63e803540..000000000 --- a/packaging/macosx/Resources/openDoc +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# -# Author: Aaron Voisine <aaron@voisine.org> -# Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> -# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> - -CWD="$(cd "$(dirname "$0")" && pwd)" - -source "${CWD}/xdg_setup.sh" - -BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//')" -cd "$BASE" -exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc new file mode 120000 index 000000000..2b804bee2 --- /dev/null +++ b/packaging/macosx/Resources/openDoc @@ -0,0 +1 @@ +script \ No newline at end of file diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index de839484d..9951922ab 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -4,19 +4,164 @@ # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> # Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> -#export _DEBUG=true +if test "x$GTK_DEBUG_LAUNCHER" != x; then + set -x +fi +if test "x$GTK_DEBUG_GDB" != x; then + EXEC="gdb --args" +elif test "x$GTK_DEBUG_LLDB" != x; then + EXEC="lldb -- " +elif test "x$GTK_DEBUG_DTRUSS" != x; then + EXEC="dtruss" +else + EXEC=exec +fi + +# store absolute path to current script CWD="$(cd "$(dirname "$0")" && pwd)" +# read xdg user configuration source "${CWD}/xdg_setup.sh" -source "${CWD}/alert_fccache.sh" -BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//')" +# if this is the main script, check if this is the first run for current user +if [ $(basename "$0") == "script" ]; then + source "${CWD}/alert_fccache.sh" +fi + +# set prefix for bundled libs and resources +TOP="$CWD" + +# change into path prefix (top-level app dir) for osxapp-enabled binary +BASE="$(echo "$CWD" | sed -e 's/\/Contents\/Resources/\//')" cd "$BASE" -# TODO examine whether it would be wisest to move the code from inkscape shell -# script and getdisplay.sh to here and only keep the real binary in bin. This -# may make things easier on Leopard and may also help using Inkscape on the -# command line. +# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. +# the 'classic' PATH additions: +# /usr/local/bin which, though standard, doesn't seem to be in the PATH +# Fink +# MacPorts (former DarwinPorts) +# LaTeX distribution for Mac OS X +export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin:$PATH" + +# Put /usr/bin at beginning of path so we make sure we use Apple's python +# over one that may be installed be Macports, Fink or some other means. +export PATH="/usr/bin:$PATH" + +# Put $CWD/bin at beginning of path so we make sure that recursive calls +# to inkscape don't pull in other inkscape binaries with different setup +# also allows to override system python with custom wrapper script +export PATH="$CWD/bin:$PATH" + +# Set up PYTHONPATH to use python modules bundled with Inkscape +OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" +build_arch=__build_arch__ +if [ $OSXMINORNO -gt "5" ]; then + if [ $OSXMINORNO -eq "6" ]; then + export VERSIONER_PYTHON_VERSION=2.6 + else # if [ $OSXMINORNO -ge "7" ]; then + export VERSIONER_PYTHON_VERSION=2.7 + fi + if [ $build_arch = "i386" ]; then + export VERSIONER_PYTHON_PREFER_32_BIT=yes + else # build & runtime arch x86_64 + export VERSIONER_PYTHON_PREFER_32_BIT=no + fi +fi +PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" +export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" + +# fallback for missing $INK_CACHE_DIR +if [ -z "$INK_CACHE_DIR" ]; then + INK_CACHE_DIR="${HOME}/.cache/inkscape" + mkdir -p "$INK_CACHE_DIR" + [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" +fi + +export FONTCONFIG_PATH="$TOP/etc/fonts" +export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" +export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" +export GTK_DATA_PREFIX="$TOP" +export GTK_EXE_PREFIX="$TOP" +export GTK_PATH="$TOP" +export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" +export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" +export XDG_DATA_DIRS="$TOP/share" +export ASPELL_CONF="prefix $TOP;" +export POPPLER_DATADIR="$TOP/share/poppler" + +# Note: This requires the path with the exact ImageMagic version number. +# Also, that ImageMagick will only work if it does not find a +# version installed into the same PREFIX as it was originally +# installed. Luckily, this is very unlikely given the extra long +# and strangely named install prefix we use. +# The actual version is inserted by the packaging script. +export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" +export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" +export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" + +export INKSCAPE_SHAREDIR="$TOP/share/inkscape" +export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" +export INKSCAPE_LOCALEDIR="$TOP/share/locale" + +# Handle the case where the directory storing Inkscape has special characters +# ('#', '&', '|') in the name. These need to be escaped to work properly for +# various configuration files. +ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'` + +# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) +if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then + export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" +fi + +# If the AppleCollationOrder preference doesn't exist, we fall back to using +# the AppleLocale preference. +LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` +if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] +then + LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ + sed 's/_.*//'` + [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 +else + [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 +fi + +# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape +# to crash on startup in locale_from_utf8(). +if [ "x$LANGSTR" == "x" ] +then + # override broken script + [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 + export LANG="en_US.UTF-8" +else + tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ + tail -n1 | sed 's/\./ /' | awk '{print $2}'`" + if [ "x$tmpLANG" == "x" ] + then + # override broken script + [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="en_US.UTF-8" + else + [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="$tmpLANG.UTF-8" + fi +fi +[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 +export LC_ALL="$LANG" + +sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ + > "${INK_CACHE_DIR}/pango.modules" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ + > "${INK_CACHE_DIR}/immodules.cache" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ + > "${INK_CACHE_DIR}/loaders.cache" + +if [ "x$GTK_DEBUG_SHELL" != "x" ]; then + exec bash +else + $EXEC "$CWD/bin/inkscape" "$@" +fi -exec "$CWD/bin/inkscape" "$@" +# eof diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 6d6d2a87e..833161a97 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -299,7 +299,7 @@ binary_name=`basename "$binary"` binary_dir=`dirname "$binary"` # Inkscape's binary -binpath="$pkgbin/inkscape-bin" +binpath="$pkgbin/inkscape" cp -v "$binary" "$binpath" # TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not @@ -387,7 +387,7 @@ if [ ${add_python} = "true" ]; then cp -rvf "$python_dir"/* "$pkglib" fi fi -sed -e "s,__build_arch__,$ARCH,g" -i "" $pkgbin/inkscape +sed -e "s,__build_arch__,$ARCH,g" -i "" "$pkgresources/script" # PkgInfo must match bundle type and creator code from Info.plist echo "APPLInks" > $package/Contents/PkgInfo @@ -433,8 +433,8 @@ gdk_pixbuf_version=`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2 mkdir -p $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/ -sed -e "s,__gtk_version__,$gtk_version,g" -i "" $pkgbin/inkscape -sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" $pkgbin/inkscape +sed -e "s,__gtk_version__,$gtk_version,g" -i "" "$pkgresources/script" +sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" "$pkgresources/script" sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkglib/gtk-2.0/$gtk_version/immodules.cache sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache > $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache @@ -461,8 +461,8 @@ done for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters"/*.la; do sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters,,g" -i "" "$la_file" done -sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" $pkgbin/inkscape -sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" $pkgbin/inkscape +sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" "$pkgresources/script" +sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" "$pkgresources/script" # Copy aspell dictionary files: cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" -- cgit v1.2.3 From 74f86569d245a4ee26329f1879e82debe8344231 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 5 Sep 2014 14:20:06 +0200 Subject: revert simplification of launcher scripts (r13561) (bzr r13506.1.57) --- packaging/macosx/Resources/bin/inkscape | 154 ++++++++++++++++++++++++++++++ packaging/macosx/Resources/openDoc | 14 ++- packaging/macosx/Resources/script | 161 ++------------------------------ packaging/macosx/osx-app.sh | 12 +-- 4 files changed, 181 insertions(+), 160 deletions(-) create mode 100755 packaging/macosx/Resources/bin/inkscape mode change 120000 => 100644 packaging/macosx/Resources/openDoc diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape new file mode 100755 index 000000000..0b7e85ce8 --- /dev/null +++ b/packaging/macosx/Resources/bin/inkscape @@ -0,0 +1,154 @@ +#!/bin/sh +# +# Author: Aaron Voisine <aaron@voisine.org> +# Inkscape Modifications: +# Michael Wybrow <mjwybrow@users.sourceforge.net> +# Jean-Olivier Irisson <jo.irisson@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> +# + +if test "x$GTK_DEBUG_LAUNCHER" != x; then + set -x +fi + +if test "x$GTK_DEBUG_GDB" != x; then + EXEC="gdb --args" +elif test "x$GTK_DEBUG_LLDB" != x; then + EXEC="lldb -- " +elif test "x$GTK_DEBUG_DTRUSS" != x; then + EXEC="dtruss" +else + EXEC=exec +fi + +CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo \"$PWD\")`" +# e.g. /Applications/Inkscape.app/Contents/Resources/bin +TOP="`dirname \"$CWD\"`" +# e.g. /Applications/Inkscape.app/Contents/Resources + + +# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. +# People should really use ~/.macosx/environment.plist to set environment variables as explained by Apple: +# http://developer.apple.com/qa/qa2001/qa1067.html +# but since no one does, we correct this by making the 'classic' PATH additions here: +# /usr/local/bin which, though standard, doesn't seem to be in the PATH +# newer python as recommended by MacPython http://www.python.org/download/mac/ +# Fink +# MacPorts (former DarwinPorts) +# LaTeX distribution for Mac OS X +export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH" + +# Put /usr/bin at beginning of path so we make sure we use Apple's python +# over one that may be installed be Macports, Fink or some other means. +export PATH="/usr/bin:$PATH" + +# Setup PYTHONPATH to use python modules shipped with Inkscape +OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" +build_arch=__build_arch__ +if [ $OSXMINORNO -gt "5" ]; then + if [ $OSXMINORNO -eq "6" ]; then + export VERSIONER_PYTHON_VERSION=2.6 + else # if [ $OSXMINORNO -ge "7" ]; then + export VERSIONER_PYTHON_VERSION=2.7 + fi + if [ $build_arch = "i386" ]; then + export VERSIONER_PYTHON_PREFER_32_BIT=yes + else # build & runtime arch x86_64 + export VERSIONER_PYTHON_PREFER_32_BIT=no + fi +fi +PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" +export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" + +# fallback for missing $INK_CACHE_DIR +if [ -z "$INK_CACHE_DIR" ]; then + INK_CACHE_DIR="${HOME}/.cache/inkscape" + mkdir -p "$INK_CACHE_DIR" + [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" +fi + +export FONTCONFIG_PATH="$TOP/etc/fonts" +export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" +export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" +export GTK_DATA_PREFIX="$TOP" +export GTK_EXE_PREFIX="$TOP" +export GTK_PATH="$TOP" +export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" +export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" +export XDG_DATA_DIRS="$TOP/share" +export ASPELL_CONF="prefix $TOP;" +export POPPLER_DATADIR="$TOP/share/poppler" + +# Note: This requires the path with the exact ImageMagic version number. +# Also, that ImageMagick will only work if it does not find a +# version installed into the same PREFIX as it was originally +# installed. Luckily, this is very unlikely given the extra long +# and strangely named install prefix we use. +# The actual version is inserted by the packaging script. +export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" +export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" +export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" + +export INKSCAPE_SHAREDIR="$TOP/share/inkscape" +export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" +export INKSCAPE_LOCALEDIR="$TOP/share/locale" + +# Handle the case where the directory storing Inkscape has special characters +# ('#', '&', '|') in the name. These need to be escaped to work properly for +# various configuration files. +ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'` + +# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) +if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then + export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" +fi + +# If the AppleCollationOrder preference doesn't exist, we fall back to using +# the AppleLocale preference. +LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` +if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] +then + LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ + sed 's/_.*//'` + [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 +else + [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 +fi + +# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape +# to crash on startup in locale_from_utf8(). +if [ "x$LANGSTR" == "x" ] +then + # override broken script + [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 + export LANG="en_US.UTF-8" +else + tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ + tail -n1 | sed 's/\./ /' | awk '{print $2}'`" + if [ "x$tmpLANG" == "x" ] + then + # override broken script + [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="en_US.UTF-8" + else + [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="$tmpLANG.UTF-8" + fi +fi +[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 +export LC_ALL="$LANG" + +sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ + > "${INK_CACHE_DIR}/pango.modules" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ + > "${INK_CACHE_DIR}/immodules.cache" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ + > "${INK_CACHE_DIR}/loaders.cache" + +if [ "x$GTK_DEBUG_SHELL" != "x" ]; then + exec bash +else + $EXEC "$CWD/inkscape-bin" "$@" +fi diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc deleted file mode 120000 index 2b804bee2..000000000 --- a/packaging/macosx/Resources/openDoc +++ /dev/null @@ -1 +0,0 @@ -script \ No newline at end of file diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc new file mode 100644 index 000000000..63e803540 --- /dev/null +++ b/packaging/macosx/Resources/openDoc @@ -0,0 +1,13 @@ +#!/bin/bash +# +# Author: Aaron Voisine <aaron@voisine.org> +# Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> +# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> + +CWD="$(cd "$(dirname "$0")" && pwd)" + +source "${CWD}/xdg_setup.sh" + +BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//')" +cd "$BASE" +exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index 9951922ab..de839484d 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -4,164 +4,19 @@ # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> # Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> -if test "x$GTK_DEBUG_LAUNCHER" != x; then - set -x -fi +#export _DEBUG=true -if test "x$GTK_DEBUG_GDB" != x; then - EXEC="gdb --args" -elif test "x$GTK_DEBUG_LLDB" != x; then - EXEC="lldb -- " -elif test "x$GTK_DEBUG_DTRUSS" != x; then - EXEC="dtruss" -else - EXEC=exec -fi - -# store absolute path to current script CWD="$(cd "$(dirname "$0")" && pwd)" -# read xdg user configuration source "${CWD}/xdg_setup.sh" +source "${CWD}/alert_fccache.sh" -# if this is the main script, check if this is the first run for current user -if [ $(basename "$0") == "script" ]; then - source "${CWD}/alert_fccache.sh" -fi - -# set prefix for bundled libs and resources -TOP="$CWD" - -# change into path prefix (top-level app dir) for osxapp-enabled binary -BASE="$(echo "$CWD" | sed -e 's/\/Contents\/Resources/\//')" +BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//')" cd "$BASE" -# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. -# the 'classic' PATH additions: -# /usr/local/bin which, though standard, doesn't seem to be in the PATH -# Fink -# MacPorts (former DarwinPorts) -# LaTeX distribution for Mac OS X -export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin:$PATH" - -# Put /usr/bin at beginning of path so we make sure we use Apple's python -# over one that may be installed be Macports, Fink or some other means. -export PATH="/usr/bin:$PATH" - -# Put $CWD/bin at beginning of path so we make sure that recursive calls -# to inkscape don't pull in other inkscape binaries with different setup -# also allows to override system python with custom wrapper script -export PATH="$CWD/bin:$PATH" - -# Set up PYTHONPATH to use python modules bundled with Inkscape -OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" -build_arch=__build_arch__ -if [ $OSXMINORNO -gt "5" ]; then - if [ $OSXMINORNO -eq "6" ]; then - export VERSIONER_PYTHON_VERSION=2.6 - else # if [ $OSXMINORNO -ge "7" ]; then - export VERSIONER_PYTHON_VERSION=2.7 - fi - if [ $build_arch = "i386" ]; then - export VERSIONER_PYTHON_PREFER_32_BIT=yes - else # build & runtime arch x86_64 - export VERSIONER_PYTHON_PREFER_32_BIT=no - fi -fi -PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" -export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" - -# fallback for missing $INK_CACHE_DIR -if [ -z "$INK_CACHE_DIR" ]; then - INK_CACHE_DIR="${HOME}/.cache/inkscape" - mkdir -p "$INK_CACHE_DIR" - [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" -fi - -export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" -export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" -export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" -export GTK_DATA_PREFIX="$TOP" -export GTK_EXE_PREFIX="$TOP" -export GTK_PATH="$TOP" -export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" -export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" -export XDG_DATA_DIRS="$TOP/share" -export ASPELL_CONF="prefix $TOP;" -export POPPLER_DATADIR="$TOP/share/poppler" - -# Note: This requires the path with the exact ImageMagic version number. -# Also, that ImageMagick will only work if it does not find a -# version installed into the same PREFIX as it was originally -# installed. Luckily, this is very unlikely given the extra long -# and strangely named install prefix we use. -# The actual version is inserted by the packaging script. -export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" -export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" -export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" - -export INKSCAPE_SHAREDIR="$TOP/share/inkscape" -export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" -export INKSCAPE_LOCALEDIR="$TOP/share/locale" - -# Handle the case where the directory storing Inkscape has special characters -# ('#', '&', '|') in the name. These need to be escaped to work properly for -# various configuration files. -ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'` - -# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) -if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then - export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" -fi - -# If the AppleCollationOrder preference doesn't exist, we fall back to using -# the AppleLocale preference. -LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` -if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] -then - LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ - sed 's/_.*//'` - [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 -else - [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 -fi - -# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape -# to crash on startup in locale_from_utf8(). -if [ "x$LANGSTR" == "x" ] -then - # override broken script - [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 - export LANG="en_US.UTF-8" -else - tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ - tail -n1 | sed 's/\./ /' | awk '{print $2}'`" - if [ "x$tmpLANG" == "x" ] - then - # override broken script - [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 - export LANG="en_US.UTF-8" - else - [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 - export LANG="$tmpLANG.UTF-8" - fi -fi -[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 -export LC_ALL="$LANG" - -sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${INK_CACHE_DIR}/pango.modules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ - > "${INK_CACHE_DIR}/immodules.cache" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ - > "${INK_CACHE_DIR}/loaders.cache" - -if [ "x$GTK_DEBUG_SHELL" != "x" ]; then - exec bash -else - $EXEC "$CWD/bin/inkscape" "$@" -fi +# TODO examine whether it would be wisest to move the code from inkscape shell +# script and getdisplay.sh to here and only keep the real binary in bin. This +# may make things easier on Leopard and may also help using Inkscape on the +# command line. -# eof +exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 833161a97..6d6d2a87e 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -299,7 +299,7 @@ binary_name=`basename "$binary"` binary_dir=`dirname "$binary"` # Inkscape's binary -binpath="$pkgbin/inkscape" +binpath="$pkgbin/inkscape-bin" cp -v "$binary" "$binpath" # TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not @@ -387,7 +387,7 @@ if [ ${add_python} = "true" ]; then cp -rvf "$python_dir"/* "$pkglib" fi fi -sed -e "s,__build_arch__,$ARCH,g" -i "" "$pkgresources/script" +sed -e "s,__build_arch__,$ARCH,g" -i "" $pkgbin/inkscape # PkgInfo must match bundle type and creator code from Info.plist echo "APPLInks" > $package/Contents/PkgInfo @@ -433,8 +433,8 @@ gdk_pixbuf_version=`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2 mkdir -p $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/ -sed -e "s,__gtk_version__,$gtk_version,g" -i "" "$pkgresources/script" -sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" "$pkgresources/script" +sed -e "s,__gtk_version__,$gtk_version,g" -i "" $pkgbin/inkscape +sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" $pkgbin/inkscape sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkglib/gtk-2.0/$gtk_version/immodules.cache sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache > $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache @@ -461,8 +461,8 @@ done for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters"/*.la; do sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters,,g" -i "" "$la_file" done -sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" "$pkgresources/script" -sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" "$pkgresources/script" +sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" $pkgbin/inkscape +sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" $pkgbin/inkscape # Copy aspell dictionary files: cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" -- cgit v1.2.3 From db387835f1414858c3e1fb8be88ffc2c1a0c9ed3 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 5 Sep 2014 14:56:31 +0200 Subject: work around breakages due to current implementation of OS X relocation support (bzr r13506.1.58) --- packaging/macosx/Resources/bin/inkscape | 16 ++++++++++++++-- packaging/macosx/Resources/openDoc | 2 -- packaging/macosx/Resources/script | 5 ++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 0b7e85ce8..511bd6768 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -21,11 +21,23 @@ else EXEC=exec fi -CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo \"$PWD\")`" +CWD="$(cd "$(dirname "$0")" && pwd)" # e.g. /Applications/Inkscape.app/Contents/Resources/bin -TOP="`dirname \"$CWD\"`" +TOP="$(dirname "$CWD")" # e.g. /Applications/Inkscape.app/Contents/Resources +BASE="$(echo "$CWD" | sed -e 's/\/Contents\/Resources.*$//')" +# e.g. /Applications/Inkscape.app +# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative +# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change +# of working directory is required: +# +# Due to changes after 0.48, we have change working directory in the script named 'inkscape': +# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or +# fail (for python-based extensions, inkscape changes the working directory to the +# script's directory, and inkscape launched by python script thus can't find resources +# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory). +cd "$BASE" # Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. # People should really use ~/.macosx/environment.plist to set environment variables as explained by Apple: diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc index 63e803540..c2740c9b5 100644 --- a/packaging/macosx/Resources/openDoc +++ b/packaging/macosx/Resources/openDoc @@ -8,6 +8,4 @@ CWD="$(cd "$(dirname "$0")" && pwd)" source "${CWD}/xdg_setup.sh" -BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//')" -cd "$BASE" exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index de839484d..a97d02486 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -11,12 +11,11 @@ CWD="$(cd "$(dirname "$0")" && pwd)" source "${CWD}/xdg_setup.sh" source "${CWD}/alert_fccache.sh" -BASE="$(echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//')" -cd "$BASE" - # TODO examine whether it would be wisest to move the code from inkscape shell # script and getdisplay.sh to here and only keep the real binary in bin. This # may make things easier on Leopard and may also help using Inkscape on the # command line. +# +# See related FIXME in bin/inkscape for requirements to merge the two scripts. exec "$CWD/bin/inkscape" "$@" -- cgit v1.2.3 From 2a79d36aa16ea15267eebed48c36155495f813c9 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 5 Sep 2014 15:30:42 +0200 Subject: launcher script: add a few checks for recursive calls (bzr r13506.1.59) --- packaging/macosx/Resources/bin/inkscape | 73 ++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 511bd6768..73fb8a924 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -7,19 +7,7 @@ # ~suv <suv-sf@users.sourceforge.net> # -if test "x$GTK_DEBUG_LAUNCHER" != x; then - set -x -fi - -if test "x$GTK_DEBUG_GDB" != x; then - EXEC="gdb --args" -elif test "x$GTK_DEBUG_LLDB" != x; then - EXEC="lldb -- " -elif test "x$GTK_DEBUG_DTRUSS" != x; then - EXEC="dtruss" -else - EXEC=exec -fi +[ -n "$INK_DEBUG_LAUNCHER" ] && set -x CWD="$(cd "$(dirname "$0")" && pwd)" # e.g. /Applications/Inkscape.app/Contents/Resources/bin @@ -39,20 +27,31 @@ BASE="$(echo "$CWD" | sed -e 's/\/Contents\/Resources.*$//')" # like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory). cd "$BASE" -# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. -# People should really use ~/.macosx/environment.plist to set environment variables as explained by Apple: -# http://developer.apple.com/qa/qa2001/qa1067.html -# but since no one does, we correct this by making the 'classic' PATH additions here: -# /usr/local/bin which, though standard, doesn't seem to be in the PATH -# newer python as recommended by MacPython http://www.python.org/download/mac/ -# Fink -# MacPorts (former DarwinPorts) -# LaTeX distribution for Mac OS X -export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH" - -# Put /usr/bin at beginning of path so we make sure we use Apple's python -# over one that may be installed be Macports, Fink or some other means. -export PATH="/usr/bin:$PATH" +# don't prepend to $PATH in recursive calls: +if [ -z "$INK_PATH_ORIG" ]; then + + # Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. + # the 'classic' PATH additions: + # /usr/local/bin which, though standard, doesn't seem to be in the PATH + # Fink + # MacPorts (former DarwinPorts) + # LaTeX distribution for Mac OS X + PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin" + + # Put /usr/bin at beginning of path so we make sure we use Apple's python + # over one that may be installed be Macports, Fink or some other means. + PATH_PYTHON="/usr/bin" + + # Put $TOP/bin at beginning of path so we make sure that recursive calls + # to inkscape don't pull in other inkscape binaries with different setup. + # Also allows to override system python with custom wrapper script, and + # e.g. to support GIMP.app or gimp for external editing and GIMP XCF export. + PATH_pkgbin="$TOP/bin" + + # save orig, new PATH + export INK_PATH_ORIG="$PATH" + export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG" +fi # Setup PYTHONPATH to use python modules shipped with Inkscape OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" @@ -93,11 +92,7 @@ export ASPELL_CONF="prefix $TOP;" export POPPLER_DATADIR="$TOP/share/poppler" # Note: This requires the path with the exact ImageMagic version number. -# Also, that ImageMagick will only work if it does not find a -# version installed into the same PREFIX as it was originally -# installed. Luckily, this is very unlikely given the extra long -# and strangely named install prefix we use. -# The actual version is inserted by the packaging script. +# The actual version is inserted by the packaging script. export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" @@ -159,7 +154,19 @@ sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ > "${INK_CACHE_DIR}/loaders.cache" -if [ "x$GTK_DEBUG_SHELL" != "x" ]; then +case "$INK_DEBUG" in + gdb) + EXEC="gdb --args" ;; + lldb) + EXEC="lldb -- " ;; + dtruss) + EXEC="dtruss" ;; + *) + EXEC="exec" ;; +esac +unset INK_DEBUG # ignore for recursive calls + +if [ "x$INK_DEBUG_SHELL" != "x" ]; then exec bash else $EXEC "$CWD/inkscape-bin" "$@" -- cgit v1.2.3 From 5f24f004b4d7cb638041fa136225d603c807f0f2 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 5 Sep 2014 15:32:34 +0200 Subject: add wrapper script for gimp (supports GIMP.app) and python (not activated) (bzr r13506.1.60) --- packaging/macosx/Resources/bin/gimp-wrapper.sh | 96 ++++++++++++++++++++++++ packaging/macosx/Resources/bin/python-wrapper.sh | 79 +++++++++++++++++++ packaging/macosx/osx-app.sh | 7 ++ 3 files changed, 182 insertions(+) create mode 100644 packaging/macosx/Resources/bin/gimp-wrapper.sh create mode 100644 packaging/macosx/Resources/bin/python-wrapper.sh diff --git a/packaging/macosx/Resources/bin/gimp-wrapper.sh b/packaging/macosx/Resources/bin/gimp-wrapper.sh new file mode 100644 index 000000000..4cddfcc3a --- /dev/null +++ b/packaging/macosx/Resources/bin/gimp-wrapper.sh @@ -0,0 +1,96 @@ +#!/bin/bash +# +# simple gimp wrapper script for Inkscape.app +# + +#_DEBUG=true + +# --- defaults for GIMP.app + +app_id="org.gnome.gimp" +app_exec_default="GIMP" + + +# --- defaults for gimp in $PATH + +# path for local gimp install +PATH_local="/opt/local/bin" +# launch a specific gimp version? (e.g. gimp-2.9) +gimp_name="gimp" + + +# --- unset environment inherited from Inkscape.app + +unset XDG_CONFIG_HOME XDG_DATA_HOME XDG_CACHE_HOME +unset XDG_CONFIG_DIRS XDG_DATA_DIRS +unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE GTK2_RC_FILES +unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR +unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR +unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS +unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH +unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR +unset ASPELL_CONF +unset POPPLER_DATADIR +unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT PYTHONPATH +unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH +unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS + + +# --- detect installed GIMP.app + +unset GIMP_APP + +APPLESCRIPT1="$(cat << EOM +try + tell application "Finder" + set theApp to application file id "$app_id" as string + set theApp_path to POSIX path of theApp as string + return theApp_path + end tell +end try +EOM)" + +GIMP_APP="$(osascript -e "$APPLESCRIPT1")" + + +# --- pass command line arguments to GIMP.app or gimp or exit + +if [ ! -z "$GIMP_APP" ]; then + + app_exec="$(defaults read "${GIMP_APP}/Contents/Info.plist" CFBundleExecutable)" + [[ $? -ne 0 ]] && app_exec="$app_exec_default" + + GIMP_APP_EXEC="${GIMP_APP}/Contents/MacOS/${app_exec}" + + [ $_DEBUG ] && echo "GIMP.app found as: $GIMP_APP" 1>&2 + [ $_DEBUG ] && echo "Command line arguments: $@" 1>&2 + if [ $# -eq 1 ]; then + [ $_DEBUG ] && echo "open -a $GIMP_APP $@" 1>&2 + open -a "$GIMP_APP" "$@" + else + [ $_DEBUG ] && echo "exec $GIMP_APP_EXEC $@" 1>&2 + exec "$GIMP_APP_EXEC" "$@" + fi + +else # --- test for gimp installed in PATH + + # remove CWD from path (we don't want to recursively call this script) + [ $_DEBUG ] && echo "orig PATH: $PATH" 1>&2 + PATH_cleaned="$(echo $PATH | sed 's|'"$(cd "$(dirname "$0")" && pwd)"':||g')" || exit 1 + [ $_DEBUG ] && echo "clean PATH: $PATH_cleaned" 1>&2 + export PATH="$PATH_local:$PATH_cleaned" + [ $_DEBUG ] && echo "final PATH: $PATH" 1>&2 + + type -p "$gimp_name" + + if [ $? -eq 0 ]; then + [ $_DEBUG ] && echo "gimp found in \$PATH: $PATH" 1>&2 + [ $_DEBUG ] && echo "Command line arguments: $@" 1>&2 + exec "$gimp_name" -n "$@" + else + echo "Giving up - couldn't find GIMP.app nor gimp." 1>&2 + fi + +fi + +# eof diff --git a/packaging/macosx/Resources/bin/python-wrapper.sh b/packaging/macosx/Resources/bin/python-wrapper.sh new file mode 100644 index 000000000..35c3739bb --- /dev/null +++ b/packaging/macosx/Resources/bin/python-wrapper.sh @@ -0,0 +1,79 @@ +#!/bin/sh + + +# --------------------------------------------------------------------- +# a) to use py-gtk (for Sozi or inksmoto) from MacPorts +# --------------------------------------------------------------------- + +# # unset env used in Inkscape.app +# unset PYTHONHOME +# unset DYLD_LIBRARY_PATH +# unset XDG_CONFIG_HOME XDG_DATA_HOME XDG_CACHE_HOME +# unset XDG_CONFIG_DIRS XDG_DATA_DIRS +# unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE GTK2_RC_FILES +# unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR +# unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR +# unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS +# unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH +# unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR +# unset ASPELL_CONF +# unset POPPLER_DATADIR +# unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT PYTHONPATH +# unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH +# unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS + +# +# # set locale (language) explicitly +# # (not needed with 0.48.5 package) +# #export LANG="en_US.UTF-8" +# +# # set MacPorts prefix +# LIBPREFIX="/opt/local" +# +# exec "$LIBPREFIX/bin/python" "$@" + + +# --------------------------------------------------------------------- +# b) to test different 32bit or 64bit system-provided Python versions +# (available on Mac OS X 10.6 Snow Leopard and later versions) +# --------------------------------------------------------------------- + +# # Python 2.5 (system) - Lion: 2.5.6 +# #exec /usr/bin/python2.5 "$@" +# export VERSIONER_PYTHON_VERSION=2.5 +# export VERSIONER_PYTHON_PREFER_32_BIT=yes +# exec /usr/bin/python "$@" + +# # Python 2.6 (system) - Lion: 2.6.7 +# #exec arch -i386 /usr/bin/python2.6 "$@" +# export VERSIONER_PYTHON_VERSION=2.6 +# export VERSIONER_PYTHON_PREFER_32_BIT=yes +# #export VERSIONER_PYTHON_PREFER_32_BIT=no +# exec /usr/bin/python "$@" + +# # Python 2.7 (system) - Lion: 2.7.1 +# #exec arch -i386 /usr/bin/python2.7 "$@" +# export VERSIONER_PYTHON_VERSION=2.7 +# export VERSIONER_PYTHON_PREFER_32_BIT=yes +# #export VERSIONER_PYTHON_PREFER_32_BIT=no +# exec /usr/bin/python "$@" + + +# --------------------------------------------------------------------- +# c) to test different 32bit or 64bit MacPorts-provided Python versions +# (define $LIBPREFIX locally) +# --------------------------------------------------------------------- + +# LIBPREFIX="/opt/local-x11" +# exec "$LIBPREFIX/bin/python2.5" "$@" +# #exec "$LIBPREFIX/bin/python2.6" "@" +# #exec "$LIBPREFIX/bin/python2.7" "@" + + +# --------------------------------------------------------------------- +# d) ... otherwise run default python +# --------------------------------------------------------------------- + +exec /usr/bin/python "$@" + +# eof diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 6d6d2a87e..2371bc617 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -37,6 +37,7 @@ # Defaults strip=false +add_wrapper=true add_python=true python_dir="" @@ -332,6 +333,12 @@ done # Icons and the rest of the script framework rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" +# activate wrapper scripts for python and gimp (optional) +if [ $add_wrapper = "true" ]; then + mv "$pkgbin/gimp-wrapper.sh" "$pkgbin/gimp" + #mv "$pkgbin/python-wrapper.sh" "$pkgbin/python" +fi + # Add python modules if requested if [ ${add_python} = "true" ]; then function install_py_modules () -- cgit v1.2.3 From c599ebf36c61ff211d1f1e4d9b119efb563f2335 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 5 Sep 2014 15:43:08 +0200 Subject: Make wrappper scripts executable (bzr r13506.1.61) --- packaging/macosx/Resources/bin/gimp-wrapper.sh | 0 packaging/macosx/Resources/bin/python-wrapper.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 packaging/macosx/Resources/bin/gimp-wrapper.sh mode change 100644 => 100755 packaging/macosx/Resources/bin/python-wrapper.sh diff --git a/packaging/macosx/Resources/bin/gimp-wrapper.sh b/packaging/macosx/Resources/bin/gimp-wrapper.sh old mode 100644 new mode 100755 diff --git a/packaging/macosx/Resources/bin/python-wrapper.sh b/packaging/macosx/Resources/bin/python-wrapper.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From 9c65143b897814ab8b1574a0f07dfda1392d9f7f Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 5 Sep 2014 15:46:15 +0200 Subject: launcher script: exit if change of working directory fails (bzr r13506.1.62) --- packaging/macosx/Resources/bin/inkscape | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 73fb8a924..acc3a5ec7 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -25,7 +25,7 @@ BASE="$(echo "$CWD" | sed -e 's/\/Contents\/Resources.*$//')" # fail (for python-based extensions, inkscape changes the working directory to the # script's directory, and inkscape launched by python script thus can't find resources # like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory). -cd "$BASE" +cd "$BASE" || exit 1 # don't prepend to $PATH in recursive calls: if [ -z "$INK_PATH_ORIG" ]; then -- cgit v1.2.3 From 04c8110454f2f76ecd74c64912edec32bdcd33c8 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sat, 6 Sep 2014 16:36:33 +0200 Subject: remove compiler option '-pipe' (on LiamW's request) (bzr r13506.1.64) --- packaging/macosx/osx-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 135c6e2d9..853ca8f5e 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -171,7 +171,7 @@ export CPATH="$LIBPREFIX/include" export CPPFLAGS="$CPPFLAGS -I$LIBPREFIX/include" export LDFLAGS="$LDFLAGS -L$LIBPREFIX/lib" # compiler arguments -export CFLAGS="$CFLAGS -pipe -Os" +export CFLAGS="$CFLAGS -Os" # Use system compiler and compiler flags which are known to work: if [ "$OSXMINORNO" -le "4" ]; then -- cgit v1.2.3 From 5065f403a1f45e782a37a0b99095c18d01c0127b Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 7 Sep 2014 00:03:32 +0200 Subject: add meta port inkscape-packaging, add README.txt with quick instructions (needs review and testing) (bzr r13506.1.66) --- packaging/macosx/README.txt | 27 ++++++ .../macosx/ports/devel/inkscape-packaging/Portfile | 106 +++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 packaging/macosx/README.txt create mode 100644 packaging/macosx/ports/devel/inkscape-packaging/Portfile diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt new file mode 100644 index 000000000..1d9ed9f53 --- /dev/null +++ b/packaging/macosx/README.txt @@ -0,0 +1,27 @@ +Quick instructions: +=================== + +1) install MacPorts from source into $MP_PREFIX (e.g. "/opt/local-x11") + <https://www.macports.org/install.php> + +2) add MacPorts to your PATH environement variable, for example: + +$ export PATH="$MP_PREFIX/bin:$MP_PREFIX/sbin:$PATH" + +3) add 'ports/' subdirectory as local portfile repository: + +$ echo 'file://'"$(pwd)/ports" >> "$MP_PREFIX/etc/macports/sources.conf" + +4) index the new local portfile repository: + +$ (cd ports && portindex) + +5) install required dependencies: + +$ sudo port install inkscape-packaging + +6) compile inkscape, create app bundle and DMG: + +$ LIBPREFIX="$MP_PREFIX" ./osx-build.sh a c b -j 5 i p -s d + +7) upload the DMG. diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile new file mode 100644 index 000000000..53d6ebae1 --- /dev/null +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -0,0 +1,106 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: $ + +PortSystem 1.0 + +name inkscape-packaging +version 0.91 + +categories devel graphics +platforms darwin +license GPL-2 +supported_archs noarch + +maintainers users.sf.net:suv-sf + +description Dependencies for Inkscape.app +long_description ${description} + +homepage http://inkscape.org + +# this is a metaport - no fetch, configure and build phases +master_sites +distfiles +use_configure no +build {} +destroot { + # Create a dummy file so the port can be successfully activated + xinstall -d ${destroot}${prefix}/share/doc/${name} + set docfile [open ${destroot}${prefix}/share/doc/${name}/README.txt "w"] + puts $docfile "Inkscape packaging ${version} (meta port for all dependencies)\n" + close $docfile +} + +# build dependencies +depends_build port:bzr \ + port:autoconf \ + port:automake \ + port:pkgconfig \ + port:libtool \ + port:intltool \ + port:perl5 + +# core dependencies +depends_build-append port:popt \ + port:boehmgc \ + port:gsl \ + port:lcms2 \ + port:gtkmm \ + port:boost \ + port:libpng \ + port:ImageMagick \ + port:poppler + +# ports for python extensions +depends_build-append port:py27-lxml \ + port:py27-numpy \ + port:py27-Pillow \ + port:py27-uniconvertor + +if {${os.major} <= 10} { + # ports for python extensions on Snow Leopard and Leopard + depends_build-append port:py26-lxml \ + port:py26-numpy \ + port:py26-Pillow \ + port:py26-uniconvertor +} +if {${os.major} == 9} { + # ports for python extensions build deps on Leopard + depends_build-append port:gawk \ + port:py25-lxml \ + port:py25-numpy \ + port:py25-Pillow \ + port:py25-uniconvertor +} +if {${os.major} == 9} { + # we don't support Tiger anymore + return -code error "Mac OS X <= 10.4 not supported."" +} + +# optional features +variant libwpd conflicts librevenge description {use libpwd for WPG, CDR, VSD} { +depends_build-append port:libcdr \ + port:libvisio \ + port:libwpg +} + +variant librevenge conflicts libwpd description {use librevenge for WPG, CDR, VSD} { +depends_build-append port:libcdr-0.1 \ + port:libvisio-0.1 \ + port:libwpg-0.3 +} + +# variants +universal_variant no + +variant x11 conflicts quartz {} + +variant quartz conflicts x11 {} + +default_variants +no_startupitem \ + +no_web -atlas -ffmpeg -video \ + +x11 -quartz -no_x11 \ + +rsvg +Pillow -tkinter + +# livecheck +livecheck.type none -- cgit v1.2.3 From c0b0e10ff12d37c74f5033a8741cf7f73260ec74 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 7 Sep 2014 00:11:42 +0200 Subject: fix mistake in inkscape-packaging portfile (bzr r13506.1.67) --- packaging/macosx/ports/devel/inkscape-packaging/Portfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile index 53d6ebae1..78de97746 100644 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -72,7 +72,7 @@ if {${os.major} == 9} { port:py25-Pillow \ port:py25-uniconvertor } -if {${os.major} == 9} { +if {${os.major} < 9} { # we don't support Tiger anymore return -code error "Mac OS X <= 10.4 not supported."" } -- cgit v1.2.3 From 197ce9952b492756ed49ac6404caef26767a6c8b Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 7 Sep 2014 00:15:20 +0200 Subject: include py-Pillow too (has variant to disable tkinter support) (bzr r13506.1.68) --- packaging/macosx/ports/python/py-Pillow/Portfile | 74 +++++++++++++ .../python/py-Pillow/files/patch-setup.py.diff | 120 +++++++++++++++++++++ 2 files changed, 194 insertions(+) create mode 100644 packaging/macosx/ports/python/py-Pillow/Portfile create mode 100644 packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff diff --git a/packaging/macosx/ports/python/py-Pillow/Portfile b/packaging/macosx/ports/python/py-Pillow/Portfile new file mode 100644 index 000000000..6935fab95 --- /dev/null +++ b/packaging/macosx/ports/python/py-Pillow/Portfile @@ -0,0 +1,74 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 124123 2014-08-19 13:57:18Z stromnov@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 + +name py-Pillow +version 2.5.3 +revision 100 +categories-append devel +platforms darwin +license BSD + +python.versions 26 27 32 33 34 + +maintainers stromnov openmaintainer + +description Python Imaging Library (fork) + +long_description ${description} + +homepage http://github.com/python-imaging/Pillow +master_sites http://pypi.python.org/packages/source/P/Pillow/ + +distname Pillow-${version} + +checksums rmd160 f10cda34a62022edf3bfe626096b6bc009a74dc8 \ + sha256 62ff6c6cb88d4a1d6e856315b1691186b06cb923f18fde86d6abac9eeb9096d1 + +if {${name} ne ${subport}} { + use_zip yes + + conflicts py${python.version}-pil + + depends_build port:py${python.version}-setuptools + depends_lib-append \ + port:zlib \ + port:jpeg \ + port:tiff \ + port:lcms \ + port:webp \ + port:openjpeg \ + port:freetype + + patchfiles patch-setup.py.diff + + post-patch { + reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py + } + + livecheck.type none +} else { + livecheck.type regex + livecheck.url ${master_sites} + livecheck.regex {Pillow-(\d+(?:\.\d+)*)\.[tz]} +} + +variant quartz conflicts x11 tkinter { + # tkinter doesn't build +} + +variant x11 conflicts quartz { + # tkinter does build +} + +variant tkinter description {with tkinter support} { + if {$subport != $name} { + depends_lib-append port:py${python.version}-tkinter + } +} + +if { ![variant_isset quartz] } { + default_variants-append +tkinter +} diff --git a/packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff b/packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff new file mode 100644 index 000000000..fe300cfe5 --- /dev/null +++ b/packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff @@ -0,0 +1,120 @@ +--- setup.py.orig 2014-07-04 17:25:36.000000000 +0200 ++++ setup.py 2014-07-04 17:33:05.000000000 +0200 +@@ -19,7 +19,7 @@ + from setuptools import Extension, setup, find_packages + + # monkey patch import hook. Even though flake8 says it's not used, it is. +-# comment this out to disable multi threaded builds. ++# comment this out to disable multi threaded builds. + import mp_compile + + _IMAGING = ( +@@ -200,44 +200,8 @@ + "/usr/lib", "python%s" % sys.version[:3], "config")) + + elif sys.platform == "darwin": +- # attempt to make sure we pick freetype2 over other versions +- _add_directory(include_dirs, "/sw/include/freetype2") +- _add_directory(include_dirs, "/sw/lib/freetype2/include") +- # fink installation directories +- _add_directory(library_dirs, "/sw/lib") +- _add_directory(include_dirs, "/sw/include") +- # darwin ports installation directories +- _add_directory(library_dirs, "/opt/local/lib") +- _add_directory(include_dirs, "/opt/local/include") +- +- # if Homebrew is installed, use its lib and include directories +- import subprocess +- try: +- prefix = subprocess.check_output( +- ['brew', '--prefix'] +- ).strip().decode('latin1') +- except: +- # Homebrew not installed +- prefix = None +- +- ft_prefix = None +- +- if prefix: +- # add Homebrew's include and lib directories +- _add_directory(library_dirs, os.path.join(prefix, 'lib')) +- _add_directory(include_dirs, os.path.join(prefix, 'include')) +- ft_prefix = os.path.join(prefix, 'opt', 'freetype') +- +- if ft_prefix and os.path.isdir(ft_prefix): +- # freetype might not be linked into Homebrew's prefix +- _add_directory(library_dirs, os.path.join(ft_prefix, 'lib')) +- _add_directory( +- include_dirs, os.path.join(ft_prefix, 'include')) +- else: +- # fall back to freetype from XQuartz if +- # Homebrew's freetype is missing +- _add_directory(library_dirs, "/usr/X11/lib") +- _add_directory(include_dirs, "/usr/X11/include") ++ _add_directory(library_dirs, "@prefix@/lib") ++ _add_directory(include_dirs, "@prefix@/include") + + elif sys.platform.startswith("linux"): + arch_tp = (plat.processor(), plat.architecture()[0]) +@@ -337,21 +301,6 @@ + else: + TCL_ROOT = None + +- # add standard directories +- +- # look for tcl specific subdirectory (e.g debian) +- if _tkinter: +- tcl_dir = "/usr/include/tcl" + TCL_VERSION +- if os.path.isfile(os.path.join(tcl_dir, "tk.h")): +- _add_directory(include_dirs, tcl_dir) +- +- # standard locations +- _add_directory(library_dirs, "/usr/local/lib") +- _add_directory(include_dirs, "/usr/local/include") +- +- _add_directory(library_dirs, "/usr/lib") +- _add_directory(include_dirs, "/usr/include") +- + # on Windows, look for the OpenJPEG libraries in the location that + # the official installer puts them + if sys.platform == "win32": +@@ -410,7 +359,7 @@ + for directory in self.compiler.include_dirs: + try: + listdir = os.listdir(directory) +- except Exception: ++ except Exception: + # WindowsError, FileNotFoundError + continue + for name in listdir: +@@ -570,29 +519,7 @@ + exts.append(Extension( + "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs)) + +- if sys.platform == "darwin": +- # locate Tcl/Tk frameworks +- frameworks = [] +- framework_roots = [ +- "/Library/Frameworks", +- "/System/Library/Frameworks"] +- for root in framework_roots: +- if ( +- os.path.exists(os.path.join(root, "Tcl.framework")) and +- os.path.exists(os.path.join(root, "Tk.framework"))): +- print("--- using frameworks at %s" % root) +- frameworks = ["-framework", "Tcl", "-framework", "Tk"] +- dir = os.path.join(root, "Tcl.framework", "Headers") +- _add_directory(self.compiler.include_dirs, dir, 0) +- dir = os.path.join(root, "Tk.framework", "Headers") +- _add_directory(self.compiler.include_dirs, dir, 1) +- break +- if frameworks: +- exts.append(Extension( +- "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], +- extra_compile_args=frameworks, extra_link_args=frameworks)) +- feature.tcl = feature.tk = 1 # mark as present +- elif feature.tcl and feature.tk: ++ if feature.tcl and feature.tk: + exts.append(Extension( + "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], + libraries=[feature.tcl, feature.tk])) -- cgit v1.2.3 From 29129dc2b1400c7e974302c92da725aa8e3c7c3a Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 7 Sep 2014 01:55:10 +0200 Subject: add missing dependencies to meta port (bzr r13506.1.69) --- .../macosx/ports/devel/inkscape-packaging/Portfile | 31 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile index 78de97746..0fb8ce041 100644 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -47,10 +47,19 @@ depends_build-append port:popt \ port:lcms2 \ port:gtkmm \ port:boost \ - port:libpng \ port:ImageMagick \ + port:gtkspell2 \ + port:aspell-dict-en \ port:poppler +# ports for Inkscape.app +depends_build-append port:gnome-icon-theme \ + port:gnome-icon-theme-symbolic \ + port:icon-naming-utils \ + port:gnome-themes-standard \ + port:gtk-engines2 \ + port:gtk2-murrine + # ports for python extensions depends_build-append port:py27-lxml \ port:py27-numpy \ @@ -90,6 +99,20 @@ depends_build-append port:libcdr-0.1 \ port:libwpg-0.3 } +variant gnome_vfs description {with gnome-vfs (deprecated)} { + depends_build-append port:gnome-vfs +} + +variant gvfs description {with gvfs} { + depends_build-append port:gvfs +} + +variant dbus description {with dbus} { + depends_build-append port:dbus \ + port:dbus-glib \ + port:dbus-python27 +} + # variants universal_variant no @@ -97,10 +120,10 @@ variant x11 conflicts quartz {} variant quartz conflicts x11 {} -default_variants +no_startupitem \ - +no_web -atlas -ffmpeg -video \ +default_variants +no_startupitem +no_web -atlas -ffmpeg -video \ +x11 -quartz -no_x11 \ - +rsvg +Pillow -tkinter + +rsvg +Pillow -tkinter \ + +gnome_vfs # livecheck livecheck.type none -- cgit v1.2.3 From b4dae6b24743aa7fa99c5d8663acb499e42c5efc Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 7 Sep 2014 10:09:36 +0200 Subject: fix instructions: local repository needs to be inserted above rsync URL (bzr r13506.1.70) --- packaging/macosx/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt index 1d9ed9f53..dcad80f6d 100644 --- a/packaging/macosx/README.txt +++ b/packaging/macosx/README.txt @@ -10,7 +10,7 @@ $ export PATH="$MP_PREFIX/bin:$MP_PREFIX/sbin:$PATH" 3) add 'ports/' subdirectory as local portfile repository: -$ echo 'file://'"$(pwd)/ports" >> "$MP_PREFIX/etc/macports/sources.conf" +$ sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" foo.conf 4) index the new local portfile repository: -- cgit v1.2.3 From 2ff45ae6f87f6c1e895ff77943dfc48bd1fc478a Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 7 Sep 2014 10:11:08 +0200 Subject: fix typo (wrong file name in last commit) (bzr r13506.1.71) --- packaging/macosx/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt index dcad80f6d..1e1478f0f 100644 --- a/packaging/macosx/README.txt +++ b/packaging/macosx/README.txt @@ -10,7 +10,7 @@ $ export PATH="$MP_PREFIX/bin:$MP_PREFIX/sbin:$PATH" 3) add 'ports/' subdirectory as local portfile repository: -$ sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" foo.conf +$ sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" "$MP_PREFIX/etc/macports/sources.conf" 4) index the new local portfile repository: -- cgit v1.2.3 From 75b86edcdcbb471ee70013ae1fbe847011804d9f Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 7 Sep 2014 12:46:34 +0200 Subject: meta port: formatting (bzr r13506.1.72) --- packaging/macosx/ports/devel/inkscape-packaging/Portfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile index 0fb8ce041..b7437c3a0 100644 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -21,8 +21,8 @@ homepage http://inkscape.org # this is a metaport - no fetch, configure and build phases master_sites distfiles -use_configure no -build {} +use_configure no +build {} destroot { # Create a dummy file so the port can be successfully activated xinstall -d ${destroot}${prefix}/share/doc/${name} @@ -83,7 +83,7 @@ if {${os.major} == 9} { } if {${os.major} < 9} { # we don't support Tiger anymore - return -code error "Mac OS X <= 10.4 not supported."" + return -code error "Mac OS X <= 10.4 not supported." } # optional features -- cgit v1.2.3 From 99f62f496173d577426f7827a7dce453e89969a7 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 8 Sep 2014 03:32:48 +0200 Subject: add initial support for Quartz backend (no gtk-mac-integration, no native shortcut modifiers) (bzr r13506.1.74) --- Info.plist.in | 8 +- packaging/macosx/Resources/bin/inkscape | 9 +- .../launcher-quartz-no-macintegration.sh | 183 +++++++++++++++++++ packaging/macosx/osx-app.sh | 201 +++++++++++++++++---- 4 files changed, 357 insertions(+), 44 deletions(-) create mode 100755 packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh diff --git a/Info.plist.in b/Info.plist.in index 00fa2666d..6667f6fc2 100644 --- a/Info.plist.in +++ b/Info.plist.in @@ -328,11 +328,13 @@ <string>Inks</string> <key>CFBundleVersion</key> <string>@VERSION@</string> - <key>NSHumanReadableCopyright</key> - <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string> + <key>CGDisableCoalescedUpdates</key> + <false/> <key>LSApplicationCategoryType</key> <string>public.app-category.graphics-design</string> <key>LSMinimumSystemVersion</key> - <string>10.3</string> + <string>10.5</string> + <key>NSHumanReadableCopyright</key> + <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string> </dict> </plist> diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index acc3a5ec7..3ba4672fe 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -13,7 +13,7 @@ CWD="$(cd "$(dirname "$0")" && pwd)" # e.g. /Applications/Inkscape.app/Contents/Resources/bin TOP="$(dirname "$CWD")" # e.g. /Applications/Inkscape.app/Contents/Resources -BASE="$(echo "$CWD" | sed -e 's/\/Contents\/Resources.*$//')" +BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')" # e.g. /Applications/Inkscape.app # FIXME: Inkscape needs better relocation support for OS X (get rid of the relative @@ -87,10 +87,17 @@ export GTK_EXE_PREFIX="$TOP" export GTK_PATH="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" +export GIO_USE_VFS="local" +export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1 +export GVFS_DISABLE_FUSE=1 export XDG_DATA_DIRS="$TOP/share" export ASPELL_CONF="prefix $TOP;" export POPPLER_DATADIR="$TOP/share/poppler" +# no DBUS for now +unset DBUS_LAUNCHD_SESSION_BUS_SOCKET +unset DBUS_SESSION_BUS_ADDRESS + # Note: This requires the path with the exact ImageMagic version number. # The actual version is inserted by the packaging script. export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" diff --git a/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh new file mode 100755 index 000000000..db5861c83 --- /dev/null +++ b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh @@ -0,0 +1,183 @@ +#!/bin/sh +# +# Author: Aaron Voisine <aaron@voisine.org> +# Inkscape Modifications: +# Michael Wybrow <mjwybrow@users.sourceforge.net> +# Jean-Olivier Irisson <jo.irisson@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> +# + +[ -n "$INK_DEBUG_LAUNCHER" ] && set -x + +CWD="$(cd "$(dirname "$0")" && pwd)" +# e.g. /Applications/Inkscape.app/Contents/MacOS +TOP="$(dirname "$CWD")/Resources" +# e.g. /Applications/Inkscape.app/Contents/Resources +BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')" +# e.g. /Applications/Inkscape.app + +source "${TOP}/xdg_setup.sh" +source "${TOP}/alert_fccache.sh" + +# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative +# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change +# of working directory is required: +# +# Due to changes after 0.48, we have change working directory in the script named 'inkscape': +# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or +# fail (for python-based extensions, inkscape changes the working directory to the +# script's directory, and inkscape launched by python script thus can't find resources +# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory). +cd "$BASE" || exit 1 + +# don't prepend to $PATH in recursive calls: +if [ -z "$INK_PATH_ORIG" ]; then + + # Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. + # the 'classic' PATH additions: + # /usr/local/bin which, though standard, doesn't seem to be in the PATH + # Fink + # MacPorts (former DarwinPorts) + # LaTeX distribution for Mac OS X + PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin" + + # Put /usr/bin at beginning of path so we make sure we use Apple's python + # over one that may be installed be Macports, Fink or some other means. + PATH_PYTHON="/usr/bin" + + # Put $TOP/bin at beginning of path so we make sure that recursive calls + # to inkscape don't pull in other inkscape binaries with different setup. + # Also allows to override system python with custom wrapper script, and + # e.g. to support GIMP.app or gimp for external editing and GIMP XCF export. + PATH_pkgbin="$CWD:$TOP/bin" + + # save orig, new PATH + export INK_PATH_ORIG="$PATH" + export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG" +fi + +# Setup PYTHONPATH to use python modules shipped with Inkscape +OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" +build_arch=__build_arch__ +if [ $OSXMINORNO -gt "5" ]; then + if [ $OSXMINORNO -eq "6" ]; then + export VERSIONER_PYTHON_VERSION=2.6 + else # if [ $OSXMINORNO -ge "7" ]; then + export VERSIONER_PYTHON_VERSION=2.7 + fi + if [ $build_arch = "i386" ]; then + export VERSIONER_PYTHON_PREFER_32_BIT=yes + else # build & runtime arch x86_64 + export VERSIONER_PYTHON_PREFER_32_BIT=no + fi +fi +PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" +export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" + +# fallback for missing $INK_CACHE_DIR +if [ -z "$INK_CACHE_DIR" ]; then + INK_CACHE_DIR="${HOME}/.cache/inkscape" + mkdir -p "$INK_CACHE_DIR" + [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" +fi + +export FONTCONFIG_PATH="$TOP/etc/fonts" +export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" +export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" +export GTK_DATA_PREFIX="$TOP" +export GTK_EXE_PREFIX="$TOP" +export GTK_PATH="$TOP" +export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" +export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" +export GIO_USE_VFS="local" +export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1 +export GVFS_DISABLE_FUSE=1 +export XDG_DATA_DIRS="$TOP/share" +export ASPELL_CONF="prefix $TOP;" +export POPPLER_DATADIR="$TOP/share/poppler" + +# no DBUS for now +unset DBUS_LAUNCHD_SESSION_BUS_SOCKET +unset DBUS_SESSION_BUS_ADDRESS + +# Note: This requires the path with the exact ImageMagic version number. +# The actual version is inserted by the packaging script. +export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" +export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" +export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" + +export INKSCAPE_SHAREDIR="$TOP/share/inkscape" +export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" +export INKSCAPE_LOCALEDIR="$TOP/share/locale" + +# Handle the case where the directory storing Inkscape has special characters +# ('#', '&', '|') in the name. These need to be escaped to work properly for +# various configuration files. +ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'` + +# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) +if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then + export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" +fi + +# If the AppleCollationOrder preference doesn't exist, we fall back to using +# the AppleLocale preference. +LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` +if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] +then + LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ + sed 's/_.*//'` + [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 +else + [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 +fi + +# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape +# to crash on startup in locale_from_utf8(). +if [ "x$LANGSTR" == "x" ] +then + # override broken script + [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 + export LANG="en_US.UTF-8" +else + tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ + tail -n1 | sed 's/\./ /' | awk '{print $2}'`" + if [ "x$tmpLANG" == "x" ] + then + # override broken script + [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="en_US.UTF-8" + else + [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="$tmpLANG.UTF-8" + fi +fi +[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 +export LC_ALL="$LANG" + +sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ + > "${INK_CACHE_DIR}/pango.modules" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ + > "${INK_CACHE_DIR}/immodules.cache" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ + > "${INK_CACHE_DIR}/loaders.cache" + +case "$INK_DEBUG" in + gdb) + EXEC="gdb --args" ;; + lldb) + EXEC="lldb -- " ;; + dtruss) + EXEC="dtruss" ;; + *) + EXEC="exec" ;; +esac +unset INK_DEBUG # ignore for recursive calls + +if [ "x$INK_DEBUG_SHELL" != "x" ]; then + exec bash +else + $EXEC "$CWD/inkscape-bin" "$@" +fi diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 2371bc617..d6eaf436d 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -140,18 +140,18 @@ fi if [ ${add_python} = "true" ]; then if [ -z "$python_dir" ]; then - echo "Python modules will be copied from MacPorts tree." + echo "Python modules will be copied from MacPorts tree." >&2 else if [ ! -e "$python_dir" ]; then echo "Python modules directory \""$python_dir"\" not found." >&2 exit 1 else if [ -e "$python_dir/i386" -o -e "$python_dir/ppc" ]; then - echo "Outdated structure in custom python modules detected," - echo "not compatible with current packaging." + echo "Outdated structure in custom python modules detected," >&2 + echo "not compatible with current packaging." >&2 exit 1 else - echo "Python modules will be copied from $python_dir." + echo "Python modules will be copied from $python_dir." >&2 fi fi fi @@ -162,16 +162,80 @@ if [ ! -e "$LIBPREFIX" ]; then exit 1 fi +if [ "x$(otool -L "$binary" | grep "libgtk-quartz")" != "x" ]; then + if ! pkg-config --exists gtk+-quartz-2.0; then + echo "Missing GTK+ backend -- please install gtk2 and its dependencies with variant '+quartz' and try again." >&2 + exit 1 + fi + _backend="quartz" +else + if ! pkg-config --exists gtk+-x11-2.0; then + echo "Missing GTK+ backend -- please install gtk2 and its dependencies with variant '+x11' and try again." >&2 + exit 1 + fi + _backend="x11" +fi + if ! pkg-config --exists gtk-engines-2; then echo "Missing gtk-engines2 -- please install gtk-engines2 and try again." >&2 exit 1 fi -if ! pkg-config --exists gnome-vfs-2.0; then - echo "Missing gnome-vfs2 -- please install gnome-vfs2 and try again." >&2 +if [ ! -e "$LIBPREFIX/lib/gtk-2.0/$(pkg-config --variable=gtk_binary_version gtk+-2.0)/engines/libmurrine.so" ]; then + echo "Missing gtk2-murrine -- please install gtk2-murrine and try again." >&2 + exit 1 +fi + +if [ ! -e "$LIBPREFIX/lib/gtk-2.0/$(pkg-config --variable=gtk_binary_version gtk+-2.0)/engines/libadwaita.so" ]; then + echo "Missing gnome-themes-standard -- please install gnome-themes-standard and try again." >&2 + exit 1 +fi + +if [ ! -e "$LIBPREFIX/share/icons/hicolor/index.theme" ]; then + echo "Missing hicolor-icon-theme -- please install hicolor-icon-theme and try again." >&2 exit 1 fi +if [ "$default_theme" != "default" ] ; then + if ! pkg-config --exists gnome-icon-theme; then + echo "Missing gnome-icon-theme -- please install gnome-icon-theme and try again." >&2 + exit 1 + fi + + if ! pkg-config --exists gnome-icon-theme-symbolic; then + echo "Missing gnome-icon-theme-symbolic -- please install gnome-icon-theme-symbolic and try again." >&2 + exit 1 + fi + + if ! pkg-config --exists icon-naming-utils; then + echo "Missing icon-naming-utils -- please install icon-naming-utils and try again." >&2 + exit 1 + fi +fi + +unset WITH_GNOME_VFS +if ! pkg-config --exists gnome-vfs-2.0; then + echo "Missing gnome-vfs2 -- some features will be disabled" >&2 +else + WITH_GNOME_VFS=true +fi + +# unset WITH_DBUS +# if ! pkg-config --exists dbus-1; then +# echo "Missing dbus -- some features will be disabled" >&2 +# else +# WITH_DBUS=true +# fi +# +# unset WITH_GVFS +# if [ ! -e "$LIBPREFIX/libexec/gvfsd" ]; then +# echo "Missing gvfs -- some features will be disabled" >&2 +# elif [ ! -z "$WITH_DBUS" ]; then +# WITH_GVFS=true +# else +# echo "Missing dbus for gvfs -- some features will be disabled" >&2 +# fi + if ! pkg-config --exists poppler; then echo "Missing poppler -- please install poppler and try again." >&2 exit 1 @@ -214,15 +278,26 @@ ARCH="$(uname -a | awk '{print $NF;}')" # Setup #---------------------------------------------------------- -# Handle some version specific details. -if [ "$OSXMINORNO" -le "4" ]; then - echo "Note: Inkscape packaging requires Mac OS X 10.5 Leopard or later." - exit 1 -else # if [ "$OSXMINORNO" -ge "5" ]; then - XCODEFLAGS="-configuration Deployment" - SCRIPTEXECDIR="ScriptExec/build/Deployment/ScriptExec.app/Contents/MacOS" - EXTRALIBS="" -fi +case $_backend in + x11) + echo "Building package with GTK+/X11." >&2 + # Handle some version specific details. + if [ "$OSXMINORNO" -le "4" ]; then + echo "Note: Inkscape packaging requires Mac OS X 10.5 Leopard or later." + exit 1 + else # if [ "$OSXMINORNO" -ge "5" ]; then + XCODEFLAGS="-configuration Deployment" + SCRIPTEXECDIR="ScriptExec/build/Deployment/ScriptExec.app/Contents/MacOS" + EXTRALIBS="" + fi + ;; + quartz) + # quartz backend + echo "Building package with GTK+/Quartz." >&2 + ;; + *) + exit 1 +esac # Package always has the same name. Version information is stored in @@ -281,15 +356,24 @@ fi # Build and add the launcher #---------------------------------------------------------- -( - # Build fails if CC happens to be set (to anything other than CompileC) - unset CC - - cd "$resdir/ScriptExec" - echo -e "\033[1mBuilding launcher...\033[0m\n" - xcodebuild $XCODEFLAGS clean build -) -cp "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Inkscape" +case $_backend in + x11) + ( + # Build fails if CC happens to be set (to anything other than CompileC) + unset CC + + cd "$resdir/ScriptExec" + echo -e "\033[1mBuilding launcher...\033[0m\n" + xcodebuild $XCODEFLAGS clean build + ) + cp "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Inkscape" + ;; + quartz) + $cp_cmd "$resdir/ScriptExec/launcher-quartz-no-macintegration.sh" "$pkgexec/inkscape" + ;; + *) + exit 1 +esac # Copy all files into the bundle @@ -300,13 +384,26 @@ binary_name=`basename "$binary"` binary_dir=`dirname "$binary"` # Inkscape's binary -binpath="$pkgbin/inkscape-bin" +if [ $_backend = "x11" ]; then + scrpath="$pkgbin/inkscape" + binpath="$pkgbin/inkscape-bin" +else + scrpath="$pkgexec/inkscape" + binpath="$pkgexec/inkscape-bin" +fi cp -v "$binary" "$binpath" # TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not +# Info.plist +cp "$plist" "$package/Contents/Info.plist" +if [ $_backend = "quartz" ]; then + # FIXME: needs OS X version check (see man page) + defaults write "$(cd "$(dirname "$pkgresources")" && pwd)/Info" CGDisableCoalescedUpdates -boolean TRUE + plutil -convert xml1 "${package}/Contents/Info.plist" +fi + # Share files rsync -av "$binary_dir/../share/$binary_name"/* "$pkgshare/$binary_name" -cp "$plist" "$package/Contents/Info.plist" rsync -av "$binary_dir/../share/locale"/* "$pkglocale" # Copy GTK shared mime information @@ -329,10 +426,22 @@ for item in Adwaita Clearlooks HighContrast Industrial Raleigh Redmond ThinIce; mkdir -p "$pkgshare/themes/$item" cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" done +if [ $_backend = "quartz" ]; then + for item in Mac; do + cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0"* "$pkgshare/themes/$item/" + done +fi # Icons and the rest of the script framework rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" +# remove files not needed with GTK+/Quartz +if [ $_backend = "quartz" ]; then + rm "$pkgresources/script" + rm "$pkgresources/openDoc" + rm "$pkgbin/inkscape" +fi + # activate wrapper scripts for python and gimp (optional) if [ $add_wrapper = "true" ]; then mv "$pkgbin/gimp-wrapper.sh" "$pkgbin/gimp" @@ -394,7 +503,7 @@ if [ ${add_python} = "true" ]; then cp -rvf "$python_dir"/* "$pkglib" fi fi -sed -e "s,__build_arch__,$ARCH,g" -i "" $pkgbin/inkscape +sed -e "s,__build_arch__,$ARCH,g" -i "" "$scrpath" # PkgInfo must match bundle type and creator code from Info.plist echo "APPLInks" > $package/Contents/PkgInfo @@ -419,12 +528,6 @@ cp -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ (cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/10-autohint.conf) (cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/70-no-bitmaps.conf) - -for item in gnome-vfs-mime-magic gnome-vfs-2.0 -do - cp -r $LIBPREFIX/etc/$item $pkgetc/ -done - pango_version=`pkg-config --variable=pango_module_version pango` mkdir -p $pkglib/pango/$pango_version/modules cp $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version/modules/ @@ -433,18 +536,26 @@ gtk_version=`pkg-config --variable=gtk_binary_version gtk+-2.0` mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends} cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ -mkdir -p $pkglib/gnome-vfs-2.0/modules -cp $LIBPREFIX/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/ - gdk_pixbuf_version=`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0` mkdir -p $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/ -sed -e "s,__gtk_version__,$gtk_version,g" -i "" $pkgbin/inkscape -sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" $pkgbin/inkscape +sed -e "s,__gtk_version__,$gtk_version,g" -i "" "$scrpath" +sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" "$scrpath" sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkglib/gtk-2.0/$gtk_version/immodules.cache sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache > $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache +# Gnome-vfs modules (deprecated, optional in inkscape) +if [ $WITH_GNOME_VFS ] ; then + for item in gnome-vfs-mime-magic gnome-vfs-2.0; do + $cp_cmd -r "$LIBPREFIX/etc/$item" "$pkgetc/" + done + for item in modules; do + mkdir -p "$pkglib/gnome-vfs-2.0/$item" + $cp_cmd "$LIBPREFIX/lib/gnome-vfs-2.0/$item"/*.so "$pkglib/gnome-vfs-2.0/$item/" + done +fi + # ImageMagick version IMAGEMAGICKVER="$(pkg-config --modversion ImageMagick)" IMAGEMAGICKVER_MAJOR="$(cut -d. -f1 <<< "$IMAGEMAGICKVER")" @@ -468,8 +579,8 @@ done for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters"/*.la; do sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters,,g" -i "" "$la_file" done -sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" $pkgbin/inkscape -sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" $pkgbin/inkscape +sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" "$scrpath" +sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" "$scrpath" # Copy aspell dictionary files: cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" @@ -477,6 +588,10 @@ cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" # Copy Poppler data: cp -r "$LIBPREFIX/share/poppler" "$pkgshare" +# GLib2 schemas +mkdir -p "$pkgshare/glib-2.0" +$cp_cmd -RP "$LIBPREFIX/share/glib-2.0/schemas" "$pkgshare/glib-2.0/" + # Copy all linked libraries into the bundle #---------------------------------------------------------- # get list of *.so modules from python modules @@ -506,6 +621,7 @@ while $endl; do $pkgbin/*.so \ $python_libs \ $extra_bin \ + $binpath \ 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq)" cp -f $libs "$pkglib" let "a+=1" @@ -577,6 +693,11 @@ fixlib () { } rewritelibpaths () { + if [ $_backend = "quartz" ]; then + echo -n "Rewriting dylib paths for executable ... " + (cd "$pkgexec"; fixlib "inkscape-bin" "$package/Contents/Resources/../MacOS" "exec") + echo "done" + fi echo "Rewriting dylib paths for included binaries:" for file in $extra_bin; do echo -n "Rewriting dylib paths for $file ... " -- cgit v1.2.3 From 5df3c5c2d2c3c9e7d9ceeb6d67914f902fda4ffd Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 8 Sep 2014 04:02:53 +0200 Subject: osx-app.sh: whitespace (bzr r13506.1.75) --- packaging/macosx/osx-app.sh | 207 ++++++++++++++++++++++---------------------- 1 file changed, 103 insertions(+), 104 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index d6eaf436d..973f2e109 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -30,7 +30,7 @@ # https://gnunet.org/svn/GNUnet/contrib/OSX/build_app # # NB: -# When packaging Inkscape for OS X, configure should be run with the +# When packaging Inkscape for OS X, configure should be run with the # "--enable-osxapp" option which sets the correct paths for support # files inside the app bundle. # @@ -41,7 +41,8 @@ add_wrapper=true add_python=true python_dir="" -# If LIBPREFIX is not already set (by osx-build.sh for example) set it to blank (one should use the command line argument to set it correctly) +# If LIBPREFIX is not already set (by osx-build.sh for example) set it to blank +# (one should use the command line argument to set it correctly) if [ -z $LIBPREFIX ]; then LIBPREFIX="" fi @@ -106,7 +107,7 @@ do help exit 0 ;; *) - echo "Invalid command line option: $1" + echo "Invalid command line option: $1" exit 2 ;; esac shift 1 @@ -316,7 +317,7 @@ resdir=`pwd` # Custom resources used to generate resources during app bundle creation. if [ -z "$custom_res" ] ; then - custom_res="${resdir}/Resources-extras" + custom_res="${resdir}/Resources-extras" fi @@ -328,7 +329,6 @@ pkgetc="$package/Contents/Resources/etc" pkglib="$package/Contents/Resources/lib" pkgshare="$package/Contents/Resources/share" pkglocale="$package/Contents/Resources/share/locale" -#pkgpython="$package/Contents/Resources/python/site-packages/" pkgresources="$package/Contents/Resources" mkdir -p "$pkgexec" @@ -337,20 +337,19 @@ mkdir -p "$pkgetc" mkdir -p "$pkglib" mkdir -p "$pkgshare" mkdir -p "$pkglocale" -#mkdir -p "$pkgpython" # utility #---------------------------------------------------------- if [ $verbose_mode ] ; then - cp_cmd="/bin/cp -v" - ln_cmd="/bin/ln -sv" - rsync_cmd="/usr/bin/rsync -av" + cp_cmd="/bin/cp -v" + ln_cmd="/bin/ln -sv" + rsync_cmd="/usr/bin/rsync -av" else - cp_cmd="/bin/cp" - ln_cmd="/bin/ln -s" - rsync_cmd="/usr/bin/rsync -a" + cp_cmd="/bin/cp" + ln_cmd="/bin/ln -s" + rsync_cmd="/usr/bin/rsync -a" fi @@ -417,14 +416,14 @@ cp "$LIBPREFIX/share/icons/hicolor/index.theme" "$pkgresources/share/icons/hico # GTK+ stock icons with legacy icon mapping echo "Creating GtkStock icon theme ..." stock_src="${custom_res}/src/icons/stock-icons" \ - ./create-stock-icon-theme.sh "${pkgshare}/icons/GtkStock" + ./create-stock-icon-theme.sh "${pkgshare}/icons/GtkStock" gtk-update-icon-cache --index-only "${pkgshare}/icons/GtkStock" # GTK+ themes cp -RP "$LIBPREFIX/share/gtk-engines" "$pkgshare/" for item in Adwaita Clearlooks HighContrast Industrial Raleigh Redmond ThinIce; do - mkdir -p "$pkgshare/themes/$item" - cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" + mkdir -p "$pkgshare/themes/$item" + cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" done if [ $_backend = "quartz" ]; then for item in Mac; do @@ -563,7 +562,7 @@ IMAGEMAGICKVER_MAJOR="$(cut -d. -f1 <<< "$IMAGEMAGICKVER")" # ImageMagick data # include *.la files for main libs too for item in "$LIBPREFIX/lib/libMagick"*.la; do - cp "$item" "$pkglib/" + cp "$item" "$pkglib/" done # ImageMagick modules cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" @@ -571,13 +570,13 @@ cp -r "$LIBPREFIX/etc/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgetc/" cp -r "$LIBPREFIX/share/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgshare/" # REQUIRED: remove hard-coded paths from *.la files for la_file in "$pkglib/libMagick"*.la; do - sed -e "s,$LIBPREFIX/lib,,g" -i "" "$la_file" + sed -e "s,$LIBPREFIX/lib,,g" -i "" "$la_file" done for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders"/*.la; do - sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders,,g" -i "" "$la_file" + sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders,,g" -i "" "$la_file" done for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters"/*.la; do - sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters,,g" -i "" "$la_file" + sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters,,g" -i "" "$la_file" done sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" "$scrpath" sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" "$scrpath" @@ -609,28 +608,28 @@ a=1 nfiles=0 endl=true while $endl; do - echo -e "\033[1mLooking for dependencies.\033[0m Round" $a - libs="$(otool -L \ - $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends}/*.{dylib,so} \ - $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so \ - $pkglib/pango/$pango_version/modules/*.so \ - $pkglib/gnome-vfs-2.0/modules/*.so \ - $pkglib/gio/modules/*.so \ - $pkglib/ImageMagick-$IMAGEMAGICK_VER/modules-Q16/{filters,coders}/*.so \ - $pkglib/*.{dylib,so} \ - $pkgbin/*.so \ - $python_libs \ - $extra_bin \ - $binpath \ - 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq)" - cp -f $libs "$pkglib" - let "a+=1" - nnfiles="$(ls "$pkglib" | wc -l)" - if [ $nnfiles = $nfiles ]; then - endl=false - else - nfiles=$nnfiles - fi + echo -e "\033[1mLooking for dependencies.\033[0m Round" $a + libs="$(otool -L \ + $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends}/*.{dylib,so} \ + $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so \ + $pkglib/pango/$pango_version/modules/*.so \ + $pkglib/gnome-vfs-2.0/modules/*.so \ + $pkglib/gio/modules/*.so \ + $pkglib/ImageMagick-$IMAGEMAGICK_VER/modules-Q16/{filters,coders}/*.so \ + $pkglib/*.{dylib,so} \ + $pkgbin/*.so \ + $python_libs \ + $extra_bin \ + $binpath \ + 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq)" + cp -f $libs "$pkglib" + let "a+=1" + nnfiles="$(ls "$pkglib" | wc -l)" + if [ $nnfiles = $nfiles ]; then + endl=false + else + nfiles=$nnfiles + fi done # Some libraries don't seem to have write permission, fix this. @@ -644,72 +643,72 @@ echo -e "\n\033[1mRewriting library paths ...\033[0m\n" LIBPREFIX_levels="$(echo "$LIBPREFIX"|awk -F/ '{print NF+1}')" fixlib () { - if [ ! -d "$1" ]; then - fileLibs="$(otool -L $1 | fgrep compatibility | cut -d\( -f1)" - filePath="$(echo "$2" | sed 's/.*Resources//')" - fileType="$3" - unset to_id - case $fileType in - lib) - # TODO: verfiy correct/expected install name for relocated libs - to_id="$package/Contents/Resources$filePath/$1" - loader_to_res="$(echo $filePath | $awk_cmd -F/ '{for (i=1;i<NF;i++) sub($i,".."); sub($NF,"",$0); print $0}')" - ;; - bin) - loader_to_res="../" - ;; - exec) - loader_to_res="../Resources/" - ;; - *) - echo "Skipping loader_to_res for $1" - ;; - esac - [ $to_id ] && install_name_tool -id "$to_id" "$1" - for lib in $fileLibs; do - first="$(echo $lib | cut -d/ -f1-3)" - if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /opt/X11 -a $first != /System/Library ]; then - lib_prefix_levels="$(echo $lib | $awk_cmd -F/ '{for (i=NF;i>0;i--) if($i=="lib") j=i; print j}')" - res_to_lib="$(echo $lib | cut -d/ -f$lib_prefix_levels-)" - unset to_path - case $fileType in - lib) - to_path="@loader_path/$loader_to_res$res_to_lib" - ;; - bin) - to_path="@executable_path/$loader_to_res$res_to_lib" - ;; - exec) - to_path="@executable_path/$loader_to_res$res_to_lib" - ;; - *) - echo "Skipping to_path for $lib in $1" - ;; - esac - [ $to_path ] && install_name_tool -change "$lib" "$to_path" "$1" - fi - done - fi + if [ ! -d "$1" ]; then + fileLibs="$(otool -L $1 | fgrep compatibility | cut -d\( -f1)" + filePath="$(echo "$2" | sed 's/.*Resources//')" + fileType="$3" + unset to_id + case $fileType in + lib) + # TODO: verfiy correct/expected install name for relocated libs + to_id="$package/Contents/Resources$filePath/$1" + loader_to_res="$(echo $filePath | $awk_cmd -F/ '{for (i=1;i<NF;i++) sub($i,".."); sub($NF,"",$0); print $0}')" + ;; + bin) + loader_to_res="../" + ;; + exec) + loader_to_res="../Resources/" + ;; + *) + echo "Skipping loader_to_res for $1" + ;; + esac + [ $to_id ] && install_name_tool -id "$to_id" "$1" + for lib in $fileLibs; do + first="$(echo $lib | cut -d/ -f1-3)" + if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /opt/X11 -a $first != /System/Library ]; then + lib_prefix_levels="$(echo $lib | $awk_cmd -F/ '{for (i=NF;i>0;i--) if($i=="lib") j=i; print j}')" + res_to_lib="$(echo $lib | cut -d/ -f$lib_prefix_levels-)" + unset to_path + case $fileType in + lib) + to_path="@loader_path/$loader_to_res$res_to_lib" + ;; + bin) + to_path="@executable_path/$loader_to_res$res_to_lib" + ;; + exec) + to_path="@executable_path/$loader_to_res$res_to_lib" + ;; + *) + echo "Skipping to_path for $lib in $1" + ;; + esac + [ $to_path ] && install_name_tool -change "$lib" "$to_path" "$1" + fi + done + fi } rewritelibpaths () { - if [ $_backend = "quartz" ]; then - echo -n "Rewriting dylib paths for executable ... " - (cd "$pkgexec"; fixlib "inkscape-bin" "$package/Contents/Resources/../MacOS" "exec") - echo "done" - fi - echo "Rewriting dylib paths for included binaries:" - for file in $extra_bin; do - echo -n "Rewriting dylib paths for $file ... " - (cd "$(dirname $file)" ; fixlib "$(basename $file)" "$(dirname $file)" "bin") - echo "done" - done - echo "Rewriting dylib paths for included libraries:" - for file in $(find $package \( -name '*.so' -or -name '*.dylib' \) -and -not -ipath '*.dSYM*'); do - echo -n "Rewriting dylib paths for $file ... " - (cd "$(dirname $file)" ; fixlib "$(basename $file)" "$(dirname $file)" "lib") - echo "done" - done + if [ $_backend = "quartz" ]; then + echo -n "Rewriting dylib paths for executable ... " + (cd "$pkgexec"; fixlib "inkscape-bin" "$package/Contents/Resources/../MacOS" "exec") + echo "done" + fi + echo "Rewriting dylib paths for included binaries:" + for file in $extra_bin; do + echo -n "Rewriting dylib paths for $file ... " + (cd "$(dirname $file)" ; fixlib "$(basename $file)" "$(dirname $file)" "bin") + echo "done" + done + echo "Rewriting dylib paths for included libraries:" + for file in $(find $package \( -name '*.so' -or -name '*.dylib' \) -and -not -ipath '*.dSYM*'); do + echo -n "Rewriting dylib paths for $file ... " + (cd "$(dirname $file)" ; fixlib "$(basename $file)" "$(dirname $file)" "lib") + echo "done" + done } rewritelibpaths -- cgit v1.2.3 From 35afc81413038d00b76294f2d4907a0329e3ca53 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 8 Sep 2014 04:13:39 +0200 Subject: osx-app.sh: clean up "Safety tests" (bzr r13506.1.76) --- packaging/macosx/osx-app.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 973f2e109..71216e1a8 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -197,23 +197,23 @@ if [ ! -e "$LIBPREFIX/share/icons/hicolor/index.theme" ]; then exit 1 fi -if [ "$default_theme" != "default" ] ; then - if ! pkg-config --exists gnome-icon-theme; then - echo "Missing gnome-icon-theme -- please install gnome-icon-theme and try again." >&2 - exit 1 - fi - - if ! pkg-config --exists gnome-icon-theme-symbolic; then - echo "Missing gnome-icon-theme-symbolic -- please install gnome-icon-theme-symbolic and try again." >&2 - exit 1 - fi - - if ! pkg-config --exists icon-naming-utils; then - echo "Missing icon-naming-utils -- please install icon-naming-utils and try again." >&2 - exit 1 - fi +if ! pkg-config --exists icon-naming-utils; then + echo "Missing icon-naming-utils -- please install icon-naming-utils and try again." >&2 + exit 1 fi +# if [ "$default_theme" != "default" ] ; then +# if ! pkg-config --exists gnome-icon-theme; then +# echo "Missing gnome-icon-theme -- please install gnome-icon-theme and try again." >&2 +# exit 1 +# fi +# +# if ! pkg-config --exists gnome-icon-theme-symbolic; then +# echo "Missing gnome-icon-theme-symbolic -- please install gnome-icon-theme-symbolic and try again." >&2 +# exit 1 +# fi +# fi + unset WITH_GNOME_VFS if ! pkg-config --exists gnome-vfs-2.0; then echo "Missing gnome-vfs2 -- some features will be disabled" >&2 @@ -242,7 +242,7 @@ if ! pkg-config --exists poppler; then exit 1 fi -if ! pkg-config --modversion ImageMagick >/dev/null 2>&1; then +if ! pkg-config --exists ImageMagick; then echo "Missing ImageMagick -- please install ImageMagick and try again." >&2 exit 1 fi -- cgit v1.2.3 From 6b1ea9a7b265592ee78a814a95dd05dc014e0887 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 8 Sep 2014 16:17:19 +0200 Subject: osx-app.sh: use PlistBuddy instead of defaults (bzr r13506.1.77) --- packaging/macosx/osx-app.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 71216e1a8..2a10aa61e 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -396,9 +396,7 @@ cp -v "$binary" "$binpath" # Info.plist cp "$plist" "$package/Contents/Info.plist" if [ $_backend = "quartz" ]; then - # FIXME: needs OS X version check (see man page) - defaults write "$(cd "$(dirname "$pkgresources")" && pwd)/Info" CGDisableCoalescedUpdates -boolean TRUE - plutil -convert xml1 "${package}/Contents/Info.plist" + /usr/libexec/PlistBuddy -x -c "Set :CGDisableCoalescedUpdates 1" "${package}/Contents/Info.plist" fi # Share files -- cgit v1.2.3 From 7a07caefa744f8a0cebb5897485359a656978d8c Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 8 Sep 2014 22:47:04 +0200 Subject: osx-build.sh: update creation of info file (more packages, include license and homepage) (bzr r13506.1.78) --- packaging/macosx/osx-build.sh | 194 +++++++++++++++++++++++++++++++----------- 1 file changed, 145 insertions(+), 49 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 853ca8f5e..7b04681fc 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -66,6 +66,8 @@ Compilation script for Inkscape on Mac OS X. \033[1m-py,--with-python\033[0m specify python modules path for inclusion into the app bundle \033[1md,dist,distrib\033[0m store Inkscape.app in a disk image (dmg) for distribution + \033[1minfo\033[0m + create info file for current build \033[1mEXAMPLES\033[0m \033[1m$0 conf build install\033[0m @@ -100,7 +102,7 @@ NJOBS=1 INSTALL="f" PACKAGE="f" DISTRIB="f" -UNIVERSAL="f" +BUILD_INFO="f" STRIP="" PYTHON_MODULES="" @@ -145,6 +147,8 @@ do -py|--with-python) PYTHON_MODULES="$2" shift 1 ;; + info) + BUILD_INFO="t" ;; *) echo "Invalid command line option: $1" exit 2 ;; @@ -152,14 +156,21 @@ do shift 1 done -# OS X version +# Checks # ---------------------------------------------------------- +# OS X version OSXVERSION="$(/usr/bin/sw_vers | grep ProductVersion | cut -f2)" OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)" OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)" OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)" ARCH="$(uname -a | awk '{print $NF;}')" +# MacPorts for dependencies +[[ -x $LIBPREFIX/bin/port && -d $LIBPREFIX/etc/macports ]] && use_port="t" + +# GTK+ backend +gtk_target="$(pkg-config --variable=target gtk+-2.0 2>/dev/null)" + # Set environment variables # ---------------------------------------------------------- export LIBPREFIX @@ -251,8 +262,6 @@ function getinkscapeinfo () { REVISION="$(bzr revno)" [ $? -ne 0 ] && REVISION="" || REVISION="-r$REVISION" - gtk_target=`pkg-config --variable=target gtk+-2.0 2>/dev/null` - TARGETARCH="$ARCH" NEWNAME="Inkscape-$INKVERSION$REVISION-$gtk_target-$TARGETVERSION-$TARGETARCH" DMGFILE="$NEWNAME.dmg" @@ -260,6 +269,129 @@ function getinkscapeinfo () { } +function checkversion () { + DEPVER="$(pkg-config --modversion $1 2>/dev/null)" + if [[ "$?" == "1" ]]; then + [[ $2 ]] && DEPVER="$(checkversion-port $2)" || unset DEPVER + fi + if [[ ! -z "$DEPVER" ]]; then + [[ $2 ]] && DEPVER="${DEPVER}$(checklicense-port $2)" + else + DEPVER="---" + fi + echo "$DEPVER" +} + +function checkversion-port () { + if [[ "$use_port" == "t" ]]; then + PORTVER="$(port echo $1 and active 2>/dev/null | cut -d@ -f2 | cut -d_ -f1)" + else + PORTVER="" + fi + echo "$PORTVER" +} + +function checklicense-port() { + if [[ "$use_port" == "t" ]]; then + PORTLIC="$(port info --license --line $1 2>/dev/null)" + PORTURL="$(port info --homepage --line $1 2>/dev/null)" + if [[ -z "$PORTLIC" ]]; then + PORTLIC="Unknown" + fi + _spacer="\t\t" + PORTLIC="$(echo -ne "${_spacer}(License: ${PORTLIC}, Homepage: ${PORTURL})")" + else + PORTLIC="Unknown license" + fi + echo "$PORTLIC" +} + +function checkversion-py-module () { + # python -c "import foo; ..." + echo "TODO." +} + +function buildinfofile () { + getinkscapeinfo + # Prepare information file + echo "Build information on $(date) for $(whoami): + For OS X Ver $TARGETNAME ($TARGETVERSION) + Architecture $TARGETARCH +Build system information: + OS X Version $OSXVERSION + Architecture $ARCH + MacPorts Ver $(port version 2>/dev/null | cut -f2 -d \ ) + Compiler $($CXX --version | head -1) + GTK+ backend $gtk_target +Included dependency versions (build or runtime): + Glib $(checkversion glib-2.0 glib2) + Glibmm $(checkversion glibmm-2.4 glibmm) + GTK $(checkversion gtk+-2.0 gtk2) + GTKmm $(checkversion gtkmm-2.4 gtkmm) + GdkPixbuf $(checkversion gdk-pixbuf-2.0 gdk-pixbuf2) + Pixman $(checkversion pixman-1 libpixman) + Cairo $(checkversion cairo cairo) + Cairomm $(checkversion cairomm-1.0 cairomm) + CairoPDF $(checkversion cairo-pdf cairo) + Poppler $(checkversion poppler-cairo poppler) + Fontconfig $(checkversion fontconfig fontconfig) + Freetype $(checkversion freetype2 freetype) + Pango $(checkversion pango pango) + Pangoft2 $(checkversion pangoft2 pango) + Harfbuzz $(checkversion harfbuzz harfbuzz) + LibXML2 $(checkversion libxml-2.0 libxml2) + LibXSLT $(checkversion libxslt libxslt) + LibSigC++ $(checkversion sigc++-2.0 libsigcxx2) + Boost $(checkversion boost boost) + Boehm GC $(checkversion bdw-gc boehmgc) + GSL $(checkversion gsl gsl) + LibPNG $(checkversion libpng libpng) + Librsvg $(checkversion librsvg-2.0 librsvg) + LittleCMS $(checkversion lcms lcms) + LittleCMS2 $(checkversion lcms2 lcms2) + GnomeVFS $(checkversion gnome-vfs-2.0 gnome-vfs) + DBus $(checkversion dbus-1 dbus) + Gvfs $(checkversion gvfs gvfs) + ImageMagick $(checkversion ImageMagick ImageMagick) + Libexif $(checkversion libexif libexif) + JPEG $(checkversion jpeg jpeg) + Icu $(checkversion icu-uc icu) + LibWPD $(checkversion libwpd-0.9 libwpd) + LibWPG $(checkversion libwpg-0.2 libwpg) + Libcdr $(checkversion libcdr-0.0 libcdr) + Libvisio $(checkversion libvisio-0.0 libvisio) +Included python modules: + lxml $(checkversion py27-lxml py27-lxml) + numpy $(checkversion py27-numpy py27-numpy) + sk1libs $(checkversion py27-sk1libs py27-sk1libs) + UniConvertor $(checkversion py27-uniconvertor py27-uniconvertor) + Pillow $(checkversion py27-Pillow py27-Pillow) +" > $INFOFILE + + ## TODO: Pending merge adds support for: + #LibRevenge $(checkversion librevenge-0.0 librevenge-devel) + #LibWPD $(checkversion libwpd-0.10 libwpd-10.0) + #LibWPG $(checkversion libwpg-0.3 libwpg-0.3) + #Libcdr $(checkversion libcdr-0.1 libcdr-0.1) + #Libvisio $(checkversion libvisio-0.1 libvisio-0.1) + + ## TODO: add support for gtk-mac-integration (see osxmenu branch) + #Gtk-mac-integration $(checkversion gtk-mac-integration gtk-osx-application) + + ## TODO: how to realiably add details specific to config and build + #if [[ ! -z "$ALLCONFFLAGS" ]]; then + # echo "Configure options: + # $ALLCONFFLAGS" >> $INFOFILE + #fi + #if [[ "$STRIP" == "-s" ]]; then + # echo "Debug info: + # no" >> $INFOFILE + #else + # echo "Debug info: + # yes" >> $INFOFILE + #fi +} + # Actions # ---------------------------------------------------------- if [[ "$BZRUPDATE" == "t" ]] @@ -369,16 +501,10 @@ then echo -e "\nApplication bundle creation failed" exit $status fi -fi - -function checkversion { - DEPVER=`pkg-config --modversion $1 2>/dev/null` - if [[ "$?" == "1" ]]; then - DEPVER="Not included" - fi - echo "$DEPVER" -} + # Prepare information file + BUILD_INFO="t" +fi if [[ "$DISTRIB" == "t" ]] then @@ -394,42 +520,12 @@ then mv Inkscape.dmg $DMGFILE # Prepare information file - echo "Build information on `date` for `whoami`: - For OS X Ver $TARGETNAME ($TARGETVERSION) - Architecture $TARGETARCH -Build system information: - OS X Version $OSXVERSION - Architecture $ARCH - MacPorts Ver `port version | cut -f2 -d \ ` - GCC `$CXX --version | head -1` - GTK+ backend $gtk_target -Included dependency versions: - GTK `checkversion gtk+-2.0` - GTKmm `checkversion gtkmm-2.4` - Cairo `checkversion cairo` - Cairomm `checkversion cairomm-1.0` - CairoPDF `checkversion cairo-pdf` - Fontconfig `checkversion fontconfig` - Pango `checkversion pango` - LibXML2 `checkversion libxml-2.0` - LibXSLT `checkversion libxslt` - LibSigC++ `checkversion sigc++-2.0` - LibPNG `checkversion libpng` - GSL `checkversion gsl` - ImageMagick `checkversion ImageMagick` - Poppler `checkversion poppler-cairo` - LittleCMS `checkversion lcms` - GnomeVFS `checkversion gnome-vfs-2.0` - LibWPG `checkversion libwpg-0.2` -Configure options: - $CONFFLAGS" > $INFOFILE - if [[ "$STRIP" == "t" ]]; then - echo "Debug info - no" >> $INFOFILE - else - echo "Debug info - yes" >> $INFOFILE - fi + BUILD_INFO="t" +fi + +if [[ "$BUILD_INFO" == "t" ]] +then + buildinfofile fi if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; then -- cgit v1.2.3 From 68fd226973ff1b53c47f674d1ebdeb840fef90ce Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 8 Sep 2014 23:26:18 +0200 Subject: build scripts: implement verbose mode (bzr r13506.1.80) --- packaging/macosx/osx-app.sh | 74 +++++++++++++++++++++++++++---------------- packaging/macosx/osx-build.sh | 6 +++- 2 files changed, 52 insertions(+), 28 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 2a10aa61e..372ea1aea 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -76,6 +76,8 @@ Create an app bundle for OS X specify the path to Info.plist. Info.plist can be found in the base directory of the source code once configure has been run + \033[1m-v,--verbose\033[0m + Verbose mode. \033[1mEXAMPLE\033[0m $0 -s -py ~/python-modules -l /opt/local -b ../../Build/bin/inkscape -p ../../Info.plist @@ -103,6 +105,8 @@ do -p|--plist) plist="$2" shift 1 ;; + -v|--verbose) + verbose_mode=true ;; -h|--help) help exit 0 ;; @@ -365,7 +369,7 @@ case $_backend in echo -e "\033[1mBuilding launcher...\033[0m\n" xcodebuild $XCODEFLAGS clean build ) - cp "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Inkscape" + $cp_cmd "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Inkscape" ;; quartz) $cp_cmd "$resdir/ScriptExec/launcher-quartz-no-macintegration.sh" "$pkgexec/inkscape" @@ -390,26 +394,26 @@ else scrpath="$pkgexec/inkscape" binpath="$pkgexec/inkscape-bin" fi -cp -v "$binary" "$binpath" +$cp_cmd "$binary" "$binpath" # TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not # Info.plist -cp "$plist" "$package/Contents/Info.plist" +$cp_cmd "$plist" "$package/Contents/Info.plist" if [ $_backend = "quartz" ]; then /usr/libexec/PlistBuddy -x -c "Set :CGDisableCoalescedUpdates 1" "${package}/Contents/Info.plist" fi # Share files -rsync -av "$binary_dir/../share/$binary_name"/* "$pkgshare/$binary_name" -rsync -av "$binary_dir/../share/locale"/* "$pkglocale" +$rsync_cmd "$binary_dir/../share/$binary_name"/* "$pkgshare/$binary_name" +$rsync_cmd "$binary_dir/../share/locale"/* "$pkglocale" # Copy GTK shared mime information mkdir -p "$pkgresources/share" -cp -rp "$LIBPREFIX/share/mime" "$pkgshare/" +$cp_cmd -rp "$LIBPREFIX/share/mime" "$pkgshare/" # Copy GTK hicolor icon theme index file mkdir -p "$pkgresources/share/icons/hicolor" -cp "$LIBPREFIX/share/icons/hicolor/index.theme" "$pkgresources/share/icons/hicolor" +$cp_cmd "$LIBPREFIX/share/icons/hicolor/index.theme" "$pkgresources/share/icons/hicolor" # GTK+ stock icons with legacy icon mapping echo "Creating GtkStock icon theme ..." @@ -418,19 +422,19 @@ stock_src="${custom_res}/src/icons/stock-icons" \ gtk-update-icon-cache --index-only "${pkgshare}/icons/GtkStock" # GTK+ themes -cp -RP "$LIBPREFIX/share/gtk-engines" "$pkgshare/" +$cp_cmd -RP "$LIBPREFIX/share/gtk-engines" "$pkgshare/" for item in Adwaita Clearlooks HighContrast Industrial Raleigh Redmond ThinIce; do mkdir -p "$pkgshare/themes/$item" - cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" + $cp_cmd -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" done if [ $_backend = "quartz" ]; then for item in Mac; do - cp -RP "$LIBPREFIX/share/themes/$item/gtk-2.0"* "$pkgshare/themes/$item/" + $cp_cmd -RP "$LIBPREFIX/share/themes/$item/gtk-2.0"* "$pkgshare/themes/$item/" done fi # Icons and the rest of the script framework -rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" +$rsync_cmd --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" # remove files not needed with GTK+/Quartz if [ $_backend = "quartz" ]; then @@ -497,7 +501,7 @@ if [ ${add_python} = "true" ]; then # - ${python_dir}/python2.5/site-packages/numpy # - ${python_dir}/python2.6/site-packages/lxml # - ... - cp -rvf "$python_dir"/* "$pkglib" + $cp_cmd -rf "$python_dir"/* "$pkglib" fi fi sed -e "s,__build_arch__,$ARCH,g" -i "" "$scrpath" @@ -517,25 +521,25 @@ END_PANGO # We use a modified fonts.conf file so only need the dtd mkdir -p $pkgshare/xml/fontconfig -cp $LIBPREFIX/share/xml/fontconfig/fonts.dtd $pkgshare/xml/fontconfig +$cp_cmd $LIBPREFIX/share/xml/fontconfig/fonts.dtd $pkgshare/xml/fontconfig mkdir -p $pkgetc/fonts -cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ +$cp_cmd -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ mkdir -p $pkgshare/fontconfig -cp -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ -(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/10-autohint.conf) -(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/70-no-bitmaps.conf) +$cp_cmd -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ +(cd $pkgetc/fonts/conf.d && $ln_cmd ../../../share/fontconfig/conf.avail/10-autohint.conf) +(cd $pkgetc/fonts/conf.d && $ln_cmd ../../../share/fontconfig/conf.avail/70-no-bitmaps.conf) pango_version=`pkg-config --variable=pango_module_version pango` mkdir -p $pkglib/pango/$pango_version/modules -cp $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version/modules/ +$cp_cmd $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version/modules/ gtk_version=`pkg-config --variable=gtk_binary_version gtk+-2.0` mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends} -cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ +$cp_cmd -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ gdk_pixbuf_version=`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0` mkdir -p $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders -cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/ +$cp_cmd $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/ sed -e "s,__gtk_version__,$gtk_version,g" -i "" "$scrpath" sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" "$scrpath" @@ -560,12 +564,12 @@ IMAGEMAGICKVER_MAJOR="$(cut -d. -f1 <<< "$IMAGEMAGICKVER")" # ImageMagick data # include *.la files for main libs too for item in "$LIBPREFIX/lib/libMagick"*.la; do - cp "$item" "$pkglib/" + $cp_cmd "$item" "$pkglib/" done # ImageMagick modules -cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" -cp -r "$LIBPREFIX/etc/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgetc/" -cp -r "$LIBPREFIX/share/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgshare/" +$cp_cmd -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" +$cp_cmd -r "$LIBPREFIX/etc/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgetc/" +$cp_cmd -r "$LIBPREFIX/share/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgshare/" # REQUIRED: remove hard-coded paths from *.la files for la_file in "$pkglib/libMagick"*.la; do sed -e "s,$LIBPREFIX/lib,,g" -i "" "$la_file" @@ -580,10 +584,10 @@ sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" "$scrpath" sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" "$scrpath" # Copy aspell dictionary files: -cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" +$cp_cmd -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" # Copy Poppler data: -cp -r "$LIBPREFIX/share/poppler" "$pkgshare" +$cp_cmd -r "$LIBPREFIX/share/poppler" "$pkgshare" # GLib2 schemas mkdir -p "$pkgshare/glib-2.0" @@ -596,9 +600,11 @@ python_libs="" for PYTHON_VER in "2.5" "2.6" "2.7"; do python_libs="$python_libs $(find "${pkglib}/python${PYTHON_VER}" -name *.so -or -name *.dylib)" done +[ $verbose_mode ] && echo "Python libs: $python_libs" # get list of included binary executables extra_bin=$(find $pkgbin -exec file {} \; | grep executable | grep -v text | cut -d: -f1) +[ $verbose_mode ] && echo "Extra binaries: $extra_bin" # Find out libs we need from MacPorts, Fink, or from a custom install # (i.e. $LIBPREFIX), then loop until no changes. @@ -620,7 +626,7 @@ while $endl; do $extra_bin \ $binpath \ 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq)" - cp -f $libs "$pkglib" + $cp_cmd -f $libs "$pkglib" let "a+=1" nnfiles="$(ls "$pkglib" | wc -l)" if [ $nnfiles = $nfiles ]; then @@ -662,6 +668,11 @@ fixlib () { echo "Skipping loader_to_res for $1" ;; esac + [ $verbose_mode ] && echo "basename: $1" + [ $verbose_mode ] && echo "dirname: $2" + [ $verbose_mode ] && echo "filePath: $filePath" + [ $verbose_mode ] && echo "to_id: $to_id" + [ $verbose_mode ] && echo "loader_to_res: $loader_to_res" [ $to_id ] && install_name_tool -id "$to_id" "$1" for lib in $fileLibs; do first="$(echo $lib | cut -d/ -f1-3)" @@ -683,6 +694,11 @@ fixlib () { echo "Skipping to_path for $lib in $1" ;; esac + [ $verbose_mode ] && echo "lib: $lib" + [ $verbose_mode ] && echo "lib_prefix_levels: $lib_prefix_levels" + [ $verbose_mode ] && echo "res_to_lib: $res_to_lib" + [ $verbose_mode ] && echo "to_path: $to_path" + [ $verbose_mode ] && echo "install_name_tool arguments: -change $lib $to_path $1" [ $to_path ] && install_name_tool -change "$lib" "$to_path" "$1" fi done @@ -711,4 +727,8 @@ rewritelibpaths () { rewritelibpaths +# All done. +#---------------------------------------------------------- +echo "Inkscape.app created successfully." + exit 0 diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 7b04681fc..02d8cc386 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -63,6 +63,7 @@ Compilation script for Inkscape on Mac OS X. \033[1mp,pack,package\033[0m package Inkscape in a double clickable .app bundle \033[1m-s,--strip\033[0m remove debugging information in Inkscape package + \033[1m-v,--verbose\033[0m verbose mode \033[1m-py,--with-python\033[0m specify python modules path for inclusion into the app bundle \033[1md,dist,distrib\033[0m store Inkscape.app in a disk image (dmg) for distribution @@ -105,6 +106,7 @@ DISTRIB="f" BUILD_INFO="f" STRIP="" +VERBOSE="" PYTHON_MODULES="" # Parse command line options @@ -147,6 +149,8 @@ do -py|--with-python) PYTHON_MODULES="$2" shift 1 ;; + -v|--verbose) + VERBOSE="-v" ;; info) BUILD_INFO="t" ;; *) @@ -495,7 +499,7 @@ then fi # Create app bundle - ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $BUILDPREFIX/Info.plist $PYTHON_MODULES + ./osx-app.sh $STRIP $VERBOSE -b $INSTALLPREFIX/bin/inkscape -p $BUILDPREFIX/Info.plist $PYTHON_MODULES status=$? if [[ $status -ne 0 ]]; then echo -e "\nApplication bundle creation failed" -- cgit v1.2.3 From 94c2ed0ec290b8d097415af3dc347c6b55cbdbf0 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Mon, 8 Sep 2014 23:39:54 +0200 Subject: osx-app.sh: restore strip option (bzr r13506.1.81) --- packaging/macosx/osx-app.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 372ea1aea..e35448f19 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -36,7 +36,7 @@ # # Defaults -strip=false +strip_build=false add_wrapper=true add_python=true python_dir="" @@ -95,7 +95,7 @@ do python_dir="$2" shift 1 ;; -s) - strip=true ;; + strip_build=true ;; -l|--libraries) LIBPREFIX="$2" shift 1 ;; @@ -639,6 +639,15 @@ done # Some libraries don't seem to have write permission, fix this. chmod -R u+w "$package/Contents/Resources/lib" +# Strip libraries and executables if requested +#---------------------------------------------------------- +if [ "$strip_build" = "true" ]; then + echo -e "\n\033[1mStripping debugging symbols...\033[0m\n" + chmod +w "$pkglib"/*.dylib + strip -x "$pkglib"/*.dylib + strip -ur "$binpath" +fi + # Rewrite id and paths of linked libraries #---------------------------------------------------------- # extract level for relative path to libs -- cgit v1.2.3 From c5e7da631db79ad12aa90667e2d318334f405600 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 9 Sep 2014 02:18:29 +0200 Subject: silence warning when building from release tarball (no bzr) (bzr r13506.1.82) --- packaging/macosx/osx-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 02d8cc386..802d96017 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -263,7 +263,7 @@ function getinkscapeinfo () { osxapp_domain="$BUILDPREFIX/Info" INKVERSION="$(defaults read $osxapp_domain CFBundleVersion)" [ $? -ne 0 ] && INKVERSION="devel" - REVISION="$(bzr revno)" + REVISION="$(bzr revno 2>/dev/null)" [ $? -ne 0 ] && REVISION="" || REVISION="-r$REVISION" TARGETARCH="$ARCH" -- cgit v1.2.3 From 1a1529e193960678f2b5e72db4f2a268d0cffbc9 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 9 Sep 2014 04:02:04 +0200 Subject: default MacPorts install requires sudo to edit config file (bzr r13506.1.83) --- packaging/macosx/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt index 1e1478f0f..45ed39799 100644 --- a/packaging/macosx/README.txt +++ b/packaging/macosx/README.txt @@ -10,7 +10,7 @@ $ export PATH="$MP_PREFIX/bin:$MP_PREFIX/sbin:$PATH" 3) add 'ports/' subdirectory as local portfile repository: -$ sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" "$MP_PREFIX/etc/macports/sources.conf" +$ sudo sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" "$MP_PREFIX/etc/macports/sources.conf" 4) index the new local portfile repository: -- cgit v1.2.3 From 8ca3926ea93d32f106d3c37457020bef8d273071 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 9 Sep 2014 22:27:01 +0200 Subject: don't store temp loader and module cache files outside the app bundle (bzr r13506.1.84) --- packaging/macosx/Resources/bin/inkscape | 22 ++++------------------ packaging/macosx/osx-app.sh | 32 +++++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 3ba4672fe..775f94e5c 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -71,17 +71,11 @@ fi PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" -# fallback for missing $INK_CACHE_DIR -if [ -z "$INK_CACHE_DIR" ]; then - INK_CACHE_DIR="${HOME}/.cache/inkscape" - mkdir -p "$INK_CACHE_DIR" - [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" -fi - export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" -export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" -export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" +export PANGO_RC_FILE="$TOP/etc/pango/pangorc" +export PANGO_SYSCONFDIR="$TOP/etc" +export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GTK_PATH="$TOP" @@ -153,14 +147,6 @@ fi [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" -sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${INK_CACHE_DIR}/pango.modules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ - > "${INK_CACHE_DIR}/immodules.cache" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ - > "${INK_CACHE_DIR}/loaders.cache" - case "$INK_DEBUG" in gdb) EXEC="gdb --args" ;; diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index e35448f19..753ae64bc 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -511,13 +511,7 @@ echo "APPLInks" > $package/Contents/PkgInfo # Pull in extra requirements for Pango and GTK mkdir -p $pkgetc/pango - -# Need to adjust path and quote in case of spaces in path. -sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $LIBPREFIX/etc/pango/pango.modules > $pkgetc/pango/pango.modules -cat > $pkgetc/pango/pangorc <<END_PANGO -[Pango] -ModuleFiles=\${INK_CACHE_DIR}/pango.modules -END_PANGO +touch "$pkgetc/pango/pangorc" # We use a modified fonts.conf file so only need the dtd mkdir -p $pkgshare/xml/fontconfig @@ -543,8 +537,28 @@ $cp_cmd $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/g sed -e "s,__gtk_version__,$gtk_version,g" -i "" "$scrpath" sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" "$scrpath" -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkglib/gtk-2.0/$gtk_version/immodules.cache -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache > $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/etc/pango/pango.modules" > "$pkgetc/pango/pango.modules" +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache" > "$pkglib/gtk-2.0/$gtk_version/immodules.cache" +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders.cache" > "$pkglib/gdk-pixbuf-2.0/$gtk_version/loaders.cache" + +# recreate loaders and modules caches based on actually included modules + +# Pango modules +pango-querymodules "$pkglib/pango/$pango_version"/modules/*.so \ + | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ + > "$pkgetc"/pango/pango.modules + +# Gtk immodules +gtk-query-immodules-2.0 "$pkglib/gtk-2.0/$gtk_version"/immodules/*.so \ + | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ + > "$pkglib/gtk-2.0/$gtk_version/"immodules.cache + +# Gdk pixbuf loaders +GDK_PIXBUF_MODULEDIR="$pkglib/gdk-pixbuf-2.0/$gtk_version/"loaders gdk-pixbuf-query-loaders \ + | sed -e "s,$pkgresources,@loader_path/..,g" > "$pkglib/gdk-pixbuf-2.0/$gtk_version/"loaders.cache + +# GIO modules +#gio-querymodules "$pkglib/gio/modules" # Gnome-vfs modules (deprecated, optional in inkscape) if [ $WITH_GNOME_VFS ] ; then -- cgit v1.2.3 From 37f02b55e82937270b8b7a7225f90fcc19c81d55 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 10 Sep 2014 01:24:58 +0200 Subject: Use global variants instead attempting to propagate default variants via meta port (bzr r13506.1.86) --- packaging/macosx/README.txt | 10 +++++++--- packaging/macosx/ports/devel/inkscape-packaging/Portfile | 9 +-------- packaging/macosx/ports/python/py-sk1libs/Portfile | 2 ++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt index 45ed39799..d6aa0b9f4 100644 --- a/packaging/macosx/README.txt +++ b/packaging/macosx/README.txt @@ -16,12 +16,16 @@ $ sudo sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" "$MP_PREFIX/etc/macp $ (cd ports && portindex) -5) install required dependencies: +5) add default variants for x11-based package to MacPorts' global variants: + +$ sudo echo '+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' >> "$MP_PREFIX/etc/macports/variants.conf" + +6) install required dependencies: $ sudo port install inkscape-packaging -6) compile inkscape, create app bundle and DMG: +7) compile inkscape, create app bundle and DMG: $ LIBPREFIX="$MP_PREFIX" ./osx-build.sh a c b -j 5 i p -s d -7) upload the DMG. +8) upload the DMG. diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile index b7437c3a0..67a46781b 100644 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -116,14 +116,7 @@ variant dbus description {with dbus} { # variants universal_variant no -variant x11 conflicts quartz {} - -variant quartz conflicts x11 {} - -default_variants +no_startupitem +no_web -atlas -ffmpeg -video \ - +x11 -quartz -no_x11 \ - +rsvg +Pillow -tkinter \ - +gnome_vfs +default_variants-append +gnome_vfs # livecheck livecheck.type none diff --git a/packaging/macosx/ports/python/py-sk1libs/Portfile b/packaging/macosx/ports/python/py-sk1libs/Portfile index 1e9c01d63..0c152ce8c 100644 --- a/packaging/macosx/ports/python/py-sk1libs/Portfile +++ b/packaging/macosx/ports/python/py-sk1libs/Portfile @@ -57,6 +57,8 @@ if {$subport != $name} { } } +default_variants +Pillow + livecheck.type regex livecheck.url http://sk1project.org/modules.php?name=Products&product=uniconvertor&op=download livecheck.regex "sk1libs-(\\d+(?:\\.\\d+)*)${extract.suffix}" -- cgit v1.2.3 From b8f04680d3b169543839b4aad65d79ef599577f7 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Wed, 10 Sep 2014 15:05:08 +0200 Subject: update launcher for quartz backend too (no external loader cache files) (bzr r13506.1.87) --- .../launcher-quartz-no-macintegration.sh | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh index db5861c83..d449b5121 100755 --- a/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh +++ b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh @@ -74,17 +74,11 @@ fi PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" -# fallback for missing $INK_CACHE_DIR -if [ -z "$INK_CACHE_DIR" ]; then - INK_CACHE_DIR="${HOME}/.cache/inkscape" - mkdir -p "$INK_CACHE_DIR" - [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" -fi - export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" -export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" -export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" +export PANGO_RC_FILE="$TOP/etc/pango/pangorc" +export PANGO_SYSCONFDIR="$TOP/etc" +export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GTK_PATH="$TOP" @@ -156,14 +150,6 @@ fi [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" -sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${INK_CACHE_DIR}/pango.modules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ - > "${INK_CACHE_DIR}/immodules.cache" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ - > "${INK_CACHE_DIR}/loaders.cache" - case "$INK_DEBUG" in gdb) EXEC="gdb --args" ;; -- cgit v1.2.3 From c6b67564fe748e3f211075d3c4690359a5dd36ef Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Thu, 11 Sep 2014 10:08:34 +0200 Subject: update EXTRA_DIST for files in packaging/macosx (bzr r13506.1.88) --- Makefile.am | 377 +++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 320 insertions(+), 57 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1ed5e4d0f..d9c756b94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,71 +102,334 @@ EXTRA_DIST = \ cxxtest/cxxtest/X11Gui.h \ cxxtest/cxxtest/YesNoRunner.h \ packaging/autopackage/default.apspec.in \ - packaging/macosx/dmg_background.png \ - packaging/macosx/inkscape.ds_store \ - packaging/macosx/osx-app.sh \ - packaging/macosx/osx-dmg.sh \ - packaging/macosx/osx-build.sh \ - packaging/macosx/Resources/MenuBar.nib/classes.nib \ - packaging/macosx/Resources/MenuBar.nib/info.nib \ - packaging/macosx/Resources/MenuBar.nib/objects.xib \ + packaging/macosx/README.txt \ + packaging/macosx/Resources/Inkscape.icns \ + packaging/macosx/Resources/MenuBar.nib/classes.nib \ + packaging/macosx/Resources/MenuBar.nib/info.nib \ + packaging/macosx/Resources/MenuBar.nib/objects.xib \ + packaging/macosx/Resources/ProgressWindow.nib/classes.nib \ + packaging/macosx/Resources/ProgressWindow.nib/info.nib \ + packaging/macosx/Resources/ProgressWindow.nib/objects.xib \ + packaging/macosx/Resources/alert_fccache.sh \ packaging/macosx/Resources/application-gimp-gradient.icns \ - packaging/macosx/Resources/application-vnd.ms.xaml.icns \ - packaging/macosx/Resources/image-vnd.sk1.icns \ + packaging/macosx/Resources/application-illustrator-svg.icns \ packaging/macosx/Resources/application-illustrator.icns \ - packaging/macosx/Resources/application-vnd.corel-draw.icns \ - packaging/macosx/Resources/image-x-eps.icns \ - packaging/macosx/Resources/Inkscape.icns \ - packaging/macosx/Resources/image-vnd.dxf.icns \ - packaging/macosx/Resources/image-svg+xml-compressed.icns \ packaging/macosx/Resources/application-pdf.icns \ - packaging/macosx/Resources/application-vnd.corel-draw-template.icns \ packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns \ + packaging/macosx/Resources/application-vnd.corel-draw-template.icns \ + packaging/macosx/Resources/application-vnd.corel-draw.icns \ + packaging/macosx/Resources/application-vnd.ms.xaml.icns \ + packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \ + packaging/macosx/Resources/bin/gimp-wrapper.sh \ + packaging/macosx/Resources/bin/inkscape \ + packaging/macosx/Resources/bin/python-wrapper.sh \ + packaging/macosx/Resources/etc/fonts/fonts.conf \ + packaging/macosx/Resources/etc/gtk-2.0/gtkrc \ + packaging/macosx/Resources/image-svg+xml-compressed.icns \ packaging/macosx/Resources/image-svg+xml.icns \ + packaging/macosx/Resources/image-vnd.dxf.icns \ + packaging/macosx/Resources/image-vnd.sk1.icns \ packaging/macosx/Resources/image-vnd.windows-metafile.icns \ + packaging/macosx/Resources/image-x-eps.icns \ packaging/macosx/Resources/image-x-ps.icns \ - packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \ - packaging/macosx/Resources/application-illustrator-svg.icns \ - packaging/macosx/Resources/openDoc \ - packaging/macosx/Resources/script \ - packaging/macosx/Resources/ProgressWindow.nib/classes.nib \ - packaging/macosx/Resources/ProgressWindow.nib/info.nib \ - packaging/macosx/Resources/ProgressWindow.nib/objects.xib \ - packaging/macosx/Resources/bin/getdisplay.sh \ - packaging/macosx/Resources/bin/inkscape \ - packaging/macosx/Resources/etc/fonts/fonts.conf \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png \ - packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib \ - packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib \ - packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib \ - packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings \ - packaging/macosx/ScriptExec/Info.plist \ - packaging/macosx/ScriptExec/ScriptExec_Prefix.pch \ - packaging/macosx/ScriptExec/main.c \ - packaging/macosx/ScriptExec/openDoc \ - packaging/macosx/ScriptExec/script \ - packaging/macosx/ScriptExec/version.plist \ - packaging/macosx/ScriptExec/MenuBar.nib/classes.nib \ - packaging/macosx/ScriptExec/MenuBar.nib/info.nib \ - packaging/macosx/ScriptExec/MenuBar.nib/objects.xib \ - packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj \ + packaging/macosx/Resources/openDoc \ + packaging/macosx/Resources/script \ + packaging/macosx/Resources/xdg_setup.sh \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png \ + packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings \ + packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib \ + packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib \ + packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib \ + packaging/macosx/ScriptExec/Info.plist \ + packaging/macosx/ScriptExec/MenuBar.nib/classes.nib \ + packaging/macosx/ScriptExec/MenuBar.nib/info.nib \ + packaging/macosx/ScriptExec/MenuBar.nib/objects.xib \ packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj \ + packaging/macosx/ScriptExec/ScriptExec_Prefix.pch \ + packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh \ + packaging/macosx/ScriptExec/main.c \ + packaging/macosx/ScriptExec/openDoc \ + packaging/macosx/ScriptExec/script \ + packaging/macosx/ScriptExec/version.plist \ + packaging/macosx/create-stock-icon-theme.sh \ + packaging/macosx/dmg_background.png \ + packaging/macosx/dmg_background.svg \ + packaging/macosx/dmg_set_style.scpt \ + packaging/macosx/inkscape.ds_store \ + packaging/macosx/osx-app.sh \ + packaging/macosx/osx-build.sh \ + packaging/macosx/osx-dmg.sh \ + packaging/macosx/ports/devel/inkscape-packaging/Portfile \ + packaging/macosx/ports/lang/python26/Portfile \ + packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff \ + packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff \ + packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff \ + packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff \ + packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff \ + packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff \ + packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff \ + packaging/macosx/ports/lang/python26/files/patch-setup.py.diff \ + packaging/macosx/ports/lang/python26/files/pyconfig.ed \ + packaging/macosx/ports/lang/python26/files/python26 \ + packaging/macosx/ports/lang/python26/files/version.plist \ + packaging/macosx/ports/python/py-Pillow/Portfile \ + packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff \ + packaging/macosx/ports/python/py-sk1libs/Portfile \ + packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff \ + packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff \ + packaging/macosx/ports/python/py-uniconvertor/Portfile \ + packaging/macosx/ports/python/py25-Pillow/Portfile \ + packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff \ + packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff \ + packaging/macosx/ports/python/py25-numpy/Portfile \ + packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff \ + packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff \ + packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff \ + packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff \ + packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff \ + packaging/macosx/ports/python/py25-numpy/files/wrapper-template \ packaging/win32/inkscape.nsi \ packaging/win32/inkscape.nsi.uninstall \ packaging/win32/languages/Breton.nsh \ -- cgit v1.2.3 From dbf8071be78323acdecab129a16beff665ba3888 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sat, 13 Sep 2014 18:48:52 +0200 Subject: update resources for DMG (draft for new background image); TODO: add notes about background image and compatibility with Mac OS X Leopard (bzr r13506.1.90) --- packaging/macosx/dmg_background.png | Bin 24742 -> 24536 bytes packaging/macosx/dmg_background.svg | 3527 ++++++++++------------------------- packaging/macosx/dmg_set_style.scpt | Bin 4438 -> 5146 bytes packaging/macosx/inkscape.ds_store | Bin 12292 -> 12292 bytes 4 files changed, 1012 insertions(+), 2515 deletions(-) diff --git a/packaging/macosx/dmg_background.png b/packaging/macosx/dmg_background.png index 04cc698df..0ee039718 100644 Binary files a/packaging/macosx/dmg_background.png and b/packaging/macosx/dmg_background.png differ diff --git a/packaging/macosx/dmg_background.svg b/packaging/macosx/dmg_background.svg index 559b77ef6..8cd35504a 100644 --- a/packaging/macosx/dmg_background.svg +++ b/packaging/macosx/dmg_background.svg @@ -10,2072 +10,237 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="624.54108" - height="350" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.46+devel r21585 custom" - sodipodi:docname="dmg_background.svg" - version="1.0" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="./dmg_background.png"> + width="1280" + height="800" + id="svg13532" + version="1.1" + inkscape:version="0.91pre2 r13550 custom" + viewBox="0 0 1280 800" + sodipodi:docname="dmg_background.svg"> <defs - id="defs4"> + id="defs13534"> <linearGradient inkscape:collect="always" - id="linearGradient5781"> - <stop - style="stop-color:#555753;stop-opacity:1" - offset="0" - id="stop5783" /> - <stop - style="stop-color:#d3d7cf;stop-opacity:1" - offset="1" - id="stop5785" /> - </linearGradient> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 175 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="624.54108 : 175 : 1" - inkscape:persp3d-origin="312.27054 : 116.66667 : 1" - id="perspective58" /> - <linearGradient - id="linearGradient841"> + id="content_bg"> <stop - id="stop842" + style="stop-color:#eeeeee;stop-opacity:1" offset="0" - style="stop-color:#62c012;stop-opacity:1;" /> + id="stop4699" /> <stop - id="stop843" + style="stop-color:#ffffff;stop-opacity:1" offset="1" - style="stop-color:white;stop-opacity:0;" /> + id="stop4701" /> </linearGradient> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient841" - id="linearGradient4989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(4.195695,0,0,1.0590609,48.598964,114.17717)" - x1="76.911163" - y1="25.401896" - x2="76.911163" - y2="137.02844" /> - <filter - inkscape:collect="always" - x="-1.0928679" - width="3.1857358" - y="-1.212016" - height="3.424032" - id="filter6362"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="6.9435145" - id="feGaussianBlur6364" /> - </filter> - <filter - inkscape:collect="always" - x="-0.27738996" - width="1.5547799" - y="-0.28560414" - height="1.5712083" - id="filter6366"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="6.9435145" - id="feGaussianBlur6368" /> - </filter> - <filter - inkscape:collect="always" - x="-0.9599201" - width="2.9198402" - y="-1.2584231" - height="3.5168462" - id="filter6370"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="6.9435145" - id="feGaussianBlur6372" /> - </filter> - <filter - inkscape:collect="always" - x="-1.2436028" - width="3.4872055" - y="-1.2664239" - height="3.5328478" - id="filter6374"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="6.9435145" - id="feGaussianBlur6376" /> - </filter> - <filter - inkscape:collect="always" - x="-0.016262574" - width="1.0325251" - y="-0.19320738" - height="1.3864148" - id="filter6402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.8499877" - id="feGaussianBlur6404" /> - </filter> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath8875"> - <path - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.81105022pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 251.4419,206.10491 C 247.44915,206.10491 244.22315,209.33092 244.22315,213.32366 L 244.22315,312.47991 C 244.22315,316.47265 247.44915,319.69867 251.4419,319.69866 L 472.16065,319.69866 C 476.1534,319.69866 479.34815,316.47264 479.34815,312.47991 L 479.34815,213.32366 C 479.34815,209.33092 476.1534,206.10491 472.16065,206.10491 L 251.4419,206.10491 z M 321.1294,233.57366 L 321.1294,244.94866 L 321.16065,244.94866 L 440.0669,244.94866 L 440.0669,277.26116 L 321.1919,277.26116 L 321.2544,288.63616 L 282.1294,261.26116 L 321.1294,233.57366 z" - id="path8877" /> - </clipPath> - <filter - inkscape:collect="always" - id="filter9015"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.755523" - id="feGaussianBlur9017" /> - </filter> - <linearGradient - gradientTransform="translate(-130.16572,-83.352786)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient10981-3-9" - id="linearGradient1539" - y2="144.5" - x2="153.70045" - y1="217.5" - x1="180.81293" /> - <filter - color-interpolation-filters="sRGB" - id="filter10997-7-2"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7" /> - </filter> - <linearGradient - id="linearGradient10981-3-9"> + id="header_bg"> <stop + style="stop-color:#e6e6e6;stop-opacity:1" offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0" /> + id="stop4685" /> <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3" - id="linearGradient5822-7" - y2="187.65974" - x2="82.754066" - y1="180.47572" - x1="73.712105" /> - <filter - color-interpolation-filters="sRGB" - id="filter5845-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.2409356" - id="feGaussianBlur5847-5" /> - </filter> - <linearGradient - id="linearGradient5805-9"> + id="stop4687" + offset="0.13333334" + style="stop-color:#e6e6e6;stop-opacity:1" /> <stop - offset="0" style="stop-color:#ffffff;stop-opacity:1" - id="stop5807-4" /> - <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5809-9" /> + id="stop4689" /> </linearGradient> - <radialGradient - gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5805-9" - id="radialGradient5811-3" - fy="214.55121" - fx="181.22731" - r="22.466398" - cy="214.55121" - cx="181.22731" /> <linearGradient - id="linearGradient5793-9"> + inkscape:collect="always" + id="nav_foot"> <stop + style="stop-color:#4d4d4d;stop-opacity:1" offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5" /> + id="stop4635" /> <stop + style="stop-color:#333333;stop-opacity:1" offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4" /> + id="stop4637" /> </linearGradient> <linearGradient - gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9" - id="linearGradient5801-2" - y2="84.480316" - x2="53.63158" - y1="76.246338" - x1="57.225197" /> - <filter - color-interpolation-filters="sRGB" - id="filter5983-8" - x="-0.082508981" - width="1.165018" - y="-0.12233575" - height="1.2446715"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.6868363" - id="feGaussianBlur5985-3" /> - </filter> - <linearGradient - id="linearGradient5899-9"> + inkscape:collect="always" + id="nav_top"> <stop + style="stop-color:#4d4d4d;stop-opacity:1" offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5901-9" /> + id="stop4469" /> <stop + style="stop-color:#1a1a1a;stop-opacity:1" offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5903-3" /> + id="stop4471" /> </linearGradient> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5899-9" - id="linearGradient5905-4" - y2="223.5" - x2="153.5" - y1="208.16444" - x1="95.5" /> - <filter - color-interpolation-filters="sRGB" - id="filter9298-4"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.32610678" - id="feGaussianBlur9300-4" /> - </filter> - <linearGradient - id="linearGradient9286-3"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9288-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9290-2" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9286-3" - id="radialGradient11553-3" - fy="21.225746" - fx="68.39994" - r="54.783398" - cy="21.225746" - cx="68.39994" /> - <filter - color-interpolation-filters="sRGB" - id="filter9068-2" - x="-0.076179281" - width="1.1523587" - y="-0.1655701" - height="1.3311402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.66458488" - id="feGaussianBlur9070-7" /> - </filter> - <linearGradient - id="linearGradient9040-4"> + id="linearGradient5785-8-9"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9042-3" /> + style="stop-color:#c0cdf9;stop-opacity:1" + id="stop5787-7-9" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9044-7" /> + style="stop-color:#07092d;stop-opacity:0.28804347" + id="stop5789-3-7" /> </linearGradient> - <radialGradient - gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9040-4" - id="radialGradient9046-1" - fy="230.83626" - fx="90.28125" - r="10.46875" - cy="230.83626" - cx="90.28125" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient9025-1" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient9023-6" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient8998-5"> + id="WhiteTransparent-3-90"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:0.33004925" - id="stop9000-9" /> + style="stop-color:#ffffff;stop-opacity:1" + id="stop7606-1-2" /> <stop offset="1" style="stop-color:#ffffff;stop-opacity:0" - id="stop9002-5" /> + id="stop7608-8-0" /> </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8998-5" - id="radialGradient9004-6" - fy="187.86935" - fx="89.875" - r="22.75" - cy="187.86935" - cx="89.875" /> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4" - id="radialGradient8994-0" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient8992-2" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient8990-4" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <filter - color-interpolation-filters="sRGB" - id="filter8980-1" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur8982-9" /> - </filter> <linearGradient - id="linearGradient8916-4"> + id="linearGradient5793-9-3"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8918-9" /> + style="stop-color:#eeeeec;stop-opacity:1" + id="stop5795-5-7" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8920-9" /> + style="stop-color:#eeeeec;stop-opacity:0" + id="stop5797-4-8" /> </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4" - id="radialGradient8922-9" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <filter - color-interpolation-filters="sRGB" - id="filter8906-3" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur8908-7" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient8910-3" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> <linearGradient - id="linearGradient8866-0"> + id="linearGradient10981-3-9-0"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8868-3" /> + style="stop-color:#729fcf;stop-opacity:1" + id="stop10983-2-0-9" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8870-0" /> + style="stop-color:#729fcf;stop-opacity:0" + id="stop10985-3-7-7" /> </linearGradient> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient8912-9" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <filter - color-interpolation-filters="sRGB" - id="filter8764-9" - x="-0.074262142" - width="1.1485243" - y="-0.1754123" - height="1.3508246"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.1195652" - id="feGaussianBlur8766-2" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4" - id="radialGradient8768-6" - fy="182.08189" - fx="217.5" - r="34.25" - cy="182.08189" - cx="217.5" /> - <linearGradient - id="linearGradient8738-4"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8740-8" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8742-4" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4" - id="radialGradient8744-9" - fy="168.5" - fx="210.25" - r="34.25" - cy="168.5" - cx="210.25" /> - <filter - color-interpolation-filters="sRGB" - id="filter8732-3" - x="-0.078079157" - width="1.1561583" - y="-0.11422065" - height="1.2284414"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.9579068" - id="feGaussianBlur8734-5" /> - </filter> - <radialGradient - gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7" - id="radialGradient8574-0" - fy="251.99396" - fx="132.44434" - r="30.599579" - cy="251.99396" - cx="132.44434" /> - <linearGradient - id="linearGradient8568-7"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8570-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8572-1" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7" - id="radialGradient9177-1" - fy="250.89737" - fx="116.31038" - r="30.599579" - cy="250.89737" - cx="116.31038" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3" - id="IcecapTip-0" - y2="50" - x2="90" - y1="20" - x1="60" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3" - id="shinySpecular-0" - y2="60" - x2="58" - y1="35" - x1="33" /> - <filter - color-interpolation-filters="sRGB" - id="filter8490-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-5" /> - </filter> - <clipPath - id="clipPath9086-1"> - <use - xlink:href="#outline1" - height="300" - width="400" - y="0" - x="0" - style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0" - transform="translate(1.0095461e-6,0)" /> - </clipPath> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8" - id="linearGradient9175-3" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <filter - color-interpolation-filters="sRGB" - id="filter6031-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.4903482" - id="feGaussianBlur6033-8" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter6017-3"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.80546496" - id="feGaussianBlur6019-9" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter8490"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785" - id="linearGradient9175" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <clipPath - id="clipoutline1"> - <path - id="outline1" - d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m -9.9,64.7 c 0.9,0 30.8,4 19.3,7.1 -4.4,1.2 -24.6,-7.1 -19.3,-7.1 z m 57.2,16.6 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" /> - </clipPath> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent" - id="sideSpecular" - y2="40" - x2="60" - y1="20" - x1="80" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent" - id="liquidSpecular" - y2="76" - x2="0" - y1="128" - x1="0" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9" /> - </linearGradient> - <inkscape:perspective - id="perspective3208" - inkscape:persp3d-origin="64 : 42.666667 : 1" - inkscape:vp_z="128 : 64 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 64 : 1" - sodipodi:type="inkscape:persp3d" /> - <inkscape:perspective - id="perspective3354" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /> - <filter - color-interpolation-filters="sRGB" - id="filter6017-3-7"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.80546496" - id="feGaussianBlur6019-9-6" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter6031-0-4"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.4903482" - id="feGaussianBlur6033-8-3" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-3" - id="linearGradient9175-3-0" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8-3"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7-0" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3-9" /> - </linearGradient> - <clipPath - id="clipPath9086-1-2"> - <use - xlink:href="#outline1" - height="300" - width="400" - y="0" - x="0" - style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0-5" - transform="translate(1.0095461e-6,0)" /> - </clipPath> - <filter - color-interpolation-filters="sRGB" - id="filter8490-0-4"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-5-0" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-3" - id="linearGradient3370" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient3372"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop3374" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop3376" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-9" - id="shinySpecular-0-5" - y2="60" - x2="58" - y1="35" - x1="33" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8-6" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-9" - id="IcecapTip-0-9" - y2="50" - x2="90" - y1="20" - x1="60" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient3383"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3385" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3387" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-2" - id="radialGradient9177-1-2" - fy="250.89737" - fx="116.31038" - r="30.599579" - cy="250.89737" - cx="116.31038" /> - <linearGradient - id="linearGradient8568-7-2"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8570-9-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8572-1-7" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-2" - id="radialGradient8574-0-7" - fy="251.99396" - fx="132.44434" - r="30.599579" - cy="251.99396" - cx="132.44434" /> - <linearGradient - id="linearGradient3394"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3396" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3398" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter8732-3-5" - x="-0.078079157" - width="1.1561583" - y="-0.11422065" - height="1.2284414"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.9579068" - id="feGaussianBlur8734-5-4" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-1" - id="radialGradient8744-9-8" - fy="168.5" - fx="210.25" - r="34.25" - cy="168.5" - cx="210.25" /> - <linearGradient - id="linearGradient8738-4-1"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8740-8-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8742-4-8" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-1" - id="radialGradient8768-6-9" - fy="182.08189" - fx="217.5" - r="34.25" - cy="182.08189" - cx="217.5" /> - <linearGradient - id="linearGradient3407"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3409" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3411" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter8764-9-3" - x="-0.074262142" - width="1.1485243" - y="-0.1754123" - height="1.3508246"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.1195652" - id="feGaussianBlur8766-2-6" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient8912-9-8" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient8866-0-0"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8868-3-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8870-0-1" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient8910-3-0" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient3420"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3422" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3424" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter8906-3-5" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur8908-7-1" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-0" - id="radialGradient8922-9-1" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <linearGradient - id="linearGradient8916-4-0"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8918-9-8" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8920-9-5" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter8980-1-0" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur8982-9-6" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient8990-4-4" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient3435"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3437" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3439" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient8992-2-6" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient3442"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3444" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3446" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter3448" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur3450" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-0" - id="radialGradient8994-0-2" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <linearGradient - id="linearGradient3453"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3455" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3457" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter3459" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur3461" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8998-5-8" - id="radialGradient9004-6-5" - fy="187.86935" - fx="89.875" - r="22.75" - cy="187.86935" - cx="89.875" /> - <linearGradient - id="linearGradient8998-5-8"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:0.33004925" - id="stop9000-9-6" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9002-5-2" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient9023-6-8" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient3468"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3470" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3472" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient9025-1-4" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient3475"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3477" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3479" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter3481" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur3483" /> - </filter> - <radialGradient - gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9040-4-2" - id="radialGradient9046-1-7" - fy="230.83626" - fx="90.28125" - r="10.46875" - cy="230.83626" - cx="90.28125" /> - <linearGradient - id="linearGradient9040-4-2"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9042-3-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9044-7-0" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter9068-2-6" - x="-0.076179281" - width="1.1523587" - y="-0.1655701" - height="1.3311402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.66458488" - id="feGaussianBlur9070-7-2" /> - </filter> - <radialGradient - gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9286-3-9" - id="radialGradient11553-3-9" - fy="21.225746" - fx="68.39994" - r="54.783398" - cy="21.225746" - cx="68.39994" /> - <linearGradient - id="linearGradient9286-3-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9288-9-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9290-2-8" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter9298-4-1"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.32610678" - id="feGaussianBlur9300-4-3" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5899-9-1" - id="linearGradient5905-4-1" - y2="223.5" - x2="153.5" - y1="208.16444" - x1="95.5" /> - <linearGradient - id="linearGradient5899-9-1"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5901-9-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5903-3-3" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter5983-8-4" - x="-0.082508981" - width="1.165018" - y="-0.12233575" - height="1.2446715"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.6868363" - id="feGaussianBlur5985-3-0" /> - </filter> - <linearGradient - gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9-9" - id="linearGradient5801-2-3" - y2="84.480316" - x2="53.63158" - y1="76.246338" - x1="57.225197" /> - <linearGradient - id="linearGradient5793-9-9"> - <stop - offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5-1" /> - <stop - offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4-9" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5805-9-9" - id="radialGradient5811-3-6" - fy="214.55121" - fx="181.22731" - r="22.466398" - cy="214.55121" - cx="181.22731" /> - <linearGradient - id="linearGradient5805-9-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5807-4-3" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5809-9-3" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter5845-5-8"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.2409356" - id="feGaussianBlur5847-5-0" /> - </filter> - <linearGradient - gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-9" - id="linearGradient5822-7-5" - y2="187.65974" - x2="82.754066" - y1="180.47572" - x1="73.712105" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient3514"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3516" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3518" /> - </linearGradient> - <linearGradient - gradientTransform="translate(-130.16572,-83.352786)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient10981-3-9-6" - id="linearGradient1539-6" - y2="144.5" - x2="153.70045" - y1="217.5" - x1="180.81293" /> - <linearGradient - id="linearGradient10981-3-9-6"> - <stop - offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0-4" /> - <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7-0" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter10997-7-2-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7-4" /> - </filter> - <linearGradient - gradientTransform="translate(-130.16572,-83.352786)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient10981-3-9-0" - id="linearGradient1539-7" - y2="144.5" - x2="153.70045" - y1="217.5" - x1="180.81293" /> - <filter - color-interpolation-filters="sRGB" - id="filter10997-7-2-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7-9" /> - </filter> - <linearGradient - id="linearGradient10981-3-9-0"> - <stop - offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0-9" /> - <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7-7" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient5822-7-6" - y2="187.65974" - x2="82.754066" - y1="180.47572" - x1="73.712105" /> - <filter - color-interpolation-filters="sRGB" - id="filter5845-5-6"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.2409356" - id="feGaussianBlur5847-5-7" /> - </filter> - <linearGradient - id="linearGradient5805-9-6"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5807-4-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5809-9-4" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5805-9-6" - id="radialGradient5811-3-8" - fy="214.55121" - fx="181.22731" - r="22.466398" - cy="214.55121" - cx="181.22731" /> - <linearGradient - id="linearGradient5793-9-3"> - <stop - offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5-7" /> - <stop - offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4-8" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9-3" - id="linearGradient5801-2-0" - y2="84.480316" - x2="53.63158" - y1="76.246338" - x1="57.225197" /> - <filter - color-interpolation-filters="sRGB" - id="filter5983-8-5" - x="-0.082508981" - width="1.165018" - y="-0.12233575" - height="1.2446715"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.6868363" - id="feGaussianBlur5985-3-1" /> - </filter> - <linearGradient - id="linearGradient5899-9-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5901-9-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5903-3-4" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5899-9-9" - id="linearGradient5905-4-0" - y2="223.5" - x2="153.5" - y1="208.16444" - x1="95.5" /> - <filter - color-interpolation-filters="sRGB" - id="filter9298-4-2"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.32610678" - id="feGaussianBlur9300-4-9" /> - </filter> - <linearGradient - id="linearGradient9286-3-5"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9288-9-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9290-2-0" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9286-3-5" - id="radialGradient11553-3-4" - fy="21.225746" - fx="68.39994" - r="54.783398" - cy="21.225746" - cx="68.39994" /> - <filter - color-interpolation-filters="sRGB" - id="filter9068-2-7" - x="-0.076179281" - width="1.1523587" - y="-0.1655701" - height="1.3311402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.66458488" - id="feGaussianBlur9070-7-26" /> - </filter> - <linearGradient - id="linearGradient9040-4-1"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9042-3-3" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9044-7-7" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9040-4-1" - id="radialGradient9046-1-0" - fy="230.83626" - fx="90.28125" - r="10.46875" - cy="230.83626" - cx="90.28125" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient9025-1-1" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient9023-6-0" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient8998-5-6"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:0.33004925" - id="stop9000-9-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9002-5-7" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8998-5-6" - id="radialGradient9004-6-9" - fy="187.86935" - fx="89.875" - r="22.75" - cy="187.86935" - cx="89.875" /> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-5" - id="radialGradient8994-0-8" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient8992-2-2" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient8990-4-6" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <filter - color-interpolation-filters="sRGB" - id="filter8980-1-06" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur8982-9-64" /> - </filter> - <linearGradient - id="linearGradient8916-4-5"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8918-9-82" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8920-9-6" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-5" - id="radialGradient8922-9-8" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <filter - color-interpolation-filters="sRGB" - id="filter8906-3-7" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur8908-7-4" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient8910-3-4" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient8866-0-4"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8868-3-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8870-0-6" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient8912-9-7" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <filter - color-interpolation-filters="sRGB" - id="filter8764-9-6" - x="-0.074262142" - width="1.1485243" - y="-0.1754123" - height="1.3508246"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.1195652" - id="feGaussianBlur8766-2-7" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-11" - id="radialGradient8768-6-5" - fy="182.08189" - fx="217.5" - r="34.25" - cy="182.08189" - cx="217.5" /> - <linearGradient - id="linearGradient8738-4-11"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8740-8-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8742-4-0" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-11" - id="radialGradient8744-9-3" - fy="168.5" - fx="210.25" - r="34.25" - cy="168.5" - cx="210.25" /> - <filter - color-interpolation-filters="sRGB" - id="filter8732-3-0" - x="-0.078079157" - width="1.1561583" - y="-0.11422065" - height="1.2284414"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.9579068" - id="feGaussianBlur8734-5-7" /> - </filter> - <radialGradient - gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-6" - id="radialGradient8574-0-2" - fy="251.99396" - fx="132.44434" - r="30.599579" - cy="251.99396" - cx="132.44434" /> - <linearGradient - id="linearGradient8568-7-6"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8570-9-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8572-1-1" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-6" - id="radialGradient9177-1-9" - fy="250.89737" - fx="116.31038" - r="30.599579" - cy="250.89737" - cx="116.31038" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="IcecapTip-0-1" - y2="50" - x2="90" - y1="20" - x1="60" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3-90"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8-0" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="shinySpecular-0-4" - y2="60" - x2="58" - y1="35" - x1="33" /> - <filter - color-interpolation-filters="sRGB" - id="filter8490-0-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-5-3" /> - </filter> - <clipPath - id="clipPath9086-1-8"> - <use - xlink:href="#outline1-4" - height="300" - width="400" - y="0" - x="0" - style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0-2" - transform="translate(1.0095461e-6,0)" /> - </clipPath> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8-9"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7-9" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3-7" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-9" - id="linearGradient9175-3-1" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <filter - color-interpolation-filters="sRGB" - id="filter6031-0-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.4903482" - id="feGaussianBlur6033-8-8" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter6017-3-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.80546496" - id="feGaussianBlur6019-9-7" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter8490-9"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-3" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-9"> + inkscape:collect="always" + id="linearGradient5781"> <stop + style="stop-color:#555753;stop-opacity:1" offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-4" /> + id="stop5783" /> <stop + style="stop-color:#d3d7cf;stop-opacity:1" offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-5" /> + id="stop5785" /> </linearGradient> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath14931"> + <rect + style="opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect14933" + width="1024" + height="676" + x="0" + y="0" /> + </clipPath> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath14935"> + <rect + y="178" + x="0" + height="676" + width="1024" + id="rect14937" + style="opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + </clipPath> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-9" - id="linearGradient9175-9" + xlink:href="#linearGradient5785-8-9" + id="linearGradient9175" y2="40" x2="60" y1="20" x1="82.118591" /> <clipPath - id="clipoutline1-7"> + id="clipoutline1-8"> <path - id="outline1-4" + id="outline1-2" d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m -9.9,64.7 c 0.9,0 30.8,4 19.3,7.1 -4.4,1.2 -24.6,-7.1 -19.3,-7.1 z m 57.2,16.6 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" /> </clipPath> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-5" - id="sideSpecular-5" - y2="40" - x2="60" - y1="20" - x1="80" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-5" - id="liquidSpecular-2" - y2="76" - x2="0" - y1="128" - x1="0" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-5"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9-9" /> - </linearGradient> - <inkscape:perspective - id="perspective4323" - inkscape:persp3d-origin="64 : 42.666667 : 1" - inkscape:vp_z="128 : 64 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 64 : 1" - sodipodi:type="inkscape:persp3d" /> - <inkscape:perspective - id="perspective4469" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /> <filter color-interpolation-filters="sRGB" - id="filter6017-3-5-0"> + id="filter6017-3-7"> <feGaussianBlur inkscape:collect="always" stdDeviation="0.80546496" - id="feGaussianBlur6019-9-7-8" /> + id="feGaussianBlur6019-9-28" /> </filter> <filter color-interpolation-filters="sRGB" - id="filter6031-0-0-5"> + id="filter6031-0-56"> <feGaussianBlur inkscape:collect="always" stdDeviation="3.4903482" - id="feGaussianBlur6033-8-8-1" /> + id="feGaussianBlur6033-8-49" /> </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-9-6" - id="linearGradient9175-3-1-6" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8-9-6"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7-9-2" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3-7-1" /> - </linearGradient> <clipPath - id="clipPath9086-1-8-9"> + id="clipPath9086-1-5"> <use - xlink:href="#outline1-4" + xlink:href="#outline1-2" height="300" width="400" y="0" x="0" style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0-2-6" + id="use9088-0-9" transform="translate(1.0095461e-6,0)" /> </clipPath> <filter color-interpolation-filters="sRGB" - id="filter8490-0-5-4"> + id="filter8490-0-0"> <feGaussianBlur inkscape:collect="always" stdDeviation="2.4163949" - id="feGaussianBlur8492-5-3-8" /> + id="feGaussianBlur8492-5-0" /> </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-9-6" - id="linearGradient4485" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient4487"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop4489" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop4491" /> - </linearGradient> <linearGradient gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90-8" - id="shinySpecular-0-4-0" + xlink:href="#WhiteTransparent-3-90" + id="shinySpecular-0-4" y2="60" x2="58" y1="35" x1="33" /> <linearGradient gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3-90-8"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1-2-1" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8-0-0" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90-8" - id="IcecapTip-0-1-2" + xlink:href="#WhiteTransparent-3-90" + id="IcecapTip-0-3" y2="50" x2="90" y1="20" x1="60" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient4498"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4500" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4502" /> - </linearGradient> <radialGradient gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-6-9" - id="radialGradient9177-1-9-2" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient9177-1-7" fy="250.89737" fx="116.31038" r="30.599579" cy="250.89737" cx="116.31038" /> - <linearGradient - id="linearGradient8568-7-6-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8570-9-2-7" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8572-1-1-5" /> - </linearGradient> <radialGradient gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-6-9" - id="radialGradient8574-0-2-6" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8574-0-1" fy="251.99396" fx="132.44434" r="30.599579" cy="251.99396" cx="132.44434" /> - <linearGradient - id="linearGradient4509"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4511" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4513" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter8732-3-0-4" + id="filter8732-3-8" x="-0.078079157" width="1.1561583" y="-0.11422065" @@ -2083,53 +248,31 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="1.9579068" - id="feGaussianBlur8734-5-7-6" /> + id="feGaussianBlur8734-5-0" /> </filter> <radialGradient gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-11-7" - id="radialGradient8744-9-3-3" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8744-9-7" fy="168.5" fx="210.25" r="34.25" cy="168.5" cx="210.25" /> - <linearGradient - id="linearGradient8738-4-11-7"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8740-8-9-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8742-4-0-7" /> - </linearGradient> <radialGradient gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-11-7" - id="radialGradient8768-6-5-4" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8768-6-2" fy="182.08189" fx="217.5" r="34.25" cy="182.08189" cx="217.5" /> - <linearGradient - id="linearGradient4522"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4524" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4526" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter8764-9-6-9" + id="filter8764-9-3" x="-0.074262142" width="1.1485243" y="-0.1754123" @@ -2137,49 +280,27 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="2.1195652" - id="feGaussianBlur8766-2-7-1" /> + id="feGaussianBlur8766-2-4" /> </filter> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient8912-9-7-7" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient8912-9-9" y2="201.5" x2="231.75" y1="195.1875" x1="231.625" /> - <linearGradient - id="linearGradient8866-0-4-0"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8868-3-0-6" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8870-0-6-0" /> - </linearGradient> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient8910-3-4-8" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient8910-3-8" y2="200.07138" x2="231.37646" y1="195.62132" x1="231.37646" /> - <linearGradient - id="linearGradient4535"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4537" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4539" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter8906-3-7-5" + id="filter8906-3-4" x="-0.085441329" width="1.1708827" y="-0.27823201" @@ -2187,32 +308,21 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="0.56515877" - id="feGaussianBlur8908-7-4-3" /> + id="feGaussianBlur8908-7-88" /> </filter> <radialGradient gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-5-4" - id="radialGradient8922-9-8-9" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8922-9-3" fy="204.83229" fx="228.21875" r="14.09375" cy="204.83229" cx="228.21875" /> - <linearGradient - id="linearGradient8916-4-5-4"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8918-9-82-1" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8920-9-6-5" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter8980-1-06-4" + id="filter8980-1-63" x="-0.069862768" width="1.1397254" y="-0.47285891" @@ -2220,186 +330,73 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="0.82052366" - id="feGaussianBlur8982-9-64-1" /> + id="feGaussianBlur8982-9-6" /> </filter> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient8990-4-6-5" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient8990-4-8" y2="201.5" x2="231.75" y1="195.1875" x1="231.625" /> - <linearGradient - id="linearGradient4550"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4552" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4554" /> - </linearGradient> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient8992-2-2-5" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient8992-2-5" y2="200.07138" x2="231.37646" y1="195.62132" x1="231.37646" /> - <linearGradient - id="linearGradient4557"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4559" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4561" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter4563" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur4565" /> - </filter> <radialGradient gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-5-4" - id="radialGradient8994-0-8-4" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8994-0-8" fy="204.83229" fx="228.21875" r="14.09375" cy="204.83229" cx="228.21875" /> - <linearGradient - id="linearGradient4568"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4570" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4572" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter4574" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur4576" /> - </filter> <radialGradient gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8998-5-6-8" - id="radialGradient9004-6-9-9" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient9004-6-0" fy="187.86935" fx="89.875" r="22.75" cy="187.86935" cx="89.875" /> - <linearGradient - id="linearGradient8998-5-6-8"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:0.33004925" - id="stop9000-9-0-3" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9002-5-7-8" /> - </linearGradient> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient9023-6-0-5" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient9023-6-6" y2="201.5" x2="231.75" y1="195.1875" x1="231.625" /> - <linearGradient - id="linearGradient4583"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4585" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4587" /> - </linearGradient> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient9025-1-1-2" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient9025-1-9" y2="200.07138" x2="231.37646" y1="195.62132" x1="231.37646" /> - <linearGradient - id="linearGradient4590"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4592" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4594" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter4596" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur4598" /> - </filter> <radialGradient gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9040-4-1-2" - id="radialGradient9046-1-0-2" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient9046-1-8" fy="230.83626" fx="90.28125" r="10.46875" cy="230.83626" cx="90.28125" /> - <linearGradient - id="linearGradient9040-4-1-2"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9042-3-3-7" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9044-7-7-0" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter9068-2-7-3" + id="filter9068-2-2" x="-0.076179281" width="1.1523587" y="-0.1655701" @@ -2407,59 +404,37 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="0.66458488" - id="feGaussianBlur9070-7-26-4" /> + id="feGaussianBlur9070-7-2" /> </filter> <radialGradient gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9286-3-5-3" - id="radialGradient11553-3-4-6" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient11553-3-1" fy="21.225746" fx="68.39994" r="54.783398" cy="21.225746" cx="68.39994" /> - <linearGradient - id="linearGradient9286-3-5-3"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9288-9-2-6" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9290-2-0-3" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter9298-4-2-3"> + id="filter9298-4-5"> <feGaussianBlur inkscape:collect="always" stdDeviation="0.32610678" - id="feGaussianBlur9300-4-9-4" /> + id="feGaussianBlur9300-4-6" /> </filter> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5899-9-9-3" - id="linearGradient5905-4-0-4" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient5905-4-7" y2="223.5" x2="153.5" y1="208.16444" x1="95.5" /> - <linearGradient - id="linearGradient5899-9-9-3"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5901-9-9-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5903-3-4-7" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter5983-8-5-2" + id="filter5983-8-5" x="-0.082508981" width="1.165018" y="-0.12233575" @@ -2467,436 +442,958 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="3.6868363" - id="feGaussianBlur5985-3-1-5" /> + id="feGaussianBlur5985-3-7" /> </filter> <linearGradient gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9-3-9" - id="linearGradient5801-2-0-8" + xlink:href="#linearGradient5793-9-3" + id="linearGradient5801-2-8" y2="84.480316" x2="53.63158" y1="76.246338" x1="57.225197" /> - <linearGradient - id="linearGradient5793-9-3-9"> - <stop - offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5-7-0" /> - <stop - offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4-8-2" /> - </linearGradient> <radialGradient gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5805-9-6-7" - id="radialGradient5811-3-8-4" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient5811-3-0" fy="214.55121" fx="181.22731" r="22.466398" cy="214.55121" cx="181.22731" /> - <linearGradient - id="linearGradient5805-9-6-7"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5807-4-0-6" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5809-9-4-5" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter5845-5-6-7"> + id="filter5845-5-1"> <feGaussianBlur inkscape:collect="always" stdDeviation="1.2409356" - id="feGaussianBlur5847-5-7-1" /> + id="feGaussianBlur5847-5-4" /> </filter> <linearGradient gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90-8" - id="linearGradient5822-7-6-3" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient5822-7-1" y2="187.65974" x2="82.754066" y1="180.47572" x1="73.712105" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient4629"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4631" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4633" /> - </linearGradient> + <filter + color-interpolation-filters="sRGB" + id="filter10997-7-2-1"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="2.7696726" + id="feGaussianBlur10999-0-7-6" /> + </filter> <linearGradient gradientTransform="translate(-130.16572,-83.352786)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient10981-3-9-0-3" - id="linearGradient1539-7-3" + xlink:href="#linearGradient10981-3-9-0" + id="linearGradient1539-7" y2="144.5" x2="153.70045" y1="217.5" x1="180.81293" /> + <clipPath + id="clipPath17127" + clipPathUnits="userSpaceOnUse"> + <rect + y="0" + x="0" + height="128" + width="128" + id="rect17129" + style="opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + </clipPath> <linearGradient - id="linearGradient10981-3-9-0-3"> - <stop - offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0-9-8" /> - <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7-7-5" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter10997-7-2-5-1"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7-9-0" /> - </filter> - <radialGradient inkscape:collect="always" - xlink:href="#linearGradient5781" - id="radialGradient5787" - cx="290.74387" - cy="258.93588" - fx="290.74387" - fy="258.93588" - r="78.96619" - gradientTransform="matrix(2.0000004,-6.2784742e-6,0,0.50066434,-301.34718,131.46569)" + xlink:href="#nav_top" + id="linearGradient4475" + x1="60" + y1="110" + x2="60" + y2="162" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#nav_top" + id="linearGradient4483" + x1="70" + y1="110" + x2="70" + y2="162" gradientUnits="userSpaceOnUse" /> <radialGradient inkscape:collect="always" - xlink:href="#linearGradient5781" - id="radialGradient5810" + xlink:href="#nav_foot" + id="radialGradient4639" + cx="512" + cy="767" + fx="512" + fy="767" + r="480" + gradientTransform="matrix(0.625,0,0,0.625,192,287.625)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#header_bg" + id="linearGradient4681" + x1="532" + y1="0" + x2="532" + y2="75" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.0000004,-6.2784742e-6,0,0.50066434,-301.34718,131.46569)" - cx="290.74387" - cy="258.93588" - fx="290.74387" - fy="258.93588" - r="78.96619" /> + gradientTransform="translate(-20,0)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#content_bg" + id="linearGradient4703" + x1="512" + y1="163" + x2="512" + y2="263" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5781" + id="linearGradient3762" + gradientUnits="userSpaceOnUse" + x1="220" + y1="233.5" + x2="379" + y2="233.5" /> + <mask + maskUnits="userSpaceOnUse" + id="mask3799"> + <rect + style="display:inline;opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect3801" + width="600" + height="400" + x="0" + y="0" /> + </mask> </defs> <sodipodi:namedview id="base" pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="1" + bordercolor="#6666af" + borderopacity="1" + inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="296.64284" - inkscape:cy="158.77027" + inkscape:cx="1655" + inkscape:cy="550" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer5" showgrid="false" - grid_units="mm" - inkscape:grid-points="true" - gridtolerance="10000" - inkscape:grid-bbox="false" - inkscape:object-paths="false" - guidetolerance="10000" - inkscape:guide-bbox="false" - inkscape:window-width="1244" - inkscape:window-height="756" - inkscape:window-x="36" - inkscape:window-y="25" - height="350px" - width="624.54108px" - units="px" - inkscape:window-maximized="0"> + inkscape:object-nodes="true" + inkscape:snap-page="true" + inkscape:showpageshadow="false" + borderlayer="true" + inkscape:window-width="1163" + inkscape:window-height="742" + inkscape:window-x="53" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:snap-bbox="true" + inkscape:bbox-nodes="true" + showguides="false" + inkscape:guide-bbox="true" + inkscape:snap-text-baseline="true" + inkscape:snap-center="true" + inkscape:snap-nodes="true" + inkscape:snap-others="true" + inkscape:snap-midpoints="true"> <inkscape:grid - id="GridFromPre046Settings" type="xygrid" - originx="0px" - originy="0px" - spacingx="2mm" - spacingy="2mm" - color="#0000ff" - empcolor="#0000ff" - opacity="0.2" - empopacity="0.4" - empspacing="5" /> + id="grid14925" /> + <sodipodi:guide + orientation="0,1" + position="113.27875,743.405" + id="guide4435" /> + <sodipodi:guide + orientation="1,0" + position="113.27875,743.405" + id="guide4441" /> + <sodipodi:guide + orientation="0,1" + position="137.888,658.21001" + id="guide4500" /> + <sodipodi:guide + orientation="1,0" + position="115,743" + id="guide4575" /> + <sodipodi:guide + orientation="1,0" + position="146,715" + id="guide4577" /> + <sodipodi:guide + orientation="1,0" + position="512,33" + id="guide4641" /> + <sodipodi:guide + orientation="0,1" + position="141,566.5" + id="guide4834" /> + <sodipodi:guide + orientation="1,0" + position="459,566.5" + id="guide4836" /> </sodipodi:namedview> <metadata - id="metadata7"> + id="metadata13537"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> <g - inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1" - transform="translate(-48.8794,-125.0409)"> + id="layer2" + inkscape:label="website screenshot" + style="display:none" + sodipodi:insensitive="true"> + <g + id="g14939"> + <image + sodipodi:absref="/Users/su_v/TEMP/inkscape-repo/osx-packaging-update-quartz/packaging/macosx/_work/inkscape-org-screenshot-upper.png" + xlink:href="_work/inkscape-org-screenshot-upper.png" + y="-127" + x="-57" + id="image14889" + style="image-rendering:optimizeSpeed" + preserveAspectRatio="none" + height="882" + width="1138" + clip-path="url(#clipPath14931)" /> + <image + sodipodi:absref="/Users/su_v/TEMP/inkscape-repo/osx-packaging-update-quartz/packaging/macosx/_work/inkscape-org-screenshot-lower.png" + xlink:href="_work/inkscape-org-screenshot-lower.png" + y="51" + x="-57" + id="image14919" + style="opacity:1;image-rendering:optimizeSpeed" + preserveAspectRatio="none" + height="882" + width="1138" + clip-path="url(#clipPath14935)" /> + </g> + </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="website vector" + style="display:none"> <use x="0" y="0" - xlink:href="#g9139" - id="use5007" - transform="matrix(6.5090909,0,0,6.5090909,-0.80833,-721.208)" - width="624.54108" - height="350" - style="opacity:0.19607843" /> - <rect - style="font-size:12px;fill:url(#linearGradient4989);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.06115007" - id="rect3968" - width="624.46564" - height="157.62523" - x="48.954857" - y="125.0409" - ry="7.2071209" - rx="0" /> - <path - style="fill:#b0e088;fill-opacity:1;stroke-width:1pt;filter:url(#filter6402)" - d="M 211.90625,131.50353 C 205.98536,131.00651 201.16447,138.64884 205.65625,143.19103 C 201.58111,142.39402 202.59325,154.72266 205.53125,154.44103 C 207.92857,154.12103 209.07578,153.09201 211.53125,154.31603 C 217.32456,156.22034 225.89226,152.12727 223.9375,145.15978 C 223.58426,143.30954 221.58678,142.21903 223.25378,141.31776 C 223.20533,136.85003 223.7185,128.54828 217.71875,132.50353 C 215.92538,131.64528 213.88943,131.39446 211.90625,131.50353 z M 242.78125,131.53478 C 233.79442,131.686 227.75459,143.4366 234,150.31603 C 239.43304,157.21146 253.6084,155.92987 254.8125,146.25353 C 256.34217,142.79208 248.19412,142.52195 249.09375,146.47228 C 247.74986,150.93304 239.3353,150.35814 239.6875,145.06603 C 237.97761,140.6411 241.81797,134.16096 246.71875,137.50353 C 249.41376,139.53503 248.68222,144.7773 253.40625,143.03478 C 254.93997,141.69772 255.77025,130.19743 250.78125,131.69103 C 248.48983,133.58272 245.86063,130.6504 242.78125,131.53478 z M 271.8125,132.62853 C 268.88476,137.81053 266.95595,144.19233 263.65625,148.90978 C 259.67153,147.59894 259.59949,156.11933 263.9375,154.25353 C 269.48656,156.75387 278.01244,151.20147 270.5625,149.03478 C 278.56123,146.20513 273.12299,149.82125 275.28125,154.25353 C 280.36022,153.37416 290.27534,157.33095 287.9375,149.03478 C 282.68218,150.73712 283.23236,143.06976 280.63766,140.45052 C 278.39554,137.2537 276.7707,127.60112 271.8125,132.62853 z M 114.8125,133.84728 C 116.77004,137.44183 119.84252,139.92143 118.25,147.06603 C 115.30109,149.26327 111.78292,155.87408 120.8125,154.25353 C 126.85204,157.33159 133.71667,149.54431 125.75,149.03478 C 126.22284,144.18114 123.68261,136.05584 129.125,136.06603 C 130.82877,128.51851 120.43737,133.06616 115.8125,131.84728 C 113.97917,131.01395 115.14583,133.18061 114.8125,133.84728 z M 135.53125,133.84728 C 137.13794,137.51626 141.13623,138.88004 139.1875,146.09728 C 139.90014,148.78088 138.23701,149.77742 135.5625,149.15978 C 133.27286,157.439 143.41425,153.28719 148.4375,154.25353 C 149.06032,150.62414 148.38609,148.80032 145,148.69103 C 144.37781,144.20288 144.67524,140.37677 148.22983,146.14847 C 151.10869,149.12544 157.66223,158.95016 160.03125,152.59728 C 160.56723,147.67323 159.08446,141.633 160.53125,137.15978 C 166.78949,137.51713 163.38644,128.79621 157.65625,131.84728 C 151.96161,128.87124 147.11594,136.8081 153.71875,137.12853 C 155.08393,137.90612 154.71504,144.55646 153.02099,140.78157 C 148.74449,136.84367 145.84142,129.79243 138.9375,131.84728 C 137.12804,132.15832 134.61732,130.69848 135.53125,133.84728 z M 169.90625,133.84728 C 171.85329,137.42108 174.78089,140.0143 173.25,147.06603 C 170.35185,149.32204 166.94881,155.89193 175.90625,154.25353 C 183.25,154.25353 190.59375,154.25353 197.9375,154.25353 C 198.4412,150.73398 198.06744,148.19277 194.25,148.94103 C 192.35148,145.50722 184.29985,141.35591 190.71875,138.62853 C 192.79995,135.96358 198.2411,138.61479 196.65625,133.84728 C 195.14564,129.51414 185.9343,132.88173 181.125,131.84728 C 178.05306,132.8288 169.62024,129.69565 169.90625,133.84728 z M 293.15625,133.84728 C 295.10692,137.42786 298.08265,139.98338 296.53125,147.06603 C 293.61604,149.30232 290.17477,155.88606 299.15625,154.25353 C 305.32284,157.37796 312.34688,149.41219 304.0625,149.03478 C 302.86465,143.8835 309.81747,147.32631 312.71875,144.81603 C 318.59404,142.36193 317.05771,133.06727 310.8125,132.37853 C 305.03715,131.23236 299.02318,132.1357 293.15625,131.84728 L 293.15625,132.84728 L 293.15625,133.84728 z M 322.59375,133.84728 C 324.54442,137.42786 327.52015,139.98338 325.96875,147.06603 C 323.05354,149.30232 319.61227,155.88606 328.59375,154.25353 C 333.93497,153.54619 341.80986,155.64814 345.63415,153.25884 C 346.95428,148.40113 347.18135,139.81716 341.15596,144.41675 C 340.57513,147.60682 339.42531,148.62524 340.03125,144.00353 C 339.41481,135.19467 340.19038,144.69295 345.875,142.37853 C 345.72495,136.36636 346.55912,129.23076 338.3125,131.84728 C 333.91933,133.01706 323.53366,129.40617 322.59375,133.84728 z M 212.90625,136.69103 C 214.7956,136.2583 217.80683,138.96345 217.03125,139.75353 C 216.4244,139.17109 208.72475,139.11563 211,137.03478 C 211.62008,136.69307 212.21398,136.72524 212.90625,136.69103 z M 180.78125,137.06603 C 187.89935,134.91758 178.66084,142.82534 180.78125,137.06603 z M 305.90625,137.06603 C 309.23663,135.96017 309.72242,141.54509 306.25,140.84728 C 303.03028,142.603 303.02031,135.62858 305.90625,137.06603 z M 334.75,137.06603 C 335.39873,138.82924 332.76238,142.0438 333.4375,138.06603 C 332.71875,136.57645 334.04753,137.13439 334.75,137.06603 z M 273.71875,142.90978 C 272.32791,143.69153 273.8227,141.08737 273.71875,142.90978 z M 209.25,145.19103 C 211.70195,146.62318 216.25481,145.47391 217.75,147.90978 C 216.06,151.3315 208.46858,148.82989 209.25,145.19103 z M 333.46875,145.37853 C 335.93079,145.66665 333.11094,150.51246 336.75,149.00353 C 332.80474,149.66943 333.29657,148.87152 333.46875,145.37853 z M 184.875,149.03478 C 177.62334,151.44995 181.19956,141.37917 184.875,149.03478 z " - id="path6392" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke-width:1pt" - d="M 343.30616,142.63289 L 324.60589,142.63289 L 324.60589,143.82976 L 325.16596,143.82976 C 327.68633,143.82976 327.96625,143.95712 327.96625,145.02666 L 327.96625,145.76519 L 327.96625,157.88691 L 327.96625,158.62541 C 327.96625,159.69498 327.68633,159.8223 325.16596,159.8223 L 324.60589,159.8223 L 324.60589,161.0192 L 343.71062,161.0192 L 344.33297,154.21984 L 342.96375,154.21984 C 342.55928,156.00241 341.84362,157.58132 341.09694,158.31983 C 340.13242,159.33846 338.35872,159.8223 335.74504,159.8223 L 333.69141,159.8223 C 332.75812,159.8223 331.9802,159.66952 331.70007,159.44031 C 331.4824,159.28754 331.45117,159.13474 331.45117,158.59995 L 331.45117,152.10617 L 332.0735,152.10617 C 333.97154,152.10617 334.74946,152.25896 335.37178,152.79375 C 336.18074,153.45587 336.49191,154.27077 336.55419,155.77325 L 338.01651,155.77325 L 338.01651,147.42046 L 336.55419,147.42046 C 336.3986,149.9161 335.15394,150.90926 332.19804,150.90926 L 331.45117,150.90926 L 331.45117,145.10308 C 331.45117,144.00805 331.7313,143.82976 333.41149,143.82976 L 335.0294,143.82976 C 337.76763,143.82976 339.1056,144.05898 340.16345,144.77203 C 341.19025,145.43413 341.93693,146.8602 342.4037,149.15213 L 343.74167,149.15213 L 343.30616,142.63289 z M 302.01626,152.84468 L 305.5322,152.84468 C 308.3325,152.84468 309.79502,152.66641 311.0397,152.18256 C 313.2489,151.31673 314.49337,149.68694 314.49337,147.67511 C 314.49337,145.7397 313.40429,144.26269 311.35086,143.42233 C 310.13724,142.913 308.20815,142.63289 306.06122,142.63289 L 295.17078,142.63289 L 295.17078,143.82976 L 295.73084,143.82976 C 298.25121,143.82976 298.53134,143.95712 298.53134,145.02666 L 298.53134,145.76519 L 298.53134,157.88691 L 298.53134,158.62541 C 298.53134,159.69498 298.25121,159.8223 295.73084,159.8223 L 295.17078,159.8223 L 295.17078,161.0192 L 305.62551,161.0192 L 305.62551,159.8223 L 304.81654,159.8223 C 302.29618,159.8223 302.01626,159.69498 302.01626,158.62541 L 302.01626,157.88691 L 302.01626,152.84468 z M 302.01626,151.64778 L 302.01626,145.12853 C 302.01626,143.95712 302.20288,143.82976 303.9143,143.82976 L 305.90564,143.82976 C 309.14164,143.82976 310.66624,145.0776 310.66624,147.77698 C 310.66624,150.39996 309.07938,151.64778 305.7811,151.64778 L 302.01626,151.64778 z M 274.94593,142.27638 L 273.63917,142.27638 L 266.48254,157.12293 C 265.8602,158.44714 265.73586,158.62541 265.26911,159.03287 C 264.77133,159.51672 263.90009,159.8223 263.0599,159.8223 L 262.93555,159.8223 L 262.93555,161.0192 L 271.18107,161.0192 L 271.18107,159.8223 L 270.55874,159.8223 C 268.87856,159.8223 268.03838,159.33846 268.03838,158.37078 C 268.03838,158.06517 268.13169,157.70865 268.31831,157.3012 L 269.34512,155.0602 L 277.59085,155.0602 L 279.27103,158.47264 C 279.45764,158.85461 279.51992,159.03287 279.51992,159.16018 C 279.51992,159.56766 278.742,159.8223 277.59085,159.8223 L 276.2839,159.8223 L 276.2839,161.0192 L 285.92967,161.0192 L 285.92967,159.8223 L 285.49397,159.8223 C 283.93833,159.8223 283.59593,159.61858 282.88028,158.19249 L 274.94593,142.27638 z M 273.42133,146.45276 L 276.93727,153.68506 L 269.96747,153.68506 L 273.42133,146.45276 z M 251.95181,142.45463 L 250.76941,142.45463 L 249.52474,143.95712 C 247.31554,142.63289 246.10212,142.2509 244.01745,142.2509 C 240.99929,142.2509 238.50996,143.24409 236.39425,145.30677 C 234.40272,147.24222 233.46941,149.38133 233.46941,152.00431 C 233.46941,157.47944 237.85659,161.40118 243.98621,161.40118 C 248.96468,161.40118 252.13843,159.00738 252.85408,154.72915 L 251.39174,154.5254 C 251.08059,155.8751 250.70715,156.79188 250.14708,157.55585 C 248.87137,159.31299 246.88004,160.20428 244.35966,160.20428 C 239.75462,160.20428 237.57646,157.58132 237.57646,152.10617 C 237.57646,149.22852 238.0432,147.29313 239.10125,145.76519 C 240.06578,144.33911 241.99486,143.44779 243.98621,143.44779 C 246.16439,143.44779 248.09345,144.39004 249.27586,146.01985 C 249.86715,146.8602 250.3339,147.85338 251.04954,149.81425 L 252.41855,149.81425 L 251.95181,142.45463 z M 220.80547,142.4801 L 219.65412,142.4801 L 218.40964,144.00805 C 216.94712,142.86207 214.95577,142.2509 212.74657,142.2509 C 208.67055,142.2509 205.93233,144.39004 205.93233,147.57326 C 205.93233,150.34903 207.61252,151.72419 212.18651,152.6919 L 215.14239,153.30306 C 217.44512,153.78692 217.66277,153.83785 218.31634,154.24529 C 219.24964,154.83101 219.74762,155.67137 219.74762,156.66454 C 219.74762,157.68318 219.28086,158.52356 218.34736,159.21113 C 217.32056,159.94965 216.29375,160.22976 214.58234,160.22976 C 212.27982,160.22976 210.63087,159.64404 209.16834,158.31983 C 207.8616,157.12293 207.20804,155.92603 206.74129,153.96518 L 205.4035,153.96518 L 205.52785,161.22295 L 206.74129,161.22295 L 208.14155,159.49126 C 210.22619,160.89187 211.96865,161.40118 214.67584,161.40118 C 219.24964,161.40118 222.17449,159.21113 222.17449,155.79871 C 222.17449,154.21984 221.52111,152.87015 220.30769,151.90244 C 219.46749,151.24032 218.25407,150.80742 215.76472,150.2981 L 212.4354,149.61051 C 209.66615,149.02482 208.35939,148.03163 208.35939,146.47823 C 208.35939,144.69561 210.13288,143.47325 212.7778,143.47325 C 214.95577,143.47325 216.72926,144.23725 217.97394,145.68879 C 218.8764,146.73289 219.43646,147.80246 219.84094,149.10121 L 221.17891,149.10121 L 220.80547,142.4801 z M 178.73765,152.6919 L 178.73765,145.76519 L 178.73765,145.02666 C 178.73765,143.95712 179.01778,143.82976 181.53796,143.82976 L 182.12925,143.82976 L 182.12925,142.63289 L 171.89239,142.63289 L 171.89239,143.82976 L 172.45245,143.82976 C 174.97262,143.82976 175.25275,143.95712 175.25275,145.02666 L 175.25275,145.76519 L 175.25275,157.88691 L 175.25275,158.62541 C 175.25275,159.69498 174.97262,159.8223 172.45245,159.8223 L 171.89239,159.8223 L 171.89239,161.0192 L 182.12925,161.0192 L 182.12925,159.8223 L 181.53796,159.8223 C 179.01778,159.8223 178.73765,159.69498 178.73765,158.62541 L 178.73765,157.88691 L 178.73765,154.65275 L 182.34711,151.67324 L 187.76109,158.16702 C 188.25889,158.77822 188.38343,158.98195 188.38343,159.2366 C 188.38343,159.64404 187.79213,159.8223 186.26754,159.8223 L 185.30299,159.8223 L 185.30299,161.0192 L 195.94434,161.0192 L 195.94434,159.8223 L 195.35324,159.8223 C 193.64183,159.8223 193.20631,159.64404 192.30385,158.54901 L 184.77398,149.66144 L 189.41023,145.86704 C 190.9038,144.56829 192.80183,143.82976 194.66865,143.82976 L 194.66865,142.63289 L 185.08515,142.63289 L 185.08515,143.82976 L 185.86307,143.82976 C 187.29436,143.82976 187.88563,144.05898 187.88563,144.59375 C 187.88563,144.95028 187.2633,145.68879 186.36084,146.42729 L 178.73765,152.6919 z M 143.95082,142.63289 L 137.54106,142.63289 L 137.54106,143.82976 L 138.31879,143.82976 C 139.90566,143.82976 140.62151,144.0335 141.18157,144.67015 L 141.18157,155.49312 C 141.18157,158.98195 140.55924,159.72043 137.57211,159.8223 L 137.57211,161.0192 L 146.43996,161.0192 L 146.43996,159.8223 C 143.48408,159.72043 142.86175,158.98195 142.86175,155.49312 L 142.86175,146.04531 L 156.73912,161.37574 L 158.04604,161.37574 L 158.04604,148.15896 C 158.04604,144.67015 158.66839,143.93164 161.65532,143.82976 L 161.65532,142.63289 L 152.78745,142.63289 L 152.78745,143.82976 C 155.74353,143.93164 156.36587,144.67015 156.36587,148.15896 L 156.36587,156.15522 L 143.95082,142.63289 z M 123.72578,145.76519 L 123.72578,145.02666 C 123.72578,143.95712 124.00592,143.82976 126.49504,143.82976 L 127.11738,143.82976 L 127.11738,142.63289 L 116.81822,142.63289 L 116.81822,143.82976 L 117.44055,143.82976 C 119.96093,143.82976 120.24088,143.95712 120.24088,145.02666 L 120.24088,145.76519 L 120.24088,157.88691 L 120.24088,158.62541 C 120.24088,159.69498 119.96093,159.8223 117.44055,159.8223 L 116.81822,159.8223 L 116.81822,161.0192 L 127.11738,161.0192 L 127.11738,159.8223 L 126.49504,159.8223 C 124.00592,159.8223 123.72578,159.69498 123.72578,158.62541 L 123.72578,157.88691 L 123.72578,145.76519 z " - id="path3970" - transform="translate(1.654053e-6,-8.777719)" /> - <path - style="opacity:0.18000004;fill:#ffffff;fill-opacity:1;stroke-width:1pt" - d="M 590.28004,118.44468 L 545.50486,118.44468 L 545.50486,121.23484 L 546.84587,121.23484 C 552.88054,121.23484 553.55077,121.53175 553.55077,124.02508 L 553.55077,125.74675 L 553.55077,154.00514 L 553.55077,155.72674 C 553.55077,158.22014 552.88054,158.51696 546.84587,158.51696 L 545.50486,158.51696 L 545.50486,161.30719 L 591.24846,161.30719 L 592.73859,145.45639 L 589.46018,145.45639 C 588.49174,149.61196 586.77819,153.29274 584.99037,155.01437 C 582.68096,157.38902 578.43408,158.51696 572.17599,158.51696 L 567.25886,158.51696 C 565.02423,158.51696 563.16161,158.16079 562.49088,157.62645 C 561.9697,157.27031 561.89492,156.9141 561.89492,155.66739 L 561.89492,140.52897 L 563.38501,140.52897 C 567.9296,140.52897 569.79222,140.88515 571.28228,142.13187 C 573.21922,143.67541 573.96427,145.57512 574.11339,149.07773 L 577.61471,149.07773 L 577.61471,129.60555 L 574.11339,129.60555 C 573.74085,135.42343 570.76069,137.73871 563.6832,137.73871 L 561.89492,137.73871 L 561.89492,124.20323 C 561.89492,121.65048 562.56566,121.23484 566.58864,121.23484 L 570.46249,121.23484 C 577.0188,121.23484 580.22238,121.7692 582.75526,123.43148 C 585.21379,124.97498 587.00161,128.29946 588.11922,133.64245 L 591.3228,133.64245 L 590.28004,118.44468 z M 491.41715,142.25059 L 499.83558,142.25059 C 506.5405,142.25059 510.0423,141.83501 513.02252,140.70705 C 518.31214,138.68861 521.29185,134.88921 521.29185,130.1992 C 521.29185,125.68733 518.6842,122.2441 513.76755,120.28503 C 510.8617,119.09767 506.24277,118.44468 501.10224,118.44468 L 475.02661,118.44468 L 475.02661,121.23484 L 476.36759,121.23484 C 482.40227,121.23484 483.073,121.53175 483.073,124.02508 L 483.073,125.74675 L 483.073,154.00514 L 483.073,155.72674 C 483.073,158.22014 482.40227,158.51696 476.36759,158.51696 L 475.02661,158.51696 L 475.02661,161.30719 L 500.059,161.30719 L 500.059,158.51696 L 498.12203,158.51696 C 492.08738,158.51696 491.41715,158.22014 491.41715,155.72674 L 491.41715,154.00514 L 491.41715,142.25059 z M 491.41715,139.46036 L 491.41715,124.26256 C 491.41715,121.53175 491.86399,121.23484 495.96174,121.23484 L 500.72973,121.23484 C 508.47788,121.23484 512.12832,124.14383 512.12832,130.43668 C 512.12832,136.55142 508.3288,139.46036 500.43153,139.46036 L 491.41715,139.46036 z M 426.60104,117.61357 L 423.47218,117.61357 L 406.33663,152.22413 C 404.84653,155.31116 404.54881,155.72674 403.43125,156.67662 C 402.23938,157.80458 400.15332,158.51696 398.1416,158.51696 L 397.84386,158.51696 L 397.84386,161.30719 L 417.58661,161.30719 L 417.58661,158.51696 L 416.09652,158.51696 C 412.07357,158.51696 410.06188,157.38902 410.06188,155.13314 C 410.06188,154.4207 410.28529,153.58957 410.73213,152.63972 L 413.19068,147.41546 L 432.93393,147.41546 L 436.95688,155.3706 C 437.40369,156.26106 437.55282,156.67662 437.55282,156.97341 C 437.55282,157.92333 435.6902,158.51696 432.93393,158.51696 L 429.80462,158.51696 L 429.80462,161.30719 L 452.90006,161.30719 L 452.90006,158.51696 L 451.85684,158.51696 C 448.13208,158.51696 447.31225,158.04204 445.59873,154.71751 L 426.60104,117.61357 z M 422.9506,127.34963 L 431.36902,144.2097 L 414.68081,144.2097 L 422.9506,127.34963 z M 371.54484,118.02911 L 368.71374,118.02911 L 365.73356,121.53175 C 360.44394,118.44468 357.53857,117.55417 352.54712,117.55417 C 345.32056,117.55417 339.36021,119.86952 334.29444,124.67808 C 329.526,129.19003 327.29132,134.17677 327.29132,140.29151 C 327.29132,153.05524 337.7958,162.19767 352.47232,162.19767 C 364.39257,162.19767 371.99167,156.6172 373.70519,146.64371 L 370.20383,146.16872 C 369.45882,149.31517 368.56467,151.45238 367.22366,153.23336 C 364.16915,157.32964 359.40119,159.40743 353.3665,159.40743 C 342.34037,159.40743 337.12507,153.29274 337.12507,140.52897 C 337.12507,133.82053 338.24262,129.30872 340.77597,125.74675 C 343.0854,122.42225 347.70431,120.34439 352.47232,120.34439 C 357.68767,120.34439 362.30653,122.54098 365.13765,126.34042 C 366.55341,128.29946 367.67098,130.61478 369.38448,135.186 L 372.66238,135.186 L 371.54484,118.02911 z M 296.96929,118.08849 L 294.21254,118.08849 L 291.23281,121.65048 C 287.73101,118.97894 282.963,117.55417 277.67338,117.55417 C 267.91392,117.55417 261.35763,122.54098 261.35763,129.96176 C 261.35763,136.43269 265.38061,139.63849 276.33239,141.89443 L 283.40983,143.31918 C 288.9234,144.44716 289.44453,144.56589 291.00941,145.51572 C 293.24407,146.88117 294.43641,148.84023 294.43641,151.15553 C 294.43641,153.5302 293.31882,155.48931 291.08368,157.09218 C 288.62516,158.81384 286.1666,159.46683 282.06887,159.46683 C 276.55581,159.46683 272.60763,158.10139 269.10581,155.01437 C 265.977,152.22413 264.41214,149.4339 263.29458,144.86273 L 260.09142,144.86273 L 260.38916,161.78218 L 263.29458,161.78218 L 266.6473,157.74523 C 271.63868,161.01036 275.81076,162.19767 282.29274,162.19767 C 293.24407,162.19767 300.24721,157.09218 300.24721,149.13709 C 300.24721,145.45639 298.68278,142.30997 295.77742,140.05403 C 293.76568,138.51048 290.86032,137.5013 284.89991,136.31396 L 276.92832,134.71104 C 270.29774,133.34566 267.16889,131.03032 267.16889,127.40901 C 267.16889,123.25333 271.41526,120.40374 277.74815,120.40374 C 282.963,120.40374 287.20937,122.18479 290.18958,125.56865 C 292.3504,128.00267 293.69138,130.49608 294.65985,133.52375 L 297.86343,133.52375 L 296.96929,118.08849 z M 196.24378,141.89443 L 196.24378,125.74675 L 196.24378,124.02508 C 196.24378,121.53175 196.91451,121.23484 202.94873,121.23484 L 204.36449,121.23484 L 204.36449,118.44468 L 179.85376,118.44468 L 179.85376,121.23484 L 181.19475,121.23484 C 187.22894,121.23484 187.89967,121.53175 187.89967,124.02508 L 187.89967,125.74675 L 187.89967,154.00514 L 187.89967,155.72674 C 187.89967,158.22014 187.22894,158.51696 181.19475,158.51696 L 179.85376,158.51696 L 179.85376,161.30719 L 204.36449,161.30719 L 204.36449,158.51696 L 202.94873,158.51696 C 196.91451,158.51696 196.24378,158.22014 196.24378,155.72674 L 196.24378,154.00514 L 196.24378,146.4656 L 204.88613,139.51971 L 217.84914,154.65814 C 219.04106,156.08298 219.33925,156.55792 219.33925,157.15156 C 219.33925,158.10139 217.92346,158.51696 214.27305,158.51696 L 211.96357,158.51696 L 211.96357,161.30719 L 237.44279,161.30719 L 237.44279,158.51696 L 236.02748,158.51696 C 231.92975,158.51696 230.88696,158.10139 228.72615,155.54864 L 210.69693,134.82977 L 221.79778,125.98419 C 225.37392,122.95652 229.91849,121.23484 234.38833,121.23484 L 234.38833,118.44468 L 211.44198,118.44468 L 211.44198,121.23484 L 213.3046,121.23484 C 216.73162,121.23484 218.14734,121.7692 218.14734,123.01587 C 218.14734,123.84702 216.65725,125.56865 214.49644,127.29025 L 196.24378,141.89443 z M 112.95159,118.44468 L 97.604314,118.44468 L 97.604314,121.23484 L 99.46648,121.23484 C 103.26602,121.23484 104.98002,121.7098 106.321,123.19398 L 106.321,148.42469 C 106.321,156.55792 104.83092,158.27947 97.678659,158.51696 L 97.678659,161.30719 L 118.91148,161.30719 L 118.91148,158.51696 C 111.83404,158.27947 110.34396,156.55792 110.34396,148.42469 L 110.34396,126.39977 L 143.57138,162.13836 L 146.70062,162.13836 L 146.70062,131.32716 C 146.70062,123.19398 148.19075,121.47235 155.34253,121.23484 L 155.34253,118.44468 L 134.10966,118.44468 L 134.10966,121.23484 C 141.18758,121.47235 142.67768,123.19398 142.67768,131.32716 L 142.67768,149.96819 L 112.95159,118.44468 z M 64.525561,125.74675 L 64.525561,124.02508 C 64.525561,121.53175 65.196317,121.23484 71.156166,121.23484 L 72.646272,121.23484 L 72.646272,118.44468 L 47.986375,118.44468 L 47.986375,121.23484 L 49.476457,121.23484 C 55.511154,121.23484 56.181455,121.53175 56.181455,124.02508 L 56.181455,125.74675 L 56.181455,154.00514 L 56.181455,155.72674 C 56.181455,158.22014 55.511154,158.51696 49.476457,158.51696 L 47.986375,158.51696 L 47.986375,161.30719 L 72.646272,161.30719 L 72.646272,158.51696 L 71.156166,158.51696 C 65.196317,158.51696 64.525561,158.22014 64.525561,155.72674 L 64.525561,154.00514 L 64.525561,125.74675 z " - id="use3972" /> + xlink:href="#rect4669" + id="use4724" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#g17092" + id="use17385" + width="100%" + height="100%" + transform="matrix(0.5,0,0,0.5,32,92)" /> + <use + x="0" + y="0" + xlink:href="#text4431" + id="use4447" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#text4443" + id="use4449" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#rect4693" + id="use4728" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#g4485" + id="use4587" + width="100%" + height="100%" /> <g - id="g6386"> - <path - id="path4997" - d="M 92.59375,164.875 C 88.113243,165.75634 90.444126,172.33966 94.3125,171.78125 C 98.790176,171.10793 97.488032,164.81708 93.3125,164.84375 C 93.077807,164.87205 92.819915,164.79564 92.59375,164.875 z " - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6374)" /> - <path - id="path4999" - d="M 68.0625,164 C 63.389338,163.68801 62.994345,172.30386 67.96875,171.40625 C 72.00245,171.56715 75.618715,164.7074 69.84375,164.1875 C 69.28382,163.9933 68.657906,163.92536 68.0625,164 z " - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6362)" /> - <path - id="path5001" - d="M 96.6875,160.96875 C 92.787255,160.12272 89.338676,166.71986 94.4375,167.625 C 98.127844,169.64513 105.11906,165.50747 100.90625,161.84375 C 99.656522,161.05111 98.140071,160.87759 96.6875,160.96875 z " - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6370)" /> - <path - id="path5003" - d="M 78.90625,130.0625 C 71.574069,132.72813 68.195911,140.7692 62.0625,145.25 C 60.185026,147.42322 54.784698,150.53213 57.25,153.90625 C 59.730284,154.72534 65.594263,155.98382 63.34061,159.34427 C 59.717471,163.33418 70.334693,162.45891 71.59375,165.46875 C 73.006345,167.48699 68.928159,170.12348 72.71875,170.65625 C 75.274013,170.82156 76.509875,171.42143 77.15625,173.71875 C 79.798879,175.53189 84.935097,174.59678 86.375,171.65625 C 84.032653,167.37236 91.803417,168.05515 93.09375,164.40625 C 90.163883,162.96743 90.537912,158.77419 94.09375,158.75 C 97.839433,158.38307 104.15352,156.07034 102.125,151.15625 C 95.808038,143.61829 88.597124,136.46857 81.03125,130.28125 C 80.359155,130.04775 79.615042,129.96607 78.90625,130.0625 z M 80.375,133.28125 C 82.853723,134.6375 88.132191,138.59859 83.90625,140.96875 C 81.669601,143.5713 77.157842,142.78439 76.6875,139.0625 C 76.528868,140.88754 72.618484,146.33606 70.0625,142.5 C 68.712832,139.23213 74.807932,134.16459 76.5,138.125 C 75.943839,135.93126 77.766171,131.42089 80.375,133.28125 z " - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6366)" /> + id="g4597"> + <text + transform="translate(-4.8828124e-7,-3.2861328e-6)" + sodipodi:linespacing="125%" + id="text4490" + y="141.78999" + x="137.888" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="141.78999" + x="137.888" + id="tspan4492" + sodipodi:role="line">ABOUT</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="232.79601" + y="141.78999" + id="text4496" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4498" + x="232.79601" + y="141.78999">DOWNLOAD</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4506" + y="141.78999" + x="361.29599" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="141.78999" + x="361.29599" + id="tspan4508" + sodipodi:role="line">NEWS</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="448.18799" + y="141.78999" + id="text4510" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4512" + x="448.18799" + y="141.78999">COMMUNITY</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4514" + y="141.78999" + x="580.04602" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="141.78999" + x="580.04602" + id="tspan4516" + sodipodi:role="line">LEARN</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="671.68799" + y="141.78999" + id="text4518" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4520" + x="671.68799" + y="141.78999">CONTRIBUTE</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4522" + y="141.78999" + x="804.29602" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="141.78999" + x="804.29602" + id="tspan4524" + sodipodi:role="line">DEVELOP</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ff732c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="913.59601" + y="141.78999" + id="text4526" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4528" + x="913.59601" + y="141.78999">DONATE</tspan></text> + </g> + <g + id="g4615"> + <use + height="100%" + width="100%" + id="use4550" + xlink:href="#g4543" + y="0" + x="0" + style="display:inline" /> + <use + height="100%" + width="100%" + transform="translate(95,0)" + x="0" + y="0" + xlink:href="#g4543" + id="use4553" + style="display:inline" /> + <use + id="use4555" + xlink:href="#g4543" + y="0" + x="0" + transform="translate(223,0)" + width="100%" + height="100%" + style="display:inline" /> + <use + height="100%" + width="100%" + transform="translate(310,0)" + x="0" + y="0" + xlink:href="#g4543" + id="use4557" + style="display:inline" /> + <use + id="use4559" + xlink:href="#g4543" + y="0" + x="0" + transform="translate(442,0)" + width="100%" + height="100%" + style="display:inline" /> + <use + height="100%" + width="100%" + transform="translate(534,0)" + x="0" + y="0" + xlink:href="#g4543" + id="use4561" + style="display:inline" /> + <use + id="use4563" + xlink:href="#g4543" + y="0" + x="0" + transform="translate(666,0)" + width="100%" + height="100%" + style="display:inline" /> + <use + height="100%" + width="100%" + transform="translate(776,0)" + x="0" + y="0" + xlink:href="#g4543" + id="use4565" + style="display:inline" /> </g> - <flowRoot - style="font-size:7.19999981px;font-style:italic;font-weight:normal;line-height:150%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" - id="flowRoot4797" - transform="translate(-184.4496,300.46138)"> - <flowRegion - id="flowRegion4799"> + <use + style="display:inline" + x="0" + y="0" + xlink:href="#g4649" + id="use4655" + width="100%" + height="100%" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="341.55399" + y="766.96503" + id="text4663" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4665" + x="341.55399" + y="766.96503">Inkscape is Free and Open Source Software licensed under the GPL.</tspan></text> + </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="background for dmg" + style="display:inline"> + <g + id="g4785"> + <rect + style="display:inline;opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect13530-7" + width="90" + height="90" + x="414" + y="188.5" /> + <rect + y="188.5" + x="96" + height="90" + width="90" + id="rect13527-5" + style="display:inline;opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <g + id="g3786"> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4783" + width="600" + height="400" + x="0" + y="0" /> <use - xlink:href="#d0e15" + style="display:inline" + height="100%" + width="100%" + id="use4735" + xlink:href="#rect4669" y="0" x="0" - id="use4801" - width="744.09448" - height="1052.3622" /> - </flowRegion> - <flowDiv - xml:space="preserve" - id="flowDiv4803">This tutorial covers copy/paste, node editing, freehand and bezier drawing, path manipulation, booleans, offsets, simplification, and text tool. </flowDiv> </flowRoot> - <g - id="g3978" - transform="translate(0,-6.720262)" - style="opacity:0.8258427"> - <path - sodipodi:nodetypes="ccccccccc" - style="color:#000000;fill:url(#radialGradient5810);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible" - d="m 321.13418,233.56827 -38.99349,27.67813 39.09841,27.39295 -0.035,-11.36482 118.86894,0 0,-32.34144 -118.90391,0 -0.035,0 0,-11.36482 z" - id="path4008" /> - <rect - y="245.66743" - x="320.60944" - height="30.984045" - width="118.35905" - id="rect4939" - style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + transform="scale(0.5859375,1)" /> + </g> + <g + id="g3779" + mask="url(#mask3799)"> + <use + height="100%" + width="100%" + id="use4709" + xlink:href="#g4649" + y="0" + x="0" + style="display:inline;opacity:1" + transform="matrix(0.55833333,0,0,1,14.133334,-429)" /> + <use + style="display:inline;opacity:1" + height="100%" + width="100%" + id="use4718" + xlink:href="#g4485" + y="0" + x="0" + transform="matrix(0.55833333,0,0,1,14.133334,0)" /> + <use + style="display:inline;opacity:1" + transform="matrix(0.5,0,0,0.5,32,92)" + height="100%" + width="100%" + id="use4738" + xlink:href="#g17092" + y="0" + x="0" /> + <use + style="display:inline;opacity:1" + height="100%" + width="100%" + id="use4740" + xlink:href="#text4431" + y="0" + x="0" /> + <use + style="display:inline;opacity:1" + height="100%" + width="100%" + id="use4742" + xlink:href="#text4443" + y="0" + x="0" /> + </g> + <g + id="g3790"> + <rect + y="163" + x="32" + height="141" + width="536" + id="rect4828" + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <use + style="display:inline" + height="100%" + width="100%" + id="use4732" + xlink:href="#rect4693" + y="0" + x="0" + transform="matrix(0.55833333,0,0,1,14.133334,0)" /> + <text + sodipodi:linespacing="125%" + id="text4711" + y="337.96503" + x="132.5152" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="337.96503" + x="132.5152" + id="tspan4713" + sodipodi:role="line">Inkscape is Free and Open Source Software licensed under the GPL.</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="376.46323" + y="141.78999" + id="text4804" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4806" + x="376.46323" + y="141.78999">Inkscape 0.91pre2 custom</tspan></text> + <path + sodipodi:nodetypes="cccccccc" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.8258427;fill:url(#linearGradient3762);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none" + d="m 220,233.5 40,27.5 0,-11 119,0 0,-33 -119,0 0,-11 z" + id="path4958" + inkscape:connector-curvature="0" /> + </g> </g> + <use + x="0" + y="0" + xlink:href="#g4785" + id="dmg_background" + transform="matrix(1.25,0,0,1.25,1280,0)" + width="100%" + height="100%" + inkscape:export-xdpi="72" + inkscape:export-ydpi="72" + inkscape:label="#use4802" + inkscape:export-filename="dmg_background.png" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="assets" + style="display:none"> <g - style="display:inline;enable-background:new" - id="g9139" - transform="matrix(0.42708381,0,0,0.42708381,52.046708,125.92538)"> + clip-path="url(#clipPath17127)" + id="g17092" + transform="translate(0,-128)"> <g - style="opacity:0.78325124" - id="g6035" - transform="translate(3.6896803e-7,0.4883067)"> + transform="matrix(0.9939405,0,0,0.9939405,0.38937111,-1.4450758)" + id="g9139-7" + style="display:inline;enable-background:new"> + <g + transform="translate(3.6896803e-7,0.4883067)" + id="g6035-3" + style="opacity:0.78325124"> + <path + d="m 54.1,12.988307 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.699996 -7.3,7.600003 -3.7,11.300003 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.100003 17,-4.1 20.3,-12.500003 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.0000003 -14,-5.0000003 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z M 31.9,105.38831 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.700003 -16.9,0.3 -11.1,5.2 z m 67.5,-6.700003 c -4.6,4.200003 0.8,8.600003 5.3,5.700003 1.2,-0.8 -0.1,-4.700007 -5.3,-5.700003 z" + id="path5987-2" + style="fill:#000000;fill-opacity:1;filter:url(#filter6017-3-7)" + inkscape:connector-curvature="0" /> + <path + d="m 54.1,13.964921 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.699999 -7.3,7.600009 -3.7,11.300009 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.100009 17,-4.1 20.3,-12.500009 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.0000009 -14,-5.0000009 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z M 31.9,106.36493 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.700009 -16.9,0.3 -11.1,5.2 z m 67.5,-6.700009 c -4.6,4.200009 0.8,8.600009 5.3,5.700009 1.2,-0.8 -0.1,-4.70001 -5.3,-5.700009 z" + id="path6021-6" + style="opacity:0.57635468;fill:#000000;fill-opacity:1;filter:url(#filter6031-0-56)" + inkscape:connector-curvature="0" /> + </g> <path - style="fill:#000000;fill-opacity:1;filter:url(#filter6017-3-5)" - id="path5987" - d="m 54.1,12.988307 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.699996 -7.3,7.600003 -3.7,11.300003 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.100003 17,-4.1 20.3,-12.500003 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.0000003 -14,-5.0000003 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z M 31.9,105.38831 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.700003 -16.9,0.3 -11.1,5.2 z m 67.5,-6.700003 c -4.6,4.200003 0.8,8.600003 5.3,5.700003 1.2,-0.8 -0.1,-4.700007 -5.3,-5.700003 z" /> + d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" + id="use7631-2" + style="fill:#000000;fill-opacity:1" + inkscape:connector-curvature="0" /> <path - style="opacity:0.57635468;fill:#000000;fill-opacity:1;filter:url(#filter6031-0-0)" - id="path6021" - d="m 54.1,13.964921 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.699999 -7.3,7.600009 -3.7,11.300009 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.100009 17,-4.1 20.3,-12.500009 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.0000009 -14,-5.0000009 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z M 31.9,106.36493 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.700009 -16.9,0.3 -11.1,5.2 z m 67.5,-6.700009 c -4.6,4.200009 0.8,8.600009 5.3,5.700009 1.2,-0.8 -0.1,-4.70001 -5.3,-5.700009 z" /> - </g> - <path - style="fill:#000000;fill-opacity:1" - id="use7631" - d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" /> - <path - style="fill:none" - id="use7639" - d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" /> - <use - xlink:href="#outline1-4" - height="300" - width="400" - y="0" - x="0" - style="opacity:0.66995072;fill:url(#linearGradient9175-3-1);filter:url(#filter8490-0-5)" - id="use7641" - clip-path="url(#clipPath9086-1-8)" - transform="matrix(0.9905442,0,0,0.9905442,0.6051535,0.604136)" /> - <path - style="opacity:0.50526315;fill:url(#shinySpecular-0-4);stroke:none" - id="path7643" - d="M 16.565217,57.039374 C 5.3632748,68.140398 25.042362,65.011927 40.180121,70.966113 L 71.464824,15.965587 c -4.743164,-4.844083 -10.798268,-4.44041 -15.137759,0 L 16.565217,57.039374 z" /> - <path - style="fill:url(#IcecapTip-0-1)" - id="icecap" - d="m 70.5,15.5 16.3,16.6 c 1.5,1.5 1.5,4.6 0.6,5.5 L 79.3,31 77.7,40.7 71,37.1 60.1,44 56.5,29.5 50.7,42.1 36.2,42 c -2.8,0 -2.4,-2.9 0.5,-5.8 5.7,-6.3 16.8,-17 20.3,-20.7 3.6,-3.7 9.9,-3.6 13.5,0 z" /> - <path - style="opacity:0.21674876;fill:url(#radialGradient9177-1-9);fill-opacity:1;fill-rule:evenodd;stroke:none" - id="path8566" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" - d="m 113,203.5 c 0,0 3.34046,5.10071 3,7.5 -0.66817,4.70868 -10.80945,7.05842 -8.5625,11.25 2.21991,4.14114 10.22139,1.79405 16.9375,6.125 6.6875,4.3125 4.88949,13.10149 9.75,15.3125 9.47925,4.31205 34.375,-7.4375 33.125,-7.1875 -1.25,0.25 -24.57014,5.09545 -29.82014,0.84545 -5.98592,-4.84575 -7.70217,-8.23028 -12.11736,-11.09545 -4.13751,-2.68498 -9.94967,-3.78036 -11.30246,-5.97865 -1.35279,-2.19829 2.7092,-5.03469 2.98996,-9.27135 0.16862,-2.54442 -4,-7.5 -4,-7.5 z" /> - <path - style="opacity:0.27586209;fill:url(#radialGradient8574-0-2);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8732-3-0)" - id="path8718" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" - d="m 113,203.5 c 0,0 3.34046,5.10071 3,7.5 -0.66817,4.70868 -10.80945,7.05842 -8.5625,11.25 2.21991,4.14114 10.22139,1.79405 16.9375,6.125 6.6875,4.3125 4.88949,13.10149 9.75,15.3125 9.47925,4.31205 34.375,-7.4375 33.125,-7.1875 -41.33959,0.15736 -33.62485,-10.4946 -49.5625,-17.5 -2.30305,-1.0123 -0.96826,-3.76334 -0.6875,-8 0.16862,-2.54442 -4,-7.5 -4,-7.5 z" /> - <path - style="opacity:0.45320195;fill:url(#radialGradient8744-9-3);fill-opacity:1;fill-rule:evenodd;stroke:none" - id="path8736" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" - d="m 183.25,181.75 c 37.10371,-13.65459 49.02363,-15.53058 61.25,-27.75 -14.16069,11.95366 -44.09847,18.3658 -68.5,29 l 7.25,-1.25 z" /> - <path - style="opacity:0.51231528;fill:url(#radialGradient8768-6-5);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8764-9-6)" - id="path8746" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-14.791044)" - d="m 183.25,181.75 c 61.10371,-21.65459 50.77363,-21.53058 61.25,-27.75 -19.42769,7.43666 -55.73446,8.22981 -68.5,29 l 7.25,-1.25 z" /> - <path - style="opacity:0.2857143;fill:url(#linearGradient8912-9-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8864" - transform="matrix(0.5296484,0,0,0.5296484,-12.384318,-14.791044)" - d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" /> - <path - style="opacity:0.62068942;fill:url(#linearGradient8910-3-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8906-3-7);enable-background:accumulate" - id="path8874" - transform="matrix(0.7131486,0,0,1.1407811,-54.577902,-134.95502)" - d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" /> - <path - style="fill:url(#radialGradient8922-9-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980-1-06)" - id="path8914" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-14.238677)" - d="m 214.125,203.75 c 3.76948,3.48424 24.75576,5.27219 28.1875,-1 -6.73663,4.7839 -21.71677,3.10264 -28.1875,1 z" /> - <path - style="opacity:0.2857143;fill:url(#linearGradient8990-4-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8984" - transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,5.7547955,30.286555)" - d="m 236.44594,199.0625 a 6.5084434,3.0820823 0 1 1 -13.01688,0 6.5084434,3.0820823 0 1 1 13.01688,0 z" /> - <path - style="opacity:0.62068942;fill:url(#linearGradient8992-2-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8906-3-7);enable-background:accumulate" - id="path8986" - transform="matrix(0.2750159,-0.1394397,0.5158824,1.0174708,-65.353496,-69.300635)" - d="m 236.99305,199.0625 a 7.0555515,2.1400476 0 1 1 -14.1111,0 7.0555515,2.1400476 0 1 1 14.1111,0 z" /> - <path - style="fill:url(#radialGradient8994-0-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980-1-06)" - id="path8988" - transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,6.2599008,30.649764)" - d="m 217.05754,201.94027 c 3.76948,3.48424 26.97122,8.91123 25.25496,0.80973 -3.31737,5.32326 -18.78423,1.29291 -25.25496,-0.80973 z" /> - <path - style="fill:url(#radialGradient9004-6-9);fill-opacity:1;fill-rule:evenodd;stroke:none" - id="path8996" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" - d="m 68.25,186 c 0,-0.62057 38.84622,11.83854 45.5,18.5 -5.47122,-5.33854 -33.159709,-17.61609 -37.375,-17.75 -4.215291,-0.13391 -7.625,-0.5 -8.125,-0.75 z" /> - <g - id="g9018" - transform="matrix(0.8790148,-0.1929959,0.2338341,0.6959295,-20.209533,36.725557)"> + d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" + id="use7639-7" + style="fill:none" + inkscape:connector-curvature="0" /> + <use + transform="matrix(0.9905442,0,0,0.9905442,0.6051535,0.604136)" + clip-path="url(#clipPath9086-1-5)" + id="use7641-0" + style="opacity:0.66995072;fill:url(#linearGradient9175);filter:url(#filter8490-0-0)" + x="0" + y="0" + width="400" + height="300" + xlink:href="#outline1-2" /> + <path + d="M 16.565217,57.039374 C 5.3632748,68.140398 25.042362,65.011927 40.180121,70.966113 L 71.464824,15.965587 c -4.743164,-4.844083 -10.798268,-4.44041 -15.137759,0 L 16.565217,57.039374 Z" + id="path7643-5" + style="opacity:0.50526315;fill:url(#shinySpecular-0-4);stroke:none" + inkscape:connector-curvature="0" /> + <path + d="m 70.5,15.5 16.3,16.6 c 1.5,1.5 1.5,4.6 0.6,5.5 L 79.3,31 77.7,40.7 71,37.1 60.1,44 56.5,29.5 50.7,42.1 36.2,42 c -2.8,0 -2.4,-2.9 0.5,-5.8 5.7,-6.3 16.8,-17 20.3,-20.7 3.6,-3.7 9.9,-3.6 13.5,0 z" + id="icecap-3" + style="fill:url(#IcecapTip-0-3)" + inkscape:connector-curvature="0" /> + <path + d="m 113,203.5 c 0,0 3.34046,5.10071 3,7.5 -0.66817,4.70868 -10.80945,7.05842 -8.5625,11.25 2.21991,4.14114 10.22139,1.79405 16.9375,6.125 6.6875,4.3125 4.88949,13.10149 9.75,15.3125 9.47925,4.31205 34.375,-7.4375 33.125,-7.1875 -1.25,0.25 -24.57014,5.09545 -29.82014,0.84545 -5.98592,-4.84575 -7.70217,-8.23028 -12.11736,-11.09545 -4.13751,-2.68498 -9.94967,-3.78036 -11.30246,-5.97865 -1.35279,-2.19829 2.7092,-5.03469 2.98996,-9.27135 0.16862,-2.54442 -4,-7.5 -4,-7.5 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" + id="path8566-7" + style="opacity:0.21674876;fill:url(#radialGradient9177-1-7);fill-opacity:1;fill-rule:evenodd;stroke:none" + inkscape:connector-curvature="0" /> + <path + d="m 113,203.5 c 0,0 3.34046,5.10071 3,7.5 -0.66817,4.70868 -10.80945,7.05842 -8.5625,11.25 2.21991,4.14114 10.22139,1.79405 16.9375,6.125 6.6875,4.3125 4.88949,13.10149 9.75,15.3125 9.47925,4.31205 34.375,-7.4375 33.125,-7.1875 -41.33959,0.15736 -33.62485,-10.4946 -49.5625,-17.5 -2.30305,-1.0123 -0.96826,-3.76334 -0.6875,-8 0.16862,-2.54442 -4,-7.5 -4,-7.5 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" + id="path8718-6" + style="opacity:0.27586209;fill:url(#radialGradient8574-0-1);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8732-3-8)" + inkscape:connector-curvature="0" /> + <path + d="m 183.25,181.75 c 37.10371,-13.65459 49.02363,-15.53058 61.25,-27.75 -14.16069,11.95366 -44.09847,18.3658 -68.5,29 l 7.25,-1.25 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" + id="path8736-9" + style="opacity:0.45320195;fill:url(#radialGradient8744-9-7);fill-opacity:1;fill-rule:evenodd;stroke:none" + inkscape:connector-curvature="0" /> + <path + d="m 183.25,181.75 c 61.10371,-21.65459 50.77363,-21.53058 61.25,-27.75 -19.42769,7.43666 -55.73446,8.22981 -68.5,29 l 7.25,-1.25 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-14.791044)" + id="path8746-3" + style="opacity:0.51231528;fill:url(#radialGradient8768-6-2);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8764-9-3)" + inkscape:connector-curvature="0" /> + <path + d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" + transform="matrix(0.5296484,0,0,0.5296484,-12.384318,-14.791044)" + id="path8864-0" + style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient8912-9-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" + transform="matrix(0.7131486,0,0,1.1407811,-54.577902,-134.95502)" + id="path8874-9" + style="display:inline;overflow:visible;visibility:visible;opacity:0.62068936;fill:url(#linearGradient8910-3-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906-3-4);enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 214.125,203.75 c 3.76948,3.48424 24.75576,5.27219 28.1875,-1 -6.73663,4.7839 -21.71677,3.10264 -28.1875,1 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-14.238677)" + id="path8914-1" + style="fill:url(#radialGradient8922-9-3);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980-1-63)" + inkscape:connector-curvature="0" /> + <path + d="m 236.44594,199.0625 a 6.5084434,3.0820823 0 1 1 -13.01688,0 6.5084434,3.0820823 0 1 1 13.01688,0 z" + transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,5.7547955,30.286555)" + id="path8984-2" + style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient8990-4-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 236.99305,199.0625 a 7.0555515,2.1400476 0 1 1 -14.1111,0 7.0555515,2.1400476 0 1 1 14.1111,0 z" + transform="matrix(0.2750159,-0.1394397,0.5158824,1.0174708,-65.353496,-69.300635)" + id="path8986-0" + style="display:inline;overflow:visible;visibility:visible;opacity:0.62068936;fill:url(#linearGradient8992-2-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906-3-4);enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 217.05754,201.94027 c 3.76948,3.48424 26.97122,8.91123 25.25496,0.80973 -3.31737,5.32326 -18.78423,1.29291 -25.25496,-0.80973 z" + transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,6.2599008,30.649764)" + id="path8988-7" + style="fill:url(#radialGradient8994-0-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980-1-63)" + inkscape:connector-curvature="0" /> + <path + d="m 68.25,186 c 0,-0.62057 38.84622,11.83854 45.5,18.5 -5.47122,-5.33854 -33.159709,-17.61609 -37.375,-17.75 -4.215291,-0.13391 -7.625,-0.5 -8.125,-0.75 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" + id="path8996-6" + style="fill:url(#radialGradient9004-6-0);fill-opacity:1;fill-rule:evenodd;stroke:none" + inkscape:connector-curvature="0" /> + <g + transform="matrix(0.8790148,-0.1929959,0.2338341,0.6959295,-20.209533,36.725557)" + id="g9018-6"> + <path + d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" + transform="matrix(0.5296484,0,0,0.5296484,-84.4165,-4.7277245)" + id="path9006-8" + style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient9023-6-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" + transform="matrix(0.7131486,0,0,1.1407811,-126.61008,-124.8917)" + id="path9008-0" + style="display:inline;overflow:visible;visibility:visible;opacity:0.62068936;fill:url(#linearGradient9025-1-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906-3-4);enable-background:accumulate" + inkscape:connector-curvature="0" /> + </g> + <path + d="m 80.5,220.0625 c 0,0 2.10339,5.65078 7.875,5.9375 5.83887,0.29006 12.50324,-7.00698 13.0625,-9.625 -1,2.25 -6.590334,9.03328 -13.8125,8.9375 -4.099862,-0.0544 -7.125,-5.25 -7.125,-5.25 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.622949,-14.42691)" + id="path9038-1" + style="opacity:0.61576353;fill:url(#radialGradient9046-1-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter9068-2-2)" + inkscape:connector-curvature="0" /> + <path + d="m 63.40625,10.21875 c -3.098181,0 -6.134601,1.122042 -8.28125,3.3125 l -41.1875,42.1875 c -3.76562,3.76562 -4.6702413,6.23069 -4.4375,7.625 0.1163706,0.697155 0.4585994,1.303027 1.1875,1.9375 0.728901,0.634473 1.831495,1.256389 3.15625,1.8125 2.649511,1.112222 6.217961,2.008085 9.71875,2.96875 3.500789,0.960665 6.929812,1.974626 9.53125,3.625 0.396623,0.258266 0.769088,0.576468 1.03125,1.03125 0.262162,0.454782 0.354216,1.056088 0.25,1.5625 -0.208431,1.012824 -0.83202,1.546985 -1.46875,2.03125 -1.27346,0.96853 -3.023257,1.773229 -4.78125,2.625 -1.757993,0.851771 -3.524925,1.723242 -4.40625,2.4375 -0.440663,0.357129 -0.600112,0.678133 -0.59375,0.65625 0.0064,-0.02188 -0.116851,-0.273101 0.09375,-0.0625 0.551764,0.56709 2.274075,1.538165 4.46875,2.40625 2.194675,0.868085 4.88065,1.745624 7.59375,2.625 2.7131,0.879376 5.4575,1.749959 7.78125,2.65625 2.32375,0.906291 4.217694,1.748944 5.46875,3 0.622681,0.639978 1.062632,1.435956 1.15625,2.25 0.09362,0.814044 -0.126809,1.578032 -0.4375,2.21875 -0.621382,1.28144 -1.620313,2.26719 -2.53125,3.21875 -0.910938,0.95156 -1.736226,1.86034 -2.03125,2.46875 -0.147512,0.3042 -0.170347,0.50242 -0.15625,0.625 0.0141,0.12258 0.03518,0.24623 0.3125,0.53125 A 1.4566768,1.4566768 0 0 1 44.875,106 c 1.193594,1.2618 3.787002,1.43924 6.71875,2.125 1.465874,0.34288 2.998909,0.86196 4.3125,2 1.313591,1.13804 2.299435,2.87059 2.71875,5.21875 0.176459,0.99459 0.702722,1.4788 1.96875,1.875 1.266028,0.3962 3.194353,0.46554 5.3125,0.15625 4.236295,-0.61859 9.260035,-2.69532 12.15625,-5.09375 0.17999,-0.15299 0.129956,-0.11255 0.1875,-0.1875 -0.194805,-0.13939 -0.651644,-0.43652 -1.40625,-0.8125 -0.891527,-0.4442 -1.944708,-0.85956 -2.75,-1.875 -0.402646,-0.50772 -0.679877,-1.30934 -0.5625,-2.09375 0.117377,-0.78441 0.546832,-1.43702 1.125,-2.03125 4.745751,-4.79848 9.421937,-5.944136 12.9375,-6.875 1.757782,-0.465432 3.229292,-0.891233 4.34375,-1.59375 1.114458,-0.702517 1.98508,-1.663728 2.71875,-3.53125 0.08087,-0.202174 0.07855,-0.260846 -0.03125,-0.5 C 94.515197,92.542096 94.220541,92.159521 93.75,91.75 92.808918,90.930959 91.239577,90.050804 89.6875,89.1875 88.135423,88.324196 86.627034,87.519262 85.53125,86.5 84.983358,85.990369 84.409233,85.348367 84.34375,84.375 84.27827,83.401633 84.916318,82.523367 85.65625,82 88.401968,80.06679 92.552528,78.595094 97.0625,77.03125 101.57247,75.467406 106.42363,73.849125 110.375,72 c 3.95137,-1.849125 6.85729,-3.978669 7.78125,-6.125 0.46198,-1.073165 0.54663,-2.158606 0.0625,-3.5625 -0.48413,-1.403894 -1.58958,-3.120831 -3.5625,-5.09375 L 72,13.5625 c -0.01071,-0.0101 -0.02051,-0.02119 -0.03125,-0.03125 -2.357722,-2.207738 -5.478371,-3.3125 -8.5625,-3.3125 z m 45.9375,80 c -2.63522,0.09513 -5.05952,1.301393 -6.09375,3.1875 0.29381,0.110524 0.55838,0.234969 1.03125,0.34375 1.37562,0.316455 3.29543,0.520736 5.1875,0.5625 1.89207,0.04176 3.78415,-0.117472 4.9375,-0.4375 0.50487,-0.14009 0.77236,-0.281778 0.90625,-0.375 -0.2558,-1.091098 -0.86487,-1.862126 -1.90625,-2.4375 -1.07862,-0.595951 -2.55669,-0.898111 -4.0625,-0.84375 z m -70.5,9.0625 c -2.089872,-0.145348 -4.716548,0.686551 -6,1.71875 -0.641726,0.5161 -0.913269,0.99441 -0.9375,1.3125 -0.02423,0.31809 0.07726,0.74199 0.9375,1.46875 a 1.4566768,1.4566768 0 0 1 0,0.0312 c 1.352809,1.17 2.882256,1.04802 4.625,0.0937 1.460951,-0.79997 2.757201,-2.30075 3.625,-3.875 -0.585032,-0.377341 -1.284532,-0.682853 -2.25,-0.75 z m 61,0.625 c -0.447303,0.5686 -0.690902,1.09797 -0.71875,1.46875 -0.03844,0.51176 0.106611,0.90723 0.5,1.28125 0.73729,0.70099 2.33912,1.00278 3.96875,0.125 -0.0322,-0.1891 -0.0933,-0.47591 -0.34375,-0.84375 -0.4999,-0.73414 -1.6686,-1.5251 -3.40625,-2.03125 z" + id="87235-3" + style="fill:none;stroke:url(#radialGradient11553-3-1);stroke-width:0.48830673;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter9298-4-5)" + inkscape:connector-curvature="0" /> + <path + d="m 95.5,172 c -5.090606,1.50191 -21.592018,7.73713 -19.25,12.5 2.243595,4.56272 40.61138,6.40132 46.5,20 2.5679,5.93009 -5.89238,10.40326 -3.75,16.5 1.64973,4.69477 14.41196,16.49084 22.48603,22.06781 6.33298,4.37435 14.65096,-3.52244 11.26397,-10.06781 -5.39589,-10.42759 18.44266,-23.19912 29.25,-29 6.30524,-3.38436 -13,-20 -13,-20 0,0 -73.5,-12 -73.5,-12 z" + transform="matrix(0.4883067,0,0,0.4883067,-5.8104012,-7.7042521)" + id="path5897-0" + style="opacity:0.32512315;fill:url(#linearGradient5905-4-7);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5983-8-5)" + inkscape:connector-curvature="0" /> + <path + d="m 41.742167,78.533037 c 2.231933,1.639226 6.636757,0.650538 9.282124,1.841759 6.349518,2.859218 14.154941,6.045427 12.718568,0.404555 0,0 -1.615771,1.342042 -1.615771,1.342042 0,0 -0.03153,-2.557545 -0.03153,-2.557545 0,0 -3.751977,0.916294 -3.751977,0.916294 0,0 -2.906173,-2.332759 -4.238526,-3.101995 -0.27829,-0.160669 -1.707695,1.292815 -1.707695,1.292815 0,0 -0.25697,-1.543804 -0.25697,-1.543804 -1.857372,-0.197638 -3.696159,-0.284805 -5.31515,-0.271821 -3.880942,0.03112 -6.499059,0.637741 -5.083074,1.6777 z" + id="path5783-7" + style="fill:url(#linearGradient5801-2-8);fill-opacity:1;fill-rule:evenodd;stroke:none" + inkscape:connector-curvature="0" /> + <path + d="m 182.75,187.25 c -1.75981,6.4783 21.62776,15.27989 19.875,19.75 -3.85895,9.84158 -24.97596,3.13755 -41.125,23.75 -2.31318,2.95251 3.25,13.5 2.5,12.25 -0.75,-1.25 -6.4649,-9.96285 -5,-14.25 4.59417,-13.44525 49.0128,-18.45749 40.875,-24.875 -4.67988,-3.69058 -21.50546,-13.88721 -17.125,-16.625 z" + transform="matrix(0.4883067,0,0,0.4883067,-5.8104012,-7.7042521)" + id="path5803-5" + style="opacity:0.47783251;fill:url(#radialGradient5811-3-0);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5845-5-1)" + inkscape:connector-curvature="0" /> + <path + d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" + transform="matrix(0.4883067,0,0,0.4883067,-6.3597463,-8.0094438)" + id="path6041-9" + style="display:inline;overflow:visible;visibility:visible;opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" + transform="matrix(0.3096579,0,0,0.4883067,27.528443,1.5735759)" + id="path6043-3" + style="display:inline;overflow:visible;visibility:visible;opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" + transform="matrix(0.5478563,0,0,0.4883067,-92.102233,1.115795)" + id="path6045-5" + style="display:inline;overflow:visible;visibility:visible;opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> <path - style="opacity:0.2857143;fill:url(#linearGradient9023-6-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path9006" - transform="matrix(0.5296484,0,0,0.5296484,-84.4165,-4.7277245)" - d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" /> + d="m 36.672282,76.528654 c -7.152988,4.424107 -18.274031,6.034229 -6.103834,8.972635 -1.449712,-3.2281 3.138581,-2.872021 6.103834,-8.972635 z" + id="path5049-8" + style="display:inline;overflow:visible;visibility:visible;opacity:0.25123153;fill:url(#linearGradient5822-7-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.04789329;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> <path - style="opacity:0.62068942;fill:url(#linearGradient9025-1-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8906-3-7);enable-background:accumulate" - id="path9008" - transform="matrix(0.7131486,0,0,1.1407811,-126.61008,-124.8917)" - d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" /> + d="m 8.8342799,171.64721 c 0,0 22.5917801,-2.12795 27.8180201,-8.64645 3.05755,-3.81358 -12.15146,-8.2638 -8.86827,-12 12.35008,-14.0541 22.73076,-13.46729 37.05025,-19.35355 14.31949,-5.88626 9.03544,-8.76906 4.40381,-11.35355 -7.9325,-4.4264 -25.58722,-9.14237 -19.74696,-19.64645 5.87688,-10.569936 57.34315,-25.249996 57.34315,-25.249996 15.59619,-5.32843 13.63909,-14.96447 6,-23 l -46,-45.7499997 c 0,0 2.28296,43.3886497 -7,61.9999997 -11.4715,22.99914 -72.54408,48.661766 -47,51.499996 9,1 13.32065,4.0705 17,11 7.57631,14.26883 -21.0000001,40.5 -21.0000001,40.5 z" + transform="matrix(0.48830674,0,0,0.48830674,57.750397,32.997477)" + id="path10207-0" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36315792;fill:url(#linearGradient1539-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter10997-7-2-1);enable-background:accumulate" + inkscape:connector-curvature="0" /> </g> - <path - style="opacity:0.61576353;fill:url(#radialGradient9046-1-0);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter9068-2-7)" - id="path9038" - transform="matrix(0.5296484,0,0,0.5296484,-11.622949,-14.42691)" - d="m 80.5,220.0625 c 0,0 2.10339,5.65078 7.875,5.9375 5.83887,0.29006 12.50324,-7.00698 13.0625,-9.625 -1,2.25 -6.590334,9.03328 -13.8125,8.9375 -4.099862,-0.0544 -7.125,-5.25 -7.125,-5.25 z" /> - <path - style="fill:none;stroke:url(#radialGradient11553-3-4);stroke-width:0.48830673;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter9298-4-2)" - id="87235" - d="m 63.40625,10.21875 c -3.098181,0 -6.134601,1.122042 -8.28125,3.3125 l -41.1875,42.1875 c -3.76562,3.76562 -4.6702413,6.23069 -4.4375,7.625 0.1163706,0.697155 0.4585994,1.303027 1.1875,1.9375 0.728901,0.634473 1.831495,1.256389 3.15625,1.8125 2.649511,1.112222 6.217961,2.008085 9.71875,2.96875 3.500789,0.960665 6.929812,1.974626 9.53125,3.625 0.396623,0.258266 0.769088,0.576468 1.03125,1.03125 0.262162,0.454782 0.354216,1.056088 0.25,1.5625 -0.208431,1.012824 -0.83202,1.546985 -1.46875,2.03125 -1.27346,0.96853 -3.023257,1.773229 -4.78125,2.625 -1.757993,0.851771 -3.524925,1.723242 -4.40625,2.4375 -0.440663,0.357129 -0.600112,0.678133 -0.59375,0.65625 0.0064,-0.02188 -0.116851,-0.273101 0.09375,-0.0625 0.551764,0.56709 2.274075,1.538165 4.46875,2.40625 2.194675,0.868085 4.88065,1.745624 7.59375,2.625 2.7131,0.879376 5.4575,1.749959 7.78125,2.65625 2.32375,0.906291 4.217694,1.748944 5.46875,3 0.622681,0.639978 1.062632,1.435956 1.15625,2.25 0.09362,0.814044 -0.126809,1.578032 -0.4375,2.21875 -0.621382,1.28144 -1.620313,2.26719 -2.53125,3.21875 -0.910938,0.95156 -1.736226,1.86034 -2.03125,2.46875 -0.147512,0.3042 -0.170347,0.50242 -0.15625,0.625 0.0141,0.12258 0.03518,0.24623 0.3125,0.53125 A 1.4566768,1.4566768 0 0 1 44.875,106 c 1.193594,1.2618 3.787002,1.43924 6.71875,2.125 1.465874,0.34288 2.998909,0.86196 4.3125,2 1.313591,1.13804 2.299435,2.87059 2.71875,5.21875 0.176459,0.99459 0.702722,1.4788 1.96875,1.875 1.266028,0.3962 3.194353,0.46554 5.3125,0.15625 4.236295,-0.61859 9.260035,-2.69532 12.15625,-5.09375 0.17999,-0.15299 0.129956,-0.11255 0.1875,-0.1875 -0.194805,-0.13939 -0.651644,-0.43652 -1.40625,-0.8125 -0.891527,-0.4442 -1.944708,-0.85956 -2.75,-1.875 -0.402646,-0.50772 -0.679877,-1.30934 -0.5625,-2.09375 0.117377,-0.78441 0.546832,-1.43702 1.125,-2.03125 4.745751,-4.79848 9.421937,-5.944136 12.9375,-6.875 1.757782,-0.465432 3.229292,-0.891233 4.34375,-1.59375 1.114458,-0.702517 1.98508,-1.663728 2.71875,-3.53125 0.08087,-0.202174 0.07855,-0.260846 -0.03125,-0.5 C 94.515197,92.542096 94.220541,92.159521 93.75,91.75 92.808918,90.930959 91.239577,90.050804 89.6875,89.1875 88.135423,88.324196 86.627034,87.519262 85.53125,86.5 84.983358,85.990369 84.409233,85.348367 84.34375,84.375 84.27827,83.401633 84.916318,82.523367 85.65625,82 88.401968,80.06679 92.552528,78.595094 97.0625,77.03125 101.57247,75.467406 106.42363,73.849125 110.375,72 c 3.95137,-1.849125 6.85729,-3.978669 7.78125,-6.125 0.46198,-1.073165 0.54663,-2.158606 0.0625,-3.5625 -0.48413,-1.403894 -1.58958,-3.120831 -3.5625,-5.09375 L 72,13.5625 c -0.01071,-0.0101 -0.02051,-0.02119 -0.03125,-0.03125 -2.357722,-2.207738 -5.478371,-3.3125 -8.5625,-3.3125 z m 45.9375,80 c -2.63522,0.09513 -5.05952,1.301393 -6.09375,3.1875 0.29381,0.110524 0.55838,0.234969 1.03125,0.34375 1.37562,0.316455 3.29543,0.520736 5.1875,0.5625 1.89207,0.04176 3.78415,-0.117472 4.9375,-0.4375 0.50487,-0.14009 0.77236,-0.281778 0.90625,-0.375 -0.2558,-1.091098 -0.86487,-1.862126 -1.90625,-2.4375 -1.07862,-0.595951 -2.55669,-0.898111 -4.0625,-0.84375 z m -70.5,9.0625 c -2.089872,-0.145348 -4.716548,0.686551 -6,1.71875 -0.641726,0.5161 -0.913269,0.99441 -0.9375,1.3125 -0.02423,0.31809 0.07726,0.74199 0.9375,1.46875 a 1.4566768,1.4566768 0 0 1 0,0.0312 c 1.352809,1.17 2.882256,1.04802 4.625,0.0937 1.460951,-0.79997 2.757201,-2.30075 3.625,-3.875 -0.585032,-0.377341 -1.284532,-0.682853 -2.25,-0.75 z m 61,0.625 c -0.447303,0.5686 -0.690902,1.09797 -0.71875,1.46875 -0.03844,0.51176 0.106611,0.90723 0.5,1.28125 0.73729,0.70099 2.33912,1.00278 3.96875,0.125 -0.0322,-0.1891 -0.0933,-0.47591 -0.34375,-0.84375 -0.4999,-0.73414 -1.6686,-1.5251 -3.40625,-2.03125 z" /> - <path - style="opacity:0.32512315;fill:url(#linearGradient5905-4-0);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5983-8-5)" - id="path5897" - transform="matrix(0.4883067,0,0,0.4883067,-5.8104012,-7.7042521)" - d="m 95.5,172 c -5.090606,1.50191 -21.592018,7.73713 -19.25,12.5 2.243595,4.56272 40.61138,6.40132 46.5,20 2.5679,5.93009 -5.89238,10.40326 -3.75,16.5 1.64973,4.69477 14.41196,16.49084 22.48603,22.06781 6.33298,4.37435 14.65096,-3.52244 11.26397,-10.06781 -5.39589,-10.42759 18.44266,-23.19912 29.25,-29 6.30524,-3.38436 -13,-20 -13,-20 0,0 -73.5,-12 -73.5,-12 z" /> - <path - style="fill:url(#linearGradient5801-2-0);fill-opacity:1;fill-rule:evenodd;stroke:none" - id="path5783" - d="m 41.742167,78.533037 c 2.231933,1.639226 6.636757,0.650538 9.282124,1.841759 6.349518,2.859218 14.154941,6.045427 12.718568,0.404555 0,0 -1.615771,1.342042 -1.615771,1.342042 0,0 -0.03153,-2.557545 -0.03153,-2.557545 0,0 -3.751977,0.916294 -3.751977,0.916294 0,0 -2.906173,-2.332759 -4.238526,-3.101995 -0.27829,-0.160669 -1.707695,1.292815 -1.707695,1.292815 0,0 -0.25697,-1.543804 -0.25697,-1.543804 -1.857372,-0.197638 -3.696159,-0.284805 -5.31515,-0.271821 -3.880942,0.03112 -6.499059,0.637741 -5.083074,1.6777 z" /> - <path - style="opacity:0.47783251;fill:url(#radialGradient5811-3-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5845-5-6)" - id="path5803" - transform="matrix(0.4883067,0,0,0.4883067,-5.8104012,-7.7042521)" - d="m 182.75,187.25 c -1.75981,6.4783 21.62776,15.27989 19.875,19.75 -3.85895,9.84158 -24.97596,3.13755 -41.125,23.75 -2.31318,2.95251 3.25,13.5 2.5,12.25 -0.75,-1.25 -6.4649,-9.96285 -5,-14.25 4.59417,-13.44525 49.0128,-18.45749 40.875,-24.875 -4.67988,-3.69058 -21.50546,-13.88721 -17.125,-16.625 z" /> - <path - style="opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6041" - transform="matrix(0.4883067,0,0,0.4883067,-6.3597463,-8.0094438)" - d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" /> - <path - style="opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6043" - transform="matrix(0.3096579,0,0,0.4883067,27.528443,1.5735759)" - d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" /> - <path - style="opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6045" - transform="matrix(0.5478563,0,0,0.4883067,-92.102233,1.115795)" - d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" /> - <path - style="opacity:0.25123153;fill:url(#linearGradient5822-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.04789329;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path5049" - d="m 36.672282,76.528654 c -7.152988,4.424107 -18.274031,6.034229 -6.103834,8.972635 -1.449712,-3.2281 3.138581,-2.872021 6.103834,-8.972635 z" /> - <path - style="opacity:0.36315792;color:#000000;fill:url(#linearGradient1539-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter10997-7-2-5);enable-background:accumulate" - id="path10207" - transform="matrix(0.48830674,0,0,0.48830674,57.750397,32.997477)" - d="m 8.8342799,171.64721 c 0,0 22.5917801,-2.12795 27.8180201,-8.64645 3.05755,-3.81358 -12.15146,-8.2638 -8.86827,-12 12.35008,-14.0541 22.73076,-13.46729 37.05025,-19.35355 14.31949,-5.88626 9.03544,-8.76906 4.40381,-11.35355 -7.9325,-4.4264 -25.58722,-9.14237 -19.74696,-19.64645 5.87688,-10.569936 57.34315,-25.249996 57.34315,-25.249996 15.59619,-5.32843 13.63909,-14.96447 6,-23 l -46,-45.7499997 c 0,0 2.28296,43.3886497 -7,61.9999997 -11.4715,22.99914 -72.54408,48.661766 -47,51.499996 9,1 13.32065,4.0705 17,11 7.57631,14.26883 -21.0000001,40.5 -21.0000001,40.5 z" /> </g> + <g + id="g4453" + transform="translate(0,-92)"> + <text + sodipodi:linespacing="125%" + id="text4431" + y="56.595001" + x="113.27875" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:33.75px;line-height:125%;font-family:Calluna;-inkscape-font-specification:Calluna;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="56.595001" + x="113.27875" + id="tspan4433" + sodipodi:role="line">INKSCAPE</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4443" + y="84.804001" + x="144.53799" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="84.804001" + x="144.53799" + id="tspan4445" + sodipodi:role="line">Draw Freely.</tspan></text> + </g> + <g + style="display:inline" + id="g4485"> + <rect + y="162" + x="32" + height="1" + width="960" + id="rect4461" + style="opacity:1;fill:#262626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + rx="10" + y="110" + x="32" + height="52" + width="960" + id="rect4459" + style="opacity:1;fill:url(#linearGradient4475);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + style="opacity:1;fill:url(#linearGradient4483);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4463" + width="960" + height="42" + x="32" + y="120" /> + </g> + <g + id="g4543"> + <rect + y="110" + x="113" + height="52" + width="1" + id="rect4531" + style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + style="opacity:1;fill:#5a5a5a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4533" + width="1" + height="52" + x="114" + y="110" /> + </g> + <g + style="display:inline" + id="g4649"> + <rect + y="733" + x="32" + height="4" + width="960" + id="rect4625" + style="opacity:1;fill:#0d0d0d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + y="737" + x="32" + height="50" + width="960" + id="rect4629" + style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + rx="10" + style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4627" + width="960" + height="60" + x="32" + y="737" /> + <rect + y="737" + x="32" + height="60" + width="960" + id="rect4631" + style="opacity:1;fill:url(#radialGradient4639);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + rx="10" /> + </g> + <use + style="display:inline" + transform="matrix(0.5,0,0,0.5,32,-8)" + height="100%" + width="100%" + id="use4705" + xlink:href="#g17092" + y="0" + x="0" /> + <rect + style="display:inline;opacity:1;fill:url(#linearGradient4681);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4669" + width="1024" + height="75" + x="0" + y="0" /> + <rect + y="163" + x="32" + height="100" + width="960" + id="rect4693" + style="display:inline;opacity:1;fill:url(#linearGradient4703);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> </g> - <style - id="style26" - type="text/css" /> - <style - id="style26-8" - type="text/css" /> </svg> diff --git a/packaging/macosx/dmg_set_style.scpt b/packaging/macosx/dmg_set_style.scpt index 7c010d102..b27a6860d 100755 Binary files a/packaging/macosx/dmg_set_style.scpt and b/packaging/macosx/dmg_set_style.scpt differ diff --git a/packaging/macosx/inkscape.ds_store b/packaging/macosx/inkscape.ds_store index c4bc9e32d..469da6fcc 100644 Binary files a/packaging/macosx/inkscape.ds_store and b/packaging/macosx/inkscape.ds_store differ -- cgit v1.2.3 From 227f79fc1b58498aa302b7fe3ab33c1131693d44 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 14 Sep 2014 01:16:58 +0200 Subject: partial cleanup of dmg_background.svg (bzr r13506.1.92) --- packaging/macosx/dmg_background.svg | 56 +------------------------------------ 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/packaging/macosx/dmg_background.svg b/packaging/macosx/dmg_background.svg index 8cd35504a..a62beb370 100644 --- a/packaging/macosx/dmg_background.svg +++ b/packaging/macosx/dmg_background.svg @@ -14,7 +14,7 @@ height="800" id="svg13532" version="1.1" - inkscape:version="0.91pre2 r13550 custom" + inkscape:version="0.91pre2 r13554 custom" viewBox="0 0 1280 800" sodipodi:docname="dmg_background.svg"> <defs @@ -129,28 +129,6 @@ offset="1" id="stop5785" /> </linearGradient> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath14931"> - <rect - style="opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" - id="rect14933" - width="1024" - height="676" - x="0" - y="0" /> - </clipPath> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath14935"> - <rect - y="178" - x="0" - height="676" - width="1024" - id="rect14937" - style="opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> - </clipPath> <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient5785-8-9" @@ -656,38 +634,6 @@ </cc:Work> </rdf:RDF> </metadata> - <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="website screenshot" - style="display:none" - sodipodi:insensitive="true"> - <g - id="g14939"> - <image - sodipodi:absref="/Users/su_v/TEMP/inkscape-repo/osx-packaging-update-quartz/packaging/macosx/_work/inkscape-org-screenshot-upper.png" - xlink:href="_work/inkscape-org-screenshot-upper.png" - y="-127" - x="-57" - id="image14889" - style="image-rendering:optimizeSpeed" - preserveAspectRatio="none" - height="882" - width="1138" - clip-path="url(#clipPath14931)" /> - <image - sodipodi:absref="/Users/su_v/TEMP/inkscape-repo/osx-packaging-update-quartz/packaging/macosx/_work/inkscape-org-screenshot-lower.png" - xlink:href="_work/inkscape-org-screenshot-lower.png" - y="51" - x="-57" - id="image14919" - style="opacity:1;image-rendering:optimizeSpeed" - preserveAspectRatio="none" - height="882" - width="1138" - clip-path="url(#clipPath14935)" /> - </g> - </g> <g inkscape:groupmode="layer" id="layer3" -- cgit v1.2.3 From c6d1127fb74dcb9379929e3ec3b6d139f88010c2 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 14 Sep 2014 19:03:34 +0200 Subject: Instructions for setting up build env: sudo with redirection fails, use workaround (bzr r13506.1.93) --- packaging/macosx/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt index d6aa0b9f4..31b4247f9 100644 --- a/packaging/macosx/README.txt +++ b/packaging/macosx/README.txt @@ -18,7 +18,7 @@ $ (cd ports && portindex) 5) add default variants for x11-based package to MacPorts' global variants: -$ sudo echo '+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' >> "$MP_PREFIX/etc/macports/variants.conf" +$ sudo bash -c "echo '+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' >> \"$MP_PREFIX/etc/macports/variants.conf\"" 6) install required dependencies: -- cgit v1.2.3 From 595bb8fcfa8f6245c61d0ee40f79dae5c16798df Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 14 Sep 2014 20:32:47 +0200 Subject: packaging: don't rely on 'uname -a' for build_arch (instead use same tests as MacPorts internally) (bzr r13506.1.94) --- packaging/macosx/osx-app.sh | 18 +++++++++++++++++- packaging/macosx/osx-build.sh | 34 +++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 753ae64bc..8318f9761 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -280,6 +280,21 @@ OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)" OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)" ARCH="$(uname -a | awk '{print $NF;}')" +# guess default build_arch (MacPorts) +if [ "$OSXMINORNO" -ge "6" ]; then + _cpu_bits="$(sysctl hw.cpu64bit_capable > /dev/null 2>&1)" + if [ $? -eq 0 ]; then + _build_arch="x86_64" + else + _build_arch="i386" + fi +else + if [ $ARCH = "powerpc" ]; then + _build_arch="ppc" + else + _build_arch="i386" + fi +fi # Setup #---------------------------------------------------------- @@ -504,7 +519,8 @@ if [ ${add_python} = "true" ]; then $cp_cmd -rf "$python_dir"/* "$pkglib" fi fi -sed -e "s,__build_arch__,$ARCH,g" -i "" "$scrpath" + +sed -e "s,__build_arch__,$_build_arch,g" -i "" "$scrpath" # PkgInfo must match bundle type and creator code from Info.plist echo "APPLInks" > $package/Contents/PkgInfo diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 802d96017..84a0d0ba9 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -172,6 +172,22 @@ ARCH="$(uname -a | awk '{print $NF;}')" # MacPorts for dependencies [[ -x $LIBPREFIX/bin/port && -d $LIBPREFIX/etc/macports ]] && use_port="t" +# guess default build_arch (MacPorts) +if [ "$OSXMINORNO" -ge "6" ]; then + _cpu_bits="$(sysctl hw.cpu64bit_capable > /dev/null 2>&1)" + if [ $? -eq 0 ]; then + _build_arch="x86_64" + else + _build_arch="i386" + fi +else + if [ $ARCH = "powerpc" ]; then + _build_arch="ppc" + else + _build_arch="i386" + fi +fi + # GTK+ backend gtk_target="$(pkg-config --variable=target gtk+-2.0 2>/dev/null)" @@ -198,7 +214,7 @@ elif [ "$OSXMINORNO" -eq "5" ]; then TARGETVERSION="10.5" export CC="/usr/bin/gcc-4.2" export CXX="/usr/bin/g++-4.2" - export CLAGS="$CFLAGS -arch $ARCH" + #export CLAGS="$CFLAGS -arch $_build_arch" export CXXFLAGS="$CFLAGS" CONFFLAGS="--disable-openmp $CONFFLAGS" elif [ "$OSXMINORNO" -eq "6" ]; then @@ -207,7 +223,7 @@ elif [ "$OSXMINORNO" -eq "6" ]; then TARGETVERSION="10.6" export CC="/usr/bin/llvm-gcc-4.2" export CXX="/usr/bin/llvm-g++-4.2" - export CLAGS="$CFLAGS -arch $ARCH" + #export CLAGS="$CFLAGS -arch $_build_arch" export CXXFLAGS="$CFLAGS" CONFFLAGS="--disable-openmp $CONFFLAGS" elif [ "$OSXMINORNO" -eq "7" ]; then @@ -216,7 +232,7 @@ elif [ "$OSXMINORNO" -eq "7" ]; then TARGETVERSION="10.7" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" - export CLAGS="$CFLAGS -arch $ARCH" + #export CLAGS="$CFLAGS -arch $_build_arch" export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11 elif [ "$OSXMINORNO" -eq "8" ]; then ## Apple's clang on Mountain Lion @@ -224,7 +240,7 @@ elif [ "$OSXMINORNO" -eq "8" ]; then TARGETVERSION="10.8" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" - export CLAGS="$CFLAGS -arch $ARCH" + #export CLAGS="$CFLAGS -arch $_build_arch" export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libstdc++" elif [ "$OSXMINORNO" -eq "9" ]; then ## Apple's clang on Mavericks @@ -232,7 +248,7 @@ elif [ "$OSXMINORNO" -eq "9" ]; then TARGETVERSION="10.9" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" - export CLAGS="$CFLAGS -arch $ARCH" + #export CLAGS="$CFLAGS -arch $_build_arch" export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" elif [ "$OSXMINORNO" -eq "10" ]; then ## Apple's clang on Yosemite @@ -240,7 +256,7 @@ elif [ "$OSXMINORNO" -eq "10" ]; then TARGETVERSION="10.10" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" - export CLAGS="$CFLAGS -arch $ARCH" + #export CLAGS="$CFLAGS -arch $_build_arch" export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION" echo " Inkscape packaging has not been tested on ${TARGETNAME}." @@ -250,7 +266,7 @@ else # if [ "$OSXMINORNO" -ge "11" ]; then TARGETVERSION="10.XX" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" - export CLAGS="$CFLAGS -arch $ARCH" + #export CLAGS="$CFLAGS -arch $_build_arch" export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION" echo " Inkscape packaging has not been tested on this unknown version of OS X (${OSXVERSION})." @@ -266,7 +282,7 @@ function getinkscapeinfo () { REVISION="$(bzr revno 2>/dev/null)" [ $? -ne 0 ] && REVISION="" || REVISION="-r$REVISION" - TARGETARCH="$ARCH" + TARGETARCH="$_build_arch" NEWNAME="Inkscape-$INKVERSION$REVISION-$gtk_target-$TARGETVERSION-$TARGETARCH" DMGFILE="$NEWNAME.dmg" INFOFILE="$NEWNAME-info.txt" @@ -323,7 +339,7 @@ function buildinfofile () { Architecture $TARGETARCH Build system information: OS X Version $OSXVERSION - Architecture $ARCH + Architecture $_build_arch MacPorts Ver $(port version 2>/dev/null | cut -f2 -d \ ) Compiler $($CXX --version | head -1) GTK+ backend $gtk_target -- cgit v1.2.3 From db956ebd6ec994674645cb88d2dfc819d7da2cd6 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 14 Sep 2014 22:15:13 +0200 Subject: fix flawed test for cpu capability (r13600) (bzr r13506.1.95) --- packaging/macosx/osx-app.sh | 3 +-- packaging/macosx/osx-build.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 8318f9761..9a3478e67 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -282,8 +282,7 @@ ARCH="$(uname -a | awk '{print $NF;}')" # guess default build_arch (MacPorts) if [ "$OSXMINORNO" -ge "6" ]; then - _cpu_bits="$(sysctl hw.cpu64bit_capable > /dev/null 2>&1)" - if [ $? -eq 0 ]; then + if [ "$(sysctl hw.cpu64bit_capable 2>/dev/null | awk '{print $NF;}')" = "1" ]; then _build_arch="x86_64" else _build_arch="i386" diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 84a0d0ba9..ececf11cb 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -174,8 +174,7 @@ ARCH="$(uname -a | awk '{print $NF;}')" # guess default build_arch (MacPorts) if [ "$OSXMINORNO" -ge "6" ]; then - _cpu_bits="$(sysctl hw.cpu64bit_capable > /dev/null 2>&1)" - if [ $? -eq 0 ]; then + if [ "$(sysctl hw.cpu64bit_capable 2>/dev/null | awk '{print $NF;}')" = "1" ]; then _build_arch="x86_64" else _build_arch="i386" -- cgit v1.2.3 From 635a3f0c8ad8ca3bd62f3a227801cddcf77c4da6 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 14 Sep 2014 22:47:03 +0200 Subject: simplify test (note to self: always consult the man page before pushing a commit ... ) (bzr r13506.1.96) --- packaging/macosx/osx-app.sh | 2 +- packaging/macosx/osx-build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 9a3478e67..520f2f0f4 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -282,7 +282,7 @@ ARCH="$(uname -a | awk '{print $NF;}')" # guess default build_arch (MacPorts) if [ "$OSXMINORNO" -ge "6" ]; then - if [ "$(sysctl hw.cpu64bit_capable 2>/dev/null | awk '{print $NF;}')" = "1" ]; then + if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then _build_arch="x86_64" else _build_arch="i386" diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index ececf11cb..5db991f1f 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -174,7 +174,7 @@ ARCH="$(uname -a | awk '{print $NF;}')" # guess default build_arch (MacPorts) if [ "$OSXMINORNO" -ge "6" ]; then - if [ "$(sysctl hw.cpu64bit_capable 2>/dev/null | awk '{print $NF;}')" = "1" ]; then + if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then _build_arch="x86_64" else _build_arch="i386" -- cgit v1.2.3 From 67be86628796a35cdef5b5b543b5e4661f7a416c Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Tue, 16 Sep 2014 18:22:35 +0200 Subject: ports: maintain current ports for python25 and py25-* modules for packaging locally (support will likely be removed in upstream MacPorts) (bzr r13506.1.98) --- packaging/macosx/ports/lang/python25/Portfile | 214 ++++ .../ports/lang/python25/files/_localemodule.c.ed | 2 + .../macosx/ports/lang/python25/files/locale.py.ed | 2 + .../ports/lang/python25/files/patch-64bit.diff | 1234 ++++++++++++++++++++ .../lang/python25/files/patch-FSIORefNum.diff | 11 + .../lang/python25/files/patch-Lib-cgi.py.diff | 18 + .../files/patch-Lib-distutils-dist.py.diff | 51 + .../lang/python25/files/patch-Makefile.pre.in.diff | 49 + .../python25/files/patch-Misc-setuid-prog.c.diff | 16 + .../files/patch-Modules-posixmodule.c.diff | 21 + .../ports/lang/python25/files/patch-configure.diff | 45 + .../ports/lang/python25/files/patch-fwrapv.diff | 12 + .../ports/lang/python25/files/patch-libedit.diff | 132 +++ .../ports/lang/python25/files/patch-mac_ver.diff | 114 ++ .../lang/python25/files/patch-pyconfig.h.in.diff | 13 + .../files/patch-setup.py-disabled_modules.diff | 11 + .../ports/lang/python25/files/patch-setup.py.diff | 80 ++ .../macosx/ports/lang/python25/files/pyconfig.ed | 2 + .../lang/python25/files/pyconfig.h-universal.ed | 50 + .../macosx/ports/lang/python25/files/python25 | 13 + packaging/macosx/ports/lang/python26/Portfile | 2 +- packaging/macosx/ports/python/py25-Pillow/Portfile | 8 +- packaging/macosx/ports/python/py25-lxml/Portfile | 51 + packaging/macosx/ports/python/py25-nose/Portfile | 86 ++ .../ports/python/py25-nose/files/nosetests24 | 1 + .../ports/python/py25-nose/files/nosetests25 | 1 + .../ports/python/py25-nose/files/nosetests26 | 1 + .../ports/python/py25-nose/files/nosetests27 | 1 + .../ports/python/py25-nose/files/nosetests31 | 1 + .../ports/python/py25-nose/files/nosetests32 | 1 + .../ports/python/py25-nose/files/nosetests33 | 1 + .../ports/python/py25-nose/files/nosetests34 | 1 + packaging/macosx/ports/python/py25-numpy/Portfile | 7 +- .../macosx/ports/python/py25-setuptools/Portfile | 58 + 34 files changed, 2303 insertions(+), 7 deletions(-) create mode 100644 packaging/macosx/ports/lang/python25/Portfile create mode 100644 packaging/macosx/ports/lang/python25/files/_localemodule.c.ed create mode 100644 packaging/macosx/ports/lang/python25/files/locale.py.ed create mode 100644 packaging/macosx/ports/lang/python25/files/patch-64bit.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-configure.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-libedit.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff create mode 100644 packaging/macosx/ports/lang/python25/files/patch-setup.py.diff create mode 100644 packaging/macosx/ports/lang/python25/files/pyconfig.ed create mode 100644 packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed create mode 100644 packaging/macosx/ports/lang/python25/files/python25 create mode 100644 packaging/macosx/ports/python/py25-lxml/Portfile create mode 100644 packaging/macosx/ports/python/py25-nose/Portfile create mode 100644 packaging/macosx/ports/python/py25-nose/files/nosetests24 create mode 100644 packaging/macosx/ports/python/py25-nose/files/nosetests25 create mode 100644 packaging/macosx/ports/python/py25-nose/files/nosetests26 create mode 100644 packaging/macosx/ports/python/py25-nose/files/nosetests27 create mode 100644 packaging/macosx/ports/python/py25-nose/files/nosetests31 create mode 100644 packaging/macosx/ports/python/py25-nose/files/nosetests32 create mode 100644 packaging/macosx/ports/python/py25-nose/files/nosetests33 create mode 100644 packaging/macosx/ports/python/py25-nose/files/nosetests34 create mode 100644 packaging/macosx/ports/python/py25-setuptools/Portfile diff --git a/packaging/macosx/ports/lang/python25/Portfile b/packaging/macosx/ports/lang/python25/Portfile new file mode 100644 index 000000000..a27bdaf64 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/Portfile @@ -0,0 +1,214 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 104926 2013-04-05 04:43:09Z larryv@macports.org $ + +PortSystem 1.0 +PortGroup select 1.0 + +name python25 +version 2.5.6 +revision 100 + +set branch [join [lrange [split ${version} .] 0 1] .] +categories lang +license PSF +platforms darwin +maintainers nomaintainer + +description An interpreted, object-oriented programming language +long_description Python is an interpreted, interactive, object-oriented \ + programming language. + +homepage http://www.python.org/ +master_sites http://ftp.python.org/ftp/python/${version}/ + +distname Python-${version} +use_bzip2 yes + +checksums md5 5d45979c5f30fb2dd5f067c6b06b88e4 \ + sha1 29f6dd41bf09c5e04311b367cbb7604fa016e699 \ + rmd160 92f0a955971f187a7d50c6422168202ec551bf22 + +# patch-Lib-distutils-dist.py.diff comes from +# <http://bugs.python.org/issue1180> +patchfiles patch-Makefile.pre.in.diff \ + patch-Lib-cgi.py.diff \ + patch-Lib-distutils-dist.py.diff \ + patch-setup.py.diff \ + patch-configure.diff \ + patch-64bit.diff \ + patch-setup.py-disabled_modules.diff \ + patch-mac_ver.diff \ + patch-libedit.diff \ + patch-fwrapv.diff + +depends_lib port:gettext port:zlib port:openssl \ + port:sqlite3 port:db46 port:bzip2 \ + port:libedit port:ncurses +depends_run port:python_select + +configure.args --enable-shared \ + --enable-framework=${frameworks_dir} \ + --mandir=${prefix}/share/man \ + --enable-ipv6 \ + --with-cxx=${configure.cxx} + +post-patch { + reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py \ + ${worksrcpath}/setup.py + reinplace "s|/Applications/MacPython|${applications_dir}/MacPython|g" \ + ${worksrcpath}/Mac/Makefile.in \ + ${worksrcpath}/Mac/IDLE/Makefile.in \ + ${worksrcpath}/Mac/Tools/Doc/setup.py \ + ${worksrcpath}/Mac/PythonLauncher/Makefile.in \ + ${worksrcpath}/Mac/BuildScript/build-installer.py + reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \ + ${worksrcpath}/Mac/PythonLauncher/Makefile.in + reinplace "s|__BUILD_ARCH__|${build_arch}|" ${worksrcpath}/configure + reinplace "s|__UNIVERSAL_CFLAGS__|${configure.universal_cflags}|" ${worksrcpath}/configure + reinplace "s|__UNIVERSAL_LDFLAGS__|${configure.universal_ldflags}|" \ + ${worksrcpath}/configure \ + ${worksrcpath}/Makefile.pre.in + + # http://trac.macports.org/ticket/21517 + system -W ${worksrcpath} "ed - Modules/_localemodule.c < ${filespath}/_localemodule.c.ed" + system -W ${worksrcpath} "ed - Lib/locale.py < ${filespath}/locale.py.ed" +} + +build.target all + +# TODO: From python24, do we still need this? +# Workaround for case-sensitive file systems +post-build { + if { ![file exists ${worksrcpath}/python.exe] } { + ln -s python ${worksrcpath}/python.exe + } +} + +test.run yes +test.target test + +destroot.target frameworkinstall maninstall + +# ensure that correct compiler is used +build.args-append MAKE="${build.cmd}" CC="${configure.cc}" +destroot.args-append MAKE="${destroot.cmd}" CC="${configure.cc}" + +select.group python +select.file ${filespath}/python[string map {. {}} ${branch}] + +notes " +To make python ${branch} the default (i.e. the version you get when you run\ +'python'), please run: + +sudo port select --set ${select.group} [file tail ${select.file}] +" + +platform macosx { +post-destroot { + + set framewpath ${frameworks_dir}/Python.framework + set framewdir ${framewpath}/Versions/${branch} + + # Without this, LINKFORSHARED is set to + # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) + # (this becomes Python.framework/Versions/2.5/Python) which doesn't + # quite work (see ticket #15099); instead specifically list the + # full path to the proper Python framework file (which becomes + # ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/Python) + reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile + + foreach dir { lib include } { + file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir} + ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch} + } + ln -s ${prefix}/share ${destroot}${framewdir}/share + + ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib + + file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1 + + # delete symlinks without version suffix, use python_select instead to choose version + foreach bin { python pythonw idle pydoc smtpd.py python-config } { + file delete ${destroot}${prefix}/bin/${bin} + } + foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py python${branch}-config] { + file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin + ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin} + } + + foreach dir { Headers Resources Python Versions/Current } { + file delete ${destroot}${framewpath}/${dir} + } + + # Fix incorrectly-pointed libpython2.5.a symlink, see + # http://trac.macports.org/ticket/19906 + set python_staticlink ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a + file delete ${python_staticlink} + ln -s ${framewdir}/Python ${python_staticlink} +} +} + +platform darwin { + post-configure { + # See http://trac.macports.org/ticket/18376 + system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed" + } + if {${os.major} >= 10} { + configure.cppflags-append -D_DARWIN_C_SOURCE + patchfiles-append patch-pyconfig.h.in.diff + } + post-patch { + if {![file exists /usr/lib/libSystemStubs.a]} { + reinplace s/-lSystemStubs//g ${worksrcpath}/configure + } + } + post-destroot { + # remove -arch flags from the config + reinplace -E {s|-arch [a-z0-9_]+||g} \ + ${destroot}${prefix}/lib/python${branch}/config/Makefile + } +} + +platform darwin 8 { + patchfiles-append patch-FSIORefNum.diff +} + +platform darwin 9 { + configure.cppflags-append -D__DARWIN_UNIX03 +} + +platform puredarwin { + patchfiles-append patch-Modules-posixmodule.c.diff + configure.args-delete --enable-framework=${frameworks_dir} + configure.args-append --disable-toolbox-glue --disable-framework + destroot.target install maninstall + +post-build { + # thin dynamic library to have the same arch as static lib, even after -lSystemStubs + system "lipo ${worksrcpath}/libpython${branch}.dylib -output ${worksrcpath}/libpython${branch}.dylib -thin `lipo -info ${worksrcpath}/libpython${branch}.a | tail -n 1 | sed -e 's/.*architecture: \\(.*\\)/\\1/'`" +} + +post-destroot { + # delete symlinks without version suffix, use python_select instead to choose version + foreach bin { python pythonw idle pydoc smtpd.py python-config } { + file delete ${destroot}${prefix}/bin/${bin} + } + + file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1 +} +} + +variant universal { + if {${configure.sdkroot} == ""} { + configure.args-append --enable-universalsdk=/ + } else { + configure.args-append --enable-universalsdk=${configure.sdkroot} + } + post-configure { + system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed" + } +} + +livecheck.type regex +livecheck.url ${homepage}download/releases/ +livecheck.regex Python (${branch}.\[0-9\]+) diff --git a/packaging/macosx/ports/lang/python25/files/_localemodule.c.ed b/packaging/macosx/ports/lang/python25/files/_localemodule.c.ed new file mode 100644 index 000000000..d4617a931 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/_localemodule.c.ed @@ -0,0 +1,2 @@ +g/defined(__APPLE__)/s//0/g +w diff --git a/packaging/macosx/ports/lang/python25/files/locale.py.ed b/packaging/macosx/ports/lang/python25/files/locale.py.ed new file mode 100644 index 000000000..0bdbf3ea0 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/locale.py.ed @@ -0,0 +1,2 @@ +g/'darwin', /s/// +w diff --git a/packaging/macosx/ports/lang/python25/files/patch-64bit.diff b/packaging/macosx/ports/lang/python25/files/patch-64bit.diff new file mode 100644 index 000000000..100617df6 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-64bit.diff @@ -0,0 +1,1234 @@ +--- Include/pymactoolbox.h.orig 2004-11-05 18:02:59.000000000 +1100 ++++ Include/pymactoolbox.h 2009-09-10 18:08:58.000000000 +1000 +@@ -8,7 +8,9 @@ + #endif + + #include <Carbon/Carbon.h> ++#ifndef __LP64__ + #include <QuickTime/QuickTime.h> ++#endif /* !__LP64__ */ + + /* + ** Helper routines for error codes and such. +@@ -18,8 +20,10 @@ + PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */ + PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */ + PyObject *PyMac_Error(OSErr); /* Uses PyMac_GetOSErrException */ ++#ifndef __LP64__ + extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert + fsspec->path */ ++#endif /* !__LP64__ */ + /* + ** These conversion routines are defined in mactoolboxglue.c itself. + */ +@@ -83,9 +87,10 @@ + #endif /* USE_TOOLBOX_OBJECT_GLUE */ + + /* macfs exports */ ++#ifndef __LP64__ + int PyMac_GetFSSpec(PyObject *, FSSpec *); /* argument parser for FSSpec */ + PyObject *PyMac_BuildFSSpec(FSSpec *); /* Convert FSSpec to PyObject */ +- ++#endif /* !__LP64__ */ + int PyMac_GetFSRef(PyObject *, FSRef *); /* argument parser for FSRef */ + PyObject *PyMac_BuildFSRef(FSRef *); /* Convert FSRef to PyObject */ + +@@ -101,39 +106,54 @@ + extern int CmpInstObj_Convert(PyObject *, ComponentInstance *); + + /* Ctl exports */ ++#ifndef __LP64__ + extern PyObject *CtlObj_New(ControlHandle); + extern int CtlObj_Convert(PyObject *, ControlHandle *); ++#endif /* !__LP64__ */ + + /* Dlg exports */ ++#ifndef __LP64__ + extern PyObject *DlgObj_New(DialogPtr); + extern int DlgObj_Convert(PyObject *, DialogPtr *); + extern PyObject *DlgObj_WhichDialog(DialogPtr); ++#endif /* !__LP64__ */ + + /* Drag exports */ ++#ifndef __LP64__ + extern PyObject *DragObj_New(DragReference); + extern int DragObj_Convert(PyObject *, DragReference *); ++#endif /* !__LP64__ */ + + /* List exports */ ++#ifndef __LP64__ + extern PyObject *ListObj_New(ListHandle); + extern int ListObj_Convert(PyObject *, ListHandle *); ++#endif /* !__LP64__ */ + + /* Menu exports */ ++#ifndef __LP64__ + extern PyObject *MenuObj_New(MenuHandle); + extern int MenuObj_Convert(PyObject *, MenuHandle *); ++#endif /* !__LP64__ */ + + /* Qd exports */ ++#ifndef __LP64__ + extern PyObject *GrafObj_New(GrafPtr); + extern int GrafObj_Convert(PyObject *, GrafPtr *); + extern PyObject *BMObj_New(BitMapPtr); + extern int BMObj_Convert(PyObject *, BitMapPtr *); + extern PyObject *QdRGB_New(RGBColor *); + extern int QdRGB_Convert(PyObject *, RGBColor *); ++#endif /* !__LP64__ */ + + /* Qdoffs exports */ ++#ifndef __LP64__ + extern PyObject *GWorldObj_New(GWorldPtr); + extern int GWorldObj_Convert(PyObject *, GWorldPtr *); ++#endif /* !__LP64__ */ + + /* Qt exports */ ++#ifndef __LP64__ + extern PyObject *TrackObj_New(Track); + extern int TrackObj_Convert(PyObject *, Track *); + extern PyObject *MovieObj_New(Movie); +@@ -146,6 +166,7 @@ + extern int UserDataObj_Convert(PyObject *, UserData *); + extern PyObject *MediaObj_New(Media); + extern int MediaObj_Convert(PyObject *, Media *); ++#endif /* !__LP64__ */ + + /* Res exports */ + extern PyObject *ResObj_New(Handle); +@@ -154,13 +175,17 @@ + extern int OptResObj_Convert(PyObject *, Handle *); + + /* TE exports */ ++#ifndef __LP64__ + extern PyObject *TEObj_New(TEHandle); + extern int TEObj_Convert(PyObject *, TEHandle *); ++#endif /* !__LP64__ */ + + /* Win exports */ ++#ifndef __LP64__ + extern PyObject *WinObj_New(WindowPtr); + extern int WinObj_Convert(PyObject *, WindowPtr *); + extern PyObject *WinObj_WhichWindow(WindowPtr); ++#endif /* !__LP64__ */ + + /* CF exports */ + extern PyObject *CFObj_New(CFTypeRef); +--- Python/mactoolboxglue.c.orig 2006-07-12 02:44:25.000000000 +1000 ++++ Python/mactoolboxglue.c 2009-09-10 19:26:39.000000000 +1000 +@@ -105,7 +105,7 @@ + return PyErr_Mac(PyMac_GetOSErrException(), err); + } + +- ++#ifndef __LP64__ + OSErr + PyMac_GetFullPathname(FSSpec *fss, char *path, int len) + { +@@ -153,6 +153,7 @@ + Py_XDECREF(fs); + return err; + } ++#endif /* !__LP64__ */ + + /* Convert a 4-char string object argument to an OSType value */ + int +@@ -417,6 +418,7 @@ + GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs") + GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs") + ++#ifndef __LP64__ + GLUE_NEW(Track, TrackObj_New, "Carbon.Qt") + GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt") + GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt") +@@ -429,6 +431,7 @@ + GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt") + GLUE_NEW(Media, MediaObj_New, "Carbon.Qt") + GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt") ++#endif /* !__LP64__ */ + + GLUE_NEW(Handle, ResObj_New, "Carbon.Res") + GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res") +--- Modules/_ctypes/libffi/src/darwin/ffitarget.h.orig 2006-05-26 07:58:05.000000000 +1000 ++++ Modules/_ctypes/libffi/src/darwin/ffitarget.h 2009-09-10 20:15:39.000000000 +1000 +@@ -4,7 +4,7 @@ + * created by configure). This makes is possible to build a univeral binary + * of ctypes in one go. + */ +-#if defined(__i386__) ++#if defined(__i386__) || defined(__x86_64__) + + #ifndef X86_DARWIN + #define X86_DARWIN +@@ -13,7 +13,7 @@ + + #include "../src/x86/ffitarget.h" + +-#elif defined(__ppc__) ++#elif defined(__ppc__) || defined(__ppc64__) + + #ifndef POWERPC_DARWIN + #define POWERPC_DARWIN +--- Mac/Modules/res/_Resmodule.c.orig 2005-07-04 06:59:44.000000000 +1000 ++++ Mac/Modules/res/_Resmodule.c 2009-09-10 20:44:43.000000000 +1000 +@@ -414,6 +414,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -431,6 +432,7 @@ + return _res; + + } ++#endif /* !__LP64__ */ + + static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args) + { +@@ -501,10 +503,12 @@ + PyDoc_STR("(long newSize) -> None")}, + {"GetNextFOND", (PyCFunction)ResObj_GetNextFOND, 1, + PyDoc_STR("() -> (Handle _rv)")}, ++#ifndef __LP64__ + {"as_Control", (PyCFunction)ResObj_as_Control, 1, + PyDoc_STR("Return this resource/handle as a Control")}, + {"as_Menu", (PyCFunction)ResObj_as_Menu, 1, + PyDoc_STR("Return this resource/handle as a Menu")}, ++#endif /* !__LP64__ */ + {"LoadResource", (PyCFunction)ResObj_LoadResource, 1, + PyDoc_STR("() -> None")}, + {"AutoDispose", (PyCFunction)ResObj_AutoDispose, 1, +@@ -1152,6 +1156,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -1287,6 +1292,7 @@ + _res = Py_None; + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args) + { +@@ -1327,6 +1333,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -1413,6 +1420,7 @@ + nextRefNum); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args) + { +@@ -1438,6 +1446,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -1534,6 +1543,7 @@ + PyMac_BuildFSSpec, &newSpec); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args) + { +@@ -1637,6 +1647,7 @@ + PyDoc_STR("(short refNum) -> (short _rv)")}, + {"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1, + PyDoc_STR("(short refNum, short attrs) -> None")}, ++#ifndef __LP64__ + {"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1, + PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")}, + {"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1, +@@ -1647,10 +1658,12 @@ + PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")}, + {"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1, + PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")}, ++#endif /* !__LP64__ */ + {"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1, + PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")}, + {"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1, + PyDoc_STR("(SInt16 refNum) -> None")}, ++#ifndef __LP64__ + {"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1, + PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")}, + {"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1, +@@ -1659,14 +1672,17 @@ + PyDoc_STR("() -> (SInt16 refNum)")}, + {"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1, + PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")}, ++#endif /* !__LP64__ */ + {"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1, + PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")}, ++#ifndef __LP64__ + {"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1, + PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")}, + {"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1, + PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")}, + {"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1, + PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")}, ++#endif /* !__LP64__ */ + {"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1, + PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")}, + {"Handle", (PyCFunction)Res_Handle, 1, +--- Mac/Modules/MacOS.c.orig 2006-07-26 05:20:54.000000000 +1000 ++++ Mac/Modules/MacOS.c 2009-09-10 21:47:34.000000000 +1000 +@@ -54,7 +54,7 @@ + do_close(rfobject *self) + { + if (self->isclosed ) return; +- (void)FSClose(self->fRefNum); ++ (void)FSCloseFork(self->fRefNum); + self->isclosed = 1; + } + +@@ -68,6 +68,7 @@ + long n; + PyObject *v; + OSErr err; ++ ByteCount n2; + + if (self->isclosed) { + PyErr_SetString(PyExc_ValueError, "Operation on closed file"); +@@ -81,13 +82,13 @@ + if (v == NULL) + return NULL; + +- err = FSRead(self->fRefNum, &n, PyString_AsString(v)); ++ err = FSReadFork(self->fRefNum, fsAtMark, 0, n, PyString_AsString(v), &n2); + if (err && err != eofErr) { + PyMac_Error(err); + Py_DECREF(v); + return NULL; + } +- _PyString_Resize(&v, n); ++ _PyString_Resize(&v, n2); + return v; + } + +@@ -109,7 +110,7 @@ + } + if (!PyArg_ParseTuple(args, "s#", &buffer, &size)) + return NULL; +- err = FSWrite(self->fRefNum, &size, buffer); ++ err = FSWriteFork(self->fRefNum, fsAtMark, 0, size, buffer, NULL); + if (err) { + PyMac_Error(err); + return NULL; +@@ -126,9 +127,9 @@ + static PyObject * + rf_seek(rfobject *self, PyObject *args) + { +- long amount, pos; ++ long amount; + int whence = SEEK_SET; +- long eof; ++ int mode; + OSErr err; + + if (self->isclosed) { +@@ -138,35 +139,23 @@ + if (!PyArg_ParseTuple(args, "l|i", &amount, &whence)) + return NULL; + +- if ((err = GetEOF(self->fRefNum, &eof))) +- goto ioerr; +- + switch (whence) { + case SEEK_CUR: +- if ((err = GetFPos(self->fRefNum, &pos))) +- goto ioerr; ++ mode = fsFromMark; + break; + case SEEK_END: +- pos = eof; ++ mode = fsFromLEOF; + break; + case SEEK_SET: +- pos = 0; ++ mode = fsFromStart; + break; + default: + PyErr_BadArgument(); + return NULL; + } + +- pos += amount; +- +- /* Don't bother implementing seek past EOF */ +- if (pos > eof || pos < 0) { +- PyErr_BadArgument(); +- return NULL; +- } +- +- if ((err = SetFPos(self->fRefNum, fsFromStart, pos)) ) { +-ioerr: ++ err = FSSetForkPosition(self->fRefNum, mode, amount); ++ if (err != noErr) { + PyMac_Error(err); + return NULL; + } +@@ -182,7 +171,7 @@ + static PyObject * + rf_tell(rfobject *self, PyObject *args) + { +- long where; ++ long long where; + OSErr err; + + if (self->isclosed) { +@@ -191,11 +180,13 @@ + } + if (!PyArg_ParseTuple(args, "")) + return NULL; +- if ((err = GetFPos(self->fRefNum, &where)) ) { ++ ++ err = FSGetForkPosition(self->fRefNum, &where); ++ if (err != noErr) { + PyMac_Error(err); + return NULL; + } +- return PyInt_FromLong(where); ++ return PyLong_FromLongLong(where); + } + + static char rf_close__doc__[] = +@@ -292,17 +283,61 @@ + static PyObject * + MacOS_GetCreatorAndType(PyObject *self, PyObject *args) + { +- FSSpec fss; +- FInfo info; + PyObject *creator, *type, *res; + OSErr err; +- +- if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss)) ++ FSRef ref; ++ FSCatalogInfo cataloginfo; ++ FileInfo* finfo; ++ ++ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSRef, &ref)) { ++#ifndef __LP64__ ++ /* This function is documented to take an FSSpec as well, ++ * which only works in 32-bit mode. ++ */ ++ PyErr_Clear(); ++ FSSpec fss; ++ FInfo info; ++ ++ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss)) ++ return NULL; ++ ++ if ((err = FSpGetFInfo(&fss, &info)) != noErr) { ++ return PyErr_Mac(MacOS_Error, err); ++ } ++ creator = PyString_FromStringAndSize( ++ (char *)&info.fdCreator, 4); ++ type = PyString_FromStringAndSize((char *)&info.fdType, 4); ++ res = Py_BuildValue("OO", creator, type); ++ Py_DECREF(creator); ++ Py_DECREF(type); ++ return res; ++#else /* __LP64__ */ ++ return NULL; ++#endif /* __LP64__ */ ++ } ++ ++ err = FSGetCatalogInfo(&ref, ++ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo, ++ NULL, NULL, NULL); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, err); + return NULL; +- if ((err = FSpGetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); +- creator = PyString_FromStringAndSize((char *)&info.fdCreator, 4); +- type = PyString_FromStringAndSize((char *)&info.fdType, 4); ++ } ++ ++ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) { ++ /* Directory: doesn't have type/creator info. ++ * ++ * The specific error code is for backward compatibility with ++ * earlier versions. ++ */ ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ ++ } ++ finfo = (FileInfo*)&(cataloginfo.finderInfo); ++ creator = PyString_FromStringAndSize((char*)&(finfo->fileCreator), 4); ++ type = PyString_FromStringAndSize((char*)&(finfo->fileType), 4); ++ + res = Py_BuildValue("OO", creator, type); + Py_DECREF(creator); + Py_DECREF(type); +@@ -314,20 +349,66 @@ + static PyObject * + MacOS_SetCreatorAndType(PyObject *self, PyObject *args) + { +- FSSpec fss; + ResType creator, type; +- FInfo info; ++ FSRef ref; ++ FileInfo* finfo; + OSErr err; +- ++ FSCatalogInfo cataloginfo; ++ + if (!PyArg_ParseTuple(args, "O&O&O&", ++ PyMac_GetFSRef, &ref, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) { ++#ifndef __LP64__ ++ /* Try to handle FSSpec arguments, for backward compatibility */ ++ FSSpec fss; ++ FInfo info; ++ ++ if (!PyArg_ParseTuple(args, "O&O&O&", + PyMac_GetFSSpec, &fss, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) ++ return NULL; ++ ++ if ((err = FSpGetFInfo(&fss, &info)) != noErr) ++ return PyErr_Mac(MacOS_Error, err); ++ ++ info.fdCreator = creator; ++ info.fdType = type; ++ ++ if ((err = FSpSetFInfo(&fss, &info)) != noErr) ++ return PyErr_Mac(MacOS_Error, err); ++ Py_INCREF(Py_None); ++ return Py_None; ++#else /* __LP64__ */ ++ return NULL; ++#endif /* __LP64__ */ ++ } ++ ++ err = FSGetCatalogInfo(&ref, ++ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo, ++ NULL, NULL, NULL); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, err); + return NULL; +- if ((err = FSpGetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); +- info.fdCreator = creator; +- info.fdType = type; +- if ((err = FSpSetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); ++ } ++ ++ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) { ++ /* Directory: doesn't have type/creator info. ++ * ++ * The specific error code is for backward compatibility with ++ * earlier versions. ++ */ ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ ++ } ++ finfo = (FileInfo*)&(cataloginfo.finderInfo); ++ finfo->fileCreator = creator; ++ finfo->fileType = type; ++ ++ err = FSSetCatalogInfo(&ref, kFSCatInfoFinderInfo, &cataloginfo); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ } ++ + Py_INCREF(Py_None); + return Py_None; + } +@@ -399,6 +480,7 @@ + return Py_BuildValue("s", buf); + } + ++#ifndef __LP64__ + static char splash_doc[] = "Open a splash-screen dialog by resource-id (0=close)"; + + static PyObject * +@@ -470,6 +552,7 @@ + Py_INCREF(Py_None); + return Py_None; + } ++#endif /* !__LP64__ */ + + static char WMAvailable_doc[] = + "True if this process can interact with the display." +@@ -530,17 +613,18 @@ + { + OSErr err; + char *mode = "r"; +- FSSpec fss; +- SignedByte permission = 1; ++ FSRef ref; ++ SInt8 permission = fsRdPerm; + rfobject *fp; ++ HFSUniStr255 name; + +- if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSSpec, &fss, &mode)) ++ if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSRef, &ref, &mode)) + return NULL; + while (*mode) { + switch (*mode++) { + case '*': break; +- case 'r': permission = 1; break; +- case 'w': permission = 2; break; ++ case 'r': permission = fsRdPerm; break; ++ case 'w': permission = fsWrPerm; break; + case 'b': break; + default: + PyErr_BadArgument(); +@@ -548,33 +632,18 @@ + } + } + +- if ( (fp = newrfobject()) == NULL ) ++ err = FSGetResourceForkName(&name); ++ if (err != noErr) { ++ PyMac_Error(err); + return NULL; ++ } + +- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum); ++ if ( (fp = newrfobject()) == NULL ) ++ return NULL; ++ + +- if ( err == fnfErr ) { +- /* In stead of doing complicated things here to get creator/type +- ** correct we let the standard i/o library handle it +- */ +- FILE *tfp; +- char pathname[PATHNAMELEN]; +- +- if ( (err=PyMac_GetFullPathname(&fss, pathname, PATHNAMELEN)) ) { +- PyMac_Error(err); +- Py_DECREF(fp); +- return NULL; +- } +- +- if ( (tfp = fopen(pathname, "w")) == NULL ) { +- PyMac_Error(fnfErr); /* What else... */ +- Py_DECREF(fp); +- return NULL; +- } +- fclose(tfp); +- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum); +- } +- if ( err ) { ++ err = FSOpenFork(&ref, name.length, name.unicode, permission, &fp->fRefNum); ++ if (err != noErr) { + Py_DECREF(fp); + PyMac_Error(err); + return NULL; +@@ -589,10 +658,12 @@ + {"SetCreatorAndType", MacOS_SetCreatorAndType, 1, setcrtp_doc}, + {"GetErrorString", MacOS_GetErrorString, 1, geterr_doc}, + {"openrf", MacOS_openrf, 1, openrf_doc}, ++#ifndef __LP64__ + {"splash", MacOS_splash, 1, splash_doc}, + {"DebugStr", MacOS_DebugStr, 1, DebugStr_doc}, +- {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc}, + {"SysBeep", MacOS_SysBeep, 1, SysBeep_doc}, ++#endif /* !__LP64__ */ ++ {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc}, + {"WMAvailable", MacOS_WMAvailable, 1, WMAvailable_doc}, + {NULL, NULL} /* Sentinel */ + }; +--- Mac/Modules/file/_Filemodule.c.orig 2006-05-29 07:57:35.000000000 +1000 ++++ Mac/Modules/file/_Filemodule.c 2009-09-10 22:48:47.000000000 +1000 +@@ -18,9 +18,11 @@ + #include <Carbon/Carbon.h> + + #ifdef USE_TOOLBOX_OBJECT_GLUE ++#ifndef __LP64__ + extern int _PyMac_GetFSSpec(PyObject *v, FSSpec *spec); +-extern int _PyMac_GetFSRef(PyObject *v, FSRef *fsr); + extern PyObject *_PyMac_BuildFSSpec(FSSpec *spec); ++#endif /* !__LP64__ */ ++extern int _PyMac_GetFSRef(PyObject *v, FSRef *fsr); + extern PyObject *_PyMac_BuildFSRef(FSRef *spec); + + #define PyMac_GetFSSpec _PyMac_GetFSSpec +@@ -28,20 +30,26 @@ + #define PyMac_BuildFSSpec _PyMac_BuildFSSpec + #define PyMac_BuildFSRef _PyMac_BuildFSRef + #else ++#ifndef __LP64__ + extern int PyMac_GetFSSpec(PyObject *v, FSSpec *spec); +-extern int PyMac_GetFSRef(PyObject *v, FSRef *fsr); + extern PyObject *PyMac_BuildFSSpec(FSSpec *spec); ++#endif /* !__LP64__ */ ++extern int PyMac_GetFSRef(PyObject *v, FSRef *fsr); + extern PyObject *PyMac_BuildFSRef(FSRef *spec); + #endif + + /* Forward declarations */ ++#ifndef __LP64__ + static PyObject *FInfo_New(FInfo *itself); +-static PyObject *FSRef_New(FSRef *itself); + static PyObject *FSSpec_New(FSSpec *itself); ++#define FSSpec_Convert PyMac_GetFSSpec ++#endif /* !__LP64__ */ ++static PyObject *FSRef_New(FSRef *itself); + static PyObject *Alias_New(AliasHandle itself); ++#ifndef __LP64__ + static int FInfo_Convert(PyObject *v, FInfo *p_itself); ++#endif /* !__LP64__ */ + #define FSRef_Convert PyMac_GetFSRef +-#define FSSpec_Convert PyMac_GetFSSpec + static int Alias_Convert(PyObject *v, AliasHandle *p_itself); + + /* +@@ -62,6 +70,7 @@ + /* + ** Optional fsspec and fsref pointers. None will pass NULL + */ ++#ifndef __LP64__ + static int + myPyMac_GetOptFSSpecPtr(PyObject *v, FSSpec **spec) + { +@@ -71,6 +80,7 @@ + } + return PyMac_GetFSSpec(v, *spec); + } ++#endif /* !__LP64__ */ + + static int + myPyMac_GetOptFSRefPtr(PyObject *v, FSRef **ref) +@@ -92,6 +102,7 @@ + return Py_BuildValue("u#", itself->unicode, itself->length); + } + ++#ifndef __LP64__ + static OSErr + _PyMac_GetFullPathname(FSSpec *fss, char *path, int len) + { +@@ -135,6 +146,7 @@ + } + return 0; + } ++#endif /* !__LP64__ */ + + + static PyObject *File_Error; +@@ -282,12 +294,28 @@ + + static PyObject *FSCatalogInfo_get_permissions(FSCatalogInfoObject *self, void *closure) + { +- return Py_BuildValue("(llll)", self->ob_itself.permissions[0], self->ob_itself.permissions[1], self->ob_itself.permissions[2], self->ob_itself.permissions[3]); ++ FSPermissionInfo* info = (FSPermissionInfo*)&(self->ob_itself.permissions); ++ return Py_BuildValue("(llll)", info->userID, info->groupID, info->userAccess, info->mode); + } + + static int FSCatalogInfo_set_permissions(FSCatalogInfoObject *self, PyObject *v, void *closure) + { +- return PyArg_Parse(v, "(llll)", &self->ob_itself.permissions[0], &self->ob_itself.permissions[1], &self->ob_itself.permissions[2], &self->ob_itself.permissions[3])-1; ++ long userID; ++ long groupID; ++ long userAccess; ++ long mode; ++ int r; ++ ++ FSPermissionInfo* info = (FSPermissionInfo*)&(self->ob_itself.permissions); ++ ++ r = PyArg_Parse(v, "(llll)", &userID, &groupID, &userAccess, &mode); ++ if (!r) { ++ return -1; ++ } ++ info->userID = userID; ++ info->groupID = groupID; ++ info->userAccess = userAccess; ++ info->mode = mode; + return 0; + } + +@@ -501,6 +529,7 @@ + + /* ----------------------- Object type FInfo ------------------------ */ + ++#ifndef __LP64__ + static PyTypeObject FInfo_Type; + + #define FInfo_Check(x) ((x)->ob_type == &FInfo_Type || PyObject_TypeCheck((x), &FInfo_Type)) +@@ -682,6 +711,7 @@ + FInfo_tp_free, /* tp_free */ + }; + ++#endif /* !__LP64__ */ + /* --------------------- End object type FInfo ---------------------- */ + + +@@ -729,6 +759,7 @@ + self->ob_type->tp_free((PyObject *)self); + } + ++#ifndef __LP64__ + static PyObject *Alias_ResolveAlias(AliasObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -818,6 +849,7 @@ + wasChanged); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *Alias_FSResolveAliasWithMountFlags(AliasObject *_self, PyObject *_args) + { +@@ -891,6 +923,7 @@ + } + + static PyMethodDef Alias_methods[] = { ++#ifndef __LP64__ + {"ResolveAlias", (PyCFunction)Alias_ResolveAlias, 1, + PyDoc_STR("(FSSpec fromFile) -> (FSSpec target, Boolean wasChanged)")}, + {"GetAliasInfo", (PyCFunction)Alias_GetAliasInfo, 1, +@@ -899,6 +932,7 @@ + PyDoc_STR("(FSSpec fromFile, unsigned long mountFlags) -> (FSSpec target, Boolean wasChanged)")}, + {"FollowFinderAlias", (PyCFunction)Alias_FollowFinderAlias, 1, + PyDoc_STR("(FSSpec fromFile, Boolean logon) -> (FSSpec target, Boolean wasChanged)")}, ++#endif /* !__LP64__ */ + {"FSResolveAliasWithMountFlags", (PyCFunction)Alias_FSResolveAliasWithMountFlags, 1, + PyDoc_STR("(FSRef fromFile, unsigned long mountFlags) -> (FSRef target, Boolean wasChanged)")}, + {"FSResolveAlias", (PyCFunction)Alias_FSResolveAlias, 1, +@@ -1033,6 +1067,7 @@ + + + /* ----------------------- Object type FSSpec ----------------------- */ ++#ifndef __LP64__ + + static PyTypeObject FSSpec_Type; + +@@ -1488,6 +1523,7 @@ + FSSpec_tp_free, /* tp_free */ + }; + ++#endif /* !__LP64__ */ + /* --------------------- End object type FSSpec --------------------- */ + + +@@ -1568,7 +1604,9 @@ + FSCatalogInfoBitmap whichInfo; + FSCatalogInfo catalogInfo; + FSRef newRef; ++#ifndef __LP64__ + FSSpec newSpec; ++#endif /* !__LP64__ */ + if (!PyArg_ParseTuple(_args, "u#lO&", + &nameLength__in__, &nameLength__in_len__, + &whichInfo, +@@ -1580,11 +1618,20 @@ + whichInfo, + &catalogInfo, + &newRef, +- &newSpec); ++#ifndef __LP64__ ++ &newSpec ++#else ++ NULL ++#endif /* !__LP64__ */ ++ ); + if (_err != noErr) return PyMac_Error(_err); ++#ifndef __LP64__ + _res = Py_BuildValue("O&O&", + FSRef_New, &newRef, + FSSpec_New, &newSpec); ++#else ++ _res = Py_BuildValue("O&O", FSRef_New, &newRef, Py_None); ++#endif /* !__LP64__ */ + return _res; + } + +@@ -1598,7 +1645,9 @@ + FSCatalogInfoBitmap whichInfo; + FSCatalogInfo catalogInfo; + FSRef newRef; ++#ifndef __LP64__ + FSSpec newSpec; ++#endif /* !__LP64__ */ + UInt32 newDirID; + if (!PyArg_ParseTuple(_args, "u#lO&", + &nameLength__in__, &nameLength__in_len__, +@@ -1611,13 +1660,25 @@ + whichInfo, + &catalogInfo, + &newRef, ++#ifndef __LP64__ + &newSpec, ++#else ++ NULL, ++#endif /* !__LP64__ */ + &newDirID); + if (_err != noErr) return PyMac_Error(_err); ++ ++#ifndef __LP64__ + _res = Py_BuildValue("O&O&l", + FSRef_New, &newRef, + FSSpec_New, &newSpec, + newDirID); ++#else ++ _res = Py_BuildValue("O&Ol", ++ FSRef_New, &newRef, ++ Py_None, ++ newDirID); ++#endif /* !__LP64__ */ + return _res; + } + +@@ -1699,7 +1760,9 @@ + FSCatalogInfoBitmap whichInfo; + FSCatalogInfo catalogInfo; + HFSUniStr255 outName; ++#ifndef __LP64__ + FSSpec fsSpec; ++#endif /* !__LP64__ */ + FSRef parentRef; + if (!PyArg_ParseTuple(_args, "l", + &whichInfo)) +@@ -1708,14 +1771,26 @@ + whichInfo, + &catalogInfo, + &outName, ++#ifndef __LP64__ + &fsSpec, ++#else ++ NULL, ++#endif /* !__LP64__ */ + &parentRef); + if (_err != noErr) return PyMac_Error(_err); ++#ifndef __LP64__ + _res = Py_BuildValue("O&O&O&O&", + FSCatalogInfo_New, &catalogInfo, + PyMac_BuildHFSUniStr255, &outName, + FSSpec_New, &fsSpec, + FSRef_New, &parentRef); ++#else ++ _res = Py_BuildValue("O&O&OO&", ++ FSCatalogInfo_New, &catalogInfo, ++ PyMac_BuildHFSUniStr255, &outName, ++ Py_None, ++ FSRef_New, &parentRef); ++#endif /* !__LP64__ */ + return _res; + } + +@@ -1784,7 +1859,7 @@ + UniCharCount forkNameLength__len__; + int forkNameLength__in_len__; + SInt8 permissions; +- SInt16 forkRefNum; ++ FSIORefNum forkRefNum; + if (!PyArg_ParseTuple(_args, "u#b", + &forkNameLength__in__, &forkNameLength__in_len__, + &permissions)) +@@ -2034,7 +2109,7 @@ + + /* --------------------- End object type FSRef ---------------------- */ + +- ++#ifndef __LP64__ + static PyObject *File_UnmountVol(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -2562,6 +2637,7 @@ + FSSpec_New, &spec); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *File_FSGetForkPosition(PyObject *_self, PyObject *_args) + { +@@ -2785,6 +2861,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *File_NewAlias(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -2933,6 +3010,7 @@ + wasAliased); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *File_FSNewAlias(PyObject *_self, PyObject *_args) + { +@@ -3050,6 +3128,7 @@ + } + + static PyMethodDef File_methods[] = { ++#ifndef __LP64__ + {"UnmountVol", (PyCFunction)File_UnmountVol, 1, + PyDoc_STR("(Str63 volName, short vRefNum) -> None")}, + {"FlushVol", (PyCFunction)File_FlushVol, 1, +@@ -3100,6 +3179,7 @@ + PyDoc_STR("(short vRefNum, long dirID, Str255 oldName, long newDirID, Str255 newName) -> None")}, + {"FSMakeFSSpec", (PyCFunction)File_FSMakeFSSpec, 1, + PyDoc_STR("(short vRefNum, long dirID, Str255 fileName) -> (FSSpec spec)")}, ++#endif /* !__LP64__ */ + {"FSGetForkPosition", (PyCFunction)File_FSGetForkPosition, 1, + PyDoc_STR("(SInt16 forkRefNum) -> (SInt64 position)")}, + {"FSSetForkPosition", (PyCFunction)File_FSSetForkPosition, 1, +@@ -3124,6 +3204,7 @@ + PyDoc_STR("(UInt8 * path, FNMessage message, OptionBits flags) -> None")}, + {"FNNotifyAll", (PyCFunction)File_FNNotifyAll, 1, + PyDoc_STR("(FNMessage message, OptionBits flags) -> None")}, ++#ifndef __LP64__ + {"NewAlias", (PyCFunction)File_NewAlias, 1, + PyDoc_STR("(FSSpec fromFile, FSSpec target) -> (AliasHandle alias)")}, + {"NewAliasMinimalFromFullPath", (PyCFunction)File_NewAliasMinimalFromFullPath, 1, +@@ -3136,6 +3217,7 @@ + PyDoc_STR("(FSSpec fromFile, FSSpec target, AliasHandle alias) -> (Boolean wasChanged)")}, + {"ResolveAliasFileWithMountFlagsNoUI", (PyCFunction)File_ResolveAliasFileWithMountFlagsNoUI, 1, + PyDoc_STR("(FSSpec theSpec, Boolean resolveAliasChains, unsigned long mountFlags) -> (FSSpec theSpec, Boolean targetIsFolder, Boolean wasAliased)")}, ++#endif /* !__LP64__ */ + {"FSNewAlias", (PyCFunction)File_FSNewAlias, 1, + PyDoc_STR("(FSRef fromFile, FSRef target) -> (AliasHandle inAlias)")}, + {"FSResolveAliasFileWithMountFlags", (PyCFunction)File_FSResolveAliasFileWithMountFlags, 1, +@@ -3150,7 +3232,7 @@ + }; + + +- ++#ifndef __LP64__ + int + PyMac_GetFSSpec(PyObject *v, FSSpec *spec) + { +@@ -3188,12 +3270,15 @@ + } + return 0; + } ++#endif /* !__LP64__ */ + + int + PyMac_GetFSRef(PyObject *v, FSRef *fsr) + { + OSStatus err; ++#ifndef __LP64__ + FSSpec fss; ++#endif /* !__LP64__ */ + + if (FSRef_Check(v)) { + *fsr = ((FSRefObject *)v)->ob_itself; +@@ -3211,6 +3296,7 @@ + return !err; + } + /* XXXX Should try unicode here too */ ++#ifndef __LP64__ + /* Otherwise we try to go via an FSSpec */ + if (FSSpec_Check(v)) { + fss = ((FSSpecObject *)v)->ob_itself; +@@ -3219,15 +3305,18 @@ + PyMac_Error(err); + return 0; + } ++#endif /* !__LP64__ */ + PyErr_SetString(PyExc_TypeError, "FSRef, FSSpec or pathname required"); + return 0; + } + ++#ifndef __LP64__ + extern PyObject * + PyMac_BuildFSSpec(FSSpec *spec) + { + return FSSpec_New(spec); + } ++#endif /* !__LP64__ */ + + extern PyObject * + PyMac_BuildFSRef(FSRef *spec) +@@ -3242,10 +3331,11 @@ + PyObject *d; + + +- ++#ifndef __LP64__ + PyMac_INIT_TOOLBOX_OBJECT_NEW(FSSpec *, PyMac_BuildFSSpec); +- PyMac_INIT_TOOLBOX_OBJECT_NEW(FSRef *, PyMac_BuildFSRef); + PyMac_INIT_TOOLBOX_OBJECT_CONVERT(FSSpec, PyMac_GetFSSpec); ++#endif /* !__LP64__ */ ++ PyMac_INIT_TOOLBOX_OBJECT_NEW(FSRef *, PyMac_BuildFSRef); + PyMac_INIT_TOOLBOX_OBJECT_CONVERT(FSRef, PyMac_GetFSRef); + + +@@ -3262,6 +3352,7 @@ + /* Backward-compatible name */ + Py_INCREF(&FSCatalogInfo_Type); + PyModule_AddObject(m, "FSCatalogInfoType", (PyObject *)&FSCatalogInfo_Type); ++#ifndef __LP64__ + FInfo_Type.ob_type = &PyType_Type; + if (PyType_Ready(&FInfo_Type) < 0) return; + Py_INCREF(&FInfo_Type); +@@ -3269,6 +3360,7 @@ + /* Backward-compatible name */ + Py_INCREF(&FInfo_Type); + PyModule_AddObject(m, "FInfoType", (PyObject *)&FInfo_Type); ++#endif /* !__LP64__ */ + Alias_Type.ob_type = &PyType_Type; + if (PyType_Ready(&Alias_Type) < 0) return; + Py_INCREF(&Alias_Type); +@@ -3276,6 +3368,7 @@ + /* Backward-compatible name */ + Py_INCREF(&Alias_Type); + PyModule_AddObject(m, "AliasType", (PyObject *)&Alias_Type); ++#ifndef __LP64__ + FSSpec_Type.ob_type = &PyType_Type; + if (PyType_Ready(&FSSpec_Type) < 0) return; + Py_INCREF(&FSSpec_Type); +@@ -3283,6 +3376,7 @@ + /* Backward-compatible name */ + Py_INCREF(&FSSpec_Type); + PyModule_AddObject(m, "FSSpecType", (PyObject *)&FSSpec_Type); ++#endif /* !__LP64__ */ + FSRef_Type.ob_type = &PyType_Type; + if (PyType_Ready(&FSRef_Type) < 0) return; + Py_INCREF(&FSRef_Type); +Index: Lib/plat-mac/macresource.py +=================================================================== +--- Lib/plat-mac/macresource.py (revision 74680) ++++ Lib/plat-mac/macresource.py (revision 74681) +@@ -79,8 +79,8 @@ + AppleSingle file""" + try: + refno = Res.FSpOpenResFile(pathname, 1) +- except Res.Error, arg: +- if arg[0] in (-37, -39): ++ except (AttributeError, Res.Error), arg: ++ if isinstance(arg, AttributeError) or arg[0] in (-37, -39): + # No resource fork. We may be on OSX, and this may be either + # a data-fork based resource file or a AppleSingle file + # from the CVS repository. +@@ -106,8 +106,8 @@ + try: + refno = Res.FSpOpenResFile(pathname, 1) + Res.CloseResFile(refno) +- except Res.Error, arg: +- if arg[0] in (-37, -39): ++ except (AttributeError, Res.Error), arg: ++ if isinstance(arg, AttributeError) or arg[0] in (-37, -39): + # No resource fork. We may be on OSX, and this may be either + # a data-fork based resource file or a AppleSingle file + # from the CVS repository. +Index: Lib/plat-mac/applesingle.py +=================================================================== +--- Lib/plat-mac/applesingle.py (revision 74680) ++++ Lib/plat-mac/applesingle.py (revision 74681) +@@ -119,8 +119,13 @@ + if not hasattr(infile, 'read'): + if isinstance(infile, Carbon.File.Alias): + infile = infile.ResolveAlias()[0] +- if isinstance(infile, (Carbon.File.FSSpec, Carbon.File.FSRef)): +- infile = infile.as_pathname() ++ ++ if hasattr(Carbon.File, "FSSpec"): ++ if isinstance(infile, (Carbon.File.FSSpec, Carbon.File.FSRef)): ++ infile = infile.as_pathname() ++ else: ++ if isinstance(infile, Carbon.File.FSRef): ++ infile = infile.as_pathname() + infile = open(infile, 'rb') + + asfile = AppleSingle(infile, verbose=verbose) +Index: Mac/scripts/BuildApplet.py +=================================================================== +--- Mac/scripts/BuildApplet.py (revision 74680) ++++ Mac/scripts/BuildApplet.py (revision 74681) +@@ -12,7 +12,10 @@ + + import os + import MacOS +-import EasyDialogs ++try: ++ import EasyDialogs ++except ImportError: ++ EasyDialogs = None + import buildtools + import getopt + +@@ -32,7 +35,10 @@ + try: + buildapplet() + except buildtools.BuildError, detail: +- EasyDialogs.Message(detail) ++ if EasyDialogs is None: ++ print detail ++ else: ++ EasyDialogs.Message(detail) + + + def buildapplet(): +@@ -46,6 +52,10 @@ + # Ask for source text if not specified in sys.argv[1:] + + if not sys.argv[1:]: ++ if EasyDialogs is None: ++ usage() ++ sys.exit(1) ++ + filename = EasyDialogs.AskFileForOpen(message='Select Python source or applet:', + typeList=('TEXT', 'APPL')) + if not filename: +Index: Lib/plat-mac/buildtools.py +=================================================================== +--- Lib/plat-mac/buildtools.py (revision 74680) ++++ Lib/plat-mac/buildtools.py (revision 74681) +@@ -15,7 +15,10 @@ + import MacOS + import macostools + import macresource +-import EasyDialogs ++try: ++ import EasyDialogs ++except ImportError: ++ EasyDialogs = None + import shutil + + +@@ -67,9 +70,13 @@ + rsrcname=None, others=[], raw=0, progress="default", destroot=""): + + if progress == "default": +- progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120) +- progress.label("Compiling...") +- progress.inc(0) ++ if EasyDialogs is None: ++ print "Compiling %s"%(os.path.split(filename)[1],) ++ process = None ++ else: ++ progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120) ++ progress.label("Compiling...") ++ progress.inc(0) + # check for the script name being longer than 32 chars. This may trigger a bug + # on OSX that can destroy your sourcefile. + if '#' in os.path.split(filename)[1]: +@@ -119,7 +126,11 @@ + if MacOS.runtimemodel == 'macho': + raise BuildError, "No updating yet for MachO applets" + if progress: +- progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120) ++ if EasyDialogs is None: ++ print "Updating %s"%(os.path.split(filename)[1],) ++ progress = None ++ else: ++ progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120) + else: + progress = None + if not output: diff --git a/packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff b/packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff new file mode 100644 index 000000000..6f8ac6608 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff @@ -0,0 +1,11 @@ +--- Mac/Modules/file/_Filemodule.c.orig 2009-09-12 15:55:59.000000000 +1000 ++++ Mac/Modules/file/_Filemodule.c 2009-09-12 16:12:07.000000000 +1000 +@@ -7,6 +7,8 @@ + + #include "pymactoolbox.h" + ++typedef SInt16 FSIORefNum; ++ + /* Macro to test whether a weak-loaded CFM function exists */ + #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ + PyErr_SetString(PyExc_NotImplementedError, \ diff --git a/packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff b/packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff new file mode 100644 index 000000000..8153bebbd --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff @@ -0,0 +1,18 @@ +--- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200 ++++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200 +@@ -1,13 +1,6 @@ +-#! /usr/local/bin/python ++#! __PREFIX__/bin/python2.5 + +-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is +-# intentionally NOT "/usr/bin/env python". On many systems +-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI +-# scripts, and /usr/local/bin is the default directory where Python is +-# installed, so /usr/bin/env would be unable to find python. Granted, +-# binary installations by Linux vendors often install Python in +-# /usr/bin. So let those vendors patch cgi.py to match their choice +-# of installation. ++# NOTE: The original #!/usr/local/bin/python patched for MacPorts installation + + """Support module for CGI (Common Gateway Interface) scripts. + diff --git a/packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff b/packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff new file mode 100644 index 000000000..961a8ad28 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff @@ -0,0 +1,51 @@ +--- Lib/distutils/dist.py.orig 2005-03-23 11:54:36.000000000 -0700 ++++ Lib/distutils/dist.py 2008-07-25 21:27:15.000000000 -0600 +@@ -57,6 +57,7 @@ + ('quiet', 'q', "run quietly (turns verbosity off)"), + ('dry-run', 'n', "don't actually do anything"), + ('help', 'h', "show detailed help message"), ++ ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'), + ] + + # 'common_usage' is a short (2-3 line) string describing the common +@@ -264,6 +265,12 @@ + else: + sys.stderr.write(msg + "\n") + ++ # no-user-cfg is handled before other command line args ++ # because other args override the config files, and this ++ # one is needed before we can load the config files. ++ # If attrs['script_args'] wasn't passed, assume false. ++ self.want_user_cfg = '--no-user-cfg' not in (self.script_args or []) ++ + self.finalize_options() + + # __init__ () +@@ -324,6 +331,9 @@ + Distutils __inst__.py file lives), a file in the user's home + directory named .pydistutils.cfg on Unix and pydistutils.cfg + on Windows/Mac, and setup.cfg in the current directory. ++ ++ The file in the user's home directory can be disabled with the ++ --no-user-cfg option. + """ + files = [] + check_environ() +@@ -343,7 +353,7 @@ + user_filename = "pydistutils.cfg" + + # And look for the user config file +- if os.environ.has_key('HOME'): ++ if self.want_user_cfg and os.environ.has_key('HOME'): + user_file = os.path.join(os.environ.get('HOME'), user_filename) + if os.path.isfile(user_file): + files.append(user_file) +@@ -353,6 +363,8 @@ + if os.path.isfile(local_file): + files.append(local_file) + ++ if DEBUG: ++ print "using config files: %s" % ', '.join(files) + return files + + # find_config_files () diff --git a/packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff b/packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff new file mode 100644 index 000000000..e99a24741 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff @@ -0,0 +1,49 @@ +--- Makefile.pre.in.orig 2008-09-22 10:22:44.000000000 +1000 ++++ Makefile.pre.in 2011-10-27 06:47:17.000000000 +1100 +@@ -348,8 +348,8 @@ + # Build the shared modules + sharedmods: $(BUILDPYTHON) + case $$MAKEFLAGS in \ +- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ +- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ ++ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \ ++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \ + esac + + # Build static library +@@ -387,7 +387,7 @@ + $(RESSRCDIR)/English.lproj/InfoPlist.strings + $(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION) + if test "${UNIVERSALSDK}"; then \ +- $(CC) -o $(LDLIBRARY) -arch i386 -arch ppc -dynamiclib \ ++ $(CC) -o $(LDLIBRARY) __UNIVERSAL_LDFLAGS__ -dynamiclib \ + -isysroot "${UNIVERSALSDK}" \ + -all_load $(LIBRARY) -Wl,-single_module \ + -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python \ +@@ -458,7 +458,7 @@ + $(SIGNAL_OBJS) \ + $(MODOBJS) \ + $(srcdir)/Modules/getbuildinfo.c +- $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c ++ $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c + + Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile + $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ +@@ -894,7 +894,7 @@ + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: +- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ ++ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +@@ -968,7 +968,7 @@ + # This installs a few of the useful scripts in Tools/scripts + scriptsinstall: + SRCDIR=$(srcdir) $(RUNSHARED) \ +- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ ++ ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py --no-user-cfg install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --root=/$(DESTDIR) diff --git a/packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff b/packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff new file mode 100644 index 000000000..0fee9e791 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff @@ -0,0 +1,16 @@ +--- Misc/setuid-prog.c.orig Sat Dec 11 14:29:22 2004 ++++ Misc/setuid-prog.c Sat Dec 11 14:30:13 2004 +@@ -70,6 +70,12 @@ + #define environ _environ + #endif + ++#if defined(__APPLE__) ++#include <sys/time.h> ++#include <crt_externs.h> ++#define environ (*_NSGetEnviron()) ++#endif ++ + /* don't change def_IFS */ + char def_IFS[] = "IFS= \t\n"; + /* you may want to change def_PATH, but you should really change it in */ + diff --git a/packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff b/packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff new file mode 100644 index 000000000..c14913cf7 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff @@ -0,0 +1,21 @@ +--- Modules/posixmodule.c.orig Sat Dec 11 14:27:52 2004 ++++ Modules/posixmodule.c Sat Dec 11 14:28:17 2004 +@@ -339,7 +339,7 @@ + #endif + + /* Return a dictionary corresponding to the POSIX environment table */ +-#ifdef WITH_NEXT_FRAMEWORK ++#ifdef __APPLE__ + /* On Darwin/MacOSX a shared library or framework has no access to + ** environ directly, we must obtain it with _NSGetEnviron(). + */ +@@ -357,7 +357,7 @@ + d = PyDict_New(); + if (d == NULL) + return NULL; +-#ifdef WITH_NEXT_FRAMEWORK ++#ifdef __APPLE__ + if (environ == NULL) + environ = *_NSGetEnviron(); + #endif + diff --git a/packaging/macosx/ports/lang/python25/files/patch-configure.diff b/packaging/macosx/ports/lang/python25/files/patch-configure.diff new file mode 100644 index 000000000..22d260047 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-configure.diff @@ -0,0 +1,45 @@ +--- configure.orig 2008-12-14 01:13:52.000000000 +1100 ++++ configure 2011-05-10 16:25:02.000000000 +1000 +@@ -4534,9 +4534,11 @@ + ;; + # is there any other compiler on Darwin besides gcc? + Darwin*) +- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" ++ BASECFLAGS="$BASECFLAGS -mno-fused-madd" + if test "${enable_universalsdk}"; then +- BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" ++ BASECFLAGS="__UNIVERSAL_CFLAGS__ -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" ++ else ++ BASECFLAGS="-arch __BUILD_ARCH__ ${BASECFLAGS}" + fi + + ;; +@@ -11362,7 +11364,7 @@ + if test "${enable_universalsdk}"; then + : + else +- LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`" ++ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only __BUILD_ARCH__" + fi + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; +@@ -11374,7 +11376,7 @@ + else + LIBTOOL_CRUFT="" + fi +- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`" ++ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only __BUILD_ARCH__" + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; + esac +@@ -11524,7 +11526,9 @@ + if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2 + then + if test "${enable_universalsdk}"; then +- LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}" ++ LDFLAGS="__UNIVERSAL_LDFLAGS__ -isysroot ${UNIVERSALSDK} ${LDFLAGS}" ++ else ++ LDFLAGS="-arch __BUILD_ARCH__ ${LDFLAGS}" + fi + LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup' + BLDSHARED="$LDSHARED" diff --git a/packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff b/packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff new file mode 100644 index 000000000..130a3ad5d --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff @@ -0,0 +1,12 @@ +--- configure.orig 2011-11-22 09:08:58.000000000 +1100 ++++ configure 2011-11-22 09:10:56.000000000 +1100 +@@ -4428,9 +4428,7 @@ + STRICT_PROTO="-Wstrict-prototypes" + fi + # For gcc 4.x we need to use -fwrapv so lets check if its supported +- if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then + WRAP="-fwrapv" +- fi + case $ac_cv_prog_cc_g in + yes) + if test "$Py_DEBUG" = 'true' ; then diff --git a/packaging/macosx/ports/lang/python25/files/patch-libedit.diff b/packaging/macosx/ports/lang/python25/files/patch-libedit.diff new file mode 100644 index 000000000..99da7a9c4 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-libedit.diff @@ -0,0 +1,132 @@ +--- configure.orig 2011-10-31 13:23:35.000000000 +1100 ++++ configure 2011-10-31 13:28:19.000000000 +1100 +@@ -20985,9 +20985,9 @@ + echo $ECHO_N "checking how to link readline libs... $ECHO_C" >&6; } + for py_libtermcap in "" ncursesw ncurses curses termcap; do + if test -z "$py_libtermcap"; then +- READLINE_LIBS="-lreadline" ++ READLINE_LIBS="-ledit" + else +- READLINE_LIBS="-lreadline -l$py_libtermcap" ++ READLINE_LIBS="-ledit -l$py_libtermcap" + fi + LIBS="$READLINE_LIBS $LIBS_no_readline" + cat >conftest.$ac_ext <<_ACEOF +@@ -21060,13 +21060,13 @@ + fi + + # check for readline 2.1 +-{ echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5 +-echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for rl_callback_handler_install in -ledit" >&5 ++echo $ECHO_N "checking for rl_callback_handler_install in -ledit... $ECHO_C" >&6; } + if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline $READLINE_LIBS $LIBS" ++LIBS="-ledit $READLINE_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21137,7 +21137,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <readline/readline.h> ++#include <editline/readline.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in +@@ -21172,7 +21172,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <readline/readline.h> ++#include <editline/readline.h> + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +@@ -21188,13 +21188,13 @@ + fi + + # check for readline 4.0 +-{ echo "$as_me:$LINENO: checking for rl_pre_input_hook in -lreadline" >&5 +-echo $ECHO_N "checking for rl_pre_input_hook in -lreadline... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for rl_pre_input_hook in -ledit" >&5 ++echo $ECHO_N "checking for rl_pre_input_hook in -ledit... $ECHO_C" >&6; } + if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline $READLINE_LIBS $LIBS" ++LIBS="-ledit $READLINE_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21259,13 +21259,13 @@ + + + # check for readline 4.2 +-{ echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5 +-echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for rl_completion_matches in -ledit" >&5 ++echo $ECHO_N "checking for rl_completion_matches in -ledit... $ECHO_C" >&6; } + if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline $READLINE_LIBS $LIBS" ++LIBS="-ledit $READLINE_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21336,7 +21336,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <readline/readline.h> ++#include <editline/readline.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in +@@ -21371,7 +21371,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <readline/readline.h> ++#include <editline/readline.h> + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +--- setup.py.orig 2011-10-31 13:23:35.000000000 +1100 ++++ setup.py 2011-10-31 13:32:40.000000000 +1100 +@@ -488,7 +488,7 @@ + else: + readline_extra_link_args = () + +- readline_libs = ['readline'] ++ readline_libs = ['edit'] + if self.compiler.find_library_file(lib_dirs, + 'ncursesw'): + readline_libs.append('ncursesw') +--- Modules/readline.c.orig 2007-01-23 03:10:27.000000000 +1100 ++++ Modules/readline.c 2011-10-31 14:00:36.000000000 +1100 +@@ -28,8 +28,7 @@ + + /* GNU readline definitions */ + #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */ +-#include <readline/readline.h> +-#include <readline/history.h> ++#include <editline/readline.h> + + #ifdef HAVE_RL_COMPLETION_MATCHES + #define completion_matches(x, y) \ +@@ -794,7 +793,6 @@ readline_until_enter_or_signal(char *pro + PyEval_SaveThread(); + #endif + if (s < 0) { +- rl_free_line_state(); + rl_cleanup_after_signal(); + rl_callback_handler_remove(); + *signal = 1; diff --git a/packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff b/packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff new file mode 100644 index 000000000..5350dee29 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff @@ -0,0 +1,114 @@ + +# HG changeset patch +# User Ronald Oussoren <ronaldoussoren@mac.com> +# Date 1279889153 0 +# Node ID e267ee9760bd14a8b4270e12af982c941fa7a67d +# Parent bdc069a1a721b28ad21849232bd5426dda871506 +Merged revisions 83085 via svnmerge from +svn+ssh://pythondev@svn.python.org/python/branches/release27-maint + +................ + r83085 | ronald.oussoren | 2010-07-23 13:41:00 +0100 (Fri, 23 Jul 2010) | 12 lines + + Merged revisions 83075 via svnmerge from + svn+ssh://pythondev@svn.python.org/python/branches/py3k + + ........ + r83075 | ronald.oussoren | 2010-07-23 12:54:59 +0100 (Fri, 23 Jul 2010) | 5 lines + + Fix for issue 7895. Avoid crashing the interpreter + when calling platform.mac_ver after calling os.fork by + reading from a system configuration file instead of + using OSX APIs. + ........ +................ + +diff --git a/Lib/platform.py b/Lib/platform.py +--- Lib/platform.py ++++ Lib/platform.py +@@ -562,28 +562,20 @@ def _bcd2str(bcd): + + return hex(bcd)[2:] + +-def mac_ver(release='',versioninfo=('','',''),machine=''): +- +- """ Get MacOS version information and return it as tuple (release, +- versioninfo, machine) with versioninfo being a tuple (version, +- dev_stage, non_release_version). +- +- Entries which cannot be determined are set to the paramter values +- which default to ''. All tuple entries are strings. +- ++def _mac_ver_gestalt(): ++ """ + Thanks to Mark R. Levinson for mailing documentation links and + code examples for this function. Documentation for the + gestalt() API is available online at: + + http://www.rgaros.nl/gestalt/ +- + """ + # Check whether the version info module is available + try: + import gestalt + import MacOS + except ImportError: +- return release,versioninfo,machine ++ return None + # Get the infos + sysv,sysu,sysa = _mac_ver_lookup(('sysv','sysu','sysa')) + # Decode the infos +@@ -619,6 +611,53 @@ def mac_ver(release='',versioninfo=('',' + machine = {0x1: '68k', + 0x2: 'PowerPC', + 0xa: 'i386'}.get(sysa,'') ++ ++ return release,versioninfo,machine ++ ++def _mac_ver_xml(): ++ fn = '/System/Library/CoreServices/SystemVersion.plist' ++ if not os.path.exists(fn): ++ return None ++ ++ try: ++ import plistlib ++ except ImportError: ++ return None ++ ++ pl = plistlib.readPlist(fn) ++ release = pl['ProductVersion'] ++ versioninfo=('', '', '') ++ machine = os.uname()[4] ++ if machine == 'ppc': ++ # for compatibility with the gestalt based code ++ machine = 'PowerPC' ++ ++ return release,versioninfo,machine ++ ++ ++def mac_ver(release='',versioninfo=('','',''),machine=''): ++ ++ """ Get MacOS version information and return it as tuple (release, ++ versioninfo, machine) with versioninfo being a tuple (version, ++ dev_stage, non_release_version). ++ ++ Entries which cannot be determined are set to the paramter values ++ which default to ''. All tuple entries are strings. ++ """ ++ ++ # First try reading the information from an XML file which should ++ # always be present ++ info = _mac_ver_xml() ++ if info is not None: ++ return info ++ ++ # If that doesn't work for some reason fall back to reading the ++ # information using gestalt calls. ++ info = _mac_ver_gestalt() ++ if info is not None: ++ return info ++ ++ # If that also doesn't work return the default values + return release,versioninfo,machine + + def _java_getprop(name,default): diff --git a/packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff b/packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff new file mode 100644 index 000000000..bd0ecd803 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff @@ -0,0 +1,13 @@ +--- pyconfig.h.in.orig 2009-08-16 10:22:50.000000000 -0700 ++++ pyconfig.h.in 2009-08-16 10:23:24.000000000 -0700 +@@ -4,6 +4,10 @@ + #ifndef Py_PYCONFIG_H + #define Py_PYCONFIG_H + ++// Required on Darwin 10+ ++#ifndef _DARWIN_C_SOURCE ++#define _DARWIN_C_SOURCE ++#endif + + /* Define for AIX if your compiler is a genuine IBM xlC/xlC_r and you want + support for AIX C++ shared extension modules. */ diff --git a/packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff b/packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff new file mode 100644 index 000000000..14d3bc582 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff @@ -0,0 +1,11 @@ +--- setup.py.orig 2009-03-31 12:20:48.000000000 -0600 ++++ setup.py 2009-09-17 00:33:12.000000000 -0600 +@@ -17,7 +17,7 @@ + from distutils.command.install_lib import install_lib + + # This global variable is used to hold the list of modules to be disabled. +-disabled_module_list = [] ++disabled_module_list = ["_tkinter", "gdbm"] + + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/packaging/macosx/ports/lang/python25/files/patch-setup.py.diff b/packaging/macosx/ports/lang/python25/files/patch-setup.py.diff new file mode 100644 index 000000000..2649594c8 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-setup.py.diff @@ -0,0 +1,80 @@ +--- setup.py.orig 2008-10-16 12:58:19.000000000 -0600 ++++ setup.py 2009-06-07 20:55:17.000000000 -0600 +@@ -609,7 +609,7 @@ + # a release. Most open source OSes come with one or more + # versions of BerkeleyDB already installed. + +- max_db_ver = (4, 5) ++ max_db_ver = (4, 6) + # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x + # we leave that version disabled by default as it has proven to be + # quite a buggy library release on many platforms. +@@ -636,6 +636,7 @@ + db_inc_paths.append('/usr/local/include/db4%d' % x) + db_inc_paths.append('/pkg/db-4.%d/include' % x) + db_inc_paths.append('/opt/db-4.%d/include' % x) ++ db_inc_paths.append('__PREFIX__/include/db4%d' % x) + # 3.x minor number specific paths + for x in (3,): + db_inc_paths.append('/usr/include/db3%d' % x) +@@ -711,6 +712,7 @@ + + # check lib directories parallel to the location of the header + db_dirs_to_check = [ ++ os.path.join('__PREFIX__', 'lib', 'db46'), + os.path.join(db_incdir, '..', 'lib64'), + os.path.join(db_incdir, '..', 'lib'), + os.path.join(db_incdir, '..', '..', 'lib64'), +@@ -1212,13 +1214,7 @@ + def detect_tkinter(self, inc_dirs, lib_dirs): + # The _tkinter module. + +- # Rather than complicate the code below, detecting and building +- # AquaTk is a separate method. Only one Tkinter will be built on +- # Darwin - either AquaTk, if it is found, or X11 based Tk. + platform = self.get_platform() +- if (platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +--- setup.py.orig 2009-09-10 19:41:32.000000000 +1000 ++++ setup.py 2009-09-10 19:48:30.000000000 +1000 +@@ -1197,7 +1197,7 @@ + # For 8.4a2, the X11 headers are not included. Rather than include a + # complicated search, this is a hard-coded path. It could bail out + # if X11 libs are not found... +- include_dirs.append('/usr/X11R6/include') ++ #include_dirs.append('/usr/X11R6/include') + frameworks = ['-framework', 'Tcl', '-framework', 'Tk'] + + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], +@@ -1262,17 +1262,17 @@ + if platform == 'sunos5': + include_dirs.append('/usr/openwin/include') + added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: ++ #elif os.path.exists('/usr/X11R6/include'): ++ # include_dirs.append('/usr/X11R6/include') ++ # added_lib_dirs.append('/usr/X11R6/lib64') ++ # added_lib_dirs.append('/usr/X11R6/lib') ++ #elif os.path.exists('/usr/X11R5/include'): ++ # include_dirs.append('/usr/X11R5/include') ++ # added_lib_dirs.append('/usr/X11R5/lib') ++ #else: + # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') ++ # include_dirs.append('/usr/X11/include') ++ # added_lib_dirs.append('/usr/X11/lib') + + # If Cygwin, then verify that X is installed before proceeding + if platform == 'cygwin': diff --git a/packaging/macosx/ports/lang/python25/files/pyconfig.ed b/packaging/macosx/ports/lang/python25/files/pyconfig.ed new file mode 100644 index 000000000..671d0d560 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/pyconfig.ed @@ -0,0 +1,2 @@ +g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */, +w diff --git a/packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed b/packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed new file mode 100644 index 000000000..67ecc11a1 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed @@ -0,0 +1,50 @@ +/HAVE_LARGEFILE_SUPPORT/c +#ifdef __LP64__ +/* #undef HAVE_LARGEFILE_SUPPORT */ +#else +#define HAVE_LARGEFILE_SUPPORT 1 +#endif +. +/SIZEOF_LONG/c +#ifdef __LP64__ +#define SIZEOF_LONG 8 +#else +#define SIZEOF_LONG 4 +#endif +. +/SIZEOF_PTHREAD_T/c +#ifdef __LP64__ +#define SIZEOF_PTHREAD_T 8 +#else +#define SIZEOF_PTHREAD_T 4 +#endif +. +/SIZEOF_SIZE_T/c +#ifdef __LP64__ +#define SIZEOF_SIZE_T 8 +#else +#define SIZEOF_SIZE_T 4 +#endif +. +/SIZEOF_TIME_T/c +#ifdef __LP64__ +#define SIZEOF_TIME_T 8 +#else +#define SIZEOF_TIME_T 4 +#endif +. +/SIZEOF_UINTPTR_T/c +#ifdef __LP64__ +#define SIZEOF_UINTPTR_T 8 +#else +#define SIZEOF_UINTPTR_T 4 +#endif +. +/SIZEOF_VOID_P/c +#ifdef __LP64__ +#define SIZEOF_VOID_P 8 +#else +#define SIZEOF_VOID_P 4 +#endif +. +w diff --git a/packaging/macosx/ports/lang/python25/files/python25 b/packaging/macosx/ports/lang/python25/files/python25 new file mode 100644 index 000000000..e7ca5aed2 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/python25 @@ -0,0 +1,13 @@ +bin/python2.5 +bin/pythonw2.5 +bin/python2.5-config +bin/idle2.5 +bin/pydoc2.5 +bin/smtpd2.5.py +- +- +share/man/man1/python2.5.1.gz +${frameworks_dir}/Python.framework/Versions/2.5 +${frameworks_dir}/Python.framework/Versions/2.5/Headers +${frameworks_dir}/Python.framework/Versions/2.5/Resources +${frameworks_dir}/Python.framework/Versions/2.5/Python diff --git a/packaging/macosx/ports/lang/python26/Portfile b/packaging/macosx/ports/lang/python26/Portfile index 93929fd80..c72cd28d5 100644 --- a/packaging/macosx/ports/lang/python26/Portfile +++ b/packaging/macosx/ports/lang/python26/Portfile @@ -5,7 +5,7 @@ PortGroup select 1.0 name python26 version 2.6.1 -revision 2 +revision 100 set major [lindex [split $version .] 0] set branch [join [lrange [split ${version} .] 0 1] .] categories lang diff --git a/packaging/macosx/ports/python/py25-Pillow/Portfile b/packaging/macosx/ports/python/py25-Pillow/Portfile index 85363b206..aa74a06ad 100644 --- a/packaging/macosx/ports/python/py25-Pillow/Portfile +++ b/packaging/macosx/ports/python/py25-Pillow/Portfile @@ -50,10 +50,10 @@ if {$subport == $name} { } livecheck.type none -} else { - livecheck.type regex - livecheck.url ${master_sites} - livecheck.regex "Pillow-(\\d+(?:\\.\\d+)*)${extract.suffix}" +#} else { +# livecheck.type regex +# livecheck.url ${master_sites} +# livecheck.regex "Pillow-(\\d+(?:\\.\\d+)*)${extract.suffix}" } variant quartz conflicts x11 tkinter { diff --git a/packaging/macosx/ports/python/py25-lxml/Portfile b/packaging/macosx/ports/python/py25-lxml/Portfile new file mode 100644 index 000000000..49a753cd1 --- /dev/null +++ b/packaging/macosx/ports/python/py25-lxml/Portfile @@ -0,0 +1,51 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 121661 2014-07-03 17:50:11Z mf2k@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 + +name py25-lxml +version 3.3.5 +revision 0 +categories-append devel +platforms darwin +license BSD + +python.versions 25 + +maintainers gmail.com:dbraband openmaintainer + +description Powerful and Pythonic XML processing library + +long_description lxml is a Pythonic binding for the libxml2 and \ + libxslt libraries. It is unique in that it \ + combines the speed and feature completeness of \ + these libraries with the simplicity of a native \ + Python API, mostly compatible but superior to \ + the well-known ElementTree API. + +homepage http://lxml.de/ +master_sites http://pypi.python.org/packages/source/l/lxml/ + +checksums rmd160 c7ccece50f8d20f5fac44ac1bf8dc0d8a85aa0f9 \ + sha256 6ad6949dc7eea744a30fba77a968dd5910f545220e58bcc813b9df5c793e318a + +distname lxml-${version} + +if {${name} eq ${subport}} { + + revision 100 + + depends_build-append \ + port:py${python.version}-setuptools + + depends_lib-append port:zlib \ + port:libxml2 \ + port:libxslt + + livecheck.type none +} else { + livecheck.type regex + livecheck.url ${master_sites} + livecheck.regex "lxml-(\\d+(?:\\.\\d+)*)${extract.suffix}" +} diff --git a/packaging/macosx/ports/python/py25-nose/Portfile b/packaging/macosx/ports/python/py25-nose/Portfile new file mode 100644 index 000000000..62a60eec5 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/Portfile @@ -0,0 +1,86 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 121661 2014-07-03 17:50:11Z mf2k@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 +PortGroup select 1.0 + +set my_name nose +name py25-${my_name} +version 1.3.1 +categories-append www +license LGPL-2+ +maintainers mcalhoun openmaintainer +description A Python unittest extension. +long_description \ + A unittest extension offering automatic test \ + suite discovery, simplified test authoring, \ + and output capture. Nose provides an alternate \ + test discovery and running process for \ + unittest, one that is intended to mimic the \ + behavior of py.test as much as is reasonably \ + possible without resorting to magic. + +platforms darwin +supported_archs noarch + +homepage http://somethingaboutorange.com/mrl/projects/${my_name} +master_sites http://pypi.python.org/packages/source/n/${my_name}/ +distname ${my_name}-${version} + +checksums md5 672398801ddf5ba745c55c6eed79c5aa \ + rmd160 7bf311d3d54f2ccb372dea331708c475b992ccec \ + sha256 85273b87ab3db9307e3b1452b071e25c1db1cc812bc337d2a97ea0b0cf2ab6ba + +python.versions 25 + +# already installs version-suffixed executables +python.link_binaries no +python.move_binaries no + +depends_run-append port:nosetests_select +if {${name} eq ${subport}} { + + revision 100 + + select.group nosetests + select.file ${filespath}/nosetests${python.version} + + depends_lib port:py${python.version}-setuptools + + post-patch { + reinplace "s|man/man|share/man/man|" ${worksrcpath}/setup.py + + # One of the tests fails if this directory does not exist + file mkdir ${worksrcpath}/functional_tests/support/empty + } + + post-destroot { + if {${python.version} == "24" || ${python.version} == "25"} { + move ${destroot}${prefix}/share/man/man1/nosetests.1 ${destroot}${prefix}/share/man/man1/nosetests${python.branch}.1 + delete ${destroot}${prefix}/bin/nosetests + } else { + ln -s ${python.prefix}/bin/nosetests-${python.branch} ${destroot}${prefix}/bin/ + ln -s ${python.prefix}/share/man/man1/nosetests.1 ${destroot}${prefix}/share/man/man1/nosetests${python.branch}.1 + } + + xinstall -m 644 -W ${worksrcpath} \ + AUTHORS CHANGELOG NEWS README.txt \ + ${destroot}${prefix}/share/doc/${subport} + + file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${subport}/html + + file delete ${destroot}${prefix}/share/doc/${subport}/examples + file copy ${worksrcpath}/examples ${destroot}${prefix}/share/doc/${subport} + } + + test.run yes + test.cmd ${python.bin} setup.py test + + livecheck.type none + +#} else { +# livecheck.type regex +# livecheck.url ${master_sites} +# livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" +} diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests24 b/packaging/macosx/ports/python/py25-nose/files/nosetests24 new file mode 100644 index 000000000..d9a8f4034 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests24 @@ -0,0 +1 @@ +bin/nosetests-2.4 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests25 b/packaging/macosx/ports/python/py25-nose/files/nosetests25 new file mode 100644 index 000000000..95864c283 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests25 @@ -0,0 +1 @@ +bin/nosetests-2.5 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests26 b/packaging/macosx/ports/python/py25-nose/files/nosetests26 new file mode 100644 index 000000000..bb670776f --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests26 @@ -0,0 +1 @@ +bin/nosetests-2.6 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests27 b/packaging/macosx/ports/python/py25-nose/files/nosetests27 new file mode 100644 index 000000000..28c7bfe8c --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests27 @@ -0,0 +1 @@ +bin/nosetests-2.7 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests31 b/packaging/macosx/ports/python/py25-nose/files/nosetests31 new file mode 100644 index 000000000..5ba27a4d5 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests31 @@ -0,0 +1 @@ +bin/nosetests-3.1 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests32 b/packaging/macosx/ports/python/py25-nose/files/nosetests32 new file mode 100644 index 000000000..07bfb86a1 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests32 @@ -0,0 +1 @@ +bin/nosetests-3.2 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests33 b/packaging/macosx/ports/python/py25-nose/files/nosetests33 new file mode 100644 index 000000000..b750d806b --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests33 @@ -0,0 +1 @@ +bin/nosetests-3.3 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests34 b/packaging/macosx/ports/python/py25-nose/files/nosetests34 new file mode 100644 index 000000000..542ffc949 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests34 @@ -0,0 +1 @@ +bin/nosetests-3.4 diff --git a/packaging/macosx/ports/python/py25-numpy/Portfile b/packaging/macosx/ports/python/py25-numpy/Portfile index 169c1d2ec..4575d6293 100644 --- a/packaging/macosx/ports/python/py25-numpy/Portfile +++ b/packaging/macosx/ports/python/py25-numpy/Portfile @@ -23,6 +23,9 @@ checksums rmd160 16df4216f40b22077e1f14cc41b8c8ae486b45af \ python.versions 25 if {$subport == $name} { + + revision 100 + patchfiles patch-f2py_setup.py.diff \ patch-numpy_distutils_fcompiler___init__.py.diff \ patch-fcompiler_g95.diff @@ -201,6 +204,6 @@ explicitly), one of the +gcc4X variants must be selected.\n" } livecheck.type none -} else { - livecheck.regex archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}" +#} else { +# livecheck.regex archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}" } diff --git a/packaging/macosx/ports/python/py25-setuptools/Portfile b/packaging/macosx/ports/python/py25-setuptools/Portfile new file mode 100644 index 000000000..35c528500 --- /dev/null +++ b/packaging/macosx/ports/python/py25-setuptools/Portfile @@ -0,0 +1,58 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 123950 2014-08-16 14:24:07Z jmr@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 + +name py25-setuptools +version 5.7 +categories-append devel +license {PSF ZPL} +maintainers jmr openmaintainer +description distutils enhancement for build and distribution +long_description \ + setuptools is a collection of enhancements to the Python distutils that \ + allow you to more easily build and distribute Python packages, \ + especially ones that have dependencies on other packages. + +platforms darwin +supported_archs noarch + +homepage https://pypi.python.org/pypi/setuptools/ +master_sites https://pypi.python.org/packages/source/s/setuptools/ +distname setuptools-${version} + +checksums md5 81f980854a239d60d074d6ba052e21ed \ + rmd160 ee9eff6c77e6f27e22e2049a6685bb0e624f94b0 \ + sha256 a8bbdb2d67532c5b5cef5ba09553cea45d767378e42c7003347e53ebbe70f482 + +python.versions 25 +python.link_binaries no +python.move_binaries no + +if {$subport eq $name} { + if {${python.version} == 25} { + version 1.4.2 + revision 100 + distname setuptools-${version} + checksums md5 13951be6711438073fbe50843e7f141f \ + rmd160 b48086a2aae718fe433a8c882d2d9209aa157b0a \ + sha256 263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd + } + + post-destroot { + xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport} + xinstall -m 644 -W ${worksrcpath} CHANGES.txt \ + DEVGUIDE.txt README.txt ${destroot}${prefix}/share/doc/${subport} + if {${python.version} <= 25} { + delete "${destroot}${prefix}/bin/easy_install" + } else { + ln -s "${python.prefix}/bin/easy_install-${python.branch}" "${destroot}${prefix}/bin/" + } + } + livecheck.type none +#} else { +# livecheck.type regex +# livecheck.url ${homepage} +# livecheck.regex setuptools/(\\d+(\\.\\d+)+) +} -- cgit v1.2.3 From e2cb6279386c642f1a7adf1ca0d288b59a0fc91f Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 19 Sep 2014 15:25:49 +0200 Subject: update EXTRA_DIST for files added in packaging/macosx/ports (r13604) (bzr r13506.1.99) --- Makefile.am | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index d9c756b94..7745f0dc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -402,6 +402,26 @@ EXTRA_DIST = \ packaging/macosx/osx-build.sh \ packaging/macosx/osx-dmg.sh \ packaging/macosx/ports/devel/inkscape-packaging/Portfile \ + packaging/macosx/ports/lang/python25/Portfile \ + packaging/macosx/ports/lang/python25/files/_localemodule.c.ed \ + packaging/macosx/ports/lang/python25/files/locale.py.ed \ + packaging/macosx/ports/lang/python25/files/patch-64bit.diff \ + packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff \ + packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff \ + packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff \ + packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff \ + packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff \ + packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff \ + packaging/macosx/ports/lang/python25/files/patch-configure.diff \ + packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff \ + packaging/macosx/ports/lang/python25/files/patch-libedit.diff \ + packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff \ + packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff \ + packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff \ + packaging/macosx/ports/lang/python25/files/patch-setup.py.diff \ + packaging/macosx/ports/lang/python25/files/pyconfig.ed \ + packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed \ + packaging/macosx/ports/lang/python25/files/python25 \ packaging/macosx/ports/lang/python26/Portfile \ packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff \ packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff \ @@ -423,6 +443,16 @@ EXTRA_DIST = \ packaging/macosx/ports/python/py25-Pillow/Portfile \ packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff \ packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff \ + packaging/macosx/ports/python/py25-lxml/Portfile \ + packaging/macosx/ports/python/py25-nose/Portfile \ + packaging/macosx/ports/python/py25-nose/files/nosetests24 \ + packaging/macosx/ports/python/py25-nose/files/nosetests25 \ + packaging/macosx/ports/python/py25-nose/files/nosetests26 \ + packaging/macosx/ports/python/py25-nose/files/nosetests27 \ + packaging/macosx/ports/python/py25-nose/files/nosetests31 \ + packaging/macosx/ports/python/py25-nose/files/nosetests32 \ + packaging/macosx/ports/python/py25-nose/files/nosetests33 \ + packaging/macosx/ports/python/py25-nose/files/nosetests34 \ packaging/macosx/ports/python/py25-numpy/Portfile \ packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff \ packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff \ @@ -430,6 +460,7 @@ EXTRA_DIST = \ packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff \ packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff \ packaging/macosx/ports/python/py25-numpy/files/wrapper-template \ + packaging/macosx/ports/python/py25-setuptools/Portfile \ packaging/win32/inkscape.nsi \ packaging/win32/inkscape.nsi.uninstall \ packaging/win32/languages/Breton.nsh \ -- cgit v1.2.3 From 36a9354f0503896a65f6fd2d8fe642f8b95b1856 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 19 Sep 2014 20:25:01 +0200 Subject: Packaging: fix python-wrapper.sh (currently not in use) (bzr r13506.1.100) --- packaging/macosx/Resources/bin/python-wrapper.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/macosx/Resources/bin/python-wrapper.sh b/packaging/macosx/Resources/bin/python-wrapper.sh index 35c3739bb..64ae52a93 100755 --- a/packaging/macosx/Resources/bin/python-wrapper.sh +++ b/packaging/macosx/Resources/bin/python-wrapper.sh @@ -8,17 +8,17 @@ # # unset env used in Inkscape.app # unset PYTHONHOME # unset DYLD_LIBRARY_PATH -# unset XDG_CONFIG_HOME XDG_DATA_HOME XDG_CACHE_HOME +# #unset XDG_CONFIG_HOME XDG_DATA_HOME XDG_CACHE_HOME # unset XDG_CONFIG_DIRS XDG_DATA_DIRS -# unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE GTK2_RC_FILES +# unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE # unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR # unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR # unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS # unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH -# unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR -# unset ASPELL_CONF +# unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR +# unset ASPELL_CONF # unset POPPLER_DATADIR -# unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT PYTHONPATH +# unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT # unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH # unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS @@ -66,8 +66,8 @@ # LIBPREFIX="/opt/local-x11" # exec "$LIBPREFIX/bin/python2.5" "$@" -# #exec "$LIBPREFIX/bin/python2.6" "@" -# #exec "$LIBPREFIX/bin/python2.7" "@" +# #exec "$LIBPREFIX/bin/python2.6" "$@" +# #exec "$LIBPREFIX/bin/python2.7" "$@" # --------------------------------------------------------------------- -- cgit v1.2.3 From 6e5de4f1a866ad4ce534bd7cc8c1280b7860e95b Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 19 Sep 2014 21:32:44 +0200 Subject: Packaging: include PyGTK (required e.g. for Sozi extension) (bzr r13506.1.101) --- packaging/macosx/osx-app.sh | 10 ++++++++++ packaging/macosx/ports/devel/inkscape-packaging/Portfile | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 520f2f0f4..e0cdcb913 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -482,9 +482,19 @@ if [ ${add_python} = "true" ]; then fi $cp_cmd -RL "$packages_path/sk1libs" "$pkgpython" $cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython" + # PyGTK (Sozi) + $cp_cmd -RL "$packages_path/cairo" "$pkgpython" + $cp_cmd -RL "$packages_path/glib" "$pkgpython" + $cp_cmd -RL "$packages_path/gobject" "$pkgpython" + $cp_cmd -RL "$packages_path/../../../share/pygobject" "$pkgshare" + $cp_cmd -RL "$packages_path/gtk-2.0" "$pkgpython" + $cp_cmd -RL "$packages_path/../../../share/pygtk" "$pkgshare" + $cp_cmd -RL "$packages_path/pygtk.pth" "$pkgpython" + $cp_cmd -RL "$packages_path/pygtk.py" "$pkgpython" # cleanup python modules find "$pkgpython" -name *.pyc -print0 | xargs -0 rm -f find "$pkgpython" -name *.pyo -print0 | xargs -0 rm -f + find "${pkgshare}/pygobject" -name *.pyc -print0 | xargs -0 rm -f # TODO: test whether to remove hard-coded paths from *.la files or to exclude them altogether for la_file in $(find "$pkgpython" -name *.la); do diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile index 67a46781b..eb5ceee6c 100644 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -64,7 +64,8 @@ depends_build-append port:gnome-icon-theme \ depends_build-append port:py27-lxml \ port:py27-numpy \ port:py27-Pillow \ - port:py27-uniconvertor + port:py27-uniconvertor \ + port:py27-pygtk if {${os.major} <= 10} { # ports for python extensions on Snow Leopard and Leopard -- cgit v1.2.3 From 02a332c98c8876dbb128ddcfb5a4e6b3aa2bf6b2 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 19 Sep 2014 21:34:09 +0200 Subject: revbump meta port (start with 100 like the other local ports) (bzr r13506.1.102) --- packaging/macosx/ports/devel/inkscape-packaging/Portfile | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile index eb5ceee6c..9a2bf0cf1 100644 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -5,6 +5,7 @@ PortSystem 1.0 name inkscape-packaging version 0.91 +revision 100 categories devel graphics platforms darwin -- cgit v1.2.3 From 1102d38e773d20b6ffffd8213af6ba395b909c60 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sat, 20 Sep 2014 12:13:25 +0200 Subject: Packaging: python wrapper - override PYTHONPATH if using external modules (PyGTK) (bzr r13506.1.104) --- packaging/macosx/Resources/bin/python-wrapper.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packaging/macosx/Resources/bin/python-wrapper.sh b/packaging/macosx/Resources/bin/python-wrapper.sh index 64ae52a93..34cd75737 100755 --- a/packaging/macosx/Resources/bin/python-wrapper.sh +++ b/packaging/macosx/Resources/bin/python-wrapper.sh @@ -2,13 +2,13 @@ # --------------------------------------------------------------------- -# a) to use py-gtk (for Sozi or inksmoto) from MacPorts +# a) to use PyGTK (for Sozi or inksmoto) from MacPorts # --------------------------------------------------------------------- -# # unset env used in Inkscape.app -# unset PYTHONHOME +# export PYTHONPATH="$INKSCAPE_SHAREDIR"/extensions +# +# # unset other environment variables used in Inkscape.app # unset DYLD_LIBRARY_PATH -# #unset XDG_CONFIG_HOME XDG_DATA_HOME XDG_CACHE_HOME # unset XDG_CONFIG_DIRS XDG_DATA_DIRS # unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE # unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR @@ -21,7 +21,6 @@ # unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT # unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH # unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS - # # # set locale (language) explicitly # # (not needed with 0.48.5 package) -- cgit v1.2.3 From b4b8b4bd75406ae960b765de4e40da8a5012a787 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Sun, 21 Sep 2014 04:34:05 +0200 Subject: Packaging: fix typo (bzr r13506.1.105) --- packaging/macosx/osx-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 5db991f1f..a4f294b27 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -235,7 +235,7 @@ elif [ "$OSXMINORNO" -eq "7" ]; then export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11 elif [ "$OSXMINORNO" -eq "8" ]; then ## Apple's clang on Mountain Lion - TARGETNAME="MOUTAIN LION" + TARGETNAME="MOUNTAIN LION" TARGETVERSION="10.8" export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" -- cgit v1.2.3 From ef2a7d06c9c878f4878f6962f903db6338f3af78 Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Thu, 25 Sep 2014 11:28:47 +0200 Subject: osx-build.sh: sync with osxmenu (whitespace, formatting) (bzr r13506.1.106) --- packaging/macosx/osx-build.sh | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index a4f294b27..7443b1698 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -61,7 +61,7 @@ Compilation script for Inkscape on Mac OS X. install the build products locally, inside the source directory (run make install) \033[1mp,pack,package\033[0m - package Inkscape in a double clickable .app bundle + package Inkscape in a double clickable .app bundle \033[1m-s,--strip\033[0m remove debugging information in Inkscape package \033[1m-v,--verbose\033[0m verbose mode \033[1m-py,--with-python\033[0m specify python modules path for inclusion into the app bundle @@ -73,12 +73,12 @@ Compilation script for Inkscape on Mac OS X. \033[1mEXAMPLES\033[0m \033[1m$0 conf build install\033[0m configure, build and install a dowloaded version of Inkscape in the default - directory, keeping debugging information. + directory, keeping debugging information. \033[1m$0 u a c b -p ~ i -s -py ~/python_modules/ p d\033[0m update an bzr checkout, prepare configure script, configure, - build and install Inkscape in the user home directory (~). + build and install Inkscape in the user home directory (~). Then package Inkscape without debugging information, - with python packages from ~/python_modules/ and prepare + with python packages from ~/python_modules/ and prepare a dmg for distribution." } @@ -115,12 +115,12 @@ while [ "$1" != "" ] do case $1 in h|help) - help + help exit 1 ;; - all) + all) BZRUPDATE="t" CONFIGURE="t" - BUILD="t" + BUILD="t" INSTALL="t" PACKAGE="t" DISTRIB="t" ;; @@ -142,10 +142,10 @@ do d|dist|distrib) DISTRIB="t" ;; -p|--prefix) - INSTALLPREFIX=$2 - shift 1 ;; + INSTALLPREFIX=$2 + shift 1 ;; -s|--strip) - STRIP="-s" ;; + STRIP="-s" ;; -py|--with-python) PYTHON_MODULES="$2" shift 1 ;; @@ -154,7 +154,7 @@ do info) BUILD_INFO="t" ;; *) - echo "Invalid command line option: $1" + echo "Invalid command line option: $1" exit 2 ;; esac shift 1 @@ -417,11 +417,11 @@ if [[ "$BZRUPDATE" == "t" ]] then cd $SRCROOT if [ -z "$(bzr info | grep "checkout")" ]; then - echo "repo is unbound (branch)" + echo "repo is unbound (branch)" >&2 bzr pull else - echo "repo is bound (checkout)" - echo '... please update bound branch manually.' + echo "repo is bound (checkout)" >&2 + echo '... please update bound branch manually.' >&2 false fi status=$? @@ -480,7 +480,7 @@ then cd $HERE fi -if [[ "$INSTALL" == "t" ]] +if [[ "$INSTALL" == "t" ]] then cd $BUILDPREFIX || exit 1 make install @@ -494,7 +494,7 @@ fi if [[ "$PACKAGE" == "t" ]] then - + # Test the existence of required files if [ ! -e $INSTALLPREFIX/bin/inkscape ] then @@ -506,7 +506,7 @@ then echo "The file \"$BUILDPREFIX/Info.plist\" could not be found, please re-run configure." exit 1 fi - + # Set python command line option (if PYTHON_MODULES location is not empty, then add the python call to the command line, otherwise, stay empty) if [[ "$PYTHON_MODULES" != "" ]]; then PYTHON_MODULES="-py $PYTHON_MODULES" @@ -537,7 +537,7 @@ then fi mv Inkscape.dmg $DMGFILE - + # Prepare information file BUILD_INFO="t" fi @@ -547,7 +547,8 @@ then buildinfofile fi -if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; then +if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; +then # open a Finder window here to admire what we just produced open . fi -- cgit v1.2.3 From 2d1ff6f2eb9798e2f1f24caa5af6b4e2cdde1df7 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Wed, 8 Oct 2014 15:50:02 +0200 Subject: Allow <sodipodi:namedview> attributes to be set by scripts. This is a bit of a hack... Why does <sodipode:namedview> need special treatment? (bzr r13341.1.258) --- src/extension/implementation/script.cpp | 98 ++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 32 deletions(-) diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index cac11031f..377b872bc 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -726,12 +726,12 @@ void Script::effect(Inkscape::Extension::Effect *module, vd->emitReconstructionStart(); copy_doc(vd->rroot, mydoc->rroot); vd->emitReconstructionFinish(); - SPObject *layer = NULL; - + // Getting the named view from the document generated by the extension SPNamedView *nv = sp_document_namedview(mydoc, NULL); //Check if it has a default layer set up + SPObject *layer = NULL; if ( nv != NULL) { if( nv->default_layer_id != 0 ) { @@ -760,19 +760,21 @@ void Script::effect(Inkscape::Extension::Effect *module, /** - \brief A function to take all the svg elements from one document - and put them in another. - \param oldroot The root node of the document to be replaced - \param newroot The root node of the document to replace it with - - This function first deletes all of the data in the old document. It - does this by creating a list of what needs to be deleted, and then - goes through the list. This two pass approach removes issues with - the list being change while parsing through it. Lots of nasty bugs. - - Then, it goes through the new document, duplicating all of the - elements and putting them into the old document. The copy - is then complete. + \brief A function to replace all the elements in an old document + by those from a new document. + document and repinserts them into an emptied old document. + \param oldroot The root node of the old (destination) document. + \param newroot The root node of the new (source) document. + + This function first deletes all the elements in the old document by + making two pass, the first to create a list of the old elements and + the second to actually delete them. This two pass approach removes issues + with the list being change while parsing through it... lots of nasty bugs. + + Then, it copies all the element in the new document into the old document. + + Finally, it replaces the attributes in the root element of the old document + by the attributes in root of the new document. */ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newroot) { @@ -781,9 +783,19 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr g_warning("Error on copy_doc: NULL pointer input."); return; } + + // For copying attributes in root and in namedview + using Inkscape::Util::List; + using Inkscape::XML::AttributeRecord; + + // Question: Why is the "sodipodi:namedview" special? Treating it as a normal + // elmement results in crashes. + std::vector<Inkscape::XML::Node *> delete_list; Inkscape::XML::Node * oldroot_namedview = NULL; + Inkscape::XML::Node * newroot_namedview = NULL; + // Make list for (Inkscape::XML::Node * child = oldroot->firstChild(); child != NULL; child = child->next()) { @@ -798,14 +810,18 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr delete_list.push_back(child); } } + + // Unparent (delete) for (unsigned int i = 0; i < delete_list.size(); i++) { sp_repr_unparent(delete_list[i]); } + // Copy for (Inkscape::XML::Node * child = newroot->firstChild(); child != NULL; child = child->next()) { if (!strcmp("sodipodi:namedview", child->name())) { + newroot_namedview = child; if (oldroot_namedview != NULL) { for (Inkscape::XML::Node * newroot_namedview_child = child->firstChild(); newroot_namedview_child != NULL; @@ -818,26 +834,44 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr } } - { - using Inkscape::Util::List; - using Inkscape::XML::AttributeRecord; - std::vector<gchar const *> attribs; + std::vector<gchar const *> attribs; - // Make a list of all attributes of the old root node. - for (List<AttributeRecord const> iter = oldroot->attributeList(); iter; ++iter) { - attribs.push_back(g_quark_to_string(iter->key)); - } + // Must explicitly copy root attributes. - // Delete the attributes of the old root nodes. - for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) { - oldroot->setAttribute(*it, NULL); - } + // Make a list of all attributes of the old root node. + for (List<AttributeRecord const> iter = oldroot->attributeList(); iter; ++iter) { + attribs.push_back(g_quark_to_string(iter->key)); + } - // Set the new attributes. - for (List<AttributeRecord const> iter = newroot->attributeList(); iter; ++iter) { - gchar const *name = g_quark_to_string(iter->key); - oldroot->setAttribute(name, newroot->attribute(name)); - } + // Delete the attributes of the old root node. + for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) { + oldroot->setAttribute(*it, NULL); + } + + // Set the new attributes. + for (List<AttributeRecord const> iter = newroot->attributeList(); iter; ++iter) { + gchar const *name = g_quark_to_string(iter->key); + oldroot->setAttribute(name, newroot->attribute(name)); + } + + attribs.clear(); + + // Must explicitly copy namedview attributes. + + // Make a list of all attributes of the old namedview node. + for (List<AttributeRecord const> iter = oldroot_namedview->attributeList(); iter; ++iter) { + attribs.push_back(g_quark_to_string(iter->key)); + } + + // Delete the attributes of the old namedview node. + for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) { + oldroot_namedview->setAttribute(*it, NULL); + } + + // Set the new attributes. + for (List<AttributeRecord const> iter = newroot_namedview->attributeList(); iter; ++iter) { + gchar const *name = g_quark_to_string(iter->key); + oldroot_namedview->setAttribute(name, newroot_namedview->attribute(name)); } /** \todo Restore correct layer */ -- cgit v1.2.3 From 413b305c3fa06f490cf730cb61387012714eb316 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Wed, 8 Oct 2014 15:53:03 +0200 Subject: Fixed 'viewBox', added 'inkscape:cx' and 'inkscape:cy'. (bzr r13341.1.259) --- share/extensions/empty_page.py | 77 ++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/share/extensions/empty_page.py b/share/extensions/empty_page.py index dc16bab97..34dee7fc4 100644 --- a/share/extensions/empty_page.py +++ b/share/extensions/empty_page.py @@ -1,5 +1,7 @@ #!/usr/bin/env python +# Rewritten by Tavmjong Bah to add correct viewBox, inkscape:cx, etc. attributes + import inkex class C(inkex.Effect): @@ -8,37 +10,52 @@ class C(inkex.Effect): self.OptionParser.add_option("-s", "--size", action="store", type="string", dest="page_size", default="a4", help="Page size") self.OptionParser.add_option("-o", "--orientation", action="store", type="string", dest="page_orientation", default="vertical", help="Page orientation") - def effect(self): + def effect(self): + + width = 300 + height = 300 + units = 'px' + + if self.options.page_size == "a5": + width = 148 + height= 210 + units = 'mm' + + if self.options.page_size == "a4": + width = 210 + height= 297 + units = 'mm' + + if self.options.page_size == "a3": + width = 297 + height= 420 + units = 'mm' + + if self.options.page_size == "letter": + width = 8.5 + height = 11 + units = 'in' + + if self.options.page_orientation == "horizontal": + width, height = height, width + + root = self.document.getroot() - root.set("width", "12in") - root.set("height", "12in") - if self.options.page_size == "a4" and self.options.page_orientation == "vertical": - root.set("width", "210mm") - root.set("height", "297mm") - if self.options.page_size == "a4" and self.options.page_orientation == "horizontal": - root.set("height", "210mm") - root.set("width", "297mm") - - if self.options.page_size == "a5" and self.options.page_orientation == "vertical": - root.set("width", "148mm") - root.set("height", "210mm") - if self.options.page_size == "a5" and self.options.page_orientation == "horizontal": - root.set("width", "210mm") - root.set("height", "148mm") - - if self.options.page_size == "a3" and self.options.page_orientation == "vertical": - root.set("width", "297mm") - root.set("height", "420mm") - if self.options.page_size == "a3" and self.options.page_orientation == "horizontal": - root.set("width", "420mm") - root.set("height", "297mm") - - if self.options.page_size == "letter" and self.options.page_orientation == "vertical": - root.set("width", "8.5in") - root.set("height", "11in") - if self.options.page_size == "letter" and self.options.page_orientation == "horizontal": - root.set("width", "11in") - root.set("height", "8.5in") + root.set("id", "SVGRoot") + root.set("width", str(width) + units) + root.set("height", str(height) + units) + root.set("viewBox", "0 0 " + str(width) + " " + str(height) ) + + namedview = root.find(inkex.addNS('namedview', 'sodipodi')) + if namedview is None: + namedview = inkex.etree.SubElement( root, inkex.addNS('namedview', 'sodipodi') ); + + namedview.set(inkex.addNS('document-units', 'inkscape'), units) + + # Until units are supported in 'cx', etc. + namedview.set(inkex.addNS('cx', 'inkscape'), str(self.uutounit( width, 'px' )/2.0 ) ) + namedview.set(inkex.addNS('cy', 'inkscape'), str(self.uutounit( height, 'px' )/2.0 ) ) + c = C() c.affect() -- cgit v1.2.3 From d63b299f761639b39a99365a1424d761878d02f7 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Wed, 8 Oct 2014 15:54:32 +0200 Subject: Small adjustements for 96px per inch. (bzr r13341.1.260) --- share/templates/Letter.svg | 8 ++++---- share/templates/Letter_landscape.svg | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/templates/Letter.svg b/share/templates/Letter.svg index 8942d2e2f..227288c12 100644 --- a/share/templates/Letter.svg +++ b/share/templates/Letter.svg @@ -20,8 +20,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.36" - inkscape:cx="340" - inkscape:cy="500" + inkscape:cx="408" + inkscape:cy="528" inkscape:current-layer="layer1" /> <metadata> <rdf:RDF> @@ -35,8 +35,8 @@ </metadata> <inkscape:_templateinfo> <inkscape:_name>Letter</inkscape:_name> - <inkscape:_shortdesc>Standard letter sheet - 612x792</inkscape:_shortdesc> - <inkscape:_keywords>letter 612x792 empty</inkscape:_keywords> + <inkscape:_shortdesc>Standard letter sheet - 8.5"x11"</inkscape:_shortdesc> + <inkscape:_keywords>letter 8.5x11 empty</inkscape:_keywords> </inkscape:_templateinfo> <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> </svg> diff --git a/share/templates/Letter_landscape.svg b/share/templates/Letter_landscape.svg index 531bb9d3e..4800ecba3 100644 --- a/share/templates/Letter_landscape.svg +++ b/share/templates/Letter_landscape.svg @@ -20,8 +20,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.43415836" - inkscape:cx="490" - inkscape:cy="380" + inkscape:cx="528" + inkscape:cy="408" inkscape:current-layer="layer1" /> <metadata> <rdf:RDF> @@ -35,8 +35,8 @@ </metadata> <inkscape:_templateinfo> <inkscape:_name>Letter Landscape</inkscape:_name> - <inkscape:_shortdesc>Standard letter landscape sheet - 792x612</inkscape:_shortdesc> - <inkscape:_keywords>letter landscape 792x612 empty</inkscape:_keywords> + <inkscape:_shortdesc>Standard letter landscape sheet - 11"x8.5"</inkscape:_shortdesc> + <inkscape:_keywords>letter landscape 11x8.5 empty</inkscape:_keywords> </inkscape:_templateinfo> <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> </svg> -- cgit v1.2.3 From c62bc930f1e85d3ab19fb474653ad2db9a41eca5 Mon Sep 17 00:00:00 2001 From: Alvin Penner <penner@vaxxine.com> Date: Wed, 8 Oct 2014 13:05:26 -0400 Subject: avoid round-off error when calculating viewbox transform c2p (Bug 1374614 and Bug 1235279) Fixed bugs: - https://launchpad.net/bugs/1374614 (bzr r13581) --- src/viewbox.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/viewbox.cpp b/src/viewbox.cpp index f59909abc..6d677d57d 100644 --- a/src/viewbox.cpp +++ b/src/viewbox.cpp @@ -164,16 +164,16 @@ void SPViewBox::set_preserveAspectRatio(const gchar* value) { void SPViewBox::apply_viewbox(const Geom::Rect& in) { /* Determine actual viewbox in viewport coordinates */ - double x = 0.0; - double y = 0.0; - double width = in.width(); - double height = in.height(); + float x = 0.0; + float y = 0.0; + float width = in.width(); + float height = in.height(); // std::cout << " width: " << width << " height: " << height << std::endl; if (this->aspect_align != SP_ASPECT_NONE) { /* Things are getting interesting */ - double scalex = in.width() / this->viewBox.width(); - double scaley = in.height() / this->viewBox.height(); + double scalex = in.width() / ((float) this->viewBox.width()); + double scaley = in.height() / ((float) this->viewBox.height()); double scale = (this->aspect_clip == SP_ASPECT_MEET) ? MIN (scalex, scaley) : MAX (scalex, scaley); width = this->viewBox.width() * scale; height = this->viewBox.height() * scale; @@ -217,12 +217,12 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in) { /* Viewbox transform from scale and position */ Geom::Affine q; - q[0] = width / this->viewBox.width(); + q[0] = width / ((float) this->viewBox.width()); q[1] = 0.0; q[2] = 0.0; - q[3] = height / this->viewBox.height(); - q[4] = x - q[0] * this->viewBox.left(); - q[5] = y - q[3] * this->viewBox.top(); + q[3] = height / ((float) this->viewBox.height()); + q[4] = x - q[0] * ((float) this->viewBox.left()); + q[5] = y - q[3] * ((float) this->viewBox.top()); // std::cout << " q\n" << q << std::endl; -- cgit v1.2.3 From dcf222167e512abb39c83f6e885ed35ea8b1e802 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Wed, 8 Oct 2014 20:36:22 +0200 Subject: Add proper 'viewBox', set 'inkscape:document-units', increased maximum emsize to 2048 (typical of TrueType). (bzr r13341.1.261) --- share/extensions/setup_typography_canvas.inx | 10 +++++----- share/extensions/setup_typography_canvas.py | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/share/extensions/setup_typography_canvas.inx b/share/extensions/setup_typography_canvas.inx index 332a14ade..8e7739b5c 100644 --- a/share/extensions/setup_typography_canvas.inx +++ b/share/extensions/setup_typography_canvas.inx @@ -4,11 +4,11 @@ <id>org.inkscape.typography.setuptypographycanvas</id> <dependency type="executable" location="extensions">inkex.py</dependency> <dependency type="executable" location="extensions">setup_typography_canvas.py</dependency> - <param name="emsize" type="int" _gui-text="Em-size:" min="10" max="2000">1000</param> - <param name="ascender" type="int" _gui-text="Ascender:" min="0" max="2000">750</param> - <param name="caps" type="int" _gui-text="Caps Height:" min="0" max="2000">700</param> - <param name="xheight" type="int" _gui-text="X-Height:" min="0" max="2000">500</param> - <param name="descender" type="int" _gui-text="Descender:" min="0" max="1000">250</param> + <param name="emsize" type="int" _gui-text="Em-size:" min="10" max="2048">1000</param> + <param name="ascender" type="int" _gui-text="Ascender:" min="0" max="2048">750</param> + <param name="caps" type="int" _gui-text="Caps Height:" min="0" max="2048">700</param> + <param name="xheight" type="int" _gui-text="X-Height:" min="0" max="2048">500</param> + <param name="descender" type="int" _gui-text="Descender:" min="0" max="1024">250</param> <effect> <object-type>all</object-type> <effects-menu> diff --git a/share/extensions/setup_typography_canvas.py b/share/extensions/setup_typography_canvas.py index 197aeb77e..a1000f2d1 100755 --- a/share/extensions/setup_typography_canvas.py +++ b/share/extensions/setup_typography_canvas.py @@ -69,6 +69,7 @@ class SetupTypographyCanvas(inkex.Effect): self.svg = self.document.getroot() self.svg.set("width", str(emsize)) self.svg.set("height", str(emsize)) + self.svg.set("viewBox", "0 0 " + str(emsize) + " " + str(emsize) ) baseline = descender # Create guidelines @@ -78,6 +79,12 @@ class SetupTypographyCanvas(inkex.Effect): self.create_horizontal_guideline("xheight", baseline+xheight) self.create_horizontal_guideline("descender", baseline-descender) + namedview = self.svg.find(inkex.addNS('namedview', 'sodipodi')) + namedview.set(inkex.addNS('document-units', 'inkscape'), 'px') + namedview.set(inkex.addNS('cx', 'inkscape'), str(emsize/2.0 )) + namedview.set(inkex.addNS('cy', 'inkscape'), str(emsize/2.0 )) + + if __name__ == '__main__': e = SetupTypographyCanvas() e.affect() -- cgit v1.2.3 From 8e6879acee859f216f5e63d97a4ba80c7cb0b94b Mon Sep 17 00:00:00 2001 From: "Liam P. White" <inkscapebrony@gmail.com> Date: Wed, 8 Oct 2014 18:56:12 -0400 Subject: Fix gtk3 build at risk of breaking windows build (bzr r13341.1.262) --- src/ui/widget/highlight-picker.cpp | 10 +--------- src/ui/widget/insertordericon.cpp | 9 --------- src/ui/widget/insertordericon.h | 4 ++-- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp index c03f526dc..8593f0bdf 100644 --- a/src/ui/widget/highlight-picker.cpp +++ b/src/ui/widget/highlight-picker.cpp @@ -7,19 +7,11 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#include <glibmm.h> #include <gtkmm/icontheme.h> - -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif #include "display/cairo-utils.h" - #include "highlight-picker.h" #include "widgets/icon.h" #include "widgets/toolbox.h" diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp index 17930daa2..a28b0f834 100644 --- a/src/ui/widget/insertordericon.cpp +++ b/src/ui/widget/insertordericon.cpp @@ -9,15 +9,6 @@ #include "ui/widget/insertordericon.h" -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - - #include <gtkmm/icontheme.h> #include "widgets/icon.h" diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h index e6c2e1c5b..fb3412d3f 100644 --- a/src/ui/widget/insertordericon.h +++ b/src/ui/widget/insertordericon.h @@ -10,12 +10,12 @@ */ #if HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif +#include <glibmm.h> #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> -#include <glibmm/property.h> namespace Inkscape { namespace UI { -- cgit v1.2.3 From f11f0a40d6a7f087512a0d1c52ebde5dbba2a76f Mon Sep 17 00:00:00 2001 From: "Liam P. White" <inkscapebrony@gmail.com> Date: Wed, 8 Oct 2014 20:24:25 -0400 Subject: Un-deprecate NodeEventVector - The resulting refactoring from such a deprecation will not be worth the effort applied to it, and the current system is not wrong or broken. (bzr r13341.1.263) --- src/xml/node-event-vector.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/xml/node-event-vector.h b/src/xml/node-event-vector.h index 416640b86..16add2960 100644 --- a/src/xml/node-event-vector.h +++ b/src/xml/node-event-vector.h @@ -58,11 +58,7 @@ struct NodeEventVector { void (* attr_changed) (Node *repr, char const *key, char const *oldval, char const *newval, bool is_interactive, void* data); void (* content_changed) (Node *repr, char const *oldcontent, char const *newcontent, void * data); void (* order_changed) (Node *repr, Node *child, Node *oldref, Node *newref, void* data); -} -#ifdef __GNUC__ -__attribute__((deprecated)) -#endif -; +}; } } -- cgit v1.2.3 From 0dc05429417f53ea871f40505f65de97480d71a3 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Thu, 9 Oct 2014 11:06:21 +0200 Subject: Add comment. (bzr r13582) --- src/viewbox.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/viewbox.cpp b/src/viewbox.cpp index 6d677d57d..662b05686 100644 --- a/src/viewbox.cpp +++ b/src/viewbox.cpp @@ -164,6 +164,7 @@ void SPViewBox::set_preserveAspectRatio(const gchar* value) { void SPViewBox::apply_viewbox(const Geom::Rect& in) { /* Determine actual viewbox in viewport coordinates */ + /* These are floats since SVGLength is a float: See bug 1374614 */ float x = 0.0; float y = 0.0; float width = in.width(); -- cgit v1.2.3 From 7245058959fe4437b76b481e8ee32ceeaee78a38 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Thu, 9 Oct 2014 11:10:01 +0200 Subject: Allow <sodipodi:namedview> attributes to be set by scripts. (bzr r13583) --- src/extension/implementation/script.cpp | 144 ++++++++++++++++++-------------- 1 file changed, 82 insertions(+), 62 deletions(-) diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index f0fd3711b..f9241b1b7 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -1,28 +1,18 @@ -/** \file - * Code for handling extensions (i.e.\ scripts). - */ -/* +/** + * Code for handling extensions (i.e. scripts). + * * Authors: * Bryce Harrington <bryce@osdl.org> * Ted Gould <ted@gould.cx> * Jon A. Cruz <jon@joncruz.org> * Abhishek Sharma * - * Copyright (C) 2002-2005,2007 Authors + * Copyright (C) 2002-2007 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ -#define __INKSCAPE_EXTENSION_IMPLEMENTATION_SCRIPT_C__ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - +#include <glibmm.h> #include <gtkmm/messagedialog.h> #include <gtkmm/main.h> #include <gtkmm/scrolledwindow.h> @@ -32,44 +22,38 @@ #include <unistd.h> #include <errno.h> -#include <glib.h> #include <glib/gstdio.h> -#include "ui/view/view.h" #include "desktop-handles.h" #include "desktop.h" -#include "selection.h" -#include "sp-namedview.h" -#include "io/sys.h" -#include "preferences.h" -#include "../system.h" +#include "dialogs/dialog-events.h" #include "extension/effect.h" #include "extension/output.h" #include "extension/input.h" #include "extension/db.h" -#include "script.h" -#include "dialogs/dialog-events.h" #include "inkscape.h" +#include "io/sys.h" +#include "preferences.h" +#include "script.h" +#include "selection.h" +#include "sp-namedview.h" +#include "extension/system.h" +#include "ui/view/view.h" #include "xml/node.h" #include "xml/attribute-record.h" #include "util/glib-list-iterators.h" #include "path-prefix.h" - #ifdef WIN32 #include <windows.h> #include <sys/stat.h> #include "registrytool.h" #endif - - /** This is the command buffer that gets allocated from the stack */ #define BUFSIZE (255) - - /* Namespaces */ namespace Inkscape { namespace Extension { @@ -742,12 +726,12 @@ void Script::effect(Inkscape::Extension::Effect *module, vd->emitReconstructionStart(); copy_doc(vd->rroot, mydoc->rroot); vd->emitReconstructionFinish(); - SPObject *layer = NULL; - + // Getting the named view from the document generated by the extension SPNamedView *nv = sp_document_namedview(mydoc, NULL); //Check if it has a default layer set up + SPObject *layer = NULL; if ( nv != NULL) { if( nv->default_layer_id != 0 ) { @@ -776,19 +760,21 @@ void Script::effect(Inkscape::Extension::Effect *module, /** - \brief A function to take all the svg elements from one document - and put them in another. - \param oldroot The root node of the document to be replaced - \param newroot The root node of the document to replace it with - - This function first deletes all of the data in the old document. It - does this by creating a list of what needs to be deleted, and then - goes through the list. This two pass approach removes issues with - the list being change while parsing through it. Lots of nasty bugs. - - Then, it goes through the new document, duplicating all of the - elements and putting them into the old document. The copy - is then complete. + \brief A function to replace all the elements in an old document + by those from a new document. + document and repinserts them into an emptied old document. + \param oldroot The root node of the old (destination) document. + \param newroot The root node of the new (source) document. + + This function first deletes all the elements in the old document by + making two pass, the first to create a list of the old elements and + the second to actually delete them. This two pass approach removes issues + with the list being change while parsing through it... lots of nasty bugs. + + Then, it copies all the element in the new document into the old document. + + Finally, it replaces the attributes in the root element of the old document + by the attributes in root of the new document. */ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newroot) { @@ -797,9 +783,21 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr g_warning("Error on copy_doc: NULL pointer input."); return; } + + // For copying attributes in root and in namedview + using Inkscape::Util::List; + using Inkscape::XML::AttributeRecord; + + // Question: Why is the "sodipodi:namedview" special? Treating it as a normal + // elmement results in crashes. + // Seems to be a bug: + // http://inkscape.13.x6.nabble.com/Effect-that-modifies-the-document-properties-tt2822126.html + std::vector<Inkscape::XML::Node *> delete_list; Inkscape::XML::Node * oldroot_namedview = NULL; + Inkscape::XML::Node * newroot_namedview = NULL; + // Make list for (Inkscape::XML::Node * child = oldroot->firstChild(); child != NULL; child = child->next()) { @@ -814,14 +812,18 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr delete_list.push_back(child); } } + + // Unparent (delete) for (unsigned int i = 0; i < delete_list.size(); i++) { sp_repr_unparent(delete_list[i]); } + // Copy for (Inkscape::XML::Node * child = newroot->firstChild(); child != NULL; child = child->next()) { if (!strcmp("sodipodi:namedview", child->name())) { + newroot_namedview = child; if (oldroot_namedview != NULL) { for (Inkscape::XML::Node * newroot_namedview_child = child->firstChild(); newroot_namedview_child != NULL; @@ -834,26 +836,44 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr } } - { - using Inkscape::Util::List; - using Inkscape::XML::AttributeRecord; - std::vector<gchar const *> attribs; + std::vector<gchar const *> attribs; - // Make a list of all attributes of the old root node. - for (List<AttributeRecord const> iter = oldroot->attributeList(); iter; ++iter) { - attribs.push_back(g_quark_to_string(iter->key)); - } + // Must explicitly copy root attributes. - // Delete the attributes of the old root nodes. - for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) { - oldroot->setAttribute(*it, NULL); - } + // Make a list of all attributes of the old root node. + for (List<AttributeRecord const> iter = oldroot->attributeList(); iter; ++iter) { + attribs.push_back(g_quark_to_string(iter->key)); + } - // Set the new attributes. - for (List<AttributeRecord const> iter = newroot->attributeList(); iter; ++iter) { - gchar const *name = g_quark_to_string(iter->key); - oldroot->setAttribute(name, newroot->attribute(name)); - } + // Delete the attributes of the old root node. + for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) { + oldroot->setAttribute(*it, NULL); + } + + // Set the new attributes. + for (List<AttributeRecord const> iter = newroot->attributeList(); iter; ++iter) { + gchar const *name = g_quark_to_string(iter->key); + oldroot->setAttribute(name, newroot->attribute(name)); + } + + attribs.clear(); + + // Must explicitly copy namedview attributes. + + // Make a list of all attributes of the old namedview node. + for (List<AttributeRecord const> iter = oldroot_namedview->attributeList(); iter; ++iter) { + attribs.push_back(g_quark_to_string(iter->key)); + } + + // Delete the attributes of the old namedview node. + for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) { + oldroot_namedview->setAttribute(*it, NULL); + } + + // Set the new attributes. + for (List<AttributeRecord const> iter = newroot_namedview->attributeList(); iter; ++iter) { + gchar const *name = g_quark_to_string(iter->key); + oldroot_namedview->setAttribute(name, newroot_namedview->attribute(name)); } /** \todo Restore correct layer */ @@ -1063,4 +1083,4 @@ int Script::execute (const std::list<std::string> &in_command, fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : -- cgit v1.2.3 From e78edc8f66d94a44d0cb4e4c9db9a14690ef10b9 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Thu, 9 Oct 2014 11:21:47 +0200 Subject: Fix 'viewBox' and 'inkscape:document-units', add 'inkscape:cx' and 'inkscape:cy'. (bzr r13584) --- share/extensions/empty_page.py | 77 ++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/share/extensions/empty_page.py b/share/extensions/empty_page.py index dc16bab97..34dee7fc4 100644 --- a/share/extensions/empty_page.py +++ b/share/extensions/empty_page.py @@ -1,5 +1,7 @@ #!/usr/bin/env python +# Rewritten by Tavmjong Bah to add correct viewBox, inkscape:cx, etc. attributes + import inkex class C(inkex.Effect): @@ -8,37 +10,52 @@ class C(inkex.Effect): self.OptionParser.add_option("-s", "--size", action="store", type="string", dest="page_size", default="a4", help="Page size") self.OptionParser.add_option("-o", "--orientation", action="store", type="string", dest="page_orientation", default="vertical", help="Page orientation") - def effect(self): + def effect(self): + + width = 300 + height = 300 + units = 'px' + + if self.options.page_size == "a5": + width = 148 + height= 210 + units = 'mm' + + if self.options.page_size == "a4": + width = 210 + height= 297 + units = 'mm' + + if self.options.page_size == "a3": + width = 297 + height= 420 + units = 'mm' + + if self.options.page_size == "letter": + width = 8.5 + height = 11 + units = 'in' + + if self.options.page_orientation == "horizontal": + width, height = height, width + + root = self.document.getroot() - root.set("width", "12in") - root.set("height", "12in") - if self.options.page_size == "a4" and self.options.page_orientation == "vertical": - root.set("width", "210mm") - root.set("height", "297mm") - if self.options.page_size == "a4" and self.options.page_orientation == "horizontal": - root.set("height", "210mm") - root.set("width", "297mm") - - if self.options.page_size == "a5" and self.options.page_orientation == "vertical": - root.set("width", "148mm") - root.set("height", "210mm") - if self.options.page_size == "a5" and self.options.page_orientation == "horizontal": - root.set("width", "210mm") - root.set("height", "148mm") - - if self.options.page_size == "a3" and self.options.page_orientation == "vertical": - root.set("width", "297mm") - root.set("height", "420mm") - if self.options.page_size == "a3" and self.options.page_orientation == "horizontal": - root.set("width", "420mm") - root.set("height", "297mm") - - if self.options.page_size == "letter" and self.options.page_orientation == "vertical": - root.set("width", "8.5in") - root.set("height", "11in") - if self.options.page_size == "letter" and self.options.page_orientation == "horizontal": - root.set("width", "11in") - root.set("height", "8.5in") + root.set("id", "SVGRoot") + root.set("width", str(width) + units) + root.set("height", str(height) + units) + root.set("viewBox", "0 0 " + str(width) + " " + str(height) ) + + namedview = root.find(inkex.addNS('namedview', 'sodipodi')) + if namedview is None: + namedview = inkex.etree.SubElement( root, inkex.addNS('namedview', 'sodipodi') ); + + namedview.set(inkex.addNS('document-units', 'inkscape'), units) + + # Until units are supported in 'cx', etc. + namedview.set(inkex.addNS('cx', 'inkscape'), str(self.uutounit( width, 'px' )/2.0 ) ) + namedview.set(inkex.addNS('cy', 'inkscape'), str(self.uutounit( height, 'px' )/2.0 ) ) + c = C() c.affect() -- cgit v1.2.3 From 19bb109f2149cc856f8d87b49b230f161a8880b3 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Thu, 9 Oct 2014 11:25:39 +0200 Subject: Add proper 'viewBox', set 'inkscape:document-units', set maximum em-size to 2048 as is typical in TrueType. (bzr r13585) --- share/extensions/setup_typography_canvas.inx | 10 +++++----- share/extensions/setup_typography_canvas.py | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/share/extensions/setup_typography_canvas.inx b/share/extensions/setup_typography_canvas.inx index 332a14ade..8e7739b5c 100644 --- a/share/extensions/setup_typography_canvas.inx +++ b/share/extensions/setup_typography_canvas.inx @@ -4,11 +4,11 @@ <id>org.inkscape.typography.setuptypographycanvas</id> <dependency type="executable" location="extensions">inkex.py</dependency> <dependency type="executable" location="extensions">setup_typography_canvas.py</dependency> - <param name="emsize" type="int" _gui-text="Em-size:" min="10" max="2000">1000</param> - <param name="ascender" type="int" _gui-text="Ascender:" min="0" max="2000">750</param> - <param name="caps" type="int" _gui-text="Caps Height:" min="0" max="2000">700</param> - <param name="xheight" type="int" _gui-text="X-Height:" min="0" max="2000">500</param> - <param name="descender" type="int" _gui-text="Descender:" min="0" max="1000">250</param> + <param name="emsize" type="int" _gui-text="Em-size:" min="10" max="2048">1000</param> + <param name="ascender" type="int" _gui-text="Ascender:" min="0" max="2048">750</param> + <param name="caps" type="int" _gui-text="Caps Height:" min="0" max="2048">700</param> + <param name="xheight" type="int" _gui-text="X-Height:" min="0" max="2048">500</param> + <param name="descender" type="int" _gui-text="Descender:" min="0" max="1024">250</param> <effect> <object-type>all</object-type> <effects-menu> diff --git a/share/extensions/setup_typography_canvas.py b/share/extensions/setup_typography_canvas.py index 197aeb77e..a1000f2d1 100755 --- a/share/extensions/setup_typography_canvas.py +++ b/share/extensions/setup_typography_canvas.py @@ -69,6 +69,7 @@ class SetupTypographyCanvas(inkex.Effect): self.svg = self.document.getroot() self.svg.set("width", str(emsize)) self.svg.set("height", str(emsize)) + self.svg.set("viewBox", "0 0 " + str(emsize) + " " + str(emsize) ) baseline = descender # Create guidelines @@ -78,6 +79,12 @@ class SetupTypographyCanvas(inkex.Effect): self.create_horizontal_guideline("xheight", baseline+xheight) self.create_horizontal_guideline("descender", baseline-descender) + namedview = self.svg.find(inkex.addNS('namedview', 'sodipodi')) + namedview.set(inkex.addNS('document-units', 'inkscape'), 'px') + namedview.set(inkex.addNS('cx', 'inkscape'), str(emsize/2.0 )) + namedview.set(inkex.addNS('cy', 'inkscape'), str(emsize/2.0 )) + + if __name__ == '__main__': e = SetupTypographyCanvas() e.affect() -- cgit v1.2.3 From 259976c863ccdd6c28698125179b20b91da32ec0 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Thu, 9 Oct 2014 14:27:49 +0200 Subject: Apply cx, cy, etc. from template to newly created document window. (bzr r13341.1.264) --- src/ui/dialog/template-widget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index 9758b35ac..f79d166f2 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -24,6 +24,7 @@ #include "document.h" #include "document-undo.h" #include "file.h" +#include "sp-namedview.h" #include "extension/implementation/implementation.h" #include "inkscape.h" @@ -69,7 +70,10 @@ void TemplateWidget::create() _current_template.tpl_effect->effect(desc); DocumentUndo::clearUndo(sp_desktop_document(desc)); sp_desktop_document(desc)->setModifiedSinceSave(false); - + + // Apply cx,cy etc. from document + sp_namedview_window_from_document( desc ); + if (desktop) desktop->clearWaitingCursor(); } -- cgit v1.2.3 From 01a8acb49126aa37fee65b3e350ce69e87abecc8 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Thu, 9 Oct 2014 14:32:16 +0200 Subject: Apply cx, cy, etc. from template to newly created document window. (bzr r13586) --- src/ui/dialog/template-widget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index 9758b35ac..f79d166f2 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -24,6 +24,7 @@ #include "document.h" #include "document-undo.h" #include "file.h" +#include "sp-namedview.h" #include "extension/implementation/implementation.h" #include "inkscape.h" @@ -69,7 +70,10 @@ void TemplateWidget::create() _current_template.tpl_effect->effect(desc); DocumentUndo::clearUndo(sp_desktop_document(desc)); sp_desktop_document(desc)->setModifiedSinceSave(false); - + + // Apply cx,cy etc. from document + sp_namedview_window_from_document( desc ); + if (desktop) desktop->clearWaitingCursor(); } -- cgit v1.2.3 From daa321bfda680f3a65ed9f5f09dcca42e8c65dc7 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Thu, 9 Oct 2014 14:34:04 +0200 Subject: Added comment. (bzr r13341.1.265) --- src/extension/implementation/script.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index 377b872bc..99c882a01 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -790,6 +790,8 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr // Question: Why is the "sodipodi:namedview" special? Treating it as a normal // elmement results in crashes. + // Seems to be a bug: + // http://inkscape.13.x6.nabble.com/Effect-that-modifies-the-document-properties-tt2822126.html std::vector<Inkscape::XML::Node *> delete_list; Inkscape::XML::Node * oldroot_namedview = NULL; -- cgit v1.2.3 From 2a3231bec43e2f0685ba60b5be2d7103f223f68a Mon Sep 17 00:00:00 2001 From: su_v <suv-sf@users.sourceforge.net> Date: Fri, 10 Oct 2014 16:31:55 +0200 Subject: packaging scripts: fix syntax (bzr r13506.1.110) --- packaging/macosx/osx-app.sh | 2 +- packaging/macosx/osx-build.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index e0cdcb913..8931aca77 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -465,7 +465,7 @@ fi # Add python modules if requested if [ ${add_python} = "true" ]; then - function install_py_modules () + install_py_modules () { # lxml $cp_cmd -RL "$packages_path/lxml" "$pkgpython" diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 7443b1698..3d5e5b1de 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -273,7 +273,7 @@ fi # Utility functions # ---------------------------------------------------------- -function getinkscapeinfo () { +getinkscapeinfo () { osxapp_domain="$BUILDPREFIX/Info" INKVERSION="$(defaults read $osxapp_domain CFBundleVersion)" @@ -288,7 +288,7 @@ function getinkscapeinfo () { } -function checkversion () { +checkversion () { DEPVER="$(pkg-config --modversion $1 2>/dev/null)" if [[ "$?" == "1" ]]; then [[ $2 ]] && DEPVER="$(checkversion-port $2)" || unset DEPVER @@ -301,7 +301,7 @@ function checkversion () { echo "$DEPVER" } -function checkversion-port () { +checkversion-port () { if [[ "$use_port" == "t" ]]; then PORTVER="$(port echo $1 and active 2>/dev/null | cut -d@ -f2 | cut -d_ -f1)" else @@ -310,7 +310,7 @@ function checkversion-port () { echo "$PORTVER" } -function checklicense-port() { +checklicense-port() { if [[ "$use_port" == "t" ]]; then PORTLIC="$(port info --license --line $1 2>/dev/null)" PORTURL="$(port info --homepage --line $1 2>/dev/null)" @@ -325,12 +325,12 @@ function checklicense-port() { echo "$PORTLIC" } -function checkversion-py-module () { +checkversion-py-module () { # python -c "import foo; ..." echo "TODO." } -function buildinfofile () { +buildinfofile () { getinkscapeinfo # Prepare information file echo "Build information on $(date) for $(whoami): -- cgit v1.2.3 From 08851e26fdc2a5f52affae67fd1fb913a512cfe1 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Fri, 10 Oct 2014 20:55:11 +0200 Subject: Added background and no border options. (bzr r13341.1.266) --- share/extensions/empty_page.inx | 21 +++++++++++++++------ share/extensions/empty_page.py | 26 +++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/share/extensions/empty_page.inx b/share/extensions/empty_page.inx index f3f60f796..6882b7273 100644 --- a/share/extensions/empty_page.inx +++ b/share/extensions/empty_page.inx @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <inkscape-extension xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> - <_name>Empty Page</_name> + <_name>Page</_name> <id>org.inkscape.render.empty_page</id> <dependency type="executable" location="extensions">empty_page.py</dependency> <dependency type="executable" location="extensions">inkex.py</dependency> @@ -16,17 +16,26 @@ <item value="horizontal">Horizontal</item> <item value="vertical">Vertical</item> </param> - + + <param name="background" _gui-text="Page background:" type="enum"> + <item value="normal">Normal</item> + <item value="black">Black Opaque</item> + <item value="gray">Gray Opaque</item> + <item value="white">White Opaque</item> + </param> + + <param name="noborder" type="boolean" _gui-text="Hide border">false</param> + <effect needs-live-preview="false"> <object-type>all</object-type> <effects-menu hidden="true" /> </effect> <inkscape:_templateinfo> - <inkscape:_name>Empty page</inkscape:_name> - <inkscape:author>Jan Darowski</inkscape:author> + <inkscape:_name>Page...</inkscape:_name> + <inkscape:author>Jan Darowski, updated by Tavmjong Bah</inkscape:author> <inkscape:_shortdesc>Empty page of chosen size.</inkscape:_shortdesc> - <inkscape:date>2013-09-10</inkscape:date> - <inkscape:_keywords>empty sheet a4 a3 a5 letter</inkscape:_keywords> + <inkscape:date>2014-10-06</inkscape:date> + <inkscape:_keywords>empty sheet a4 a3 a5 letter black white opaque</inkscape:_keywords> </inkscape:_templateinfo> <script> <command reldir="extensions" interpreter="python">empty_page.py</command> diff --git a/share/extensions/empty_page.py b/share/extensions/empty_page.py index 34dee7fc4..3c1f67041 100644 --- a/share/extensions/empty_page.py +++ b/share/extensions/empty_page.py @@ -9,6 +9,8 @@ class C(inkex.Effect): inkex.Effect.__init__(self) self.OptionParser.add_option("-s", "--size", action="store", type="string", dest="page_size", default="a4", help="Page size") self.OptionParser.add_option("-o", "--orientation", action="store", type="string", dest="page_orientation", default="vertical", help="Page orientation") + self.OptionParser.add_option("-b", "--background", action="store", type="string", dest="page_background", default="normal", help="Page background") + self.OptionParser.add_option("-n", "--noborder", action="store", type="inkbool", dest="page_noborder", default=False) def effect(self): @@ -39,7 +41,6 @@ class C(inkex.Effect): if self.options.page_orientation == "horizontal": width, height = height, width - root = self.document.getroot() root.set("id", "SVGRoot") root.set("width", str(width) + units) @@ -57,5 +58,28 @@ class C(inkex.Effect): namedview.set(inkex.addNS('cy', 'inkscape'), str(self.uutounit( height, 'px' )/2.0 ) ) + if self.options.page_background == "white": + namedview.set( 'pagecolor', "#ffffff" ) + namedview.set( 'bordercolor', "#666666" ) + namedview.set(inkex.addNS('pageopacity', 'inkscape'), "1.0" ) + namedview.set(inkex.addNS('pageshadow', 'inkscape'), "0" ) + + if self.options.page_background == "gray": + namedview.set( 'pagecolor', "#808080" ) + namedview.set( 'bordercolor', "#444444" ) + namedview.set(inkex.addNS('pageopacity', 'inkscape'), "1.0" ) + namedview.set(inkex.addNS('pageshadow', 'inkscape'), "0" ) + + if self.options.page_background == "black": + namedview.set( 'pagecolor', "#000000" ) + namedview.set( 'bordercolor', "#999999" ) + namedview.set(inkex.addNS('pageopacity', 'inkscape'), "1.0" ) + namedview.set(inkex.addNS('pageshadow', 'inkscape'), "0" ) + + if self.options.page_noborder: + pagecolor = namedview.get( 'pagecolor' ) + namedview.set( 'bordercolor', pagecolor ) + namedview.set( 'borderopacity', "0" ) + c = C() c.affect() -- cgit v1.2.3 From e18383b3ae2e644cabdcccbbdaf3da850a62e814 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Fri, 10 Oct 2014 20:56:07 +0200 Subject: New procedural templates. (bzr r13341.1.267) --- share/extensions/empty_business_card.inx | 32 +++++++++++++ share/extensions/empty_business_card.py | 45 ++++++++++++++++++ share/extensions/empty_desktop.inx | 39 +++++++++++++++ share/extensions/empty_desktop.py | 46 ++++++++++++++++++ share/extensions/empty_dvd_cover.inx | 31 ++++++++++++ share/extensions/empty_dvd_cover.py | 64 +++++++++++++++++++++++++ share/extensions/empty_generic.inx | 47 ++++++++++++++++++ share/extensions/empty_generic.py | 82 ++++++++++++++++++++++++++++++++ share/extensions/empty_icon.inx | 24 ++++++++++ share/extensions/empty_icon.py | 36 ++++++++++++++ share/extensions/empty_video.inx | 35 ++++++++++++++ share/extensions/empty_video.py | 46 ++++++++++++++++++ 12 files changed, 527 insertions(+) create mode 100644 share/extensions/empty_business_card.inx create mode 100644 share/extensions/empty_business_card.py create mode 100644 share/extensions/empty_desktop.inx create mode 100644 share/extensions/empty_desktop.py create mode 100644 share/extensions/empty_dvd_cover.inx create mode 100644 share/extensions/empty_dvd_cover.py create mode 100644 share/extensions/empty_generic.inx create mode 100644 share/extensions/empty_generic.py create mode 100644 share/extensions/empty_icon.inx create mode 100644 share/extensions/empty_icon.py create mode 100644 share/extensions/empty_video.inx create mode 100644 share/extensions/empty_video.py diff --git a/share/extensions/empty_business_card.inx b/share/extensions/empty_business_card.inx new file mode 100644 index 000000000..1513ebf26 --- /dev/null +++ b/share/extensions/empty_business_card.inx @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<inkscape-extension xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> + <_name>Business Card</_name> + <id>org.inkscape.render.empty_business_card</id> + <dependency type="executable" location="extensions">business_card.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + + <param name="size" _gui-text="Business card size:" type="enum"> + <item value="74mmx52mm">74mm x 52mm (A8)</item> + <item value="85mmx55mm">85mm x 55mm (Europe)</item> + <item value="90mmx55mm">90mm x 55mm (Australia, India, ...)</item> + <item value="91mmx55mm">91mm x 55mm (Japan)</item> + <item value="90mmx54mm">90mm x 54mm (China, ...)</item> + <item value="90mmx50mm">90mm x 50mm (India, Russia, ...)</item> + <item value="3.5inx2in">3.5in x 2in (United States, Canada)</item> + </param> + + <effect needs-live-preview="false"> + <object-type>all</object-type> + <effects-menu hidden="true" /> + </effect> + <inkscape:_templateinfo> + <inkscape:_name>Business Card...</inkscape:_name> + <inkscape:author>Tavmjong Bah</inkscape:author> + <inkscape:_shortdesc>Business card of chosen size.</inkscape:_shortdesc> + <inkscape:date>2014-10-09</inkscape:date> + <inkscape:_keywords>business card</inkscape:_keywords> + </inkscape:_templateinfo> + <script> + <command reldir="extensions" interpreter="python">business_card.py</command> + </script> +</inkscape-extension> diff --git a/share/extensions/empty_business_card.py b/share/extensions/empty_business_card.py new file mode 100644 index 000000000..586c37abc --- /dev/null +++ b/share/extensions/empty_business_card.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python + +# Written by Tavmjong Bah + +import inkex +import re + +class C(inkex.Effect): + def __init__(self): + inkex.Effect.__init__(self) + self.OptionParser.add_option("-s", "--size", action="store", type="string", dest="card_size", default="90mmx55mm", help="Business card size") + + def effect(self): + + size = self.options.card_size + + p = re.compile('([0-9.]*)([a-z][a-z])x([0-9.]*)([a-z][a-z])') + m = p.match( size ) + width = m.group(1) + width_unit = m.group(2) + height = m.group(3) + height_unit = m.group(4) + + root = self.document.getroot() + root.set("id", "SVGRoot") + root.set("width", width + width_unit) + root.set("height", height + height_unit) + root.set("viewBox", "0 0 " + width + " " + height ) + + namedview = root.find(inkex.addNS('namedview', 'sodipodi')) + if namedview is None: + namedview = inkex.etree.SubElement( root, inkex.addNS('namedview', 'sodipodi') ); + + namedview.set(inkex.addNS('document-units', 'inkscape'), width_unit) + + width_int = int(self.uutounit(float(width), 'px')) + height_int = int(self.uutounit(float(height), 'px')) + + namedview.set(inkex.addNS('zoom', 'inkscape'), str(2) ) + namedview.set(inkex.addNS('cx', 'inkscape'), str(width_int/2.0) ) + namedview.set(inkex.addNS('cy', 'inkscape'), str(height_int/2.0) ) + + +c = C() +c.affect() diff --git a/share/extensions/empty_desktop.inx b/share/extensions/empty_desktop.inx new file mode 100644 index 000000000..75762b660 --- /dev/null +++ b/share/extensions/empty_desktop.inx @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<inkscape-extension xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> + <_name>Desktop</_name> + <id>org.inkscape.render.empty_desktop</id> + <dependency type="executable" location="extensions">empty_desktop.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + + <param name="size" _gui-text="Desktop size:" type="enum"> + <item value="Custom">Custom</item> + <item value="640x480">640x480 (VGA)</item> + <item value="800x600">800x600 (SVGA)</item> + <item value="1024x768">1024x768 (XGA)</item> + <item value="1366x768">1366x768 (HD)</item> + <item value="1600x900">1600x900 (HD+)</item> + <item value="1600x1200">1600x1200 (UXGA)</item> + <item value="1920x1080">1920x1080 (FHD)</item> + <item value="1920x1200">1920x1200 (WUXGA)</item> + <item value="2560x1600">2560x1600 (WQXGA)</item> + </param> + + <!-- Maximum size is '16k' --> + <param name="width" _gui-text="Custom Width:" type="int" min="240" max="15360">1920</param> + <param name="height" _gui-text="Custom Height:" type="int" min="160" max="8640">1080</param> + + <effect needs-live-preview="false"> + <object-type>all</object-type> + <effects-menu hidden="true" /> + </effect> + <inkscape:_templateinfo> + <inkscape:_name>Desktop...</inkscape:_name> + <inkscape:author>Tavmjong Bah</inkscape:author> + <inkscape:_shortdesc>Empty desktop of chosen size.</inkscape:_shortdesc> + <inkscape:date>2014-10-09</inkscape:date> + <inkscape:_keywords>empty desktop</inkscape:_keywords> + </inkscape:_templateinfo> + <script> + <command reldir="extensions" interpreter="python">empty_desktop.py</command> + </script> +</inkscape-extension> diff --git a/share/extensions/empty_desktop.py b/share/extensions/empty_desktop.py new file mode 100644 index 000000000..31cb35f9d --- /dev/null +++ b/share/extensions/empty_desktop.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python + +# Written by Tavmjong Bah + +import inkex +import re + +class C(inkex.Effect): + def __init__(self): + inkex.Effect.__init__(self) + self.OptionParser.add_option("-s", "--size", action="store", type="string", dest="desktop_size", default="16", help="Desktop size") + + self.OptionParser.add_option("-w", "--width", action="store", type="int", dest="desktop_width", default="1920", help="Custom width") + self.OptionParser.add_option("-z", "--height", action="store", type="int", dest="desktop_height", default="1080", help="Custom height") + + def effect(self): + + size = self.options.desktop_size + width = self.options.desktop_width + height = self.options.desktop_height + + if size != "Custom": + p = re.compile('([0-9]*)x([0-9]*)') + m = p.match( size ) + width = int(m.group(1)) + height = int(m.group(2)) + + + root = self.document.getroot() + root.set("id", "SVGRoot") + root.set("width", str(width) + 'px') + root.set("height", str(height) + 'px') + root.set("viewBox", "0 0 " + str(width) + " " + str(height) ) + + namedview = root.find(inkex.addNS('namedview', 'sodipodi')) + if namedview is None: + namedview = inkex.etree.SubElement( root, inkex.addNS('namedview', 'sodipodi') ); + + namedview.set(inkex.addNS('document-units', 'inkscape'), 'px') + + namedview.set(inkex.addNS('cx', 'inkscape'), str(width/2.0) ) + namedview.set(inkex.addNS('cy', 'inkscape'), str(height/2.0) ) + + +c = C() +c.affect() diff --git a/share/extensions/empty_dvd_cover.inx b/share/extensions/empty_dvd_cover.inx new file mode 100644 index 000000000..facb523d1 --- /dev/null +++ b/share/extensions/empty_dvd_cover.inx @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<inkscape-extension xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> + <_name>DVD Cover</_name> + <id>org.inkscape.render.empty_dvd_cover</id> + <dependency type="executable" location="extensions">empty_dvd_cover.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + + <param name="spine" _gui-text="DVD spine width:" type="enum"> + <item value="14">Normal (14mm)</item> + <item value="9">Slim (9mm)</item> + <item value="7">Super Slim (7mm)</item> + <item value="5">Ultra Slim (5mm)</item> + </param> + + <param name="bleed" _gui-text="DVD cover bleed (mm):" type="float" min="0" max="25">3</param> + + <effect needs-live-preview="false"> + <object-type>all</object-type> + <effects-menu hidden="true" /> + </effect> + <inkscape:_templateinfo> + <inkscape:_name>DVD Cover...</inkscape:_name> + <inkscape:author>Tavmjong Bah</inkscape:author> + <inkscape:_shortdesc>DVD cover of chosen size.</inkscape:_shortdesc> + <inkscape:date>2014-10-10</inkscape:date> + <inkscape:_keywords>dvd cover</inkscape:_keywords> + </inkscape:_templateinfo> + <script> + <command reldir="extensions" interpreter="python">empty_dvd_cover.py</command> + </script> +</inkscape-extension> diff --git a/share/extensions/empty_dvd_cover.py b/share/extensions/empty_dvd_cover.py new file mode 100644 index 000000000..1456de51d --- /dev/null +++ b/share/extensions/empty_dvd_cover.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python + +# Written by Tavmjong Bah + +import inkex + +class C(inkex.Effect): + def __init__(self): + inkex.Effect.__init__(self) + self.OptionParser.add_option("-s", "--spine", action="store", type="string", dest="dvd_cover_spine", default="normal", help="Dvd spine width") + self.OptionParser.add_option("-b", "--bleed", action="store", type="float", dest="dvd_cover_bleed", default="3", help="Bleed (extra area around image") + + def create_horizontal_guideline(self, name, position): + self.create_guideline(name, "0,1", 0, position) + + def create_vertical_guideline(self, name, position): + self.create_guideline(name, "1,0", position, 0) + + def create_guideline(self, label, orientation, x,y): + namedview = self.root.find(inkex.addNS('namedview', 'sodipodi')) + guide = inkex.etree.SubElement(namedview, inkex.addNS('guide', 'sodipodi')) + guide.set("orientation", orientation) + guide.set("position", str(x)+","+str(y)) + # No need to set label (causes translation problems, etc.) + # guide.set(inkex.addNS('label', 'inkscape'), label) + + def effect(self): + + # Dimensions in mm + width = 259.0 # Before adding spine width or bleed + height = 183.0 # Before adding bleed + + bleed = self.options.dvd_cover_bleed + spine = float( self.options.dvd_cover_spine ) + + width += spine + width += 2.0 * bleed + height += 2.0 * bleed + + self.root = self.document.getroot() + self.root.set("id", "SVGRoot") + self.root.set("width", str(width) + 'mm') + self.root.set("height", str(height) + 'mm') + self.root.set("viewBox", "0 0 " + str(width) + " " + str(height) ) + + namedview = self.root.find(inkex.addNS('namedview', 'sodipodi')) + if namedview is None: + namedview = inkex.etree.SubElement( self.root, inkex.addNS('namedview', 'sodipodi') ); + + namedview.set(inkex.addNS('document-units', 'inkscape'), "mm") + + # Until units are supported in 'cx', etc. + namedview.set(inkex.addNS('cx', 'inkscape'), str(self.uutounit( width, 'px' )/2.0 ) ) + namedview.set(inkex.addNS('cy', 'inkscape'), str(self.uutounit( height, 'px' )/2.0 ) ) + + self.create_horizontal_guideline("bottom", str(self.uutounit( bleed, 'px' )) ) + self.create_horizontal_guideline("top", str(self.uutounit( height-bleed, 'px' )) ) + self.create_vertical_guideline("left edge", str(self.uutounit( bleed, 'px' )) ) + self.create_vertical_guideline("left spline", str(self.uutounit( (width-spine)/2.0,'px' )) ) + self.create_vertical_guideline("right spline", str(self.uutounit( (width+spine)/2.0,'px' )) ) + self.create_vertical_guideline("left edge", str(self.uutounit( width-bleed, 'px' )) ) + +c = C() +c.affect() diff --git a/share/extensions/empty_generic.inx b/share/extensions/empty_generic.inx new file mode 100644 index 000000000..b430cfba5 --- /dev/null +++ b/share/extensions/empty_generic.inx @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<inkscape-extension xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> + <_name>Generic Canvas</_name> + <id>org.inkscape.render.empty_generic_canvas</id> + <dependency type="executable" location="extensions">empty_generic.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + + <param name="width" _gui-text="Custom Width:" type="float" min="1" max="15360">800</param> + <param name="height" _gui-text="Custom Height:" type="float" min="1" max="8640">600</param> + + <param name="unit" _gui-text="SVG Unit:" type="enum"> + <item value="px">'px'</item> + <item value="in">'in'</item> + <item value="mm">'mm'</item> + <item value="cm">'cm'</item> + <item value="pc">'pc'</item> + <item value="pt">'pt'</item> + </param> + + <param name="background" _gui-text="Canvas background:" type="enum"> + <item value="normal">Normal</item> + <item value="black">Black Opaque</item> + <item value="gray">Gray Opaque</item> + <item value="white">White Opaque</item> + </param> + + <param name="noborder" type="boolean" _gui-text="Hide border">false</param> + + <!-- + <param name="layer" type="boolean" _gui-text="Include default layer">true</param> + --> + + <effect needs-live-preview="false"> + <object-type>all</object-type> + <effects-menu hidden="true" /> + </effect> + <inkscape:_templateinfo> + <inkscape:_name>Generic canvas...</inkscape:_name> + <inkscape:author>Tavmjong Bah</inkscape:author> + <inkscape:_shortdesc>Genric canvas of choosen size.</inkscape:_shortdesc> + <inkscape:date>2014-10-09</inkscape:date> + <inkscape:_keywords>empty generic canvas</inkscape:_keywords> + </inkscape:_templateinfo> + <script> + <command reldir="extensions" interpreter="python">empty_generic.py</command> + </script> +</inkscape-extension> diff --git a/share/extensions/empty_generic.py b/share/extensions/empty_generic.py new file mode 100644 index 000000000..62e27d220 --- /dev/null +++ b/share/extensions/empty_generic.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python + +# Written by Tavmjong Bah + +import inkex +import re + +class C(inkex.Effect): + def __init__(self): + inkex.Effect.__init__(self) + self.OptionParser.add_option("-w", "--width", action="store", type="int", dest="generic_width", default="1920", help="Custom width") + self.OptionParser.add_option("-z", "--height", action="store", type="int", dest="generic_height", default="1080", help="Custom height") + self.OptionParser.add_option("-u", "--unit", action="store", type="string", dest="generic_unit", default="px", help="SVG Unit") + self.OptionParser.add_option("-b", "--background", action="store", type="string", dest="generic_background", default="normal", help="Canvas background") + self.OptionParser.add_option("-n", "--noborder", action="store", type="inkbool", dest="generic_noborder", default=False) + # self.OptionParser.add_option("-l", "--layer", action="store", type="inkbool", dest="generic_layer", default=True) + + def effect(self): + + width = self.options.generic_width + height = self.options.generic_height + unit = self.options.generic_unit + + root = self.document.getroot() + root.set("id", "SVGRoot") + root.set("width", str(width) + unit) + root.set("height", str(height) + unit) + root.set("viewBox", "0 0 " + str(width) + " " + str(height) ) + + namedview = root.find(inkex.addNS('namedview', 'sodipodi')) + if namedview is None: + namedview = inkex.etree.SubElement( root, inkex.addNS('namedview', 'sodipodi') ); + + namedview.set(inkex.addNS('document-units', 'inkscape'), unit) + + # Until units are supported in 'cx', etc. + namedview.set(inkex.addNS('zoom', 'inkscape'), str(512.0/self.uutounit( width, 'px' )) ) + namedview.set(inkex.addNS('cx', 'inkscape'), str(self.uutounit( width, 'px' )/2.0 ) ) + namedview.set(inkex.addNS('cy', 'inkscape'), str(self.uutounit( height, 'px' )/2.0 ) ) + + if self.options.generic_background == "white": + namedview.set( 'pagecolor', "#ffffff" ) + namedview.set( 'bordercolor', "#666666" ) + namedview.set(inkex.addNS('pageopacity', 'inkscape'), "1.0" ) + namedview.set(inkex.addNS('pageshadow', 'inkscape'), "0" ) + + if self.options.generic_background == "gray": + namedview.set( 'pagecolor', "#808080" ) + namedview.set( 'bordercolor', "#444444" ) + namedview.set(inkex.addNS('pageopacity', 'inkscape'), "1.0" ) + namedview.set(inkex.addNS('pageshadow', 'inkscape'), "0" ) + + if self.options.generic_background == "black": + namedview.set( 'pagecolor', "#000000" ) + namedview.set( 'bordercolor', "#999999" ) + namedview.set(inkex.addNS('pageopacity', 'inkscape'), "1.0" ) + namedview.set(inkex.addNS('pageshadow', 'inkscape'), "0" ) + + if self.options.generic_noborder: + pagecolor = namedview.get( 'pagecolor' ) + namedview.set( 'bordercolor', pagecolor ) + namedview.set( 'borderopacity', "0" ) + + # This nees more thought... we need to set "Current layer" to (root), how? + # if self.options.generic_layer: + # # Add layer + # inkex.debug( "We want a layer" ) + # else: + # # Remove layer id default document (assuming only one) + # inkex.debug( "We don't want a layer" ) + # layer_node = self.current_layer + # if layer_node is not None: + # inkex.debug( "We have layer" ) + # root.remove(layer_node) + # try: + # del namedview.attrib[ inkex.addNS('current-layer', 'inkscape') ] + # except: + # pass + + +c = C() +c.affect() diff --git a/share/extensions/empty_icon.inx b/share/extensions/empty_icon.inx new file mode 100644 index 000000000..9e36b9d20 --- /dev/null +++ b/share/extensions/empty_icon.inx @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<inkscape-extension xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> + <_name>Icon</_name> + <id>org.inkscape.render.empty_icon</id> + <dependency type="executable" location="extensions">empty_icon.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + + <param name="size" _gui-text="Icon size:" type="int" min="8" max="256">16</param> + + <effect needs-live-preview="false"> + <object-type>all</object-type> + <effects-menu hidden="true" /> + </effect> + <inkscape:_templateinfo> + <inkscape:_name>Icon...</inkscape:_name> + <inkscape:author>Tavmjong Bah</inkscape:author> + <inkscape:_shortdesc>Empty icon of chosen size.</inkscape:_shortdesc> + <inkscape:date>2014-10-09</inkscape:date> + <inkscape:_keywords>empty icon</inkscape:_keywords> + </inkscape:_templateinfo> + <script> + <command reldir="extensions" interpreter="python">empty_icon.py</command> + </script> +</inkscape-extension> diff --git a/share/extensions/empty_icon.py b/share/extensions/empty_icon.py new file mode 100644 index 000000000..979edbae4 --- /dev/null +++ b/share/extensions/empty_icon.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +# Written by Tavmjong Bah + +import inkex + +class C(inkex.Effect): + def __init__(self): + inkex.Effect.__init__(self) + self.OptionParser.add_option("-s", "--size", action="store", type="int", dest="icon_size", default="16", help="Icon size") + + def effect(self): + + size = self.options.icon_size + + root = self.document.getroot() + root.set("id", "SVGRoot") + root.set("width", str(size) + 'px') + root.set("height", str(size) + 'px') + root.set("viewBox", "0 0 " + str(size) + " " + str(size) ) + + namedview = root.find(inkex.addNS('namedview', 'sodipodi')) + if namedview is None: + namedview = inkex.etree.SubElement( root, inkex.addNS('namedview', 'sodipodi') ); + + namedview.set(inkex.addNS('document-units', 'inkscape'), 'px') + + namedview.set(inkex.addNS('zoom', 'inkscape'), str(256.0/size) ) + namedview.set(inkex.addNS('cx', 'inkscape'), str(size/2.0) ) + namedview.set(inkex.addNS('cy', 'inkscape'), str(size/2.0) ) + namedview.set(inkex.addNS('grid-bbox', 'inkscape'), "true" ) + + + +c = C() +c.affect() diff --git a/share/extensions/empty_video.inx b/share/extensions/empty_video.inx new file mode 100644 index 000000000..8ca148cfc --- /dev/null +++ b/share/extensions/empty_video.inx @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<inkscape-extension xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> + <_name>Video Screen</_name> + <id>org.inkscape.render.empty_video</id> + <dependency type="executable" location="extensions">empty_video.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + + <param name="size" _gui-text="Video size:" type="enum"> + <item value="Custom">Custom</item> + <item value="720x486">720x486 (NTSC)</item> + <item value="720x576">720x576 (PAL)</item> + <item value="1920x1080">1920x1080 (HDTV)</item> + <item value="3840x2160">3840x2160 (4K)</item> + <item value="7680x4320">7680x4320 (8K)</item> + </param> + + <!-- Maximum size is '16k' --> + <param name="width" _gui-text="Custom Width:" type="int" min="240" max="15360">1920</param> + <param name="height" _gui-text="Custom Height:" type="int" min="160" max="8640">1080</param> + + <effect needs-live-preview="false"> + <object-type>all</object-type> + <effects-menu hidden="true" /> + </effect> + <inkscape:_templateinfo> + <inkscape:_name>Video...</inkscape:_name> + <inkscape:author>Tavmjong Bah</inkscape:author> + <inkscape:_shortdesc>Video screen of chosen size.</inkscape:_shortdesc> + <inkscape:date>2014-10-09</inkscape:date> + <inkscape:_keywords>empty video</inkscape:_keywords> + </inkscape:_templateinfo> + <script> + <command reldir="extensions" interpreter="python">empty_video.py</command> + </script> +</inkscape-extension> diff --git a/share/extensions/empty_video.py b/share/extensions/empty_video.py new file mode 100644 index 000000000..4b440704c --- /dev/null +++ b/share/extensions/empty_video.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python + +# Written by Tavmjong Bah + +import inkex +import re + +class C(inkex.Effect): + def __init__(self): + inkex.Effect.__init__(self) + self.OptionParser.add_option("-s", "--size", action="store", type="string", dest="video_size", default="16", help="Video size") + + self.OptionParser.add_option("-w", "--width", action="store", type="int", dest="video_width", default="1920", help="Custom width") + self.OptionParser.add_option("-z", "--height", action="store", type="int", dest="video_height", default="1080", help="Custom height") + + def effect(self): + + size = self.options.video_size + width = self.options.video_width + height = self.options.video_height + + if size != "Custom": + p = re.compile('([0-9]*)x([0-9]*)') + m = p.match( size ) + width = int(m.group(1)) + height = int(m.group(2)) + + + root = self.document.getroot() + root.set("id", "SVGRoot") + root.set("width", str(width) + 'px') + root.set("height", str(height) + 'px') + root.set("viewBox", "0 0 " + str(width) + " " + str(height) ) + + namedview = root.find(inkex.addNS('namedview', 'sodipodi')) + if namedview is None: + namedview = inkex.etree.SubElement( root, inkex.addNS('namedview', 'sodipodi') ); + + namedview.set(inkex.addNS('document-units', 'inkscape'), 'px') + + namedview.set(inkex.addNS('cx', 'inkscape'), str(width/2.0) ) + namedview.set(inkex.addNS('cy', 'inkscape'), str(height/2.0) ) + + +c = C() +c.affect() -- cgit v1.2.3 From 65506bae820a6f4c53e3674dcd058eaadd61b126 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Fri, 10 Oct 2014 21:02:13 +0200 Subject: Updated README (bzr r13341.1.268) --- share/templates/README | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/share/templates/README b/share/templates/README index 38a0be05c..423f25092 100644 --- a/share/templates/README +++ b/share/templates/README @@ -1,21 +1,28 @@ -This folder contains the templates for new documents created in Inkscape. You will -normally see them listed in the File > New submenu. A template may store any -document-specific settings (such as initial zoom and view, paper size, background and -borders, metadata, window geometry, grid and guide settings, export hints) as well as -any objects. To add a new template, simply save or copy it in this folder; nothing else -is required. +This folder contains the templates for new documents created in +Inkscape. You will normally see them listed in the File > New +submenu. A template may store any document-specific settings (such as +initial zoom and view, paper size, background and borders, metadata, +window geometry, grid and guide settings, export hints) as well as any +objects. To add a new template, simply save or copy it to this folder; +nothing else is required. -Files of the mask default.*.svg are the translations of default.svg template into -different languages. The default.svg itself is in English. These translations contain -a translated name of the default layer and possibly different canvas size. Each -language version of Inkscape will only use one of these templates and ignore the rest. +Procedural templates are located in the adjacent 'extension' +directory. By convention, they begin with 'empty'. -Internationalization -This file is internationalized the same way as share/filters/filters/svg -The i18n.py script called from the makefile will extract strings from the *.svg -into a *.svg.h file. Intltool is then able to extracts these strings just like -from normal .h files. +Internationalization: + +Files of the mask default.*.svg are the translations of default.svg +template into different languages. The default.svg itself is in +English. These translations contain a translated name of the default +layer and possibly different canvas size. Each language version of +Inkscape will only use one of these templates and ignore the rest. + +These files are internationalized the same way as +share/filters/filters/svg The i18n.py script called from the makefile +will extract strings from the *.svg files into a *.svg.h +file. Intltool is then able to extracts these strings just like from +normal .h files. The internationalized default files (A4 only) are created using the PERL script "create_defaults.pl" and are based on default.svg. To add -- cgit v1.2.3 From 84fd02b65e523de82abbc965971e6c88cee500be Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Fri, 10 Oct 2014 21:13:24 +0200 Subject: Minor changes. (bzr r13341.1.269) --- share/templates/Typography_Canvas.svg | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/share/templates/Typography_Canvas.svg b/share/templates/Typography_Canvas.svg index f142da13f..42a2919cb 100644 --- a/share/templates/Typography_Canvas.svg +++ b/share/templates/Typography_Canvas.svg @@ -9,9 +9,6 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:version="0.48+devel r10213" - version="1.1" - id="svg2" height="1000" width="1000" sodipodi:docname="Typography_Canvas.svg"> @@ -22,12 +19,13 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.537" + inkscape:zoom="0.5" inkscape:cx="500" inkscape:cy="500" inkscape:document-units="px" - inkscape:current-layer="svg2" + inkscape:current-layer="layer1" showgrid="false" + showguides="true" inkscape:window-width="1280" inkscape:window-height="737" inkscape:window-x="0" @@ -36,27 +34,27 @@ showborder="true" inkscape:showpageshadow="false"> <sodipodi:guide - id="guide45" + id="guide_baseline" inkscape:label="baseline" position="0,253" orientation="0,1" /> <sodipodi:guide - id="guide47" + id="guide_ascender" inkscape:label="ascender" position="0,945" orientation="0,1" /> <sodipodi:guide - id="guide49" + id="guide_caps" inkscape:label="caps" position="0,896" orientation="0,1" /> <sodipodi:guide - id="guide51" + id="guide_xheight" inkscape:label="xheight" position="0,729" orientation="0,1" /> <sodipodi:guide - id="guide53" + id="guide_descender" inkscape:label="descender" position="0,28" orientation="0,1" /> -- cgit v1.2.3 From 740ac58c25023a081a7a52e14a6d9ad1f63953e3 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Fri, 10 Oct 2014 21:13:44 +0200 Subject: Removal of templates replaced by procedural templates. Removal of redundant fontforge_glyph.svg. (bzr r13341.1.270) --- share/templates/A4.svg | 45 ---------- share/templates/A4_landscape.svg | 42 ---------- share/templates/CD_cover_300dpi.svg | 42 ---------- share/templates/DVD_cover_regular_300dpi.svg | 89 -------------------- share/templates/DVD_cover_slim_300dpi.svg | 89 -------------------- share/templates/DVD_cover_superslim_300dpi.svg | 89 -------------------- share/templates/DVD_cover_ultraslim_300dpi.svg | 89 -------------------- share/templates/Letter.svg | 42 ---------- share/templates/Letter_landscape.svg | 42 ---------- share/templates/Makefile.am | 56 ------------- share/templates/black_opaque.svg | 43 ---------- share/templates/business_card_85x54mm.svg | 44 ---------- share/templates/business_card_90x50mm.svg | 44 ---------- share/templates/desktop_1024x768.svg | 42 ---------- share/templates/desktop_1600x1200.svg | 42 ---------- share/templates/desktop_640x480.svg | 42 ---------- share/templates/desktop_800x600.svg | 43 ---------- share/templates/fontforge_glyph.svg | 59 ------------- share/templates/icon_16x16.svg | 47 ----------- share/templates/icon_32x32.svg | 47 ----------- share/templates/icon_48x48.svg | 47 ----------- share/templates/icon_64x64.svg | 48 ----------- share/templates/no_borders.svg | 43 ---------- share/templates/video_HDTV_1920x1080.svg | 44 ---------- share/templates/video_NTSC_720x486.svg | 44 ---------- share/templates/video_PAL_720x576.svg | 44 ---------- share/templates/web_banner_468x60.svg | 42 ---------- share/templates/web_banner_728x90.svg | 42 ---------- share/templates/web_banners.svg | 112 ------------------------- share/templates/white_opaque.svg | 43 ---------- 30 files changed, 1587 deletions(-) delete mode 100644 share/templates/A4.svg delete mode 100644 share/templates/A4_landscape.svg delete mode 100644 share/templates/CD_cover_300dpi.svg delete mode 100644 share/templates/DVD_cover_regular_300dpi.svg delete mode 100644 share/templates/DVD_cover_slim_300dpi.svg delete mode 100644 share/templates/DVD_cover_superslim_300dpi.svg delete mode 100644 share/templates/DVD_cover_ultraslim_300dpi.svg delete mode 100644 share/templates/Letter.svg delete mode 100644 share/templates/Letter_landscape.svg delete mode 100644 share/templates/black_opaque.svg delete mode 100644 share/templates/business_card_85x54mm.svg delete mode 100644 share/templates/business_card_90x50mm.svg delete mode 100644 share/templates/desktop_1024x768.svg delete mode 100644 share/templates/desktop_1600x1200.svg delete mode 100644 share/templates/desktop_640x480.svg delete mode 100644 share/templates/desktop_800x600.svg delete mode 100644 share/templates/fontforge_glyph.svg delete mode 100644 share/templates/icon_16x16.svg delete mode 100644 share/templates/icon_32x32.svg delete mode 100644 share/templates/icon_48x48.svg delete mode 100644 share/templates/icon_64x64.svg delete mode 100644 share/templates/no_borders.svg delete mode 100644 share/templates/video_HDTV_1920x1080.svg delete mode 100644 share/templates/video_NTSC_720x486.svg delete mode 100644 share/templates/video_PAL_720x576.svg delete mode 100644 share/templates/web_banner_468x60.svg delete mode 100644 share/templates/web_banner_728x90.svg delete mode 100644 share/templates/web_banners.svg delete mode 100644 share/templates/white_opaque.svg diff --git a/share/templates/A4.svg b/share/templates/A4.svg deleted file mode 100644 index b7d7968d6..000000000 --- a/share/templates/A4.svg +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="210mm" - height="297mm" - viewBox="0 0 210 297"> - <defs - id="defs3" /> - <sodipodi:namedview - inkscape:document-units="mm" - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.35" - inkscape:cx="350" - inkscape:cy="520" - inkscape:current-layer="layer1" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>A4 Page</inkscape:_name> - <inkscape:_shortdesc>Empty A4 sheet</inkscape:_shortdesc> - <inkscape:_keywords>A4 paper sheet empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/A4_landscape.svg b/share/templates/A4_landscape.svg deleted file mode 100644 index 7d550b3ff..000000000 --- a/share/templates/A4_landscape.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="297mm" - height="210mm" - viewBox="0 0 297 210"> - <defs /> - <sodipodi:namedview - inkscape:document-units="mm" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.43415836" - inkscape:cx="490" - inkscape:cy="380" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>A4 Landscape Page</inkscape:_name> - <inkscape:_shortdesc>Empty A4 landscape sheet</inkscape:_shortdesc> - <inkscape:_keywords>A4 paper sheet empty landscape</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/CD_cover_300dpi.svg b/share/templates/CD_cover_300dpi.svg deleted file mode 100644 index fc23cd48e..000000000 --- a/share/templates/CD_cover_300dpi.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="343pt" - height="340pt" - viewBox="0 0 343 340"> - <defs /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.8" - inkscape:cx="210" - inkscape:cy="210" - inkscape:document-units="pt" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>CD Cover 300dpi</inkscape:_name> - <inkscape:_shortdesc>Empty CD box cover.</inkscape:_shortdesc> - <inkscape:_keywords>CD cover disc disk 300dpi box</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/DVD_cover_regular_300dpi.svg b/share/templates/DVD_cover_regular_300dpi.svg deleted file mode 100644 index b9f471afd..000000000 --- a/share/templates/DVD_cover_regular_300dpi.svg +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="988.58264" - height="669.685" - id="svg1878" - sodipodi:version="0.32" - inkscape:version="0.43+0.44pre3" - version="1.0" - sodipodi:docbase="c:\Program Files\inkscape\share\templates" - sodipodi:docname="DVD_cover_regular_300dpi.svg"> - <defs - id="defs1880" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.76155208" - inkscape:cx="494.29132" - inkscape:cy="334.8425" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - id="namedview1882" - width="279mm" - height="189mm" - units="mm" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-width="1024" - inkscape:window-height="719" - inkscape:window-x="-4" - inkscape:window-y="-4"> - <sodipodi:guide - orientation="vertical" - position="10.629921" - id="guide1887" /> - <sodipodi:guide - orientation="vertical" - position="977.95276" - id="guide1889" /> - <sodipodi:guide - orientation="horizontal" - position="659.05512" - id="guide1891" /> - <sodipodi:guide - orientation="horizontal" - position="10.629921" - id="guide1893" /> - <sodipodi:guide - orientation="vertical" - position="469.48819" - id="guide1895" /> - <sodipodi:guide - orientation="vertical" - position="519.09449" - id="guide1897" /> - </sodipodi:namedview> - <metadata - id="metadata1884"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>DVD Cover Regular 300dpi </inkscape:_name> - <inkscape:author>cmarqu</inkscape:author> - <inkscape:_shortdesc>Template for both-sides DVD covers.</inkscape:_shortdesc> - <inkscape:date>2006-06-21</inkscape:date> - <inkscape:_keywords>DVD cover regular 300dpi</inkscape:_keywords> - </inkscape:_templateinfo> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" /> -</svg> diff --git a/share/templates/DVD_cover_slim_300dpi.svg b/share/templates/DVD_cover_slim_300dpi.svg deleted file mode 100644 index ee7e1584c..000000000 --- a/share/templates/DVD_cover_slim_300dpi.svg +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="970.86609" - height="669.685" - id="svg1878" - sodipodi:version="0.32" - inkscape:version="0.43+0.44pre3" - version="1.0" - sodipodi:docbase="c:\Program Files\inkscape\share\templates" - sodipodi:docname="DVD_cover_slim_300dpi.svg"> - <defs - id="defs1880" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.76155208" - inkscape:cx="494.29132" - inkscape:cy="334.8425" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - id="namedview1882" - width="273.99999mm" - height="189mm" - units="mm" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-width="1024" - inkscape:window-height="719" - inkscape:window-x="-4" - inkscape:window-y="-4"> - <sodipodi:guide - orientation="vertical" - position="10.629921" - id="guide1887" /> - <sodipodi:guide - orientation="vertical" - position="960.23622" - id="guide1889" /> - <sodipodi:guide - orientation="horizontal" - position="659.05512" - id="guide1891" /> - <sodipodi:guide - orientation="horizontal" - position="10.629921" - id="guide1893" /> - <sodipodi:guide - orientation="vertical" - position="469.48819" - id="guide1895" /> - <sodipodi:guide - orientation="vertical" - position="501.37795" - id="guide1897" /> - </sodipodi:namedview> - <metadata - id="metadata1884"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>DVD Cover Slim 300dpi </inkscape:_name> - <inkscape:author>cmarqu</inkscape:author> - <inkscape:_shortdesc>Template for both-sides DVD slim covers.</inkscape:_shortdesc> - <inkscape:date>2006-06-21</inkscape:date> - <inkscape:_keywords>DVD cover slim 300dpi</inkscape:_keywords> - </inkscape:_templateinfo> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" /> -</svg> diff --git a/share/templates/DVD_cover_superslim_300dpi.svg b/share/templates/DVD_cover_superslim_300dpi.svg deleted file mode 100644 index fecff3979..000000000 --- a/share/templates/DVD_cover_superslim_300dpi.svg +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="963.77948" - height="669.685" - id="svg1878" - sodipodi:version="0.32" - inkscape:version="0.43+0.44pre3" - version="1.0" - sodipodi:docbase="c:\Program Files\inkscape\share\templates" - sodipodi:docname="DVD_cover_superslim_300dpi.svg"> - <defs - id="defs1880" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.76155208" - inkscape:cx="494.29132" - inkscape:cy="334.8425" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - id="namedview1882" - width="271.99999mm" - height="189mm" - units="mm" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-width="1024" - inkscape:window-height="719" - inkscape:window-x="-4" - inkscape:window-y="-4"> - <sodipodi:guide - orientation="vertical" - position="10.629921" - id="guide1887" /> - <sodipodi:guide - orientation="vertical" - position="953.14961" - id="guide1889" /> - <sodipodi:guide - orientation="horizontal" - position="659.05512" - id="guide1891" /> - <sodipodi:guide - orientation="horizontal" - position="10.629921" - id="guide1893" /> - <sodipodi:guide - orientation="vertical" - position="469.48819" - id="guide1895" /> - <sodipodi:guide - orientation="vertical" - position="494.29134" - id="guide1897" /> - </sodipodi:namedview> - <metadata - id="metadata1884"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>DVD Cover Superslim 300dpi </inkscape:_name> - <inkscape:author>cmarqu</inkscape:author> - <inkscape:_shortdesc>Template for both-sides DVD superslim covers.</inkscape:_shortdesc> - <inkscape:date>2006-06-21</inkscape:date> - <inkscape:_keywords>DVD cover superslim 300dpi</inkscape:_keywords> - </inkscape:_templateinfo> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" /> -</svg> diff --git a/share/templates/DVD_cover_ultraslim_300dpi.svg b/share/templates/DVD_cover_ultraslim_300dpi.svg deleted file mode 100644 index 79288832e..000000000 --- a/share/templates/DVD_cover_ultraslim_300dpi.svg +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="956.69287" - height="669.685" - id="svg1878" - sodipodi:version="0.32" - inkscape:version="0.43+0.44pre3" - version="1.0" - sodipodi:docbase="c:\Program Files\inkscape\share\templates" - sodipodi:docname="DVD_cover_ultraslim_300dpi.svg"> - <defs - id="defs1880" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.76155208" - inkscape:cx="478.34644" - inkscape:cy="334.8425" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - id="namedview1882" - width="269.99999mm" - height="189mm" - units="mm" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-width="1024" - inkscape:window-height="719" - inkscape:window-x="-4" - inkscape:window-y="-4"> - <sodipodi:guide - orientation="vertical" - position="10.629921" - id="guide1887" /> - <sodipodi:guide - orientation="vertical" - position="946.063" - id="guide1889" /> - <sodipodi:guide - orientation="horizontal" - position="659.05512" - id="guide1891" /> - <sodipodi:guide - orientation="horizontal" - position="10.629921" - id="guide1893" /> - <sodipodi:guide - orientation="vertical" - position="469.48819" - id="guide1895" /> - <sodipodi:guide - orientation="vertical" - position="487.20473" - id="guide1897" /> - </sodipodi:namedview> - <metadata - id="metadata1884"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>DVD Cover Ultraslim 300dpi </inkscape:_name> - <inkscape:author>cmarqu</inkscape:author> - <inkscape:_shortdesc>Template for both-sides DVD ultraslim covers.</inkscape:_shortdesc> - <inkscape:date>2006-06-21</inkscape:date> - <inkscape:_keywords>DVD cover ultraslim 300dpi</inkscape:_keywords> - </inkscape:_templateinfo> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" /> -</svg> diff --git a/share/templates/Letter.svg b/share/templates/Letter.svg deleted file mode 100644 index 227288c12..000000000 --- a/share/templates/Letter.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="8.5in" - height="11in" - viewBox="0 0 8.5 11"> - <defs /> - <sodipodi:namedview - inkscape:document-units="in" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.36" - inkscape:cx="408" - inkscape:cy="528" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Letter</inkscape:_name> - <inkscape:_shortdesc>Standard letter sheet - 8.5"x11"</inkscape:_shortdesc> - <inkscape:_keywords>letter 8.5x11 empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/Letter_landscape.svg b/share/templates/Letter_landscape.svg deleted file mode 100644 index 4800ecba3..000000000 --- a/share/templates/Letter_landscape.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="11in" - height="8.5in" - viewBox="0 0 11 8.5"> - <defs /> - <sodipodi:namedview - inkscape:document-units="in" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.43415836" - inkscape:cx="528" - inkscape:cy="408" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Letter Landscape</inkscape:_name> - <inkscape:_shortdesc>Standard letter landscape sheet - 11"x8.5"</inkscape:_shortdesc> - <inkscape:_keywords>letter landscape 11x8.5 empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/Makefile.am b/share/templates/Makefile.am index 452c6aa91..390204ff7 100644 --- a/share/templates/Makefile.am +++ b/share/templates/Makefile.am @@ -3,18 +3,7 @@ templatesdir = $(datadir)/inkscape/templates templates_DATA = \ README \ - A4_landscape.svg \ - A4.svg \ - black_opaque.svg \ - white_opaque.svg \ - business_card_85x54mm.svg \ - business_card_90x50mm.svg \ - CD_cover_300dpi.svg \ CD_label_120x120.svg \ - DVD_cover_regular_300dpi.svg \ - DVD_cover_slim_300dpi.svg \ - DVD_cover_superslim_300dpi.svg \ - DVD_cover_ultraslim_300dpi.svg \ default.svg \ default.be.svg \ default.ca.svg \ @@ -36,41 +25,13 @@ templates_DATA = \ default.sk.svg \ default_pt.svg \ default_px.svg \ - desktop_1024x768.svg \ - desktop_1600x1200.svg \ - desktop_640x480.svg \ - desktop_800x600.svg \ - fontforge_glyph.svg \ - icon_16x16.svg \ - icon_32x32.svg \ - icon_48x48.svg \ - icon_64x64.svg \ - Letter_landscape.svg \ - Letter.svg \ - no_borders.svg \ no_layers.svg \ - video_HDTV_1920x1080.svg \ - video_NTSC_720x486.svg \ - video_PAL_720x576.svg \ - web_banner_468x60.svg \ - web_banner_728x90.svg \ LaTeX_Beamer.svg \ Typography_Canvas.svg \ templates.h templates_i18n = \ - A4_landscape.svg \ - A4.svg \ - black_opaque.svg \ - white_opaque.svg \ - business_card_85x54mm.svg \ - business_card_90x50mm.svg \ - CD_cover_300dpi.svg \ CD_label_120x120.svg \ - DVD_cover_regular_300dpi.svg \ - DVD_cover_slim_300dpi.svg \ - DVD_cover_superslim_300dpi.svg \ - DVD_cover_ultraslim_300dpi.svg \ default.svg \ default.be.svg \ default.ca.svg \ @@ -92,24 +53,7 @@ templates_i18n = \ default.sk.svg \ default_pt.svg \ default_px.svg \ - desktop_1024x768.svg \ - desktop_1600x1200.svg \ - desktop_640x480.svg \ - desktop_800x600.svg \ - fontforge_glyph.svg \ - icon_16x16.svg \ - icon_32x32.svg \ - icon_48x48.svg \ - icon_64x64.svg \ - Letter_landscape.svg \ - Letter.svg \ - no_borders.svg \ no_layers.svg \ - video_HDTV_1920x1080.svg \ - video_NTSC_720x486.svg \ - video_PAL_720x576.svg \ - web_banner_468x60.svg \ - web_banner_728x90.svg \ LaTeX_Beamer.svg \ Typography_Canvas.svg diff --git a/share/templates/black_opaque.svg b/share/templates/black_opaque.svg deleted file mode 100644 index 7bed84ee5..000000000 --- a/share/templates/black_opaque.svg +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="210mm" - height="297mm" - viewBox="0 0 210 297"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#000000" - bordercolor="#000000" - borderopacity="1.0" - inkscape:pageopacity="1.0" - inkscape:pageshadow="0" - inkscape:zoom="0.35" - inkscape:cx="400" - inkscape:cy="560" - inkscape:document-units="mm" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Black Opaque</inkscape:_name> - <inkscape:_shortdesc>Empty black page</inkscape:_shortdesc> - <inkscape:_keywords>black opaque empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/business_card_85x54mm.svg b/share/templates/business_card_85x54mm.svg deleted file mode 100644 index 257cb6060..000000000 --- a/share/templates/business_card_85x54mm.svg +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="85mm" - height="54mm" - viewBox="0 0 85 54"> - <defs - id="defs3" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.2" - inkscape:cx="160" - inkscape:cy="100" - inkscape:document-units="mm" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Business Card 85x54mm</inkscape:_name> - <inkscape:_shortdesc>Empty business card template.</inkscape:_shortdesc> - <inkscape:_keywords>business card empty 85mmx54mm</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/business_card_90x50mm.svg b/share/templates/business_card_90x50mm.svg deleted file mode 100644 index c25556468..000000000 --- a/share/templates/business_card_90x50mm.svg +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="90mm" - height="50mm" - viewBox="0 0 90 50"> - <defs - id="defs3" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.2" - inkscape:cx="170" - inkscape:cy="95" - inkscape:document-units="mm" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Business Card 90x50mm</inkscape:_name> - <inkscape:_shortdesc>Empty business card template.</inkscape:_shortdesc> - <inkscape:_keywords>business card empty 90mmx50mm</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/desktop_1024x768.svg b/share/templates/desktop_1024x768.svg deleted file mode 100644 index b64a1bc79..000000000 --- a/share/templates/desktop_1024x768.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="1024px" - height="768px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.5" - inkscape:cx="512" - inkscape:cy="382" - inkscape:current-layer="layer1" - inkscape:document-units="px"/> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Desktop 1024x768</inkscape:_name> - <inkscape:_shortdesc>Empty desktop size sheet</inkscape:_shortdesc> - <inkscape:_keywords>desktop 1024x768 wallpaper</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/desktop_1600x1200.svg b/share/templates/desktop_1600x1200.svg deleted file mode 100644 index bb8ca4bd5..000000000 --- a/share/templates/desktop_1600x1200.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="1600px" - height="1200px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.3" - inkscape:cx="800" - inkscape:cy="600" - inkscape:current-layer="layer1" - inkscape:document-units="px"/> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Desktop 1600x1200</inkscape:_name> - <inkscape:_shortdesc>Empty desktop size sheet</inkscape:_shortdesc> - <inkscape:_keywords>desktop 1600x1200 wallpaper</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/desktop_640x480.svg b/share/templates/desktop_640x480.svg deleted file mode 100644 index 28f3de41e..000000000 --- a/share/templates/desktop_640x480.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="640px" - height="480px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.77472527" - inkscape:cx="320" - inkscape:cy="240" - inkscape:current-layer="layer1" - inkscape:document-units="px"/> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Desktop 640x480</inkscape:_name> - <inkscape:_shortdesc>Empty desktop size sheet</inkscape:_shortdesc> - <inkscape:_keywords>desktop 640x480 wallpaper</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/desktop_800x600.svg b/share/templates/desktop_800x600.svg deleted file mode 100644 index 2f58e3b9d..000000000 --- a/share/templates/desktop_800x600.svg +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="800px" - height="600px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.6" - inkscape:cx="400" - inkscape:cy="300" - inkscape:current-layer="layer1" - inkscape:document-units="px" - /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Desktop 800x600</inkscape:_name> - <inkscape:_shortdesc>Empty desktop size sheet</inkscape:_shortdesc> - <inkscape:_keywords>desktop 800x600 wallpaper</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/fontforge_glyph.svg b/share/templates/fontforge_glyph.svg deleted file mode 100644 index 84ea05753..000000000 --- a/share/templates/fontforge_glyph.svg +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="1000" - height="1000"> - <defs - id="defs5498" /> - <sodipodi:namedview - inkscape:window-height="618" - inkscape:window-width="641" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - showguides="true" - inkscape:guide-bbox="true" - inkscape:zoom="0.454" - inkscape:cx="500" - inkscape:cy="500" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:current-layer="layer1"> - <sodipodi:guide - orientation="horizontal" - position="200" - id="guide5596" /> - </sodipodi:namedview> - <metadata - id="metadata5594"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Fontforge Glyph</inkscape:_name> - <inkscape:author>prokoudine</inkscape:author> - <inkscape:date>2007-11-11</inkscape:date> - <inkscape:_keywords>font fontforge glyph 1000x1000</inkscape:_keywords> - </inkscape:_templateinfo> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" /> -</svg> diff --git a/share/templates/icon_16x16.svg b/share/templates/icon_16x16.svg deleted file mode 100644 index bb4f5e7a0..000000000 --- a/share/templates/icon_16x16.svg +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="16px" - height="16px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="22.197802" - inkscape:cx="8" - inkscape:cy="8" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px"/> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Icon 16x16</inkscape:_name> - <inkscape:_shortdesc>Small 16x16 icon template.</inkscape:_shortdesc> - <inkscape:_keywords>icon 16x16 empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/icon_32x32.svg b/share/templates/icon_32x32.svg deleted file mode 100644 index 72d56ee7d..000000000 --- a/share/templates/icon_32x32.svg +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="32px" - height="32px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="11.197802" - inkscape:cx="16" - inkscape:cy="16" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px"/> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Icon 32x32</inkscape:_name> - <inkscape:_shortdesc>32x32 icon template.</inkscape:_shortdesc> - <inkscape:_keywords>icon 32x32 empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/icon_48x48.svg b/share/templates/icon_48x48.svg deleted file mode 100644 index 9c2ba463b..000000000 --- a/share/templates/icon_48x48.svg +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="48px" - height="48px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="7" - inkscape:cx="24" - inkscape:cy="24" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px"/> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Icon 48x48</inkscape:_name> - <inkscape:_shortdesc>48x48 icon template.</inkscape:_shortdesc> - <inkscape:_keywords>icon 48x48 empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/icon_64x64.svg b/share/templates/icon_64x64.svg deleted file mode 100644 index ce317acc4..000000000 --- a/share/templates/icon_64x64.svg +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="64px" - height="64px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="5.5" - inkscape:cx="32" - inkscape:cy="32" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:document-units="px" - inkscape:grid-bbox="true" - /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Icon 64x64</inkscape:_name> - <inkscape:_shortdesc>64x64 icon template.</inkscape:_shortdesc> - <inkscape:_keywords>icon 64x64 empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/no_borders.svg b/share/templates/no_borders.svg deleted file mode 100644 index 95ac43302..000000000 --- a/share/templates/no_borders.svg +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="210mm" - height="297mm" - viewBox="0 0 210 297"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#ffffff" - borderopacity="0.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="0" - inkscape:zoom="0.35" - inkscape:cx="400" - inkscape:cy="560" - inkscape:document-units="mm" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>No Borders</inkscape:_name> - <inkscape:_shortdesc>Empty sheet with no borders</inkscape:_shortdesc> - <inkscape:_keywords>no borders empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> diff --git a/share/templates/video_HDTV_1920x1080.svg b/share/templates/video_HDTV_1920x1080.svg deleted file mode 100644 index b2c8da68f..000000000 --- a/share/templates/video_HDTV_1920x1080.svg +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="1920px" - height="1080px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.3" - inkscape:cx="960" - inkscape:cy="540" - inkscape:document-units="px" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Video HDTV 1920x1080</inkscape:_name> - <inkscape:author>popolon2</inkscape:author> - <inkscape:_shortdesc>HDTV video template for 1920x1080 resolution.</inkscape:_shortdesc> - <inkscape:date>2006-10-14</inkscape:date> - <inkscape:_keywords>HDTV video empty 1920x1080</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/video_NTSC_720x486.svg b/share/templates/video_NTSC_720x486.svg deleted file mode 100644 index 8609c5ca8..000000000 --- a/share/templates/video_NTSC_720x486.svg +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="720px" - height="486px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.75" - inkscape:cx="360" - inkscape:cy="243" - inkscape:document-units="px" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Video NTSC 720x486</inkscape:_name> - <inkscape:author>popolon2</inkscape:author> - <inkscape:_shortdesc>NTSC video template for 720x486 resolution.</inkscape:_shortdesc> - <inkscape:date>2006-10-14</inkscape:date> - <inkscape:_keywords>NTSC video empty 720x486</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/video_PAL_720x576.svg b/share/templates/video_PAL_720x576.svg deleted file mode 100644 index 84eeb5547..000000000 --- a/share/templates/video_PAL_720x576.svg +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="720px" - height="576px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.6" - inkscape:cx="360" - inkscape:cy="290" - inkscape:document-units="px" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Video PAL 728x576</inkscape:_name> - <inkscape:author>popolon2</inkscape:author> - <inkscape:_shortdesc>PAL video template for 728x576 resolution.</inkscape:_shortdesc> - <inkscape:date>2006-10-14</inkscape:date> - <inkscape:_keywords>PAL video empty 728x576</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/web_banner_468x60.svg b/share/templates/web_banner_468x60.svg deleted file mode 100644 index 14237b101..000000000 --- a/share/templates/web_banner_468x60.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="468px" - height="60px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.2" - inkscape:cx="234" - inkscape:cy="30" - inkscape:document-units="px" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Web Banner 468x60</inkscape:_name> - <inkscape:_shortdesc>Empty 468x60 web banner template.</inkscape:_shortdesc> - <inkscape:_keywords>web banner 468x60 empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/web_banner_728x90.svg b/share/templates/web_banner_728x90.svg deleted file mode 100644 index 1133fa98f..000000000 --- a/share/templates/web_banner_728x90.svg +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="728px" - height="90px" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.75" - inkscape:cx="360" - inkscape:cy="45" - inkscape:document-units="px" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Web Banner 728x90</inkscape:_name> - <inkscape:_shortdesc>Empty 728x90 web banner template.</inkscape:_shortdesc> - <inkscape:_keywords>web banner 728x90 empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" /> -</svg> diff --git a/share/templates/web_banners.svg b/share/templates/web_banners.svg deleted file mode 100644 index 02ad6bcac..000000000 --- a/share/templates/web_banners.svg +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:ns="http://purl.org/dc/elements/1/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1430" - height="835" - id="svg2839" - version="1" - inkscape:version="0.46+devel r22620" - sodipodi:docname="web_banners.svg"> - <defs - id="defs2841"> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="0.5" - inkscape:cx="715" - inkscape:cy="415" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:window-width="900" - inkscape:window-height="700" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - showguides="true" - inkscape:guide-bbox="true" /> - <metadata - id="metadata2844"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <ns:format>image/svg+xml</ns:format> - <ns:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <ns:title /> - <ns:format>image/svg+xml</ns:format> - <ns:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>Web Banners Collection</inkscape:_name> - <inkscape:author>Aurélio A. Heckert</inkscape:author> - <inkscape:_shortdesc>A collection of standard web banners</inkscape:_shortdesc> - <inkscape:date>2010-05-27</inkscape:date> - <inkscape:_keywords>web banners collection</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Camada 1" inkscape:groupmode="layer" id="layer1"> - <g id="Areas" style="fill:#999999"> - <rect id="cell_phone_header" width="300" height="50" x="20" y="120" /> - <rect id="full_banner" width="468" height="60" x="692" y="758" /> - <rect id="leaderboard" width="728" height="90" x="20" y="16" /> - <rect id="square_pop-up" width="250" height="250" x="20" y="271" /> - <rect id="square" width="200" height="200" x="288" y="321" /> - <rect id="large_rectangle" width="336" height="280" x="20" y="538" /> - <rect id="medium_rectangle" width="300" height="250" x="373" y="568" /> - <rect id="skyscraper" width="120" height="600" x="1290" y="138" /> - <rect id="wide_skyscraper" width="160" height="600" x="1101" y="138" /> - <rect id="half_page_ad" width="300" height="600" x="772" y="138" /> - <rect id="half_banner" width="234" height="60" x="1176" y="758" /> - <rect id="3:1_rectangle" width="300" height="100" x="772" y="16" /> - <rect id="vertical_banner" width="120" height="240" x="627" y="121" /> - <rect id="button1" width="120" height="90" x="488" y="121" /> - <rect id="button2" width="120" height="60" x="488" y="231" /> - <rect id="micro_bar" width="88" height="31" x="520" y="311" /> - <rect id="square_button" width="125" height="125" x="347" y="166" /> - <rect id="rectangle" width="180" height="150" x="535" y="388" /> - </g> - <g id="Text" style="font-family:sans-serif;font-size:28px;letter-spacing:-2px;text-anchor:middle;fill:#000000"> - <text x="168" y="155">Cell Phone Header</text> - <text x="923" y="798">Full Banner</text> - <text x="382" y="71">Leaderboard</text> - <text x="143" y="403">Square Pop-Up</text> - <text x="387" y="429">Square</text> - <text x="186" y="685">Large Rectangle</text> - <text x="521" y="700">Medium Rectangle</text> - <text x="436" y="-1173" transform="matrix(0,1,-1,0,0,0)">Wide Skyscraper</text> - <text x="436" y="-1342" transform="matrix(0,1,-1,0,0,0)">Skyscraper</text> - <text x="436" y="-914" transform="matrix(0,1,-1,0,0,0)">Half Page Ad</text> - <text x="1290" y="798">Half Banner</text> - <text x="920" y="73">3:1 Rectangle</text> - <text x="240" y="-677" transform="matrix(0,1,-1,0,0,0)">Vertical Banner</text> - <text x="562" y="334" style="font-size:20px">Micro Bar</text> - <text x="547" y="176">Button 1</text> - <text x="547" y="271">Button 2</text> - <text x="623" y="471">Rectangle</text> - <text x="408" y="225"> - <tspan x="408" y="225">Square</tspan> - <tspan x="408" y="253">Button</tspan> - </text> - </g> - </g> -</svg> diff --git a/share/templates/white_opaque.svg b/share/templates/white_opaque.svg deleted file mode 100644 index b94aaeb75..000000000 --- a/share/templates/white_opaque.svg +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - width="210mm" - height="297mm" - viewBox="0 0 210 297"> - <defs /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#000000" - borderopacity="1.0" - inkscape:pageopacity="1.0" - inkscape:pageshadow="0" - inkscape:zoom="0.35" - inkscape:cx="400" - inkscape:cy="560" - inkscape:document-units="mm" - inkscape:current-layer="layer1" /> - <metadata> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <inkscape:_templateinfo> - <inkscape:_name>White Opaque</inkscape:_name> - <inkscape:_shortdesc>Empty white page</inkscape:_shortdesc> - <inkscape:_keywords>white opaque empty</inkscape:_keywords> - </inkscape:_templateinfo> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" /> -</svg> -- cgit v1.2.3 From 60aeb869a2fe7980724b933484cb871c72078ca6 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sat, 11 Oct 2014 19:05:39 +0200 Subject: Fix "Argument with 'nonnull' attribute passed null" API bug in extension color parameter construction. Clang static analyzer has found an "Argument with 'nonnull' attribute passed null". The applied fix here checks if the defaulthex argument is nullptr before making the call. A default initialization value is added to the constructor in case defaulthex == nullptr. (with additional whitespace improvements) (bzr r13587) --- src/extension/param/color.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp index 0a2598c56..5bd70359f 100644 --- a/src/extension/param/color.cpp +++ b/src/extension/param/color.cpp @@ -59,9 +59,10 @@ guint32 ParamColor::set( guint32 in, SPDocument * /*doc*/, Inkscape::XML::Node * return _value; } -ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) : - Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), - _changeSignal(0) +ParamColor::ParamColor(const gchar *name, const gchar *guitext, const gchar *desc, const Parameter::_scope_t scope, + bool gui_hidden, const gchar *gui_tip, Inkscape::Extension::Extension *ext, + Inkscape::XML::Node *xml) + : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _value(0), _changeSignal(0) { const char * defaulthex = NULL; if (xml->firstChild() != NULL) @@ -75,7 +76,8 @@ ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar * if (!paramval.empty()) defaulthex = paramval.data(); - _value = atoi(defaulthex); + if (defaulthex) + _value = atoi(defaulthex); } void ParamColor::string(std::string &string) const @@ -87,7 +89,7 @@ void ParamColor::string(std::string &string) const Gtk::Widget *ParamColor::get_widget( SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/, sigc::signal<void> * changeSignal ) { - if (_gui_hidden) return NULL; + if (_gui_hidden) return NULL; _changeSignal = new sigc::signal<void>(*changeSignal); Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); -- cgit v1.2.3 From a38add027810b9725f81cebb099282a8656e3aa3 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sat, 11 Oct 2014 19:15:03 +0200 Subject: Fix uninitialized variable use in svg-color.cpp. (additionally reduce scope of variable) Bug found using clang static analyzer. The bug happens with color_out not being initialized upon definition; then 1. if(icc) == true 2. if(prof) == true 3. if(trans) == false 4. *r = color_out[0]; <-- un-init use Fixed by initializing color_out (with black). (bzr r13588) --- src/svg/svg-color.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index 5108b7702..c9f22f8a4 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -511,18 +511,18 @@ sp_svg_create_color_hash() void icc_color_to_sRGB(SVGICCColor* icc, guchar* r, guchar* g, guchar* b) { - guchar color_out[4]; - guchar color_in[4]; if (icc) { g_message("profile name: %s", icc->colorProfile.c_str()); Inkscape::ColorProfile* prof = SP_ACTIVE_DOCUMENT->profileManager->find(icc->colorProfile.c_str()); if ( prof ) { + guchar color_out[4] = {0,0,0,0}; cmsHTRANSFORM trans = prof->getTransfToSRGB8(); if ( trans ) { std::vector<colorspace::Component> comps = colorspace::getColorSpaceInfo( prof ); size_t count = CMSSystem::getChannelCount( prof ); size_t cap = std::min(count, comps.size()); + guchar color_in[4]; for (size_t i = 0; i < cap; i++) { color_in[i] = static_cast<guchar>((((gdouble)icc->colors[i]) * 256.0) * (gdouble)comps[i].scale); g_message("input[%d]: %d", (int)i, (int)color_in[i]); -- cgit v1.2.3 From ccb75de1cadbe4c2e8ad833cbbcd1bc8f79cd548 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sat, 11 Oct 2014 19:21:54 +0200 Subject: LPEVonKoch : remove redundant assignment (is taken care of by the following if-statement) Found by clang static analyzer (bzr r13589) --- src/live_effects/lpe-vonkoch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp index 8b0b716fe..7e396e84a 100644 --- a/src/live_effects/lpe-vonkoch.cpp +++ b/src/live_effects/lpe-vonkoch.cpp @@ -133,7 +133,7 @@ LPEVonKoch::doEffect_path (std::vector<Geom::Path> const & path_in) for (unsigned k = 0; k < path_in.size(); k++){ path_in_complexity+=path_in[k].size(); } - double complexity = std::pow(transforms.size(),nbgenerations)*path_in_complexity; + double complexity; if (drawall.get_value()){ int k = transforms.size(); if(k>1){ -- cgit v1.2.3 From 82565dc1a86e232f1a809624b14daa2c831b5282 Mon Sep 17 00:00:00 2001 From: Alvin Penner <penner@vaxxine.com> Date: Sat, 11 Oct 2014 17:55:07 -0400 Subject: maintain page size units when resizing page to drawing (Bug 1310787) Fixed bugs: - https://launchpad.net/bugs/1310787 (bzr r13590) --- src/document.cpp | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/document.cpp b/src/document.cpp index f94a9f04f..f7edf5ed3 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -706,7 +706,12 @@ void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins) double const h = rect.height(); double const old_height = getHeight().value("px"); - Inkscape::Util::Unit const *px = unit_table.getUnit("px"); + Inkscape::Util::Unit const *nv_units = unit_table.getUnit("px"); + SPNamedView *nv = sp_document_namedview(this, NULL); + if (nv != NULL) { + if (nv->getAttribute("units")) + nv_units = unit_table.getUnit(nv->getAttribute("units")); + } /* in px */ double margin_top = 0.0; @@ -714,22 +719,16 @@ void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins) double margin_right = 0.0; double margin_bottom = 0.0; - SPNamedView *nv = sp_document_namedview(this, NULL); - if (with_margins && nv) { if (nv != NULL) { - gchar const * const units_abbr = nv->getAttribute("units"); - Inkscape::Util::Unit const *margin_units = NULL; - if (units_abbr) { - margin_units = unit_table.getUnit(units_abbr); - } - if (!margin_units) { - margin_units = px; - } - margin_top = nv->getMarginLength("fit-margin-top",margin_units, px, w, h, false); - margin_left = nv->getMarginLength("fit-margin-left",margin_units, px, w, h, true); - margin_right = nv->getMarginLength("fit-margin-right",margin_units, px, w, h, true); - margin_bottom = nv->getMarginLength("fit-margin-bottom",margin_units, px, w, h, false); + margin_top = nv->getMarginLength("fit-margin-top", nv_units, unit_table.getUnit("px"), w, h, false); + margin_left = nv->getMarginLength("fit-margin-left", nv_units, unit_table.getUnit("px"), w, h, true); + margin_right = nv->getMarginLength("fit-margin-right", nv_units, unit_table.getUnit("px"), w, h, true); + margin_bottom = nv->getMarginLength("fit-margin-bottom", nv_units, unit_table.getUnit("px"), w, h, false); + margin_top = Inkscape::Util::Quantity::convert(margin_top, nv_units, "px"); + margin_left = Inkscape::Util::Quantity::convert(margin_left, nv_units, "px"); + margin_right = Inkscape::Util::Quantity::convert(margin_right, nv_units, "px"); + margin_bottom = Inkscape::Util::Quantity::convert(margin_bottom, nv_units, "px"); } } @@ -738,8 +737,8 @@ void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins) rect.max() + Geom::Point(margin_right, margin_top)); - setWidth(Inkscape::Util::Quantity(rect_with_margins.width(), px)); - setHeight(Inkscape::Util::Quantity(rect_with_margins.height(), px)); + setWidth(Inkscape::Util::Quantity(Inkscape::Util::Quantity::convert(rect_with_margins.width(), "px", nv_units), nv_units)); + setHeight(Inkscape::Util::Quantity(Inkscape::Util::Quantity::convert(rect_with_margins.height(), "px", nv_units), nv_units)); Geom::Translate const tr( Geom::Point(0, old_height - rect_with_margins.height()) -- cgit v1.2.3 From f369e0ed4157c33e09c426b40ec1e39c7591d2c6 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 12:04:17 +0200 Subject: LPEVonKoch: improve rev. 13589 by removing the else branch for complexity calculation for better human readability (bzr r13591) --- src/live_effects/lpe-vonkoch.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp index 7e396e84a..709c9e56e 100644 --- a/src/live_effects/lpe-vonkoch.cpp +++ b/src/live_effects/lpe-vonkoch.cpp @@ -132,8 +132,8 @@ LPEVonKoch::doEffect_path (std::vector<Geom::Path> const & path_in) int path_in_complexity = 0; for (unsigned k = 0; k < path_in.size(); k++){ path_in_complexity+=path_in[k].size(); - } - double complexity; + } + double complexity = std::pow(transforms.size(), nbgenerations) * path_in_complexity; if (drawall.get_value()){ int k = transforms.size(); if(k>1){ @@ -141,8 +141,6 @@ LPEVonKoch::doEffect_path (std::vector<Geom::Path> const & path_in) }else{ complexity = nbgenerations*k*path_in_complexity; } - }else{ - complexity = std::pow(transforms.size(),nbgenerations)*path_in_complexity; } if (complexity > double(maxComplexity)){ g_warning("VonKoch lpe's output too complex. Effect bypassed."); -- cgit v1.2.3 From f6640d3d5c3c6ede3c5c97e1bcc1f959a47cc79e Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 12:21:37 +0200 Subject: Change clang-format configuration Prefer ParamColor::ParamColor(const gchar *name, const gchar *guitext, const gchar *desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar *gui_tip, Inkscape::Extension::Extension *ext, Inkscape::XML::Node *xml) : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext) , _value(0) , _changeSignal(0) { over ParamColor::ParamColor(const gchar *name, const gchar *guitext, const gchar *desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar *gui_tip, Inkscape::Extension::Extension *ext, Inkscape::XML::Node *xml) : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _value(0), _changeSignal(0) { (bzr r13592) --- _clang-format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_clang-format b/_clang-format index 913819284..932c18703 100644 --- a/_clang-format +++ b/_clang-format @@ -13,7 +13,7 @@ BreakBeforeBinaryOperators: false BreakConstructorInitializersBeforeComma: true BinPackParameters: true ColumnLimit: 120 -ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerAllOnOneLineOrOnePerLine: false DerivePointerBinding: false ExperimentalAutoDetectBinPacking: false IndentCaseLabels: true -- cgit v1.2.3 From 6fda35fe16784f75a6a98b4d44141177616a06ef Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 12:36:25 +0200 Subject: Mass fix whitespace (clang-format) before working on bug (bzr r13593) --- src/trace/potrace/trace.cpp | 2059 ++++++++++++++++++++++--------------------- 1 file changed, 1040 insertions(+), 1019 deletions(-) diff --git a/src/trace/potrace/trace.cpp b/src/trace/potrace/trace.cpp index f1e88a908..2bdefb90a 100644 --- a/src/trace/potrace/trace.cpp +++ b/src/trace/potrace/trace.cpp @@ -16,124 +16,129 @@ #include "trace.h" #include "progress.h" -#define INFTY 10000000 /* it suffices that this is longer than any - path; it need not be really infinite */ -#define COS179 -0.999847695156 /* the cosine of 179 degrees */ +#define INFTY 10000000 // it suffices that this is longer than any + // path; it need not be really infinite +#define COS179 -0.999847695156 // the cosine of 179 degrees /* ---------------------------------------------------------------------- */ #define SAFE_MALLOC(var, n, typ) \ - if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error + if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error /* ---------------------------------------------------------------------- */ /* auxiliary functions */ /* return a direction that is 90 degrees counterclockwise from p2-p0, but then restricted to one of the major wind directions (n, nw, w, etc) */ -static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2) { - point_t r; - - r.y = sign(p2.x-p0.x); - r.x = -sign(p2.y-p0.y); +static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2) +{ + point_t r; + + r.y = sign(p2.x - p0.x); + r.x = -sign(p2.y - p0.y); - return r; + return r; } /* return (p1-p0)x(p2-p0), the area of the parallelogram */ -static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2) { - double x1, y1, x2, y2; +static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2) +{ + double x1, y1, x2, y2; - x1 = p1.x-p0.x; - y1 = p1.y-p0.y; - x2 = p2.x-p0.x; - y2 = p2.y-p0.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p2.x - p0.x; + y2 = p2.y - p0.y; - return x1*y2 - x2*y1; + return x1 * y2 - x2 * y1; } /* ddenom/dpara have the property that the square of radius 1 centered at p1 intersects the line p0p2 iff |dpara(p0,p1,p2)| <= ddenom(p0,p2) */ -static inline double ddenom(dpoint_t p0, dpoint_t p2) { - point_t r = dorth_infty(p0, p2); +static inline double ddenom(dpoint_t p0, dpoint_t p2) +{ + point_t r = dorth_infty(p0, p2); - return r.y*(p2.x-p0.x) - r.x*(p2.y-p0.y); + return r.y * (p2.x - p0.x) - r.x * (p2.y - p0.y); } /* return 1 if a <= b < c < a, in a cyclic sense (mod n) */ -static inline int cyclic(int a, int b, int c) { - if (a<=c) { - return (a<=b && b<c); - } else { - return (a<=b || b<c); - } +static inline int cyclic(int a, int b, int c) +{ + if (a <= c) { + return (a <= b && b < c); + } else { + return (a <= b || b < c); + } } /* determine the center and slope of the line i..j. Assume i<j. Needs "sum" components of p to be set. */ -static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *dir) { - /* assume i<j */ - - int n = pp->len; - sums_t *sums = pp->sums; - - double x, y, x2, xy, y2; - double k; - double a, b, c, lambda2, l; - int r=0; /* rotations from i to j */ - - while (j>=n) { - j-=n; - r+=1; - } - while (i>=n) { - i-=n; - r-=1; - } - while (j<0) { - j+=n; - r-=1; - } - while (i<0) { - i+=n; - r+=1; - } - - x = sums[j+1].x-sums[i].x+r*sums[n].x; - y = sums[j+1].y-sums[i].y+r*sums[n].y; - x2 = sums[j+1].x2-sums[i].x2+r*sums[n].x2; - xy = sums[j+1].xy-sums[i].xy+r*sums[n].xy; - y2 = sums[j+1].y2-sums[i].y2+r*sums[n].y2; - k = j+1-i+r*n; - - ctr->x = x/k; - ctr->y = y/k; - - a = (x2-(double)x*x/k)/k; - b = (xy-(double)x*y/k)/k; - c = (y2-(double)y*y/k)/k; - - lambda2 = (a+c+sqrt((a-c)*(a-c)+4*b*b))/2; /* larger e.value */ - - /* now find e.vector for lambda2 */ - a -= lambda2; - c -= lambda2; - - if (fabs(a) >= fabs(c)) { - l = sqrt(a*a+b*b); - if (l!=0) { - dir->x = -b/l; - dir->y = a/l; +static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *dir) +{ + /* assume i<j */ + + int n = pp->len; + sums_t *sums = pp->sums; + + double x, y, x2, xy, y2; + double k; + double a, b, c, lambda2, l; + int r = 0; /* rotations from i to j */ + + while (j >= n) { + j -= n; + r += 1; + } + while (i >= n) { + i -= n; + r -= 1; + } + while (j < 0) { + j += n; + r -= 1; + } + while (i < 0) { + i += n; + r += 1; + } + + x = sums[j + 1].x - sums[i].x + r * sums[n].x; + y = sums[j + 1].y - sums[i].y + r * sums[n].y; + x2 = sums[j + 1].x2 - sums[i].x2 + r * sums[n].x2; + xy = sums[j + 1].xy - sums[i].xy + r * sums[n].xy; + y2 = sums[j + 1].y2 - sums[i].y2 + r * sums[n].y2; + k = j + 1 - i + r * n; + + ctr->x = x / k; + ctr->y = y / k; + + a = (x2 - (double)x * x / k) / k; + b = (xy - (double)x * y / k) / k; + c = (y2 - (double)y * y / k) / k; + + lambda2 = (a + c + sqrt((a - c) * (a - c) + 4 * b * b)) / 2; /* larger e.value */ + + /* now find e.vector for lambda2 */ + a -= lambda2; + c -= lambda2; + + if (fabs(a) >= fabs(c)) { + l = sqrt(a * a + b * b); + if (l != 0) { + dir->x = -b / l; + dir->y = a / l; + } + } else { + l = sqrt(c * c + b * b); + if (l != 0) { + dir->x = -c / l; + dir->y = b / l; + } } - } else { - l = sqrt(c*c+b*b); - if (l!=0) { - dir->x = -c/l; - dir->y = b/l; + if (l == 0) { + dir->x = dir->y = 0; /* sometimes this can happen when k=4: + the two eigenvalues coincide */ } - } - if (l==0) { - dir->x = dir->y = 0; /* sometimes this can happen when k=4: - the two eigenvalues coincide */ - } } /* the type of (affine) quadratic forms, represented as symmetric 3x3 @@ -142,155 +147,158 @@ static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *di typedef double quadform_t[3][3]; /* Apply quadratic form Q to vector w = (w.x,w.y) */ -static inline double quadform(quadform_t Q, dpoint_t w) { - double v[3]; - int i, j; - double sum; - - v[0] = w.x; - v[1] = w.y; - v[2] = 1; - sum = 0.0; - - for (i=0; i<3; i++) { - for (j=0; j<3; j++) { - sum += v[i] * Q[i][j] * v[j]; +static inline double quadform(quadform_t Q, dpoint_t w) +{ + double v[3]; + int i, j; + double sum; + + v[0] = w.x; + v[1] = w.y; + v[2] = 1; + sum = 0.0; + + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) { + sum += v[i] * Q[i][j] * v[j]; + } } - } - return sum; + return sum; } /* calculate p1 x p2 */ -static inline int xprod(point_t p1, point_t p2) { - return p1.x*p2.y - p1.y*p2.x; -} +static inline int xprod(point_t p1, point_t p2) { return p1.x * p2.y - p1.y * p2.x; } /* calculate (p1-p0)x(p3-p2) */ -static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { - double x1, y1, x2, y2; +static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) +{ + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p3.x - p2.x; - y2 = p3.y - p2.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p3.x - p2.x; + y2 = p3.y - p2.y; - return x1*y2 - x2*y1; + return x1 * y2 - x2 * y1; } /* calculate (p1-p0)*(p2-p0) */ -static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2) { - double x1, y1, x2, y2; +static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2) +{ + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p2.x - p0.x; - y2 = p2.y - p0.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p2.x - p0.x; + y2 = p2.y - p0.y; - return x1*x2 + y1*y2; + return x1 * x2 + y1 * y2; } /* calculate (p1-p0)*(p3-p2) */ -static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { - double x1, y1, x2, y2; +static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) +{ + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p3.x - p2.x; - y2 = p3.y - p2.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p3.x - p2.x; + y2 = p3.y - p2.y; - return x1*x2 + y1*y2; + return x1 * x2 + y1 * y2; } /* calculate distance between two points */ -static inline double ddist(dpoint_t p, dpoint_t q) { - return sqrt(sq(p.x-q.x)+sq(p.y-q.y)); -} +static inline double ddist(dpoint_t p, dpoint_t q) { return sqrt(sq(p.x - q.x) + sq(p.y - q.y)); } /* calculate point of a bezier curve */ -static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { - double s = 1-t; - dpoint_t res; +static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) +{ + double s = 1 - t; + dpoint_t res; - /* Note: a good optimizing compiler (such as gcc-3) reduces the - following to 16 multiplications, using common subexpression - elimination. */ + /* Note: a good optimizing compiler (such as gcc-3) reduces the + following to 16 multiplications, using common subexpression + elimination. */ - res.x = s*s*s*p0.x + 3*(s*s*t)*p1.x + 3*(t*t*s)*p2.x + t*t*t*p3.x; - res.y = s*s*s*p0.y + 3*(s*s*t)*p1.y + 3*(t*t*s)*p2.y + t*t*t*p3.y; + res.x = s * s * s * p0.x + 3 * (s * s * t) * p1.x + 3 * (t * t * s) * p2.x + t * t * t * p3.x; + res.y = s * s * s * p0.y + 3 * (s * s * t) * p1.y + 3 * (t * t * s) * p2.y + t * t * t * p3.y; - return res; + return res; } /* calculate the point t in [0..1] on the (convex) bezier curve (p0,p1,p2,p3) which is tangent to q1-q0. Return -1.0 if there is no solution in [0..1]. */ -static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1) { - double A, B, C; /* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */ - double a, b, c; /* a t^2 + b t + c = 0 */ - double d, s, r1, r2; - - A = cprod(p0, p1, q0, q1); - B = cprod(p1, p2, q0, q1); - C = cprod(p2, p3, q0, q1); - - a = A - 2*B + C; - b = -2*A + 2*B; - c = A; - - d = b*b - 4*a*c; - - if (a==0 || d<0) { - return -1.0; - } - - s = sqrt(d); - - r1 = (-b + s) / (2 * a); - r2 = (-b - s) / (2 * a); - - if (r1 >= 0 && r1 <= 1) { - return r1; - } else if (r2 >= 0 && r2 <= 1) { - return r2; - } else { - return -1.0; - } +static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1) +{ + double A, B, C; /* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */ + double a, b, c; /* a t^2 + b t + c = 0 */ + double d, s, r1, r2; + + A = cprod(p0, p1, q0, q1); + B = cprod(p1, p2, q0, q1); + C = cprod(p2, p3, q0, q1); + + a = A - 2 * B + C; + b = -2 * A + 2 * B; + c = A; + + d = b * b - 4 * a * c; + + if (a == 0 || d < 0) { + return -1.0; + } + + s = sqrt(d); + + r1 = (-b + s) / (2 * a); + r2 = (-b - s) / (2 * a); + + if (r1 >= 0 && r1 <= 1) { + return r1; + } else if (r2 >= 0 && r2 <= 1) { + return r2; + } else { + return -1.0; + } } /* ---------------------------------------------------------------------- */ /* Preparation: fill in the sum* fields of a path (used for later rapid summing). Return 0 on success, 1 with errno set on failure. */ -static int calc_sums(privpath_t *pp) { - int i, x, y; - int n = pp->len; - - SAFE_MALLOC(pp->sums, pp->len+1, sums_t); - - /* origin */ - pp->x0 = pp->pt[0].x; - pp->y0 = pp->pt[0].y; - - /* preparatory computation for later fast summing */ - pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0; - for (i=0; i<n; i++) { - x = pp->pt[i].x - pp->x0; - y = pp->pt[i].y - pp->y0; - pp->sums[i+1].x = pp->sums[i].x + x; - pp->sums[i+1].y = pp->sums[i].y + y; - pp->sums[i+1].x2 = pp->sums[i].x2 + x*x; - pp->sums[i+1].xy = pp->sums[i].xy + x*y; - pp->sums[i+1].y2 = pp->sums[i].y2 + y*y; - } - return 0; - - malloc_error: - return 1; +static int calc_sums(privpath_t *pp) +{ + int i, x, y; + int n = pp->len; + + SAFE_MALLOC(pp->sums, pp->len + 1, sums_t); + + /* origin */ + pp->x0 = pp->pt[0].x; + pp->y0 = pp->pt[0].y; + + /* preparatory computation for later fast summing */ + pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0; + for (i = 0; i < n; i++) { + x = pp->pt[i].x - pp->x0; + y = pp->pt[i].y - pp->y0; + pp->sums[i + 1].x = pp->sums[i].x + x; + pp->sums[i + 1].y = pp->sums[i].y + y; + pp->sums[i + 1].x2 = pp->sums[i].x2 + x * x; + pp->sums[i + 1].xy = pp->sums[i].xy + x * y; + pp->sums[i + 1].y2 = pp->sums[i].y2 + y * y; + } + return 0; + +malloc_error: + return 1; } /* ---------------------------------------------------------------------- */ /* Stage 1: determine the straight subpaths (Sec. 2.2.1). Fill in the - "lon" component of a path object (based on pt/len). For each i, + "lon" component of a path object (based on pt/len). For each i, lon[i] is the furthest index such that a straight line can be drawn from i to lon[i]. Return 1 on error with errno set, else 0. */ @@ -318,206 +326,208 @@ static int calc_sums(privpath_t *pp) { substantial. */ /* returns 0 on success, 1 on error with errno set */ -static int calc_lon(privpath_t *pp) { - point_t *pt = pp->pt; - int n = pp->len; - int i, j, k, k1; - int ct[4], dir; - point_t constraint[2]; - point_t cur; - point_t off; - int *pivk = NULL; /* pivk[n] */ - int *nc = NULL; /* nc[n]: next corner */ - point_t dk; /* direction of k-k1 */ - int a, b, c, d; - - SAFE_MALLOC(pivk, n, int); - SAFE_MALLOC(nc, n, int); - - /* initialize the nc data structure. Point from each point to the - furthest future point to which it is connected by a vertical or - horizontal segment. We take advantage of the fact that there is - always a direction change at 0 (due to the path decomposition - algorithm). But even if this were not so, there is no harm, as - in practice, correctness does not depend on the word "furthest" - above. */ - k = 0; - for (i=n-1; i>=0; i--) { - if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) { - k = i+1; /* necessarily i<n-1 in this case */ - } - nc[i] = k; - } - - SAFE_MALLOC(pp->lon, n, int); - - /* determine pivot points: for each i, let pivk[i] be the furthest k - such that all j with i<j<k lie on a line connecting i,k. */ - - for (i=n-1; i>=0; i--) { - ct[0] = ct[1] = ct[2] = ct[3] = 0; - - /* keep track of "directions" that have occurred */ - dir = (3+3*(pt[mod(i+1,n)].x-pt[i].x)+(pt[mod(i+1,n)].y-pt[i].y))/2; - ct[dir]++; - - constraint[0].x = 0; - constraint[0].y = 0; - constraint[1].x = 0; - constraint[1].y = 0; - - /* find the next k such that no straight line from i to k */ - k = nc[i]; - k1 = i; - while (1) { - - dir = (3+3*sign(pt[k].x-pt[k1].x)+sign(pt[k].y-pt[k1].y))/2; - ct[dir]++; - - /* if all four "directions" have occurred, cut this path */ - if (ct[0] && ct[1] && ct[2] && ct[3]) { - pivk[i] = k1; - goto foundk; - } - - cur.x = pt[k].x - pt[i].x; - cur.y = pt[k].y - pt[i].y; - - /* see if current constraint is violated */ - if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) { - goto constraint_viol; - } - - /* else, update constraint */ - if (abs(cur.x) <= 1 && abs(cur.y) <= 1) { - /* no constraint */ - } else { - off.x = cur.x + ((cur.y>=0 && (cur.y>0 || cur.x<0)) ? 1 : -1); - off.y = cur.y + ((cur.x<=0 && (cur.x<0 || cur.y<0)) ? 1 : -1); - if (xprod(constraint[0], off) >= 0) { - constraint[0] = off; - } - off.x = cur.x + ((cur.y<=0 && (cur.y<0 || cur.x<0)) ? 1 : -1); - off.y = cur.y + ((cur.x>=0 && (cur.x>0 || cur.y<0)) ? 1 : -1); - if (xprod(constraint[1], off) <= 0) { - constraint[1] = off; - } - } - k1 = k; - k = nc[k1]; - if (!cyclic(k,i,k1)) { - break; - } - } - constraint_viol: - /* k1 was the last "corner" satisfying the current constraint, and - k is the first one violating it. We now need to find the last - point along k1..k which satisfied the constraint. */ - dk.x = sign(pt[k].x-pt[k1].x); - dk.y = sign(pt[k].y-pt[k1].y); - cur.x = pt[k1].x - pt[i].x; - cur.y = pt[k1].y - pt[i].y; - /* find largest integer j such that xprod(constraint[0], cur+j*dk) - >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity - of xprod. */ - a = xprod(constraint[0], cur); - b = xprod(constraint[0], dk); - c = xprod(constraint[1], cur); - d = xprod(constraint[1], dk); - /* find largest integer j such that a+j*b>=0 and c+j*d<=0. This - can be solved with integer arithmetic. */ - j = INFTY; - if (b<0) { - j = floordiv(a,-b); - } - if (d>0) { - j = min(j, floordiv(-c,d)); +static int calc_lon(privpath_t *pp) +{ + point_t *pt = pp->pt; + int n = pp->len; + int i, j, k, k1; + int ct[4], dir; + point_t constraint[2]; + point_t cur; + point_t off; + int *pivk = NULL; /* pivk[n] */ + int *nc = NULL; /* nc[n]: next corner */ + point_t dk; /* direction of k-k1 */ + int a, b, c, d; + + SAFE_MALLOC(pivk, n, int); + SAFE_MALLOC(nc, n, int); + + /* initialize the nc data structure. Point from each point to the + furthest future point to which it is connected by a vertical or + horizontal segment. We take advantage of the fact that there is + always a direction change at 0 (due to the path decomposition + algorithm). But even if this were not so, there is no harm, as + in practice, correctness does not depend on the word "furthest" + above. */ + k = 0; + for (i = n - 1; i >= 0; i--) { + if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) { + k = i + 1; /* necessarily i<n-1 in this case */ + } + nc[i] = k; } - pivk[i] = mod(k1+j,n); - foundk: - ; - } /* for i */ - - /* clean up: for each i, let lon[i] be the largest k such that for - all i' with i<=i'<k, i'<k<=pivk[i']. */ - - j=pivk[n-1]; - pp->lon[n-1]=j; - for (i=n-2; i>=0; i--) { - if (cyclic(i+1,pivk[i],j)) { - j=pivk[i]; + + SAFE_MALLOC(pp->lon, n, int); + + /* determine pivot points: for each i, let pivk[i] be the furthest k + such that all j with i<j<k lie on a line connecting i,k. */ + + for (i = n - 1; i >= 0; i--) { + ct[0] = ct[1] = ct[2] = ct[3] = 0; + + /* keep track of "directions" that have occurred */ + dir = (3 + 3 * (pt[mod(i + 1, n)].x - pt[i].x) + (pt[mod(i + 1, n)].y - pt[i].y)) / 2; + ct[dir]++; + + constraint[0].x = 0; + constraint[0].y = 0; + constraint[1].x = 0; + constraint[1].y = 0; + + /* find the next k such that no straight line from i to k */ + k = nc[i]; + k1 = i; + while (1) { + + dir = (3 + 3 * sign(pt[k].x - pt[k1].x) + sign(pt[k].y - pt[k1].y)) / 2; + ct[dir]++; + + /* if all four "directions" have occurred, cut this path */ + if (ct[0] && ct[1] && ct[2] && ct[3]) { + pivk[i] = k1; + goto foundk; + } + + cur.x = pt[k].x - pt[i].x; + cur.y = pt[k].y - pt[i].y; + + /* see if current constraint is violated */ + if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) { + goto constraint_viol; + } + + /* else, update constraint */ + if (abs(cur.x) <= 1 && abs(cur.y) <= 1) { + /* no constraint */ + } else { + off.x = cur.x + ((cur.y >= 0 && (cur.y > 0 || cur.x < 0)) ? 1 : -1); + off.y = cur.y + ((cur.x <= 0 && (cur.x < 0 || cur.y < 0)) ? 1 : -1); + if (xprod(constraint[0], off) >= 0) { + constraint[0] = off; + } + off.x = cur.x + ((cur.y <= 0 && (cur.y < 0 || cur.x < 0)) ? 1 : -1); + off.y = cur.y + ((cur.x >= 0 && (cur.x > 0 || cur.y < 0)) ? 1 : -1); + if (xprod(constraint[1], off) <= 0) { + constraint[1] = off; + } + } + k1 = k; + k = nc[k1]; + if (!cyclic(k, i, k1)) { + break; + } + } + constraint_viol: + /* k1 was the last "corner" satisfying the current constraint, and + k is the first one violating it. We now need to find the last + point along k1..k which satisfied the constraint. */ + dk.x = sign(pt[k].x - pt[k1].x); + dk.y = sign(pt[k].y - pt[k1].y); + cur.x = pt[k1].x - pt[i].x; + cur.y = pt[k1].y - pt[i].y; + /* find largest integer j such that xprod(constraint[0], cur+j*dk) + >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity + of xprod. */ + a = xprod(constraint[0], cur); + b = xprod(constraint[0], dk); + c = xprod(constraint[1], cur); + d = xprod(constraint[1], dk); + /* find largest integer j such that a+j*b>=0 and c+j*d<=0. This + can be solved with integer arithmetic. */ + j = INFTY; + if (b < 0) { + j = floordiv(a, -b); + } + if (d > 0) { + j = min(j, floordiv(-c, d)); + } + pivk[i] = mod(k1 + j, n); + foundk: + ; + } /* for i */ + + /* clean up: for each i, let lon[i] be the largest k such that for + all i' with i<=i'<k, i'<k<=pivk[i']. */ + + j = pivk[n - 1]; + pp->lon[n - 1] = j; + for (i = n - 2; i >= 0; i--) { + if (cyclic(i + 1, pivk[i], j)) { + j = pivk[i]; + } + pp->lon[i] = j; } - pp->lon[i]=j; - } - for (i=n-1; cyclic(mod(i+1,n),j,pp->lon[i]); i--) { - pp->lon[i] = j; - } + for (i = n - 1; cyclic(mod(i + 1, n), j, pp->lon[i]); i--) { + pp->lon[i] = j; + } - free(pivk); - free(nc); - return 0; + free(pivk); + free(nc); + return 0; - malloc_error: - free(pivk); - free(nc); - return 1; +malloc_error: + free(pivk); + free(nc); + return 1; } /* ---------------------------------------------------------------------- */ -/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */ +/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */ /* Auxiliary function: calculate the penalty of an edge from i to j in the given path. This needs the "lon" and "sum*" data. */ -static double penalty3(privpath_t *pp, int i, int j) { - int n = pp->len; - point_t *pt = pp->pt; - sums_t *sums = pp->sums; - - /* assume 0<=i<j<=n */ - double x, y, x2, xy, y2; - double k; - double a, b, c, s; - double px, py, ex, ey; - - int r = 0; /* rotations from i to j */ - - if (j>=n) { - j -= n; - r = 1; - } - - /* critical inner loop: the "if" gives a 4.6 percent speedup */ - if (r == 0) { - x = sums[j+1].x - sums[i].x; - y = sums[j+1].y - sums[i].y; - x2 = sums[j+1].x2 - sums[i].x2; - xy = sums[j+1].xy - sums[i].xy; - y2 = sums[j+1].y2 - sums[i].y2; - k = j+1 - i; - } else { - x = sums[j+1].x - sums[i].x + sums[n].x; - y = sums[j+1].y - sums[i].y + sums[n].y; - x2 = sums[j+1].x2 - sums[i].x2 + sums[n].x2; - xy = sums[j+1].xy - sums[i].xy + sums[n].xy; - y2 = sums[j+1].y2 - sums[i].y2 + sums[n].y2; - k = j+1 - i + n; - } - - px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x; - py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y; - ey = (pt[j].x - pt[i].x); - ex = -(pt[j].y - pt[i].y); - - a = ((x2 - 2*x*px) / k + px*px); - b = ((xy - x*py - y*px) / k + px*py); - c = ((y2 - 2*y*py) / k + py*py); - - s = ex*ex*a + 2*ex*ey*b + ey*ey*c; - - return sqrt(s); +static double penalty3(privpath_t *pp, int i, int j) +{ + int n = pp->len; + point_t *pt = pp->pt; + sums_t *sums = pp->sums; + + /* assume 0<=i<j<=n */ + double x, y, x2, xy, y2; + double k; + double a, b, c, s; + double px, py, ex, ey; + + int r = 0; /* rotations from i to j */ + + if (j >= n) { + j -= n; + r = 1; + } + + /* critical inner loop: the "if" gives a 4.6 percent speedup */ + if (r == 0) { + x = sums[j + 1].x - sums[i].x; + y = sums[j + 1].y - sums[i].y; + x2 = sums[j + 1].x2 - sums[i].x2; + xy = sums[j + 1].xy - sums[i].xy; + y2 = sums[j + 1].y2 - sums[i].y2; + k = j + 1 - i; + } else { + x = sums[j + 1].x - sums[i].x + sums[n].x; + y = sums[j + 1].y - sums[i].y + sums[n].y; + x2 = sums[j + 1].x2 - sums[i].x2 + sums[n].x2; + xy = sums[j + 1].xy - sums[i].xy + sums[n].xy; + y2 = sums[j + 1].y2 - sums[i].y2 + sums[n].y2; + k = j + 1 - i + n; + } + + px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x; + py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y; + ey = (pt[j].x - pt[i].x); + ex = -(pt[j].y - pt[i].y); + + a = ((x2 - 2 * x * px) / k + px * px); + b = ((xy - x * py - y * px) / k + px * py); + c = ((y2 - 2 * y * py) / k + py * py); + + s = ex * ex * a + 2 * ex * ey * b + ey * ey * c; + + return sqrt(s); } /* find the optimal polygon. Fill in the m and po components. Return 1 @@ -525,109 +535,109 @@ static double penalty3(privpath_t *pp, int i, int j) { is in the polygon. Fixme: implement cyclic version. */ static int bestpolygon(privpath_t *pp) { - int i, j, m, k; - int n = pp->len; - double *pen = NULL; /* pen[n+1]: penalty vector */ - int *prev = NULL; /* prev[n+1]: best path pointer vector */ - int *clip0 = NULL; /* clip0[n]: longest segment pointer, non-cyclic */ - int *clip1 = NULL; /* clip1[n+1]: backwards segment pointer, non-cyclic */ - int *seg0 = NULL; /* seg0[m+1]: forward segment bounds, m<=n */ - int *seg1 = NULL; /* seg1[m+1]: backward segment bounds, m<=n */ - double thispen; - double best; - int c; - - SAFE_MALLOC(pen, n+1, double); - SAFE_MALLOC(prev, n+1, int); - SAFE_MALLOC(clip0, n, int); - SAFE_MALLOC(clip1, n+1, int); - SAFE_MALLOC(seg0, n+1, int); - SAFE_MALLOC(seg1, n+1, int); - - /* calculate clipped paths */ - for (i=0; i<n; i++) { - c = mod(pp->lon[mod(i-1,n)]-1,n); - if (c == i) { - c = mod(i+1,n); + int i, j, m, k; + int n = pp->len; + double *pen = NULL; /* pen[n+1]: penalty vector */ + int *prev = NULL; /* prev[n+1]: best path pointer vector */ + int *clip0 = NULL; /* clip0[n]: longest segment pointer, non-cyclic */ + int *clip1 = NULL; /* clip1[n+1]: backwards segment pointer, non-cyclic */ + int *seg0 = NULL; /* seg0[m+1]: forward segment bounds, m<=n */ + int *seg1 = NULL; /* seg1[m+1]: backward segment bounds, m<=n */ + double thispen; + double best; + int c; + + SAFE_MALLOC(pen, n + 1, double); + SAFE_MALLOC(prev, n + 1, int); + SAFE_MALLOC(clip0, n, int); + SAFE_MALLOC(clip1, n + 1, int); + SAFE_MALLOC(seg0, n + 1, int); + SAFE_MALLOC(seg1, n + 1, int); + + /* calculate clipped paths */ + for (i = 0; i < n; i++) { + c = mod(pp->lon[mod(i - 1, n)] - 1, n); + if (c == i) { + c = mod(i + 1, n); + } + if (c < i) { + clip0[i] = n; + } else { + clip0[i] = c; + } } - if (c < i) { - clip0[i] = n; - } else { - clip0[i] = c; + + /* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff + clip1[j] <= i, for i,j=0..n. */ + j = 1; + for (i = 0; i < n; i++) { + while (j <= clip0[i]) { + clip1[j] = i; + j++; + } + } + + /* calculate seg0[j] = longest path from 0 with j segments */ + i = 0; + for (j = 0; i < n; j++) { + seg0[j] = i; + i = clip0[i]; + } + seg0[j] = n; + m = j; + + /* calculate seg1[j] = longest path to n with m-j segments */ + i = n; + for (j = m; j > 0; j--) { + seg1[j] = i; + i = clip1[i]; } - } - - /* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff - clip1[j] <= i, for i,j=0..n. */ - j = 1; - for (i=0; i<n; i++) { - while (j <= clip0[i]) { - clip1[j] = i; - j++; + seg1[0] = 0; + + /* now find the shortest path with m segments, based on penalty3 */ + /* note: the outer 2 loops jointly have at most n iterations, thus + the worst-case behavior here is quadratic. In practice, it is + close to linear since the inner loop tends to be short. */ + pen[0] = 0; + for (j = 1; j <= m; j++) { + for (i = seg1[j]; i <= seg0[j]; i++) { + best = -1; + for (k = seg0[j - 1]; k >= clip1[i]; k--) { + thispen = penalty3(pp, k, i) + pen[k]; + if (best < 0 || thispen < best) { + prev[i] = k; + best = thispen; + } + } + pen[i] = best; + } } - } - - /* calculate seg0[j] = longest path from 0 with j segments */ - i = 0; - for (j=0; i<n; j++) { - seg0[j] = i; - i = clip0[i]; - } - seg0[j] = n; - m = j; - - /* calculate seg1[j] = longest path to n with m-j segments */ - i = n; - for (j=m; j>0; j--) { - seg1[j] = i; - i = clip1[i]; - } - seg1[0] = 0; - - /* now find the shortest path with m segments, based on penalty3 */ - /* note: the outer 2 loops jointly have at most n iterations, thus - the worst-case behavior here is quadratic. In practice, it is - close to linear since the inner loop tends to be short. */ - pen[0]=0; - for (j=1; j<=m; j++) { - for (i=seg1[j]; i<=seg0[j]; i++) { - best = -1; - for (k=seg0[j-1]; k>=clip1[i]; k--) { - thispen = penalty3(pp, k, i) + pen[k]; - if (best < 0 || thispen < best) { - prev[i] = k; - best = thispen; - } - } - pen[i] = best; + + pp->m = m; + SAFE_MALLOC(pp->po, m, int); + + /* read off shortest path */ + for (i = n, j = m - 1; i > 0; j--) { + i = prev[i]; + pp->po[j] = i; } - } - - pp->m = m; - SAFE_MALLOC(pp->po, m, int); - - /* read off shortest path */ - for (i=n, j=m-1; i>0; j--) { - i = prev[i]; - pp->po[j] = i; - } - - free(pen); - free(prev); - free(clip0); - free(clip1); - free(seg0); - free(seg1); - return 0; - - malloc_error: - free(pen); - free(prev); - free(clip0); - free(clip1); - free(seg0); - free(seg1); - return 1; + + free(pen); + free(prev); + free(clip0); + free(clip1); + free(seg0); + free(seg1); + return 0; + +malloc_error: + free(pen); + free(prev); + free(clip0); + free(clip1); + free(seg0); + free(seg1); + return 1; } /* ---------------------------------------------------------------------- */ @@ -638,266 +648,269 @@ static int bestpolygon(privpath_t *pp) if it lies outside. Return 1 with errno set on error; 0 on success. */ -static int adjust_vertices(privpath_t *pp) { - int m = pp->m; - int *po = pp->po; - int n = pp->len; - point_t *pt = pp->pt; - int x0 = pp->x0; - int y0 = pp->y0; - - dpoint_t *ctr = NULL; /* ctr[m] */ - dpoint_t *dir = NULL; /* dir[m] */ - quadform_t *q = NULL; /* q[m] */ - double v[3]; - double d; - int i, j, k, l; - dpoint_t s; - int r; - - SAFE_MALLOC(ctr, m, dpoint_t); - SAFE_MALLOC(dir, m, dpoint_t); - SAFE_MALLOC(q, m, quadform_t); - - r = privcurve_init(&pp->curve, m); - if (r) { - goto malloc_error; - } - - /* calculate "optimal" point-slope representation for each line - segment */ - for (i=0; i<m; i++) { - j = po[mod(i+1,m)]; - j = mod(j-po[i],n)+po[i]; - pointslope(pp, po[i], j, &ctr[i], &dir[i]); - } - - /* represent each line segment as a singular quadratic form; the - distance of a point (x,y) from the line segment will be - (x,y,1)Q(x,y,1)^t, where Q=q[i]. */ - for (i=0; i<m; i++) { - d = sq(dir[i].x) + sq(dir[i].y); - if (d == 0.0) { - for (j=0; j<3; j++) { - for (k=0; k<3; k++) { - q[i][j][k] = 0; - } - } - } else { - v[0] = dir[i].y; - v[1] = -dir[i].x; - v[2] = - v[1] * ctr[i].y - v[0] * ctr[i].x; - for (l=0; l<3; l++) { - for (k=0; k<3; k++) { - q[i][l][k] = v[l] * v[k] / d; - } - } - } - } - - /* now calculate the "intersections" of consecutive segments. - Instead of using the actual intersection, we find the point - within a given unit square which minimizes the square distance to - the two lines. */ - for (i=0; i<m; i++) { - quadform_t Q; - dpoint_t w; - double dx, dy; - double det; - double min, cand; /* minimum and candidate for minimum of quad. form */ - double xmin, ymin; /* coordinates of minimum */ - int z; - - /* let s be the vertex, in coordinates relative to x0/y0 */ - s.x = pt[po[i]].x-x0; - s.y = pt[po[i]].y-y0; - - /* intersect segments i-1 and i */ - - j = mod(i-1,m); - - /* add quadratic forms */ - for (l=0; l<3; l++) { - for (k=0; k<3; k++) { - Q[l][k] = q[j][l][k] + q[i][l][k]; - } +static int adjust_vertices(privpath_t *pp) +{ + int m = pp->m; + int *po = pp->po; + int n = pp->len; + point_t *pt = pp->pt; + int x0 = pp->x0; + int y0 = pp->y0; + + dpoint_t *ctr = NULL; /* ctr[m] */ + dpoint_t *dir = NULL; /* dir[m] */ + quadform_t *q = NULL; /* q[m] */ + double v[3]; + double d; + int i, j, k, l; + dpoint_t s; + int r; + + SAFE_MALLOC(ctr, m, dpoint_t); + SAFE_MALLOC(dir, m, dpoint_t); + SAFE_MALLOC(q, m, quadform_t); + + r = privcurve_init(&pp->curve, m); + if (r) { + goto malloc_error; } - - while(1) { - /* minimize the quadratic form Q on the unit square */ - /* find intersection */ -#ifdef HAVE_GCC_LOOP_BUG - /* work around gcc bug #12243 */ - free(NULL); -#endif - - det = Q[0][0]*Q[1][1] - Q[0][1]*Q[1][0]; - if (det != 0.0) { - w.x = (-Q[0][2]*Q[1][1] + Q[1][2]*Q[0][1]) / det; - w.y = ( Q[0][2]*Q[1][0] - Q[1][2]*Q[0][0]) / det; - break; - } - - /* matrix is singular - lines are parallel. Add another, - orthogonal axis, through the center of the unit square */ - if (Q[0][0]>Q[1][1]) { - v[0] = -Q[0][1]; - v[1] = Q[0][0]; - } else if (Q[1][1]) { - v[0] = -Q[1][1]; - v[1] = Q[1][0]; - } else { - v[0] = 1; - v[1] = 0; - } - d = sq(v[0]) + sq(v[1]); - v[2] = - v[1] * s.y - v[0] * s.x; - for (l=0; l<3; l++) { - for (k=0; k<3; k++) { - Q[l][k] += v[l] * v[k] / d; - } - } + /* calculate "optimal" point-slope representation for each line + segment */ + for (i = 0; i < m; i++) { + j = po[mod(i + 1, m)]; + j = mod(j - po[i], n) + po[i]; + pointslope(pp, po[i], j, &ctr[i], &dir[i]); } - dx = fabs(w.x-s.x); - dy = fabs(w.y-s.y); - if (dx <= .5 && dy <= .5) { - pp->curve.vertex[i].x = w.x+x0; - pp->curve.vertex[i].y = w.y+y0; - continue; + + /* represent each line segment as a singular quadratic form; the + distance of a point (x,y) from the line segment will be + (x,y,1)Q(x,y,1)^t, where Q=q[i]. */ + for (i = 0; i < m; i++) { + d = sq(dir[i].x) + sq(dir[i].y); + if (d == 0.0) { + for (j = 0; j < 3; j++) { + for (k = 0; k < 3; k++) { + q[i][j][k] = 0; + } + } + } else { + v[0] = dir[i].y; + v[1] = -dir[i].x; + v[2] = -v[1] * ctr[i].y - v[0] * ctr[i].x; + for (l = 0; l < 3; l++) { + for (k = 0; k < 3; k++) { + q[i][l][k] = v[l] * v[k] / d; + } + } + } } - /* the minimum was not in the unit square; now minimize quadratic - on boundary of square */ - min = quadform(Q, s); - xmin = s.x; - ymin = s.y; + /* now calculate the "intersections" of consecutive segments. + Instead of using the actual intersection, we find the point + within a given unit square which minimizes the square distance to + the two lines. */ + for (i = 0; i < m; i++) { + quadform_t Q; + dpoint_t w; + double dx, dy; + double det; + double min, cand; /* minimum and candidate for minimum of quad. form */ + double xmin, ymin; /* coordinates of minimum */ + int z; + + /* let s be the vertex, in coordinates relative to x0/y0 */ + s.x = pt[po[i]].x - x0; + s.y = pt[po[i]].y - y0; + + /* intersect segments i-1 and i */ + + j = mod(i - 1, m); + + /* add quadratic forms */ + for (l = 0; l < 3; l++) { + for (k = 0; k < 3; k++) { + Q[l][k] = q[j][l][k] + q[i][l][k]; + } + } + + while (1) { +/* minimize the quadratic form Q on the unit square */ +/* find intersection */ - if (Q[0][0] == 0.0) { - goto fixx; - } - for (z=0; z<2; z++) { /* value of the y-coordinate */ - w.y = s.y-0.5+z; - w.x = - (Q[0][1] * w.y + Q[0][2]) / Q[0][0]; - dx = fabs(w.x-s.x); - cand = quadform(Q, w); - if (dx <= .5 && cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - fixx: - if (Q[1][1] == 0.0) { - goto corners; - } - for (z=0; z<2; z++) { /* value of the x-coordinate */ - w.x = s.x-0.5+z; - w.y = - (Q[1][0] * w.x + Q[1][2]) / Q[1][1]; - dy = fabs(w.y-s.y); - cand = quadform(Q, w); - if (dy <= .5 && cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - corners: - /* check four corners */ - for (l=0; l<2; l++) { - for (k=0; k<2; k++) { - w.x = s.x-0.5+l; - w.y = s.y-0.5+k; - cand = quadform(Q, w); - if (cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } +#ifdef HAVE_GCC_LOOP_BUG + /* work around gcc bug #12243 */ + free(NULL); +#endif + + det = Q[0][0] * Q[1][1] - Q[0][1] * Q[1][0]; + if (det != 0.0) { + w.x = (-Q[0][2] * Q[1][1] + Q[1][2] * Q[0][1]) / det; + w.y = (Q[0][2] * Q[1][0] - Q[1][2] * Q[0][0]) / det; + break; + } + + /* matrix is singular - lines are parallel. Add another, + orthogonal axis, through the center of the unit square */ + if (Q[0][0] > Q[1][1]) { + v[0] = -Q[0][1]; + v[1] = Q[0][0]; + } else if (Q[1][1]) { + v[0] = -Q[1][1]; + v[1] = Q[1][0]; + } else { + v[0] = 1; + v[1] = 0; + } + d = sq(v[0]) + sq(v[1]); + v[2] = -v[1] * s.y - v[0] * s.x; + for (l = 0; l < 3; l++) { + for (k = 0; k < 3; k++) { + Q[l][k] += v[l] * v[k] / d; + } + } + } + dx = fabs(w.x - s.x); + dy = fabs(w.y - s.y); + if (dx <= .5 && dy <= .5) { + pp->curve.vertex[i].x = w.x + x0; + pp->curve.vertex[i].y = w.y + y0; + continue; + } + + /* the minimum was not in the unit square; now minimize quadratic + on boundary of square */ + min = quadform(Q, s); + xmin = s.x; + ymin = s.y; + + if (Q[0][0] == 0.0) { + goto fixx; + } + for (z = 0; z < 2; z++) { /* value of the y-coordinate */ + w.y = s.y - 0.5 + z; + w.x = -(Q[0][1] * w.y + Q[0][2]) / Q[0][0]; + dx = fabs(w.x - s.x); + cand = quadform(Q, w); + if (dx <= .5 && cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + fixx: + if (Q[1][1] == 0.0) { + goto corners; + } + for (z = 0; z < 2; z++) { /* value of the x-coordinate */ + w.x = s.x - 0.5 + z; + w.y = -(Q[1][0] * w.x + Q[1][2]) / Q[1][1]; + dy = fabs(w.y - s.y); + cand = quadform(Q, w); + if (dy <= .5 && cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + corners: + /* check four corners */ + for (l = 0; l < 2; l++) { + for (k = 0; k < 2; k++) { + w.x = s.x - 0.5 + l; + w.y = s.y - 0.5 + k; + cand = quadform(Q, w); + if (cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + } + + pp->curve.vertex[i].x = xmin + x0; + pp->curve.vertex[i].y = ymin + y0; + continue; } - pp->curve.vertex[i].x = xmin + x0; - pp->curve.vertex[i].y = ymin + y0; - continue; - } - - free(ctr); - free(dir); - free(q); - return 0; - - malloc_error: - free(ctr); - free(dir); - free(q); - return 1; + free(ctr); + free(dir); + free(q); + return 0; + +malloc_error: + free(ctr); + free(dir); + free(q); + return 1; } /* ---------------------------------------------------------------------- */ /* Stage 4: smoothing and corner analysis (Sec. 2.3.3) */ /* reverse orientation of a path */ -static void reverse(privcurve_t *curve) { - int m = curve->n; - int i, j; - dpoint_t tmp; - - for (i=0, j=m-1; i<j; i++, j--) { - tmp = curve->vertex[i]; - curve->vertex[i] = curve->vertex[j]; - curve->vertex[j] = tmp; - } +static void reverse(privcurve_t *curve) +{ + int m = curve->n; + int i, j; + dpoint_t tmp; + + for (i = 0, j = m - 1; i < j; i++, j--) { + tmp = curve->vertex[i]; + curve->vertex[i] = curve->vertex[j]; + curve->vertex[j] = tmp; + } } /* Always succeeds */ -static void smooth(privcurve_t *curve, double alphamax) { - int m = curve->n; - - int i, j, k; - double dd, denom, alpha; - dpoint_t p2, p3, p4; - - /* examine each vertex and find its best fit */ - for (i=0; i<m; i++) { - j = mod(i+1, m); - k = mod(i+2, m); - p4 = interval(1/2.0, curve->vertex[k], curve->vertex[j]); - - denom = ddenom(curve->vertex[i], curve->vertex[k]); - if (denom != 0.0) { - dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom; - dd = fabs(dd); - alpha = dd>1 ? (1 - 1.0/dd) : 0; - alpha = alpha / 0.75; - } else { - alpha = 4/3.0; - } - curve->alpha0[j] = alpha; /* remember "original" value of alpha */ - - if (alpha > alphamax) { /* pointed corner */ - curve->tag[j] = POTRACE_CORNER; - curve->c[j][1] = curve->vertex[j]; - curve->c[j][2] = p4; - } else { - if (alpha < 0.55) { - alpha = 0.55; - } else if (alpha > 1) { - alpha = 1; - } - p2 = interval(.5+.5*alpha, curve->vertex[i], curve->vertex[j]); - p3 = interval(.5+.5*alpha, curve->vertex[k], curve->vertex[j]); - curve->tag[j] = POTRACE_CURVETO; - curve->c[j][0] = p2; - curve->c[j][1] = p3; - curve->c[j][2] = p4; +static void smooth(privcurve_t *curve, double alphamax) +{ + int m = curve->n; + + int i, j, k; + double dd, denom, alpha; + dpoint_t p2, p3, p4; + + /* examine each vertex and find its best fit */ + for (i = 0; i < m; i++) { + j = mod(i + 1, m); + k = mod(i + 2, m); + p4 = interval(1 / 2.0, curve->vertex[k], curve->vertex[j]); + + denom = ddenom(curve->vertex[i], curve->vertex[k]); + if (denom != 0.0) { + dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom; + dd = fabs(dd); + alpha = dd > 1 ? (1 - 1.0 / dd) : 0; + alpha = alpha / 0.75; + } else { + alpha = 4 / 3.0; + } + curve->alpha0[j] = alpha; /* remember "original" value of alpha */ + + if (alpha > alphamax) { /* pointed corner */ + curve->tag[j] = POTRACE_CORNER; + curve->c[j][1] = curve->vertex[j]; + curve->c[j][2] = p4; + } else { + if (alpha < 0.55) { + alpha = 0.55; + } else if (alpha > 1) { + alpha = 1; + } + p2 = interval(.5 + .5 * alpha, curve->vertex[i], curve->vertex[j]); + p3 = interval(.5 + .5 * alpha, curve->vertex[k], curve->vertex[j]); + curve->tag[j] = POTRACE_CURVETO; + curve->c[j][0] = p2; + curve->c[j][1] = p3; + curve->c[j][2] = p4; + } + curve->alpha[j] = alpha; /* store the "cropped" value of alpha */ + curve->beta[j] = 0.5; } - curve->alpha[j] = alpha; /* store the "cropped" value of alpha */ - curve->beta[j] = 0.5; - } - curve->alphacurve = 1; + curve->alphacurve = 1; - return; + return; } /* ---------------------------------------------------------------------- */ @@ -905,341 +918,349 @@ static void smooth(privcurve_t *curve, double alphamax) { /* a private type for the result of opti_penalty */ struct opti_s { - double pen; /* penalty */ - dpoint_t c[2]; /* curve parameters */ - double t, s; /* curve parameters */ - double alpha; /* curve parameter */ + double pen; /* penalty */ + dpoint_t c[2]; /* curve parameters */ + double t, s; /* curve parameters */ + double alpha; /* curve parameter */ }; typedef struct opti_s opti_t; /* calculate best fit from i+.5 to j+.5. Assume i<j (cyclically). Return 0 and set badness and parameters (alpha, beta), if possible. Return 1 if impossible. */ -static int opti_penalty(privpath_t *pp, int i, int j, opti_t *res, double opttolerance, int *convc, double *areac) { - int m = pp->curve.n; - int k, k1, k2, conv, i1; - double area, alpha, d, d1, d2; - dpoint_t p0, p1, p2, p3, pt; - double A, R, A1, A2, A3, A4; - double s, t; - - /* check convexity, corner-freeness, and maximum bend < 179 degrees */ +static int opti_penalty(privpath_t *pp, int i, int j, opti_t *res, double opttolerance, int *convc, double *areac) +{ + int m = pp->curve.n; + int k, k1, k2, conv, i1; + double area, alpha, d, d1, d2; + dpoint_t p0, p1, p2, p3, pt; + double A, R, A1, A2, A3, A4; + double s, t; - if (i==j) { /* sanity - a full loop can never be an opticurve */ - return 1; - } + /* check convexity, corner-freeness, and maximum bend < 179 degrees */ - k = i; - i1 = mod(i+1, m); - k1 = mod(k+1, m); - conv = convc[k1]; - if (conv == 0) { - return 1; - } - d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]); - for (k=k1; k!=j; k=k1) { - k1 = mod(k+1, m); - k2 = mod(k+2, m); - if (convc[k1] != conv) { - return 1; + if (i == j) { /* sanity - a full loop can never be an opticurve */ + return 1; } - if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != conv) { - return 1; + + k = i; + i1 = mod(i + 1, m); + k1 = mod(k + 1, m); + conv = convc[k1]; + if (conv == 0) { + return 1; } - if (iprod1(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2]) < d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) { - return 1; + d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]); + for (k = k1; k != j; k = k1) { + k1 = mod(k + 1, m); + k2 = mod(k + 2, m); + if (convc[k1] != conv) { + return 1; + } + if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != + conv) { + return 1; + } + if (iprod1(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2]) < + d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) { + return 1; + } } - } - - /* the curve we're working in: */ - p0 = pp->curve.c[mod(i,m)][2]; - p1 = pp->curve.vertex[mod(i+1,m)]; - p2 = pp->curve.vertex[mod(j,m)]; - p3 = pp->curve.c[mod(j,m)][2]; - - /* determine its area */ - area = areac[j] - areac[i]; - area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2])/2; - if (i>=j) { - area += areac[m]; - } - - /* find intersection o of p0p1 and p2p3. Let t,s such that o = - interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the - triangle (p0,o,p3). */ - - A1 = dpara(p0, p1, p2); - A2 = dpara(p0, p1, p3); - A3 = dpara(p0, p2, p3); - /* A4 = dpara(p1, p2, p3); */ - A4 = A1+A3-A2; - - if (A2 == A1) { /* this should never happen */ - return 1; - } - t = A3/(A3-A4); - s = A2/(A2-A1); - A = A2 * t / 2.0; - - if (A == 0.0) { /* this should never happen */ - return 1; - } + /* the curve we're working in: */ + p0 = pp->curve.c[mod(i, m)][2]; + p1 = pp->curve.vertex[mod(i + 1, m)]; + p2 = pp->curve.vertex[mod(j, m)]; + p3 = pp->curve.c[mod(j, m)][2]; + + /* determine its area */ + area = areac[j] - areac[i]; + area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2]) / 2; + if (i >= j) { + area += areac[m]; + } - R = area / A; /* relative area */ - alpha = 2 - sqrt(4 - R / 0.3); /* overall alpha for p0-o-p3 curve */ + /* find intersection o of p0p1 and p2p3. Let t,s such that o = + interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the + triangle (p0,o,p3). */ - res->c[0] = interval(t * alpha, p0, p1); - res->c[1] = interval(s * alpha, p3, p2); - res->alpha = alpha; - res->t = t; - res->s = s; + A1 = dpara(p0, p1, p2); + A2 = dpara(p0, p1, p3); + A3 = dpara(p0, p2, p3); + /* A4 = dpara(p1, p2, p3); */ + A4 = A1 + A3 - A2; - p1 = res->c[0]; - p2 = res->c[1]; /* the proposed curve is now (p0,p1,p2,p3) */ + if (A2 == A1) { /* this should never happen */ + return 1; + } - res->pen = 0; + t = A3 / (A3 - A4); + s = A2 / (A2 - A1); + A = A2 * t / 2.0; - /* calculate penalty */ - /* check tangency with edges */ - for (k=mod(i+1,m); k!=j; k=k1) { - k1 = mod(k+1,m); - t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]); - if (t<-.5) { - return 1; - } - pt = bezier(t, p0, p1, p2, p3); - d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]); - if (d == 0.0) { /* this should never happen */ - return 1; + if (A == 0.0) { /* this should never happen */ + return 1; } - d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d; - if (fabs(d1) > opttolerance) { - return 1; - } - if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) { - return 1; - } - res->pen += sq(d1); - } - - /* check corners */ - for (k=i; k!=j; k=k1) { - k1 = mod(k+1,m); - t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]); - if (t<-.5) { - return 1; - } - pt = bezier(t, p0, p1, p2, p3); - d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]); - if (d == 0.0) { /* this should never happen */ - return 1; - } - d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d; - d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d; - d2 *= 0.75 * pp->curve.alpha[k1]; - if (d2 < 0) { - d1 = -d1; - d2 = -d2; - } - if (d1 < d2 - opttolerance) { - return 1; + + R = area / A; /* relative area */ + alpha = 2 - sqrt(4 - R / 0.3); /* overall alpha for p0-o-p3 curve */ + + res->c[0] = interval(t * alpha, p0, p1); + res->c[1] = interval(s * alpha, p3, p2); + res->alpha = alpha; + res->t = t; + res->s = s; + + p1 = res->c[0]; + p2 = res->c[1]; /* the proposed curve is now (p0,p1,p2,p3) */ + + res->pen = 0; + + /* calculate penalty */ + /* check tangency with edges */ + for (k = mod(i + 1, m); k != j; k = k1) { + k1 = mod(k + 1, m); + t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]); + if (t < -.5) { + return 1; + } + pt = bezier(t, p0, p1, p2, p3); + d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]); + if (d == 0.0) { /* this should never happen */ + return 1; + } + d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d; + if (fabs(d1) > opttolerance) { + return 1; + } + if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || + iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) { + return 1; + } + res->pen += sq(d1); } - if (d1 < d2) { - res->pen += sq(d1 - d2); + + /* check corners */ + for (k = i; k != j; k = k1) { + k1 = mod(k + 1, m); + t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]); + if (t < -.5) { + return 1; + } + pt = bezier(t, p0, p1, p2, p3); + d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]); + if (d == 0.0) { /* this should never happen */ + return 1; + } + d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d; + d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d; + d2 *= 0.75 * pp->curve.alpha[k1]; + if (d2 < 0) { + d1 = -d1; + d2 = -d2; + } + if (d1 < d2 - opttolerance) { + return 1; + } + if (d1 < d2) { + res->pen += sq(d1 - d2); + } } - } - return 0; + return 0; } /* optimize the path p, replacing sequences of Bezier segments by a single segment when possible. Return 0 on success, 1 with errno set on failure. */ -static int opticurve(privpath_t *pp, double opttolerance) { - int m = pp->curve.n; - int *pt = NULL; /* pt[m+1] */ - double *pen = NULL; /* pen[m+1] */ - int *len = NULL; /* len[m+1] */ - opti_t *opt = NULL; /* opt[m+1] */ - int om; - int i,j,r; - opti_t o; - dpoint_t p0; - int i1; - double area; - double alpha; - double *s = NULL; - double *t = NULL; - - int *convc = NULL; /* conv[m]: pre-computed convexities */ - double *areac = NULL; /* cumarea[m+1]: cache for fast area computation */ - - SAFE_MALLOC(pt, m+1, int); - SAFE_MALLOC(pen, m+1, double); - SAFE_MALLOC(len, m+1, int); - SAFE_MALLOC(opt, m+1, opti_t); - SAFE_MALLOC(convc, m, int); - SAFE_MALLOC(areac, m+1, double); - - /* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */ - for (i=0; i<m; i++) { - if (pp->curve.tag[i] == POTRACE_CURVETO) { - convc[i] = sign(dpara(pp->curve.vertex[mod(i-1,m)], pp->curve.vertex[i], pp->curve.vertex[mod(i+1,m)])); - } else { - convc[i] = 0; +static int opticurve(privpath_t *pp, double opttolerance) +{ + int m = pp->curve.n; + int *pt = NULL; /* pt[m+1] */ + double *pen = NULL; /* pen[m+1] */ + int *len = NULL; /* len[m+1] */ + opti_t *opt = NULL; /* opt[m+1] */ + int om; + int i, j, r; + opti_t o; + dpoint_t p0; + int i1; + double area; + double alpha; + double *s = NULL; + double *t = NULL; + + int *convc = NULL; /* conv[m]: pre-computed convexities */ + double *areac = NULL; /* cumarea[m+1]: cache for fast area computation */ + + SAFE_MALLOC(pt, m + 1, int); + SAFE_MALLOC(pen, m + 1, double); + SAFE_MALLOC(len, m + 1, int); + SAFE_MALLOC(opt, m + 1, opti_t); + SAFE_MALLOC(convc, m, int); + SAFE_MALLOC(areac, m + 1, double); + + /* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */ + for (i = 0; i < m; i++) { + if (pp->curve.tag[i] == POTRACE_CURVETO) { + convc[i] = + sign(dpara(pp->curve.vertex[mod(i - 1, m)], pp->curve.vertex[i], pp->curve.vertex[mod(i + 1, m)])); + } else { + convc[i] = 0; + } } - } - - /* pre-calculate areas */ - area = 0.0; - areac[0] = 0.0; - p0 = pp->curve.vertex[0]; - for (i=0; i<m; i++) { - i1 = mod(i+1, m); - if (pp->curve.tag[i1] == POTRACE_CURVETO) { - alpha = pp->curve.alpha[i1]; - area += 0.3*alpha*(4-alpha)*dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2])/2; - area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2])/2; + + /* pre-calculate areas */ + area = 0.0; + areac[0] = 0.0; + p0 = pp->curve.vertex[0]; + for (i = 0; i < m; i++) { + i1 = mod(i + 1, m); + if (pp->curve.tag[i1] == POTRACE_CURVETO) { + alpha = pp->curve.alpha[i1]; + area += 0.3 * alpha * (4 - alpha) * dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2]) / 2; + area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2]) / 2; + } + areac[i + 1] = area; } - areac[i+1] = area; - } - - pt[0] = -1; - pen[0] = 0; - len[0] = 0; - - /* Fixme: we always start from a fixed point -- should find the best - curve cyclically */ - - for (j=1; j<=m; j++) { - /* calculate best path from 0 to j */ - pt[j] = j-1; - pen[j] = pen[j-1]; - len[j] = len[j-1]+1; - - for (i=j-2; i>=0; i--) { - r = opti_penalty(pp, i, mod(j,m), &o, opttolerance, convc, areac); - if (r) { - break; - } - if (len[j] > len[i]+1 || (len[j] == len[i]+1 && pen[j] > pen[i] + o.pen)) { - pt[j] = i; - pen[j] = pen[i] + o.pen; - len[j] = len[i] + 1; - opt[j] = o; - } + + pt[0] = -1; + pen[0] = 0; + len[0] = 0; + + /* Fixme: we always start from a fixed point -- should find the best + curve cyclically */ + + for (j = 1; j <= m; j++) { + /* calculate best path from 0 to j */ + pt[j] = j - 1; + pen[j] = pen[j - 1]; + len[j] = len[j - 1] + 1; + + for (i = j - 2; i >= 0; i--) { + r = opti_penalty(pp, i, mod(j, m), &o, opttolerance, convc, areac); + if (r) { + break; + } + if (len[j] > len[i] + 1 || (len[j] == len[i] + 1 && pen[j] > pen[i] + o.pen)) { + pt[j] = i; + pen[j] = pen[i] + o.pen; + len[j] = len[i] + 1; + opt[j] = o; + } + } } - } - om = len[m]; - r = privcurve_init(&pp->ocurve, om); - if (r) { - goto malloc_error; - } - SAFE_MALLOC(s, om, double); - SAFE_MALLOC(t, om, double); - - j = m; - for (i=om-1; i>=0; i--) { - if (pt[j]==j-1) { - pp->ocurve.tag[i] = pp->curve.tag[mod(j,m)]; - pp->ocurve.c[i][0] = pp->curve.c[mod(j,m)][0]; - pp->ocurve.c[i][1] = pp->curve.c[mod(j,m)][1]; - pp->ocurve.c[i][2] = pp->curve.c[mod(j,m)][2]; - pp->ocurve.vertex[i] = pp->curve.vertex[mod(j,m)]; - pp->ocurve.alpha[i] = pp->curve.alpha[mod(j,m)]; - pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j,m)]; - pp->ocurve.beta[i] = pp->curve.beta[mod(j,m)]; - s[i] = t[i] = 1.0; - } else { - pp->ocurve.tag[i] = POTRACE_CURVETO; - pp->ocurve.c[i][0] = opt[j].c[0]; - pp->ocurve.c[i][1] = opt[j].c[1]; - pp->ocurve.c[i][2] = pp->curve.c[mod(j,m)][2]; - pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j,m)][2], pp->curve.vertex[mod(j,m)]); - pp->ocurve.alpha[i] = opt[j].alpha; - pp->ocurve.alpha0[i] = opt[j].alpha; - s[i] = opt[j].s; - t[i] = opt[j].t; + om = len[m]; + r = privcurve_init(&pp->ocurve, om); + if (r) { + goto malloc_error; } - j = pt[j]; - } - - /* calculate beta parameters */ - for (i=0; i<om; i++) { - i1 = mod(i+1,om); - pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]); - } - pp->ocurve.alphacurve = 1; - - free(pt); - free(pen); - free(len); - free(opt); - free(s); - free(t); - free(convc); - free(areac); - return 0; - - malloc_error: - free(pt); - free(pen); - free(len); - free(opt); - free(s); - free(t); - free(convc); - free(areac); - return 1; + SAFE_MALLOC(s, om, double); + SAFE_MALLOC(t, om, double); + + j = m; + for (i = om - 1; i >= 0; i--) { + if (pt[j] == j - 1) { + pp->ocurve.tag[i] = pp->curve.tag[mod(j, m)]; + pp->ocurve.c[i][0] = pp->curve.c[mod(j, m)][0]; + pp->ocurve.c[i][1] = pp->curve.c[mod(j, m)][1]; + pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2]; + pp->ocurve.vertex[i] = pp->curve.vertex[mod(j, m)]; + pp->ocurve.alpha[i] = pp->curve.alpha[mod(j, m)]; + pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j, m)]; + pp->ocurve.beta[i] = pp->curve.beta[mod(j, m)]; + s[i] = t[i] = 1.0; + } else { + pp->ocurve.tag[i] = POTRACE_CURVETO; + pp->ocurve.c[i][0] = opt[j].c[0]; + pp->ocurve.c[i][1] = opt[j].c[1]; + pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2]; + pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j, m)][2], pp->curve.vertex[mod(j, m)]); + pp->ocurve.alpha[i] = opt[j].alpha; + pp->ocurve.alpha0[i] = opt[j].alpha; + s[i] = opt[j].s; + t[i] = opt[j].t; + } + j = pt[j]; + } + + /* calculate beta parameters */ + for (i = 0; i < om; i++) { + i1 = mod(i + 1, om); + pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]); + } + pp->ocurve.alphacurve = 1; + + free(pt); + free(pen); + free(len); + free(opt); + free(s); + free(t); + free(convc); + free(areac); + return 0; + +malloc_error: + free(pt); + free(pen); + free(len); + free(opt); + free(s); + free(t); + free(convc); + free(areac); + return 1; } /* ---------------------------------------------------------------------- */ -#define TRY(x) if (x) goto try_error +#define TRY(x) \ + if (x) \ + goto try_error /* return 0 on success, 1 on error with errno set. */ -int process_path(path_t *plist, const potrace_param_t *param, progress_t *progress) { - path_t *p; - double nn = 0, cn = 0; - - if (progress->callback) { - /* precompute task size for progress estimates */ - nn = 0; - list_forall (p, plist) { - nn += p->priv->len; - } - cn = 0; - } - - /* call downstream function with each path */ - list_forall (p, plist) { - TRY(calc_sums(p->priv)); - TRY(calc_lon(p->priv)); - TRY(bestpolygon(p->priv)); - TRY(adjust_vertices(p->priv)); - if (p->sign == '-') { /* reverse orientation of negative paths */ - reverse(&p->priv->curve); - } - smooth(&p->priv->curve, param->alphamax); - if (param->opticurve) { - TRY(opticurve(p->priv, param->opttolerance)); - p->priv->fcurve = &p->priv->ocurve; - } else { - p->priv->fcurve = &p->priv->curve; - } - privcurve_to_curve(p->priv->fcurve, &p->curve); +int process_path(path_t *plist, const potrace_param_t *param, progress_t *progress) +{ + path_t *p; + double nn = 0, cn = 0; if (progress->callback) { - cn += p->priv->len; - progress_update(cn/nn, progress); + /* precompute task size for progress estimates */ + nn = 0; + list_forall(p, plist) { nn += p->priv->len; } + cn = 0; + } + + /* call downstream function with each path */ + list_forall(p, plist) + { + TRY(calc_sums(p->priv)); + TRY(calc_lon(p->priv)); + TRY(bestpolygon(p->priv)); + TRY(adjust_vertices(p->priv)); + if (p->sign == '-') { /* reverse orientation of negative paths */ + reverse(&p->priv->curve); + } + smooth(&p->priv->curve, param->alphamax); + if (param->opticurve) { + TRY(opticurve(p->priv, param->opttolerance)); + p->priv->fcurve = &p->priv->ocurve; + } else { + p->priv->fcurve = &p->priv->curve; + } + privcurve_to_curve(p->priv->fcurve, &p->curve); + + if (progress->callback) { + cn += p->priv->len; + progress_update(cn / nn, progress); + } } - } - progress_update(1.0, progress); + progress_update(1.0, progress); - return 0; + return 0; - try_error: - return 1; +try_error: + return 1; } -- cgit v1.2.3 From 4534b82b4db9b1593bbe09d686b13655466e4a81 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 13:01:25 +0200 Subject: Mass fix whitespace (clang-format) before working on bug (bzr r13341.1.271) --- src/trace/potrace/trace.cpp | 2059 ++++++++++++++++++++++--------------------- 1 file changed, 1040 insertions(+), 1019 deletions(-) diff --git a/src/trace/potrace/trace.cpp b/src/trace/potrace/trace.cpp index f1e88a908..2bdefb90a 100644 --- a/src/trace/potrace/trace.cpp +++ b/src/trace/potrace/trace.cpp @@ -16,124 +16,129 @@ #include "trace.h" #include "progress.h" -#define INFTY 10000000 /* it suffices that this is longer than any - path; it need not be really infinite */ -#define COS179 -0.999847695156 /* the cosine of 179 degrees */ +#define INFTY 10000000 // it suffices that this is longer than any + // path; it need not be really infinite +#define COS179 -0.999847695156 // the cosine of 179 degrees /* ---------------------------------------------------------------------- */ #define SAFE_MALLOC(var, n, typ) \ - if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error + if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error /* ---------------------------------------------------------------------- */ /* auxiliary functions */ /* return a direction that is 90 degrees counterclockwise from p2-p0, but then restricted to one of the major wind directions (n, nw, w, etc) */ -static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2) { - point_t r; - - r.y = sign(p2.x-p0.x); - r.x = -sign(p2.y-p0.y); +static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2) +{ + point_t r; + + r.y = sign(p2.x - p0.x); + r.x = -sign(p2.y - p0.y); - return r; + return r; } /* return (p1-p0)x(p2-p0), the area of the parallelogram */ -static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2) { - double x1, y1, x2, y2; +static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2) +{ + double x1, y1, x2, y2; - x1 = p1.x-p0.x; - y1 = p1.y-p0.y; - x2 = p2.x-p0.x; - y2 = p2.y-p0.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p2.x - p0.x; + y2 = p2.y - p0.y; - return x1*y2 - x2*y1; + return x1 * y2 - x2 * y1; } /* ddenom/dpara have the property that the square of radius 1 centered at p1 intersects the line p0p2 iff |dpara(p0,p1,p2)| <= ddenom(p0,p2) */ -static inline double ddenom(dpoint_t p0, dpoint_t p2) { - point_t r = dorth_infty(p0, p2); +static inline double ddenom(dpoint_t p0, dpoint_t p2) +{ + point_t r = dorth_infty(p0, p2); - return r.y*(p2.x-p0.x) - r.x*(p2.y-p0.y); + return r.y * (p2.x - p0.x) - r.x * (p2.y - p0.y); } /* return 1 if a <= b < c < a, in a cyclic sense (mod n) */ -static inline int cyclic(int a, int b, int c) { - if (a<=c) { - return (a<=b && b<c); - } else { - return (a<=b || b<c); - } +static inline int cyclic(int a, int b, int c) +{ + if (a <= c) { + return (a <= b && b < c); + } else { + return (a <= b || b < c); + } } /* determine the center and slope of the line i..j. Assume i<j. Needs "sum" components of p to be set. */ -static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *dir) { - /* assume i<j */ - - int n = pp->len; - sums_t *sums = pp->sums; - - double x, y, x2, xy, y2; - double k; - double a, b, c, lambda2, l; - int r=0; /* rotations from i to j */ - - while (j>=n) { - j-=n; - r+=1; - } - while (i>=n) { - i-=n; - r-=1; - } - while (j<0) { - j+=n; - r-=1; - } - while (i<0) { - i+=n; - r+=1; - } - - x = sums[j+1].x-sums[i].x+r*sums[n].x; - y = sums[j+1].y-sums[i].y+r*sums[n].y; - x2 = sums[j+1].x2-sums[i].x2+r*sums[n].x2; - xy = sums[j+1].xy-sums[i].xy+r*sums[n].xy; - y2 = sums[j+1].y2-sums[i].y2+r*sums[n].y2; - k = j+1-i+r*n; - - ctr->x = x/k; - ctr->y = y/k; - - a = (x2-(double)x*x/k)/k; - b = (xy-(double)x*y/k)/k; - c = (y2-(double)y*y/k)/k; - - lambda2 = (a+c+sqrt((a-c)*(a-c)+4*b*b))/2; /* larger e.value */ - - /* now find e.vector for lambda2 */ - a -= lambda2; - c -= lambda2; - - if (fabs(a) >= fabs(c)) { - l = sqrt(a*a+b*b); - if (l!=0) { - dir->x = -b/l; - dir->y = a/l; +static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *dir) +{ + /* assume i<j */ + + int n = pp->len; + sums_t *sums = pp->sums; + + double x, y, x2, xy, y2; + double k; + double a, b, c, lambda2, l; + int r = 0; /* rotations from i to j */ + + while (j >= n) { + j -= n; + r += 1; + } + while (i >= n) { + i -= n; + r -= 1; + } + while (j < 0) { + j += n; + r -= 1; + } + while (i < 0) { + i += n; + r += 1; + } + + x = sums[j + 1].x - sums[i].x + r * sums[n].x; + y = sums[j + 1].y - sums[i].y + r * sums[n].y; + x2 = sums[j + 1].x2 - sums[i].x2 + r * sums[n].x2; + xy = sums[j + 1].xy - sums[i].xy + r * sums[n].xy; + y2 = sums[j + 1].y2 - sums[i].y2 + r * sums[n].y2; + k = j + 1 - i + r * n; + + ctr->x = x / k; + ctr->y = y / k; + + a = (x2 - (double)x * x / k) / k; + b = (xy - (double)x * y / k) / k; + c = (y2 - (double)y * y / k) / k; + + lambda2 = (a + c + sqrt((a - c) * (a - c) + 4 * b * b)) / 2; /* larger e.value */ + + /* now find e.vector for lambda2 */ + a -= lambda2; + c -= lambda2; + + if (fabs(a) >= fabs(c)) { + l = sqrt(a * a + b * b); + if (l != 0) { + dir->x = -b / l; + dir->y = a / l; + } + } else { + l = sqrt(c * c + b * b); + if (l != 0) { + dir->x = -c / l; + dir->y = b / l; + } } - } else { - l = sqrt(c*c+b*b); - if (l!=0) { - dir->x = -c/l; - dir->y = b/l; + if (l == 0) { + dir->x = dir->y = 0; /* sometimes this can happen when k=4: + the two eigenvalues coincide */ } - } - if (l==0) { - dir->x = dir->y = 0; /* sometimes this can happen when k=4: - the two eigenvalues coincide */ - } } /* the type of (affine) quadratic forms, represented as symmetric 3x3 @@ -142,155 +147,158 @@ static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *di typedef double quadform_t[3][3]; /* Apply quadratic form Q to vector w = (w.x,w.y) */ -static inline double quadform(quadform_t Q, dpoint_t w) { - double v[3]; - int i, j; - double sum; - - v[0] = w.x; - v[1] = w.y; - v[2] = 1; - sum = 0.0; - - for (i=0; i<3; i++) { - for (j=0; j<3; j++) { - sum += v[i] * Q[i][j] * v[j]; +static inline double quadform(quadform_t Q, dpoint_t w) +{ + double v[3]; + int i, j; + double sum; + + v[0] = w.x; + v[1] = w.y; + v[2] = 1; + sum = 0.0; + + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) { + sum += v[i] * Q[i][j] * v[j]; + } } - } - return sum; + return sum; } /* calculate p1 x p2 */ -static inline int xprod(point_t p1, point_t p2) { - return p1.x*p2.y - p1.y*p2.x; -} +static inline int xprod(point_t p1, point_t p2) { return p1.x * p2.y - p1.y * p2.x; } /* calculate (p1-p0)x(p3-p2) */ -static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { - double x1, y1, x2, y2; +static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) +{ + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p3.x - p2.x; - y2 = p3.y - p2.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p3.x - p2.x; + y2 = p3.y - p2.y; - return x1*y2 - x2*y1; + return x1 * y2 - x2 * y1; } /* calculate (p1-p0)*(p2-p0) */ -static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2) { - double x1, y1, x2, y2; +static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2) +{ + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p2.x - p0.x; - y2 = p2.y - p0.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p2.x - p0.x; + y2 = p2.y - p0.y; - return x1*x2 + y1*y2; + return x1 * x2 + y1 * y2; } /* calculate (p1-p0)*(p3-p2) */ -static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { - double x1, y1, x2, y2; +static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) +{ + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p3.x - p2.x; - y2 = p3.y - p2.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p3.x - p2.x; + y2 = p3.y - p2.y; - return x1*x2 + y1*y2; + return x1 * x2 + y1 * y2; } /* calculate distance between two points */ -static inline double ddist(dpoint_t p, dpoint_t q) { - return sqrt(sq(p.x-q.x)+sq(p.y-q.y)); -} +static inline double ddist(dpoint_t p, dpoint_t q) { return sqrt(sq(p.x - q.x) + sq(p.y - q.y)); } /* calculate point of a bezier curve */ -static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { - double s = 1-t; - dpoint_t res; +static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) +{ + double s = 1 - t; + dpoint_t res; - /* Note: a good optimizing compiler (such as gcc-3) reduces the - following to 16 multiplications, using common subexpression - elimination. */ + /* Note: a good optimizing compiler (such as gcc-3) reduces the + following to 16 multiplications, using common subexpression + elimination. */ - res.x = s*s*s*p0.x + 3*(s*s*t)*p1.x + 3*(t*t*s)*p2.x + t*t*t*p3.x; - res.y = s*s*s*p0.y + 3*(s*s*t)*p1.y + 3*(t*t*s)*p2.y + t*t*t*p3.y; + res.x = s * s * s * p0.x + 3 * (s * s * t) * p1.x + 3 * (t * t * s) * p2.x + t * t * t * p3.x; + res.y = s * s * s * p0.y + 3 * (s * s * t) * p1.y + 3 * (t * t * s) * p2.y + t * t * t * p3.y; - return res; + return res; } /* calculate the point t in [0..1] on the (convex) bezier curve (p0,p1,p2,p3) which is tangent to q1-q0. Return -1.0 if there is no solution in [0..1]. */ -static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1) { - double A, B, C; /* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */ - double a, b, c; /* a t^2 + b t + c = 0 */ - double d, s, r1, r2; - - A = cprod(p0, p1, q0, q1); - B = cprod(p1, p2, q0, q1); - C = cprod(p2, p3, q0, q1); - - a = A - 2*B + C; - b = -2*A + 2*B; - c = A; - - d = b*b - 4*a*c; - - if (a==0 || d<0) { - return -1.0; - } - - s = sqrt(d); - - r1 = (-b + s) / (2 * a); - r2 = (-b - s) / (2 * a); - - if (r1 >= 0 && r1 <= 1) { - return r1; - } else if (r2 >= 0 && r2 <= 1) { - return r2; - } else { - return -1.0; - } +static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1) +{ + double A, B, C; /* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */ + double a, b, c; /* a t^2 + b t + c = 0 */ + double d, s, r1, r2; + + A = cprod(p0, p1, q0, q1); + B = cprod(p1, p2, q0, q1); + C = cprod(p2, p3, q0, q1); + + a = A - 2 * B + C; + b = -2 * A + 2 * B; + c = A; + + d = b * b - 4 * a * c; + + if (a == 0 || d < 0) { + return -1.0; + } + + s = sqrt(d); + + r1 = (-b + s) / (2 * a); + r2 = (-b - s) / (2 * a); + + if (r1 >= 0 && r1 <= 1) { + return r1; + } else if (r2 >= 0 && r2 <= 1) { + return r2; + } else { + return -1.0; + } } /* ---------------------------------------------------------------------- */ /* Preparation: fill in the sum* fields of a path (used for later rapid summing). Return 0 on success, 1 with errno set on failure. */ -static int calc_sums(privpath_t *pp) { - int i, x, y; - int n = pp->len; - - SAFE_MALLOC(pp->sums, pp->len+1, sums_t); - - /* origin */ - pp->x0 = pp->pt[0].x; - pp->y0 = pp->pt[0].y; - - /* preparatory computation for later fast summing */ - pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0; - for (i=0; i<n; i++) { - x = pp->pt[i].x - pp->x0; - y = pp->pt[i].y - pp->y0; - pp->sums[i+1].x = pp->sums[i].x + x; - pp->sums[i+1].y = pp->sums[i].y + y; - pp->sums[i+1].x2 = pp->sums[i].x2 + x*x; - pp->sums[i+1].xy = pp->sums[i].xy + x*y; - pp->sums[i+1].y2 = pp->sums[i].y2 + y*y; - } - return 0; - - malloc_error: - return 1; +static int calc_sums(privpath_t *pp) +{ + int i, x, y; + int n = pp->len; + + SAFE_MALLOC(pp->sums, pp->len + 1, sums_t); + + /* origin */ + pp->x0 = pp->pt[0].x; + pp->y0 = pp->pt[0].y; + + /* preparatory computation for later fast summing */ + pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0; + for (i = 0; i < n; i++) { + x = pp->pt[i].x - pp->x0; + y = pp->pt[i].y - pp->y0; + pp->sums[i + 1].x = pp->sums[i].x + x; + pp->sums[i + 1].y = pp->sums[i].y + y; + pp->sums[i + 1].x2 = pp->sums[i].x2 + x * x; + pp->sums[i + 1].xy = pp->sums[i].xy + x * y; + pp->sums[i + 1].y2 = pp->sums[i].y2 + y * y; + } + return 0; + +malloc_error: + return 1; } /* ---------------------------------------------------------------------- */ /* Stage 1: determine the straight subpaths (Sec. 2.2.1). Fill in the - "lon" component of a path object (based on pt/len). For each i, + "lon" component of a path object (based on pt/len). For each i, lon[i] is the furthest index such that a straight line can be drawn from i to lon[i]. Return 1 on error with errno set, else 0. */ @@ -318,206 +326,208 @@ static int calc_sums(privpath_t *pp) { substantial. */ /* returns 0 on success, 1 on error with errno set */ -static int calc_lon(privpath_t *pp) { - point_t *pt = pp->pt; - int n = pp->len; - int i, j, k, k1; - int ct[4], dir; - point_t constraint[2]; - point_t cur; - point_t off; - int *pivk = NULL; /* pivk[n] */ - int *nc = NULL; /* nc[n]: next corner */ - point_t dk; /* direction of k-k1 */ - int a, b, c, d; - - SAFE_MALLOC(pivk, n, int); - SAFE_MALLOC(nc, n, int); - - /* initialize the nc data structure. Point from each point to the - furthest future point to which it is connected by a vertical or - horizontal segment. We take advantage of the fact that there is - always a direction change at 0 (due to the path decomposition - algorithm). But even if this were not so, there is no harm, as - in practice, correctness does not depend on the word "furthest" - above. */ - k = 0; - for (i=n-1; i>=0; i--) { - if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) { - k = i+1; /* necessarily i<n-1 in this case */ - } - nc[i] = k; - } - - SAFE_MALLOC(pp->lon, n, int); - - /* determine pivot points: for each i, let pivk[i] be the furthest k - such that all j with i<j<k lie on a line connecting i,k. */ - - for (i=n-1; i>=0; i--) { - ct[0] = ct[1] = ct[2] = ct[3] = 0; - - /* keep track of "directions" that have occurred */ - dir = (3+3*(pt[mod(i+1,n)].x-pt[i].x)+(pt[mod(i+1,n)].y-pt[i].y))/2; - ct[dir]++; - - constraint[0].x = 0; - constraint[0].y = 0; - constraint[1].x = 0; - constraint[1].y = 0; - - /* find the next k such that no straight line from i to k */ - k = nc[i]; - k1 = i; - while (1) { - - dir = (3+3*sign(pt[k].x-pt[k1].x)+sign(pt[k].y-pt[k1].y))/2; - ct[dir]++; - - /* if all four "directions" have occurred, cut this path */ - if (ct[0] && ct[1] && ct[2] && ct[3]) { - pivk[i] = k1; - goto foundk; - } - - cur.x = pt[k].x - pt[i].x; - cur.y = pt[k].y - pt[i].y; - - /* see if current constraint is violated */ - if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) { - goto constraint_viol; - } - - /* else, update constraint */ - if (abs(cur.x) <= 1 && abs(cur.y) <= 1) { - /* no constraint */ - } else { - off.x = cur.x + ((cur.y>=0 && (cur.y>0 || cur.x<0)) ? 1 : -1); - off.y = cur.y + ((cur.x<=0 && (cur.x<0 || cur.y<0)) ? 1 : -1); - if (xprod(constraint[0], off) >= 0) { - constraint[0] = off; - } - off.x = cur.x + ((cur.y<=0 && (cur.y<0 || cur.x<0)) ? 1 : -1); - off.y = cur.y + ((cur.x>=0 && (cur.x>0 || cur.y<0)) ? 1 : -1); - if (xprod(constraint[1], off) <= 0) { - constraint[1] = off; - } - } - k1 = k; - k = nc[k1]; - if (!cyclic(k,i,k1)) { - break; - } - } - constraint_viol: - /* k1 was the last "corner" satisfying the current constraint, and - k is the first one violating it. We now need to find the last - point along k1..k which satisfied the constraint. */ - dk.x = sign(pt[k].x-pt[k1].x); - dk.y = sign(pt[k].y-pt[k1].y); - cur.x = pt[k1].x - pt[i].x; - cur.y = pt[k1].y - pt[i].y; - /* find largest integer j such that xprod(constraint[0], cur+j*dk) - >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity - of xprod. */ - a = xprod(constraint[0], cur); - b = xprod(constraint[0], dk); - c = xprod(constraint[1], cur); - d = xprod(constraint[1], dk); - /* find largest integer j such that a+j*b>=0 and c+j*d<=0. This - can be solved with integer arithmetic. */ - j = INFTY; - if (b<0) { - j = floordiv(a,-b); - } - if (d>0) { - j = min(j, floordiv(-c,d)); +static int calc_lon(privpath_t *pp) +{ + point_t *pt = pp->pt; + int n = pp->len; + int i, j, k, k1; + int ct[4], dir; + point_t constraint[2]; + point_t cur; + point_t off; + int *pivk = NULL; /* pivk[n] */ + int *nc = NULL; /* nc[n]: next corner */ + point_t dk; /* direction of k-k1 */ + int a, b, c, d; + + SAFE_MALLOC(pivk, n, int); + SAFE_MALLOC(nc, n, int); + + /* initialize the nc data structure. Point from each point to the + furthest future point to which it is connected by a vertical or + horizontal segment. We take advantage of the fact that there is + always a direction change at 0 (due to the path decomposition + algorithm). But even if this were not so, there is no harm, as + in practice, correctness does not depend on the word "furthest" + above. */ + k = 0; + for (i = n - 1; i >= 0; i--) { + if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) { + k = i + 1; /* necessarily i<n-1 in this case */ + } + nc[i] = k; } - pivk[i] = mod(k1+j,n); - foundk: - ; - } /* for i */ - - /* clean up: for each i, let lon[i] be the largest k such that for - all i' with i<=i'<k, i'<k<=pivk[i']. */ - - j=pivk[n-1]; - pp->lon[n-1]=j; - for (i=n-2; i>=0; i--) { - if (cyclic(i+1,pivk[i],j)) { - j=pivk[i]; + + SAFE_MALLOC(pp->lon, n, int); + + /* determine pivot points: for each i, let pivk[i] be the furthest k + such that all j with i<j<k lie on a line connecting i,k. */ + + for (i = n - 1; i >= 0; i--) { + ct[0] = ct[1] = ct[2] = ct[3] = 0; + + /* keep track of "directions" that have occurred */ + dir = (3 + 3 * (pt[mod(i + 1, n)].x - pt[i].x) + (pt[mod(i + 1, n)].y - pt[i].y)) / 2; + ct[dir]++; + + constraint[0].x = 0; + constraint[0].y = 0; + constraint[1].x = 0; + constraint[1].y = 0; + + /* find the next k such that no straight line from i to k */ + k = nc[i]; + k1 = i; + while (1) { + + dir = (3 + 3 * sign(pt[k].x - pt[k1].x) + sign(pt[k].y - pt[k1].y)) / 2; + ct[dir]++; + + /* if all four "directions" have occurred, cut this path */ + if (ct[0] && ct[1] && ct[2] && ct[3]) { + pivk[i] = k1; + goto foundk; + } + + cur.x = pt[k].x - pt[i].x; + cur.y = pt[k].y - pt[i].y; + + /* see if current constraint is violated */ + if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) { + goto constraint_viol; + } + + /* else, update constraint */ + if (abs(cur.x) <= 1 && abs(cur.y) <= 1) { + /* no constraint */ + } else { + off.x = cur.x + ((cur.y >= 0 && (cur.y > 0 || cur.x < 0)) ? 1 : -1); + off.y = cur.y + ((cur.x <= 0 && (cur.x < 0 || cur.y < 0)) ? 1 : -1); + if (xprod(constraint[0], off) >= 0) { + constraint[0] = off; + } + off.x = cur.x + ((cur.y <= 0 && (cur.y < 0 || cur.x < 0)) ? 1 : -1); + off.y = cur.y + ((cur.x >= 0 && (cur.x > 0 || cur.y < 0)) ? 1 : -1); + if (xprod(constraint[1], off) <= 0) { + constraint[1] = off; + } + } + k1 = k; + k = nc[k1]; + if (!cyclic(k, i, k1)) { + break; + } + } + constraint_viol: + /* k1 was the last "corner" satisfying the current constraint, and + k is the first one violating it. We now need to find the last + point along k1..k which satisfied the constraint. */ + dk.x = sign(pt[k].x - pt[k1].x); + dk.y = sign(pt[k].y - pt[k1].y); + cur.x = pt[k1].x - pt[i].x; + cur.y = pt[k1].y - pt[i].y; + /* find largest integer j such that xprod(constraint[0], cur+j*dk) + >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity + of xprod. */ + a = xprod(constraint[0], cur); + b = xprod(constraint[0], dk); + c = xprod(constraint[1], cur); + d = xprod(constraint[1], dk); + /* find largest integer j such that a+j*b>=0 and c+j*d<=0. This + can be solved with integer arithmetic. */ + j = INFTY; + if (b < 0) { + j = floordiv(a, -b); + } + if (d > 0) { + j = min(j, floordiv(-c, d)); + } + pivk[i] = mod(k1 + j, n); + foundk: + ; + } /* for i */ + + /* clean up: for each i, let lon[i] be the largest k such that for + all i' with i<=i'<k, i'<k<=pivk[i']. */ + + j = pivk[n - 1]; + pp->lon[n - 1] = j; + for (i = n - 2; i >= 0; i--) { + if (cyclic(i + 1, pivk[i], j)) { + j = pivk[i]; + } + pp->lon[i] = j; } - pp->lon[i]=j; - } - for (i=n-1; cyclic(mod(i+1,n),j,pp->lon[i]); i--) { - pp->lon[i] = j; - } + for (i = n - 1; cyclic(mod(i + 1, n), j, pp->lon[i]); i--) { + pp->lon[i] = j; + } - free(pivk); - free(nc); - return 0; + free(pivk); + free(nc); + return 0; - malloc_error: - free(pivk); - free(nc); - return 1; +malloc_error: + free(pivk); + free(nc); + return 1; } /* ---------------------------------------------------------------------- */ -/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */ +/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */ /* Auxiliary function: calculate the penalty of an edge from i to j in the given path. This needs the "lon" and "sum*" data. */ -static double penalty3(privpath_t *pp, int i, int j) { - int n = pp->len; - point_t *pt = pp->pt; - sums_t *sums = pp->sums; - - /* assume 0<=i<j<=n */ - double x, y, x2, xy, y2; - double k; - double a, b, c, s; - double px, py, ex, ey; - - int r = 0; /* rotations from i to j */ - - if (j>=n) { - j -= n; - r = 1; - } - - /* critical inner loop: the "if" gives a 4.6 percent speedup */ - if (r == 0) { - x = sums[j+1].x - sums[i].x; - y = sums[j+1].y - sums[i].y; - x2 = sums[j+1].x2 - sums[i].x2; - xy = sums[j+1].xy - sums[i].xy; - y2 = sums[j+1].y2 - sums[i].y2; - k = j+1 - i; - } else { - x = sums[j+1].x - sums[i].x + sums[n].x; - y = sums[j+1].y - sums[i].y + sums[n].y; - x2 = sums[j+1].x2 - sums[i].x2 + sums[n].x2; - xy = sums[j+1].xy - sums[i].xy + sums[n].xy; - y2 = sums[j+1].y2 - sums[i].y2 + sums[n].y2; - k = j+1 - i + n; - } - - px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x; - py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y; - ey = (pt[j].x - pt[i].x); - ex = -(pt[j].y - pt[i].y); - - a = ((x2 - 2*x*px) / k + px*px); - b = ((xy - x*py - y*px) / k + px*py); - c = ((y2 - 2*y*py) / k + py*py); - - s = ex*ex*a + 2*ex*ey*b + ey*ey*c; - - return sqrt(s); +static double penalty3(privpath_t *pp, int i, int j) +{ + int n = pp->len; + point_t *pt = pp->pt; + sums_t *sums = pp->sums; + + /* assume 0<=i<j<=n */ + double x, y, x2, xy, y2; + double k; + double a, b, c, s; + double px, py, ex, ey; + + int r = 0; /* rotations from i to j */ + + if (j >= n) { + j -= n; + r = 1; + } + + /* critical inner loop: the "if" gives a 4.6 percent speedup */ + if (r == 0) { + x = sums[j + 1].x - sums[i].x; + y = sums[j + 1].y - sums[i].y; + x2 = sums[j + 1].x2 - sums[i].x2; + xy = sums[j + 1].xy - sums[i].xy; + y2 = sums[j + 1].y2 - sums[i].y2; + k = j + 1 - i; + } else { + x = sums[j + 1].x - sums[i].x + sums[n].x; + y = sums[j + 1].y - sums[i].y + sums[n].y; + x2 = sums[j + 1].x2 - sums[i].x2 + sums[n].x2; + xy = sums[j + 1].xy - sums[i].xy + sums[n].xy; + y2 = sums[j + 1].y2 - sums[i].y2 + sums[n].y2; + k = j + 1 - i + n; + } + + px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x; + py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y; + ey = (pt[j].x - pt[i].x); + ex = -(pt[j].y - pt[i].y); + + a = ((x2 - 2 * x * px) / k + px * px); + b = ((xy - x * py - y * px) / k + px * py); + c = ((y2 - 2 * y * py) / k + py * py); + + s = ex * ex * a + 2 * ex * ey * b + ey * ey * c; + + return sqrt(s); } /* find the optimal polygon. Fill in the m and po components. Return 1 @@ -525,109 +535,109 @@ static double penalty3(privpath_t *pp, int i, int j) { is in the polygon. Fixme: implement cyclic version. */ static int bestpolygon(privpath_t *pp) { - int i, j, m, k; - int n = pp->len; - double *pen = NULL; /* pen[n+1]: penalty vector */ - int *prev = NULL; /* prev[n+1]: best path pointer vector */ - int *clip0 = NULL; /* clip0[n]: longest segment pointer, non-cyclic */ - int *clip1 = NULL; /* clip1[n+1]: backwards segment pointer, non-cyclic */ - int *seg0 = NULL; /* seg0[m+1]: forward segment bounds, m<=n */ - int *seg1 = NULL; /* seg1[m+1]: backward segment bounds, m<=n */ - double thispen; - double best; - int c; - - SAFE_MALLOC(pen, n+1, double); - SAFE_MALLOC(prev, n+1, int); - SAFE_MALLOC(clip0, n, int); - SAFE_MALLOC(clip1, n+1, int); - SAFE_MALLOC(seg0, n+1, int); - SAFE_MALLOC(seg1, n+1, int); - - /* calculate clipped paths */ - for (i=0; i<n; i++) { - c = mod(pp->lon[mod(i-1,n)]-1,n); - if (c == i) { - c = mod(i+1,n); + int i, j, m, k; + int n = pp->len; + double *pen = NULL; /* pen[n+1]: penalty vector */ + int *prev = NULL; /* prev[n+1]: best path pointer vector */ + int *clip0 = NULL; /* clip0[n]: longest segment pointer, non-cyclic */ + int *clip1 = NULL; /* clip1[n+1]: backwards segment pointer, non-cyclic */ + int *seg0 = NULL; /* seg0[m+1]: forward segment bounds, m<=n */ + int *seg1 = NULL; /* seg1[m+1]: backward segment bounds, m<=n */ + double thispen; + double best; + int c; + + SAFE_MALLOC(pen, n + 1, double); + SAFE_MALLOC(prev, n + 1, int); + SAFE_MALLOC(clip0, n, int); + SAFE_MALLOC(clip1, n + 1, int); + SAFE_MALLOC(seg0, n + 1, int); + SAFE_MALLOC(seg1, n + 1, int); + + /* calculate clipped paths */ + for (i = 0; i < n; i++) { + c = mod(pp->lon[mod(i - 1, n)] - 1, n); + if (c == i) { + c = mod(i + 1, n); + } + if (c < i) { + clip0[i] = n; + } else { + clip0[i] = c; + } } - if (c < i) { - clip0[i] = n; - } else { - clip0[i] = c; + + /* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff + clip1[j] <= i, for i,j=0..n. */ + j = 1; + for (i = 0; i < n; i++) { + while (j <= clip0[i]) { + clip1[j] = i; + j++; + } + } + + /* calculate seg0[j] = longest path from 0 with j segments */ + i = 0; + for (j = 0; i < n; j++) { + seg0[j] = i; + i = clip0[i]; + } + seg0[j] = n; + m = j; + + /* calculate seg1[j] = longest path to n with m-j segments */ + i = n; + for (j = m; j > 0; j--) { + seg1[j] = i; + i = clip1[i]; } - } - - /* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff - clip1[j] <= i, for i,j=0..n. */ - j = 1; - for (i=0; i<n; i++) { - while (j <= clip0[i]) { - clip1[j] = i; - j++; + seg1[0] = 0; + + /* now find the shortest path with m segments, based on penalty3 */ + /* note: the outer 2 loops jointly have at most n iterations, thus + the worst-case behavior here is quadratic. In practice, it is + close to linear since the inner loop tends to be short. */ + pen[0] = 0; + for (j = 1; j <= m; j++) { + for (i = seg1[j]; i <= seg0[j]; i++) { + best = -1; + for (k = seg0[j - 1]; k >= clip1[i]; k--) { + thispen = penalty3(pp, k, i) + pen[k]; + if (best < 0 || thispen < best) { + prev[i] = k; + best = thispen; + } + } + pen[i] = best; + } } - } - - /* calculate seg0[j] = longest path from 0 with j segments */ - i = 0; - for (j=0; i<n; j++) { - seg0[j] = i; - i = clip0[i]; - } - seg0[j] = n; - m = j; - - /* calculate seg1[j] = longest path to n with m-j segments */ - i = n; - for (j=m; j>0; j--) { - seg1[j] = i; - i = clip1[i]; - } - seg1[0] = 0; - - /* now find the shortest path with m segments, based on penalty3 */ - /* note: the outer 2 loops jointly have at most n iterations, thus - the worst-case behavior here is quadratic. In practice, it is - close to linear since the inner loop tends to be short. */ - pen[0]=0; - for (j=1; j<=m; j++) { - for (i=seg1[j]; i<=seg0[j]; i++) { - best = -1; - for (k=seg0[j-1]; k>=clip1[i]; k--) { - thispen = penalty3(pp, k, i) + pen[k]; - if (best < 0 || thispen < best) { - prev[i] = k; - best = thispen; - } - } - pen[i] = best; + + pp->m = m; + SAFE_MALLOC(pp->po, m, int); + + /* read off shortest path */ + for (i = n, j = m - 1; i > 0; j--) { + i = prev[i]; + pp->po[j] = i; } - } - - pp->m = m; - SAFE_MALLOC(pp->po, m, int); - - /* read off shortest path */ - for (i=n, j=m-1; i>0; j--) { - i = prev[i]; - pp->po[j] = i; - } - - free(pen); - free(prev); - free(clip0); - free(clip1); - free(seg0); - free(seg1); - return 0; - - malloc_error: - free(pen); - free(prev); - free(clip0); - free(clip1); - free(seg0); - free(seg1); - return 1; + + free(pen); + free(prev); + free(clip0); + free(clip1); + free(seg0); + free(seg1); + return 0; + +malloc_error: + free(pen); + free(prev); + free(clip0); + free(clip1); + free(seg0); + free(seg1); + return 1; } /* ---------------------------------------------------------------------- */ @@ -638,266 +648,269 @@ static int bestpolygon(privpath_t *pp) if it lies outside. Return 1 with errno set on error; 0 on success. */ -static int adjust_vertices(privpath_t *pp) { - int m = pp->m; - int *po = pp->po; - int n = pp->len; - point_t *pt = pp->pt; - int x0 = pp->x0; - int y0 = pp->y0; - - dpoint_t *ctr = NULL; /* ctr[m] */ - dpoint_t *dir = NULL; /* dir[m] */ - quadform_t *q = NULL; /* q[m] */ - double v[3]; - double d; - int i, j, k, l; - dpoint_t s; - int r; - - SAFE_MALLOC(ctr, m, dpoint_t); - SAFE_MALLOC(dir, m, dpoint_t); - SAFE_MALLOC(q, m, quadform_t); - - r = privcurve_init(&pp->curve, m); - if (r) { - goto malloc_error; - } - - /* calculate "optimal" point-slope representation for each line - segment */ - for (i=0; i<m; i++) { - j = po[mod(i+1,m)]; - j = mod(j-po[i],n)+po[i]; - pointslope(pp, po[i], j, &ctr[i], &dir[i]); - } - - /* represent each line segment as a singular quadratic form; the - distance of a point (x,y) from the line segment will be - (x,y,1)Q(x,y,1)^t, where Q=q[i]. */ - for (i=0; i<m; i++) { - d = sq(dir[i].x) + sq(dir[i].y); - if (d == 0.0) { - for (j=0; j<3; j++) { - for (k=0; k<3; k++) { - q[i][j][k] = 0; - } - } - } else { - v[0] = dir[i].y; - v[1] = -dir[i].x; - v[2] = - v[1] * ctr[i].y - v[0] * ctr[i].x; - for (l=0; l<3; l++) { - for (k=0; k<3; k++) { - q[i][l][k] = v[l] * v[k] / d; - } - } - } - } - - /* now calculate the "intersections" of consecutive segments. - Instead of using the actual intersection, we find the point - within a given unit square which minimizes the square distance to - the two lines. */ - for (i=0; i<m; i++) { - quadform_t Q; - dpoint_t w; - double dx, dy; - double det; - double min, cand; /* minimum and candidate for minimum of quad. form */ - double xmin, ymin; /* coordinates of minimum */ - int z; - - /* let s be the vertex, in coordinates relative to x0/y0 */ - s.x = pt[po[i]].x-x0; - s.y = pt[po[i]].y-y0; - - /* intersect segments i-1 and i */ - - j = mod(i-1,m); - - /* add quadratic forms */ - for (l=0; l<3; l++) { - for (k=0; k<3; k++) { - Q[l][k] = q[j][l][k] + q[i][l][k]; - } +static int adjust_vertices(privpath_t *pp) +{ + int m = pp->m; + int *po = pp->po; + int n = pp->len; + point_t *pt = pp->pt; + int x0 = pp->x0; + int y0 = pp->y0; + + dpoint_t *ctr = NULL; /* ctr[m] */ + dpoint_t *dir = NULL; /* dir[m] */ + quadform_t *q = NULL; /* q[m] */ + double v[3]; + double d; + int i, j, k, l; + dpoint_t s; + int r; + + SAFE_MALLOC(ctr, m, dpoint_t); + SAFE_MALLOC(dir, m, dpoint_t); + SAFE_MALLOC(q, m, quadform_t); + + r = privcurve_init(&pp->curve, m); + if (r) { + goto malloc_error; } - - while(1) { - /* minimize the quadratic form Q on the unit square */ - /* find intersection */ -#ifdef HAVE_GCC_LOOP_BUG - /* work around gcc bug #12243 */ - free(NULL); -#endif - - det = Q[0][0]*Q[1][1] - Q[0][1]*Q[1][0]; - if (det != 0.0) { - w.x = (-Q[0][2]*Q[1][1] + Q[1][2]*Q[0][1]) / det; - w.y = ( Q[0][2]*Q[1][0] - Q[1][2]*Q[0][0]) / det; - break; - } - - /* matrix is singular - lines are parallel. Add another, - orthogonal axis, through the center of the unit square */ - if (Q[0][0]>Q[1][1]) { - v[0] = -Q[0][1]; - v[1] = Q[0][0]; - } else if (Q[1][1]) { - v[0] = -Q[1][1]; - v[1] = Q[1][0]; - } else { - v[0] = 1; - v[1] = 0; - } - d = sq(v[0]) + sq(v[1]); - v[2] = - v[1] * s.y - v[0] * s.x; - for (l=0; l<3; l++) { - for (k=0; k<3; k++) { - Q[l][k] += v[l] * v[k] / d; - } - } + /* calculate "optimal" point-slope representation for each line + segment */ + for (i = 0; i < m; i++) { + j = po[mod(i + 1, m)]; + j = mod(j - po[i], n) + po[i]; + pointslope(pp, po[i], j, &ctr[i], &dir[i]); } - dx = fabs(w.x-s.x); - dy = fabs(w.y-s.y); - if (dx <= .5 && dy <= .5) { - pp->curve.vertex[i].x = w.x+x0; - pp->curve.vertex[i].y = w.y+y0; - continue; + + /* represent each line segment as a singular quadratic form; the + distance of a point (x,y) from the line segment will be + (x,y,1)Q(x,y,1)^t, where Q=q[i]. */ + for (i = 0; i < m; i++) { + d = sq(dir[i].x) + sq(dir[i].y); + if (d == 0.0) { + for (j = 0; j < 3; j++) { + for (k = 0; k < 3; k++) { + q[i][j][k] = 0; + } + } + } else { + v[0] = dir[i].y; + v[1] = -dir[i].x; + v[2] = -v[1] * ctr[i].y - v[0] * ctr[i].x; + for (l = 0; l < 3; l++) { + for (k = 0; k < 3; k++) { + q[i][l][k] = v[l] * v[k] / d; + } + } + } } - /* the minimum was not in the unit square; now minimize quadratic - on boundary of square */ - min = quadform(Q, s); - xmin = s.x; - ymin = s.y; + /* now calculate the "intersections" of consecutive segments. + Instead of using the actual intersection, we find the point + within a given unit square which minimizes the square distance to + the two lines. */ + for (i = 0; i < m; i++) { + quadform_t Q; + dpoint_t w; + double dx, dy; + double det; + double min, cand; /* minimum and candidate for minimum of quad. form */ + double xmin, ymin; /* coordinates of minimum */ + int z; + + /* let s be the vertex, in coordinates relative to x0/y0 */ + s.x = pt[po[i]].x - x0; + s.y = pt[po[i]].y - y0; + + /* intersect segments i-1 and i */ + + j = mod(i - 1, m); + + /* add quadratic forms */ + for (l = 0; l < 3; l++) { + for (k = 0; k < 3; k++) { + Q[l][k] = q[j][l][k] + q[i][l][k]; + } + } + + while (1) { +/* minimize the quadratic form Q on the unit square */ +/* find intersection */ - if (Q[0][0] == 0.0) { - goto fixx; - } - for (z=0; z<2; z++) { /* value of the y-coordinate */ - w.y = s.y-0.5+z; - w.x = - (Q[0][1] * w.y + Q[0][2]) / Q[0][0]; - dx = fabs(w.x-s.x); - cand = quadform(Q, w); - if (dx <= .5 && cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - fixx: - if (Q[1][1] == 0.0) { - goto corners; - } - for (z=0; z<2; z++) { /* value of the x-coordinate */ - w.x = s.x-0.5+z; - w.y = - (Q[1][0] * w.x + Q[1][2]) / Q[1][1]; - dy = fabs(w.y-s.y); - cand = quadform(Q, w); - if (dy <= .5 && cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - corners: - /* check four corners */ - for (l=0; l<2; l++) { - for (k=0; k<2; k++) { - w.x = s.x-0.5+l; - w.y = s.y-0.5+k; - cand = quadform(Q, w); - if (cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } +#ifdef HAVE_GCC_LOOP_BUG + /* work around gcc bug #12243 */ + free(NULL); +#endif + + det = Q[0][0] * Q[1][1] - Q[0][1] * Q[1][0]; + if (det != 0.0) { + w.x = (-Q[0][2] * Q[1][1] + Q[1][2] * Q[0][1]) / det; + w.y = (Q[0][2] * Q[1][0] - Q[1][2] * Q[0][0]) / det; + break; + } + + /* matrix is singular - lines are parallel. Add another, + orthogonal axis, through the center of the unit square */ + if (Q[0][0] > Q[1][1]) { + v[0] = -Q[0][1]; + v[1] = Q[0][0]; + } else if (Q[1][1]) { + v[0] = -Q[1][1]; + v[1] = Q[1][0]; + } else { + v[0] = 1; + v[1] = 0; + } + d = sq(v[0]) + sq(v[1]); + v[2] = -v[1] * s.y - v[0] * s.x; + for (l = 0; l < 3; l++) { + for (k = 0; k < 3; k++) { + Q[l][k] += v[l] * v[k] / d; + } + } + } + dx = fabs(w.x - s.x); + dy = fabs(w.y - s.y); + if (dx <= .5 && dy <= .5) { + pp->curve.vertex[i].x = w.x + x0; + pp->curve.vertex[i].y = w.y + y0; + continue; + } + + /* the minimum was not in the unit square; now minimize quadratic + on boundary of square */ + min = quadform(Q, s); + xmin = s.x; + ymin = s.y; + + if (Q[0][0] == 0.0) { + goto fixx; + } + for (z = 0; z < 2; z++) { /* value of the y-coordinate */ + w.y = s.y - 0.5 + z; + w.x = -(Q[0][1] * w.y + Q[0][2]) / Q[0][0]; + dx = fabs(w.x - s.x); + cand = quadform(Q, w); + if (dx <= .5 && cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + fixx: + if (Q[1][1] == 0.0) { + goto corners; + } + for (z = 0; z < 2; z++) { /* value of the x-coordinate */ + w.x = s.x - 0.5 + z; + w.y = -(Q[1][0] * w.x + Q[1][2]) / Q[1][1]; + dy = fabs(w.y - s.y); + cand = quadform(Q, w); + if (dy <= .5 && cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + corners: + /* check four corners */ + for (l = 0; l < 2; l++) { + for (k = 0; k < 2; k++) { + w.x = s.x - 0.5 + l; + w.y = s.y - 0.5 + k; + cand = quadform(Q, w); + if (cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + } + + pp->curve.vertex[i].x = xmin + x0; + pp->curve.vertex[i].y = ymin + y0; + continue; } - pp->curve.vertex[i].x = xmin + x0; - pp->curve.vertex[i].y = ymin + y0; - continue; - } - - free(ctr); - free(dir); - free(q); - return 0; - - malloc_error: - free(ctr); - free(dir); - free(q); - return 1; + free(ctr); + free(dir); + free(q); + return 0; + +malloc_error: + free(ctr); + free(dir); + free(q); + return 1; } /* ---------------------------------------------------------------------- */ /* Stage 4: smoothing and corner analysis (Sec. 2.3.3) */ /* reverse orientation of a path */ -static void reverse(privcurve_t *curve) { - int m = curve->n; - int i, j; - dpoint_t tmp; - - for (i=0, j=m-1; i<j; i++, j--) { - tmp = curve->vertex[i]; - curve->vertex[i] = curve->vertex[j]; - curve->vertex[j] = tmp; - } +static void reverse(privcurve_t *curve) +{ + int m = curve->n; + int i, j; + dpoint_t tmp; + + for (i = 0, j = m - 1; i < j; i++, j--) { + tmp = curve->vertex[i]; + curve->vertex[i] = curve->vertex[j]; + curve->vertex[j] = tmp; + } } /* Always succeeds */ -static void smooth(privcurve_t *curve, double alphamax) { - int m = curve->n; - - int i, j, k; - double dd, denom, alpha; - dpoint_t p2, p3, p4; - - /* examine each vertex and find its best fit */ - for (i=0; i<m; i++) { - j = mod(i+1, m); - k = mod(i+2, m); - p4 = interval(1/2.0, curve->vertex[k], curve->vertex[j]); - - denom = ddenom(curve->vertex[i], curve->vertex[k]); - if (denom != 0.0) { - dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom; - dd = fabs(dd); - alpha = dd>1 ? (1 - 1.0/dd) : 0; - alpha = alpha / 0.75; - } else { - alpha = 4/3.0; - } - curve->alpha0[j] = alpha; /* remember "original" value of alpha */ - - if (alpha > alphamax) { /* pointed corner */ - curve->tag[j] = POTRACE_CORNER; - curve->c[j][1] = curve->vertex[j]; - curve->c[j][2] = p4; - } else { - if (alpha < 0.55) { - alpha = 0.55; - } else if (alpha > 1) { - alpha = 1; - } - p2 = interval(.5+.5*alpha, curve->vertex[i], curve->vertex[j]); - p3 = interval(.5+.5*alpha, curve->vertex[k], curve->vertex[j]); - curve->tag[j] = POTRACE_CURVETO; - curve->c[j][0] = p2; - curve->c[j][1] = p3; - curve->c[j][2] = p4; +static void smooth(privcurve_t *curve, double alphamax) +{ + int m = curve->n; + + int i, j, k; + double dd, denom, alpha; + dpoint_t p2, p3, p4; + + /* examine each vertex and find its best fit */ + for (i = 0; i < m; i++) { + j = mod(i + 1, m); + k = mod(i + 2, m); + p4 = interval(1 / 2.0, curve->vertex[k], curve->vertex[j]); + + denom = ddenom(curve->vertex[i], curve->vertex[k]); + if (denom != 0.0) { + dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom; + dd = fabs(dd); + alpha = dd > 1 ? (1 - 1.0 / dd) : 0; + alpha = alpha / 0.75; + } else { + alpha = 4 / 3.0; + } + curve->alpha0[j] = alpha; /* remember "original" value of alpha */ + + if (alpha > alphamax) { /* pointed corner */ + curve->tag[j] = POTRACE_CORNER; + curve->c[j][1] = curve->vertex[j]; + curve->c[j][2] = p4; + } else { + if (alpha < 0.55) { + alpha = 0.55; + } else if (alpha > 1) { + alpha = 1; + } + p2 = interval(.5 + .5 * alpha, curve->vertex[i], curve->vertex[j]); + p3 = interval(.5 + .5 * alpha, curve->vertex[k], curve->vertex[j]); + curve->tag[j] = POTRACE_CURVETO; + curve->c[j][0] = p2; + curve->c[j][1] = p3; + curve->c[j][2] = p4; + } + curve->alpha[j] = alpha; /* store the "cropped" value of alpha */ + curve->beta[j] = 0.5; } - curve->alpha[j] = alpha; /* store the "cropped" value of alpha */ - curve->beta[j] = 0.5; - } - curve->alphacurve = 1; + curve->alphacurve = 1; - return; + return; } /* ---------------------------------------------------------------------- */ @@ -905,341 +918,349 @@ static void smooth(privcurve_t *curve, double alphamax) { /* a private type for the result of opti_penalty */ struct opti_s { - double pen; /* penalty */ - dpoint_t c[2]; /* curve parameters */ - double t, s; /* curve parameters */ - double alpha; /* curve parameter */ + double pen; /* penalty */ + dpoint_t c[2]; /* curve parameters */ + double t, s; /* curve parameters */ + double alpha; /* curve parameter */ }; typedef struct opti_s opti_t; /* calculate best fit from i+.5 to j+.5. Assume i<j (cyclically). Return 0 and set badness and parameters (alpha, beta), if possible. Return 1 if impossible. */ -static int opti_penalty(privpath_t *pp, int i, int j, opti_t *res, double opttolerance, int *convc, double *areac) { - int m = pp->curve.n; - int k, k1, k2, conv, i1; - double area, alpha, d, d1, d2; - dpoint_t p0, p1, p2, p3, pt; - double A, R, A1, A2, A3, A4; - double s, t; - - /* check convexity, corner-freeness, and maximum bend < 179 degrees */ +static int opti_penalty(privpath_t *pp, int i, int j, opti_t *res, double opttolerance, int *convc, double *areac) +{ + int m = pp->curve.n; + int k, k1, k2, conv, i1; + double area, alpha, d, d1, d2; + dpoint_t p0, p1, p2, p3, pt; + double A, R, A1, A2, A3, A4; + double s, t; - if (i==j) { /* sanity - a full loop can never be an opticurve */ - return 1; - } + /* check convexity, corner-freeness, and maximum bend < 179 degrees */ - k = i; - i1 = mod(i+1, m); - k1 = mod(k+1, m); - conv = convc[k1]; - if (conv == 0) { - return 1; - } - d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]); - for (k=k1; k!=j; k=k1) { - k1 = mod(k+1, m); - k2 = mod(k+2, m); - if (convc[k1] != conv) { - return 1; + if (i == j) { /* sanity - a full loop can never be an opticurve */ + return 1; } - if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != conv) { - return 1; + + k = i; + i1 = mod(i + 1, m); + k1 = mod(k + 1, m); + conv = convc[k1]; + if (conv == 0) { + return 1; } - if (iprod1(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2]) < d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) { - return 1; + d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]); + for (k = k1; k != j; k = k1) { + k1 = mod(k + 1, m); + k2 = mod(k + 2, m); + if (convc[k1] != conv) { + return 1; + } + if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != + conv) { + return 1; + } + if (iprod1(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2]) < + d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) { + return 1; + } } - } - - /* the curve we're working in: */ - p0 = pp->curve.c[mod(i,m)][2]; - p1 = pp->curve.vertex[mod(i+1,m)]; - p2 = pp->curve.vertex[mod(j,m)]; - p3 = pp->curve.c[mod(j,m)][2]; - - /* determine its area */ - area = areac[j] - areac[i]; - area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2])/2; - if (i>=j) { - area += areac[m]; - } - - /* find intersection o of p0p1 and p2p3. Let t,s such that o = - interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the - triangle (p0,o,p3). */ - - A1 = dpara(p0, p1, p2); - A2 = dpara(p0, p1, p3); - A3 = dpara(p0, p2, p3); - /* A4 = dpara(p1, p2, p3); */ - A4 = A1+A3-A2; - - if (A2 == A1) { /* this should never happen */ - return 1; - } - t = A3/(A3-A4); - s = A2/(A2-A1); - A = A2 * t / 2.0; - - if (A == 0.0) { /* this should never happen */ - return 1; - } + /* the curve we're working in: */ + p0 = pp->curve.c[mod(i, m)][2]; + p1 = pp->curve.vertex[mod(i + 1, m)]; + p2 = pp->curve.vertex[mod(j, m)]; + p3 = pp->curve.c[mod(j, m)][2]; + + /* determine its area */ + area = areac[j] - areac[i]; + area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2]) / 2; + if (i >= j) { + area += areac[m]; + } - R = area / A; /* relative area */ - alpha = 2 - sqrt(4 - R / 0.3); /* overall alpha for p0-o-p3 curve */ + /* find intersection o of p0p1 and p2p3. Let t,s such that o = + interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the + triangle (p0,o,p3). */ - res->c[0] = interval(t * alpha, p0, p1); - res->c[1] = interval(s * alpha, p3, p2); - res->alpha = alpha; - res->t = t; - res->s = s; + A1 = dpara(p0, p1, p2); + A2 = dpara(p0, p1, p3); + A3 = dpara(p0, p2, p3); + /* A4 = dpara(p1, p2, p3); */ + A4 = A1 + A3 - A2; - p1 = res->c[0]; - p2 = res->c[1]; /* the proposed curve is now (p0,p1,p2,p3) */ + if (A2 == A1) { /* this should never happen */ + return 1; + } - res->pen = 0; + t = A3 / (A3 - A4); + s = A2 / (A2 - A1); + A = A2 * t / 2.0; - /* calculate penalty */ - /* check tangency with edges */ - for (k=mod(i+1,m); k!=j; k=k1) { - k1 = mod(k+1,m); - t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]); - if (t<-.5) { - return 1; - } - pt = bezier(t, p0, p1, p2, p3); - d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]); - if (d == 0.0) { /* this should never happen */ - return 1; + if (A == 0.0) { /* this should never happen */ + return 1; } - d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d; - if (fabs(d1) > opttolerance) { - return 1; - } - if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) { - return 1; - } - res->pen += sq(d1); - } - - /* check corners */ - for (k=i; k!=j; k=k1) { - k1 = mod(k+1,m); - t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]); - if (t<-.5) { - return 1; - } - pt = bezier(t, p0, p1, p2, p3); - d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]); - if (d == 0.0) { /* this should never happen */ - return 1; - } - d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d; - d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d; - d2 *= 0.75 * pp->curve.alpha[k1]; - if (d2 < 0) { - d1 = -d1; - d2 = -d2; - } - if (d1 < d2 - opttolerance) { - return 1; + + R = area / A; /* relative area */ + alpha = 2 - sqrt(4 - R / 0.3); /* overall alpha for p0-o-p3 curve */ + + res->c[0] = interval(t * alpha, p0, p1); + res->c[1] = interval(s * alpha, p3, p2); + res->alpha = alpha; + res->t = t; + res->s = s; + + p1 = res->c[0]; + p2 = res->c[1]; /* the proposed curve is now (p0,p1,p2,p3) */ + + res->pen = 0; + + /* calculate penalty */ + /* check tangency with edges */ + for (k = mod(i + 1, m); k != j; k = k1) { + k1 = mod(k + 1, m); + t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]); + if (t < -.5) { + return 1; + } + pt = bezier(t, p0, p1, p2, p3); + d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]); + if (d == 0.0) { /* this should never happen */ + return 1; + } + d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d; + if (fabs(d1) > opttolerance) { + return 1; + } + if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || + iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) { + return 1; + } + res->pen += sq(d1); } - if (d1 < d2) { - res->pen += sq(d1 - d2); + + /* check corners */ + for (k = i; k != j; k = k1) { + k1 = mod(k + 1, m); + t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]); + if (t < -.5) { + return 1; + } + pt = bezier(t, p0, p1, p2, p3); + d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]); + if (d == 0.0) { /* this should never happen */ + return 1; + } + d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d; + d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d; + d2 *= 0.75 * pp->curve.alpha[k1]; + if (d2 < 0) { + d1 = -d1; + d2 = -d2; + } + if (d1 < d2 - opttolerance) { + return 1; + } + if (d1 < d2) { + res->pen += sq(d1 - d2); + } } - } - return 0; + return 0; } /* optimize the path p, replacing sequences of Bezier segments by a single segment when possible. Return 0 on success, 1 with errno set on failure. */ -static int opticurve(privpath_t *pp, double opttolerance) { - int m = pp->curve.n; - int *pt = NULL; /* pt[m+1] */ - double *pen = NULL; /* pen[m+1] */ - int *len = NULL; /* len[m+1] */ - opti_t *opt = NULL; /* opt[m+1] */ - int om; - int i,j,r; - opti_t o; - dpoint_t p0; - int i1; - double area; - double alpha; - double *s = NULL; - double *t = NULL; - - int *convc = NULL; /* conv[m]: pre-computed convexities */ - double *areac = NULL; /* cumarea[m+1]: cache for fast area computation */ - - SAFE_MALLOC(pt, m+1, int); - SAFE_MALLOC(pen, m+1, double); - SAFE_MALLOC(len, m+1, int); - SAFE_MALLOC(opt, m+1, opti_t); - SAFE_MALLOC(convc, m, int); - SAFE_MALLOC(areac, m+1, double); - - /* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */ - for (i=0; i<m; i++) { - if (pp->curve.tag[i] == POTRACE_CURVETO) { - convc[i] = sign(dpara(pp->curve.vertex[mod(i-1,m)], pp->curve.vertex[i], pp->curve.vertex[mod(i+1,m)])); - } else { - convc[i] = 0; +static int opticurve(privpath_t *pp, double opttolerance) +{ + int m = pp->curve.n; + int *pt = NULL; /* pt[m+1] */ + double *pen = NULL; /* pen[m+1] */ + int *len = NULL; /* len[m+1] */ + opti_t *opt = NULL; /* opt[m+1] */ + int om; + int i, j, r; + opti_t o; + dpoint_t p0; + int i1; + double area; + double alpha; + double *s = NULL; + double *t = NULL; + + int *convc = NULL; /* conv[m]: pre-computed convexities */ + double *areac = NULL; /* cumarea[m+1]: cache for fast area computation */ + + SAFE_MALLOC(pt, m + 1, int); + SAFE_MALLOC(pen, m + 1, double); + SAFE_MALLOC(len, m + 1, int); + SAFE_MALLOC(opt, m + 1, opti_t); + SAFE_MALLOC(convc, m, int); + SAFE_MALLOC(areac, m + 1, double); + + /* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */ + for (i = 0; i < m; i++) { + if (pp->curve.tag[i] == POTRACE_CURVETO) { + convc[i] = + sign(dpara(pp->curve.vertex[mod(i - 1, m)], pp->curve.vertex[i], pp->curve.vertex[mod(i + 1, m)])); + } else { + convc[i] = 0; + } } - } - - /* pre-calculate areas */ - area = 0.0; - areac[0] = 0.0; - p0 = pp->curve.vertex[0]; - for (i=0; i<m; i++) { - i1 = mod(i+1, m); - if (pp->curve.tag[i1] == POTRACE_CURVETO) { - alpha = pp->curve.alpha[i1]; - area += 0.3*alpha*(4-alpha)*dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2])/2; - area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2])/2; + + /* pre-calculate areas */ + area = 0.0; + areac[0] = 0.0; + p0 = pp->curve.vertex[0]; + for (i = 0; i < m; i++) { + i1 = mod(i + 1, m); + if (pp->curve.tag[i1] == POTRACE_CURVETO) { + alpha = pp->curve.alpha[i1]; + area += 0.3 * alpha * (4 - alpha) * dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2]) / 2; + area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2]) / 2; + } + areac[i + 1] = area; } - areac[i+1] = area; - } - - pt[0] = -1; - pen[0] = 0; - len[0] = 0; - - /* Fixme: we always start from a fixed point -- should find the best - curve cyclically */ - - for (j=1; j<=m; j++) { - /* calculate best path from 0 to j */ - pt[j] = j-1; - pen[j] = pen[j-1]; - len[j] = len[j-1]+1; - - for (i=j-2; i>=0; i--) { - r = opti_penalty(pp, i, mod(j,m), &o, opttolerance, convc, areac); - if (r) { - break; - } - if (len[j] > len[i]+1 || (len[j] == len[i]+1 && pen[j] > pen[i] + o.pen)) { - pt[j] = i; - pen[j] = pen[i] + o.pen; - len[j] = len[i] + 1; - opt[j] = o; - } + + pt[0] = -1; + pen[0] = 0; + len[0] = 0; + + /* Fixme: we always start from a fixed point -- should find the best + curve cyclically */ + + for (j = 1; j <= m; j++) { + /* calculate best path from 0 to j */ + pt[j] = j - 1; + pen[j] = pen[j - 1]; + len[j] = len[j - 1] + 1; + + for (i = j - 2; i >= 0; i--) { + r = opti_penalty(pp, i, mod(j, m), &o, opttolerance, convc, areac); + if (r) { + break; + } + if (len[j] > len[i] + 1 || (len[j] == len[i] + 1 && pen[j] > pen[i] + o.pen)) { + pt[j] = i; + pen[j] = pen[i] + o.pen; + len[j] = len[i] + 1; + opt[j] = o; + } + } } - } - om = len[m]; - r = privcurve_init(&pp->ocurve, om); - if (r) { - goto malloc_error; - } - SAFE_MALLOC(s, om, double); - SAFE_MALLOC(t, om, double); - - j = m; - for (i=om-1; i>=0; i--) { - if (pt[j]==j-1) { - pp->ocurve.tag[i] = pp->curve.tag[mod(j,m)]; - pp->ocurve.c[i][0] = pp->curve.c[mod(j,m)][0]; - pp->ocurve.c[i][1] = pp->curve.c[mod(j,m)][1]; - pp->ocurve.c[i][2] = pp->curve.c[mod(j,m)][2]; - pp->ocurve.vertex[i] = pp->curve.vertex[mod(j,m)]; - pp->ocurve.alpha[i] = pp->curve.alpha[mod(j,m)]; - pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j,m)]; - pp->ocurve.beta[i] = pp->curve.beta[mod(j,m)]; - s[i] = t[i] = 1.0; - } else { - pp->ocurve.tag[i] = POTRACE_CURVETO; - pp->ocurve.c[i][0] = opt[j].c[0]; - pp->ocurve.c[i][1] = opt[j].c[1]; - pp->ocurve.c[i][2] = pp->curve.c[mod(j,m)][2]; - pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j,m)][2], pp->curve.vertex[mod(j,m)]); - pp->ocurve.alpha[i] = opt[j].alpha; - pp->ocurve.alpha0[i] = opt[j].alpha; - s[i] = opt[j].s; - t[i] = opt[j].t; + om = len[m]; + r = privcurve_init(&pp->ocurve, om); + if (r) { + goto malloc_error; } - j = pt[j]; - } - - /* calculate beta parameters */ - for (i=0; i<om; i++) { - i1 = mod(i+1,om); - pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]); - } - pp->ocurve.alphacurve = 1; - - free(pt); - free(pen); - free(len); - free(opt); - free(s); - free(t); - free(convc); - free(areac); - return 0; - - malloc_error: - free(pt); - free(pen); - free(len); - free(opt); - free(s); - free(t); - free(convc); - free(areac); - return 1; + SAFE_MALLOC(s, om, double); + SAFE_MALLOC(t, om, double); + + j = m; + for (i = om - 1; i >= 0; i--) { + if (pt[j] == j - 1) { + pp->ocurve.tag[i] = pp->curve.tag[mod(j, m)]; + pp->ocurve.c[i][0] = pp->curve.c[mod(j, m)][0]; + pp->ocurve.c[i][1] = pp->curve.c[mod(j, m)][1]; + pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2]; + pp->ocurve.vertex[i] = pp->curve.vertex[mod(j, m)]; + pp->ocurve.alpha[i] = pp->curve.alpha[mod(j, m)]; + pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j, m)]; + pp->ocurve.beta[i] = pp->curve.beta[mod(j, m)]; + s[i] = t[i] = 1.0; + } else { + pp->ocurve.tag[i] = POTRACE_CURVETO; + pp->ocurve.c[i][0] = opt[j].c[0]; + pp->ocurve.c[i][1] = opt[j].c[1]; + pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2]; + pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j, m)][2], pp->curve.vertex[mod(j, m)]); + pp->ocurve.alpha[i] = opt[j].alpha; + pp->ocurve.alpha0[i] = opt[j].alpha; + s[i] = opt[j].s; + t[i] = opt[j].t; + } + j = pt[j]; + } + + /* calculate beta parameters */ + for (i = 0; i < om; i++) { + i1 = mod(i + 1, om); + pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]); + } + pp->ocurve.alphacurve = 1; + + free(pt); + free(pen); + free(len); + free(opt); + free(s); + free(t); + free(convc); + free(areac); + return 0; + +malloc_error: + free(pt); + free(pen); + free(len); + free(opt); + free(s); + free(t); + free(convc); + free(areac); + return 1; } /* ---------------------------------------------------------------------- */ -#define TRY(x) if (x) goto try_error +#define TRY(x) \ + if (x) \ + goto try_error /* return 0 on success, 1 on error with errno set. */ -int process_path(path_t *plist, const potrace_param_t *param, progress_t *progress) { - path_t *p; - double nn = 0, cn = 0; - - if (progress->callback) { - /* precompute task size for progress estimates */ - nn = 0; - list_forall (p, plist) { - nn += p->priv->len; - } - cn = 0; - } - - /* call downstream function with each path */ - list_forall (p, plist) { - TRY(calc_sums(p->priv)); - TRY(calc_lon(p->priv)); - TRY(bestpolygon(p->priv)); - TRY(adjust_vertices(p->priv)); - if (p->sign == '-') { /* reverse orientation of negative paths */ - reverse(&p->priv->curve); - } - smooth(&p->priv->curve, param->alphamax); - if (param->opticurve) { - TRY(opticurve(p->priv, param->opttolerance)); - p->priv->fcurve = &p->priv->ocurve; - } else { - p->priv->fcurve = &p->priv->curve; - } - privcurve_to_curve(p->priv->fcurve, &p->curve); +int process_path(path_t *plist, const potrace_param_t *param, progress_t *progress) +{ + path_t *p; + double nn = 0, cn = 0; if (progress->callback) { - cn += p->priv->len; - progress_update(cn/nn, progress); + /* precompute task size for progress estimates */ + nn = 0; + list_forall(p, plist) { nn += p->priv->len; } + cn = 0; + } + + /* call downstream function with each path */ + list_forall(p, plist) + { + TRY(calc_sums(p->priv)); + TRY(calc_lon(p->priv)); + TRY(bestpolygon(p->priv)); + TRY(adjust_vertices(p->priv)); + if (p->sign == '-') { /* reverse orientation of negative paths */ + reverse(&p->priv->curve); + } + smooth(&p->priv->curve, param->alphamax); + if (param->opticurve) { + TRY(opticurve(p->priv, param->opttolerance)); + p->priv->fcurve = &p->priv->ocurve; + } else { + p->priv->fcurve = &p->priv->curve; + } + privcurve_to_curve(p->priv->fcurve, &p->curve); + + if (progress->callback) { + cn += p->priv->len; + progress_update(cn / nn, progress); + } } - } - progress_update(1.0, progress); + progress_update(1.0, progress); - return 0; + return 0; - try_error: - return 1; +try_error: + return 1; } -- cgit v1.2.3 From a2dca92e95dabcdaa66310f489dba5178e3e1914 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 13:16:16 +0200 Subject: undo whitespace edit. it's an external dependency, and let's assume that the potential bug is not a bug (line 611, possibly uninitialized used of prev[i]) (bzr r13594) --- src/trace/potrace/trace.cpp | 2059 +++++++++++++++++++++---------------------- 1 file changed, 1019 insertions(+), 1040 deletions(-) diff --git a/src/trace/potrace/trace.cpp b/src/trace/potrace/trace.cpp index 2bdefb90a..f1e88a908 100644 --- a/src/trace/potrace/trace.cpp +++ b/src/trace/potrace/trace.cpp @@ -16,129 +16,124 @@ #include "trace.h" #include "progress.h" -#define INFTY 10000000 // it suffices that this is longer than any - // path; it need not be really infinite -#define COS179 -0.999847695156 // the cosine of 179 degrees +#define INFTY 10000000 /* it suffices that this is longer than any + path; it need not be really infinite */ +#define COS179 -0.999847695156 /* the cosine of 179 degrees */ /* ---------------------------------------------------------------------- */ #define SAFE_MALLOC(var, n, typ) \ - if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error + if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error /* ---------------------------------------------------------------------- */ /* auxiliary functions */ /* return a direction that is 90 degrees counterclockwise from p2-p0, but then restricted to one of the major wind directions (n, nw, w, etc) */ -static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2) -{ - point_t r; - - r.y = sign(p2.x - p0.x); - r.x = -sign(p2.y - p0.y); +static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2) { + point_t r; + + r.y = sign(p2.x-p0.x); + r.x = -sign(p2.y-p0.y); - return r; + return r; } /* return (p1-p0)x(p2-p0), the area of the parallelogram */ -static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2) -{ - double x1, y1, x2, y2; +static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2) { + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p2.x - p0.x; - y2 = p2.y - p0.y; + x1 = p1.x-p0.x; + y1 = p1.y-p0.y; + x2 = p2.x-p0.x; + y2 = p2.y-p0.y; - return x1 * y2 - x2 * y1; + return x1*y2 - x2*y1; } /* ddenom/dpara have the property that the square of radius 1 centered at p1 intersects the line p0p2 iff |dpara(p0,p1,p2)| <= ddenom(p0,p2) */ -static inline double ddenom(dpoint_t p0, dpoint_t p2) -{ - point_t r = dorth_infty(p0, p2); +static inline double ddenom(dpoint_t p0, dpoint_t p2) { + point_t r = dorth_infty(p0, p2); - return r.y * (p2.x - p0.x) - r.x * (p2.y - p0.y); + return r.y*(p2.x-p0.x) - r.x*(p2.y-p0.y); } /* return 1 if a <= b < c < a, in a cyclic sense (mod n) */ -static inline int cyclic(int a, int b, int c) -{ - if (a <= c) { - return (a <= b && b < c); - } else { - return (a <= b || b < c); - } +static inline int cyclic(int a, int b, int c) { + if (a<=c) { + return (a<=b && b<c); + } else { + return (a<=b || b<c); + } } /* determine the center and slope of the line i..j. Assume i<j. Needs "sum" components of p to be set. */ -static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *dir) -{ - /* assume i<j */ - - int n = pp->len; - sums_t *sums = pp->sums; - - double x, y, x2, xy, y2; - double k; - double a, b, c, lambda2, l; - int r = 0; /* rotations from i to j */ - - while (j >= n) { - j -= n; - r += 1; - } - while (i >= n) { - i -= n; - r -= 1; - } - while (j < 0) { - j += n; - r -= 1; - } - while (i < 0) { - i += n; - r += 1; - } - - x = sums[j + 1].x - sums[i].x + r * sums[n].x; - y = sums[j + 1].y - sums[i].y + r * sums[n].y; - x2 = sums[j + 1].x2 - sums[i].x2 + r * sums[n].x2; - xy = sums[j + 1].xy - sums[i].xy + r * sums[n].xy; - y2 = sums[j + 1].y2 - sums[i].y2 + r * sums[n].y2; - k = j + 1 - i + r * n; - - ctr->x = x / k; - ctr->y = y / k; - - a = (x2 - (double)x * x / k) / k; - b = (xy - (double)x * y / k) / k; - c = (y2 - (double)y * y / k) / k; - - lambda2 = (a + c + sqrt((a - c) * (a - c) + 4 * b * b)) / 2; /* larger e.value */ - - /* now find e.vector for lambda2 */ - a -= lambda2; - c -= lambda2; - - if (fabs(a) >= fabs(c)) { - l = sqrt(a * a + b * b); - if (l != 0) { - dir->x = -b / l; - dir->y = a / l; - } - } else { - l = sqrt(c * c + b * b); - if (l != 0) { - dir->x = -c / l; - dir->y = b / l; - } +static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *dir) { + /* assume i<j */ + + int n = pp->len; + sums_t *sums = pp->sums; + + double x, y, x2, xy, y2; + double k; + double a, b, c, lambda2, l; + int r=0; /* rotations from i to j */ + + while (j>=n) { + j-=n; + r+=1; + } + while (i>=n) { + i-=n; + r-=1; + } + while (j<0) { + j+=n; + r-=1; + } + while (i<0) { + i+=n; + r+=1; + } + + x = sums[j+1].x-sums[i].x+r*sums[n].x; + y = sums[j+1].y-sums[i].y+r*sums[n].y; + x2 = sums[j+1].x2-sums[i].x2+r*sums[n].x2; + xy = sums[j+1].xy-sums[i].xy+r*sums[n].xy; + y2 = sums[j+1].y2-sums[i].y2+r*sums[n].y2; + k = j+1-i+r*n; + + ctr->x = x/k; + ctr->y = y/k; + + a = (x2-(double)x*x/k)/k; + b = (xy-(double)x*y/k)/k; + c = (y2-(double)y*y/k)/k; + + lambda2 = (a+c+sqrt((a-c)*(a-c)+4*b*b))/2; /* larger e.value */ + + /* now find e.vector for lambda2 */ + a -= lambda2; + c -= lambda2; + + if (fabs(a) >= fabs(c)) { + l = sqrt(a*a+b*b); + if (l!=0) { + dir->x = -b/l; + dir->y = a/l; } - if (l == 0) { - dir->x = dir->y = 0; /* sometimes this can happen when k=4: - the two eigenvalues coincide */ + } else { + l = sqrt(c*c+b*b); + if (l!=0) { + dir->x = -c/l; + dir->y = b/l; } + } + if (l==0) { + dir->x = dir->y = 0; /* sometimes this can happen when k=4: + the two eigenvalues coincide */ + } } /* the type of (affine) quadratic forms, represented as symmetric 3x3 @@ -147,158 +142,155 @@ static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *di typedef double quadform_t[3][3]; /* Apply quadratic form Q to vector w = (w.x,w.y) */ -static inline double quadform(quadform_t Q, dpoint_t w) -{ - double v[3]; - int i, j; - double sum; - - v[0] = w.x; - v[1] = w.y; - v[2] = 1; - sum = 0.0; - - for (i = 0; i < 3; i++) { - for (j = 0; j < 3; j++) { - sum += v[i] * Q[i][j] * v[j]; - } +static inline double quadform(quadform_t Q, dpoint_t w) { + double v[3]; + int i, j; + double sum; + + v[0] = w.x; + v[1] = w.y; + v[2] = 1; + sum = 0.0; + + for (i=0; i<3; i++) { + for (j=0; j<3; j++) { + sum += v[i] * Q[i][j] * v[j]; } - return sum; + } + return sum; } /* calculate p1 x p2 */ -static inline int xprod(point_t p1, point_t p2) { return p1.x * p2.y - p1.y * p2.x; } +static inline int xprod(point_t p1, point_t p2) { + return p1.x*p2.y - p1.y*p2.x; +} /* calculate (p1-p0)x(p3-p2) */ -static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) -{ - double x1, y1, x2, y2; +static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p3.x - p2.x; - y2 = p3.y - p2.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p3.x - p2.x; + y2 = p3.y - p2.y; - return x1 * y2 - x2 * y1; + return x1*y2 - x2*y1; } /* calculate (p1-p0)*(p2-p0) */ -static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2) -{ - double x1, y1, x2, y2; +static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2) { + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p2.x - p0.x; - y2 = p2.y - p0.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p2.x - p0.x; + y2 = p2.y - p0.y; - return x1 * x2 + y1 * y2; + return x1*x2 + y1*y2; } /* calculate (p1-p0)*(p3-p2) */ -static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) -{ - double x1, y1, x2, y2; +static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p3.x - p2.x; - y2 = p3.y - p2.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p3.x - p2.x; + y2 = p3.y - p2.y; - return x1 * x2 + y1 * y2; + return x1*x2 + y1*y2; } /* calculate distance between two points */ -static inline double ddist(dpoint_t p, dpoint_t q) { return sqrt(sq(p.x - q.x) + sq(p.y - q.y)); } +static inline double ddist(dpoint_t p, dpoint_t q) { + return sqrt(sq(p.x-q.x)+sq(p.y-q.y)); +} /* calculate point of a bezier curve */ -static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) -{ - double s = 1 - t; - dpoint_t res; +static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { + double s = 1-t; + dpoint_t res; - /* Note: a good optimizing compiler (such as gcc-3) reduces the - following to 16 multiplications, using common subexpression - elimination. */ + /* Note: a good optimizing compiler (such as gcc-3) reduces the + following to 16 multiplications, using common subexpression + elimination. */ - res.x = s * s * s * p0.x + 3 * (s * s * t) * p1.x + 3 * (t * t * s) * p2.x + t * t * t * p3.x; - res.y = s * s * s * p0.y + 3 * (s * s * t) * p1.y + 3 * (t * t * s) * p2.y + t * t * t * p3.y; + res.x = s*s*s*p0.x + 3*(s*s*t)*p1.x + 3*(t*t*s)*p2.x + t*t*t*p3.x; + res.y = s*s*s*p0.y + 3*(s*s*t)*p1.y + 3*(t*t*s)*p2.y + t*t*t*p3.y; - return res; + return res; } /* calculate the point t in [0..1] on the (convex) bezier curve (p0,p1,p2,p3) which is tangent to q1-q0. Return -1.0 if there is no solution in [0..1]. */ -static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1) -{ - double A, B, C; /* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */ - double a, b, c; /* a t^2 + b t + c = 0 */ - double d, s, r1, r2; - - A = cprod(p0, p1, q0, q1); - B = cprod(p1, p2, q0, q1); - C = cprod(p2, p3, q0, q1); - - a = A - 2 * B + C; - b = -2 * A + 2 * B; - c = A; - - d = b * b - 4 * a * c; - - if (a == 0 || d < 0) { - return -1.0; - } - - s = sqrt(d); - - r1 = (-b + s) / (2 * a); - r2 = (-b - s) / (2 * a); - - if (r1 >= 0 && r1 <= 1) { - return r1; - } else if (r2 >= 0 && r2 <= 1) { - return r2; - } else { - return -1.0; - } +static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1) { + double A, B, C; /* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */ + double a, b, c; /* a t^2 + b t + c = 0 */ + double d, s, r1, r2; + + A = cprod(p0, p1, q0, q1); + B = cprod(p1, p2, q0, q1); + C = cprod(p2, p3, q0, q1); + + a = A - 2*B + C; + b = -2*A + 2*B; + c = A; + + d = b*b - 4*a*c; + + if (a==0 || d<0) { + return -1.0; + } + + s = sqrt(d); + + r1 = (-b + s) / (2 * a); + r2 = (-b - s) / (2 * a); + + if (r1 >= 0 && r1 <= 1) { + return r1; + } else if (r2 >= 0 && r2 <= 1) { + return r2; + } else { + return -1.0; + } } /* ---------------------------------------------------------------------- */ /* Preparation: fill in the sum* fields of a path (used for later rapid summing). Return 0 on success, 1 with errno set on failure. */ -static int calc_sums(privpath_t *pp) -{ - int i, x, y; - int n = pp->len; - - SAFE_MALLOC(pp->sums, pp->len + 1, sums_t); - - /* origin */ - pp->x0 = pp->pt[0].x; - pp->y0 = pp->pt[0].y; - - /* preparatory computation for later fast summing */ - pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0; - for (i = 0; i < n; i++) { - x = pp->pt[i].x - pp->x0; - y = pp->pt[i].y - pp->y0; - pp->sums[i + 1].x = pp->sums[i].x + x; - pp->sums[i + 1].y = pp->sums[i].y + y; - pp->sums[i + 1].x2 = pp->sums[i].x2 + x * x; - pp->sums[i + 1].xy = pp->sums[i].xy + x * y; - pp->sums[i + 1].y2 = pp->sums[i].y2 + y * y; - } - return 0; - -malloc_error: - return 1; +static int calc_sums(privpath_t *pp) { + int i, x, y; + int n = pp->len; + + SAFE_MALLOC(pp->sums, pp->len+1, sums_t); + + /* origin */ + pp->x0 = pp->pt[0].x; + pp->y0 = pp->pt[0].y; + + /* preparatory computation for later fast summing */ + pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0; + for (i=0; i<n; i++) { + x = pp->pt[i].x - pp->x0; + y = pp->pt[i].y - pp->y0; + pp->sums[i+1].x = pp->sums[i].x + x; + pp->sums[i+1].y = pp->sums[i].y + y; + pp->sums[i+1].x2 = pp->sums[i].x2 + x*x; + pp->sums[i+1].xy = pp->sums[i].xy + x*y; + pp->sums[i+1].y2 = pp->sums[i].y2 + y*y; + } + return 0; + + malloc_error: + return 1; } /* ---------------------------------------------------------------------- */ /* Stage 1: determine the straight subpaths (Sec. 2.2.1). Fill in the - "lon" component of a path object (based on pt/len). For each i, + "lon" component of a path object (based on pt/len). For each i, lon[i] is the furthest index such that a straight line can be drawn from i to lon[i]. Return 1 on error with errno set, else 0. */ @@ -326,208 +318,206 @@ malloc_error: substantial. */ /* returns 0 on success, 1 on error with errno set */ -static int calc_lon(privpath_t *pp) -{ - point_t *pt = pp->pt; - int n = pp->len; - int i, j, k, k1; - int ct[4], dir; - point_t constraint[2]; - point_t cur; - point_t off; - int *pivk = NULL; /* pivk[n] */ - int *nc = NULL; /* nc[n]: next corner */ - point_t dk; /* direction of k-k1 */ - int a, b, c, d; - - SAFE_MALLOC(pivk, n, int); - SAFE_MALLOC(nc, n, int); - - /* initialize the nc data structure. Point from each point to the - furthest future point to which it is connected by a vertical or - horizontal segment. We take advantage of the fact that there is - always a direction change at 0 (due to the path decomposition - algorithm). But even if this were not so, there is no harm, as - in practice, correctness does not depend on the word "furthest" - above. */ - k = 0; - for (i = n - 1; i >= 0; i--) { - if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) { - k = i + 1; /* necessarily i<n-1 in this case */ - } - nc[i] = k; +static int calc_lon(privpath_t *pp) { + point_t *pt = pp->pt; + int n = pp->len; + int i, j, k, k1; + int ct[4], dir; + point_t constraint[2]; + point_t cur; + point_t off; + int *pivk = NULL; /* pivk[n] */ + int *nc = NULL; /* nc[n]: next corner */ + point_t dk; /* direction of k-k1 */ + int a, b, c, d; + + SAFE_MALLOC(pivk, n, int); + SAFE_MALLOC(nc, n, int); + + /* initialize the nc data structure. Point from each point to the + furthest future point to which it is connected by a vertical or + horizontal segment. We take advantage of the fact that there is + always a direction change at 0 (due to the path decomposition + algorithm). But even if this were not so, there is no harm, as + in practice, correctness does not depend on the word "furthest" + above. */ + k = 0; + for (i=n-1; i>=0; i--) { + if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) { + k = i+1; /* necessarily i<n-1 in this case */ } - - SAFE_MALLOC(pp->lon, n, int); - - /* determine pivot points: for each i, let pivk[i] be the furthest k - such that all j with i<j<k lie on a line connecting i,k. */ - - for (i = n - 1; i >= 0; i--) { - ct[0] = ct[1] = ct[2] = ct[3] = 0; - - /* keep track of "directions" that have occurred */ - dir = (3 + 3 * (pt[mod(i + 1, n)].x - pt[i].x) + (pt[mod(i + 1, n)].y - pt[i].y)) / 2; - ct[dir]++; - - constraint[0].x = 0; - constraint[0].y = 0; - constraint[1].x = 0; - constraint[1].y = 0; - - /* find the next k such that no straight line from i to k */ - k = nc[i]; - k1 = i; - while (1) { - - dir = (3 + 3 * sign(pt[k].x - pt[k1].x) + sign(pt[k].y - pt[k1].y)) / 2; - ct[dir]++; - - /* if all four "directions" have occurred, cut this path */ - if (ct[0] && ct[1] && ct[2] && ct[3]) { - pivk[i] = k1; - goto foundk; - } - - cur.x = pt[k].x - pt[i].x; - cur.y = pt[k].y - pt[i].y; - - /* see if current constraint is violated */ - if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) { - goto constraint_viol; - } - - /* else, update constraint */ - if (abs(cur.x) <= 1 && abs(cur.y) <= 1) { - /* no constraint */ - } else { - off.x = cur.x + ((cur.y >= 0 && (cur.y > 0 || cur.x < 0)) ? 1 : -1); - off.y = cur.y + ((cur.x <= 0 && (cur.x < 0 || cur.y < 0)) ? 1 : -1); - if (xprod(constraint[0], off) >= 0) { - constraint[0] = off; - } - off.x = cur.x + ((cur.y <= 0 && (cur.y < 0 || cur.x < 0)) ? 1 : -1); - off.y = cur.y + ((cur.x >= 0 && (cur.x > 0 || cur.y < 0)) ? 1 : -1); - if (xprod(constraint[1], off) <= 0) { - constraint[1] = off; - } - } - k1 = k; - k = nc[k1]; - if (!cyclic(k, i, k1)) { - break; - } - } - constraint_viol: - /* k1 was the last "corner" satisfying the current constraint, and - k is the first one violating it. We now need to find the last - point along k1..k which satisfied the constraint. */ - dk.x = sign(pt[k].x - pt[k1].x); - dk.y = sign(pt[k].y - pt[k1].y); - cur.x = pt[k1].x - pt[i].x; - cur.y = pt[k1].y - pt[i].y; - /* find largest integer j such that xprod(constraint[0], cur+j*dk) - >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity - of xprod. */ - a = xprod(constraint[0], cur); - b = xprod(constraint[0], dk); - c = xprod(constraint[1], cur); - d = xprod(constraint[1], dk); - /* find largest integer j such that a+j*b>=0 and c+j*d<=0. This - can be solved with integer arithmetic. */ - j = INFTY; - if (b < 0) { - j = floordiv(a, -b); - } - if (d > 0) { - j = min(j, floordiv(-c, d)); - } - pivk[i] = mod(k1 + j, n); - foundk: - ; - } /* for i */ - - /* clean up: for each i, let lon[i] be the largest k such that for - all i' with i<=i'<k, i'<k<=pivk[i']. */ - - j = pivk[n - 1]; - pp->lon[n - 1] = j; - for (i = n - 2; i >= 0; i--) { - if (cyclic(i + 1, pivk[i], j)) { - j = pivk[i]; - } - pp->lon[i] = j; + nc[i] = k; + } + + SAFE_MALLOC(pp->lon, n, int); + + /* determine pivot points: for each i, let pivk[i] be the furthest k + such that all j with i<j<k lie on a line connecting i,k. */ + + for (i=n-1; i>=0; i--) { + ct[0] = ct[1] = ct[2] = ct[3] = 0; + + /* keep track of "directions" that have occurred */ + dir = (3+3*(pt[mod(i+1,n)].x-pt[i].x)+(pt[mod(i+1,n)].y-pt[i].y))/2; + ct[dir]++; + + constraint[0].x = 0; + constraint[0].y = 0; + constraint[1].x = 0; + constraint[1].y = 0; + + /* find the next k such that no straight line from i to k */ + k = nc[i]; + k1 = i; + while (1) { + + dir = (3+3*sign(pt[k].x-pt[k1].x)+sign(pt[k].y-pt[k1].y))/2; + ct[dir]++; + + /* if all four "directions" have occurred, cut this path */ + if (ct[0] && ct[1] && ct[2] && ct[3]) { + pivk[i] = k1; + goto foundk; + } + + cur.x = pt[k].x - pt[i].x; + cur.y = pt[k].y - pt[i].y; + + /* see if current constraint is violated */ + if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) { + goto constraint_viol; + } + + /* else, update constraint */ + if (abs(cur.x) <= 1 && abs(cur.y) <= 1) { + /* no constraint */ + } else { + off.x = cur.x + ((cur.y>=0 && (cur.y>0 || cur.x<0)) ? 1 : -1); + off.y = cur.y + ((cur.x<=0 && (cur.x<0 || cur.y<0)) ? 1 : -1); + if (xprod(constraint[0], off) >= 0) { + constraint[0] = off; + } + off.x = cur.x + ((cur.y<=0 && (cur.y<0 || cur.x<0)) ? 1 : -1); + off.y = cur.y + ((cur.x>=0 && (cur.x>0 || cur.y<0)) ? 1 : -1); + if (xprod(constraint[1], off) <= 0) { + constraint[1] = off; + } + } + k1 = k; + k = nc[k1]; + if (!cyclic(k,i,k1)) { + break; + } } - - for (i = n - 1; cyclic(mod(i + 1, n), j, pp->lon[i]); i--) { - pp->lon[i] = j; + constraint_viol: + /* k1 was the last "corner" satisfying the current constraint, and + k is the first one violating it. We now need to find the last + point along k1..k which satisfied the constraint. */ + dk.x = sign(pt[k].x-pt[k1].x); + dk.y = sign(pt[k].y-pt[k1].y); + cur.x = pt[k1].x - pt[i].x; + cur.y = pt[k1].y - pt[i].y; + /* find largest integer j such that xprod(constraint[0], cur+j*dk) + >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity + of xprod. */ + a = xprod(constraint[0], cur); + b = xprod(constraint[0], dk); + c = xprod(constraint[1], cur); + d = xprod(constraint[1], dk); + /* find largest integer j such that a+j*b>=0 and c+j*d<=0. This + can be solved with integer arithmetic. */ + j = INFTY; + if (b<0) { + j = floordiv(a,-b); + } + if (d>0) { + j = min(j, floordiv(-c,d)); } + pivk[i] = mod(k1+j,n); + foundk: + ; + } /* for i */ + + /* clean up: for each i, let lon[i] be the largest k such that for + all i' with i<=i'<k, i'<k<=pivk[i']. */ + + j=pivk[n-1]; + pp->lon[n-1]=j; + for (i=n-2; i>=0; i--) { + if (cyclic(i+1,pivk[i],j)) { + j=pivk[i]; + } + pp->lon[i]=j; + } - free(pivk); - free(nc); - return 0; + for (i=n-1; cyclic(mod(i+1,n),j,pp->lon[i]); i--) { + pp->lon[i] = j; + } -malloc_error: - free(pivk); - free(nc); - return 1; + free(pivk); + free(nc); + return 0; + + malloc_error: + free(pivk); + free(nc); + return 1; } /* ---------------------------------------------------------------------- */ -/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */ +/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */ /* Auxiliary function: calculate the penalty of an edge from i to j in the given path. This needs the "lon" and "sum*" data. */ -static double penalty3(privpath_t *pp, int i, int j) -{ - int n = pp->len; - point_t *pt = pp->pt; - sums_t *sums = pp->sums; - - /* assume 0<=i<j<=n */ - double x, y, x2, xy, y2; - double k; - double a, b, c, s; - double px, py, ex, ey; - - int r = 0; /* rotations from i to j */ - - if (j >= n) { - j -= n; - r = 1; - } - - /* critical inner loop: the "if" gives a 4.6 percent speedup */ - if (r == 0) { - x = sums[j + 1].x - sums[i].x; - y = sums[j + 1].y - sums[i].y; - x2 = sums[j + 1].x2 - sums[i].x2; - xy = sums[j + 1].xy - sums[i].xy; - y2 = sums[j + 1].y2 - sums[i].y2; - k = j + 1 - i; - } else { - x = sums[j + 1].x - sums[i].x + sums[n].x; - y = sums[j + 1].y - sums[i].y + sums[n].y; - x2 = sums[j + 1].x2 - sums[i].x2 + sums[n].x2; - xy = sums[j + 1].xy - sums[i].xy + sums[n].xy; - y2 = sums[j + 1].y2 - sums[i].y2 + sums[n].y2; - k = j + 1 - i + n; - } - - px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x; - py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y; - ey = (pt[j].x - pt[i].x); - ex = -(pt[j].y - pt[i].y); - - a = ((x2 - 2 * x * px) / k + px * px); - b = ((xy - x * py - y * px) / k + px * py); - c = ((y2 - 2 * y * py) / k + py * py); - - s = ex * ex * a + 2 * ex * ey * b + ey * ey * c; - - return sqrt(s); +static double penalty3(privpath_t *pp, int i, int j) { + int n = pp->len; + point_t *pt = pp->pt; + sums_t *sums = pp->sums; + + /* assume 0<=i<j<=n */ + double x, y, x2, xy, y2; + double k; + double a, b, c, s; + double px, py, ex, ey; + + int r = 0; /* rotations from i to j */ + + if (j>=n) { + j -= n; + r = 1; + } + + /* critical inner loop: the "if" gives a 4.6 percent speedup */ + if (r == 0) { + x = sums[j+1].x - sums[i].x; + y = sums[j+1].y - sums[i].y; + x2 = sums[j+1].x2 - sums[i].x2; + xy = sums[j+1].xy - sums[i].xy; + y2 = sums[j+1].y2 - sums[i].y2; + k = j+1 - i; + } else { + x = sums[j+1].x - sums[i].x + sums[n].x; + y = sums[j+1].y - sums[i].y + sums[n].y; + x2 = sums[j+1].x2 - sums[i].x2 + sums[n].x2; + xy = sums[j+1].xy - sums[i].xy + sums[n].xy; + y2 = sums[j+1].y2 - sums[i].y2 + sums[n].y2; + k = j+1 - i + n; + } + + px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x; + py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y; + ey = (pt[j].x - pt[i].x); + ex = -(pt[j].y - pt[i].y); + + a = ((x2 - 2*x*px) / k + px*px); + b = ((xy - x*py - y*px) / k + px*py); + c = ((y2 - 2*y*py) / k + py*py); + + s = ex*ex*a + 2*ex*ey*b + ey*ey*c; + + return sqrt(s); } /* find the optimal polygon. Fill in the m and po components. Return 1 @@ -535,109 +525,109 @@ static double penalty3(privpath_t *pp, int i, int j) is in the polygon. Fixme: implement cyclic version. */ static int bestpolygon(privpath_t *pp) { - int i, j, m, k; - int n = pp->len; - double *pen = NULL; /* pen[n+1]: penalty vector */ - int *prev = NULL; /* prev[n+1]: best path pointer vector */ - int *clip0 = NULL; /* clip0[n]: longest segment pointer, non-cyclic */ - int *clip1 = NULL; /* clip1[n+1]: backwards segment pointer, non-cyclic */ - int *seg0 = NULL; /* seg0[m+1]: forward segment bounds, m<=n */ - int *seg1 = NULL; /* seg1[m+1]: backward segment bounds, m<=n */ - double thispen; - double best; - int c; - - SAFE_MALLOC(pen, n + 1, double); - SAFE_MALLOC(prev, n + 1, int); - SAFE_MALLOC(clip0, n, int); - SAFE_MALLOC(clip1, n + 1, int); - SAFE_MALLOC(seg0, n + 1, int); - SAFE_MALLOC(seg1, n + 1, int); - - /* calculate clipped paths */ - for (i = 0; i < n; i++) { - c = mod(pp->lon[mod(i - 1, n)] - 1, n); - if (c == i) { - c = mod(i + 1, n); - } - if (c < i) { - clip0[i] = n; - } else { - clip0[i] = c; - } - } - - /* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff - clip1[j] <= i, for i,j=0..n. */ - j = 1; - for (i = 0; i < n; i++) { - while (j <= clip0[i]) { - clip1[j] = i; - j++; - } - } - - /* calculate seg0[j] = longest path from 0 with j segments */ - i = 0; - for (j = 0; i < n; j++) { - seg0[j] = i; - i = clip0[i]; + int i, j, m, k; + int n = pp->len; + double *pen = NULL; /* pen[n+1]: penalty vector */ + int *prev = NULL; /* prev[n+1]: best path pointer vector */ + int *clip0 = NULL; /* clip0[n]: longest segment pointer, non-cyclic */ + int *clip1 = NULL; /* clip1[n+1]: backwards segment pointer, non-cyclic */ + int *seg0 = NULL; /* seg0[m+1]: forward segment bounds, m<=n */ + int *seg1 = NULL; /* seg1[m+1]: backward segment bounds, m<=n */ + double thispen; + double best; + int c; + + SAFE_MALLOC(pen, n+1, double); + SAFE_MALLOC(prev, n+1, int); + SAFE_MALLOC(clip0, n, int); + SAFE_MALLOC(clip1, n+1, int); + SAFE_MALLOC(seg0, n+1, int); + SAFE_MALLOC(seg1, n+1, int); + + /* calculate clipped paths */ + for (i=0; i<n; i++) { + c = mod(pp->lon[mod(i-1,n)]-1,n); + if (c == i) { + c = mod(i+1,n); } - seg0[j] = n; - m = j; - - /* calculate seg1[j] = longest path to n with m-j segments */ - i = n; - for (j = m; j > 0; j--) { - seg1[j] = i; - i = clip1[i]; + if (c < i) { + clip0[i] = n; + } else { + clip0[i] = c; } - seg1[0] = 0; - - /* now find the shortest path with m segments, based on penalty3 */ - /* note: the outer 2 loops jointly have at most n iterations, thus - the worst-case behavior here is quadratic. In practice, it is - close to linear since the inner loop tends to be short. */ - pen[0] = 0; - for (j = 1; j <= m; j++) { - for (i = seg1[j]; i <= seg0[j]; i++) { - best = -1; - for (k = seg0[j - 1]; k >= clip1[i]; k--) { - thispen = penalty3(pp, k, i) + pen[k]; - if (best < 0 || thispen < best) { - prev[i] = k; - best = thispen; - } - } - pen[i] = best; - } + } + + /* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff + clip1[j] <= i, for i,j=0..n. */ + j = 1; + for (i=0; i<n; i++) { + while (j <= clip0[i]) { + clip1[j] = i; + j++; } - - pp->m = m; - SAFE_MALLOC(pp->po, m, int); - - /* read off shortest path */ - for (i = n, j = m - 1; i > 0; j--) { - i = prev[i]; - pp->po[j] = i; + } + + /* calculate seg0[j] = longest path from 0 with j segments */ + i = 0; + for (j=0; i<n; j++) { + seg0[j] = i; + i = clip0[i]; + } + seg0[j] = n; + m = j; + + /* calculate seg1[j] = longest path to n with m-j segments */ + i = n; + for (j=m; j>0; j--) { + seg1[j] = i; + i = clip1[i]; + } + seg1[0] = 0; + + /* now find the shortest path with m segments, based on penalty3 */ + /* note: the outer 2 loops jointly have at most n iterations, thus + the worst-case behavior here is quadratic. In practice, it is + close to linear since the inner loop tends to be short. */ + pen[0]=0; + for (j=1; j<=m; j++) { + for (i=seg1[j]; i<=seg0[j]; i++) { + best = -1; + for (k=seg0[j-1]; k>=clip1[i]; k--) { + thispen = penalty3(pp, k, i) + pen[k]; + if (best < 0 || thispen < best) { + prev[i] = k; + best = thispen; + } + } + pen[i] = best; } - - free(pen); - free(prev); - free(clip0); - free(clip1); - free(seg0); - free(seg1); - return 0; - -malloc_error: - free(pen); - free(prev); - free(clip0); - free(clip1); - free(seg0); - free(seg1); - return 1; + } + + pp->m = m; + SAFE_MALLOC(pp->po, m, int); + + /* read off shortest path */ + for (i=n, j=m-1; i>0; j--) { + i = prev[i]; + pp->po[j] = i; + } + + free(pen); + free(prev); + free(clip0); + free(clip1); + free(seg0); + free(seg1); + return 0; + + malloc_error: + free(pen); + free(prev); + free(clip0); + free(clip1); + free(seg0); + free(seg1); + return 1; } /* ---------------------------------------------------------------------- */ @@ -648,269 +638,266 @@ malloc_error: if it lies outside. Return 1 with errno set on error; 0 on success. */ -static int adjust_vertices(privpath_t *pp) -{ - int m = pp->m; - int *po = pp->po; - int n = pp->len; - point_t *pt = pp->pt; - int x0 = pp->x0; - int y0 = pp->y0; - - dpoint_t *ctr = NULL; /* ctr[m] */ - dpoint_t *dir = NULL; /* dir[m] */ - quadform_t *q = NULL; /* q[m] */ - double v[3]; - double d; - int i, j, k, l; - dpoint_t s; - int r; - - SAFE_MALLOC(ctr, m, dpoint_t); - SAFE_MALLOC(dir, m, dpoint_t); - SAFE_MALLOC(q, m, quadform_t); - - r = privcurve_init(&pp->curve, m); - if (r) { - goto malloc_error; - } - - /* calculate "optimal" point-slope representation for each line - segment */ - for (i = 0; i < m; i++) { - j = po[mod(i + 1, m)]; - j = mod(j - po[i], n) + po[i]; - pointslope(pp, po[i], j, &ctr[i], &dir[i]); +static int adjust_vertices(privpath_t *pp) { + int m = pp->m; + int *po = pp->po; + int n = pp->len; + point_t *pt = pp->pt; + int x0 = pp->x0; + int y0 = pp->y0; + + dpoint_t *ctr = NULL; /* ctr[m] */ + dpoint_t *dir = NULL; /* dir[m] */ + quadform_t *q = NULL; /* q[m] */ + double v[3]; + double d; + int i, j, k, l; + dpoint_t s; + int r; + + SAFE_MALLOC(ctr, m, dpoint_t); + SAFE_MALLOC(dir, m, dpoint_t); + SAFE_MALLOC(q, m, quadform_t); + + r = privcurve_init(&pp->curve, m); + if (r) { + goto malloc_error; + } + + /* calculate "optimal" point-slope representation for each line + segment */ + for (i=0; i<m; i++) { + j = po[mod(i+1,m)]; + j = mod(j-po[i],n)+po[i]; + pointslope(pp, po[i], j, &ctr[i], &dir[i]); + } + + /* represent each line segment as a singular quadratic form; the + distance of a point (x,y) from the line segment will be + (x,y,1)Q(x,y,1)^t, where Q=q[i]. */ + for (i=0; i<m; i++) { + d = sq(dir[i].x) + sq(dir[i].y); + if (d == 0.0) { + for (j=0; j<3; j++) { + for (k=0; k<3; k++) { + q[i][j][k] = 0; + } + } + } else { + v[0] = dir[i].y; + v[1] = -dir[i].x; + v[2] = - v[1] * ctr[i].y - v[0] * ctr[i].x; + for (l=0; l<3; l++) { + for (k=0; k<3; k++) { + q[i][l][k] = v[l] * v[k] / d; + } + } } - - /* represent each line segment as a singular quadratic form; the - distance of a point (x,y) from the line segment will be - (x,y,1)Q(x,y,1)^t, where Q=q[i]. */ - for (i = 0; i < m; i++) { - d = sq(dir[i].x) + sq(dir[i].y); - if (d == 0.0) { - for (j = 0; j < 3; j++) { - for (k = 0; k < 3; k++) { - q[i][j][k] = 0; - } - } - } else { - v[0] = dir[i].y; - v[1] = -dir[i].x; - v[2] = -v[1] * ctr[i].y - v[0] * ctr[i].x; - for (l = 0; l < 3; l++) { - for (k = 0; k < 3; k++) { - q[i][l][k] = v[l] * v[k] / d; - } - } - } + } + + /* now calculate the "intersections" of consecutive segments. + Instead of using the actual intersection, we find the point + within a given unit square which minimizes the square distance to + the two lines. */ + for (i=0; i<m; i++) { + quadform_t Q; + dpoint_t w; + double dx, dy; + double det; + double min, cand; /* minimum and candidate for minimum of quad. form */ + double xmin, ymin; /* coordinates of minimum */ + int z; + + /* let s be the vertex, in coordinates relative to x0/y0 */ + s.x = pt[po[i]].x-x0; + s.y = pt[po[i]].y-y0; + + /* intersect segments i-1 and i */ + + j = mod(i-1,m); + + /* add quadratic forms */ + for (l=0; l<3; l++) { + for (k=0; k<3; k++) { + Q[l][k] = q[j][l][k] + q[i][l][k]; + } } - - /* now calculate the "intersections" of consecutive segments. - Instead of using the actual intersection, we find the point - within a given unit square which minimizes the square distance to - the two lines. */ - for (i = 0; i < m; i++) { - quadform_t Q; - dpoint_t w; - double dx, dy; - double det; - double min, cand; /* minimum and candidate for minimum of quad. form */ - double xmin, ymin; /* coordinates of minimum */ - int z; - - /* let s be the vertex, in coordinates relative to x0/y0 */ - s.x = pt[po[i]].x - x0; - s.y = pt[po[i]].y - y0; - - /* intersect segments i-1 and i */ - - j = mod(i - 1, m); - - /* add quadratic forms */ - for (l = 0; l < 3; l++) { - for (k = 0; k < 3; k++) { - Q[l][k] = q[j][l][k] + q[i][l][k]; - } - } - - while (1) { -/* minimize the quadratic form Q on the unit square */ -/* find intersection */ + + while(1) { + /* minimize the quadratic form Q on the unit square */ + /* find intersection */ #ifdef HAVE_GCC_LOOP_BUG - /* work around gcc bug #12243 */ - free(NULL); + /* work around gcc bug #12243 */ + free(NULL); #endif - - det = Q[0][0] * Q[1][1] - Q[0][1] * Q[1][0]; - if (det != 0.0) { - w.x = (-Q[0][2] * Q[1][1] + Q[1][2] * Q[0][1]) / det; - w.y = (Q[0][2] * Q[1][0] - Q[1][2] * Q[0][0]) / det; - break; - } - - /* matrix is singular - lines are parallel. Add another, - orthogonal axis, through the center of the unit square */ - if (Q[0][0] > Q[1][1]) { - v[0] = -Q[0][1]; - v[1] = Q[0][0]; - } else if (Q[1][1]) { - v[0] = -Q[1][1]; - v[1] = Q[1][0]; - } else { - v[0] = 1; - v[1] = 0; - } - d = sq(v[0]) + sq(v[1]); - v[2] = -v[1] * s.y - v[0] * s.x; - for (l = 0; l < 3; l++) { - for (k = 0; k < 3; k++) { - Q[l][k] += v[l] * v[k] / d; - } - } - } - dx = fabs(w.x - s.x); - dy = fabs(w.y - s.y); - if (dx <= .5 && dy <= .5) { - pp->curve.vertex[i].x = w.x + x0; - pp->curve.vertex[i].y = w.y + y0; - continue; - } - - /* the minimum was not in the unit square; now minimize quadratic - on boundary of square */ - min = quadform(Q, s); - xmin = s.x; - ymin = s.y; - - if (Q[0][0] == 0.0) { - goto fixx; - } - for (z = 0; z < 2; z++) { /* value of the y-coordinate */ - w.y = s.y - 0.5 + z; - w.x = -(Q[0][1] * w.y + Q[0][2]) / Q[0][0]; - dx = fabs(w.x - s.x); - cand = quadform(Q, w); - if (dx <= .5 && cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - fixx: - if (Q[1][1] == 0.0) { - goto corners; - } - for (z = 0; z < 2; z++) { /* value of the x-coordinate */ - w.x = s.x - 0.5 + z; - w.y = -(Q[1][0] * w.x + Q[1][2]) / Q[1][1]; - dy = fabs(w.y - s.y); - cand = quadform(Q, w); - if (dy <= .5 && cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - corners: - /* check four corners */ - for (l = 0; l < 2; l++) { - for (k = 0; k < 2; k++) { - w.x = s.x - 0.5 + l; - w.y = s.y - 0.5 + k; - cand = quadform(Q, w); - if (cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - } - - pp->curve.vertex[i].x = xmin + x0; - pp->curve.vertex[i].y = ymin + y0; - continue; + + det = Q[0][0]*Q[1][1] - Q[0][1]*Q[1][0]; + if (det != 0.0) { + w.x = (-Q[0][2]*Q[1][1] + Q[1][2]*Q[0][1]) / det; + w.y = ( Q[0][2]*Q[1][0] - Q[1][2]*Q[0][0]) / det; + break; + } + + /* matrix is singular - lines are parallel. Add another, + orthogonal axis, through the center of the unit square */ + if (Q[0][0]>Q[1][1]) { + v[0] = -Q[0][1]; + v[1] = Q[0][0]; + } else if (Q[1][1]) { + v[0] = -Q[1][1]; + v[1] = Q[1][0]; + } else { + v[0] = 1; + v[1] = 0; + } + d = sq(v[0]) + sq(v[1]); + v[2] = - v[1] * s.y - v[0] * s.x; + for (l=0; l<3; l++) { + for (k=0; k<3; k++) { + Q[l][k] += v[l] * v[k] / d; + } + } + } + dx = fabs(w.x-s.x); + dy = fabs(w.y-s.y); + if (dx <= .5 && dy <= .5) { + pp->curve.vertex[i].x = w.x+x0; + pp->curve.vertex[i].y = w.y+y0; + continue; } - free(ctr); - free(dir); - free(q); - return 0; + /* the minimum was not in the unit square; now minimize quadratic + on boundary of square */ + min = quadform(Q, s); + xmin = s.x; + ymin = s.y; -malloc_error: - free(ctr); - free(dir); - free(q); - return 1; + if (Q[0][0] == 0.0) { + goto fixx; + } + for (z=0; z<2; z++) { /* value of the y-coordinate */ + w.y = s.y-0.5+z; + w.x = - (Q[0][1] * w.y + Q[0][2]) / Q[0][0]; + dx = fabs(w.x-s.x); + cand = quadform(Q, w); + if (dx <= .5 && cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + fixx: + if (Q[1][1] == 0.0) { + goto corners; + } + for (z=0; z<2; z++) { /* value of the x-coordinate */ + w.x = s.x-0.5+z; + w.y = - (Q[1][0] * w.x + Q[1][2]) / Q[1][1]; + dy = fabs(w.y-s.y); + cand = quadform(Q, w); + if (dy <= .5 && cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + corners: + /* check four corners */ + for (l=0; l<2; l++) { + for (k=0; k<2; k++) { + w.x = s.x-0.5+l; + w.y = s.y-0.5+k; + cand = quadform(Q, w); + if (cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + } + + pp->curve.vertex[i].x = xmin + x0; + pp->curve.vertex[i].y = ymin + y0; + continue; + } + + free(ctr); + free(dir); + free(q); + return 0; + + malloc_error: + free(ctr); + free(dir); + free(q); + return 1; } /* ---------------------------------------------------------------------- */ /* Stage 4: smoothing and corner analysis (Sec. 2.3.3) */ /* reverse orientation of a path */ -static void reverse(privcurve_t *curve) -{ - int m = curve->n; - int i, j; - dpoint_t tmp; - - for (i = 0, j = m - 1; i < j; i++, j--) { - tmp = curve->vertex[i]; - curve->vertex[i] = curve->vertex[j]; - curve->vertex[j] = tmp; - } +static void reverse(privcurve_t *curve) { + int m = curve->n; + int i, j; + dpoint_t tmp; + + for (i=0, j=m-1; i<j; i++, j--) { + tmp = curve->vertex[i]; + curve->vertex[i] = curve->vertex[j]; + curve->vertex[j] = tmp; + } } /* Always succeeds */ -static void smooth(privcurve_t *curve, double alphamax) -{ - int m = curve->n; - - int i, j, k; - double dd, denom, alpha; - dpoint_t p2, p3, p4; - - /* examine each vertex and find its best fit */ - for (i = 0; i < m; i++) { - j = mod(i + 1, m); - k = mod(i + 2, m); - p4 = interval(1 / 2.0, curve->vertex[k], curve->vertex[j]); - - denom = ddenom(curve->vertex[i], curve->vertex[k]); - if (denom != 0.0) { - dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom; - dd = fabs(dd); - alpha = dd > 1 ? (1 - 1.0 / dd) : 0; - alpha = alpha / 0.75; - } else { - alpha = 4 / 3.0; - } - curve->alpha0[j] = alpha; /* remember "original" value of alpha */ - - if (alpha > alphamax) { /* pointed corner */ - curve->tag[j] = POTRACE_CORNER; - curve->c[j][1] = curve->vertex[j]; - curve->c[j][2] = p4; - } else { - if (alpha < 0.55) { - alpha = 0.55; - } else if (alpha > 1) { - alpha = 1; - } - p2 = interval(.5 + .5 * alpha, curve->vertex[i], curve->vertex[j]); - p3 = interval(.5 + .5 * alpha, curve->vertex[k], curve->vertex[j]); - curve->tag[j] = POTRACE_CURVETO; - curve->c[j][0] = p2; - curve->c[j][1] = p3; - curve->c[j][2] = p4; - } - curve->alpha[j] = alpha; /* store the "cropped" value of alpha */ - curve->beta[j] = 0.5; +static void smooth(privcurve_t *curve, double alphamax) { + int m = curve->n; + + int i, j, k; + double dd, denom, alpha; + dpoint_t p2, p3, p4; + + /* examine each vertex and find its best fit */ + for (i=0; i<m; i++) { + j = mod(i+1, m); + k = mod(i+2, m); + p4 = interval(1/2.0, curve->vertex[k], curve->vertex[j]); + + denom = ddenom(curve->vertex[i], curve->vertex[k]); + if (denom != 0.0) { + dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom; + dd = fabs(dd); + alpha = dd>1 ? (1 - 1.0/dd) : 0; + alpha = alpha / 0.75; + } else { + alpha = 4/3.0; + } + curve->alpha0[j] = alpha; /* remember "original" value of alpha */ + + if (alpha > alphamax) { /* pointed corner */ + curve->tag[j] = POTRACE_CORNER; + curve->c[j][1] = curve->vertex[j]; + curve->c[j][2] = p4; + } else { + if (alpha < 0.55) { + alpha = 0.55; + } else if (alpha > 1) { + alpha = 1; + } + p2 = interval(.5+.5*alpha, curve->vertex[i], curve->vertex[j]); + p3 = interval(.5+.5*alpha, curve->vertex[k], curve->vertex[j]); + curve->tag[j] = POTRACE_CURVETO; + curve->c[j][0] = p2; + curve->c[j][1] = p3; + curve->c[j][2] = p4; } - curve->alphacurve = 1; + curve->alpha[j] = alpha; /* store the "cropped" value of alpha */ + curve->beta[j] = 0.5; + } + curve->alphacurve = 1; - return; + return; } /* ---------------------------------------------------------------------- */ @@ -918,349 +905,341 @@ static void smooth(privcurve_t *curve, double alphamax) /* a private type for the result of opti_penalty */ struct opti_s { - double pen; /* penalty */ - dpoint_t c[2]; /* curve parameters */ - double t, s; /* curve parameters */ - double alpha; /* curve parameter */ + double pen; /* penalty */ + dpoint_t c[2]; /* curve parameters */ + double t, s; /* curve parameters */ + double alpha; /* curve parameter */ }; typedef struct opti_s opti_t; /* calculate best fit from i+.5 to j+.5. Assume i<j (cyclically). Return 0 and set badness and parameters (alpha, beta), if possible. Return 1 if impossible. */ -static int opti_penalty(privpath_t *pp, int i, int j, opti_t *res, double opttolerance, int *convc, double *areac) -{ - int m = pp->curve.n; - int k, k1, k2, conv, i1; - double area, alpha, d, d1, d2; - dpoint_t p0, p1, p2, p3, pt; - double A, R, A1, A2, A3, A4; - double s, t; +static int opti_penalty(privpath_t *pp, int i, int j, opti_t *res, double opttolerance, int *convc, double *areac) { + int m = pp->curve.n; + int k, k1, k2, conv, i1; + double area, alpha, d, d1, d2; + dpoint_t p0, p1, p2, p3, pt; + double A, R, A1, A2, A3, A4; + double s, t; - /* check convexity, corner-freeness, and maximum bend < 179 degrees */ + /* check convexity, corner-freeness, and maximum bend < 179 degrees */ - if (i == j) { /* sanity - a full loop can never be an opticurve */ - return 1; - } + if (i==j) { /* sanity - a full loop can never be an opticurve */ + return 1; + } - k = i; - i1 = mod(i + 1, m); - k1 = mod(k + 1, m); - conv = convc[k1]; - if (conv == 0) { - return 1; + k = i; + i1 = mod(i+1, m); + k1 = mod(k+1, m); + conv = convc[k1]; + if (conv == 0) { + return 1; + } + d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]); + for (k=k1; k!=j; k=k1) { + k1 = mod(k+1, m); + k2 = mod(k+2, m); + if (convc[k1] != conv) { + return 1; } - d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]); - for (k = k1; k != j; k = k1) { - k1 = mod(k + 1, m); - k2 = mod(k + 2, m); - if (convc[k1] != conv) { - return 1; - } - if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != - conv) { - return 1; - } - if (iprod1(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2]) < - d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) { - return 1; - } + if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != conv) { + return 1; } - - /* the curve we're working in: */ - p0 = pp->curve.c[mod(i, m)][2]; - p1 = pp->curve.vertex[mod(i + 1, m)]; - p2 = pp->curve.vertex[mod(j, m)]; - p3 = pp->curve.c[mod(j, m)][2]; - - /* determine its area */ - area = areac[j] - areac[i]; - area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2]) / 2; - if (i >= j) { - area += areac[m]; + if (iprod1(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2]) < d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) { + return 1; } + } + + /* the curve we're working in: */ + p0 = pp->curve.c[mod(i,m)][2]; + p1 = pp->curve.vertex[mod(i+1,m)]; + p2 = pp->curve.vertex[mod(j,m)]; + p3 = pp->curve.c[mod(j,m)][2]; + + /* determine its area */ + area = areac[j] - areac[i]; + area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2])/2; + if (i>=j) { + area += areac[m]; + } + + /* find intersection o of p0p1 and p2p3. Let t,s such that o = + interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the + triangle (p0,o,p3). */ + + A1 = dpara(p0, p1, p2); + A2 = dpara(p0, p1, p3); + A3 = dpara(p0, p2, p3); + /* A4 = dpara(p1, p2, p3); */ + A4 = A1+A3-A2; + + if (A2 == A1) { /* this should never happen */ + return 1; + } - /* find intersection o of p0p1 and p2p3. Let t,s such that o = - interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the - triangle (p0,o,p3). */ + t = A3/(A3-A4); + s = A2/(A2-A1); + A = A2 * t / 2.0; + + if (A == 0.0) { /* this should never happen */ + return 1; + } - A1 = dpara(p0, p1, p2); - A2 = dpara(p0, p1, p3); - A3 = dpara(p0, p2, p3); - /* A4 = dpara(p1, p2, p3); */ - A4 = A1 + A3 - A2; + R = area / A; /* relative area */ + alpha = 2 - sqrt(4 - R / 0.3); /* overall alpha for p0-o-p3 curve */ - if (A2 == A1) { /* this should never happen */ - return 1; - } + res->c[0] = interval(t * alpha, p0, p1); + res->c[1] = interval(s * alpha, p3, p2); + res->alpha = alpha; + res->t = t; + res->s = s; - t = A3 / (A3 - A4); - s = A2 / (A2 - A1); - A = A2 * t / 2.0; + p1 = res->c[0]; + p2 = res->c[1]; /* the proposed curve is now (p0,p1,p2,p3) */ - if (A == 0.0) { /* this should never happen */ - return 1; - } + res->pen = 0; - R = area / A; /* relative area */ - alpha = 2 - sqrt(4 - R / 0.3); /* overall alpha for p0-o-p3 curve */ - - res->c[0] = interval(t * alpha, p0, p1); - res->c[1] = interval(s * alpha, p3, p2); - res->alpha = alpha; - res->t = t; - res->s = s; - - p1 = res->c[0]; - p2 = res->c[1]; /* the proposed curve is now (p0,p1,p2,p3) */ - - res->pen = 0; - - /* calculate penalty */ - /* check tangency with edges */ - for (k = mod(i + 1, m); k != j; k = k1) { - k1 = mod(k + 1, m); - t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]); - if (t < -.5) { - return 1; - } - pt = bezier(t, p0, p1, p2, p3); - d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]); - if (d == 0.0) { /* this should never happen */ - return 1; - } - d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d; - if (fabs(d1) > opttolerance) { - return 1; - } - if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || - iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) { - return 1; - } - res->pen += sq(d1); + /* calculate penalty */ + /* check tangency with edges */ + for (k=mod(i+1,m); k!=j; k=k1) { + k1 = mod(k+1,m); + t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]); + if (t<-.5) { + return 1; } - - /* check corners */ - for (k = i; k != j; k = k1) { - k1 = mod(k + 1, m); - t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]); - if (t < -.5) { - return 1; - } - pt = bezier(t, p0, p1, p2, p3); - d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]); - if (d == 0.0) { /* this should never happen */ - return 1; - } - d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d; - d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d; - d2 *= 0.75 * pp->curve.alpha[k1]; - if (d2 < 0) { - d1 = -d1; - d2 = -d2; - } - if (d1 < d2 - opttolerance) { - return 1; - } - if (d1 < d2) { - res->pen += sq(d1 - d2); - } + pt = bezier(t, p0, p1, p2, p3); + d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]); + if (d == 0.0) { /* this should never happen */ + return 1; } + d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d; + if (fabs(d1) > opttolerance) { + return 1; + } + if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) { + return 1; + } + res->pen += sq(d1); + } + + /* check corners */ + for (k=i; k!=j; k=k1) { + k1 = mod(k+1,m); + t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]); + if (t<-.5) { + return 1; + } + pt = bezier(t, p0, p1, p2, p3); + d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]); + if (d == 0.0) { /* this should never happen */ + return 1; + } + d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d; + d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d; + d2 *= 0.75 * pp->curve.alpha[k1]; + if (d2 < 0) { + d1 = -d1; + d2 = -d2; + } + if (d1 < d2 - opttolerance) { + return 1; + } + if (d1 < d2) { + res->pen += sq(d1 - d2); + } + } - return 0; + return 0; } /* optimize the path p, replacing sequences of Bezier segments by a single segment when possible. Return 0 on success, 1 with errno set on failure. */ -static int opticurve(privpath_t *pp, double opttolerance) -{ - int m = pp->curve.n; - int *pt = NULL; /* pt[m+1] */ - double *pen = NULL; /* pen[m+1] */ - int *len = NULL; /* len[m+1] */ - opti_t *opt = NULL; /* opt[m+1] */ - int om; - int i, j, r; - opti_t o; - dpoint_t p0; - int i1; - double area; - double alpha; - double *s = NULL; - double *t = NULL; - - int *convc = NULL; /* conv[m]: pre-computed convexities */ - double *areac = NULL; /* cumarea[m+1]: cache for fast area computation */ - - SAFE_MALLOC(pt, m + 1, int); - SAFE_MALLOC(pen, m + 1, double); - SAFE_MALLOC(len, m + 1, int); - SAFE_MALLOC(opt, m + 1, opti_t); - SAFE_MALLOC(convc, m, int); - SAFE_MALLOC(areac, m + 1, double); - - /* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */ - for (i = 0; i < m; i++) { - if (pp->curve.tag[i] == POTRACE_CURVETO) { - convc[i] = - sign(dpara(pp->curve.vertex[mod(i - 1, m)], pp->curve.vertex[i], pp->curve.vertex[mod(i + 1, m)])); - } else { - convc[i] = 0; - } - } - - /* pre-calculate areas */ - area = 0.0; - areac[0] = 0.0; - p0 = pp->curve.vertex[0]; - for (i = 0; i < m; i++) { - i1 = mod(i + 1, m); - if (pp->curve.tag[i1] == POTRACE_CURVETO) { - alpha = pp->curve.alpha[i1]; - area += 0.3 * alpha * (4 - alpha) * dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2]) / 2; - area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2]) / 2; - } - areac[i + 1] = area; - } - - pt[0] = -1; - pen[0] = 0; - len[0] = 0; - - /* Fixme: we always start from a fixed point -- should find the best - curve cyclically */ - - for (j = 1; j <= m; j++) { - /* calculate best path from 0 to j */ - pt[j] = j - 1; - pen[j] = pen[j - 1]; - len[j] = len[j - 1] + 1; - - for (i = j - 2; i >= 0; i--) { - r = opti_penalty(pp, i, mod(j, m), &o, opttolerance, convc, areac); - if (r) { - break; - } - if (len[j] > len[i] + 1 || (len[j] == len[i] + 1 && pen[j] > pen[i] + o.pen)) { - pt[j] = i; - pen[j] = pen[i] + o.pen; - len[j] = len[i] + 1; - opt[j] = o; - } - } +static int opticurve(privpath_t *pp, double opttolerance) { + int m = pp->curve.n; + int *pt = NULL; /* pt[m+1] */ + double *pen = NULL; /* pen[m+1] */ + int *len = NULL; /* len[m+1] */ + opti_t *opt = NULL; /* opt[m+1] */ + int om; + int i,j,r; + opti_t o; + dpoint_t p0; + int i1; + double area; + double alpha; + double *s = NULL; + double *t = NULL; + + int *convc = NULL; /* conv[m]: pre-computed convexities */ + double *areac = NULL; /* cumarea[m+1]: cache for fast area computation */ + + SAFE_MALLOC(pt, m+1, int); + SAFE_MALLOC(pen, m+1, double); + SAFE_MALLOC(len, m+1, int); + SAFE_MALLOC(opt, m+1, opti_t); + SAFE_MALLOC(convc, m, int); + SAFE_MALLOC(areac, m+1, double); + + /* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */ + for (i=0; i<m; i++) { + if (pp->curve.tag[i] == POTRACE_CURVETO) { + convc[i] = sign(dpara(pp->curve.vertex[mod(i-1,m)], pp->curve.vertex[i], pp->curve.vertex[mod(i+1,m)])); + } else { + convc[i] = 0; } - om = len[m]; - r = privcurve_init(&pp->ocurve, om); - if (r) { - goto malloc_error; + } + + /* pre-calculate areas */ + area = 0.0; + areac[0] = 0.0; + p0 = pp->curve.vertex[0]; + for (i=0; i<m; i++) { + i1 = mod(i+1, m); + if (pp->curve.tag[i1] == POTRACE_CURVETO) { + alpha = pp->curve.alpha[i1]; + area += 0.3*alpha*(4-alpha)*dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2])/2; + area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2])/2; } - SAFE_MALLOC(s, om, double); - SAFE_MALLOC(t, om, double); - - j = m; - for (i = om - 1; i >= 0; i--) { - if (pt[j] == j - 1) { - pp->ocurve.tag[i] = pp->curve.tag[mod(j, m)]; - pp->ocurve.c[i][0] = pp->curve.c[mod(j, m)][0]; - pp->ocurve.c[i][1] = pp->curve.c[mod(j, m)][1]; - pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2]; - pp->ocurve.vertex[i] = pp->curve.vertex[mod(j, m)]; - pp->ocurve.alpha[i] = pp->curve.alpha[mod(j, m)]; - pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j, m)]; - pp->ocurve.beta[i] = pp->curve.beta[mod(j, m)]; - s[i] = t[i] = 1.0; - } else { - pp->ocurve.tag[i] = POTRACE_CURVETO; - pp->ocurve.c[i][0] = opt[j].c[0]; - pp->ocurve.c[i][1] = opt[j].c[1]; - pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2]; - pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j, m)][2], pp->curve.vertex[mod(j, m)]); - pp->ocurve.alpha[i] = opt[j].alpha; - pp->ocurve.alpha0[i] = opt[j].alpha; - s[i] = opt[j].s; - t[i] = opt[j].t; - } - j = pt[j]; + areac[i+1] = area; + } + + pt[0] = -1; + pen[0] = 0; + len[0] = 0; + + /* Fixme: we always start from a fixed point -- should find the best + curve cyclically */ + + for (j=1; j<=m; j++) { + /* calculate best path from 0 to j */ + pt[j] = j-1; + pen[j] = pen[j-1]; + len[j] = len[j-1]+1; + + for (i=j-2; i>=0; i--) { + r = opti_penalty(pp, i, mod(j,m), &o, opttolerance, convc, areac); + if (r) { + break; + } + if (len[j] > len[i]+1 || (len[j] == len[i]+1 && pen[j] > pen[i] + o.pen)) { + pt[j] = i; + pen[j] = pen[i] + o.pen; + len[j] = len[i] + 1; + opt[j] = o; + } } - - /* calculate beta parameters */ - for (i = 0; i < om; i++) { - i1 = mod(i + 1, om); - pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]); + } + om = len[m]; + r = privcurve_init(&pp->ocurve, om); + if (r) { + goto malloc_error; + } + SAFE_MALLOC(s, om, double); + SAFE_MALLOC(t, om, double); + + j = m; + for (i=om-1; i>=0; i--) { + if (pt[j]==j-1) { + pp->ocurve.tag[i] = pp->curve.tag[mod(j,m)]; + pp->ocurve.c[i][0] = pp->curve.c[mod(j,m)][0]; + pp->ocurve.c[i][1] = pp->curve.c[mod(j,m)][1]; + pp->ocurve.c[i][2] = pp->curve.c[mod(j,m)][2]; + pp->ocurve.vertex[i] = pp->curve.vertex[mod(j,m)]; + pp->ocurve.alpha[i] = pp->curve.alpha[mod(j,m)]; + pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j,m)]; + pp->ocurve.beta[i] = pp->curve.beta[mod(j,m)]; + s[i] = t[i] = 1.0; + } else { + pp->ocurve.tag[i] = POTRACE_CURVETO; + pp->ocurve.c[i][0] = opt[j].c[0]; + pp->ocurve.c[i][1] = opt[j].c[1]; + pp->ocurve.c[i][2] = pp->curve.c[mod(j,m)][2]; + pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j,m)][2], pp->curve.vertex[mod(j,m)]); + pp->ocurve.alpha[i] = opt[j].alpha; + pp->ocurve.alpha0[i] = opt[j].alpha; + s[i] = opt[j].s; + t[i] = opt[j].t; } - pp->ocurve.alphacurve = 1; - - free(pt); - free(pen); - free(len); - free(opt); - free(s); - free(t); - free(convc); - free(areac); - return 0; - -malloc_error: - free(pt); - free(pen); - free(len); - free(opt); - free(s); - free(t); - free(convc); - free(areac); - return 1; + j = pt[j]; + } + + /* calculate beta parameters */ + for (i=0; i<om; i++) { + i1 = mod(i+1,om); + pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]); + } + pp->ocurve.alphacurve = 1; + + free(pt); + free(pen); + free(len); + free(opt); + free(s); + free(t); + free(convc); + free(areac); + return 0; + + malloc_error: + free(pt); + free(pen); + free(len); + free(opt); + free(s); + free(t); + free(convc); + free(areac); + return 1; } /* ---------------------------------------------------------------------- */ -#define TRY(x) \ - if (x) \ - goto try_error +#define TRY(x) if (x) goto try_error /* return 0 on success, 1 on error with errno set. */ -int process_path(path_t *plist, const potrace_param_t *param, progress_t *progress) -{ - path_t *p; - double nn = 0, cn = 0; - - if (progress->callback) { - /* precompute task size for progress estimates */ - nn = 0; - list_forall(p, plist) { nn += p->priv->len; } - cn = 0; +int process_path(path_t *plist, const potrace_param_t *param, progress_t *progress) { + path_t *p; + double nn = 0, cn = 0; + + if (progress->callback) { + /* precompute task size for progress estimates */ + nn = 0; + list_forall (p, plist) { + nn += p->priv->len; + } + cn = 0; + } + + /* call downstream function with each path */ + list_forall (p, plist) { + TRY(calc_sums(p->priv)); + TRY(calc_lon(p->priv)); + TRY(bestpolygon(p->priv)); + TRY(adjust_vertices(p->priv)); + if (p->sign == '-') { /* reverse orientation of negative paths */ + reverse(&p->priv->curve); } + smooth(&p->priv->curve, param->alphamax); + if (param->opticurve) { + TRY(opticurve(p->priv, param->opttolerance)); + p->priv->fcurve = &p->priv->ocurve; + } else { + p->priv->fcurve = &p->priv->curve; + } + privcurve_to_curve(p->priv->fcurve, &p->curve); - /* call downstream function with each path */ - list_forall(p, plist) - { - TRY(calc_sums(p->priv)); - TRY(calc_lon(p->priv)); - TRY(bestpolygon(p->priv)); - TRY(adjust_vertices(p->priv)); - if (p->sign == '-') { /* reverse orientation of negative paths */ - reverse(&p->priv->curve); - } - smooth(&p->priv->curve, param->alphamax); - if (param->opticurve) { - TRY(opticurve(p->priv, param->opttolerance)); - p->priv->fcurve = &p->priv->ocurve; - } else { - p->priv->fcurve = &p->priv->curve; - } - privcurve_to_curve(p->priv->fcurve, &p->curve); - - if (progress->callback) { - cn += p->priv->len; - progress_update(cn / nn, progress); - } + if (progress->callback) { + cn += p->priv->len; + progress_update(cn/nn, progress); } + } - progress_update(1.0, progress); + progress_update(1.0, progress); - return 0; + return 0; -try_error: - return 1; + try_error: + return 1; } -- cgit v1.2.3 From a7f2b5c335699603e03dc38d3bb8d1d020f2e672 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 13:18:33 +0200 Subject: revert previous commit. (bzr r13341.1.272) --- src/trace/potrace/trace.cpp | 2059 +++++++++++++++++++++---------------------- 1 file changed, 1019 insertions(+), 1040 deletions(-) diff --git a/src/trace/potrace/trace.cpp b/src/trace/potrace/trace.cpp index 2bdefb90a..f1e88a908 100644 --- a/src/trace/potrace/trace.cpp +++ b/src/trace/potrace/trace.cpp @@ -16,129 +16,124 @@ #include "trace.h" #include "progress.h" -#define INFTY 10000000 // it suffices that this is longer than any - // path; it need not be really infinite -#define COS179 -0.999847695156 // the cosine of 179 degrees +#define INFTY 10000000 /* it suffices that this is longer than any + path; it need not be really infinite */ +#define COS179 -0.999847695156 /* the cosine of 179 degrees */ /* ---------------------------------------------------------------------- */ #define SAFE_MALLOC(var, n, typ) \ - if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error + if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error /* ---------------------------------------------------------------------- */ /* auxiliary functions */ /* return a direction that is 90 degrees counterclockwise from p2-p0, but then restricted to one of the major wind directions (n, nw, w, etc) */ -static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2) -{ - point_t r; - - r.y = sign(p2.x - p0.x); - r.x = -sign(p2.y - p0.y); +static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2) { + point_t r; + + r.y = sign(p2.x-p0.x); + r.x = -sign(p2.y-p0.y); - return r; + return r; } /* return (p1-p0)x(p2-p0), the area of the parallelogram */ -static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2) -{ - double x1, y1, x2, y2; +static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2) { + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p2.x - p0.x; - y2 = p2.y - p0.y; + x1 = p1.x-p0.x; + y1 = p1.y-p0.y; + x2 = p2.x-p0.x; + y2 = p2.y-p0.y; - return x1 * y2 - x2 * y1; + return x1*y2 - x2*y1; } /* ddenom/dpara have the property that the square of radius 1 centered at p1 intersects the line p0p2 iff |dpara(p0,p1,p2)| <= ddenom(p0,p2) */ -static inline double ddenom(dpoint_t p0, dpoint_t p2) -{ - point_t r = dorth_infty(p0, p2); +static inline double ddenom(dpoint_t p0, dpoint_t p2) { + point_t r = dorth_infty(p0, p2); - return r.y * (p2.x - p0.x) - r.x * (p2.y - p0.y); + return r.y*(p2.x-p0.x) - r.x*(p2.y-p0.y); } /* return 1 if a <= b < c < a, in a cyclic sense (mod n) */ -static inline int cyclic(int a, int b, int c) -{ - if (a <= c) { - return (a <= b && b < c); - } else { - return (a <= b || b < c); - } +static inline int cyclic(int a, int b, int c) { + if (a<=c) { + return (a<=b && b<c); + } else { + return (a<=b || b<c); + } } /* determine the center and slope of the line i..j. Assume i<j. Needs "sum" components of p to be set. */ -static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *dir) -{ - /* assume i<j */ - - int n = pp->len; - sums_t *sums = pp->sums; - - double x, y, x2, xy, y2; - double k; - double a, b, c, lambda2, l; - int r = 0; /* rotations from i to j */ - - while (j >= n) { - j -= n; - r += 1; - } - while (i >= n) { - i -= n; - r -= 1; - } - while (j < 0) { - j += n; - r -= 1; - } - while (i < 0) { - i += n; - r += 1; - } - - x = sums[j + 1].x - sums[i].x + r * sums[n].x; - y = sums[j + 1].y - sums[i].y + r * sums[n].y; - x2 = sums[j + 1].x2 - sums[i].x2 + r * sums[n].x2; - xy = sums[j + 1].xy - sums[i].xy + r * sums[n].xy; - y2 = sums[j + 1].y2 - sums[i].y2 + r * sums[n].y2; - k = j + 1 - i + r * n; - - ctr->x = x / k; - ctr->y = y / k; - - a = (x2 - (double)x * x / k) / k; - b = (xy - (double)x * y / k) / k; - c = (y2 - (double)y * y / k) / k; - - lambda2 = (a + c + sqrt((a - c) * (a - c) + 4 * b * b)) / 2; /* larger e.value */ - - /* now find e.vector for lambda2 */ - a -= lambda2; - c -= lambda2; - - if (fabs(a) >= fabs(c)) { - l = sqrt(a * a + b * b); - if (l != 0) { - dir->x = -b / l; - dir->y = a / l; - } - } else { - l = sqrt(c * c + b * b); - if (l != 0) { - dir->x = -c / l; - dir->y = b / l; - } +static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *dir) { + /* assume i<j */ + + int n = pp->len; + sums_t *sums = pp->sums; + + double x, y, x2, xy, y2; + double k; + double a, b, c, lambda2, l; + int r=0; /* rotations from i to j */ + + while (j>=n) { + j-=n; + r+=1; + } + while (i>=n) { + i-=n; + r-=1; + } + while (j<0) { + j+=n; + r-=1; + } + while (i<0) { + i+=n; + r+=1; + } + + x = sums[j+1].x-sums[i].x+r*sums[n].x; + y = sums[j+1].y-sums[i].y+r*sums[n].y; + x2 = sums[j+1].x2-sums[i].x2+r*sums[n].x2; + xy = sums[j+1].xy-sums[i].xy+r*sums[n].xy; + y2 = sums[j+1].y2-sums[i].y2+r*sums[n].y2; + k = j+1-i+r*n; + + ctr->x = x/k; + ctr->y = y/k; + + a = (x2-(double)x*x/k)/k; + b = (xy-(double)x*y/k)/k; + c = (y2-(double)y*y/k)/k; + + lambda2 = (a+c+sqrt((a-c)*(a-c)+4*b*b))/2; /* larger e.value */ + + /* now find e.vector for lambda2 */ + a -= lambda2; + c -= lambda2; + + if (fabs(a) >= fabs(c)) { + l = sqrt(a*a+b*b); + if (l!=0) { + dir->x = -b/l; + dir->y = a/l; } - if (l == 0) { - dir->x = dir->y = 0; /* sometimes this can happen when k=4: - the two eigenvalues coincide */ + } else { + l = sqrt(c*c+b*b); + if (l!=0) { + dir->x = -c/l; + dir->y = b/l; } + } + if (l==0) { + dir->x = dir->y = 0; /* sometimes this can happen when k=4: + the two eigenvalues coincide */ + } } /* the type of (affine) quadratic forms, represented as symmetric 3x3 @@ -147,158 +142,155 @@ static void pointslope(privpath_t *pp, int i, int j, dpoint_t *ctr, dpoint_t *di typedef double quadform_t[3][3]; /* Apply quadratic form Q to vector w = (w.x,w.y) */ -static inline double quadform(quadform_t Q, dpoint_t w) -{ - double v[3]; - int i, j; - double sum; - - v[0] = w.x; - v[1] = w.y; - v[2] = 1; - sum = 0.0; - - for (i = 0; i < 3; i++) { - for (j = 0; j < 3; j++) { - sum += v[i] * Q[i][j] * v[j]; - } +static inline double quadform(quadform_t Q, dpoint_t w) { + double v[3]; + int i, j; + double sum; + + v[0] = w.x; + v[1] = w.y; + v[2] = 1; + sum = 0.0; + + for (i=0; i<3; i++) { + for (j=0; j<3; j++) { + sum += v[i] * Q[i][j] * v[j]; } - return sum; + } + return sum; } /* calculate p1 x p2 */ -static inline int xprod(point_t p1, point_t p2) { return p1.x * p2.y - p1.y * p2.x; } +static inline int xprod(point_t p1, point_t p2) { + return p1.x*p2.y - p1.y*p2.x; +} /* calculate (p1-p0)x(p3-p2) */ -static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) -{ - double x1, y1, x2, y2; +static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p3.x - p2.x; - y2 = p3.y - p2.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p3.x - p2.x; + y2 = p3.y - p2.y; - return x1 * y2 - x2 * y1; + return x1*y2 - x2*y1; } /* calculate (p1-p0)*(p2-p0) */ -static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2) -{ - double x1, y1, x2, y2; +static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2) { + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p2.x - p0.x; - y2 = p2.y - p0.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p2.x - p0.x; + y2 = p2.y - p0.y; - return x1 * x2 + y1 * y2; + return x1*x2 + y1*y2; } /* calculate (p1-p0)*(p3-p2) */ -static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) -{ - double x1, y1, x2, y2; +static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { + double x1, y1, x2, y2; - x1 = p1.x - p0.x; - y1 = p1.y - p0.y; - x2 = p3.x - p2.x; - y2 = p3.y - p2.y; + x1 = p1.x - p0.x; + y1 = p1.y - p0.y; + x2 = p3.x - p2.x; + y2 = p3.y - p2.y; - return x1 * x2 + y1 * y2; + return x1*x2 + y1*y2; } /* calculate distance between two points */ -static inline double ddist(dpoint_t p, dpoint_t q) { return sqrt(sq(p.x - q.x) + sq(p.y - q.y)); } +static inline double ddist(dpoint_t p, dpoint_t q) { + return sqrt(sq(p.x-q.x)+sq(p.y-q.y)); +} /* calculate point of a bezier curve */ -static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) -{ - double s = 1 - t; - dpoint_t res; +static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3) { + double s = 1-t; + dpoint_t res; - /* Note: a good optimizing compiler (such as gcc-3) reduces the - following to 16 multiplications, using common subexpression - elimination. */ + /* Note: a good optimizing compiler (such as gcc-3) reduces the + following to 16 multiplications, using common subexpression + elimination. */ - res.x = s * s * s * p0.x + 3 * (s * s * t) * p1.x + 3 * (t * t * s) * p2.x + t * t * t * p3.x; - res.y = s * s * s * p0.y + 3 * (s * s * t) * p1.y + 3 * (t * t * s) * p2.y + t * t * t * p3.y; + res.x = s*s*s*p0.x + 3*(s*s*t)*p1.x + 3*(t*t*s)*p2.x + t*t*t*p3.x; + res.y = s*s*s*p0.y + 3*(s*s*t)*p1.y + 3*(t*t*s)*p2.y + t*t*t*p3.y; - return res; + return res; } /* calculate the point t in [0..1] on the (convex) bezier curve (p0,p1,p2,p3) which is tangent to q1-q0. Return -1.0 if there is no solution in [0..1]. */ -static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1) -{ - double A, B, C; /* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */ - double a, b, c; /* a t^2 + b t + c = 0 */ - double d, s, r1, r2; - - A = cprod(p0, p1, q0, q1); - B = cprod(p1, p2, q0, q1); - C = cprod(p2, p3, q0, q1); - - a = A - 2 * B + C; - b = -2 * A + 2 * B; - c = A; - - d = b * b - 4 * a * c; - - if (a == 0 || d < 0) { - return -1.0; - } - - s = sqrt(d); - - r1 = (-b + s) / (2 * a); - r2 = (-b - s) / (2 * a); - - if (r1 >= 0 && r1 <= 1) { - return r1; - } else if (r2 >= 0 && r2 <= 1) { - return r2; - } else { - return -1.0; - } +static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1) { + double A, B, C; /* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */ + double a, b, c; /* a t^2 + b t + c = 0 */ + double d, s, r1, r2; + + A = cprod(p0, p1, q0, q1); + B = cprod(p1, p2, q0, q1); + C = cprod(p2, p3, q0, q1); + + a = A - 2*B + C; + b = -2*A + 2*B; + c = A; + + d = b*b - 4*a*c; + + if (a==0 || d<0) { + return -1.0; + } + + s = sqrt(d); + + r1 = (-b + s) / (2 * a); + r2 = (-b - s) / (2 * a); + + if (r1 >= 0 && r1 <= 1) { + return r1; + } else if (r2 >= 0 && r2 <= 1) { + return r2; + } else { + return -1.0; + } } /* ---------------------------------------------------------------------- */ /* Preparation: fill in the sum* fields of a path (used for later rapid summing). Return 0 on success, 1 with errno set on failure. */ -static int calc_sums(privpath_t *pp) -{ - int i, x, y; - int n = pp->len; - - SAFE_MALLOC(pp->sums, pp->len + 1, sums_t); - - /* origin */ - pp->x0 = pp->pt[0].x; - pp->y0 = pp->pt[0].y; - - /* preparatory computation for later fast summing */ - pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0; - for (i = 0; i < n; i++) { - x = pp->pt[i].x - pp->x0; - y = pp->pt[i].y - pp->y0; - pp->sums[i + 1].x = pp->sums[i].x + x; - pp->sums[i + 1].y = pp->sums[i].y + y; - pp->sums[i + 1].x2 = pp->sums[i].x2 + x * x; - pp->sums[i + 1].xy = pp->sums[i].xy + x * y; - pp->sums[i + 1].y2 = pp->sums[i].y2 + y * y; - } - return 0; - -malloc_error: - return 1; +static int calc_sums(privpath_t *pp) { + int i, x, y; + int n = pp->len; + + SAFE_MALLOC(pp->sums, pp->len+1, sums_t); + + /* origin */ + pp->x0 = pp->pt[0].x; + pp->y0 = pp->pt[0].y; + + /* preparatory computation for later fast summing */ + pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0; + for (i=0; i<n; i++) { + x = pp->pt[i].x - pp->x0; + y = pp->pt[i].y - pp->y0; + pp->sums[i+1].x = pp->sums[i].x + x; + pp->sums[i+1].y = pp->sums[i].y + y; + pp->sums[i+1].x2 = pp->sums[i].x2 + x*x; + pp->sums[i+1].xy = pp->sums[i].xy + x*y; + pp->sums[i+1].y2 = pp->sums[i].y2 + y*y; + } + return 0; + + malloc_error: + return 1; } /* ---------------------------------------------------------------------- */ /* Stage 1: determine the straight subpaths (Sec. 2.2.1). Fill in the - "lon" component of a path object (based on pt/len). For each i, + "lon" component of a path object (based on pt/len). For each i, lon[i] is the furthest index such that a straight line can be drawn from i to lon[i]. Return 1 on error with errno set, else 0. */ @@ -326,208 +318,206 @@ malloc_error: substantial. */ /* returns 0 on success, 1 on error with errno set */ -static int calc_lon(privpath_t *pp) -{ - point_t *pt = pp->pt; - int n = pp->len; - int i, j, k, k1; - int ct[4], dir; - point_t constraint[2]; - point_t cur; - point_t off; - int *pivk = NULL; /* pivk[n] */ - int *nc = NULL; /* nc[n]: next corner */ - point_t dk; /* direction of k-k1 */ - int a, b, c, d; - - SAFE_MALLOC(pivk, n, int); - SAFE_MALLOC(nc, n, int); - - /* initialize the nc data structure. Point from each point to the - furthest future point to which it is connected by a vertical or - horizontal segment. We take advantage of the fact that there is - always a direction change at 0 (due to the path decomposition - algorithm). But even if this were not so, there is no harm, as - in practice, correctness does not depend on the word "furthest" - above. */ - k = 0; - for (i = n - 1; i >= 0; i--) { - if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) { - k = i + 1; /* necessarily i<n-1 in this case */ - } - nc[i] = k; +static int calc_lon(privpath_t *pp) { + point_t *pt = pp->pt; + int n = pp->len; + int i, j, k, k1; + int ct[4], dir; + point_t constraint[2]; + point_t cur; + point_t off; + int *pivk = NULL; /* pivk[n] */ + int *nc = NULL; /* nc[n]: next corner */ + point_t dk; /* direction of k-k1 */ + int a, b, c, d; + + SAFE_MALLOC(pivk, n, int); + SAFE_MALLOC(nc, n, int); + + /* initialize the nc data structure. Point from each point to the + furthest future point to which it is connected by a vertical or + horizontal segment. We take advantage of the fact that there is + always a direction change at 0 (due to the path decomposition + algorithm). But even if this were not so, there is no harm, as + in practice, correctness does not depend on the word "furthest" + above. */ + k = 0; + for (i=n-1; i>=0; i--) { + if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) { + k = i+1; /* necessarily i<n-1 in this case */ } - - SAFE_MALLOC(pp->lon, n, int); - - /* determine pivot points: for each i, let pivk[i] be the furthest k - such that all j with i<j<k lie on a line connecting i,k. */ - - for (i = n - 1; i >= 0; i--) { - ct[0] = ct[1] = ct[2] = ct[3] = 0; - - /* keep track of "directions" that have occurred */ - dir = (3 + 3 * (pt[mod(i + 1, n)].x - pt[i].x) + (pt[mod(i + 1, n)].y - pt[i].y)) / 2; - ct[dir]++; - - constraint[0].x = 0; - constraint[0].y = 0; - constraint[1].x = 0; - constraint[1].y = 0; - - /* find the next k such that no straight line from i to k */ - k = nc[i]; - k1 = i; - while (1) { - - dir = (3 + 3 * sign(pt[k].x - pt[k1].x) + sign(pt[k].y - pt[k1].y)) / 2; - ct[dir]++; - - /* if all four "directions" have occurred, cut this path */ - if (ct[0] && ct[1] && ct[2] && ct[3]) { - pivk[i] = k1; - goto foundk; - } - - cur.x = pt[k].x - pt[i].x; - cur.y = pt[k].y - pt[i].y; - - /* see if current constraint is violated */ - if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) { - goto constraint_viol; - } - - /* else, update constraint */ - if (abs(cur.x) <= 1 && abs(cur.y) <= 1) { - /* no constraint */ - } else { - off.x = cur.x + ((cur.y >= 0 && (cur.y > 0 || cur.x < 0)) ? 1 : -1); - off.y = cur.y + ((cur.x <= 0 && (cur.x < 0 || cur.y < 0)) ? 1 : -1); - if (xprod(constraint[0], off) >= 0) { - constraint[0] = off; - } - off.x = cur.x + ((cur.y <= 0 && (cur.y < 0 || cur.x < 0)) ? 1 : -1); - off.y = cur.y + ((cur.x >= 0 && (cur.x > 0 || cur.y < 0)) ? 1 : -1); - if (xprod(constraint[1], off) <= 0) { - constraint[1] = off; - } - } - k1 = k; - k = nc[k1]; - if (!cyclic(k, i, k1)) { - break; - } - } - constraint_viol: - /* k1 was the last "corner" satisfying the current constraint, and - k is the first one violating it. We now need to find the last - point along k1..k which satisfied the constraint. */ - dk.x = sign(pt[k].x - pt[k1].x); - dk.y = sign(pt[k].y - pt[k1].y); - cur.x = pt[k1].x - pt[i].x; - cur.y = pt[k1].y - pt[i].y; - /* find largest integer j such that xprod(constraint[0], cur+j*dk) - >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity - of xprod. */ - a = xprod(constraint[0], cur); - b = xprod(constraint[0], dk); - c = xprod(constraint[1], cur); - d = xprod(constraint[1], dk); - /* find largest integer j such that a+j*b>=0 and c+j*d<=0. This - can be solved with integer arithmetic. */ - j = INFTY; - if (b < 0) { - j = floordiv(a, -b); - } - if (d > 0) { - j = min(j, floordiv(-c, d)); - } - pivk[i] = mod(k1 + j, n); - foundk: - ; - } /* for i */ - - /* clean up: for each i, let lon[i] be the largest k such that for - all i' with i<=i'<k, i'<k<=pivk[i']. */ - - j = pivk[n - 1]; - pp->lon[n - 1] = j; - for (i = n - 2; i >= 0; i--) { - if (cyclic(i + 1, pivk[i], j)) { - j = pivk[i]; - } - pp->lon[i] = j; + nc[i] = k; + } + + SAFE_MALLOC(pp->lon, n, int); + + /* determine pivot points: for each i, let pivk[i] be the furthest k + such that all j with i<j<k lie on a line connecting i,k. */ + + for (i=n-1; i>=0; i--) { + ct[0] = ct[1] = ct[2] = ct[3] = 0; + + /* keep track of "directions" that have occurred */ + dir = (3+3*(pt[mod(i+1,n)].x-pt[i].x)+(pt[mod(i+1,n)].y-pt[i].y))/2; + ct[dir]++; + + constraint[0].x = 0; + constraint[0].y = 0; + constraint[1].x = 0; + constraint[1].y = 0; + + /* find the next k such that no straight line from i to k */ + k = nc[i]; + k1 = i; + while (1) { + + dir = (3+3*sign(pt[k].x-pt[k1].x)+sign(pt[k].y-pt[k1].y))/2; + ct[dir]++; + + /* if all four "directions" have occurred, cut this path */ + if (ct[0] && ct[1] && ct[2] && ct[3]) { + pivk[i] = k1; + goto foundk; + } + + cur.x = pt[k].x - pt[i].x; + cur.y = pt[k].y - pt[i].y; + + /* see if current constraint is violated */ + if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) { + goto constraint_viol; + } + + /* else, update constraint */ + if (abs(cur.x) <= 1 && abs(cur.y) <= 1) { + /* no constraint */ + } else { + off.x = cur.x + ((cur.y>=0 && (cur.y>0 || cur.x<0)) ? 1 : -1); + off.y = cur.y + ((cur.x<=0 && (cur.x<0 || cur.y<0)) ? 1 : -1); + if (xprod(constraint[0], off) >= 0) { + constraint[0] = off; + } + off.x = cur.x + ((cur.y<=0 && (cur.y<0 || cur.x<0)) ? 1 : -1); + off.y = cur.y + ((cur.x>=0 && (cur.x>0 || cur.y<0)) ? 1 : -1); + if (xprod(constraint[1], off) <= 0) { + constraint[1] = off; + } + } + k1 = k; + k = nc[k1]; + if (!cyclic(k,i,k1)) { + break; + } } - - for (i = n - 1; cyclic(mod(i + 1, n), j, pp->lon[i]); i--) { - pp->lon[i] = j; + constraint_viol: + /* k1 was the last "corner" satisfying the current constraint, and + k is the first one violating it. We now need to find the last + point along k1..k which satisfied the constraint. */ + dk.x = sign(pt[k].x-pt[k1].x); + dk.y = sign(pt[k].y-pt[k1].y); + cur.x = pt[k1].x - pt[i].x; + cur.y = pt[k1].y - pt[i].y; + /* find largest integer j such that xprod(constraint[0], cur+j*dk) + >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity + of xprod. */ + a = xprod(constraint[0], cur); + b = xprod(constraint[0], dk); + c = xprod(constraint[1], cur); + d = xprod(constraint[1], dk); + /* find largest integer j such that a+j*b>=0 and c+j*d<=0. This + can be solved with integer arithmetic. */ + j = INFTY; + if (b<0) { + j = floordiv(a,-b); + } + if (d>0) { + j = min(j, floordiv(-c,d)); } + pivk[i] = mod(k1+j,n); + foundk: + ; + } /* for i */ + + /* clean up: for each i, let lon[i] be the largest k such that for + all i' with i<=i'<k, i'<k<=pivk[i']. */ + + j=pivk[n-1]; + pp->lon[n-1]=j; + for (i=n-2; i>=0; i--) { + if (cyclic(i+1,pivk[i],j)) { + j=pivk[i]; + } + pp->lon[i]=j; + } - free(pivk); - free(nc); - return 0; + for (i=n-1; cyclic(mod(i+1,n),j,pp->lon[i]); i--) { + pp->lon[i] = j; + } -malloc_error: - free(pivk); - free(nc); - return 1; + free(pivk); + free(nc); + return 0; + + malloc_error: + free(pivk); + free(nc); + return 1; } /* ---------------------------------------------------------------------- */ -/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */ +/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */ /* Auxiliary function: calculate the penalty of an edge from i to j in the given path. This needs the "lon" and "sum*" data. */ -static double penalty3(privpath_t *pp, int i, int j) -{ - int n = pp->len; - point_t *pt = pp->pt; - sums_t *sums = pp->sums; - - /* assume 0<=i<j<=n */ - double x, y, x2, xy, y2; - double k; - double a, b, c, s; - double px, py, ex, ey; - - int r = 0; /* rotations from i to j */ - - if (j >= n) { - j -= n; - r = 1; - } - - /* critical inner loop: the "if" gives a 4.6 percent speedup */ - if (r == 0) { - x = sums[j + 1].x - sums[i].x; - y = sums[j + 1].y - sums[i].y; - x2 = sums[j + 1].x2 - sums[i].x2; - xy = sums[j + 1].xy - sums[i].xy; - y2 = sums[j + 1].y2 - sums[i].y2; - k = j + 1 - i; - } else { - x = sums[j + 1].x - sums[i].x + sums[n].x; - y = sums[j + 1].y - sums[i].y + sums[n].y; - x2 = sums[j + 1].x2 - sums[i].x2 + sums[n].x2; - xy = sums[j + 1].xy - sums[i].xy + sums[n].xy; - y2 = sums[j + 1].y2 - sums[i].y2 + sums[n].y2; - k = j + 1 - i + n; - } - - px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x; - py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y; - ey = (pt[j].x - pt[i].x); - ex = -(pt[j].y - pt[i].y); - - a = ((x2 - 2 * x * px) / k + px * px); - b = ((xy - x * py - y * px) / k + px * py); - c = ((y2 - 2 * y * py) / k + py * py); - - s = ex * ex * a + 2 * ex * ey * b + ey * ey * c; - - return sqrt(s); +static double penalty3(privpath_t *pp, int i, int j) { + int n = pp->len; + point_t *pt = pp->pt; + sums_t *sums = pp->sums; + + /* assume 0<=i<j<=n */ + double x, y, x2, xy, y2; + double k; + double a, b, c, s; + double px, py, ex, ey; + + int r = 0; /* rotations from i to j */ + + if (j>=n) { + j -= n; + r = 1; + } + + /* critical inner loop: the "if" gives a 4.6 percent speedup */ + if (r == 0) { + x = sums[j+1].x - sums[i].x; + y = sums[j+1].y - sums[i].y; + x2 = sums[j+1].x2 - sums[i].x2; + xy = sums[j+1].xy - sums[i].xy; + y2 = sums[j+1].y2 - sums[i].y2; + k = j+1 - i; + } else { + x = sums[j+1].x - sums[i].x + sums[n].x; + y = sums[j+1].y - sums[i].y + sums[n].y; + x2 = sums[j+1].x2 - sums[i].x2 + sums[n].x2; + xy = sums[j+1].xy - sums[i].xy + sums[n].xy; + y2 = sums[j+1].y2 - sums[i].y2 + sums[n].y2; + k = j+1 - i + n; + } + + px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x; + py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y; + ey = (pt[j].x - pt[i].x); + ex = -(pt[j].y - pt[i].y); + + a = ((x2 - 2*x*px) / k + px*px); + b = ((xy - x*py - y*px) / k + px*py); + c = ((y2 - 2*y*py) / k + py*py); + + s = ex*ex*a + 2*ex*ey*b + ey*ey*c; + + return sqrt(s); } /* find the optimal polygon. Fill in the m and po components. Return 1 @@ -535,109 +525,109 @@ static double penalty3(privpath_t *pp, int i, int j) is in the polygon. Fixme: implement cyclic version. */ static int bestpolygon(privpath_t *pp) { - int i, j, m, k; - int n = pp->len; - double *pen = NULL; /* pen[n+1]: penalty vector */ - int *prev = NULL; /* prev[n+1]: best path pointer vector */ - int *clip0 = NULL; /* clip0[n]: longest segment pointer, non-cyclic */ - int *clip1 = NULL; /* clip1[n+1]: backwards segment pointer, non-cyclic */ - int *seg0 = NULL; /* seg0[m+1]: forward segment bounds, m<=n */ - int *seg1 = NULL; /* seg1[m+1]: backward segment bounds, m<=n */ - double thispen; - double best; - int c; - - SAFE_MALLOC(pen, n + 1, double); - SAFE_MALLOC(prev, n + 1, int); - SAFE_MALLOC(clip0, n, int); - SAFE_MALLOC(clip1, n + 1, int); - SAFE_MALLOC(seg0, n + 1, int); - SAFE_MALLOC(seg1, n + 1, int); - - /* calculate clipped paths */ - for (i = 0; i < n; i++) { - c = mod(pp->lon[mod(i - 1, n)] - 1, n); - if (c == i) { - c = mod(i + 1, n); - } - if (c < i) { - clip0[i] = n; - } else { - clip0[i] = c; - } - } - - /* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff - clip1[j] <= i, for i,j=0..n. */ - j = 1; - for (i = 0; i < n; i++) { - while (j <= clip0[i]) { - clip1[j] = i; - j++; - } - } - - /* calculate seg0[j] = longest path from 0 with j segments */ - i = 0; - for (j = 0; i < n; j++) { - seg0[j] = i; - i = clip0[i]; + int i, j, m, k; + int n = pp->len; + double *pen = NULL; /* pen[n+1]: penalty vector */ + int *prev = NULL; /* prev[n+1]: best path pointer vector */ + int *clip0 = NULL; /* clip0[n]: longest segment pointer, non-cyclic */ + int *clip1 = NULL; /* clip1[n+1]: backwards segment pointer, non-cyclic */ + int *seg0 = NULL; /* seg0[m+1]: forward segment bounds, m<=n */ + int *seg1 = NULL; /* seg1[m+1]: backward segment bounds, m<=n */ + double thispen; + double best; + int c; + + SAFE_MALLOC(pen, n+1, double); + SAFE_MALLOC(prev, n+1, int); + SAFE_MALLOC(clip0, n, int); + SAFE_MALLOC(clip1, n+1, int); + SAFE_MALLOC(seg0, n+1, int); + SAFE_MALLOC(seg1, n+1, int); + + /* calculate clipped paths */ + for (i=0; i<n; i++) { + c = mod(pp->lon[mod(i-1,n)]-1,n); + if (c == i) { + c = mod(i+1,n); } - seg0[j] = n; - m = j; - - /* calculate seg1[j] = longest path to n with m-j segments */ - i = n; - for (j = m; j > 0; j--) { - seg1[j] = i; - i = clip1[i]; + if (c < i) { + clip0[i] = n; + } else { + clip0[i] = c; } - seg1[0] = 0; - - /* now find the shortest path with m segments, based on penalty3 */ - /* note: the outer 2 loops jointly have at most n iterations, thus - the worst-case behavior here is quadratic. In practice, it is - close to linear since the inner loop tends to be short. */ - pen[0] = 0; - for (j = 1; j <= m; j++) { - for (i = seg1[j]; i <= seg0[j]; i++) { - best = -1; - for (k = seg0[j - 1]; k >= clip1[i]; k--) { - thispen = penalty3(pp, k, i) + pen[k]; - if (best < 0 || thispen < best) { - prev[i] = k; - best = thispen; - } - } - pen[i] = best; - } + } + + /* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff + clip1[j] <= i, for i,j=0..n. */ + j = 1; + for (i=0; i<n; i++) { + while (j <= clip0[i]) { + clip1[j] = i; + j++; } - - pp->m = m; - SAFE_MALLOC(pp->po, m, int); - - /* read off shortest path */ - for (i = n, j = m - 1; i > 0; j--) { - i = prev[i]; - pp->po[j] = i; + } + + /* calculate seg0[j] = longest path from 0 with j segments */ + i = 0; + for (j=0; i<n; j++) { + seg0[j] = i; + i = clip0[i]; + } + seg0[j] = n; + m = j; + + /* calculate seg1[j] = longest path to n with m-j segments */ + i = n; + for (j=m; j>0; j--) { + seg1[j] = i; + i = clip1[i]; + } + seg1[0] = 0; + + /* now find the shortest path with m segments, based on penalty3 */ + /* note: the outer 2 loops jointly have at most n iterations, thus + the worst-case behavior here is quadratic. In practice, it is + close to linear since the inner loop tends to be short. */ + pen[0]=0; + for (j=1; j<=m; j++) { + for (i=seg1[j]; i<=seg0[j]; i++) { + best = -1; + for (k=seg0[j-1]; k>=clip1[i]; k--) { + thispen = penalty3(pp, k, i) + pen[k]; + if (best < 0 || thispen < best) { + prev[i] = k; + best = thispen; + } + } + pen[i] = best; } - - free(pen); - free(prev); - free(clip0); - free(clip1); - free(seg0); - free(seg1); - return 0; - -malloc_error: - free(pen); - free(prev); - free(clip0); - free(clip1); - free(seg0); - free(seg1); - return 1; + } + + pp->m = m; + SAFE_MALLOC(pp->po, m, int); + + /* read off shortest path */ + for (i=n, j=m-1; i>0; j--) { + i = prev[i]; + pp->po[j] = i; + } + + free(pen); + free(prev); + free(clip0); + free(clip1); + free(seg0); + free(seg1); + return 0; + + malloc_error: + free(pen); + free(prev); + free(clip0); + free(clip1); + free(seg0); + free(seg1); + return 1; } /* ---------------------------------------------------------------------- */ @@ -648,269 +638,266 @@ malloc_error: if it lies outside. Return 1 with errno set on error; 0 on success. */ -static int adjust_vertices(privpath_t *pp) -{ - int m = pp->m; - int *po = pp->po; - int n = pp->len; - point_t *pt = pp->pt; - int x0 = pp->x0; - int y0 = pp->y0; - - dpoint_t *ctr = NULL; /* ctr[m] */ - dpoint_t *dir = NULL; /* dir[m] */ - quadform_t *q = NULL; /* q[m] */ - double v[3]; - double d; - int i, j, k, l; - dpoint_t s; - int r; - - SAFE_MALLOC(ctr, m, dpoint_t); - SAFE_MALLOC(dir, m, dpoint_t); - SAFE_MALLOC(q, m, quadform_t); - - r = privcurve_init(&pp->curve, m); - if (r) { - goto malloc_error; - } - - /* calculate "optimal" point-slope representation for each line - segment */ - for (i = 0; i < m; i++) { - j = po[mod(i + 1, m)]; - j = mod(j - po[i], n) + po[i]; - pointslope(pp, po[i], j, &ctr[i], &dir[i]); +static int adjust_vertices(privpath_t *pp) { + int m = pp->m; + int *po = pp->po; + int n = pp->len; + point_t *pt = pp->pt; + int x0 = pp->x0; + int y0 = pp->y0; + + dpoint_t *ctr = NULL; /* ctr[m] */ + dpoint_t *dir = NULL; /* dir[m] */ + quadform_t *q = NULL; /* q[m] */ + double v[3]; + double d; + int i, j, k, l; + dpoint_t s; + int r; + + SAFE_MALLOC(ctr, m, dpoint_t); + SAFE_MALLOC(dir, m, dpoint_t); + SAFE_MALLOC(q, m, quadform_t); + + r = privcurve_init(&pp->curve, m); + if (r) { + goto malloc_error; + } + + /* calculate "optimal" point-slope representation for each line + segment */ + for (i=0; i<m; i++) { + j = po[mod(i+1,m)]; + j = mod(j-po[i],n)+po[i]; + pointslope(pp, po[i], j, &ctr[i], &dir[i]); + } + + /* represent each line segment as a singular quadratic form; the + distance of a point (x,y) from the line segment will be + (x,y,1)Q(x,y,1)^t, where Q=q[i]. */ + for (i=0; i<m; i++) { + d = sq(dir[i].x) + sq(dir[i].y); + if (d == 0.0) { + for (j=0; j<3; j++) { + for (k=0; k<3; k++) { + q[i][j][k] = 0; + } + } + } else { + v[0] = dir[i].y; + v[1] = -dir[i].x; + v[2] = - v[1] * ctr[i].y - v[0] * ctr[i].x; + for (l=0; l<3; l++) { + for (k=0; k<3; k++) { + q[i][l][k] = v[l] * v[k] / d; + } + } } - - /* represent each line segment as a singular quadratic form; the - distance of a point (x,y) from the line segment will be - (x,y,1)Q(x,y,1)^t, where Q=q[i]. */ - for (i = 0; i < m; i++) { - d = sq(dir[i].x) + sq(dir[i].y); - if (d == 0.0) { - for (j = 0; j < 3; j++) { - for (k = 0; k < 3; k++) { - q[i][j][k] = 0; - } - } - } else { - v[0] = dir[i].y; - v[1] = -dir[i].x; - v[2] = -v[1] * ctr[i].y - v[0] * ctr[i].x; - for (l = 0; l < 3; l++) { - for (k = 0; k < 3; k++) { - q[i][l][k] = v[l] * v[k] / d; - } - } - } + } + + /* now calculate the "intersections" of consecutive segments. + Instead of using the actual intersection, we find the point + within a given unit square which minimizes the square distance to + the two lines. */ + for (i=0; i<m; i++) { + quadform_t Q; + dpoint_t w; + double dx, dy; + double det; + double min, cand; /* minimum and candidate for minimum of quad. form */ + double xmin, ymin; /* coordinates of minimum */ + int z; + + /* let s be the vertex, in coordinates relative to x0/y0 */ + s.x = pt[po[i]].x-x0; + s.y = pt[po[i]].y-y0; + + /* intersect segments i-1 and i */ + + j = mod(i-1,m); + + /* add quadratic forms */ + for (l=0; l<3; l++) { + for (k=0; k<3; k++) { + Q[l][k] = q[j][l][k] + q[i][l][k]; + } } - - /* now calculate the "intersections" of consecutive segments. - Instead of using the actual intersection, we find the point - within a given unit square which minimizes the square distance to - the two lines. */ - for (i = 0; i < m; i++) { - quadform_t Q; - dpoint_t w; - double dx, dy; - double det; - double min, cand; /* minimum and candidate for minimum of quad. form */ - double xmin, ymin; /* coordinates of minimum */ - int z; - - /* let s be the vertex, in coordinates relative to x0/y0 */ - s.x = pt[po[i]].x - x0; - s.y = pt[po[i]].y - y0; - - /* intersect segments i-1 and i */ - - j = mod(i - 1, m); - - /* add quadratic forms */ - for (l = 0; l < 3; l++) { - for (k = 0; k < 3; k++) { - Q[l][k] = q[j][l][k] + q[i][l][k]; - } - } - - while (1) { -/* minimize the quadratic form Q on the unit square */ -/* find intersection */ + + while(1) { + /* minimize the quadratic form Q on the unit square */ + /* find intersection */ #ifdef HAVE_GCC_LOOP_BUG - /* work around gcc bug #12243 */ - free(NULL); + /* work around gcc bug #12243 */ + free(NULL); #endif - - det = Q[0][0] * Q[1][1] - Q[0][1] * Q[1][0]; - if (det != 0.0) { - w.x = (-Q[0][2] * Q[1][1] + Q[1][2] * Q[0][1]) / det; - w.y = (Q[0][2] * Q[1][0] - Q[1][2] * Q[0][0]) / det; - break; - } - - /* matrix is singular - lines are parallel. Add another, - orthogonal axis, through the center of the unit square */ - if (Q[0][0] > Q[1][1]) { - v[0] = -Q[0][1]; - v[1] = Q[0][0]; - } else if (Q[1][1]) { - v[0] = -Q[1][1]; - v[1] = Q[1][0]; - } else { - v[0] = 1; - v[1] = 0; - } - d = sq(v[0]) + sq(v[1]); - v[2] = -v[1] * s.y - v[0] * s.x; - for (l = 0; l < 3; l++) { - for (k = 0; k < 3; k++) { - Q[l][k] += v[l] * v[k] / d; - } - } - } - dx = fabs(w.x - s.x); - dy = fabs(w.y - s.y); - if (dx <= .5 && dy <= .5) { - pp->curve.vertex[i].x = w.x + x0; - pp->curve.vertex[i].y = w.y + y0; - continue; - } - - /* the minimum was not in the unit square; now minimize quadratic - on boundary of square */ - min = quadform(Q, s); - xmin = s.x; - ymin = s.y; - - if (Q[0][0] == 0.0) { - goto fixx; - } - for (z = 0; z < 2; z++) { /* value of the y-coordinate */ - w.y = s.y - 0.5 + z; - w.x = -(Q[0][1] * w.y + Q[0][2]) / Q[0][0]; - dx = fabs(w.x - s.x); - cand = quadform(Q, w); - if (dx <= .5 && cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - fixx: - if (Q[1][1] == 0.0) { - goto corners; - } - for (z = 0; z < 2; z++) { /* value of the x-coordinate */ - w.x = s.x - 0.5 + z; - w.y = -(Q[1][0] * w.x + Q[1][2]) / Q[1][1]; - dy = fabs(w.y - s.y); - cand = quadform(Q, w); - if (dy <= .5 && cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - corners: - /* check four corners */ - for (l = 0; l < 2; l++) { - for (k = 0; k < 2; k++) { - w.x = s.x - 0.5 + l; - w.y = s.y - 0.5 + k; - cand = quadform(Q, w); - if (cand < min) { - min = cand; - xmin = w.x; - ymin = w.y; - } - } - } - - pp->curve.vertex[i].x = xmin + x0; - pp->curve.vertex[i].y = ymin + y0; - continue; + + det = Q[0][0]*Q[1][1] - Q[0][1]*Q[1][0]; + if (det != 0.0) { + w.x = (-Q[0][2]*Q[1][1] + Q[1][2]*Q[0][1]) / det; + w.y = ( Q[0][2]*Q[1][0] - Q[1][2]*Q[0][0]) / det; + break; + } + + /* matrix is singular - lines are parallel. Add another, + orthogonal axis, through the center of the unit square */ + if (Q[0][0]>Q[1][1]) { + v[0] = -Q[0][1]; + v[1] = Q[0][0]; + } else if (Q[1][1]) { + v[0] = -Q[1][1]; + v[1] = Q[1][0]; + } else { + v[0] = 1; + v[1] = 0; + } + d = sq(v[0]) + sq(v[1]); + v[2] = - v[1] * s.y - v[0] * s.x; + for (l=0; l<3; l++) { + for (k=0; k<3; k++) { + Q[l][k] += v[l] * v[k] / d; + } + } + } + dx = fabs(w.x-s.x); + dy = fabs(w.y-s.y); + if (dx <= .5 && dy <= .5) { + pp->curve.vertex[i].x = w.x+x0; + pp->curve.vertex[i].y = w.y+y0; + continue; } - free(ctr); - free(dir); - free(q); - return 0; + /* the minimum was not in the unit square; now minimize quadratic + on boundary of square */ + min = quadform(Q, s); + xmin = s.x; + ymin = s.y; -malloc_error: - free(ctr); - free(dir); - free(q); - return 1; + if (Q[0][0] == 0.0) { + goto fixx; + } + for (z=0; z<2; z++) { /* value of the y-coordinate */ + w.y = s.y-0.5+z; + w.x = - (Q[0][1] * w.y + Q[0][2]) / Q[0][0]; + dx = fabs(w.x-s.x); + cand = quadform(Q, w); + if (dx <= .5 && cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + fixx: + if (Q[1][1] == 0.0) { + goto corners; + } + for (z=0; z<2; z++) { /* value of the x-coordinate */ + w.x = s.x-0.5+z; + w.y = - (Q[1][0] * w.x + Q[1][2]) / Q[1][1]; + dy = fabs(w.y-s.y); + cand = quadform(Q, w); + if (dy <= .5 && cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + corners: + /* check four corners */ + for (l=0; l<2; l++) { + for (k=0; k<2; k++) { + w.x = s.x-0.5+l; + w.y = s.y-0.5+k; + cand = quadform(Q, w); + if (cand < min) { + min = cand; + xmin = w.x; + ymin = w.y; + } + } + } + + pp->curve.vertex[i].x = xmin + x0; + pp->curve.vertex[i].y = ymin + y0; + continue; + } + + free(ctr); + free(dir); + free(q); + return 0; + + malloc_error: + free(ctr); + free(dir); + free(q); + return 1; } /* ---------------------------------------------------------------------- */ /* Stage 4: smoothing and corner analysis (Sec. 2.3.3) */ /* reverse orientation of a path */ -static void reverse(privcurve_t *curve) -{ - int m = curve->n; - int i, j; - dpoint_t tmp; - - for (i = 0, j = m - 1; i < j; i++, j--) { - tmp = curve->vertex[i]; - curve->vertex[i] = curve->vertex[j]; - curve->vertex[j] = tmp; - } +static void reverse(privcurve_t *curve) { + int m = curve->n; + int i, j; + dpoint_t tmp; + + for (i=0, j=m-1; i<j; i++, j--) { + tmp = curve->vertex[i]; + curve->vertex[i] = curve->vertex[j]; + curve->vertex[j] = tmp; + } } /* Always succeeds */ -static void smooth(privcurve_t *curve, double alphamax) -{ - int m = curve->n; - - int i, j, k; - double dd, denom, alpha; - dpoint_t p2, p3, p4; - - /* examine each vertex and find its best fit */ - for (i = 0; i < m; i++) { - j = mod(i + 1, m); - k = mod(i + 2, m); - p4 = interval(1 / 2.0, curve->vertex[k], curve->vertex[j]); - - denom = ddenom(curve->vertex[i], curve->vertex[k]); - if (denom != 0.0) { - dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom; - dd = fabs(dd); - alpha = dd > 1 ? (1 - 1.0 / dd) : 0; - alpha = alpha / 0.75; - } else { - alpha = 4 / 3.0; - } - curve->alpha0[j] = alpha; /* remember "original" value of alpha */ - - if (alpha > alphamax) { /* pointed corner */ - curve->tag[j] = POTRACE_CORNER; - curve->c[j][1] = curve->vertex[j]; - curve->c[j][2] = p4; - } else { - if (alpha < 0.55) { - alpha = 0.55; - } else if (alpha > 1) { - alpha = 1; - } - p2 = interval(.5 + .5 * alpha, curve->vertex[i], curve->vertex[j]); - p3 = interval(.5 + .5 * alpha, curve->vertex[k], curve->vertex[j]); - curve->tag[j] = POTRACE_CURVETO; - curve->c[j][0] = p2; - curve->c[j][1] = p3; - curve->c[j][2] = p4; - } - curve->alpha[j] = alpha; /* store the "cropped" value of alpha */ - curve->beta[j] = 0.5; +static void smooth(privcurve_t *curve, double alphamax) { + int m = curve->n; + + int i, j, k; + double dd, denom, alpha; + dpoint_t p2, p3, p4; + + /* examine each vertex and find its best fit */ + for (i=0; i<m; i++) { + j = mod(i+1, m); + k = mod(i+2, m); + p4 = interval(1/2.0, curve->vertex[k], curve->vertex[j]); + + denom = ddenom(curve->vertex[i], curve->vertex[k]); + if (denom != 0.0) { + dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom; + dd = fabs(dd); + alpha = dd>1 ? (1 - 1.0/dd) : 0; + alpha = alpha / 0.75; + } else { + alpha = 4/3.0; + } + curve->alpha0[j] = alpha; /* remember "original" value of alpha */ + + if (alpha > alphamax) { /* pointed corner */ + curve->tag[j] = POTRACE_CORNER; + curve->c[j][1] = curve->vertex[j]; + curve->c[j][2] = p4; + } else { + if (alpha < 0.55) { + alpha = 0.55; + } else if (alpha > 1) { + alpha = 1; + } + p2 = interval(.5+.5*alpha, curve->vertex[i], curve->vertex[j]); + p3 = interval(.5+.5*alpha, curve->vertex[k], curve->vertex[j]); + curve->tag[j] = POTRACE_CURVETO; + curve->c[j][0] = p2; + curve->c[j][1] = p3; + curve->c[j][2] = p4; } - curve->alphacurve = 1; + curve->alpha[j] = alpha; /* store the "cropped" value of alpha */ + curve->beta[j] = 0.5; + } + curve->alphacurve = 1; - return; + return; } /* ---------------------------------------------------------------------- */ @@ -918,349 +905,341 @@ static void smooth(privcurve_t *curve, double alphamax) /* a private type for the result of opti_penalty */ struct opti_s { - double pen; /* penalty */ - dpoint_t c[2]; /* curve parameters */ - double t, s; /* curve parameters */ - double alpha; /* curve parameter */ + double pen; /* penalty */ + dpoint_t c[2]; /* curve parameters */ + double t, s; /* curve parameters */ + double alpha; /* curve parameter */ }; typedef struct opti_s opti_t; /* calculate best fit from i+.5 to j+.5. Assume i<j (cyclically). Return 0 and set badness and parameters (alpha, beta), if possible. Return 1 if impossible. */ -static int opti_penalty(privpath_t *pp, int i, int j, opti_t *res, double opttolerance, int *convc, double *areac) -{ - int m = pp->curve.n; - int k, k1, k2, conv, i1; - double area, alpha, d, d1, d2; - dpoint_t p0, p1, p2, p3, pt; - double A, R, A1, A2, A3, A4; - double s, t; +static int opti_penalty(privpath_t *pp, int i, int j, opti_t *res, double opttolerance, int *convc, double *areac) { + int m = pp->curve.n; + int k, k1, k2, conv, i1; + double area, alpha, d, d1, d2; + dpoint_t p0, p1, p2, p3, pt; + double A, R, A1, A2, A3, A4; + double s, t; - /* check convexity, corner-freeness, and maximum bend < 179 degrees */ + /* check convexity, corner-freeness, and maximum bend < 179 degrees */ - if (i == j) { /* sanity - a full loop can never be an opticurve */ - return 1; - } + if (i==j) { /* sanity - a full loop can never be an opticurve */ + return 1; + } - k = i; - i1 = mod(i + 1, m); - k1 = mod(k + 1, m); - conv = convc[k1]; - if (conv == 0) { - return 1; + k = i; + i1 = mod(i+1, m); + k1 = mod(k+1, m); + conv = convc[k1]; + if (conv == 0) { + return 1; + } + d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]); + for (k=k1; k!=j; k=k1) { + k1 = mod(k+1, m); + k2 = mod(k+2, m); + if (convc[k1] != conv) { + return 1; } - d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]); - for (k = k1; k != j; k = k1) { - k1 = mod(k + 1, m); - k2 = mod(k + 2, m); - if (convc[k1] != conv) { - return 1; - } - if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != - conv) { - return 1; - } - if (iprod1(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2]) < - d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) { - return 1; - } + if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != conv) { + return 1; } - - /* the curve we're working in: */ - p0 = pp->curve.c[mod(i, m)][2]; - p1 = pp->curve.vertex[mod(i + 1, m)]; - p2 = pp->curve.vertex[mod(j, m)]; - p3 = pp->curve.c[mod(j, m)][2]; - - /* determine its area */ - area = areac[j] - areac[i]; - area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2]) / 2; - if (i >= j) { - area += areac[m]; + if (iprod1(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2]) < d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) { + return 1; } + } + + /* the curve we're working in: */ + p0 = pp->curve.c[mod(i,m)][2]; + p1 = pp->curve.vertex[mod(i+1,m)]; + p2 = pp->curve.vertex[mod(j,m)]; + p3 = pp->curve.c[mod(j,m)][2]; + + /* determine its area */ + area = areac[j] - areac[i]; + area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2])/2; + if (i>=j) { + area += areac[m]; + } + + /* find intersection o of p0p1 and p2p3. Let t,s such that o = + interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the + triangle (p0,o,p3). */ + + A1 = dpara(p0, p1, p2); + A2 = dpara(p0, p1, p3); + A3 = dpara(p0, p2, p3); + /* A4 = dpara(p1, p2, p3); */ + A4 = A1+A3-A2; + + if (A2 == A1) { /* this should never happen */ + return 1; + } - /* find intersection o of p0p1 and p2p3. Let t,s such that o = - interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the - triangle (p0,o,p3). */ + t = A3/(A3-A4); + s = A2/(A2-A1); + A = A2 * t / 2.0; + + if (A == 0.0) { /* this should never happen */ + return 1; + } - A1 = dpara(p0, p1, p2); - A2 = dpara(p0, p1, p3); - A3 = dpara(p0, p2, p3); - /* A4 = dpara(p1, p2, p3); */ - A4 = A1 + A3 - A2; + R = area / A; /* relative area */ + alpha = 2 - sqrt(4 - R / 0.3); /* overall alpha for p0-o-p3 curve */ - if (A2 == A1) { /* this should never happen */ - return 1; - } + res->c[0] = interval(t * alpha, p0, p1); + res->c[1] = interval(s * alpha, p3, p2); + res->alpha = alpha; + res->t = t; + res->s = s; - t = A3 / (A3 - A4); - s = A2 / (A2 - A1); - A = A2 * t / 2.0; + p1 = res->c[0]; + p2 = res->c[1]; /* the proposed curve is now (p0,p1,p2,p3) */ - if (A == 0.0) { /* this should never happen */ - return 1; - } + res->pen = 0; - R = area / A; /* relative area */ - alpha = 2 - sqrt(4 - R / 0.3); /* overall alpha for p0-o-p3 curve */ - - res->c[0] = interval(t * alpha, p0, p1); - res->c[1] = interval(s * alpha, p3, p2); - res->alpha = alpha; - res->t = t; - res->s = s; - - p1 = res->c[0]; - p2 = res->c[1]; /* the proposed curve is now (p0,p1,p2,p3) */ - - res->pen = 0; - - /* calculate penalty */ - /* check tangency with edges */ - for (k = mod(i + 1, m); k != j; k = k1) { - k1 = mod(k + 1, m); - t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]); - if (t < -.5) { - return 1; - } - pt = bezier(t, p0, p1, p2, p3); - d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]); - if (d == 0.0) { /* this should never happen */ - return 1; - } - d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d; - if (fabs(d1) > opttolerance) { - return 1; - } - if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || - iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) { - return 1; - } - res->pen += sq(d1); + /* calculate penalty */ + /* check tangency with edges */ + for (k=mod(i+1,m); k!=j; k=k1) { + k1 = mod(k+1,m); + t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]); + if (t<-.5) { + return 1; } - - /* check corners */ - for (k = i; k != j; k = k1) { - k1 = mod(k + 1, m); - t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]); - if (t < -.5) { - return 1; - } - pt = bezier(t, p0, p1, p2, p3); - d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]); - if (d == 0.0) { /* this should never happen */ - return 1; - } - d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d; - d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d; - d2 *= 0.75 * pp->curve.alpha[k1]; - if (d2 < 0) { - d1 = -d1; - d2 = -d2; - } - if (d1 < d2 - opttolerance) { - return 1; - } - if (d1 < d2) { - res->pen += sq(d1 - d2); - } + pt = bezier(t, p0, p1, p2, p3); + d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]); + if (d == 0.0) { /* this should never happen */ + return 1; } + d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d; + if (fabs(d1) > opttolerance) { + return 1; + } + if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) { + return 1; + } + res->pen += sq(d1); + } + + /* check corners */ + for (k=i; k!=j; k=k1) { + k1 = mod(k+1,m); + t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]); + if (t<-.5) { + return 1; + } + pt = bezier(t, p0, p1, p2, p3); + d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]); + if (d == 0.0) { /* this should never happen */ + return 1; + } + d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d; + d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d; + d2 *= 0.75 * pp->curve.alpha[k1]; + if (d2 < 0) { + d1 = -d1; + d2 = -d2; + } + if (d1 < d2 - opttolerance) { + return 1; + } + if (d1 < d2) { + res->pen += sq(d1 - d2); + } + } - return 0; + return 0; } /* optimize the path p, replacing sequences of Bezier segments by a single segment when possible. Return 0 on success, 1 with errno set on failure. */ -static int opticurve(privpath_t *pp, double opttolerance) -{ - int m = pp->curve.n; - int *pt = NULL; /* pt[m+1] */ - double *pen = NULL; /* pen[m+1] */ - int *len = NULL; /* len[m+1] */ - opti_t *opt = NULL; /* opt[m+1] */ - int om; - int i, j, r; - opti_t o; - dpoint_t p0; - int i1; - double area; - double alpha; - double *s = NULL; - double *t = NULL; - - int *convc = NULL; /* conv[m]: pre-computed convexities */ - double *areac = NULL; /* cumarea[m+1]: cache for fast area computation */ - - SAFE_MALLOC(pt, m + 1, int); - SAFE_MALLOC(pen, m + 1, double); - SAFE_MALLOC(len, m + 1, int); - SAFE_MALLOC(opt, m + 1, opti_t); - SAFE_MALLOC(convc, m, int); - SAFE_MALLOC(areac, m + 1, double); - - /* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */ - for (i = 0; i < m; i++) { - if (pp->curve.tag[i] == POTRACE_CURVETO) { - convc[i] = - sign(dpara(pp->curve.vertex[mod(i - 1, m)], pp->curve.vertex[i], pp->curve.vertex[mod(i + 1, m)])); - } else { - convc[i] = 0; - } - } - - /* pre-calculate areas */ - area = 0.0; - areac[0] = 0.0; - p0 = pp->curve.vertex[0]; - for (i = 0; i < m; i++) { - i1 = mod(i + 1, m); - if (pp->curve.tag[i1] == POTRACE_CURVETO) { - alpha = pp->curve.alpha[i1]; - area += 0.3 * alpha * (4 - alpha) * dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2]) / 2; - area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2]) / 2; - } - areac[i + 1] = area; - } - - pt[0] = -1; - pen[0] = 0; - len[0] = 0; - - /* Fixme: we always start from a fixed point -- should find the best - curve cyclically */ - - for (j = 1; j <= m; j++) { - /* calculate best path from 0 to j */ - pt[j] = j - 1; - pen[j] = pen[j - 1]; - len[j] = len[j - 1] + 1; - - for (i = j - 2; i >= 0; i--) { - r = opti_penalty(pp, i, mod(j, m), &o, opttolerance, convc, areac); - if (r) { - break; - } - if (len[j] > len[i] + 1 || (len[j] == len[i] + 1 && pen[j] > pen[i] + o.pen)) { - pt[j] = i; - pen[j] = pen[i] + o.pen; - len[j] = len[i] + 1; - opt[j] = o; - } - } +static int opticurve(privpath_t *pp, double opttolerance) { + int m = pp->curve.n; + int *pt = NULL; /* pt[m+1] */ + double *pen = NULL; /* pen[m+1] */ + int *len = NULL; /* len[m+1] */ + opti_t *opt = NULL; /* opt[m+1] */ + int om; + int i,j,r; + opti_t o; + dpoint_t p0; + int i1; + double area; + double alpha; + double *s = NULL; + double *t = NULL; + + int *convc = NULL; /* conv[m]: pre-computed convexities */ + double *areac = NULL; /* cumarea[m+1]: cache for fast area computation */ + + SAFE_MALLOC(pt, m+1, int); + SAFE_MALLOC(pen, m+1, double); + SAFE_MALLOC(len, m+1, int); + SAFE_MALLOC(opt, m+1, opti_t); + SAFE_MALLOC(convc, m, int); + SAFE_MALLOC(areac, m+1, double); + + /* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */ + for (i=0; i<m; i++) { + if (pp->curve.tag[i] == POTRACE_CURVETO) { + convc[i] = sign(dpara(pp->curve.vertex[mod(i-1,m)], pp->curve.vertex[i], pp->curve.vertex[mod(i+1,m)])); + } else { + convc[i] = 0; } - om = len[m]; - r = privcurve_init(&pp->ocurve, om); - if (r) { - goto malloc_error; + } + + /* pre-calculate areas */ + area = 0.0; + areac[0] = 0.0; + p0 = pp->curve.vertex[0]; + for (i=0; i<m; i++) { + i1 = mod(i+1, m); + if (pp->curve.tag[i1] == POTRACE_CURVETO) { + alpha = pp->curve.alpha[i1]; + area += 0.3*alpha*(4-alpha)*dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2])/2; + area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2])/2; } - SAFE_MALLOC(s, om, double); - SAFE_MALLOC(t, om, double); - - j = m; - for (i = om - 1; i >= 0; i--) { - if (pt[j] == j - 1) { - pp->ocurve.tag[i] = pp->curve.tag[mod(j, m)]; - pp->ocurve.c[i][0] = pp->curve.c[mod(j, m)][0]; - pp->ocurve.c[i][1] = pp->curve.c[mod(j, m)][1]; - pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2]; - pp->ocurve.vertex[i] = pp->curve.vertex[mod(j, m)]; - pp->ocurve.alpha[i] = pp->curve.alpha[mod(j, m)]; - pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j, m)]; - pp->ocurve.beta[i] = pp->curve.beta[mod(j, m)]; - s[i] = t[i] = 1.0; - } else { - pp->ocurve.tag[i] = POTRACE_CURVETO; - pp->ocurve.c[i][0] = opt[j].c[0]; - pp->ocurve.c[i][1] = opt[j].c[1]; - pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2]; - pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j, m)][2], pp->curve.vertex[mod(j, m)]); - pp->ocurve.alpha[i] = opt[j].alpha; - pp->ocurve.alpha0[i] = opt[j].alpha; - s[i] = opt[j].s; - t[i] = opt[j].t; - } - j = pt[j]; + areac[i+1] = area; + } + + pt[0] = -1; + pen[0] = 0; + len[0] = 0; + + /* Fixme: we always start from a fixed point -- should find the best + curve cyclically */ + + for (j=1; j<=m; j++) { + /* calculate best path from 0 to j */ + pt[j] = j-1; + pen[j] = pen[j-1]; + len[j] = len[j-1]+1; + + for (i=j-2; i>=0; i--) { + r = opti_penalty(pp, i, mod(j,m), &o, opttolerance, convc, areac); + if (r) { + break; + } + if (len[j] > len[i]+1 || (len[j] == len[i]+1 && pen[j] > pen[i] + o.pen)) { + pt[j] = i; + pen[j] = pen[i] + o.pen; + len[j] = len[i] + 1; + opt[j] = o; + } } - - /* calculate beta parameters */ - for (i = 0; i < om; i++) { - i1 = mod(i + 1, om); - pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]); + } + om = len[m]; + r = privcurve_init(&pp->ocurve, om); + if (r) { + goto malloc_error; + } + SAFE_MALLOC(s, om, double); + SAFE_MALLOC(t, om, double); + + j = m; + for (i=om-1; i>=0; i--) { + if (pt[j]==j-1) { + pp->ocurve.tag[i] = pp->curve.tag[mod(j,m)]; + pp->ocurve.c[i][0] = pp->curve.c[mod(j,m)][0]; + pp->ocurve.c[i][1] = pp->curve.c[mod(j,m)][1]; + pp->ocurve.c[i][2] = pp->curve.c[mod(j,m)][2]; + pp->ocurve.vertex[i] = pp->curve.vertex[mod(j,m)]; + pp->ocurve.alpha[i] = pp->curve.alpha[mod(j,m)]; + pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j,m)]; + pp->ocurve.beta[i] = pp->curve.beta[mod(j,m)]; + s[i] = t[i] = 1.0; + } else { + pp->ocurve.tag[i] = POTRACE_CURVETO; + pp->ocurve.c[i][0] = opt[j].c[0]; + pp->ocurve.c[i][1] = opt[j].c[1]; + pp->ocurve.c[i][2] = pp->curve.c[mod(j,m)][2]; + pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j,m)][2], pp->curve.vertex[mod(j,m)]); + pp->ocurve.alpha[i] = opt[j].alpha; + pp->ocurve.alpha0[i] = opt[j].alpha; + s[i] = opt[j].s; + t[i] = opt[j].t; } - pp->ocurve.alphacurve = 1; - - free(pt); - free(pen); - free(len); - free(opt); - free(s); - free(t); - free(convc); - free(areac); - return 0; - -malloc_error: - free(pt); - free(pen); - free(len); - free(opt); - free(s); - free(t); - free(convc); - free(areac); - return 1; + j = pt[j]; + } + + /* calculate beta parameters */ + for (i=0; i<om; i++) { + i1 = mod(i+1,om); + pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]); + } + pp->ocurve.alphacurve = 1; + + free(pt); + free(pen); + free(len); + free(opt); + free(s); + free(t); + free(convc); + free(areac); + return 0; + + malloc_error: + free(pt); + free(pen); + free(len); + free(opt); + free(s); + free(t); + free(convc); + free(areac); + return 1; } /* ---------------------------------------------------------------------- */ -#define TRY(x) \ - if (x) \ - goto try_error +#define TRY(x) if (x) goto try_error /* return 0 on success, 1 on error with errno set. */ -int process_path(path_t *plist, const potrace_param_t *param, progress_t *progress) -{ - path_t *p; - double nn = 0, cn = 0; - - if (progress->callback) { - /* precompute task size for progress estimates */ - nn = 0; - list_forall(p, plist) { nn += p->priv->len; } - cn = 0; +int process_path(path_t *plist, const potrace_param_t *param, progress_t *progress) { + path_t *p; + double nn = 0, cn = 0; + + if (progress->callback) { + /* precompute task size for progress estimates */ + nn = 0; + list_forall (p, plist) { + nn += p->priv->len; + } + cn = 0; + } + + /* call downstream function with each path */ + list_forall (p, plist) { + TRY(calc_sums(p->priv)); + TRY(calc_lon(p->priv)); + TRY(bestpolygon(p->priv)); + TRY(adjust_vertices(p->priv)); + if (p->sign == '-') { /* reverse orientation of negative paths */ + reverse(&p->priv->curve); } + smooth(&p->priv->curve, param->alphamax); + if (param->opticurve) { + TRY(opticurve(p->priv, param->opttolerance)); + p->priv->fcurve = &p->priv->ocurve; + } else { + p->priv->fcurve = &p->priv->curve; + } + privcurve_to_curve(p->priv->fcurve, &p->curve); - /* call downstream function with each path */ - list_forall(p, plist) - { - TRY(calc_sums(p->priv)); - TRY(calc_lon(p->priv)); - TRY(bestpolygon(p->priv)); - TRY(adjust_vertices(p->priv)); - if (p->sign == '-') { /* reverse orientation of negative paths */ - reverse(&p->priv->curve); - } - smooth(&p->priv->curve, param->alphamax); - if (param->opticurve) { - TRY(opticurve(p->priv, param->opttolerance)); - p->priv->fcurve = &p->priv->ocurve; - } else { - p->priv->fcurve = &p->priv->curve; - } - privcurve_to_curve(p->priv->fcurve, &p->curve); - - if (progress->callback) { - cn += p->priv->len; - progress_update(cn / nn, progress); - } + if (progress->callback) { + cn += p->priv->len; + progress_update(cn/nn, progress); } + } - progress_update(1.0, progress); + progress_update(1.0, progress); - return 0; + return 0; -try_error: - return 1; + try_error: + return 1; } -- cgit v1.2.3 From ab266fd1410da5e2606b88dcea5263c098d9b052 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 13:23:16 +0200 Subject: Add Jenkins build scripts (bzr r13341.1.273) --- jenkins/jenkins-gtk2.sh | 8 ++++++++ jenkins/jenkins-scanbuild.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 jenkins/jenkins-gtk2.sh create mode 100644 jenkins/jenkins-scanbuild.sh diff --git a/jenkins/jenkins-gtk2.sh b/jenkins/jenkins-gtk2.sh new file mode 100644 index 000000000..4428c4d75 --- /dev/null +++ b/jenkins/jenkins-gtk2.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# This script is called by Jenkins in the scheduled gtk2 job + +./autogen.sh +./configure +make clean +make diff --git a/jenkins/jenkins-scanbuild.sh b/jenkins/jenkins-scanbuild.sh new file mode 100644 index 000000000..b414e4aeb --- /dev/null +++ b/jenkins/jenkins-scanbuild.sh @@ -0,0 +1,42 @@ +./autogen.sh +./configure +make clean + +# do not exit immediately if any command fails +set +e + +# temp directory to store the scan-build report +SCAN_BUILD_TMPDIR=$( mktemp -d /tmp/scan-build.XXXXXX ) + +# directory to use for archiving the scan-build report +SCAN_BUILD_ARCHIVE="${WORKSPACE}/scan-build-archive" + +# generate the scan-build report +scan-build -k -o ${SCAN_BUILD_TMPDIR} make + +# get the directory name of the report created by scan-build +SCAN_BUILD_REPORT=$( find ${SCAN_BUILD_TMPDIR} -maxdepth 1 -not -empty -not -name `basename ${SCAN_BUILD_TMPDIR}` ) +rc=$? + +if [ -z "${SCAN_BUILD_REPORT}" ]; then + echo ">>> No new bugs identified." + echo ">>> No scan-build report has been generated" +else + echo ">>> New scan-build report generated in ${SCAN_BUILD_REPORT}" + + if [ ! -d "${SCAN_BUILD_ARCHIVE}" ]; then + echo ">>> Creating scan-build archive directory" + install -d -o jenkins -g jenkins -m 0755 "${SCAN_BUILD_ARCHIVE}" + else + echo ">>> Removing any previous scan-build reports from ${SCAN_BUILD_ARCHIVE}" + rm -f "${SCAN_BUILD_ARCHIVE}/*" + fi + + echo ">>> Archiving scan-build report to ${SCAN_BUILD_ARCHIVE}" + mv ${SCAN_BUILD_REPORT}/* "${SCAN_BUILD_ARCHIVE}/" + + echo ">>> Removing any temporary files and directories" + rm -rf "${SCAN_BUILD_TMPDIR}" +fi + +exit ${rc} -- cgit v1.2.3 From 1603dba215787d269bca3e1d1ef9865fc918de35 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 13:40:51 +0200 Subject: modify Jenkins scan-build script to output the results to the directory that the Publish Clang Scan-Build Results plugin expects. (bzr r13341.1.274) --- jenkins/jenkins-scanbuild.sh | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/jenkins/jenkins-scanbuild.sh b/jenkins/jenkins-scanbuild.sh index b414e4aeb..492cefead 100644 --- a/jenkins/jenkins-scanbuild.sh +++ b/jenkins/jenkins-scanbuild.sh @@ -5,38 +5,9 @@ make clean # do not exit immediately if any command fails set +e -# temp directory to store the scan-build report -SCAN_BUILD_TMPDIR=$( mktemp -d /tmp/scan-build.XXXXXX ) - -# directory to use for archiving the scan-build report -SCAN_BUILD_ARCHIVE="${WORKSPACE}/scan-build-archive" +# directory to use for storing the scan-build report, this is where the Publish Clang Scan-Build Results plugin checks +SCAN_BUILD_OUTPUTDIR="${WORKSPACE}/clangScanBuildReports" # generate the scan-build report -scan-build -k -o ${SCAN_BUILD_TMPDIR} make - -# get the directory name of the report created by scan-build -SCAN_BUILD_REPORT=$( find ${SCAN_BUILD_TMPDIR} -maxdepth 1 -not -empty -not -name `basename ${SCAN_BUILD_TMPDIR}` ) -rc=$? - -if [ -z "${SCAN_BUILD_REPORT}" ]; then - echo ">>> No new bugs identified." - echo ">>> No scan-build report has been generated" -else - echo ">>> New scan-build report generated in ${SCAN_BUILD_REPORT}" +scan-build -k -o ${SCAN_BUILD_OUTPUTDIR} make - if [ ! -d "${SCAN_BUILD_ARCHIVE}" ]; then - echo ">>> Creating scan-build archive directory" - install -d -o jenkins -g jenkins -m 0755 "${SCAN_BUILD_ARCHIVE}" - else - echo ">>> Removing any previous scan-build reports from ${SCAN_BUILD_ARCHIVE}" - rm -f "${SCAN_BUILD_ARCHIVE}/*" - fi - - echo ">>> Archiving scan-build report to ${SCAN_BUILD_ARCHIVE}" - mv ${SCAN_BUILD_REPORT}/* "${SCAN_BUILD_ARCHIVE}/" - - echo ">>> Removing any temporary files and directories" - rm -rf "${SCAN_BUILD_TMPDIR}" -fi - -exit ${rc} -- cgit v1.2.3 From 61da6fdd1620ae1d4d47e7bcc8c0a5671fcfe122 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Sun, 12 Oct 2014 14:11:21 +0200 Subject: Fix "Access to field 'image_out' results in a dereference of a null pointer" (bzr r13595) --- src/filters/blend.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp index fd5a9871e..ca1d5bf96 100644 --- a/src/filters/blend.cpp +++ b/src/filters/blend.cpp @@ -183,6 +183,8 @@ void SPFeBlend::update(SPCtx *ctx, guint flags) { /* Unlike normal in, in2 is required attribute. Make sure, we can call * it by some name. */ + /* This may not be true.... see issue at + * http://www.w3.org/TR/filter-effects/#feBlendElement (but it doesn't hurt). */ if (this->in2 == Inkscape::Filters::NR_FILTER_SLOT_NOT_SET || this->in2 == Inkscape::Filters::NR_FILTER_UNNAMED_SLOT) { @@ -206,26 +208,30 @@ Inkscape::XML::Node* SPFeBlend::write(Inkscape::XML::Document *doc, Inkscape::XM repr = doc->createElement("svg:feBlend"); } - gchar const *out_name = sp_filter_name_for_image(parent, this->in2); + gchar const *in2_name = sp_filter_name_for_image(parent, this->in2); - if (out_name) { - repr->setAttribute("in2", out_name); - } else { + if( !in2_name ) { + + // This code is very similar to sp_filter_primtive_name_previous_out() SPObject *i = parent->children; + // Find previous filter primitive while (i && i->next != this) { i = i->next; } - SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i); - out_name = sp_filter_name_for_image(parent, i_prim->image_out); - repr->setAttribute("in2", out_name); - - if (!out_name) { - g_warning("Unable to set in2 for feBlend"); + if( i ) { + SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i); + in2_name = sp_filter_name_for_image(parent, i_prim->image_out); } } + if (in2_name) { + repr->setAttribute("in2", in2_name); + } else { + g_warning("Unable to set in2 for feBlend"); + } + char const *mode; switch(this->blend_mode) { case Inkscape::Filters::BLEND_NORMAL: -- cgit v1.2.3 From 17cb730370ab87bdb323c1e6972d09fe75b59f5a Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Sun, 12 Oct 2014 14:16:05 +0200 Subject: Fix "Access to field 'image_out' results in a dereference of a null pointer" (bzr r13596) --- src/filters/composite.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp index 257292f12..e600b6d20 100644 --- a/src/filters/composite.cpp +++ b/src/filters/composite.cpp @@ -205,6 +205,8 @@ void SPFeComposite::update(SPCtx *ctx, guint flags) { /* Unlike normal in, in2 is required attribute. Make sure, we can call * it by some name. */ + /* This may not be true.... see issue at + * http://www.w3.org/TR/filter-effects/#feBlendElement (but it doesn't hurt). */ if (this->in2 == Inkscape::Filters::NR_FILTER_SLOT_NOT_SET || this->in2 == Inkscape::Filters::NR_FILTER_UNNAMED_SLOT) { @@ -228,26 +230,30 @@ Inkscape::XML::Node* SPFeComposite::write(Inkscape::XML::Document *doc, Inkscape repr = doc->createElement("svg:feComposite"); } - gchar const *out_name = sp_filter_name_for_image(parent, this->in2); + gchar const *in2_name = sp_filter_name_for_image(parent, this->in2); - if (out_name) { - repr->setAttribute("in2", out_name); - } else { + if( !in2_name ) { + + // This code is very similar to sp_filter_primitive_name_previous_out() SPObject *i = parent->children; + // Find previous filter primitive while (i && i->next != this) { i = i->next; } - SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i); - out_name = sp_filter_name_for_image(parent, i_prim->image_out); - repr->setAttribute("in2", out_name); - - if (!out_name) { - g_warning("Unable to set in2 for feComposite"); + if( i ) { + SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i); + in2_name = sp_filter_name_for_image(parent, i_prim->image_out); } } + if (in2_name) { + repr->setAttribute("in2", in2_name); + } else { + g_warning("Unable to set in2 for feComposite"); + } + char const *comp_op; switch (this->composite_operator) { -- cgit v1.2.3 From be65f03b5b02746d3d21b5e905663d3264226321 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Sun, 12 Oct 2014 14:19:49 +0200 Subject: Fix "Access to field 'image_out' results in a dereference of a null pointer" (bzr r13597) --- src/filters/displacementmap.cpp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp index 473e4913f..7dedfc031 100644 --- a/src/filters/displacementmap.cpp +++ b/src/filters/displacementmap.cpp @@ -202,25 +202,30 @@ Inkscape::XML::Node* SPFeDisplacementMap::write(Inkscape::XML::Document *doc, In repr = doc->createElement("svg:feDisplacementMap"); } - gchar const *out_name = sp_filter_name_for_image(parent, this->in2); - if (out_name) { - repr->setAttribute("in2", out_name); - } else { + gchar const *in2_name = sp_filter_name_for_image(parent, this->in2); + + if( !in2_name ) { + + // This code is very similar to sp_filter_primtive_name_previous_out() SPObject *i = parent->children; + // Find previous filter primitive while (i && i->next != this) { i = i->next; } - SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i); - out_name = sp_filter_name_for_image(parent, i_prim->image_out); - repr->setAttribute("in2", out_name); - - if (!out_name) { - g_warning("Unable to set in2 for feDisplacementMap"); + if( i ) { + SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i); + in2_name = sp_filter_name_for_image(parent, i_prim->image_out); } } + if (in2_name) { + repr->setAttribute("in2", in2_name); + } else { + g_warning("Unable to set in2 for feDisplacementMap"); + } + sp_repr_set_svg_double(repr, "scale", this->scale); repr->setAttribute("xChannelSelector", get_channelselector_name(this->xChannelSelector)); -- cgit v1.2.3 From 7fdadb51f279180e7613a7ef703cda1818fe007d Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Sun, 12 Oct 2014 14:27:21 +0200 Subject: Fix "Value stored to 'child' is never read" (bzr r13598) --- src/xml/repr-io.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp index 0319bb5e3..a4146f215 100644 --- a/src/xml/repr-io.cpp +++ b/src/xml/repr-io.cpp @@ -623,7 +623,6 @@ static Node *sp_repr_svg_read_node (Document *xml_doc, xmlNodePtr node, const gc repr->setContent(reinterpret_cast<gchar*>(node->content)); } - child = node->xmlChildrenNode; for (child = node->xmlChildrenNode; child != NULL; child = child->next) { Node *crepr = sp_repr_svg_read_node (xml_doc, child, default_ns, prefix_map); if (crepr) { -- cgit v1.2.3 From e85f0be00539e62796c7160d2a18f20f5d264b7a Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 15:50:17 +0200 Subject: Extension enumeration/dropdownbox parameter: fix potential NULL-deref crash on xml == nullptr. (bzr r13599) --- src/extension/param/enum.cpp | 55 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp index bb50c06e1..74b2a75ad 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/param/enum.cpp @@ -41,8 +41,8 @@ namespace Extension { class enumentry { public: enumentry (Glib::ustring &val, Glib::ustring &text) : - value(val), - guitext(text) + value(val), + guitext(text) {} Glib::ustring value; @@ -50,16 +50,19 @@ public: }; -ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) : - Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _indent(0) +ParamComboBox::ParamComboBox(const gchar *name, const gchar *guitext, const gchar *desc, + const Parameter::_scope_t scope, bool gui_hidden, const gchar *gui_tip, + Inkscape::Extension::Extension *ext, Inkscape::XML::Node *xml) + : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext) + , _value(NULL) + , _indent(0) + , choices(NULL) { - choices = NULL; - _value = NULL; + const char *xmlval = NULL; // the value stored in XML - // Read XML tree to add enumeration items: - // printf("Extension Constructor: "); if (xml != NULL) { - for (Inkscape::XML::Node *node = xml->firstChild(); node; node = node->next()) { + // Read XML tree to add enumeration items: + for (Inkscape::XML::Node *node = xml->firstChild(); node; node = node->next()) { char const * chname = node->name(); if (!strcmp(chname, INKSCAPE_EXTENSION_NS "item") || !strcmp(chname, INKSCAPE_EXTENSION_NS "_item")) { Glib::ustring newguitext, newvalue; @@ -69,8 +72,8 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g } if (contents != NULL) { // don't translate when 'item' but do translate when '_item' - // NOTE: internal extensions use build_from_mem and don't need _item but - // still need to include if are to be localized + // NOTE: internal extensions use build_from_mem and don't need _item but + // still need to include if are to be localized if (!strcmp(chname, INKSCAPE_EXTENSION_NS "_item")) { if (node->attribute("msgctxt") != NULL) { newguitext = g_dpgettext2(NULL, node->attribute("msgctxt"), contents); @@ -95,30 +98,28 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g } } } - } - - // Initialize _value with the default value from xml - // for simplicity : default to the contents of the first xml-child - const char * defaultval = NULL; - if (xml->firstChild() && xml->firstChild()->firstChild()) { - defaultval = xml->firstChild()->attribute("value"); - } + + // Initialize _value with the default value from xml + // for simplicity : default to the contents of the first xml-child + if (xml->firstChild() && xml->firstChild()->firstChild()) { + xmlval = xml->firstChild()->attribute("value"); + } - const char * indent = xml->attribute("indent"); - if (indent != NULL) { - _indent = atoi(indent) * 12; + const char *indent = xml->attribute("indent"); + if (indent != NULL) { + _indent = atoi(indent) * 12; + } } gchar * pref_name = this->pref_name(); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - Glib::ustring paramval = prefs->getString(extension_pref_root + pref_name); + Glib::ustring paramval = prefs ? prefs->getString(extension_pref_root + pref_name) : ""; g_free(pref_name); if (!paramval.empty()) { - defaultval = paramval.data(); - } - if (defaultval != NULL) { - _value = g_strdup(defaultval); + _value = g_strdup(paramval.data()); + } else if (xmlval) { + _value = g_strdup(xmlval); } } -- cgit v1.2.3 From b021cb56b6da1e6e08da95209e75bb3d102d5267 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 17:55:41 +0200 Subject: noop: remove duplicate assignment in sp-lpe-item.cpp (bzr r13600) --- src/sp-lpe-item.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index 321d2fc42..17cacbae2 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -655,9 +655,8 @@ sp_lpe_item_apply_to_mask(SPItem * item) { SPMask *mask = item->mask_ref->getObject(); if(mask) { - SPObject * mask_data = mask->firstChild(); + SPObject *mask_data = mask->firstChild(); SPCurve * mask_curve = NULL; - mask_data = mask->firstChild(); if (SP_IS_PATH(mask_data)) { mask_curve = SP_PATH(mask_data)->get_original_curve(); } else if(SP_IS_SHAPE(mask_data)) { -- cgit v1.2.3 From acb22a496132ae58d7a500b4f92e16786d8a27c9 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 17:59:21 +0200 Subject: object-snapper.cpp : make the logic easier to read (use else-clause as default initialization value) (bzr r13601) --- src/object-snapper.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 9ff6df3bf..2b29814b0 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -289,7 +289,7 @@ void Inkscape::ObjectSnapper::_snapNodes(IntermSnapResults &isr, for (std::vector<SnapCandidatePoint>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); ++k) { if (_allowSourceToSnapToTarget(p.getSourceType(), (*k).getTargetType(), strict_snapping)) { Geom::Point target_pt = (*k).getPoint(); - Geom::Coord dist = Geom::infinity(); + Geom::Coord dist = Geom::L2(target_pt - p.getPoint()); // Default: free (unconstrained) snapping if (!c.isUndefined()) { // We're snapping to nodes along a constraint only, so find out if this node // is at the constraint, while allowing for a small margin @@ -299,9 +299,6 @@ void Inkscape::ObjectSnapper::_snapNodes(IntermSnapResults &isr, continue; } dist = Geom::L2(target_pt - p_proj_on_constraint); - } else { - // Free (unconstrained) snapping - dist = Geom::L2(target_pt - p.getPoint()); } if (dist < getSnapperTolerance() && dist < s.getSnapDistance()) { -- cgit v1.2.3 From 1d31429ac10d5fa47a611cfc2e89f4c313c1ad16 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 18:19:14 +0200 Subject: path combine: add an assert to indicate that item list cannot be empty (bzr r13602) --- src/path-chemistry.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index d355b49fe..787193060 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -78,6 +78,7 @@ sp_selected_path_combine(SPDesktop *desktop) items = g_slist_sort(items, (GCompareFunc) sp_item_repr_compare_position); items = g_slist_reverse(items); + assert(items); // cannot be NULL because of list length check at top of function // remember the position, id, transform and style of the topmost path, they will be assigned to the combined one gint position = 0; -- cgit v1.2.3 From 2f2f164bbe75b4a4bb6d553242cecd587ed03456 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch> Date: Sun, 12 Oct 2014 19:25:47 +0200 Subject: DrawingItem: add NULL check (bug found by clang static analyzer) (bzr r13603) --- src/display/drawing-item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp index 80eb69546..2ea3641dc 100644 --- a/src/display/drawing-item.cpp +++ b/src/display/drawing-item.cpp @@ -967,7 +967,7 @@ DrawingItem::_setStyleCommon(SPStyle *&_style, SPStyle *style) if (_style) sp_style_unref(_style); _style = style; - if (style->filter.set && style->getFilter()) { + if (style && style->filter.set && style->getFilter()) { if (!_filter) { int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter())); _filter = new Inkscape::Filters::Filter(primitives); -- cgit v1.2.3 From 2864d78455e7c6e5aa2eb8e7d885c5ada3afed74 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour <nicoduf@yahoo.fr> Date: Sun, 12 Oct 2014 19:27:13 +0200 Subject: Translations. Russian translation update by Alexandre Prokoudine. Fixed bugs: - https://launchpad.net/bugs/1380186 (bzr r13604) --- po/ru.po | 57747 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 29019 insertions(+), 28728 deletions(-) diff --git a/po/ru.po b/po/ru.po index aa7050cb0..528b94141 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,21 +6,21 @@ # Vitaly Lipatov <lav@altlinux.ru>, 2002, 2004. # Alexey Remizov <alexey@remizov.pp.ru>, 2004. # bulia byak <buliabyak@users.sf.net>, 2004. -# Александр Прокудин <alexandre.prokoudine@gmail.com>, 2004-2012, 2012. +# Александр Прокудин <alexandre.prokoudine@gmail.com>, 2004-2014, 2014. # msgid "" msgstr "" "Project-Id-Version: Inkscape 0.49\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-08-14 23:05-0700\n" -"PO-Revision-Date: 2013-02-11 15:27+0300\n" +"POT-Creation-Date: 2014-10-02 10:03+0200\n" +"PO-Revision-Date: 2014-10-12 02:01+0400\n" "Last-Translator: Александр Прокудин <alexandre.prokoudine@gmail.com>\n" "Language-Team: русский <>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Gtranslator 2.91.6\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n" "%100>=20) ? 1 : 2);\n" @@ -47,36953 +47,37244 @@ msgstr "" msgid "New Drawing" msgstr "Новый рисунок" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:2 -msgctxt "Palette" -msgid "Black" -msgstr "Чёрный" +#: ../share/filters/filters.svg.h:2 +#, fuzzy +msgid "Smart Jelly" +msgstr "Замысловатое желе" + +#: ../share/filters/filters.svg.h:3 ../share/filters/filters.svg.h:7 +#: ../share/filters/filters.svg.h:15 ../share/filters/filters.svg.h:31 +#: ../share/filters/filters.svg.h:35 ../share/filters/filters.svg.h:107 +#: ../share/filters/filters.svg.h:139 ../share/filters/filters.svg.h:143 +#: ../share/filters/filters.svg.h:147 ../share/filters/filters.svg.h:151 +#: ../share/filters/filters.svg.h:163 ../share/filters/filters.svg.h:171 +#: ../share/filters/filters.svg.h:219 ../share/filters/filters.svg.h:227 +#: ../share/filters/filters.svg.h:283 ../share/filters/filters.svg.h:299 +#: ../share/filters/filters.svg.h:303 ../share/filters/filters.svg.h:551 +#: ../share/filters/filters.svg.h:555 ../share/filters/filters.svg.h:559 +#: ../share/filters/filters.svg.h:563 ../share/filters/filters.svg.h:567 +#: ../src/extension/internal/filter/bevels.h:63 +#: ../src/extension/internal/filter/bevels.h:144 +#: ../src/extension/internal/filter/bevels.h:228 +msgid "Bevels" +msgstr "Фаска" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:3 -#, no-c-format -msgctxt "Palette" -msgid "90% Gray" -msgstr "90% серый" +#: ../share/filters/filters.svg.h:4 +msgid "Same as Matte jelly but with more controls" +msgstr "То же, что и матовое желе, но с увеличенным количеством регуляторов." -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:4 -#, no-c-format -msgctxt "Palette" -msgid "80% Gray" -msgstr "80% серый" +#: ../share/filters/filters.svg.h:6 +#, fuzzy +msgid "Metal Casting" +msgstr "Металлическое литьё" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:5 -#, no-c-format -msgctxt "Palette" -msgid "70% Gray" -msgstr "70% серый" +#: ../share/filters/filters.svg.h:8 +msgid "Smooth drop-like bevel with metallic finish" +msgstr "Плавная каплевидная фаска с металлической полировкой" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:6 -#, no-c-format -msgctxt "Palette" -msgid "60% Gray" -msgstr "60% серый" +#: ../share/filters/filters.svg.h:10 +msgid "Apparition" +msgstr "Видение" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:7 -#, no-c-format -msgctxt "Palette" -msgid "50% Gray" -msgstr "50% серый" +#: ../share/filters/filters.svg.h:11 ../share/filters/filters.svg.h:323 +#: ../share/filters/filters.svg.h:655 +#: ../src/extension/internal/filter/blurs.h:63 +#: ../src/extension/internal/filter/blurs.h:132 +#: ../src/extension/internal/filter/blurs.h:201 +#: ../src/extension/internal/filter/blurs.h:267 +#: ../src/extension/internal/filter/blurs.h:351 +msgid "Blurs" +msgstr "Размывание" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:8 -#, no-c-format -msgctxt "Palette" -msgid "40% Gray" -msgstr "40% серый" +#: ../share/filters/filters.svg.h:12 +msgid "Edges are partly feathered out" +msgstr "Края частично растушёваны" + +#: ../share/filters/filters.svg.h:14 +#, fuzzy +msgid "Jigsaw Piece" +msgstr "Элемент паззла" + +#: ../share/filters/filters.svg.h:16 +msgid "Low, sharp bevel" +msgstr "Низкая, резкая фаска" + +#: ../share/filters/filters.svg.h:18 +#, fuzzy +msgid "Rubber Stamp" +msgstr "Штемпель" + +#: ../share/filters/filters.svg.h:19 ../share/filters/filters.svg.h:43 +#: ../share/filters/filters.svg.h:47 ../share/filters/filters.svg.h:51 +#: ../share/filters/filters.svg.h:59 ../share/filters/filters.svg.h:63 +#: ../share/filters/filters.svg.h:95 ../share/filters/filters.svg.h:99 +#: ../share/filters/filters.svg.h:103 ../share/filters/filters.svg.h:287 +#: ../share/filters/filters.svg.h:291 ../share/filters/filters.svg.h:331 +#: ../share/filters/filters.svg.h:335 ../share/filters/filters.svg.h:339 +#: ../share/filters/filters.svg.h:391 ../share/filters/filters.svg.h:407 +#: ../share/filters/filters.svg.h:451 ../share/filters/filters.svg.h:455 +#: ../share/filters/filters.svg.h:459 ../share/filters/filters.svg.h:475 +#: ../share/filters/filters.svg.h:487 ../share/filters/filters.svg.h:583 +#: ../share/filters/filters.svg.h:643 ../share/filters/filters.svg.h:683 +#: ../share/filters/filters.svg.h:687 ../share/filters/filters.svg.h:691 +#: ../share/filters/filters.svg.h:695 ../share/filters/filters.svg.h:699 +#: ../share/filters/filters.svg.h:703 ../share/filters/filters.svg.h:707 +#: ../share/filters/filters.svg.h:711 ../share/filters/filters.svg.h:715 +#: ../share/filters/filters.svg.h:723 +#: ../src/extension/internal/filter/overlays.h:80 +msgid "Overlays" +msgstr "Перекрытия" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:9 -#, no-c-format -msgctxt "Palette" -msgid "30% Gray" -msgstr "30% серый" +#: ../share/filters/filters.svg.h:20 +msgid "Random whiteouts inside" +msgstr "Случайные белые пятна внутри" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:10 -#, no-c-format -msgctxt "Palette" -msgid "20% Gray" -msgstr "20% серый" +#: ../share/filters/filters.svg.h:22 +#, fuzzy +msgid "Ink Bleed" +msgstr "Чернила протекли" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:11 -#, no-c-format -msgctxt "Palette" -msgid "10% Gray" -msgstr "10% серый" +#: ../share/filters/filters.svg.h:23 ../share/filters/filters.svg.h:27 +#: ../share/filters/filters.svg.h:115 ../share/filters/filters.svg.h:431 +msgid "Protrusions" +msgstr "Выступы" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:12 -#, no-c-format -msgctxt "Palette" -msgid "7.5% Gray" -msgstr "7,5% серый" +#: ../share/filters/filters.svg.h:24 +msgid "Inky splotches underneath the object" +msgstr "Чернильные пятна под объектом" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:13 -#, no-c-format -msgctxt "Palette" -msgid "5% Gray" -msgstr "5% серый" +#: ../share/filters/filters.svg.h:26 +msgid "Fire" +msgstr "Огонь" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:14 -#, no-c-format -msgctxt "Palette" -msgid "2.5% Gray" -msgstr "2,5% серый" +#: ../share/filters/filters.svg.h:28 +msgid "Edges of object are on fire" +msgstr "Края объекта охвачены огнем" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:15 -msgctxt "Palette" -msgid "White" -msgstr "Белый" +#: ../share/filters/filters.svg.h:30 +msgid "Bloom" +msgstr "Расцвет" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:16 -msgctxt "Palette" -msgid "Maroon (#800000)" -msgstr "Тёмно-бордовый (#800000)" +#: ../share/filters/filters.svg.h:32 +msgid "Soft, cushion-like bevel with matte highlights" +msgstr "Фаска с плавным подушкообразным переходом и матовым бликом" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:17 -msgctxt "Palette" -msgid "Red (#FF0000)" -msgstr "Красный (#FF0000)" +#: ../share/filters/filters.svg.h:34 +#, fuzzy +msgid "Ridged Border" +msgstr "Край с кромкой" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:18 -msgctxt "Palette" -msgid "Olive (#808000)" -msgstr "Оливковый (#808000)" +#: ../share/filters/filters.svg.h:36 +msgid "Ridged border with inner bevel" +msgstr "Край с кромкой и внутренней фаской" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:19 -msgctxt "Palette" -msgid "Yellow (#FFFF00)" -msgstr "Жёлтый (#FFFF00)" +#: ../share/filters/filters.svg.h:38 +msgid "Ripple" +msgstr "Рябь" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:20 -msgctxt "Palette" -msgid "Green (#008000)" -msgstr "Зелёный (#008000)" +#: ../share/filters/filters.svg.h:39 ../share/filters/filters.svg.h:123 +#: ../share/filters/filters.svg.h:315 ../share/filters/filters.svg.h:319 +#: ../share/filters/filters.svg.h:327 ../share/filters/filters.svg.h:363 +#: ../share/filters/filters.svg.h:443 ../share/filters/filters.svg.h:519 +#: ../share/filters/filters.svg.h:635 +#: ../src/extension/internal/filter/distort.h:96 +#: ../src/extension/internal/filter/distort.h:205 +msgid "Distort" +msgstr "Искажения" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:21 -msgctxt "Palette" -msgid "Lime (#00FF00)" -msgstr "Лайм (#00FF00)" +#: ../share/filters/filters.svg.h:40 +msgid "Horizontal rippling of edges" +msgstr "Горизонтальная рябь краёв" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:22 -msgctxt "Palette" -msgid "Teal (#008080)" -msgstr "Чирок (#008080)" +#: ../share/filters/filters.svg.h:42 +msgid "Speckle" +msgstr "Пятно" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:23 -msgctxt "Palette" -msgid "Aqua (#00FFFF)" -msgstr "Цвет морской волны (#00FFFF)" +#: ../share/filters/filters.svg.h:44 +msgid "Fill object with sparse translucent specks" +msgstr "Заполнить объект редкими просвечивающими пятнами" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:24 -msgctxt "Palette" -msgid "Navy (#000080)" -msgstr "Тёмно-синий (#000080)" +#: ../share/filters/filters.svg.h:46 +msgid "Oil Slick" +msgstr "Масляная плёнка" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:25 -msgctxt "Palette" -msgid "Blue (#0000FF)" -msgstr "Синий (#0000FF)" +#: ../share/filters/filters.svg.h:48 +msgid "Rainbow-colored semitransparent oily splotches" +msgstr "Масляные полупрозрачные пятна радужного цвета" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:26 -msgctxt "Palette" -msgid "Purple (#800080)" -msgstr "Пурпурный (#800080)" +#: ../share/filters/filters.svg.h:50 +msgid "Frost" +msgstr "Мороз" -#. Palette: ./inkscape.gpl -#: ../share/palettes/palettes.h:27 -msgctxt "Palette" -msgid "Fuchsia (#FF00FF)" -msgstr "Фуксия (#FF00FF)" +#: ../share/filters/filters.svg.h:52 +msgid "Flake-like white splotches" +msgstr "Белые пятна наподобие хлопьев" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:28 -msgctxt "Palette" -msgid "black (#000000)" -msgstr "black (#000000)" +#: ../share/filters/filters.svg.h:54 +msgid "Leopard Fur" +msgstr "Шкура леопарда" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:29 -msgctxt "Palette" -msgid "dimgray (#696969)" -msgstr "dimgray (#696969)" +#: ../share/filters/filters.svg.h:55 ../share/filters/filters.svg.h:175 +#: ../share/filters/filters.svg.h:179 ../share/filters/filters.svg.h:183 +#: ../share/filters/filters.svg.h:191 ../share/filters/filters.svg.h:211 +#: ../share/filters/filters.svg.h:239 ../share/filters/filters.svg.h:243 +#: ../share/filters/filters.svg.h:247 ../share/filters/filters.svg.h:255 +#: ../share/filters/filters.svg.h:387 ../share/filters/filters.svg.h:395 +#: ../share/filters/filters.svg.h:399 ../share/filters/filters.svg.h:403 +msgid "Materials" +msgstr "Материалы" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:30 -msgctxt "Palette" -msgid "gray (#808080)" -msgstr "gray (#808080)" +#: ../share/filters/filters.svg.h:56 +msgid "Leopard spots (loses object's own color)" +msgstr "Пятна леопарда (исходный цвет объекта теряется)" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:31 -msgctxt "Palette" -msgid "darkgray (#A9A9A9)" -msgstr "darkgray (#A9A9A9)" +#: ../share/filters/filters.svg.h:58 +msgid "Zebra" +msgstr "Зебра" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:32 -msgctxt "Palette" -msgid "silver (#C0C0C0)" -msgstr "silver (#C0C0C0)" +#: ../share/filters/filters.svg.h:60 +msgid "Irregular vertical dark stripes (loses object's own color)" +msgstr "" +"Нерегулярные вертикальные темные полосы (исходный цвет объекта теряется)" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:33 -msgctxt "Palette" -msgid "lightgray (#D3D3D3)" -msgstr "lightgray (#D3D3D3)" +#: ../share/filters/filters.svg.h:62 +msgid "Clouds" +msgstr "Облака" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:34 -msgctxt "Palette" -msgid "gainsboro (#DCDCDC)" -msgstr "gainsboro (#DCDCDC)" +#: ../share/filters/filters.svg.h:64 +msgid "Airy, fluffy, sparse white clouds" +msgstr "Воздушные, пушистые, редкие облака" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:35 -msgctxt "Palette" -msgid "whitesmoke (#F5F5F5)" -msgstr "whitesmoke (#F5F5F5)" +#: ../share/filters/filters.svg.h:66 +#: ../src/extension/internal/bitmap/sharpen.cpp:38 +msgid "Sharpen" +msgstr "Повысить резкость" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:36 -msgctxt "Palette" -msgid "white (#FFFFFF)" -msgstr "white (#FFFFFF)" +#: ../share/filters/filters.svg.h:67 ../share/filters/filters.svg.h:71 +#: ../share/filters/filters.svg.h:87 ../share/filters/filters.svg.h:295 +#: ../share/filters/filters.svg.h:415 +#: ../src/extension/internal/filter/image.h:62 +msgid "Image Effects" +msgstr "Эффекты для растра" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:37 -msgctxt "Palette" -msgid "rosybrown (#BC8F8F)" -msgstr "rosybrown (#BC8F8F)" +#: ../share/filters/filters.svg.h:68 +msgid "Sharpen edges and boundaries within the object, force=0.15" +msgstr "Повысить резкость краев и границ в рамках объекта, сила=0.15" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:38 -msgctxt "Palette" -msgid "indianred (#CD5C5C)" -msgstr "indianred (#CD5C5C)" +#: ../share/filters/filters.svg.h:70 +#, fuzzy +msgid "Sharpen More" +msgstr "Усиленное повышение резкости" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:39 -msgctxt "Palette" -msgid "brown (#A52A2A)" -msgstr "brown (#A52A2A)" +#: ../share/filters/filters.svg.h:72 +msgid "Sharpen edges and boundaries within the object, force=0.3" +msgstr "Повысить резкость краев и границ в рамках объекта, сила=0.3" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:40 -msgctxt "Palette" -msgid "firebrick (#B22222)" -msgstr "firebrick (#B22222)" +#: ../share/filters/filters.svg.h:74 +msgid "Oil painting" +msgstr "Масляная краска" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:41 -msgctxt "Palette" -msgid "lightcoral (#F08080)" -msgstr "lightcoral (#F08080)" +#: ../share/filters/filters.svg.h:75 ../share/filters/filters.svg.h:79 +#: ../share/filters/filters.svg.h:83 ../share/filters/filters.svg.h:447 +#: ../share/filters/filters.svg.h:495 ../share/filters/filters.svg.h:499 +#: ../share/filters/filters.svg.h:503 ../share/filters/filters.svg.h:507 +#: ../share/filters/filters.svg.h:515 ../share/filters/filters.svg.h:659 +#: ../share/filters/filters.svg.h:663 ../share/filters/filters.svg.h:667 +#: ../share/filters/filters.svg.h:671 ../share/filters/filters.svg.h:675 +#: ../share/filters/filters.svg.h:679 ../share/filters/filters.svg.h:719 +#: ../share/filters/filters.svg.h:803 ../share/filters/filters.svg.h:815 +#: ../src/extension/internal/filter/paint.h:113 +#: ../src/extension/internal/filter/paint.h:244 +#: ../src/extension/internal/filter/paint.h:363 +#: ../src/extension/internal/filter/paint.h:507 +#: ../src/extension/internal/filter/paint.h:602 +#: ../src/extension/internal/filter/paint.h:725 +#: ../src/extension/internal/filter/paint.h:877 +#: ../src/extension/internal/filter/paint.h:981 +msgid "Image Paint and Draw" +msgstr "" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:42 -msgctxt "Palette" -msgid "maroon (#800000)" -msgstr "maroon (#800000)" +#: ../share/filters/filters.svg.h:76 +msgid "Simulate oil painting style" +msgstr "Имитация живописи маслом" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:43 -msgctxt "Palette" -msgid "darkred (#8B0000)" -msgstr "darkred (#8B0000)" +#. Pencil +#: ../share/filters/filters.svg.h:78 +#: ../src/ui/dialog/inkscape-preferences.cpp:417 +msgid "Pencil" +msgstr "Карандаш" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:44 -msgctxt "Palette" -msgid "red (#FF0000)" -msgstr "red (#FF0000)" +#: ../share/filters/filters.svg.h:80 +msgid "Detect color edges and retrace them in grayscale" +msgstr "Найти в объекте цветные края и перекрасить их в оттенки серого" + +#: ../share/filters/filters.svg.h:82 +msgid "Blueprint" +msgstr "Светокопия" + +#: ../share/filters/filters.svg.h:84 +msgid "Detect color edges and retrace them in blue" +msgstr "Найти в объекте цветные края и перекрасить их синим цветом" + +#: ../share/filters/filters.svg.h:86 +msgid "Age" +msgstr "Состаривание" + +#: ../share/filters/filters.svg.h:88 +msgid "Imitate aged photograph" +msgstr "Имитация старой фотографии" + +#: ../share/filters/filters.svg.h:90 +msgid "Organic" +msgstr "Органика" + +#: ../share/filters/filters.svg.h:91 ../share/filters/filters.svg.h:119 +#: ../share/filters/filters.svg.h:127 ../share/filters/filters.svg.h:187 +#: ../share/filters/filters.svg.h:195 ../share/filters/filters.svg.h:199 +#: ../share/filters/filters.svg.h:251 ../share/filters/filters.svg.h:259 +#: ../share/filters/filters.svg.h:263 ../share/filters/filters.svg.h:355 +#: ../share/filters/filters.svg.h:359 ../share/filters/filters.svg.h:367 +#: ../share/filters/filters.svg.h:371 ../share/filters/filters.svg.h:375 +#: ../share/filters/filters.svg.h:379 ../share/filters/filters.svg.h:383 +#: ../share/filters/filters.svg.h:439 ../share/filters/filters.svg.h:467 +#: ../share/filters/filters.svg.h:491 ../share/filters/filters.svg.h:531 +msgid "Textures" +msgstr "Текстуры" + +#: ../share/filters/filters.svg.h:92 +msgid "Bulging, knotty, slick 3D surface" +msgstr "Выпяченная, узловатая трехмерная текстура" + +#: ../share/filters/filters.svg.h:94 +msgid "Barbed Wire" +msgstr "Колючая проволока" + +#: ../share/filters/filters.svg.h:96 +msgid "Gray bevelled wires with drop shadows" +msgstr "Серые выступающие провода, отбрасывающие тень" + +#: ../share/filters/filters.svg.h:98 +msgid "Swiss Cheese" +msgstr "Швейцарский сыр" + +#: ../share/filters/filters.svg.h:100 +msgid "Random inner-bevel holes" +msgstr "Случайные дыры с внутренней фаской" + +#: ../share/filters/filters.svg.h:102 +msgid "Blue Cheese" +msgstr "Голубой сыр" + +#: ../share/filters/filters.svg.h:104 +msgid "Marble-like bluish speckles" +msgstr "Голубоватые пятна как в мраморе" + +#: ../share/filters/filters.svg.h:106 +msgid "Button" +msgstr "Кнопка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:45 -msgctxt "Palette" -msgid "snow (#FFFAFA)" -msgstr "snow (#FFFAFA)" +#: ../share/filters/filters.svg.h:108 +msgid "Soft bevel, slightly depressed middle" +msgstr "Плавная фаска, немного вдавленный центр" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:46 -msgctxt "Palette" -msgid "mistyrose (#FFE4E1)" -msgstr "mistyrose (#FFE4E1)" +#: ../share/filters/filters.svg.h:110 +msgid "Inset" +msgstr "Врезка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:47 -msgctxt "Palette" -msgid "salmon (#FA8072)" -msgstr "salmon (#FA8072)" +#: ../share/filters/filters.svg.h:111 ../share/filters/filters.svg.h:267 +#: ../share/filters/filters.svg.h:343 ../share/filters/filters.svg.h:435 +#: ../share/filters/filters.svg.h:811 +#: ../src/extension/internal/filter/shadows.h:81 +msgid "Shadows and Glows" +msgstr "Свет и тень" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:48 -msgctxt "Palette" -msgid "tomato (#FF6347)" -msgstr "tomato (#FF6347)" +#: ../share/filters/filters.svg.h:112 +msgid "Shadowy outer bevel" +msgstr "Затененная внешняя кромка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:49 -msgctxt "Palette" -msgid "darksalmon (#E9967A)" -msgstr "darksalmon (#E9967A)" +#: ../share/filters/filters.svg.h:114 +#, fuzzy +msgid "Dripping" +msgstr "Протекание" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:50 -msgctxt "Palette" -msgid "coral (#FF7F50)" -msgstr "coral (#FF7F50)" +#: ../share/filters/filters.svg.h:116 +msgid "Random paint streaks downwards" +msgstr "Случайное стекание краски вниз" + +#: ../share/filters/filters.svg.h:118 +#, fuzzy +msgid "Jam Spread" +msgstr "Слой джема" + +#: ../share/filters/filters.svg.h:120 +msgid "Glossy clumpy jam spread" +msgstr "Слой блестящего комковатого джема" + +#: ../share/filters/filters.svg.h:122 +#, fuzzy +msgid "Pixel Smear" +msgstr "Пиксельные мазки" + +#: ../share/filters/filters.svg.h:124 +msgid "Van Gogh painting effect for bitmaps" +msgstr "Эффект рисования в стиле ван Гога" + +#: ../share/filters/filters.svg.h:126 +msgid "Cracked Glass" +msgstr "Треснутое стекло" + +#: ../share/filters/filters.svg.h:128 +msgid "Under a cracked glass" +msgstr "Под треснутым стеклом" + +#: ../share/filters/filters.svg.h:130 +msgid "Bubbly Bumps" +msgstr "Пузыристые выпуклости " + +#: ../share/filters/filters.svg.h:131 ../share/filters/filters.svg.h:307 +#: ../share/filters/filters.svg.h:311 ../share/filters/filters.svg.h:347 +#: ../share/filters/filters.svg.h:351 ../share/filters/filters.svg.h:419 +#: ../share/filters/filters.svg.h:423 ../share/filters/filters.svg.h:463 +#: ../share/filters/filters.svg.h:471 ../share/filters/filters.svg.h:479 +#: ../share/filters/filters.svg.h:483 ../share/filters/filters.svg.h:511 +#: ../share/filters/filters.svg.h:535 ../share/filters/filters.svg.h:539 +#: ../share/filters/filters.svg.h:543 ../share/filters/filters.svg.h:547 +#: ../share/filters/filters.svg.h:571 ../share/filters/filters.svg.h:579 +#: ../share/filters/filters.svg.h:595 ../share/filters/filters.svg.h:599 +#: ../share/filters/filters.svg.h:603 ../share/filters/filters.svg.h:607 +#: ../share/filters/filters.svg.h:611 ../share/filters/filters.svg.h:615 +#: ../share/filters/filters.svg.h:619 ../share/filters/filters.svg.h:623 +#: ../share/filters/filters.svg.h:799 ../share/filters/filters.svg.h:807 +#: ../src/extension/internal/filter/bumps.h:142 +#: ../src/extension/internal/filter/bumps.h:362 +msgid "Bumps" +msgstr "Выпуклости" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:51 -msgctxt "Palette" -msgid "orangered (#FF4500)" -msgstr "orangered (#FF4500)" +#: ../share/filters/filters.svg.h:132 +msgid "Flexible bubbles effect with some displacement" +msgstr "Гибкий эффект пузырей с некоторым смещением" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:52 -msgctxt "Palette" -msgid "lightsalmon (#FFA07A)" -msgstr "lightsalmon (#FFA07A)" +#: ../share/filters/filters.svg.h:134 +msgid "Glowing Bubble" +msgstr "Светящийся пузырь" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:53 -msgctxt "Palette" -msgid "sienna (#A0522D)" -msgstr "sienna (#A0522D)" +#: ../share/filters/filters.svg.h:135 ../share/filters/filters.svg.h:155 +#: ../share/filters/filters.svg.h:159 ../share/filters/filters.svg.h:203 +#: ../share/filters/filters.svg.h:207 ../share/filters/filters.svg.h:215 +#: ../share/filters/filters.svg.h:223 +msgid "Ridges" +msgstr "Кромки" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:54 -msgctxt "Palette" -msgid "seashell (#FFF5EE)" -msgstr "seashell (#FFF5EE)" +#: ../share/filters/filters.svg.h:136 +msgid "Bubble effect with refraction and glow" +msgstr "Эффект пузыря с рефракцией и свечением" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:55 -msgctxt "Palette" -msgid "chocolate (#D2691E)" -msgstr "chocolate (#D2691E)" +#: ../share/filters/filters.svg.h:138 +msgid "Neon" +msgstr "Неон" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:56 -msgctxt "Palette" -msgid "saddlebrown (#8B4513)" -msgstr "saddlebrown (#8B4513)" +#: ../share/filters/filters.svg.h:140 +msgid "Neon light effect" +msgstr "Эффект неонового свечения" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:57 -msgctxt "Palette" -msgid "sandybrown (#F4A460)" -msgstr "sandybrown (#F4A460)" +#: ../share/filters/filters.svg.h:142 +msgid "Molten Metal" +msgstr "Расплавленный металл" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:58 -msgctxt "Palette" -msgid "peachpuff (#FFDAB9)" -msgstr "peachpuff (#FFDAB9)" +#: ../share/filters/filters.svg.h:144 +msgid "Melting parts of object together, with a glossy bevel and a glow" +msgstr "Сплавить части объекта, добавив блестящую фаску и свечение" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:59 -msgctxt "Palette" -msgid "peru (#CD853F)" -msgstr "peru (#CD853F)" +#: ../share/filters/filters.svg.h:146 +msgid "Pressed Steel" +msgstr "Штампованная сталь" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:60 -msgctxt "Palette" -msgid "linen (#FAF0E6)" -msgstr "linen (#FAF0E6)" +#: ../share/filters/filters.svg.h:148 +msgid "Pressed metal with a rolled edge" +msgstr "Штампованная сталь с вальцованным краем" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:61 -msgctxt "Palette" -msgid "bisque (#FFE4C4)" -msgstr "bisque (#FFE4C4)" +#: ../share/filters/filters.svg.h:150 +msgid "Matte Bevel" +msgstr "Матовая фаска" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:62 -msgctxt "Palette" -msgid "darkorange (#FF8C00)" -msgstr "darkorange (#FF8C00)" +#: ../share/filters/filters.svg.h:152 +msgid "Soft, pastel-colored, blurry bevel" +msgstr "Плавная фаска пастельных тонов" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:63 -msgctxt "Palette" -msgid "burlywood (#DEB887)" -msgstr "burlywood (#DEB887)" +#: ../share/filters/filters.svg.h:154 +msgid "Thin Membrane" +msgstr "Тонкая мембрана" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:64 -msgctxt "Palette" -msgid "tan (#D2B48C)" -msgstr "tan (#D2B48C)" +#: ../share/filters/filters.svg.h:156 +msgid "Thin like a soap membrane" +msgstr "Мембрана, тонкая как мыльный пузырь" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:65 -msgctxt "Palette" -msgid "antiquewhite (#FAEBD7)" -msgstr "antiquewhite (#FAEBD7)" +#: ../share/filters/filters.svg.h:158 +msgid "Matte Ridge" +msgstr "Матовая кромка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:66 -msgctxt "Palette" -msgid "navajowhite (#FFDEAD)" -msgstr "navajowhite (#FFDEAD)" +#: ../share/filters/filters.svg.h:160 +msgid "Soft pastel ridge" +msgstr "Мягкая пастельная кромка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:67 -msgctxt "Palette" -msgid "blanchedalmond (#FFEBCD)" -msgstr "blanchedalmond (#FFEBCD)" +#: ../share/filters/filters.svg.h:162 +msgid "Glowing Metal" +msgstr "Сверкающий металл" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:68 -msgctxt "Palette" -msgid "papayawhip (#FFEFD5)" -msgstr "papayawhip (#FFEFD5)" +#: ../share/filters/filters.svg.h:164 +msgid "Glowing metal texture" +msgstr "Текстура сверкающего металла" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:69 -msgctxt "Palette" -msgid "moccasin (#FFE4B5)" -msgstr "moccasin (#FFE4B5)" +#: ../share/filters/filters.svg.h:166 +msgid "Leaves" +msgstr "Листва" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:70 -msgctxt "Palette" -msgid "orange (#FFA500)" -msgstr "orange (#FFA500)" +#: ../share/filters/filters.svg.h:167 ../share/filters/filters.svg.h:235 +#: ../share/filters/filters.svg.h:271 ../share/filters/filters.svg.h:639 +#: ../share/extensions/pathscatter.inx.h:1 +msgid "Scatter" +msgstr "Рассеивание" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:71 -msgctxt "Palette" -msgid "wheat (#F5DEB3)" -msgstr "wheat (#F5DEB3)" +#: ../share/filters/filters.svg.h:168 +msgid "Leaves on the ground in Fall, or living foliage" +msgstr "Листва на осенней земле или лиственный орнамент" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:72 -msgctxt "Palette" -msgid "oldlace (#FDF5E6)" -msgstr "oldlace (#FDF5E6)" +#: ../share/filters/filters.svg.h:170 +#: ../src/extension/internal/filter/paint.h:339 +msgid "Translucent" +msgstr "Ослепительно яркая" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:73 -msgctxt "Palette" -msgid "floralwhite (#FFFAF0)" -msgstr "floralwhite (#FFFAF0)" +#: ../share/filters/filters.svg.h:172 +msgid "Illuminated translucent plastic or glass effect" +msgstr "Эффект подсвеченного полупрозрачного пластика" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:74 -msgctxt "Palette" -msgid "darkgoldenrod (#B8860B)" -msgstr "darkgoldenrod (#B8860B)" +#: ../share/filters/filters.svg.h:174 +msgid "Iridescent Beeswax" +msgstr "Радужный воск" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:75 -msgctxt "Palette" -msgid "goldenrod (#DAA520)" -msgstr "goldenrod (#DAA520)" +#: ../share/filters/filters.svg.h:176 +msgid "Waxy texture which keeps its iridescence through color fill change" +msgstr "Восковая текстура с радужностью за счет смены цвета заливки" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:76 -msgctxt "Palette" -msgid "cornsilk (#FFF8DC)" -msgstr "cornsilk (#FFF8DC)" +#: ../share/filters/filters.svg.h:178 +msgid "Eroded Metal" +msgstr "Ржавчина" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:77 -msgctxt "Palette" -msgid "gold (#FFD700)" -msgstr "gold (#FFD700)" +#: ../share/filters/filters.svg.h:180 +msgid "Eroded metal texture with ridges, grooves, holes and bumps" +msgstr "Текстура ржавого металла с кромкой, желобками, дырка и выпуклостями" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:78 -msgctxt "Palette" -msgid "khaki (#F0E68C)" -msgstr "khaki (#F0E68C)" +#: ../share/filters/filters.svg.h:182 +msgid "Cracked Lava" +msgstr "Пузырящаяся лава" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:79 -msgctxt "Palette" -msgid "lemonchiffon (#FFFACD)" -msgstr "lemonchiffon (#FFFACD)" +#: ../share/filters/filters.svg.h:184 +msgid "A volcanic texture, a little like leather" +msgstr "Вулканическая текстура с пузырями лавы, похожая на кожу" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:80 -msgctxt "Palette" -msgid "palegoldenrod (#EEE8AA)" -msgstr "palegoldenrod (#EEE8AA)" +#: ../share/filters/filters.svg.h:186 +msgid "Bark" +msgstr "Кора" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:81 -msgctxt "Palette" -msgid "darkkhaki (#BDB76B)" -msgstr "darkkhaki (#BDB76B)" +#: ../share/filters/filters.svg.h:188 +msgid "Bark texture, vertical; use with deep colors" +msgstr "" +"Текстура коры дерева, вертикальная; используйте с темными насыщенными цветами" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:82 -msgctxt "Palette" -msgid "beige (#F5F5DC)" -msgstr "beige (#F5F5DC)" +#: ../share/filters/filters.svg.h:190 +msgid "Lizard Skin" +msgstr "Кожа ящерицы" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:83 -msgctxt "Palette" -msgid "lightgoldenrodyellow (#FAFAD2)" -msgstr "lightgoldenrodyellow (#FAFAD2)" +#: ../share/filters/filters.svg.h:192 +msgid "Stylized reptile skin texture" +msgstr "Текстура, стилизованная под кожу ящерицы" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:84 -msgctxt "Palette" -msgid "olive (#808000)" -msgstr "olive (#808000)" +#: ../share/filters/filters.svg.h:194 +msgid "Stone Wall" +msgstr "Каменная кладка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:85 -msgctxt "Palette" -msgid "yellow (#FFFF00)" -msgstr "yellow (#FFFF00)" +#: ../share/filters/filters.svg.h:196 +msgid "Stone wall texture to use with not too saturated colors" +msgstr "Текстура камня для использования с не очень насыщенными цветами" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:86 -msgctxt "Palette" -msgid "lightyellow (#FFFFE0)" -msgstr "lightyellow (#FFFFE0)" +#: ../share/filters/filters.svg.h:198 +msgid "Silk Carpet" +msgstr "Шёлковый ковер" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:87 -msgctxt "Palette" -msgid "ivory (#FFFFF0)" -msgstr "ivory (#FFFFF0)" +#: ../share/filters/filters.svg.h:200 +msgid "Silk carpet texture, horizontal stripes" +msgstr "Текстура шелкового ковра с горизонтальными полосками" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:88 -msgctxt "Palette" -msgid "olivedrab (#6B8E23)" -msgstr "olivedrab (#6B8E23)" +#: ../share/filters/filters.svg.h:202 +msgid "Refractive Gel A" +msgstr "Преломляющий гель А" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:89 -msgctxt "Palette" -msgid "yellowgreen (#9ACD32)" -msgstr "yellowgreen (#9ACD32)" +#: ../share/filters/filters.svg.h:204 +msgid "Gel effect with light refraction" +msgstr "Гелевый эффект с легким преломлением" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:90 -msgctxt "Palette" -msgid "darkolivegreen (#556B2F)" -msgstr "darkolivegreen (#556B2F)" +#: ../share/filters/filters.svg.h:206 +msgid "Refractive Gel B" +msgstr "Преломляющий гель Б" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:91 -msgctxt "Palette" -msgid "greenyellow (#ADFF2F)" -msgstr "greenyellow (#ADFF2F)" +#: ../share/filters/filters.svg.h:208 +msgid "Gel effect with strong refraction" +msgstr "Гелевый эффект с сильным преломлением" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:92 -msgctxt "Palette" -msgid "chartreuse (#7FFF00)" -msgstr "chartreuse (#7FFF00)" +#: ../share/filters/filters.svg.h:210 +msgid "Metallized Paint" +msgstr "Металлизированная краска" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:93 -msgctxt "Palette" -msgid "lawngreen (#7CFC00)" -msgstr "lawngreen (#7CFC00)" +#: ../share/filters/filters.svg.h:212 +msgid "" +"Metallized effect with a soft lighting, slightly translucent at the edges" +msgstr "Эффект металла в рассеянном свете, слегка полупрозрачного по краям" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:94 -msgctxt "Palette" -msgid "darkseagreen (#8FBC8F)" -msgstr "darkseagreen (#8FBC8F)" +#: ../share/filters/filters.svg.h:214 +msgid "Dragee" +msgstr "Драже" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:95 -msgctxt "Palette" -msgid "forestgreen (#228B22)" -msgstr "forestgreen (#228B22)" +#: ../share/filters/filters.svg.h:216 +msgid "Gel Ridge with a pearlescent look" +msgstr "Гелевая кромка жемчужного вида" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:96 -msgctxt "Palette" -msgid "limegreen (#32CD32)" -msgstr "limegreen (#32CD32)" +#: ../share/filters/filters.svg.h:218 +msgid "Raised Border" +msgstr "Приподнятый край" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:97 -msgctxt "Palette" -msgid "lightgreen (#90EE90)" -msgstr "lightgreen (#90EE90)" +#: ../share/filters/filters.svg.h:220 +msgid "Strongly raised border around a flat surface" +msgstr "Высоко поднятая над плоской поверхностью фаска" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:98 -msgctxt "Palette" -msgid "palegreen (#98FB98)" -msgstr "palegreen (#98FB98)" +#: ../share/filters/filters.svg.h:222 +msgid "Metallized Ridge" +msgstr "Металлизированная кромка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:99 -msgctxt "Palette" -msgid "darkgreen (#006400)" -msgstr "darkgreen (#006400)" +#: ../share/filters/filters.svg.h:224 +msgid "Gel Ridge metallized at its top" +msgstr "Гелевая кромка с металликом наверху" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:100 -msgctxt "Palette" -msgid "green (#008000)" -msgstr "green (#008000)" +#: ../share/filters/filters.svg.h:226 +msgid "Fat Oil" +msgstr "Жирная масляная краска" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:101 -msgctxt "Palette" -msgid "lime (#00FF00)" -msgstr "lime (#00FF00)" +#: ../share/filters/filters.svg.h:228 +msgid "Fat oil with some adjustable turbulence" +msgstr "Жирная масляная краска с регулируемой турбулентностью" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:102 -msgctxt "Palette" -msgid "honeydew (#F0FFF0)" -msgstr "honeydew (#F0FFF0)" +#: ../share/filters/filters.svg.h:230 +msgid "Black Hole" +msgstr "Чёрная дыра" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:103 -msgctxt "Palette" -msgid "seagreen (#2E8B57)" -msgstr "seagreen (#2E8B57)" +#: ../share/filters/filters.svg.h:231 ../share/filters/filters.svg.h:275 +#: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 +#: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 +#: ../src/extension/internal/filter/morphology.h:76 +#: ../src/extension/internal/filter/morphology.h:203 +#: ../src/filter-enums.cpp:31 +msgid "Morphology" +msgstr "Морфология" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:104 -msgctxt "Palette" -msgid "mediumseagreen (#3CB371)" -msgstr "mediumseagreen (#3CB371)" +#: ../share/filters/filters.svg.h:232 +msgid "Creates a black light inside and outside" +msgstr "Создать черный свет изнутри и снаружи" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:105 -msgctxt "Palette" -msgid "springgreen (#00FF7F)" -msgstr "springgreen (#00FF7F)" +#: ../share/filters/filters.svg.h:234 +msgid "Cubes" +msgstr "Кубики" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:106 -msgctxt "Palette" -msgid "mintcream (#F5FFFA)" -msgstr "mintcream (#F5FFFA)" +#: ../share/filters/filters.svg.h:236 +msgid "Scattered cubes; adjust the Morphology primitive to vary size" +msgstr "" +"Эффект разбросанных кубиков; размер меняется коррекцией примитива Морфология" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:107 -msgctxt "Palette" -msgid "mediumspringgreen (#00FA9A)" -msgstr "mediumspringgreen (#00FA9A)" +#: ../share/filters/filters.svg.h:238 +#, fuzzy +msgid "Peel Off" +msgstr "Шелуха" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:108 -msgctxt "Palette" -msgid "mediumaquamarine (#66CDAA)" -msgstr "mediumaquamarine (#66CDAA)" +#: ../share/filters/filters.svg.h:240 +msgid "Peeling painting on a wall" +msgstr "Отслаивающаяся от стены краска" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:109 -msgctxt "Palette" -msgid "aquamarine (#7FFFD4)" -msgstr "aquamarine (#7FFFD4)" +#: ../share/filters/filters.svg.h:242 +msgid "Gold Splatter" +msgstr "Золотые брызги" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:110 -msgctxt "Palette" -msgid "turquoise (#40E0D0)" -msgstr "turquoise (#40E0D0)" +#: ../share/filters/filters.svg.h:244 +msgid "Splattered cast metal, with golden highlights" +msgstr "Брызги металла с золотистыми бликами" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:111 -msgctxt "Palette" -msgid "lightseagreen (#20B2AA)" -msgstr "lightseagreen (#20B2AA)" +#: ../share/filters/filters.svg.h:246 +#, fuzzy +msgid "Gold Paste" +msgstr "Золотая паста" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:112 -msgctxt "Palette" -msgid "mediumturquoise (#48D1CC)" -msgstr "mediumturquoise (#48D1CC)" +#: ../share/filters/filters.svg.h:248 +msgid "Fat pasted cast metal, with golden highlights" +msgstr "Толстый пласт металла с золотистыми бликами" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:113 -msgctxt "Palette" -msgid "darkslategray (#2F4F4F)" -msgstr "darkslategray (#2F4F4F)" +#: ../share/filters/filters.svg.h:250 +msgid "Crumpled Plastic" +msgstr "Мятый пластик" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:114 -msgctxt "Palette" -msgid "paleturquoise (#AFEEEE)" -msgstr "paleturquoise (#AFEEEE)" +#: ../share/filters/filters.svg.h:252 +msgid "Crumpled matte plastic, with melted edge" +msgstr "Мятый матовый пластик с оплавленными краями" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:115 -msgctxt "Palette" -msgid "teal (#008080)" -msgstr "teal (#008080)" +#: ../share/filters/filters.svg.h:254 +msgid "Enamel Jewelry" +msgstr "Финифть" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:116 -msgctxt "Palette" -msgid "darkcyan (#008B8B)" -msgstr "darkcyan (#008B8B)" +#: ../share/filters/filters.svg.h:256 +msgid "Slightly cracked enameled texture" +msgstr "Текстура слегка потрескавшейся финифти" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:117 -msgctxt "Palette" -msgid "cyan (#00FFFF)" -msgstr "cyan (#00FFFF)" +#: ../share/filters/filters.svg.h:258 +msgid "Rough Paper" +msgstr "Шероховатая бумага" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:118 -msgctxt "Palette" -msgid "lightcyan (#E0FFFF)" -msgstr "lightcyan (#E0FFFF)" +#: ../share/filters/filters.svg.h:260 +msgid "Aquarelle paper effect which can be used for pictures as for objects" +msgstr "Эффект бумаги для акварели; годится для растровых и векторных объектов" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:119 -msgctxt "Palette" -msgid "azure (#F0FFFF)" -msgstr "azure (#F0FFFF)" +#: ../share/filters/filters.svg.h:262 +#, fuzzy +msgid "Rough and Glossy" +msgstr "Грубая глянцевая бумага" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:120 -msgctxt "Palette" -msgid "darkturquoise (#00CED1)" -msgstr "darkturquoise (#00CED1)" +#: ../share/filters/filters.svg.h:264 +msgid "" +"Crumpled glossy paper effect which can be used for pictures as for objects" +msgstr "Мятая глянцевая бумага; можно применять к готовым рисункам" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:121 -msgctxt "Palette" -msgid "cadetblue (#5F9EA0)" -msgstr "cadetblue (#5F9EA0)" +#: ../share/filters/filters.svg.h:266 +#, fuzzy +msgid "In and Out" +msgstr "Внутри и снаружи" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:122 -msgctxt "Palette" -msgid "powderblue (#B0E0E6)" -msgstr "powderblue (#B0E0E6)" +#: ../share/filters/filters.svg.h:268 +msgid "Inner colorized shadow, outer black shadow" +msgstr "Внутренняя цветная и черная внешняя тени" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:123 -msgctxt "Palette" -msgid "lightblue (#ADD8E6)" -msgstr "lightblue (#ADD8E6)" +#: ../share/filters/filters.svg.h:270 +msgid "Air Spray" +msgstr "Аэрограф" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:124 -msgctxt "Palette" -msgid "deepskyblue (#00BFFF)" -msgstr "deepskyblue (#00BFFF)" +#: ../share/filters/filters.svg.h:272 +msgid "Convert to small scattered particles with some thickness" +msgstr "Превратить в маленькие рассеянные частицы некоторой толщины" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:125 -msgctxt "Palette" -msgid "skyblue (#87CEEB)" -msgstr "skyblue (#87CEEB)" +#: ../share/filters/filters.svg.h:274 +#, fuzzy +msgid "Warm Inside" +msgstr "Внутреннее тепло" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:126 -msgctxt "Palette" -msgid "lightskyblue (#87CEFA)" -msgstr "lightskyblue (#87CEFA)" +#: ../share/filters/filters.svg.h:276 +msgid "Blurred colorized contour, filled inside" +msgstr "Заполненный контур с размытой обводкой" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:127 -msgctxt "Palette" -msgid "steelblue (#4682B4)" -msgstr "steelblue (#4682B4)" +#: ../share/filters/filters.svg.h:278 +#, fuzzy +msgid "Cool Outside" +msgstr "Прохлада снаружи" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:128 -msgctxt "Palette" -msgid "aliceblue (#F0F8FF)" -msgstr "aliceblue (#F0F8FF)" +#: ../share/filters/filters.svg.h:280 +msgid "Blurred colorized contour, empty inside" +msgstr "Пустой контур с размытой обводкой" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:129 -msgctxt "Palette" -msgid "dodgerblue (#1E90FF)" -msgstr "dodgerblue (#1E90FF)" +#: ../share/filters/filters.svg.h:282 +#, fuzzy +msgid "Electronic Microscopy" +msgstr "Электронный микроскоп" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:130 -msgctxt "Palette" -msgid "slategray (#708090)" -msgstr "slategray (#708090)" +#: ../share/filters/filters.svg.h:284 +msgid "" +"Bevel, crude light, discoloration and glow like in electronic microscopy" +msgstr "" +"Фаска, жёсткий свет, обесцвечивание и свечение как в электронном микроскопе" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:131 -msgctxt "Palette" -msgid "lightslategray (#778899)" -msgstr "lightslategray (#778899)" +#: ../share/filters/filters.svg.h:286 +msgid "Tartan" +msgstr "Шотландка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:132 -msgctxt "Palette" -msgid "lightsteelblue (#B0C4DE)" -msgstr "lightsteelblue (#B0C4DE)" +#: ../share/filters/filters.svg.h:288 +msgid "Checkered tartan pattern" +msgstr "Клетчатая шерстяная материя" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:133 -msgctxt "Palette" -msgid "cornflowerblue (#6495ED)" -msgstr "cornflowerblue (#6495ED)" +#: ../share/filters/filters.svg.h:290 +#, fuzzy +msgid "Shaken Liquid" +msgstr "Взболтанная жидкость" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:134 -msgctxt "Palette" -msgid "royalblue (#4169E1)" -msgstr "royalblue (#4169E1)" +#: ../share/filters/filters.svg.h:292 +msgid "Colorizable filling with flow inside like transparency" +msgstr "Раскрашиваемая заливка с внутренним полупрозрачным потоком" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:135 -msgctxt "Palette" -msgid "midnightblue (#191970)" -msgstr "midnightblue (#191970)" +#: ../share/filters/filters.svg.h:294 +#, fuzzy +msgid "Soft Focus Lens" +msgstr "Размывание вне фокуса" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:136 -msgctxt "Palette" -msgid "lavender (#E6E6FA)" -msgstr "lavender (#E6E6FA)" +#: ../share/filters/filters.svg.h:296 +msgid "Glowing image content without blurring it" +msgstr "Свечение содержимого объекта без размывания" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:137 -msgctxt "Palette" -msgid "navy (#000080)" -msgstr "navy (#000080)" +#: ../share/filters/filters.svg.h:298 +#, fuzzy +msgid "Stained Glass" +msgstr "Треснутое стекло" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:138 -msgctxt "Palette" -msgid "darkblue (#00008B)" -msgstr "darkblue (#00008B)" +#: ../share/filters/filters.svg.h:300 +msgid "Illuminated stained glass effect" +msgstr "Иллюминированный эффект тонированного стекла" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:139 -msgctxt "Palette" -msgid "mediumblue (#0000CD)" -msgstr "mediumblue (#0000CD)" +#: ../share/filters/filters.svg.h:302 +#, fuzzy +msgid "Dark Glass" +msgstr "Тёмное стекло" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:140 -msgctxt "Palette" -msgid "blue (#0000FF)" -msgstr "blue (#0000FF)" +#: ../share/filters/filters.svg.h:304 +msgid "Illuminated glass effect with light coming from beneath" +msgstr "Эффект подсвеченного стекла, при котором свет исходит снизу" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:141 -msgctxt "Palette" -msgid "ghostwhite (#F8F8FF)" -msgstr "ghostwhite (#F8F8FF)" +#: ../share/filters/filters.svg.h:306 +#, fuzzy +msgid "HSL Bumps Alpha" +msgstr "Выпуклости HSL с альфа-каналом" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:142 -msgctxt "Palette" -msgid "slateblue (#6A5ACD)" -msgstr "slateblue (#6A5ACD)" +#: ../share/filters/filters.svg.h:308 +msgid "Same as HSL Bumps but with transparent highlights" +msgstr "То же, что и Выпуклости HSL, но с прозрачными яркими участками" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:143 -msgctxt "Palette" -msgid "darkslateblue (#483D8B)" -msgstr "darkslateblue (#483D8B)" +#: ../share/filters/filters.svg.h:310 +#, fuzzy +msgid "Bubbly Bumps Alpha" +msgstr "Пузыристые выпуклости с альфа-каналом" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:144 -msgctxt "Palette" -msgid "mediumslateblue (#7B68EE)" -msgstr "mediumslateblue (#7B68EE)" +#: ../share/filters/filters.svg.h:312 +msgid "Same as Bubbly Bumps but with transparent highlights" +msgstr "То же, что и Пузыристые выпуклости, но с прозрачными яркими участками" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:145 -msgctxt "Palette" -msgid "mediumpurple (#9370DB)" -msgstr "mediumpurple (#9370DB)" +#: ../share/filters/filters.svg.h:314 ../share/filters/filters.svg.h:362 +#, fuzzy +msgid "Torn Edges" +msgstr "Неровные края" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:146 -msgctxt "Palette" -msgid "blueviolet (#8A2BE2)" -msgstr "blueviolet (#8A2BE2)" +#: ../share/filters/filters.svg.h:316 ../share/filters/filters.svg.h:364 +msgid "" +"Displace the outside of shapes and pictures without altering their content" +msgstr "" +"Сместить внешнюю часть объектов и растровых изображений без изменения их " +"содержимого" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:147 -msgctxt "Palette" -msgid "indigo (#4B0082)" -msgstr "indigo (#4B0082)" +#: ../share/filters/filters.svg.h:318 +#, fuzzy +msgid "Roughen Inside" +msgstr "Огрубление изнутри" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:148 -msgctxt "Palette" -msgid "darkorchid (#9932CC)" -msgstr "darkorchid (#9932CC)" +#: ../share/filters/filters.svg.h:320 +msgid "Roughen all inside shapes" +msgstr "Огрубление всего внутри объектов" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:149 -msgctxt "Palette" -msgid "darkviolet (#9400D3)" -msgstr "darkviolet (#9400D3)" +#: ../share/filters/filters.svg.h:322 +msgid "Evanescent" +msgstr "Мгновение" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:150 -msgctxt "Palette" -msgid "mediumorchid (#BA55D3)" -msgstr "mediumorchid (#BA55D3)" +#: ../share/filters/filters.svg.h:324 +msgid "" +"Blur the contents of objects, preserving the outline and adding progressive " +"transparency at edges" +msgstr "" +"Размыть содержимое объектов, сохраняя контур и добавляя нарастающую " +"прозрачность по краям" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:151 -msgctxt "Palette" -msgid "thistle (#D8BFD8)" -msgstr "thistle (#D8BFD8)" +#: ../share/filters/filters.svg.h:326 +#, fuzzy +msgid "Chalk and Sponge" +msgstr "Мел и губка" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:152 -msgctxt "Palette" -msgid "plum (#DDA0DD)" -msgstr "plum (#DDA0DD)" +#: ../share/filters/filters.svg.h:328 +msgid "Low turbulence gives sponge look and high turbulence chalk" +msgstr "Низкая турбулентность создает эффект губки, а высокая — мела" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:153 -msgctxt "Palette" -msgid "violet (#EE82EE)" -msgstr "violet (#EE82EE)" +#: ../share/filters/filters.svg.h:330 +msgid "People" +msgstr "Толпа" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:154 -msgctxt "Palette" -msgid "purple (#800080)" -msgstr "purple (#800080)" +#: ../share/filters/filters.svg.h:332 +msgid "Colorized blotches, like a crowd of people" +msgstr "Разноцветные пятна, напоминающие толпу людей" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:155 -msgctxt "Palette" -msgid "darkmagenta (#8B008B)" -msgstr "darkmagenta (#8B008B)" +#: ../share/filters/filters.svg.h:334 +msgid "Scotland" +msgstr "Шотландия" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:156 -msgctxt "Palette" -msgid "magenta (#FF00FF)" -msgstr "magenta (#FF00FF)" +#: ../share/filters/filters.svg.h:336 +msgid "Colorized mountain tops out of the fog" +msgstr "Раскрашенные верхушки гор, выглядывающие из тумана" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:157 -msgctxt "Palette" -msgid "orchid (#DA70D6)" -msgstr "orchid (#DA70D6)" +#: ../share/filters/filters.svg.h:338 +msgid "Garden of Delights" +msgstr "Сады земных наслаждений" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:158 -msgctxt "Palette" -msgid "mediumvioletred (#C71585)" -msgstr "mediumvioletred (#C71585)" +#: ../share/filters/filters.svg.h:340 +msgid "" +"Phantasmagorical turbulent wisps, like Hieronymus Bosch's Garden of Delights" +msgstr "" +"Фантасмагорическая турбулентность, напоминающая «Сады земных наслаждений» " +"Иеронима Босха" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:159 -msgctxt "Palette" -msgid "deeppink (#FF1493)" -msgstr "deeppink (#FF1493)" +#: ../share/filters/filters.svg.h:342 +msgid "Cutout Glow" +msgstr "Вырезанное свечение" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:160 -msgctxt "Palette" -msgid "hotpink (#FF69B4)" -msgstr "hotpink (#FF69B4)" +#: ../share/filters/filters.svg.h:344 +msgid "In and out glow with a possible offset and colorizable flood" +msgstr "" +"Свечение изнутри и снаружи с возможным смещением и раскрашиваемой заливкой" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:161 -msgctxt "Palette" -msgid "lavenderblush (#FFF0F5)" -msgstr "lavenderblush (#FFF0F5)" +#: ../share/filters/filters.svg.h:346 +msgid "Dark Emboss" +msgstr "Тёмный рельеф" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:162 -msgctxt "Palette" -msgid "palevioletred (#DB7093)" -msgstr "palevioletred (#DB7093)" +#: ../share/filters/filters.svg.h:348 +msgid "Emboss effect : 3D relief where white is replaced by black" +msgstr "Эффект рельефа, где белое заменяется черным" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:163 -msgctxt "Palette" -msgid "crimson (#DC143C)" -msgstr "crimson (#DC143C)" +#: ../share/filters/filters.svg.h:350 +#, fuzzy +msgid "Bubbly Bumps Matte" +msgstr "Пузыристые матовые выпуклости" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:164 -msgctxt "Palette" -msgid "pink (#FFC0CB)" -msgstr "pink (#FFC0CB)" +#: ../share/filters/filters.svg.h:352 +msgid "Same as Bubbly Bumps but with a diffuse light instead of a specular one" +msgstr "" +"То же, что и пузыристые выпуклости, но с рассеянным, а не отраженным светом" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:165 -msgctxt "Palette" -msgid "lightpink (#FFB6C1)" -msgstr "lightpink (#FFB6C1)" +#: ../share/filters/filters.svg.h:354 +#, fuzzy +msgid "Blotting Paper" +msgstr "Промокшая бумага" -#. Palette: ./svg.gpl -#: ../share/palettes/palettes.h:166 -msgctxt "Palette" -msgid "rebeccapurple (#663399)" -msgstr "" +#: ../share/filters/filters.svg.h:356 +msgid "Inkblot on blotting paper" +msgstr "Чернильное пятно на промокшей бумаге" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:167 -msgctxt "Palette" -msgid "Butter 1" -msgstr "Butter 1" +#: ../share/filters/filters.svg.h:358 +#, fuzzy +msgid "Wax Print" +msgstr "Восковая печать" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:168 -msgctxt "Palette" -msgid "Butter 2" -msgstr "Butter 2" +#: ../share/filters/filters.svg.h:360 +msgid "Wax print on tissue texture" +msgstr "Восковая печать на бумажной текстуре" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:169 -msgctxt "Palette" -msgid "Butter 3" -msgstr "Butter 3" +#: ../share/filters/filters.svg.h:366 +msgid "Watercolor" +msgstr "Акварель" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:170 -msgctxt "Palette" -msgid "Chameleon 1" -msgstr "Chameleon 1" +#: ../share/filters/filters.svg.h:368 +msgid "Cloudy watercolor effect" +msgstr "Облачный акварельный эффект" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:171 -msgctxt "Palette" -msgid "Chameleon 2" -msgstr "Chameleon 2" +#: ../share/filters/filters.svg.h:370 +msgid "Felt" +msgstr "Войлок" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:172 -msgctxt "Palette" -msgid "Chameleon 3" -msgstr "Chameleon 3" +#: ../share/filters/filters.svg.h:372 +msgid "" +"Felt like texture with color turbulence and slightly darker at the edges" +msgstr "" +"Текстура, напоминающая войлок, с цветной турбулентностью, слегка темная по " +"краям" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:173 -msgctxt "Palette" -msgid "Orange 1" -msgstr "Orange 1" +#: ../share/filters/filters.svg.h:374 +#, fuzzy +msgid "Ink Paint" +msgstr "Краска" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:174 -msgctxt "Palette" -msgid "Orange 2" -msgstr "Orange 2" +#: ../share/filters/filters.svg.h:376 +msgid "Ink paint on paper with some turbulent color shift" +msgstr "Цветная краска на бумаге, с небольшим турбулентным цветовым сдвигом" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:175 -msgctxt "Palette" -msgid "Orange 3" -msgstr "Orange 3" +#: ../share/filters/filters.svg.h:378 +#, fuzzy +msgid "Tinted Rainbow" +msgstr "Окрашенная радуга" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:176 -msgctxt "Palette" -msgid "Sky Blue 1" -msgstr "Sky Blue 1" +#: ../share/filters/filters.svg.h:380 +msgid "Smooth rainbow colors melted along the edges and colorizable" +msgstr "" +"Мягкие цвета радуги, оплавляющие объект по краям и зависящие от заливки " +"объекта" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:177 -msgctxt "Palette" -msgid "Sky Blue 2" -msgstr "Sky Blue 2" +#: ../share/filters/filters.svg.h:382 +#, fuzzy +msgid "Melted Rainbow" +msgstr "Расплавленная радуга" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:178 -msgctxt "Palette" -msgid "Sky Blue 3" -msgstr "Sky Blue 3" +#: ../share/filters/filters.svg.h:384 +msgid "Smooth rainbow colors slightly melted along the edges" +msgstr "Мягкие радужные цвета цвета, слегка оплавляющие края объекта" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:179 -msgctxt "Palette" -msgid "Plum 1" -msgstr "Plum 1" +#: ../share/filters/filters.svg.h:386 +#, fuzzy +msgid "Flex Metal" +msgstr "Гибкий металл" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:180 -msgctxt "Palette" -msgid "Plum 2" -msgstr "Plum 2" +#: ../share/filters/filters.svg.h:388 +msgid "Bright, polished uneven metal casting, colorizable" +msgstr "Яркая и отполированная раскрашиваемая металлическая отливка" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:181 -msgctxt "Palette" -msgid "Plum 3" -msgstr "Plum 3" +#: ../share/filters/filters.svg.h:390 +#, fuzzy +msgid "Wavy Tartan" +msgstr "Волнистая шотландка" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:182 -msgctxt "Palette" -msgid "Chocolate 1" -msgstr "Chocolate 1" +#: ../share/filters/filters.svg.h:392 +msgid "Tartan pattern with a wavy displacement and bevel around the edges" +msgstr "" +"Узор клетчатой шерстяной материи с волнистым искажением и фаской по краям" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:183 -msgctxt "Palette" -msgid "Chocolate 2" -msgstr "Chocolate 2" +#: ../share/filters/filters.svg.h:394 +msgid "3D Marble" +msgstr "Объёмный мрамор" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:184 -msgctxt "Palette" -msgid "Chocolate 3" -msgstr "Chocolate 3" +#: ../share/filters/filters.svg.h:396 +msgid "3D warped marble texture" +msgstr "Объемная текстура мрамора" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:185 -msgctxt "Palette" -msgid "Scarlet Red 1" -msgstr "Scarlet Red 1" +#: ../share/filters/filters.svg.h:398 +msgid "3D Wood" +msgstr "Объёмное дерево" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:186 -msgctxt "Palette" -msgid "Scarlet Red 2" -msgstr "Scarlet Red 2" +#: ../share/filters/filters.svg.h:400 +msgid "3D warped, fibered wood texture" +msgstr "Объёмная текстура древесины" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:187 -msgctxt "Palette" -msgid "Scarlet Red 3" -msgstr "Scarlet Red 3" +#: ../share/filters/filters.svg.h:402 +msgid "3D Mother of Pearl" +msgstr "Объёмный перламутр" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:188 -#, fuzzy -msgctxt "Palette" -msgid "Snowy White" -msgstr "Белый" +#: ../share/filters/filters.svg.h:404 +msgid "3D warped, iridescent pearly shell texture" +msgstr "Объёмная текстура перламутровой раковины" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:189 -msgctxt "Palette" -msgid "Aluminium 1" -msgstr "Aluminium 1" +#: ../share/filters/filters.svg.h:406 +msgid "Tiger Fur" +msgstr "Тигровая шкура" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:190 -msgctxt "Palette" -msgid "Aluminium 2" -msgstr "Aluminium 2" +#: ../share/filters/filters.svg.h:408 +msgid "Tiger fur pattern with folds and bevel around the edges" +msgstr "Узор тигровой шкуры со складками и фаской по краям" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:191 -msgctxt "Palette" -msgid "Aluminium 3" -msgstr "Aluminium 3" +#: ../share/filters/filters.svg.h:410 +msgid "Black Light" +msgstr "Черный свет" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:192 -msgctxt "Palette" -msgid "Aluminium 4" -msgstr "Aluminium 4" +#: ../share/filters/filters.svg.h:411 ../share/filters/filters.svg.h:575 +#: ../share/filters/filters.svg.h:587 ../share/filters/filters.svg.h:627 +#: ../share/filters/filters.svg.h:631 ../share/filters/filters.svg.h:819 +#: ../share/filters/filters.svg.h:827 ../share/filters/filters.svg.h:831 +#: ../src/extension/internal/bitmap/colorize.cpp:52 +#: ../src/extension/internal/filter/bumps.h:101 +#: ../src/extension/internal/filter/bumps.h:321 +#: ../src/extension/internal/filter/bumps.h:328 +#: ../src/extension/internal/filter/color.h:82 +#: ../src/extension/internal/filter/color.h:164 +#: ../src/extension/internal/filter/color.h:171 +#: ../src/extension/internal/filter/color.h:262 +#: ../src/extension/internal/filter/color.h:340 +#: ../src/extension/internal/filter/color.h:347 +#: ../src/extension/internal/filter/color.h:437 +#: ../src/extension/internal/filter/color.h:532 +#: ../src/extension/internal/filter/color.h:654 +#: ../src/extension/internal/filter/color.h:751 +#: ../src/extension/internal/filter/color.h:830 +#: ../src/extension/internal/filter/color.h:921 +#: ../src/extension/internal/filter/color.h:1049 +#: ../src/extension/internal/filter/color.h:1119 +#: ../src/extension/internal/filter/color.h:1212 +#: ../src/extension/internal/filter/color.h:1324 +#: ../src/extension/internal/filter/color.h:1429 +#: ../src/extension/internal/filter/color.h:1505 +#: ../src/extension/internal/filter/color.h:1609 +#: ../src/extension/internal/filter/color.h:1616 +#: ../src/extension/internal/filter/morphology.h:194 +#: ../src/extension/internal/filter/overlays.h:73 +#: ../src/extension/internal/filter/paint.h:99 +#: ../src/extension/internal/filter/paint.h:713 +#: ../src/extension/internal/filter/paint.h:717 +#: ../src/extension/internal/filter/shadows.h:73 +#: ../src/extension/internal/filter/transparency.h:345 +#: ../src/filter-enums.cpp:66 ../src/ui/dialog/clonetiler.cpp:832 +#: ../src/ui/dialog/clonetiler.cpp:983 +#: ../src/ui/dialog/document-properties.cpp:157 +#: ../share/extensions/color_HSL_adjust.inx.h:20 +#: ../share/extensions/color_blackandwhite.inx.h:3 +#: ../share/extensions/color_brighter.inx.h:2 +#: ../share/extensions/color_custom.inx.h:15 +#: ../share/extensions/color_darker.inx.h:2 +#: ../share/extensions/color_desaturate.inx.h:2 +#: ../share/extensions/color_grayscale.inx.h:2 +#: ../share/extensions/color_lesshue.inx.h:2 +#: ../share/extensions/color_lesslight.inx.h:2 +#: ../share/extensions/color_lesssaturation.inx.h:2 +#: ../share/extensions/color_morehue.inx.h:2 +#: ../share/extensions/color_morelight.inx.h:2 +#: ../share/extensions/color_moresaturation.inx.h:2 +#: ../share/extensions/color_negative.inx.h:2 +#: ../share/extensions/color_randomize.inx.h:8 +#: ../share/extensions/color_removeblue.inx.h:2 +#: ../share/extensions/color_removegreen.inx.h:2 +#: ../share/extensions/color_removered.inx.h:2 +#: ../share/extensions/color_replace.inx.h:6 +#: ../share/extensions/color_rgbbarrel.inx.h:2 +#: ../share/extensions/interp_att_g.inx.h:19 +msgid "Color" +msgstr "Цвет" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:193 -msgctxt "Palette" -msgid "Aluminium 5" -msgstr "Aluminium 5" +#: ../share/filters/filters.svg.h:412 +msgid "Light areas turn to black" +msgstr "Светлые области становятся черными" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:194 -msgctxt "Palette" -msgid "Aluminium 6" -msgstr "Aluminium 6" +#: ../share/filters/filters.svg.h:414 +msgid "Film Grain" +msgstr "Плёночный шум" -#. Palette: ./Tango-Palette.gpl -#: ../share/palettes/palettes.h:195 -#, fuzzy -msgctxt "Palette" -msgid "Jet Black" -msgstr "Чёрный" +#: ../share/filters/filters.svg.h:416 +msgid "Adds a small scale graininess" +msgstr "Добавить небольшую зашумленность как на фотопленке" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:2 -msgctxt "Symbol" -msgid "AIGA Symbol Signs" +#: ../share/filters/filters.svg.h:418 +msgid "Plaster Color" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 -msgctxt "Symbol" -msgid "Telephone" +#: ../share/filters/filters.svg.h:420 +msgid "Colored plaster emboss effect" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6 -msgctxt "Symbol" -msgid "Mail" -msgstr "" +#: ../share/filters/filters.svg.h:422 +msgid "Velvet Bumps" +msgstr "Вельветовые шишки" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8 -#, fuzzy -msgctxt "Symbol" -msgid "Currency Exchange" -msgstr "Текущий слой" +#: ../share/filters/filters.svg.h:424 +msgid "Gives Smooth Bumps velvet like" +msgstr "Создать выпуклости наподобие вельветовой ткани" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10 -msgctxt "Symbol" -msgid "Currency Exchange - Euro" -msgstr "" +#: ../share/filters/filters.svg.h:426 +#, fuzzy +msgid "Comics Cream" +msgstr "Кремовый комикс" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12 -msgctxt "Symbol" -msgid "Cashier" -msgstr "" +#: ../share/filters/filters.svg.h:427 ../share/filters/filters.svg.h:727 +#: ../share/filters/filters.svg.h:731 ../share/filters/filters.svg.h:735 +#: ../share/filters/filters.svg.h:739 ../share/filters/filters.svg.h:743 +#: ../share/filters/filters.svg.h:747 ../share/filters/filters.svg.h:751 +#: ../share/filters/filters.svg.h:755 ../share/filters/filters.svg.h:759 +#: ../share/filters/filters.svg.h:763 ../share/filters/filters.svg.h:767 +#: ../share/filters/filters.svg.h:771 ../share/filters/filters.svg.h:775 +#: ../share/filters/filters.svg.h:779 ../share/filters/filters.svg.h:783 +#: ../share/filters/filters.svg.h:787 ../share/filters/filters.svg.h:791 +#: ../share/filters/filters.svg.h:795 +msgid "Non realistic 3D shaders" +msgstr "Нереалистичные 3D-шейдеры" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 -#, fuzzy -msgctxt "Symbol" -msgid "First Aid" -msgstr "Первый слайд:" +#: ../share/filters/filters.svg.h:428 +msgid "Comics shader with creamy waves transparency" +msgstr "Комиксовый шейдер с кремовой волнистой полупрозрачностью" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16 +#: ../share/filters/filters.svg.h:430 #, fuzzy -msgctxt "Symbol" -msgid "Lost and Found" -msgstr "Не закруглён" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18 -msgctxt "Symbol" -msgid "Coat Check" -msgstr "" +msgid "Chewing Gum" +msgstr "Жевательная резинка" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20 -msgctxt "Symbol" -msgid "Baggage Lockers" +#: ../share/filters/filters.svg.h:432 +msgid "" +"Creates colorizable blotches which smoothly flow over the edges of the lines " +"at their crossings" msgstr "" +"Создать раскрашиваемые пятна, слегка вытекающие за края линий в местах " +"пересечений этих линий" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22 -msgctxt "Symbol" -msgid "Escalator" -msgstr "" +#: ../share/filters/filters.svg.h:434 +#, fuzzy +msgid "Dark And Glow" +msgstr "Тёмный и светящийся" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24 -msgctxt "Symbol" -msgid "Escalator Down" +#: ../share/filters/filters.svg.h:436 +msgid "Darkens the edge with an inner blur and adds a flexible glow" msgstr "" +"Затемнить края, добавить внутреннее размывание и настраиваемое свечение" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26 -msgctxt "Symbol" -msgid "Escalator Up" -msgstr "" +#: ../share/filters/filters.svg.h:438 +#, fuzzy +msgid "Warped Rainbow" +msgstr "Деформированная радуга" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28 -msgctxt "Symbol" -msgid "Stairs" +#: ../share/filters/filters.svg.h:440 +msgid "Smooth rainbow colors warped along the edges and colorizable" msgstr "" +"Мягкие радужные цвета, деформированные по краям и зависящие от заливки " +"объекта" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30 -msgctxt "Symbol" -msgid "Stairs Down" -msgstr "" +#: ../share/filters/filters.svg.h:442 +#, fuzzy +msgid "Rough and Dilate" +msgstr "Неровный и растянутый" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32 -msgctxt "Symbol" -msgid "Stairs Up" -msgstr "" +#: ../share/filters/filters.svg.h:444 +msgid "Create a turbulent contour around" +msgstr "Создать турбулентный контур вокруг" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34 +#: ../share/filters/filters.svg.h:446 #, fuzzy -msgctxt "Symbol" -msgid "Elevator" -msgstr "Высота" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36 -msgctxt "Symbol" -msgid "Toilets - Men" -msgstr "" +msgid "Old Postcard" +msgstr "Старая открытка" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38 -msgctxt "Symbol" -msgid "Toilets - Women" -msgstr "" +#: ../share/filters/filters.svg.h:448 +msgid "Slightly posterize and draw edges like on old printed postcards" +msgstr "Легкая постеризация и края как на старых открытках" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40 -msgctxt "Symbol" -msgid "Toilets" -msgstr "" +#: ../share/filters/filters.svg.h:450 +#, fuzzy +msgid "Dots Transparency" +msgstr "Прозрачные точки" -#. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42 -#: ../share/symbols/symbols.h:227 -msgctxt "Symbol" -msgid "Nursery" -msgstr "" +#: ../share/filters/filters.svg.h:452 +msgid "Gives a pointillist HSL sensitive transparency" +msgstr "Создать пуантилистическую прозрачность, чувствительную к HSL" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44 -msgctxt "Symbol" -msgid "Drinking Fountain" -msgstr "" +#: ../share/filters/filters.svg.h:454 +#, fuzzy +msgid "Canvas Transparency" +msgstr "Прозрачный холст" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46 +#: ../share/filters/filters.svg.h:456 #, fuzzy -msgctxt "Symbol" -msgid "Waiting Room" -msgstr "Сценарии" +msgid "Gives a canvas like HSL sensitive transparency." +msgstr "Создать похожую на холст прозрачность, чувствительную к HSL" -#. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 -#: ../share/symbols/symbols.h:308 +#: ../share/filters/filters.svg.h:458 #, fuzzy -msgctxt "Symbol" -msgid "Information" -msgstr "Информация" +msgid "Smear Transparency" +msgstr "Прозрачные мазки" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50 +#: ../share/filters/filters.svg.h:460 +msgid "" +"Paint objects with a transparent turbulence which turns around color edges" +msgstr "Закрасить объекты прозрачной турбулентностью, огибающей цветные края" + +#: ../share/filters/filters.svg.h:462 #, fuzzy -msgctxt "Symbol" -msgid "Hotel Information" -msgstr "Информация о странице" +msgid "Thick Paint" +msgstr "Густая краска" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52 +#: ../share/filters/filters.svg.h:464 +msgid "Thick painting effect with turbulence" +msgstr "Эффект густой краски с турбулентностью" + +#: ../share/filters/filters.svg.h:466 +msgid "Burst" +msgstr "Лопнувший шарик" + +#: ../share/filters/filters.svg.h:468 +msgid "Burst balloon texture crumpled and with holes" +msgstr "Текстура разорвавшегося воздушного шарика" + +#: ../share/filters/filters.svg.h:470 #, fuzzy -msgctxt "Symbol" -msgid "Air Transportation" -msgstr "Преобразование" +msgid "Embossed Leather" +msgstr "Рельефная кожа" -#. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54 -#: ../share/symbols/symbols.h:318 -msgctxt "Symbol" -msgid "Heliport" +#: ../share/filters/filters.svg.h:472 +msgid "" +"Combine a HSL edges detection bump with a leathery or woody and colorizable " +"texture" +msgstr "Эффект текстуры кожи или дерева с выдавливанием краев" + +#: ../share/filters/filters.svg.h:474 +msgid "Carnaval" +msgstr "Карнавал" + +#: ../share/filters/filters.svg.h:476 +msgid "White splotches evocating carnaval masks" +msgstr "Белые неровные пятна, напоминающие карнавальные маски" + +#: ../share/filters/filters.svg.h:478 +msgid "Plastify" +msgstr "Пластификация" + +#: ../share/filters/filters.svg.h:480 +msgid "" +"HSL edges detection bump with a wavy reflective surface effect and variable " +"crumple" msgstr "" +"Выпуклость по определенным краям HSL с эффектом волнистой отражающей " +"поверхности и переменной смятостью" -#. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56 -#: ../share/symbols/symbols.h:314 -msgctxt "Symbol" -msgid "Taxi" +#: ../share/filters/filters.svg.h:482 +msgid "Plaster" +msgstr "Штукатурка" + +#: ../share/filters/filters.svg.h:484 +msgid "" +"Combine a HSL edges detection bump with a matte and crumpled surface effect" msgstr "" +"Объединение выпуклости по определенным краям с эффектом сморщенной " +"поверхности" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58 -#, fuzzy -msgctxt "Symbol" -msgid "Bus" -msgstr "Размывание" +#: ../share/filters/filters.svg.h:486 +msgid "Rough Transparency" +msgstr "Грубая прозрачность" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60 -#, fuzzy -msgctxt "Symbol" -msgid "Ground Transportation" -msgstr "Преобразование" +#: ../share/filters/filters.svg.h:488 +msgid "Adds a turbulent transparency which displaces pixels at the same time" +msgstr "Добавить турбулентную прозрачность с одновременным смещением пикселов" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62 +#: ../share/filters/filters.svg.h:490 +msgid "Gouache" +msgstr "Гуашь" + +#: ../share/filters/filters.svg.h:492 +msgid "Partly opaque water color effect with bleed" +msgstr "Полупрозрачный эффект акварели с " + +#: ../share/filters/filters.svg.h:494 +msgid "Alpha Engraving" +msgstr "Альфа-гравировка" + +#: ../share/filters/filters.svg.h:496 +msgid "Gives a transparent engraving effect with rough line and filling" +msgstr "Создать прозрачный эффект гравюры с грубыми линиями и заливкой" + +#: ../share/filters/filters.svg.h:498 #, fuzzy -msgctxt "Symbol" -msgid "Rail Transportation" -msgstr "Преобразование" +msgid "Alpha Draw Liquid" +msgstr "Текучий прозрачный рисунок" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64 +#: ../share/filters/filters.svg.h:500 +msgid "Gives a transparent fluid drawing effect with rough line and filling" +msgstr "Создать текучий прозрачный эффект с грубыми линиями и заливкой" + +#: ../share/filters/filters.svg.h:502 #, fuzzy -msgctxt "Symbol" -msgid "Water Transportation" -msgstr "Преобразование" +msgid "Liquid Drawing" +msgstr "Экспрессионизм" -#. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66 -#: ../share/symbols/symbols.h:316 -msgctxt "Symbol" -msgid "Car Rental" +#: ../share/filters/filters.svg.h:504 +msgid "Gives a fluid and wavy expressionist drawing effect to images" msgstr "" +"Применить эффект текучего и волнистого рисунка в стиле экспрессионизма к " +"растровым изображениям" -#. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68 -#: ../share/symbols/symbols.h:228 -msgctxt "Symbol" -msgid "Restaurant" -msgstr "" +#: ../share/filters/filters.svg.h:506 +msgid "Marbled Ink" +msgstr "Мраморные чернила" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70 -msgctxt "Symbol" -msgid "Coffeeshop" -msgstr "" +#: ../share/filters/filters.svg.h:508 +msgid "Marbled transparency effect which conforms to image detected edges" +msgstr "Эффект прозрачного мрамора, соответствующего обнаруженным краям" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72 -#, fuzzy -msgctxt "Symbol" -msgid "Bar" -msgstr "Кора" +#: ../share/filters/filters.svg.h:510 +msgid "Thick Acrylic" +msgstr "Густая акриловая краска" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74 -msgctxt "Symbol" -msgid "Shops" -msgstr "" +#: ../share/filters/filters.svg.h:512 +msgid "Thick acrylic paint texture with high texture depth" +msgstr "Рельефная текстура густой акриловой краски" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76 -msgctxt "Symbol" -msgid "Barber Shop - Beauty Salon" -msgstr "" +#: ../share/filters/filters.svg.h:514 +msgid "Alpha Engraving B" +msgstr "Альфа-гравировка №2" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78 -msgctxt "Symbol" -msgid "Barber Shop" +#: ../share/filters/filters.svg.h:516 +msgid "" +"Gives a controllable roughness engraving effect to bitmaps and materials" msgstr "" +"Применить эффект регулируемой грубой гравировки к растровым изображениям или " +"материалам" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80 -msgctxt "Symbol" -msgid "Beauty Salon" -msgstr "" +#: ../share/filters/filters.svg.h:518 +msgid "Lapping" +msgstr "Плеск волн" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82 -msgctxt "Symbol" -msgid "Ticket Purchase" -msgstr "" +#: ../share/filters/filters.svg.h:520 +msgid "Something like a water noise" +msgstr "Что-то вроде водного шума" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84 -msgctxt "Symbol" -msgid "Baggage Check In" +#: ../share/filters/filters.svg.h:522 +msgid "Monochrome Transparency" +msgstr "Монохромная прозрачность" + +#: ../share/filters/filters.svg.h:523 ../share/filters/filters.svg.h:527 +#: ../share/filters/filters.svg.h:647 ../share/filters/filters.svg.h:651 +#: ../share/filters/filters.svg.h:823 +#: ../src/extension/internal/filter/transparency.h:70 +#: ../src/extension/internal/filter/transparency.h:141 +#: ../src/extension/internal/filter/transparency.h:215 +#: ../src/extension/internal/filter/transparency.h:288 +#: ../src/extension/internal/filter/transparency.h:350 +msgid "Fill and Transparency" +msgstr "Заливка и прозрачность" + +#: ../share/filters/filters.svg.h:524 +msgid "Convert to a colorizable transparent positive or negative" +msgstr "Преобразовать в раскрашиваемый прозрачный позитив или негатив" + +#: ../share/filters/filters.svg.h:526 +msgid "Saturation Map" +msgstr "Прокция насыщенности" + +#: ../share/filters/filters.svg.h:528 +msgid "" +"Creates an approximative semi-transparent and colorizable image of the " +"saturation levels" msgstr "" +"Создать приблизительное полупрозрачное и раскрашиваемое изображение уровней " +"насыщенности" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86 -msgctxt "Symbol" -msgid "Baggage Claim" +#: ../share/filters/filters.svg.h:530 +msgid "Riddled" +msgstr "Решето" + +#: ../share/filters/filters.svg.h:532 +msgid "Riddle the surface and add bump to images" +msgstr "Изрешетить поверхность и добавить выпуклости" + +#: ../share/filters/filters.svg.h:534 +msgid "Wrinkled Varnish" +msgstr "Смятая глазурь" + +#: ../share/filters/filters.svg.h:536 +msgid "Thick glossy and translucent paint texture with high depth" +msgstr "Толстая, блестящая, рельефная и полупрозрачная текстура краски" + +#: ../share/filters/filters.svg.h:538 +msgid "Canvas Bumps" +msgstr "Холщовые выпуклости" + +#: ../share/filters/filters.svg.h:540 +msgid "Canvas texture with an HSL sensitive height map" +msgstr "Текстура холста с чувствительной к HSL картой высот" + +#: ../share/filters/filters.svg.h:542 +#, fuzzy +msgid "Canvas Bumps Matte" +msgstr "Холщовые матовые выпуклости" + +#: ../share/filters/filters.svg.h:544 +msgid "Same as Canvas Bumps but with a diffuse light instead of a specular one" msgstr "" +"То же, что и холщовые выпуклости, но с рассеянным светом вместо отраженного" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88 +#: ../share/filters/filters.svg.h:546 #, fuzzy -msgctxt "Symbol" -msgid "Customs" -msgstr "Другой" +msgid "Canvas Bumps Alpha" +msgstr "Холщовые выпуклости с альфа-каналом" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90 +#: ../share/filters/filters.svg.h:548 +msgid "Same as Canvas Bumps but with transparent highlights" +msgstr "То же, что и холщовые выпуклости, но с прозрачными яркими участками" + +#: ../share/filters/filters.svg.h:550 #, fuzzy -msgctxt "Symbol" -msgid "Immigration" -msgstr "Основные параметры" +msgid "Bright Metal" +msgstr "Яркий металл" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92 +#: ../share/filters/filters.svg.h:552 +msgid "Bright metallic effect for any color" +msgstr "Яркий эффект металла для любого цвета" + +#: ../share/filters/filters.svg.h:554 #, fuzzy -msgctxt "Symbol" -msgid "Departing Flights" -msgstr "Конечная высота" +msgid "Deep Colors Plastic" +msgstr "Тёмный пластик" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94 +#: ../share/filters/filters.svg.h:556 +msgid "Transparent plastic with deep colors" +msgstr "Прозрачный пластик тёмных цветов" + +#: ../share/filters/filters.svg.h:558 #, fuzzy -msgctxt "Symbol" -msgid "Arriving Flights" -msgstr "Яркость" +msgid "Melted Jelly Matte" +msgstr "Матовое расплавленное желе" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96 -msgctxt "Symbol" -msgid "Smoking" -msgstr "" +#: ../share/filters/filters.svg.h:560 +msgid "Matte bevel with blurred edges" +msgstr "Матовая фаска с размытыми краями" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:97 ../share/symbols/symbols.h:98 -msgctxt "Symbol" -msgid "No Smoking" -msgstr "" +#: ../share/filters/filters.svg.h:562 +msgid "Melted Jelly" +msgstr "Расплавленное желе" -#. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 -#: ../share/symbols/symbols.h:325 -msgctxt "Symbol" -msgid "Parking" -msgstr "" +#: ../share/filters/filters.svg.h:564 +msgid "Glossy bevel with blurred edges" +msgstr "Блестящая фаска с размытыми краями" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102 -msgctxt "Symbol" -msgid "No Parking" -msgstr "" +#: ../share/filters/filters.svg.h:566 +#, fuzzy +msgid "Combined Lighting" +msgstr "Объединённое освещение" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104 -msgctxt "Symbol" -msgid "No Dogs" -msgstr "" +#: ../share/filters/filters.svg.h:568 +#: ../src/extension/internal/filter/bevels.h:231 +msgid "Basic specular bevel to use for building textures" +msgstr "Типичная отражающая фаска для создания текстур" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106 -msgctxt "Symbol" -msgid "No Entry" -msgstr "" +#: ../share/filters/filters.svg.h:570 +msgid "Tinfoil" +msgstr "Оловянная фольга" -#. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108 -#: ../share/symbols/symbols.h:218 -msgctxt "Symbol" -msgid "Exit" +#: ../share/filters/filters.svg.h:572 +msgid "Metallic foil effect combining two lighting types and variable crumple" msgstr "" +"Эффект металлической фольги, объединяющий два типа освещения и настраиваемую " +"смятость" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:109 ../share/symbols/symbols.h:110 -msgctxt "Symbol" -msgid "Fire Extinguisher" +#: ../share/filters/filters.svg.h:574 +#, fuzzy +msgid "Soft Colors" +msgstr "Мягкие цвета" + +#: ../share/filters/filters.svg.h:576 +msgid "Adds a colorizable edges glow inside objects and pictures" msgstr "" +"Создать раскрашиваемое свечение краёв внутри объектов и растровых изображений" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:111 ../share/symbols/symbols.h:112 +#: ../share/filters/filters.svg.h:578 #, fuzzy -msgctxt "Symbol" -msgid "Right Arrow" -msgstr "Справа" +msgid "Relief Print" +msgstr "Рельефный отпечаток" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114 -msgctxt "Symbol" -msgid "Forward and Right Arrow" +#: ../share/filters/filters.svg.h:580 +msgid "Bumps effect with a bevel, color flood and complex lighting" +msgstr "Эффект выпуклости с фаской, заливкой цветом и сложным освещением" + +#: ../share/filters/filters.svg.h:582 +msgid "Growing Cells" +msgstr "Растущие клетки" + +#: ../share/filters/filters.svg.h:584 +msgid "Random rounded living cells like fill" +msgstr "Заливка случайными круглыми объектами наподобие живых клеток" + +#: ../share/filters/filters.svg.h:586 +msgid "Fluorescence" +msgstr "Флюоресценция" + +#: ../share/filters/filters.svg.h:588 +msgid "Oversaturate colors which can be fluorescent in real world" msgstr "" +"Перенасытить цвета, которые в реальном мире могут быть флюоресцирующими" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116 +#: ../share/filters/filters.svg.h:590 #, fuzzy -msgctxt "Symbol" -msgid "Up Arrow" -msgstr "Стрелки" +msgid "Pixellize" +msgstr "Пиксел" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118 -msgctxt "Symbol" -msgid "Forward and Left Arrow" +#: ../share/filters/filters.svg.h:591 +#, fuzzy +msgid "Pixel tools" +msgstr "Пикселы" + +#: ../share/filters/filters.svg.h:592 +msgid "Reduce or remove antialiasing around shapes" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120 +#: ../share/filters/filters.svg.h:594 +msgid "Basic Diffuse Bump" +msgstr "" + +#: ../share/filters/filters.svg.h:596 #, fuzzy -msgctxt "Symbol" -msgid "Left Arrow" -msgstr "Стрелки" +msgid "Matte emboss effect" +msgstr "Удалить эффекты" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122 -msgctxt "Symbol" -msgid "Left and Down Arrow" +#: ../share/filters/filters.svg.h:598 +msgid "Basic Specular Bump" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124 +#: ../share/filters/filters.svg.h:600 #, fuzzy -msgctxt "Symbol" -msgid "Down Arrow" -msgstr "Стрелки" +msgid "Specular emboss effect" +msgstr "Степень отражения" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126 -msgctxt "Symbol" -msgid "Right and Down Arrow" +#: ../share/filters/filters.svg.h:602 +msgid "Basic Two Lights Bump" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128 -msgctxt "Symbol" -msgid "NPS Wheelchair Accessible - 1996" -msgstr "" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130 -msgctxt "Symbol" -msgid "NPS Wheelchair Accessible" -msgstr "" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:131 ../share/symbols/symbols.h:132 -msgctxt "Symbol" -msgid "New Wheelchair Accessible" -msgstr "" +#: ../share/filters/filters.svg.h:604 +#, fuzzy +msgid "Two types of lighting emboss effect" +msgstr "Вставить динамический контурный эффект" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:133 -msgctxt "Symbol" -msgid "Word Balloons" -msgstr "" +#: ../share/filters/filters.svg.h:606 +#, fuzzy +msgid "Linen Canvas" +msgstr "Холст" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:134 -msgctxt "Symbol" -msgid "Thought Balloon" -msgstr "" +#: ../share/filters/filters.svg.h:608 ../share/filters/filters.svg.h:616 +#, fuzzy +msgid "Painting canvas emboss effect" +msgstr "Вставить динамический контурный эффект" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:135 -msgctxt "Symbol" -msgid "Dream Speaking" -msgstr "" +#: ../share/filters/filters.svg.h:610 +#, fuzzy +msgid "Plasticine" +msgstr "Штукатурка" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:136 +#: ../share/filters/filters.svg.h:612 #, fuzzy -msgctxt "Symbol" -msgid "Rounded Balloon" -msgstr "Скруглённое" +msgid "Matte modeling paste emboss effect" +msgstr "Вставить динамический контурный эффект" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:137 +#: ../share/filters/filters.svg.h:614 #, fuzzy -msgctxt "Symbol" -msgid "Squared Balloon" -msgstr "Квадратные" +msgid "Rough Canvas Painting" +msgstr "Масляная краска" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:138 -msgctxt "Symbol" -msgid "Over the Phone" -msgstr "" +#: ../share/filters/filters.svg.h:618 +#, fuzzy +msgid "Paper Bump" +msgstr "Выпуклости" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:139 -msgctxt "Symbol" -msgid "Hip Balloon" -msgstr "" +#: ../share/filters/filters.svg.h:620 +#, fuzzy +msgid "Paper like emboss effect" +msgstr "Вставить динамический контурный эффект" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:140 +#: ../share/filters/filters.svg.h:622 #, fuzzy -msgctxt "Symbol" -msgid "Circle Balloon" -msgstr "Окружность" +msgid "Jelly Bump" +msgstr "Пузыристые выпуклости " -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:141 -msgctxt "Symbol" -msgid "Exclaim Balloon" -msgstr "" +#: ../share/filters/filters.svg.h:624 +#, fuzzy +msgid "Convert pictures to thick jelly" +msgstr "Текст в кривые Безье" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:142 -msgctxt "Symbol" -msgid "Flow Chart Shapes" -msgstr "" +#: ../share/filters/filters.svg.h:626 +#, fuzzy +msgid "Blend Opposites" +msgstr "Режим смешивания:" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:143 -msgctxt "Symbol" -msgid "Process" +#: ../share/filters/filters.svg.h:628 +msgid "Blend an image with its hue opposite" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:144 +#: ../share/filters/filters.svg.h:630 #, fuzzy -msgctxt "Symbol" -msgid "Input/Output" -msgstr "Ввод и вывод" +msgid "Hue to White" +msgstr "Вращение тона" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:145 -#, fuzzy -msgctxt "Symbol" -msgid "Document" -msgstr "Документ" +#: ../share/filters/filters.svg.h:632 +msgid "Fades hue progressively to white" +msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:146 -#, fuzzy -msgctxt "Symbol" -msgid "Manual Operation" -msgstr "Математические операторы" +#: ../share/filters/filters.svg.h:634 +#: ../src/extension/internal/bitmap/swirl.cpp:37 +msgid "Swirl" +msgstr "Вихрь" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:147 +#: ../share/filters/filters.svg.h:636 #, fuzzy -msgctxt "Symbol" -msgid "Preparation" -msgstr "Насыщенность" +msgid "" +"Paint objects with a transparent turbulence which wraps around color edges" +msgstr "Закрасить объекты прозрачной турбулентностью, огибающей цветные края" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:148 -#, fuzzy -msgctxt "Symbol" -msgid "Merge" -msgstr "Сведение" +#: ../share/filters/filters.svg.h:638 +msgid "Pointillism" +msgstr "Пуантилизм" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:149 +#: ../share/filters/filters.svg.h:640 #, fuzzy -msgctxt "Symbol" -msgid "Decision" -msgstr "Точность:" +msgid "Gives a turbulent pointillist HSL sensitive transparency" +msgstr "Создать пуантилистическую прозрачность, чувствительную к HSL" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:150 -msgctxt "Symbol" -msgid "Magnetic Tape" +#: ../share/filters/filters.svg.h:642 +msgid "Silhouette Marbled" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:151 +#: ../share/filters/filters.svg.h:644 +msgid "Basic noise transparency texture" +msgstr "Простая текстура полупрозрачного шума" + +#: ../share/filters/filters.svg.h:646 #, fuzzy -msgctxt "Symbol" -msgid "Display" -msgstr "Подробность просмотр_а" +msgid "Fill Background" +msgstr "Фон" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:152 -msgctxt "Symbol" -msgid "Auxiliary Operation" -msgstr "" +#: ../share/filters/filters.svg.h:648 +#, fuzzy +msgid "Adds a colorizable opaque background" +msgstr "Создать раскрашиваемую тень внутри" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:153 +#: ../share/filters/filters.svg.h:650 #, fuzzy -msgctxt "Symbol" -msgid "Manual Input" -msgstr "Импорт EMF" +msgid "Flatten Transparency" +msgstr "Прозрачность диалога:" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:154 +#: ../share/filters/filters.svg.h:652 #, fuzzy -msgctxt "Symbol" -msgid "Extract" -msgstr "Извлечь" +msgid "Adds a white opaque background" +msgstr "default background" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:155 -msgctxt "Symbol" -msgid "Terminal/Interrupt" -msgstr "" +#: ../share/filters/filters.svg.h:654 +#, fuzzy +msgid "Blur Double" +msgstr "Размывание" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:156 -msgctxt "Symbol" -msgid "Punched Card" +#: ../share/filters/filters.svg.h:656 +msgid "" +"Overlays two copies with different blur amounts and modifiable blend and " +"composite" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:157 -msgctxt "Symbol" -msgid "Punch Tape" -msgstr "" +#: ../share/filters/filters.svg.h:658 +#, fuzzy +msgid "Image Drawing Basic" +msgstr "Новый рисунок" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:158 -msgctxt "Symbol" -msgid "Online Storage" +#: ../share/filters/filters.svg.h:660 +msgid "Enhance and redraw color edges in 1 bit black and white" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:159 -msgctxt "Symbol" -msgid "Keying" -msgstr "" +#: ../share/filters/filters.svg.h:662 +#, fuzzy +msgid "Poster Draw" +msgstr "Штукатурка" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:160 -msgctxt "Symbol" -msgid "Sort" +#: ../share/filters/filters.svg.h:664 +msgid "Enhance and redraw edges around posterized areas" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:161 +#: ../share/filters/filters.svg.h:666 #, fuzzy -msgctxt "Symbol" -msgid "Connector" -msgstr "Соединительные линии" +msgid "Cross Noise Poster" +msgstr "Шум Пуассона" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:162 +#: ../share/filters/filters.svg.h:668 #, fuzzy -msgctxt "Symbol" -msgid "Off-Page Connector" -msgstr "Соединительные линии" +msgid "Overlay with a small scale screen like noise" +msgstr "Добавить небольшую зашумленность как на фотопленке" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:163 -msgctxt "Symbol" -msgid "Transmittal Tape" -msgstr "" +#: ../share/filters/filters.svg.h:670 +#, fuzzy +msgid "Cross Noise Poster B" +msgstr "Шум Пуассона" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:164 -msgctxt "Symbol" -msgid "Communication Link" -msgstr "" +#: ../share/filters/filters.svg.h:672 +#, fuzzy +msgid "Adds a small scale screen like noise locally" +msgstr "Добавить небольшую зашумленность как на фотопленке" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:165 +#: ../share/filters/filters.svg.h:674 #, fuzzy -msgctxt "Symbol" -msgid "Collate" -msgstr "Chocolate 1" +msgid "Poster Color Fun" +msgstr "Вставить цвет" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:166 -msgctxt "Symbol" -msgid "Comment/Annotation" -msgstr "" +#: ../share/filters/filters.svg.h:678 +#, fuzzy +msgid "Poster Rough" +msgstr "Штукатурка" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:167 -msgctxt "Symbol" -msgid "Core" +#: ../share/filters/filters.svg.h:680 +msgid "Adds roughness to one of the two channels of the Poster paint filter" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:168 -msgctxt "Symbol" -msgid "Predefined Process" +#: ../share/filters/filters.svg.h:682 +msgid "Alpha Monochrome Cracked" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:169 -msgctxt "Symbol" -msgid "Magnetic Disk (Database)" -msgstr "" +#: ../share/filters/filters.svg.h:684 ../share/filters/filters.svg.h:688 +#: ../share/filters/filters.svg.h:692 ../share/filters/filters.svg.h:704 +#: ../share/filters/filters.svg.h:708 ../share/filters/filters.svg.h:712 +msgid "Basic noise fill texture; adjust color in Flood" +msgstr "Простая текстура шума; цвет меняется в примитиве Заливка" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:170 -msgctxt "Symbol" -msgid "Magnetic Drum (Direct Access)" -msgstr "" +#: ../share/filters/filters.svg.h:686 +#, fuzzy +msgid "Alpha Turbulent" +msgstr "Перекрашивание" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:171 -msgctxt "Symbol" -msgid "Offline Storage" -msgstr "" +#: ../share/filters/filters.svg.h:690 +#, fuzzy +msgid "Colorize Turbulent" +msgstr "Тонирование" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:172 -msgctxt "Symbol" -msgid "Logical Or" -msgstr "" +#: ../share/filters/filters.svg.h:694 +#, fuzzy +msgid "Cross Noise B" +msgstr "Шум Пуассона" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:173 -msgctxt "Symbol" -msgid "Logical And" -msgstr "" +#: ../share/filters/filters.svg.h:696 +#, fuzzy +msgid "Adds a small scale crossy graininess" +msgstr "Добавить небольшую зашумленность как на фотопленке" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:174 -msgctxt "Symbol" -msgid "Delay" -msgstr "" +#: ../share/filters/filters.svg.h:698 +#, fuzzy +msgid "Cross Noise" +msgstr "Шум Пуассона" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:175 -msgctxt "Symbol" -msgid "Loop Limit Begin" -msgstr "" +#: ../share/filters/filters.svg.h:700 +#, fuzzy +msgid "Adds a small scale screen like graininess" +msgstr "Добавить небольшую зашумленность как на фотопленке" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:176 -msgctxt "Symbol" -msgid "Loop Limit End" -msgstr "" +#: ../share/filters/filters.svg.h:702 +#, fuzzy +msgid "Duotone Turbulent" +msgstr "Турбулентность" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:177 +#: ../share/filters/filters.svg.h:706 #, fuzzy -msgctxt "Symbol" -msgid "Logic Symbols" -msgstr "Кхмерские символы" +msgid "Light Eraser Cracked" +msgstr "Ластик для светлых областей" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:178 -msgctxt "Symbol" -msgid "Xnor Gate" -msgstr "" +#: ../share/filters/filters.svg.h:710 +#, fuzzy +msgid "Poster Turbulent" +msgstr "Турбулентность" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:179 -msgctxt "Symbol" -msgid "Xor Gate" -msgstr "" +#: ../share/filters/filters.svg.h:714 +#, fuzzy +msgid "Tartan Smart" +msgstr "Шотландка" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:180 -msgctxt "Symbol" -msgid "Nor Gate" -msgstr "" +#: ../share/filters/filters.svg.h:716 +#, fuzzy +msgid "Highly configurable checkered tartan pattern" +msgstr "Клетчатая шерстяная материя" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:181 -msgctxt "Symbol" -msgid "Or Gate" -msgstr "" +#: ../share/filters/filters.svg.h:718 +#, fuzzy +msgid "Light Contour" +msgstr "Источник света:" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:182 -msgctxt "Symbol" -msgid "Nand Gate" +#: ../share/filters/filters.svg.h:720 +msgid "Uses vertical specular light to draw lines" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:183 -msgctxt "Symbol" -msgid "And Gate" -msgstr "" +#: ../share/filters/filters.svg.h:722 +msgid "Liquid" +msgstr "Жидкость" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:184 -msgctxt "Symbol" -msgid "Buffer" -msgstr "" +#: ../share/filters/filters.svg.h:724 +msgid "Colorizable filling with liquid transparency" +msgstr "Раскрашиваемая заливка, придающая объекту эффект жидкости" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:185 -msgctxt "Symbol" -msgid "Not Gate" -msgstr "" +#: ../share/filters/filters.svg.h:726 +msgid "Aluminium" +msgstr "Алюминий" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:186 -msgctxt "Symbol" -msgid "Buffer Small" -msgstr "" +#: ../share/filters/filters.svg.h:728 +#, fuzzy +msgid "Aluminium effect with sharp brushed reflections" +msgstr "Гелевый эффект с сильным преломлением" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:187 -msgctxt "Symbol" -msgid "Not Gate Small" -msgstr "" +#: ../share/filters/filters.svg.h:730 +msgid "Comics" +msgstr "Комикс" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:188 +#: ../share/filters/filters.svg.h:732 #, fuzzy -msgctxt "Symbol" -msgid "Map Symbols" -msgstr "Кхмерские символы" +msgid "Comics cartoon drawing effect" +msgstr "Комикс, нарисованный мокрой кистью" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:189 +#: ../share/filters/filters.svg.h:734 #, fuzzy -msgctxt "Symbol" -msgid "Bed and Breakfast" -msgstr "Красный и зелёный" +msgid "Comics Draft" +msgstr "Черновик комикса" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:190 -msgctxt "Symbol" -msgid "Youth Hostel" -msgstr "" +#: ../share/filters/filters.svg.h:736 ../share/filters/filters.svg.h:768 +msgid "Draft painted cartoon shading with a glassy look" +msgstr "Начерно нарисованный комикс с блеском" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:191 +#: ../share/filters/filters.svg.h:738 #, fuzzy -msgctxt "Symbol" -msgid "Shelter" -msgstr "фильтр" +msgid "Comics Fading" +msgstr "Комикс с затуханием" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:192 -msgctxt "Symbol" -msgid "Motel" -msgstr "" - -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:193 -msgctxt "Symbol" -msgid "Hotel" -msgstr "" +#: ../share/filters/filters.svg.h:740 +msgid "Cartoon paint style with some fading at the edges" +msgstr "Стиль рисования наподобие комиксов с затуханием по краям" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:194 +#: ../share/filters/filters.svg.h:742 #, fuzzy -msgctxt "Symbol" -msgid "Hostel" -msgstr "Host" +msgid "Brushed Metal" +msgstr "Ржавчина" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:195 +#: ../share/filters/filters.svg.h:744 #, fuzzy -msgctxt "Symbol" -msgid "Chalet" -msgstr "Палитра" - -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:196 -msgctxt "Symbol" -msgid "Caravan Park" -msgstr "" +msgid "Satiny metal surface effect" +msgstr "Иллюминированный эффект тонированного стекла" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:197 +#: ../share/filters/filters.svg.h:746 #, fuzzy -msgctxt "Symbol" -msgid "Camping" -msgstr "Плеск волн" +msgid "Opaline" +msgstr "Контур" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:198 -msgctxt "Symbol" -msgid "Alpine Hut" -msgstr "" +#: ../share/filters/filters.svg.h:748 +msgid "Contouring version of smooth shader" +msgstr "Абрисная версия плавного шейдера" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:199 -msgctxt "Symbol" -msgid "Bench or Park" -msgstr "" +#: ../share/filters/filters.svg.h:750 +msgid "Chrome" +msgstr "Хром" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:200 +#: ../share/filters/filters.svg.h:752 #, fuzzy -msgctxt "Symbol" -msgid "Playground" -msgstr "Фон" - -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:201 -msgctxt "Symbol" -msgid "Fountain" -msgstr "" - -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:202 -msgctxt "Symbol" -msgid "Library" -msgstr "" +msgid "Bright chrome effect" +msgstr "Справа налево" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:203 -msgctxt "Symbol" -msgid "Town Hall" -msgstr "" +#: ../share/filters/filters.svg.h:754 +#, fuzzy +msgid "Deep Chrome" +msgstr "Хром" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:204 -msgctxt "Symbol" -msgid "Court" -msgstr "" +#: ../share/filters/filters.svg.h:756 +#, fuzzy +msgid "Dark chrome effect" +msgstr "Текущий эффект" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:205 -msgctxt "Symbol" -msgid "Fire Station / House" -msgstr "" +#: ../share/filters/filters.svg.h:758 +#, fuzzy +msgid "Emboss Shader" +msgstr "Рельефный шейдер" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:206 +#: ../share/filters/filters.svg.h:760 #, fuzzy -msgctxt "Symbol" -msgid "Police Station" -msgstr "Больше насыщенности" +msgid "Combination of satiny and emboss effect" +msgstr "Комбинация из плавного и рельефного шейдеров" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:207 -msgctxt "Symbol" -msgid "Prison" -msgstr "" +#: ../share/filters/filters.svg.h:762 +#, fuzzy +msgid "Sharp Metal" +msgstr "Тёмный рельеф" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:208 -msgctxt "Symbol" -msgid "Post Office" -msgstr "" +#: ../share/filters/filters.svg.h:764 +#, fuzzy +msgid "Chrome effect with darkened edges" +msgstr "Гелевый эффект с легким преломлением" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:209 +#: ../share/filters/filters.svg.h:766 #, fuzzy -msgctxt "Symbol" -msgid "Public Building" -msgstr "Общественное достояние" +msgid "Brush Draw" +msgstr "Кисть" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:210 -msgctxt "Symbol" -msgid "Recycling" -msgstr "" +#: ../share/filters/filters.svg.h:770 +#, fuzzy +msgid "Chrome Emboss" +msgstr "Тёмный рельеф" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:211 +#: ../share/filters/filters.svg.h:772 #, fuzzy -msgctxt "Symbol" -msgid "Survey Point" -msgstr "Точка Жергонна" +msgid "Embossed chrome effect" +msgstr "Удаление контурного эффекта" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:212 -msgctxt "Symbol" -msgid "Toll Booth" -msgstr "" +#: ../share/filters/filters.svg.h:774 +#, fuzzy +msgid "Contour Emboss" +msgstr "Цветной рельеф" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:213 -msgctxt "Symbol" -msgid "Lift Gate" -msgstr "" +#: ../share/filters/filters.svg.h:776 +#, fuzzy +msgid "Satiny and embossed contour effect" +msgstr "Удалить эффекты" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:214 +#: ../share/filters/filters.svg.h:778 #, fuzzy -msgctxt "Symbol" -msgid "Steps" -msgstr "Шаги" +msgid "Sharp Deco" +msgstr "Повысить резкость" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:215 -msgctxt "Symbol" -msgid "Stile" -msgstr "" +#: ../share/filters/filters.svg.h:780 +msgid "Unrealistic reflections with sharp edges" +msgstr "Нереалистичные отражения с острыми краями" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:216 +#: ../share/filters/filters.svg.h:782 #, fuzzy -msgctxt "Symbol" -msgid "Kissing Gate" -msgstr "Отсутствующий глиф:" +msgid "Deep Metal" +msgstr "Гибкий металл" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:217 -msgctxt "Symbol" -msgid "Gate" +#: ../share/filters/filters.svg.h:784 +msgid "Deep and dark metal shading" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:219 +#: ../share/filters/filters.svg.h:786 #, fuzzy -msgctxt "Symbol" -msgid "Entrance" -msgstr "Повысить качество" +msgid "Aluminium Emboss" +msgstr "Aluminium 1" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:220 -msgctxt "Symbol" -msgid "Cycle Barrier" +#: ../share/filters/filters.svg.h:788 +msgid "Satiny aluminium effect with embossing" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:221 +#: ../share/filters/filters.svg.h:790 #, fuzzy -msgctxt "Symbol" -msgid "Cattle Grid" -msgstr "Картезианская сетка" +msgid "Refractive Glass" +msgstr "Преломляющий гель А" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:222 -msgctxt "Symbol" -msgid "Bollard" -msgstr "" - -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:223 +#: ../share/filters/filters.svg.h:792 #, fuzzy -msgctxt "Symbol" -msgid "University" -msgstr "Идентичная функция" +msgid "Double reflection through glass with some refraction" +msgstr "Гелевый эффект с сильным преломлением" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:224 +#: ../share/filters/filters.svg.h:794 #, fuzzy -msgctxt "Symbol" -msgid "High/Secondary School" -msgstr "Второй язык:" +msgid "Frosted Glass" +msgstr "Замороженное стекло" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:225 -msgctxt "Symbol" -msgid "School" -msgstr "" +#: ../share/filters/filters.svg.h:796 +#, fuzzy +msgid "Satiny glass effect" +msgstr "Иллюминированный эффект тонированного стекла" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:226 -msgctxt "Symbol" -msgid "Kindergarten" -msgstr "" +#: ../share/filters/filters.svg.h:798 +#, fuzzy +msgid "Bump Engraving" +msgstr "Альфа-гравировка №1" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:229 -msgctxt "Symbol" -msgid "Pub" -msgstr "" +#: ../share/filters/filters.svg.h:800 +#, fuzzy +msgid "Carving emboss effect" +msgstr "Вставить динамический контурный эффект" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:230 -msgctxt "Symbol" -msgid "Desserts/Cakes Shop" +#: ../share/filters/filters.svg.h:802 +msgid "Chromolitho Alternate" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:231 -msgctxt "Symbol" -msgid "Fast Food" -msgstr "" +#: ../share/filters/filters.svg.h:804 +#, fuzzy +msgid "Old chromolithographic effect" +msgstr "Создание контурного эффекта" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:232 -msgctxt "Symbol" -msgid "Public Tap/Water" -msgstr "" +#: ../share/filters/filters.svg.h:806 +#, fuzzy +msgid "Convoluted Bump" +msgstr "Облачный акварельный эффект" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:233 -msgctxt "Symbol" -msgid "Cafe" -msgstr "" +#: ../share/filters/filters.svg.h:808 +#, fuzzy +msgid "Convoluted emboss effect" +msgstr "Облачный акварельный эффект" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:234 -msgctxt "Symbol" -msgid "Beer Garden" -msgstr "" +#: ../share/filters/filters.svg.h:810 +#, fuzzy +msgid "Emergence" +msgstr "Отклонение" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:235 -msgctxt "Symbol" -msgid "Wine Bar" +#: ../share/filters/filters.svg.h:812 +msgid "Cut out, add inner shadow and colorize some parts of an image" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:236 -msgctxt "Symbol" -msgid "Opticians/Eye Doctors" +#: ../share/filters/filters.svg.h:814 +msgid "Litho" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:237 +#: ../share/filters/filters.svg.h:816 #, fuzzy -msgctxt "Symbol" -msgid "Dentist" -msgstr "Идентичная функция" - -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:238 -msgctxt "Symbol" -msgid "Veterinarian" -msgstr "" +msgid "Create a two colors lithographic effect" +msgstr "Создание контурного эффекта" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:239 -msgctxt "Symbol" -msgid "Drugs Dispensary" -msgstr "" +#: ../share/filters/filters.svg.h:818 +#, fuzzy +msgid "Paint Channels" +msgstr "Голубой канал (C)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:240 -msgctxt "Symbol" -msgid "Pharmacy" +#: ../share/filters/filters.svg.h:820 +msgid "Colorize separately the three color channels" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:241 +#: ../share/filters/filters.svg.h:822 #, fuzzy -msgctxt "Symbol" -msgid "Accident & Emergency" -msgstr "Accent Green" +msgid "Posterized Light Eraser" +msgstr "Ластик для светлых областей" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:242 -msgctxt "Symbol" -msgid "Hospital" +#: ../share/filters/filters.svg.h:824 +msgid "Create a semi transparent posterized image" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:243 +#: ../share/filters/filters.svg.h:826 #, fuzzy -msgctxt "Symbol" -msgid "Doctors" -msgstr "Соединительные линии" - -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:244 -msgctxt "Symbol" -msgid "Scrub Land" -msgstr "" +msgid "Trichrome" +msgstr "Хром" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:245 -msgctxt "Symbol" -msgid "Swamp" +#: ../share/filters/filters.svg.h:828 +msgid "Like Duochrome but with three colors" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:246 -msgctxt "Symbol" -msgid "Hills" +#: ../share/filters/filters.svg.h:830 +msgid "Simulate CMY" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:247 -msgctxt "Symbol" -msgid "Grass Land" +#: ../share/filters/filters.svg.h:832 +msgid "Render Cyan, Magenta and Yellow channels with a colorizable background" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:248 -msgctxt "Symbol" -msgid "Deciduous Forest" -msgstr "" +#: ../share/filters/filters.svg.h:834 +#, fuzzy +msgid "Contouring table" +msgstr "Вписанный треугольник" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:249 -msgctxt "Symbol" -msgid "Mixed Forest" -msgstr "" +#: ../share/filters/filters.svg.h:836 +#, fuzzy +msgid "Blurred multiple contours for objects" +msgstr "Пустой контур с размытой обводкой" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:250 -msgctxt "Symbol" -msgid "Coniferous Forest" -msgstr "" +#: ../share/filters/filters.svg.h:838 +#, fuzzy +msgid "Posterized Blur" +msgstr "Ластик для светлых областей" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:251 -msgctxt "Symbol" -msgid "Church or Place of Worship" +#: ../share/filters/filters.svg.h:840 +msgid "Converts blurred contour to posterized steps" msgstr "" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:252 -msgctxt "Symbol" -msgid "Bank" -msgstr "" +#: ../share/filters/filters.svg.h:842 +#, fuzzy +msgid "Contouring discrete" +msgstr "Controlling dock item" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:253 +#: ../share/filters/filters.svg.h:844 #, fuzzy -msgctxt "Symbol" -msgid "Power Lines" -msgstr "Линия по узлам" - -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:254 -msgctxt "Symbol" -msgid "Watch Tower" -msgstr "" +msgid "Sharp multiple contour for objects" +msgstr "Прилипать центрами объектов" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:255 -#, fuzzy -msgctxt "Symbol" -msgid "Transmitter" -msgstr "Трансформировать текстуры" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:2 +msgctxt "Palette" +msgid "Black" +msgstr "Чёрный" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:256 -msgctxt "Symbol" -msgid "Village" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:3 +#, no-c-format +msgctxt "Palette" +msgid "90% Gray" +msgstr "90% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:257 -msgctxt "Symbol" -msgid "Town" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:4 +#, no-c-format +msgctxt "Palette" +msgid "80% Gray" +msgstr "80% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:258 -msgctxt "Symbol" -msgid "Hamlet" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:5 +#, no-c-format +msgctxt "Palette" +msgid "70% Gray" +msgstr "70% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:259 -msgctxt "Symbol" -msgid "City" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:6 +#, no-c-format +msgctxt "Palette" +msgid "60% Gray" +msgstr "60% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:260 -msgctxt "Symbol" -msgid "Peak" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:7 +#, no-c-format +msgctxt "Palette" +msgid "50% Gray" +msgstr "50% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:261 -#, fuzzy -msgctxt "Symbol" -msgid "Mountain Pass" -msgstr "Тонированное стекло" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:8 +#, no-c-format +msgctxt "Palette" +msgid "40% Gray" +msgstr "40% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:262 -msgctxt "Symbol" -msgid "Mine" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:9 +#, no-c-format +msgctxt "Palette" +msgid "30% Gray" +msgstr "30% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:263 -msgctxt "Symbol" -msgid "Military Complex" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:10 +#, no-c-format +msgctxt "Palette" +msgid "20% Gray" +msgstr "20% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:264 -msgctxt "Symbol" -msgid "Embassy" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:11 +#, no-c-format +msgctxt "Palette" +msgid "10% Gray" +msgstr "10% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:265 -msgctxt "Symbol" -msgid "Toy Shop" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:12 +#, no-c-format +msgctxt "Palette" +msgid "7.5% Gray" +msgstr "7,5% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:266 -#, fuzzy -msgctxt "Symbol" -msgid "Supermarket" -msgstr "Установка маркеров" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:13 +#, no-c-format +msgctxt "Palette" +msgid "5% Gray" +msgstr "5% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:267 -msgctxt "Symbol" -msgid "Jewlers" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:14 +#, no-c-format +msgctxt "Palette" +msgid "2.5% Gray" +msgstr "2,5% серый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:268 -msgctxt "Symbol" -msgid "Hairdressers" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:15 +msgctxt "Palette" +msgid "White" +msgstr "Белый" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:269 -#, fuzzy -msgctxt "Symbol" -msgid "Greengrocer" -msgstr "Зеленый" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:16 +msgctxt "Palette" +msgid "Maroon (#800000)" +msgstr "Тёмно-бордовый (#800000)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:270 -msgctxt "Symbol" -msgid "Gift Shop" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:17 +msgctxt "Palette" +msgid "Red (#FF0000)" +msgstr "Красный (#FF0000)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:271 -#, fuzzy -msgctxt "Symbol" -msgid "Garden Center" -msgstr "Вверху и по центру" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:18 +msgctxt "Palette" +msgid "Olive (#808000)" +msgstr "Оливковый (#808000)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:272 -msgctxt "Symbol" -msgid "Florist" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:19 +msgctxt "Palette" +msgid "Yellow (#FFFF00)" +msgstr "Жёлтый (#FFFF00)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:273 -msgctxt "Symbol" -msgid "Fish Monger" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:20 +msgctxt "Palette" +msgid "Green (#008000)" +msgstr "Зелёный (#008000)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:274 -msgctxt "Symbol" -msgid "Real Estate" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:21 +msgctxt "Palette" +msgid "Lime (#00FF00)" +msgstr "Лайм (#00FF00)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:275 -#, fuzzy -msgctxt "Symbol" -msgid "Hardware / DIY" -msgstr "Устройства" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:22 +msgctxt "Palette" +msgid "Teal (#008080)" +msgstr "Чирок (#008080)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:276 -msgctxt "Symbol" -msgid "Shop" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:23 +msgctxt "Palette" +msgid "Aqua (#00FFFF)" +msgstr "Цвет морской волны (#00FFFF)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:277 -#, fuzzy -msgctxt "Symbol" -msgid "Confectioner" -msgstr "Cоединения" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:24 +msgctxt "Palette" +msgid "Navy (#000080)" +msgstr "Тёмно-синий (#000080)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:278 -msgctxt "Symbol" -msgid "Computer Shop" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:25 +msgctxt "Palette" +msgid "Blue (#0000FF)" +msgstr "Синий (#0000FF)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:279 -#, fuzzy -msgctxt "Symbol" -msgid "Clothing" -msgstr "Сглаживание:" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:26 +msgctxt "Palette" +msgid "Purple (#800080)" +msgstr "Пурпурный (#800080)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:280 -msgctxt "Symbol" -msgid "Mechanic" -msgstr "" +#. Palette: ./inkscape.gpl +#: ../share/palettes/palettes.h:27 +msgctxt "Palette" +msgid "Fuchsia (#FF00FF)" +msgstr "Фуксия (#FF00FF)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:281 -msgctxt "Symbol" -msgid "Car Dealer" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:28 +msgctxt "Palette" +msgid "black (#000000)" +msgstr "black (#000000)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:282 -msgctxt "Symbol" -msgid "Butcher" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:29 +msgctxt "Palette" +msgid "dimgray (#696969)" +msgstr "dimgray (#696969)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:283 -msgctxt "Symbol" -msgid "Meat Shop" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:30 +msgctxt "Palette" +msgid "gray (#808080)" +msgstr "gray (#808080)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:284 -msgctxt "Symbol" -msgid "Bicycle Shop" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:31 +msgctxt "Palette" +msgid "darkgray (#A9A9A9)" +msgstr "darkgray (#A9A9A9)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:285 -msgctxt "Symbol" -msgid "Baker" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:32 +msgctxt "Palette" +msgid "silver (#C0C0C0)" +msgstr "silver (#C0C0C0)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:286 -msgctxt "Symbol" -msgid "Off License / Liquor Store" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:33 +msgctxt "Palette" +msgid "lightgray (#D3D3D3)" +msgstr "lightgray (#D3D3D3)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:287 -msgctxt "Symbol" -msgid "Wind Surfing" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:34 +msgctxt "Palette" +msgid "gainsboro (#DCDCDC)" +msgstr "gainsboro (#DCDCDC)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:288 -msgctxt "Symbol" -msgid "Tennis" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:35 +msgctxt "Palette" +msgid "whitesmoke (#F5F5F5)" +msgstr "whitesmoke (#F5F5F5)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:289 -msgctxt "Symbol" -msgid "Outdoor Pool" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:36 +msgctxt "Palette" +msgid "white (#FFFFFF)" +msgstr "white (#FFFFFF)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:290 -msgctxt "Symbol" -msgid "Indoor Pool" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:37 +msgctxt "Palette" +msgid "rosybrown (#BC8F8F)" +msgstr "rosybrown (#BC8F8F)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:291 -msgctxt "Symbol" -msgid "Skiing" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:38 +msgctxt "Palette" +msgid "indianred (#CD5C5C)" +msgstr "indianred (#CD5C5C)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:292 -#, fuzzy -msgctxt "Symbol" -msgid "Sailing" -msgstr "Прокрутка" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:39 +msgctxt "Palette" +msgid "brown (#A52A2A)" +msgstr "brown (#A52A2A)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:293 -#, fuzzy -msgctxt "Symbol" -msgid "Leisure Center" -msgstr "Возврат к исходному центру" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:40 +msgctxt "Palette" +msgid "firebrick (#B22222)" +msgstr "firebrick (#B22222)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:294 -#, fuzzy -msgctxt "Symbol" -msgid "Ice Skating" -msgstr "Сатин" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:41 +msgctxt "Palette" +msgid "lightcoral (#F08080)" +msgstr "lightcoral (#F08080)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:295 -msgctxt "Symbol" -msgid "Equine Sports" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:42 +msgctxt "Palette" +msgid "maroon (#800000)" +msgstr "maroon (#800000)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:296 -msgctxt "Symbol" -msgid "Rock Climbing" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:43 +msgctxt "Palette" +msgid "darkred (#8B0000)" +msgstr "darkred (#8B0000)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:297 -msgctxt "Symbol" -msgid "Gym" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:44 +msgctxt "Palette" +msgid "red (#FF0000)" +msgstr "red (#FF0000)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:298 -msgctxt "Symbol" -msgid "Golf" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:45 +msgctxt "Palette" +msgid "snow (#FFFAFA)" +msgstr "snow (#FFFAFA)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:299 -#, fuzzy -msgctxt "Symbol" -msgid "Diving" -msgstr "Деление" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:46 +msgctxt "Palette" +msgid "mistyrose (#FFE4E1)" +msgstr "mistyrose (#FFE4E1)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:300 -msgctxt "Symbol" -msgid "Archery" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:47 +msgctxt "Palette" +msgid "salmon (#FA8072)" +msgstr "salmon (#FA8072)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:301 -#, fuzzy -msgctxt "Symbol" -msgid "Zoo" -msgstr "Лупа" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:48 +msgctxt "Palette" +msgid "tomato (#FF6347)" +msgstr "tomato (#FF6347)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:302 -msgctxt "Symbol" -msgid "Wreck" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:49 +msgctxt "Palette" +msgid "darksalmon (#E9967A)" +msgstr "darksalmon (#E9967A)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:303 -#, fuzzy -msgctxt "Symbol" -msgid "Water Wheel" -msgstr "Круг" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:50 +msgctxt "Palette" +msgid "coral (#FF7F50)" +msgstr "coral (#FF7F50)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:304 -msgctxt "Symbol" -msgid "Point of Interest" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:51 +msgctxt "Palette" +msgid "orangered (#FF4500)" +msgstr "orangered (#FF4500)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:305 -#, fuzzy -msgctxt "Symbol" -msgid "Theater" -msgstr "Создать" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:52 +msgctxt "Palette" +msgid "lightsalmon (#FFA07A)" +msgstr "lightsalmon (#FFA07A)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:306 -msgctxt "Symbol" -msgid "Park / Picnic Area" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:53 +msgctxt "Palette" +msgid "sienna (#A0522D)" +msgstr "sienna (#A0522D)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:307 -#, fuzzy -msgctxt "Symbol" -msgid "Monument" -msgstr "Документ" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:54 +msgctxt "Palette" +msgid "seashell (#FFF5EE)" +msgstr "seashell (#FFF5EE)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:309 -msgctxt "Symbol" -msgid "Beach" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:55 +msgctxt "Palette" +msgid "chocolate (#D2691E)" +msgstr "chocolate (#D2691E)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:310 -#, fuzzy -msgctxt "Symbol" -msgid "Battle Location" -msgstr "Расположение:" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:56 +msgctxt "Palette" +msgid "saddlebrown (#8B4513)" +msgstr "saddlebrown (#8B4513)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:311 -msgctxt "Symbol" -msgid "Archaeology / Ruins" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:57 +msgctxt "Palette" +msgid "sandybrown (#F4A460)" +msgstr "sandybrown (#F4A460)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:312 -msgctxt "Symbol" -msgid "Walking" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:58 +msgctxt "Palette" +msgid "peachpuff (#FFDAB9)" +msgstr "peachpuff (#FFDAB9)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:313 -#, fuzzy -msgctxt "Symbol" -msgid "Train" -msgstr "Режим рисования" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:59 +msgctxt "Palette" +msgid "peru (#CD853F)" +msgstr "peru (#CD853F)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:315 -msgctxt "Symbol" -msgid "Underground Rail" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:60 +msgctxt "Palette" +msgid "linen (#FAF0E6)" +msgstr "linen (#FAF0E6)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:317 -msgctxt "Symbol" -msgid "Bike Rental" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:61 +msgctxt "Palette" +msgid "bisque (#FFE4C4)" +msgstr "bisque (#FFE4C4)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:319 -msgctxt "Symbol" -msgid "Carpool" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:62 +msgctxt "Palette" +msgid "darkorange (#FF8C00)" +msgstr "darkorange (#FF8C00)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:320 -#, fuzzy -msgctxt "Symbol" -msgid "Flood Gate" -msgstr "Заливка" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:63 +msgctxt "Palette" +msgid "burlywood (#DEB887)" +msgstr "burlywood (#DEB887)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:321 -#, fuzzy -msgctxt "Symbol" -msgid "Shipping" -msgstr "Протекание" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:64 +msgctxt "Palette" +msgid "tan (#D2B48C)" +msgstr "tan (#D2B48C)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:322 -#, fuzzy -msgctxt "Symbol" -msgid "Disabled Parking" -msgstr "Отключено" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:65 +msgctxt "Palette" +msgid "antiquewhite (#FAEBD7)" +msgstr "antiquewhite (#FAEBD7)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:323 -msgctxt "Symbol" -msgid "Paid Parking" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:66 +msgctxt "Palette" +msgid "navajowhite (#FFDEAD)" +msgstr "navajowhite (#FFDEAD)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:324 -msgctxt "Symbol" -msgid "Bike Parking" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:67 +msgctxt "Palette" +msgid "blanchedalmond (#FFEBCD)" +msgstr "blanchedalmond (#FFEBCD)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:326 -msgctxt "Symbol" -msgid "Marina" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:68 +msgctxt "Palette" +msgid "papayawhip (#FFEFD5)" +msgstr "papayawhip (#FFEFD5)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:327 -#, fuzzy -msgctxt "Symbol" -msgid "Fuel Station" -msgstr "Смежный" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:69 +msgctxt "Palette" +msgid "moccasin (#FFE4B5)" +msgstr "moccasin (#FFE4B5)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:328 -#, fuzzy -msgctxt "Symbol" -msgid "Bus Stop" -msgstr "_Остановить" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:70 +msgctxt "Palette" +msgid "orange (#FFA500)" +msgstr "orange (#FFA500)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:329 -#, fuzzy -msgctxt "Symbol" -msgid "Bus Station" -msgstr "Меньше насыщенности" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:71 +msgctxt "Palette" +msgid "wheat (#F5DEB3)" +msgstr "wheat (#F5DEB3)" -#. Symbols: ./MapSymbols.svg -#: ../share/symbols/symbols.h:330 -#, fuzzy -msgctxt "Symbol" -msgid "Airport" -msgstr "Импорт" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:72 +msgctxt "Palette" +msgid "oldlace (#FDF5E6)" +msgstr "oldlace (#FDF5E6)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "A4 Landscape Page" -msgstr "_Альбом" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:73 +msgctxt "Palette" +msgid "floralwhite (#FFFAF0)" +msgstr "floralwhite (#FFFAF0)" -#: ../share/templates/templates.h:1 -msgid "Empty A4 landscape sheet" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:74 +msgctxt "Palette" +msgid "darkgoldenrod (#B8860B)" +msgstr "darkgoldenrod (#B8860B)" -#: ../share/templates/templates.h:1 -msgid "A4 paper sheet empty landscape" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:75 +msgctxt "Palette" +msgid "goldenrod (#DAA520)" +msgstr "goldenrod (#DAA520)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "A4 Page" -msgstr "Страница" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:76 +msgctxt "Palette" +msgid "cornsilk (#FFF8DC)" +msgstr "cornsilk (#FFF8DC)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "Empty A4 sheet" -msgstr "Выделение пусто" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:77 +msgctxt "Palette" +msgid "gold (#FFD700)" +msgstr "gold (#FFD700)" -#: ../share/templates/templates.h:1 -msgid "A4 paper sheet empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:78 +msgctxt "Palette" +msgid "khaki (#F0E68C)" +msgstr "khaki (#F0E68C)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "Black Opaque" -msgstr "Чёрный канал (K)" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:79 +msgctxt "Palette" +msgid "lemonchiffon (#FFFACD)" +msgstr "lemonchiffon (#FFFACD)" -#: ../share/templates/templates.h:1 -msgid "Empty black page" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:80 +msgctxt "Palette" +msgid "palegoldenrod (#EEE8AA)" +msgstr "palegoldenrod (#EEE8AA)" -#: ../share/templates/templates.h:1 -msgid "black opaque empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:81 +msgctxt "Palette" +msgid "darkkhaki (#BDB76B)" +msgstr "darkkhaki (#BDB76B)" -#: ../share/templates/templates.h:1 -msgid "White Opaque" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:82 +msgctxt "Palette" +msgid "beige (#F5F5DC)" +msgstr "beige (#F5F5DC)" -#: ../share/templates/templates.h:1 -msgid "Empty white page" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:83 +msgctxt "Palette" +msgid "lightgoldenrodyellow (#FAFAD2)" +msgstr "lightgoldenrodyellow (#FAFAD2)" -#: ../share/templates/templates.h:1 -msgid "white opaque empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:84 +msgctxt "Palette" +msgid "olive (#808000)" +msgstr "olive (#808000)" -#: ../share/templates/templates.h:1 -msgid "Business Card 85x54mm" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:85 +msgctxt "Palette" +msgid "yellow (#FFFF00)" +msgstr "yellow (#FFFF00)" -#: ../share/templates/templates.h:1 -msgid "Empty business card template." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:86 +msgctxt "Palette" +msgid "lightyellow (#FFFFE0)" +msgstr "lightyellow (#FFFFE0)" -#: ../share/templates/templates.h:1 -msgid "business card empty 85x54" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:87 +msgctxt "Palette" +msgid "ivory (#FFFFF0)" +msgstr "ivory (#FFFFF0)" -#: ../share/templates/templates.h:1 -msgid "Business Card 90x50mm" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:88 +msgctxt "Palette" +msgid "olivedrab (#6B8E23)" +msgstr "olivedrab (#6B8E23)" -#: ../share/templates/templates.h:1 -msgid "business card empty 90x50" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:89 +msgctxt "Palette" +msgid "yellowgreen (#9ACD32)" +msgstr "yellowgreen (#9ACD32)" -#: ../share/templates/templates.h:1 -msgid "CD Cover 300dpi" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:90 +msgctxt "Palette" +msgid "darkolivegreen (#556B2F)" +msgstr "darkolivegreen (#556B2F)" -#: ../share/templates/templates.h:1 -msgid "Empty CD box cover." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:91 +msgctxt "Palette" +msgid "greenyellow (#ADFF2F)" +msgstr "greenyellow (#ADFF2F)" -#: ../share/templates/templates.h:1 -msgid "CD cover disc disk 300dpi box" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:92 +msgctxt "Palette" +msgid "chartreuse (#7FFF00)" +msgstr "chartreuse (#7FFF00)" -#: ../share/templates/templates.h:1 -msgid "CD Label 120x120 " -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:93 +msgctxt "Palette" +msgid "lawngreen (#7CFC00)" +msgstr "lawngreen (#7CFC00)" -#: ../share/templates/templates.h:1 -msgid "Simple CD Label template with disc's pattern." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:94 +msgctxt "Palette" +msgid "darkseagreen (#8FBC8F)" +msgstr "darkseagreen (#8FBC8F)" -#: ../share/templates/templates.h:1 -msgid "CD label 120x120 disc disk" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:95 +msgctxt "Palette" +msgid "forestgreen (#228B22)" +msgstr "forestgreen (#228B22)" -#: ../share/templates/templates.h:1 -msgid "DVD Cover Regular 300dpi " -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:96 +msgctxt "Palette" +msgid "limegreen (#32CD32)" +msgstr "limegreen (#32CD32)" -#: ../share/templates/templates.h:1 -msgid "Template for both-sides DVD covers." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:97 +msgctxt "Palette" +msgid "lightgreen (#90EE90)" +msgstr "lightgreen (#90EE90)" -#: ../share/templates/templates.h:1 -msgid "DVD cover regular 300dpi" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:98 +msgctxt "Palette" +msgid "palegreen (#98FB98)" +msgstr "palegreen (#98FB98)" -#: ../share/templates/templates.h:1 -msgid "DVD Cover Slim 300dpi " -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:99 +msgctxt "Palette" +msgid "darkgreen (#006400)" +msgstr "darkgreen (#006400)" -#: ../share/templates/templates.h:1 -msgid "Template for both-sides DVD slim covers." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:100 +msgctxt "Palette" +msgid "green (#008000)" +msgstr "green (#008000)" -#: ../share/templates/templates.h:1 -msgid "DVD cover slim 300dpi" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:101 +msgctxt "Palette" +msgid "lime (#00FF00)" +msgstr "lime (#00FF00)" -#: ../share/templates/templates.h:1 -msgid "DVD Cover Superslim 300dpi " -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:102 +msgctxt "Palette" +msgid "honeydew (#F0FFF0)" +msgstr "honeydew (#F0FFF0)" -#: ../share/templates/templates.h:1 -msgid "Template for both-sides DVD superslim covers." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:103 +msgctxt "Palette" +msgid "seagreen (#2E8B57)" +msgstr "seagreen (#2E8B57)" -#: ../share/templates/templates.h:1 -msgid "DVD cover superslim 300dpi" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:104 +msgctxt "Palette" +msgid "mediumseagreen (#3CB371)" +msgstr "mediumseagreen (#3CB371)" -#: ../share/templates/templates.h:1 -msgid "DVD Cover Ultraslim 300dpi " -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:105 +msgctxt "Palette" +msgid "springgreen (#00FF7F)" +msgstr "springgreen (#00FF7F)" -#: ../share/templates/templates.h:1 -msgid "Template for both-sides DVD ultraslim covers." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:106 +msgctxt "Palette" +msgid "mintcream (#F5FFFA)" +msgstr "mintcream (#F5FFFA)" -#: ../share/templates/templates.h:1 -msgid "DVD cover ultraslim 300dpi" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:107 +msgctxt "Palette" +msgid "mediumspringgreen (#00FA9A)" +msgstr "mediumspringgreen (#00FA9A)" -#: ../share/templates/templates.h:1 -msgid "Desktop 1024x768" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:108 +msgctxt "Palette" +msgid "mediumaquamarine (#66CDAA)" +msgstr "mediumaquamarine (#66CDAA)" -#: ../share/templates/templates.h:1 -msgid "Empty desktop size sheet" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:109 +msgctxt "Palette" +msgid "aquamarine (#7FFFD4)" +msgstr "aquamarine (#7FFFD4)" -#: ../share/templates/templates.h:1 -msgid "desktop 1024x768 wallpaper" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:110 +msgctxt "Palette" +msgid "turquoise (#40E0D0)" +msgstr "turquoise (#40E0D0)" -#: ../share/templates/templates.h:1 -msgid "Desktop 1600x1200" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:111 +msgctxt "Palette" +msgid "lightseagreen (#20B2AA)" +msgstr "lightseagreen (#20B2AA)" -#: ../share/templates/templates.h:1 -msgid "desktop 1600x1200 wallpaper" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:112 +msgctxt "Palette" +msgid "mediumturquoise (#48D1CC)" +msgstr "mediumturquoise (#48D1CC)" -#: ../share/templates/templates.h:1 -msgid "Desktop 640x480" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:113 +msgctxt "Palette" +msgid "darkslategray (#2F4F4F)" +msgstr "darkslategray (#2F4F4F)" -#: ../share/templates/templates.h:1 -msgid "desktop 640x480 wallpaper" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:114 +msgctxt "Palette" +msgid "paleturquoise (#AFEEEE)" +msgstr "paleturquoise (#AFEEEE)" -#: ../share/templates/templates.h:1 -msgid "Desktop 800x600" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:115 +msgctxt "Palette" +msgid "teal (#008080)" +msgstr "teal (#008080)" -#: ../share/templates/templates.h:1 -msgid "desktop 800x600 wallpaper" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:116 +msgctxt "Palette" +msgid "darkcyan (#008B8B)" +msgstr "darkcyan (#008B8B)" -#: ../share/templates/templates.h:1 -msgid "Fontforge Glyph" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:117 +msgctxt "Palette" +msgid "cyan (#00FFFF)" +msgstr "cyan (#00FFFF)" -#: ../share/templates/templates.h:1 -msgid "font fontforge glyph 1000x1000" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:118 +msgctxt "Palette" +msgid "lightcyan (#E0FFFF)" +msgstr "lightcyan (#E0FFFF)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "Icon 16x16" -msgstr "16×16" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:119 +msgctxt "Palette" +msgid "azure (#F0FFFF)" +msgstr "azure (#F0FFFF)" -#: ../share/templates/templates.h:1 -msgid "Small 16x16 icon template." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:120 +msgctxt "Palette" +msgid "darkturquoise (#00CED1)" +msgstr "darkturquoise (#00CED1)" -#: ../share/templates/templates.h:1 -msgid "icon 16x16 empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:121 +msgctxt "Palette" +msgid "cadetblue (#5F9EA0)" +msgstr "cadetblue (#5F9EA0)" -#: ../share/templates/templates.h:1 -msgid "Icon 32x32" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:122 +msgctxt "Palette" +msgid "powderblue (#B0E0E6)" +msgstr "powderblue (#B0E0E6)" -#: ../share/templates/templates.h:1 -msgid "32x32 icon template." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:123 +msgctxt "Palette" +msgid "lightblue (#ADD8E6)" +msgstr "lightblue (#ADD8E6)" -#: ../share/templates/templates.h:1 -msgid "icon 32x32 empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:124 +msgctxt "Palette" +msgid "deepskyblue (#00BFFF)" +msgstr "deepskyblue (#00BFFF)" -#: ../share/templates/templates.h:1 -msgid "Icon 48x48" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:125 +msgctxt "Palette" +msgid "skyblue (#87CEEB)" +msgstr "skyblue (#87CEEB)" -#: ../share/templates/templates.h:1 -msgid "48x48 icon template." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:126 +msgctxt "Palette" +msgid "lightskyblue (#87CEFA)" +msgstr "lightskyblue (#87CEFA)" -#: ../share/templates/templates.h:1 -msgid "icon 48x48 empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:127 +msgctxt "Palette" +msgid "steelblue (#4682B4)" +msgstr "steelblue (#4682B4)" -#: ../share/templates/templates.h:1 -msgid "Icon 64x64" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:128 +msgctxt "Palette" +msgid "aliceblue (#F0F8FF)" +msgstr "aliceblue (#F0F8FF)" -#: ../share/templates/templates.h:1 -msgid "64x64 icon template." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:129 +msgctxt "Palette" +msgid "dodgerblue (#1E90FF)" +msgstr "dodgerblue (#1E90FF)" -#: ../share/templates/templates.h:1 -msgid "icon 64x64 empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:130 +msgctxt "Palette" +msgid "slategray (#708090)" +msgstr "slategray (#708090)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "Letter Landscape" -msgstr "_Альбом" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:131 +msgctxt "Palette" +msgid "lightslategray (#778899)" +msgstr "lightslategray (#778899)" -#: ../share/templates/templates.h:1 -msgid "Standard letter landscape sheet - 792x612" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:132 +msgctxt "Palette" +msgid "lightsteelblue (#B0C4DE)" +msgstr "lightsteelblue (#B0C4DE)" -#: ../share/templates/templates.h:1 -msgid "letter landscape 792x612 empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:133 +msgctxt "Palette" +msgid "cornflowerblue (#6495ED)" +msgstr "cornflowerblue (#6495ED)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "Letter" -msgstr "Кернинг:" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:134 +msgctxt "Palette" +msgid "royalblue (#4169E1)" +msgstr "royalblue (#4169E1)" -#: ../share/templates/templates.h:1 -msgid "Standard letter sheet - 612x792" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:135 +msgctxt "Palette" +msgid "midnightblue (#191970)" +msgstr "midnightblue (#191970)" -#: ../share/templates/templates.h:1 -msgid "letter 612x792 empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:136 +msgctxt "Palette" +msgid "lavender (#E6E6FA)" +msgstr "lavender (#E6E6FA)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "No Borders" -msgstr "Край" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:137 +msgctxt "Palette" +msgid "navy (#000080)" +msgstr "navy (#000080)" -#: ../share/templates/templates.h:1 -msgid "Empty sheet with no borders" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:138 +msgctxt "Palette" +msgid "darkblue (#00008B)" +msgstr "darkblue (#00008B)" -#: ../share/templates/templates.h:1 -msgid "no borders empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:139 +msgctxt "Palette" +msgid "mediumblue (#0000CD)" +msgstr "mediumblue (#0000CD)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "No Layers" -msgstr "Слой" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:140 +msgctxt "Palette" +msgid "blue (#0000FF)" +msgstr "blue (#0000FF)" -#: ../share/templates/templates.h:1 -msgid "Empty sheet with no layers" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:141 +msgctxt "Palette" +msgid "ghostwhite (#F8F8FF)" +msgstr "ghostwhite (#F8F8FF)" -#: ../share/templates/templates.h:1 -msgid "no layers empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:142 +msgctxt "Palette" +msgid "slateblue (#6A5ACD)" +msgstr "slateblue (#6A5ACD)" -#: ../share/templates/templates.h:1 -msgid "Video HDTV 1920x1080" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:143 +msgctxt "Palette" +msgid "darkslateblue (#483D8B)" +msgstr "darkslateblue (#483D8B)" -#: ../share/templates/templates.h:1 -msgid "HDTV video template for 1920x1080 resolution." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:144 +msgctxt "Palette" +msgid "mediumslateblue (#7B68EE)" +msgstr "mediumslateblue (#7B68EE)" -#: ../share/templates/templates.h:1 -msgid "HDTV video empty 1920x1080" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:145 +msgctxt "Palette" +msgid "mediumpurple (#9370DB)" +msgstr "mediumpurple (#9370DB)" -#: ../share/templates/templates.h:1 -msgid "Video NTSC 720x486" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:146 +msgctxt "Palette" +msgid "blueviolet (#8A2BE2)" +msgstr "blueviolet (#8A2BE2)" -#: ../share/templates/templates.h:1 -msgid "NTSC video template for 720x486 resolution." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:147 +msgctxt "Palette" +msgid "indigo (#4B0082)" +msgstr "indigo (#4B0082)" -#: ../share/templates/templates.h:1 -msgid "NTSC video empty 720x486" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:148 +msgctxt "Palette" +msgid "darkorchid (#9932CC)" +msgstr "darkorchid (#9932CC)" -#: ../share/templates/templates.h:1 -msgid "Video PAL 728x576" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:149 +msgctxt "Palette" +msgid "darkviolet (#9400D3)" +msgstr "darkviolet (#9400D3)" -#: ../share/templates/templates.h:1 -msgid "PAL video template for 728x576 resolution." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:150 +msgctxt "Palette" +msgid "mediumorchid (#BA55D3)" +msgstr "mediumorchid (#BA55D3)" -#: ../share/templates/templates.h:1 -msgid "PAL video empty 728x576" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:151 +msgctxt "Palette" +msgid "thistle (#D8BFD8)" +msgstr "thistle (#D8BFD8)" -#: ../share/templates/templates.h:1 -msgid "Web Banner 468x60" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:152 +msgctxt "Palette" +msgid "plum (#DDA0DD)" +msgstr "plum (#DDA0DD)" -#: ../share/templates/templates.h:1 -msgid "Empty 468x60 web banner template." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:153 +msgctxt "Palette" +msgid "violet (#EE82EE)" +msgstr "violet (#EE82EE)" -#: ../share/templates/templates.h:1 -msgid "web banner 468x60 empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:154 +msgctxt "Palette" +msgid "purple (#800080)" +msgstr "purple (#800080)" -#: ../share/templates/templates.h:1 -msgid "Web Banner 728x90" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:155 +msgctxt "Palette" +msgid "darkmagenta (#8B008B)" +msgstr "darkmagenta (#8B008B)" -#: ../share/templates/templates.h:1 -msgid "Empty 728x90 web banner template." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:156 +msgctxt "Palette" +msgid "magenta (#FF00FF)" +msgstr "magenta (#FF00FF)" -#: ../share/templates/templates.h:1 -msgid "web banner 728x90 empty" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:157 +msgctxt "Palette" +msgid "orchid (#DA70D6)" +msgstr "orchid (#DA70D6)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "LaTeX Beamer" -msgstr "Печать в LaTeX" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:158 +msgctxt "Palette" +msgid "mediumvioletred (#C71585)" +msgstr "mediumvioletred (#C71585)" -#: ../share/templates/templates.h:1 -msgid "LaTeX beamer template with helping grid." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:159 +msgctxt "Palette" +msgid "deeppink (#FF1493)" +msgstr "deeppink (#FF1493)" -#: ../share/templates/templates.h:1 -msgid "LaTex LaTeX latex grid beamer" -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:160 +msgctxt "Palette" +msgid "hotpink (#FF69B4)" +msgstr "hotpink (#FF69B4)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "Typography Canvas" -msgstr "1 Настроить холст" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:161 +msgctxt "Palette" +msgid "lavenderblush (#FFF0F5)" +msgstr "lavenderblush (#FFF0F5)" -#: ../share/templates/templates.h:1 -msgid "Empty typography canvas with helping guidelines." -msgstr "" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:162 +msgctxt "Palette" +msgid "palevioletred (#DB7093)" +msgstr "palevioletred (#DB7093)" -#: ../share/templates/templates.h:1 -#, fuzzy -msgid "guidelines typography canvas" -msgstr "1 Настроить холст" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:163 +msgctxt "Palette" +msgid "crimson (#DC143C)" +msgstr "crimson (#DC143C)" -#. 3D box -#: ../src/box3d.cpp:259 ../src/box3d.cpp:1310 -#: ../src/ui/dialog/inkscape-preferences.cpp:398 -msgid "3D Box" -msgstr "Паралеллепипед" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:164 +msgctxt "Palette" +msgid "pink (#FFC0CB)" +msgstr "pink (#FFC0CB)" -#: ../src/color-profile.cpp:852 -#, c-format -msgid "Color profiles directory (%s) is unavailable." -msgstr "Каталог с профилями (%s) недоступен." +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:165 +msgctxt "Palette" +msgid "lightpink (#FFB6C1)" +msgstr "lightpink (#FFB6C1)" -#: ../src/color-profile.cpp:911 ../src/color-profile.cpp:928 -msgid "(invalid UTF-8 string)" -msgstr "(некорректная строка UTF-8)" +#. Palette: ./svg.gpl +#: ../share/palettes/palettes.h:166 +msgctxt "Palette" +msgid "rebeccapurple (#663399)" +msgstr "" -#: ../src/color-profile.cpp:913 ../src/filter-enums.cpp:121 -#: ../src/live_effects/lpe-ruler.cpp:32 -#: ../src/ui/dialog/filter-effects-dialog.cpp:549 -#: ../src/ui/dialog/inkscape-preferences.cpp:332 -#: ../src/ui/dialog/inkscape-preferences.cpp:643 -#: ../src/ui/dialog/inkscape-preferences.cpp:1261 -#: ../src/ui/dialog/inkscape-preferences.cpp:1837 -#: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743 -#: ../src/ui/dialog/input.cpp:1571 ../src/ui/dialog/input.cpp:1625 -#: ../src/verbs.cpp:2349 ../src/widgets/gradient-toolbar.cpp:1112 -#: ../src/widgets/pencil-toolbar.cpp:155 -#: ../src/widgets/stroke-marker-selector.cpp:388 -#: ../share/extensions/gcodetools_area.inx.h:48 -#: ../share/extensions/gcodetools_dxf_points.inx.h:20 -#: ../share/extensions/gcodetools_engraving.inx.h:26 -#: ../share/extensions/gcodetools_graffiti.inx.h:37 -#: ../share/extensions/gcodetools_lathe.inx.h:41 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:30 -#: ../share/extensions/grid_polar.inx.h:4 -#: ../share/extensions/guides_creator.inx.h:24 -#: ../share/extensions/plotter.inx.h:15 ../share/extensions/scour.inx.h:18 -msgid "None" -msgstr "Нет" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:167 +msgctxt "Palette" +msgid "Butter 1" +msgstr "Butter 1" -#: ../src/context-fns.cpp:36 ../src/context-fns.cpp:65 -msgid "<b>Current layer is hidden</b>. Unhide it to be able to draw on it." -msgstr "" -"<b>Текущий слой скрыт</b>. Включите его показ, чтобы снова иметь возможность " -"рисовать на нём." +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:168 +msgctxt "Palette" +msgid "Butter 2" +msgstr "Butter 2" -#: ../src/context-fns.cpp:42 ../src/context-fns.cpp:71 -msgid "<b>Current layer is locked</b>. Unlock it to be able to draw on it." -msgstr "" -"<b>Текущий слой заблокирован</b>. Разблокируйте его, чтобы иметь возможность " -"снова рисовать на нём." +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:169 +msgctxt "Palette" +msgid "Butter 3" +msgstr "Butter 3" -#: ../src/desktop-events.cpp:225 -msgid "Create guide" -msgstr "Создание направляющей" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:170 +msgctxt "Palette" +msgid "Chameleon 1" +msgstr "Chameleon 1" -#: ../src/desktop-events.cpp:471 -msgid "Move guide" -msgstr "Перемещение направляющей" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:171 +msgctxt "Palette" +msgid "Chameleon 2" +msgstr "Chameleon 2" -#: ../src/desktop-events.cpp:478 ../src/desktop-events.cpp:536 -#: ../src/ui/dialog/guides.cpp:138 -msgid "Delete guide" -msgstr "Удаление направляющей" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:172 +msgctxt "Palette" +msgid "Chameleon 3" +msgstr "Chameleon 3" -#: ../src/desktop-events.cpp:516 -#, c-format -msgid "<b>Guideline</b>: %s" -msgstr "<b>Направляющая</b>: %s" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:173 +msgctxt "Palette" +msgid "Orange 1" +msgstr "Orange 1" -#: ../src/desktop.cpp:880 -msgid "No previous zoom." -msgstr "Нет предыдущего масштаба." +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:174 +msgctxt "Palette" +msgid "Orange 2" +msgstr "Orange 2" -#: ../src/desktop.cpp:901 -msgid "No next zoom." -msgstr "Нет следующего масштаба." +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:175 +msgctxt "Palette" +msgid "Orange 3" +msgstr "Orange 3" -#: ../src/display/canvas-axonomgrid.cpp:317 ../src/display/canvas-grid.cpp:693 -msgid "Grid _units:" -msgstr "Е_диницы сетки:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:176 +msgctxt "Palette" +msgid "Sky Blue 1" +msgstr "Sky Blue 1" -#: ../src/display/canvas-axonomgrid.cpp:319 ../src/display/canvas-grid.cpp:695 -msgid "_Origin X:" -msgstr "_Точка отсчёта по X:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:177 +msgctxt "Palette" +msgid "Sky Blue 2" +msgstr "Sky Blue 2" -#: ../src/display/canvas-axonomgrid.cpp:319 ../src/display/canvas-grid.cpp:695 -#: ../src/ui/dialog/inkscape-preferences.cpp:737 -#: ../src/ui/dialog/inkscape-preferences.cpp:762 -msgid "X coordinate of grid origin" -msgstr "Координата начала отсчёта по оси X" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:178 +msgctxt "Palette" +msgid "Sky Blue 3" +msgstr "Sky Blue 3" -#: ../src/display/canvas-axonomgrid.cpp:321 ../src/display/canvas-grid.cpp:697 -msgid "O_rigin Y:" -msgstr "Т_очка отсчёта по Y:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:179 +msgctxt "Palette" +msgid "Plum 1" +msgstr "Plum 1" -#: ../src/display/canvas-axonomgrid.cpp:321 ../src/display/canvas-grid.cpp:697 -#: ../src/ui/dialog/inkscape-preferences.cpp:738 -#: ../src/ui/dialog/inkscape-preferences.cpp:763 -msgid "Y coordinate of grid origin" -msgstr "Координата начала отсчёта по оси Y" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:180 +msgctxt "Palette" +msgid "Plum 2" +msgstr "Plum 2" -#: ../src/display/canvas-axonomgrid.cpp:323 ../src/display/canvas-grid.cpp:701 -msgid "Spacing _Y:" -msgstr "И_нтервал по Y:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:181 +msgctxt "Palette" +msgid "Plum 3" +msgstr "Plum 3" -#: ../src/display/canvas-axonomgrid.cpp:323 -#: ../src/ui/dialog/inkscape-preferences.cpp:766 -msgid "Base length of z-axis" -msgstr "Основная длина оси Z" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:182 +msgctxt "Palette" +msgid "Chocolate 1" +msgstr "Chocolate 1" -#: ../src/display/canvas-axonomgrid.cpp:325 -#: ../src/ui/dialog/inkscape-preferences.cpp:769 -#: ../src/widgets/box3d-toolbar.cpp:299 -msgid "Angle X:" -msgstr "Угол X:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:183 +msgctxt "Palette" +msgid "Chocolate 2" +msgstr "Chocolate 2" -#: ../src/display/canvas-axonomgrid.cpp:325 -#: ../src/ui/dialog/inkscape-preferences.cpp:769 -msgid "Angle of x-axis" -msgstr "Угол оси X" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:184 +msgctxt "Palette" +msgid "Chocolate 3" +msgstr "Chocolate 3" -#: ../src/display/canvas-axonomgrid.cpp:327 -#: ../src/ui/dialog/inkscape-preferences.cpp:770 -#: ../src/widgets/box3d-toolbar.cpp:378 -msgid "Angle Z:" -msgstr "Угол Z:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:185 +msgctxt "Palette" +msgid "Scarlet Red 1" +msgstr "Scarlet Red 1" -#: ../src/display/canvas-axonomgrid.cpp:327 -#: ../src/ui/dialog/inkscape-preferences.cpp:770 -msgid "Angle of z-axis" -msgstr "Угол оси Z" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:186 +msgctxt "Palette" +msgid "Scarlet Red 2" +msgstr "Scarlet Red 2" -#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 -#, fuzzy -msgid "Minor grid line _color:" -msgstr "Цвет основных линий сетки:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:187 +msgctxt "Palette" +msgid "Scarlet Red 3" +msgstr "Scarlet Red 3" -#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:721 +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:188 #, fuzzy -msgid "Minor grid line color" -msgstr "Цвет основных линий сетки" +msgctxt "Palette" +msgid "Snowy White" +msgstr "Белый" -#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 -#, fuzzy -msgid "Color of the minor grid lines" -msgstr "Цвет обычных линий сетки" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:189 +msgctxt "Palette" +msgid "Aluminium 1" +msgstr "Aluminium 1" -#: ../src/display/canvas-axonomgrid.cpp:336 ../src/display/canvas-grid.cpp:710 -msgid "Ma_jor grid line color:" -msgstr "Цвет о_сновных линий сетки:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:190 +msgctxt "Palette" +msgid "Aluminium 2" +msgstr "Aluminium 2" -#: ../src/display/canvas-axonomgrid.cpp:336 ../src/display/canvas-grid.cpp:710 -#: ../src/ui/dialog/inkscape-preferences.cpp:723 -msgid "Major grid line color" -msgstr "Цвет основных линий сетки" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:191 +msgctxt "Palette" +msgid "Aluminium 3" +msgstr "Aluminium 3" -#: ../src/display/canvas-axonomgrid.cpp:337 ../src/display/canvas-grid.cpp:711 -msgid "Color of the major (highlighted) grid lines" -msgstr "Цвет основных линий сетки" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:192 +msgctxt "Palette" +msgid "Aluminium 4" +msgstr "Aluminium 4" -#: ../src/display/canvas-axonomgrid.cpp:341 ../src/display/canvas-grid.cpp:715 -msgid "_Major grid line every:" -msgstr "Осно_вная линия сетки каждые:" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:193 +msgctxt "Palette" +msgid "Aluminium 5" +msgstr "Aluminium 5" -#: ../src/display/canvas-axonomgrid.cpp:341 ../src/display/canvas-grid.cpp:715 -msgid "lines" -msgstr "линий" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:194 +msgctxt "Palette" +msgid "Aluminium 6" +msgstr "Aluminium 6" -#: ../src/display/canvas-grid.cpp:63 -msgid "Rectangular grid" -msgstr "Прямоугольная сетка" +#. Palette: ./Tango-Palette.gpl +#: ../share/palettes/palettes.h:195 +#, fuzzy +msgctxt "Palette" +msgid "Jet Black" +msgstr "Чёрный" -#: ../src/display/canvas-grid.cpp:64 -msgid "Axonometric grid" -msgstr "Аксонометрическая сетка" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:1" +msgstr "Полосы 1:1" -#: ../src/display/canvas-grid.cpp:275 -msgid "Create new grid" -msgstr "Создание новой сетки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:1 white" +msgstr "Полосы белые 1:1" -#: ../src/display/canvas-grid.cpp:341 -msgid "_Enabled" -msgstr "В_ключена" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:1.5" +msgstr "Полосы 1:1.5" -#: ../src/display/canvas-grid.cpp:342 -msgid "" -"Determines whether to snap to this grid or not. Can be 'on' for invisible " -"grids." -msgstr "" -"Определяет, включено ли прилипание к этой сетке. Прилипание может работать и " -"с невидимыми сетками." +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:1.5 white" +msgstr "Полосы белые 1:1.5" -#: ../src/display/canvas-grid.cpp:346 -msgid "Snap to visible _grid lines only" -msgstr "_Прилипать только к видимым линиям сетки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:2" +msgstr "Полосы 1:2" -#: ../src/display/canvas-grid.cpp:347 -msgid "" -"When zoomed out, not all grid lines will be displayed. Only the visible ones " -"will be snapped to" -msgstr "" -"При уменьшении отображения не все линии сетки будут видны. Прилипание будет " -"выполняться только к видимым линиям." +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:2 white" +msgstr "Полосы белые 1:2" -#: ../src/display/canvas-grid.cpp:351 -msgid "_Visible" -msgstr "_Видима" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:3" +msgstr "Полосы 1:3" -#: ../src/display/canvas-grid.cpp:352 -msgid "" -"Determines whether the grid is displayed or not. Objects are still snapped " -"to invisible grids." -msgstr "" -"Определяет, отображается ли сетка. Объекты по-прежнему остаются " -"прилепленными к невидимым сеткам." +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:3 white" +msgstr "Полосы белые 1:3" -#: ../src/display/canvas-grid.cpp:699 -msgid "Spacing _X:" -msgstr "_Интервал по X:" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:4" +msgstr "Полосы 1:4" -#: ../src/display/canvas-grid.cpp:699 -#: ../src/ui/dialog/inkscape-preferences.cpp:743 -msgid "Distance between vertical grid lines" -msgstr "Расстояние между вертикальными линиями сетки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:4 white" +msgstr "Полосы белые 1:4" -#: ../src/display/canvas-grid.cpp:701 -#: ../src/ui/dialog/inkscape-preferences.cpp:744 -msgid "Distance between horizontal grid lines" -msgstr "Расстояние между горизонтальными линиями сетки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:5" +msgstr "Полосы 1:5" -#: ../src/display/canvas-grid.cpp:732 -msgid "_Show dots instead of lines" -msgstr "Показывать точки в_место линий" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:5 white" +msgstr "Полосы белые 1:5" -#: ../src/display/canvas-grid.cpp:733 -msgid "If set, displays dots at gridpoints instead of gridlines" -msgstr "Отображается ли сетка лишь точками пересечения ее линий" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:8" +msgstr "Полосы 1:8" -#. TRANSLATORS: undefined target for snapping -#: ../src/display/snap-indicator.cpp:72 ../src/display/snap-indicator.cpp:75 -#: ../src/display/snap-indicator.cpp:180 ../src/display/snap-indicator.cpp:183 -msgid "UNDEFINED" -msgstr "НЕ ОПРЕДЕЛЕНО" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:8 white" +msgstr "Полосы белые 1:8" -#: ../src/display/snap-indicator.cpp:79 -msgid "grid line" -msgstr "линии сетки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:10" +msgstr "Полосы 1:10" -#: ../src/display/snap-indicator.cpp:82 -msgid "grid intersection" -msgstr "пересечению линий сетки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:10 white" +msgstr "Полосы белые 1:10" -#: ../src/display/snap-indicator.cpp:85 -#, fuzzy -msgid "grid line (perpendicular)" -msgstr "Перпендикулярная биссектриса" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:16" +msgstr "Полосы 1:16" -#: ../src/display/snap-indicator.cpp:88 -msgid "guide" -msgstr "направляющей" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:16 white" +msgstr "Полосы белые 1:16" -#: ../src/display/snap-indicator.cpp:91 -msgid "guide intersection" -msgstr "пересечению направляющих" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:32" +msgstr "Полосы 1:32" -#: ../src/display/snap-indicator.cpp:94 -msgid "guide origin" -msgstr "началу координат направляющей" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:32 white" +msgstr "Полосы белые 1:32" -#: ../src/display/snap-indicator.cpp:97 -#, fuzzy -msgid "guide (perpendicular)" -msgstr "Перпендикулярная биссектриса" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 1:64" +msgstr "Полосы 1:64" -#: ../src/display/snap-indicator.cpp:100 -msgid "grid-guide intersection" -msgstr "пересечению сетки с направляющей" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 2:1" +msgstr "Полосы 2:1" -#: ../src/display/snap-indicator.cpp:103 -msgid "cusp node" -msgstr "острому узлу" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 2:1 white" +msgstr "Полосы белые 2:1" -#: ../src/display/snap-indicator.cpp:106 -msgid "smooth node" -msgstr "сглаженному узлу" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 4:1" +msgstr "Полосы 4:1" -#: ../src/display/snap-indicator.cpp:109 -msgid "path" -msgstr "контуру" +#: ../share/patterns/patterns.svg.h:1 +msgid "Stripes 4:1 white" +msgstr "Полосы белые 4:1" -#: ../src/display/snap-indicator.cpp:112 -#, fuzzy -msgid "path (perpendicular)" -msgstr "Перпендикулярная биссектриса" +#: ../share/patterns/patterns.svg.h:1 +msgid "Checkerboard" +msgstr "Шахматная доска" -#: ../src/display/snap-indicator.cpp:115 -msgid "path (tangential)" -msgstr "" +#: ../share/patterns/patterns.svg.h:1 +msgid "Checkerboard white" +msgstr "Шахматная доска белая" -#: ../src/display/snap-indicator.cpp:118 -msgid "path intersection" -msgstr "пересечению контуров" +#: ../share/patterns/patterns.svg.h:1 +msgid "Packed circles" +msgstr "Упакованные круги" -#: ../src/display/snap-indicator.cpp:121 -#, fuzzy -msgid "guide-path intersection" -msgstr "пересечению направляющих" +#: ../share/patterns/patterns.svg.h:1 +msgid "Polka dots, small" +msgstr "Горошек мелкий" -#: ../src/display/snap-indicator.cpp:124 -#, fuzzy -msgid "clip-path" -msgstr "Установлен обтравочный контур" +#: ../share/patterns/patterns.svg.h:1 +msgid "Polka dots, small white" +msgstr "Горошек мелкий белый" -#: ../src/display/snap-indicator.cpp:127 -#, fuzzy -msgid "mask-path" -msgstr "Изменить контур маски" +#: ../share/patterns/patterns.svg.h:1 +msgid "Polka dots, medium" +msgstr "Горошек средний" -#: ../src/display/snap-indicator.cpp:130 -msgid "bounding box corner" -msgstr "углу площадки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Polka dots, medium white" +msgstr "Горошек средний белый" -#: ../src/display/snap-indicator.cpp:133 -msgid "bounding box side" -msgstr "стороне площадки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Polka dots, large" +msgstr "Горошек крупный" -#: ../src/display/snap-indicator.cpp:136 -msgid "page border" -msgstr "краю страницы" +#: ../share/patterns/patterns.svg.h:1 +msgid "Polka dots, large white" +msgstr "Горошек крупный белый" -#: ../src/display/snap-indicator.cpp:139 -msgid "line midpoint" -msgstr "средней точке линии" +#: ../share/patterns/patterns.svg.h:1 +msgid "Wavy" +msgstr "Волна" -#: ../src/display/snap-indicator.cpp:142 -msgid "object midpoint" -msgstr "средней точке объекта" +#: ../share/patterns/patterns.svg.h:1 +msgid "Wavy white" +msgstr "Волна белая" -#: ../src/display/snap-indicator.cpp:145 -msgid "object rotation center" -msgstr "центру вращения объекта" +#: ../share/patterns/patterns.svg.h:1 +msgid "Camouflage" +msgstr "Камуфляж" -#: ../src/display/snap-indicator.cpp:148 -msgid "bounding box side midpoint" -msgstr "средней точке стороны площадки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Ermine" +msgstr "Горностай" -#: ../src/display/snap-indicator.cpp:151 -msgid "bounding box midpoint" -msgstr "средней точке площадки" +#: ../share/patterns/patterns.svg.h:1 +msgid "Sand (bitmap)" +msgstr "Песок (растровая текстура)" -#: ../src/display/snap-indicator.cpp:154 -msgid "page corner" -msgstr "углу страницы" +#: ../share/patterns/patterns.svg.h:1 +msgid "Cloth (bitmap)" +msgstr "Ткань (растровая текстура)" -#: ../src/display/snap-indicator.cpp:157 -msgid "quadrant point" -msgstr "точке квадранта" +#: ../share/patterns/patterns.svg.h:1 +msgid "Old paint (bitmap)" +msgstr "Старая краска (растровая текстура)" -#: ../src/display/snap-indicator.cpp:161 -msgid "corner" -msgstr "углу" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:2 +msgctxt "Symbol" +msgid "AIGA Symbol Signs" +msgstr "" -#: ../src/display/snap-indicator.cpp:164 -msgid "text anchor" +#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 +#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278 +msgctxt "Symbol" +msgid "Telephone" msgstr "" -#: ../src/display/snap-indicator.cpp:167 -msgid "text baseline" -msgstr "линии шрифта" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6 +msgctxt "Symbol" +msgid "Mail" +msgstr "" -#: ../src/display/snap-indicator.cpp:170 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8 #, fuzzy -msgid "constrained angle" -msgstr "Сокращение межстрочного интервала" +msgctxt "Symbol" +msgid "Currency Exchange" +msgstr "Текущий слой" -#: ../src/display/snap-indicator.cpp:173 -#, fuzzy -msgid "constraint" -msgstr "Константа диффузии:" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10 +msgctxt "Symbol" +msgid "Currency Exchange - Euro" +msgstr "" -#: ../src/display/snap-indicator.cpp:187 -msgid "Bounding box corner" -msgstr "Угол площадки" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12 +msgctxt "Symbol" +msgid "Cashier" +msgstr "" -#: ../src/display/snap-indicator.cpp:190 -msgid "Bounding box midpoint" -msgstr "Средняя точка площадки" +#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 +#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214 +#, fuzzy +msgctxt "Symbol" +msgid "First Aid" +msgstr "Первый слайд:" -#: ../src/display/snap-indicator.cpp:193 -msgid "Bounding box side midpoint" -msgstr "Средняя точка стороны площадки" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16 +#, fuzzy +msgctxt "Symbol" +msgid "Lost and Found" +msgstr "Не закруглён" -#: ../src/display/snap-indicator.cpp:196 ../src/ui/tool/node.cpp:1319 -msgid "Smooth node" -msgstr "Сглаженный узел" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18 +msgctxt "Symbol" +msgid "Coat Check" +msgstr "" -#: ../src/display/snap-indicator.cpp:199 ../src/ui/tool/node.cpp:1318 -msgid "Cusp node" -msgstr "Острый узел" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20 +msgctxt "Symbol" +msgid "Baggage Lockers" +msgstr "" -#: ../src/display/snap-indicator.cpp:202 -msgid "Line midpoint" -msgstr "Средняя точка линии" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22 +msgctxt "Symbol" +msgid "Escalator" +msgstr "" -#: ../src/display/snap-indicator.cpp:205 -msgid "Object midpoint" -msgstr "Средняя точка объекта" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24 +msgctxt "Symbol" +msgid "Escalator Down" +msgstr "" -#: ../src/display/snap-indicator.cpp:208 -msgid "Object rotation center" -msgstr "Центр вращения объекта" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26 +msgctxt "Symbol" +msgid "Escalator Up" +msgstr "" -#: ../src/display/snap-indicator.cpp:212 -msgid "Handle" -msgstr "Рычаг" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28 +msgctxt "Symbol" +msgid "Stairs" +msgstr "" -#: ../src/display/snap-indicator.cpp:215 -msgid "Path intersection" -msgstr "Пересечение контуров" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30 +msgctxt "Symbol" +msgid "Stairs Down" +msgstr "" -#: ../src/display/snap-indicator.cpp:218 -msgid "Guide" -msgstr "Направляющая" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32 +msgctxt "Symbol" +msgid "Stairs Up" +msgstr "" -#: ../src/display/snap-indicator.cpp:221 -msgid "Guide origin" -msgstr "Начало координат направляющей" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34 +#, fuzzy +msgctxt "Symbol" +msgid "Elevator" +msgstr "Высота" -#: ../src/display/snap-indicator.cpp:224 -msgid "Convex hull corner" -msgstr "Выпуклый внешний угол" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36 +msgctxt "Symbol" +msgid "Toilets - Men" +msgstr "" -#: ../src/display/snap-indicator.cpp:227 -msgid "Quadrant point" -msgstr "Точка квадранта" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38 +msgctxt "Symbol" +msgid "Toilets - Women" +msgstr "" -#: ../src/display/snap-indicator.cpp:231 -msgid "Corner" -msgstr "Угол" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40 +msgctxt "Symbol" +msgid "Toilets" +msgstr "" -#: ../src/display/snap-indicator.cpp:234 -#, fuzzy -msgid "Text anchor" -msgstr "Импорт текстовых файлов" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42 +msgctxt "Symbol" +msgid "Nursery" +msgstr "" -#: ../src/display/snap-indicator.cpp:237 -msgid "Multiple of grid spacing" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44 +msgctxt "Symbol" +msgid "Drinking Fountain" msgstr "" -#: ../src/display/snap-indicator.cpp:268 -msgid " to " -msgstr " к " +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46 +#, fuzzy +msgctxt "Symbol" +msgid "Waiting Room" +msgstr "Сценарии" -#: ../src/document.cpp:542 -#, c-format -msgid "New document %d" -msgstr "Новый документ %d" +#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 +#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 +#, fuzzy +msgctxt "Symbol" +msgid "Information" +msgstr "Информация" -#: ../src/document.cpp:547 -#, fuzzy, c-format -msgid "Memory document %d" -msgstr "Документ в памяти %d" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50 +#, fuzzy +msgctxt "Symbol" +msgid "Hotel Information" +msgstr "Информация о странице" -#: ../src/document.cpp:576 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52 #, fuzzy -msgid "Memory document %1" -msgstr "Документ в памяти %d" +msgctxt "Symbol" +msgid "Air Transportation" +msgstr "Преобразование" -#: ../src/document.cpp:788 -#, c-format -msgid "Unnamed document %d" -msgstr "Безымянный документ %d" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54 +msgctxt "Symbol" +msgid "Heliport" +msgstr "" -#: ../src/event-log.cpp:185 -msgid "[Unchanged]" -msgstr "[Без изменений]" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56 +msgctxt "Symbol" +msgid "Taxi" +msgstr "" -#. Edit -#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2386 -msgid "_Undo" -msgstr "_Отменить" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58 +#, fuzzy +msgctxt "Symbol" +msgid "Bus" +msgstr "Размывание" -#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2388 -msgid "_Redo" -msgstr "Ве_рнуть" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60 +#, fuzzy +msgctxt "Symbol" +msgid "Ground Transportation" +msgstr "Преобразование" -#: ../src/extension/dependency.cpp:243 -msgid "Dependency:" -msgstr "Зависит от:" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62 +#, fuzzy +msgctxt "Symbol" +msgid "Rail Transportation" +msgstr "Преобразование" -#: ../src/extension/dependency.cpp:244 -msgid " type: " -msgstr " тип: " +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64 +#, fuzzy +msgctxt "Symbol" +msgid "Water Transportation" +msgstr "Преобразование" -#: ../src/extension/dependency.cpp:245 -msgid " location: " -msgstr " расположение:" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66 +msgctxt "Symbol" +msgid "Car Rental" +msgstr "" -#: ../src/extension/dependency.cpp:246 -msgid " string: " -msgstr " строка:" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68 +msgctxt "Symbol" +msgid "Restaurant" +msgstr "" -#: ../src/extension/dependency.cpp:249 -msgid " description: " -msgstr " описание:" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70 +msgctxt "Symbol" +msgid "Coffeeshop" +msgstr "" -#: ../src/extension/effect.cpp:41 -msgid " (No preferences)" -msgstr " (без параметров)" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72 +#, fuzzy +msgctxt "Symbol" +msgid "Bar" +msgstr "Кора" -#: ../src/extension/effect.h:70 ../src/verbs.cpp:2160 -msgid "Extensions" -msgstr "Расширения" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74 +msgctxt "Symbol" +msgid "Shops" +msgstr "" -#. This is some filler text, needs to change before relase -#: ../src/extension/error-file.cpp:52 -msgid "" -"<span weight=\"bold\" size=\"larger\">One or more extensions failed to load</" -"span>\n" -"\n" -"The failed extensions have been skipped. Inkscape will continue to run " -"normally but those extensions will be unavailable. For details to " -"troubleshoot this problem, please refer to the error log located at: " +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76 +msgctxt "Symbol" +msgid "Barber Shop - Beauty Salon" msgstr "" -"<span weight=\"bold\" size=\"larger\">Не удалось загрузить одно или " -"несколько расширений</span>\n" -"\n" -"Незагруженные сценарии пропущены. Inkscape будет работать нормально, но эти " -"расширения будут недоступны. Подробности можно найти в файле журнала " -"событий, находящегося здесь:" -#: ../src/extension/error-file.cpp:66 -msgid "Show dialog on startup" -msgstr "Показывать диалог при запуске" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78 +msgctxt "Symbol" +msgid "Barber Shop" +msgstr "" -#: ../src/extension/execution-env.cpp:144 -#, c-format -msgid "'%s' working, please wait..." -msgstr "Применяется эффект '%s' , подождите немного..." - -#. static int i = 0; -#. std::cout << "Checking module[" << i++ << "]: " << name << std::endl; -#: ../src/extension/extension.cpp:266 -msgid "" -" This is caused by an improper .inx file for this extension. An improper ." -"inx file could have been caused by a faulty installation of Inkscape." -msgstr "" -"Это вызвано неправильным .inx файлом для данного расширения. Неправильный ." -"inx файл мог появиться из-за ошибки при инсталляции Inkscape." - -#: ../src/extension/extension.cpp:276 -msgid "the extension is designed for Windows only." -msgstr "" - -#: ../src/extension/extension.cpp:281 -msgid "an ID was not defined for it." -msgstr "ID не был определен." - -#: ../src/extension/extension.cpp:285 -msgid "there was no name defined for it." -msgstr "не было определено имени." - -#: ../src/extension/extension.cpp:289 -msgid "the XML description of it got lost." -msgstr "XML-описание было потеряно." - -#: ../src/extension/extension.cpp:293 -msgid "no implementation was defined for the extension." -msgstr "для этого расширения не была определена реализация." - -#. std::cout << "Failed: " << *(_deps[i]) << std::endl; -#: ../src/extension/extension.cpp:300 -msgid "a dependency was not met." -msgstr "не установлен необходимый для выполнения сценария компонент." - -#: ../src/extension/extension.cpp:320 -msgid "Extension \"" -msgstr "Расширение \"" - -#: ../src/extension/extension.cpp:320 -msgid "\" failed to load because " -msgstr "\" не удалось загрузить, потому что " - -#: ../src/extension/extension.cpp:669 -#, c-format -msgid "Could not create extension error log file '%s'" -msgstr "Невозможно создать файл журнала %s." - -#: ../src/extension/extension.cpp:777 -#: ../share/extensions/webslicer_create_rect.inx.h:2 -msgid "Name:" -msgstr "Имя:" - -#: ../src/extension/extension.cpp:778 -msgid "ID:" -msgstr "ID" - -#: ../src/extension/extension.cpp:779 -msgid "State:" -msgstr "Состояние:" - -#: ../src/extension/extension.cpp:779 -msgid "Loaded" -msgstr "Загружен" - -#: ../src/extension/extension.cpp:779 -msgid "Unloaded" -msgstr "Не загружен" - -#: ../src/extension/extension.cpp:779 -msgid "Deactivated" -msgstr "Деактивирован" - -#: ../src/extension/extension.cpp:819 -msgid "" -"Currently there is no help available for this Extension. Please look on the " -"Inkscape website or ask on the mailing lists if you have questions regarding " -"this extension." +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80 +msgctxt "Symbol" +msgid "Beauty Salon" msgstr "" -"В настоящее время для этого расширения нет справочной информации. Поищите ее " -"на сайте Inkscape или задайте вопрос в списке рассылки для пользователей." -#: ../src/extension/implementation/script.cpp:1037 -msgid "" -"Inkscape has received additional data from the script executed. The script " -"did not return an error, but this may indicate the results will not be as " -"expected." +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82 +msgctxt "Symbol" +msgid "Ticket Purchase" msgstr "" -"Inkscape получил дополнительные данные от выполненного сценария. Сценарий не " -"возвратил ошибки, но это может означать и то, что результаты будут " -"отличаться от ожидаемых." -#: ../src/extension/init.cpp:288 -msgid "Null external module directory name. Modules will not be loaded." -msgstr "Нулевое имя каталога с внешними модулями. Модули не будут загружены." - -#: ../src/extension/init.cpp:302 -#: ../src/extension/internal/filter/filter-file.cpp:59 -#, c-format -msgid "" -"Modules directory (%s) is unavailable. External modules in that directory " -"will not be loaded." +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84 +msgctxt "Symbol" +msgid "Baggage Check In" msgstr "" -"Каталог модулей (%s) недоступен. Внешние модули из этого каталога не будут " -"загружены." - -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:39 -msgid "Adaptive Threshold" -msgstr "Адаптивная постеризация" - -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:41 -#: ../src/extension/internal/bitmap/raise.cpp:42 -#: ../src/extension/internal/bitmap/sample.cpp:41 -#: ../src/extension/internal/bluredge.cpp:138 -#: ../src/ui/dialog/object-attributes.cpp:68 -#: ../src/ui/dialog/object-attributes.cpp:77 -#: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116 -#: ../src/widgets/tweak-toolbar.cpp:128 -#: ../share/extensions/foldablebox.inx.h:2 -msgid "Width:" -msgstr "Ширина:" - -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:42 -#: ../src/extension/internal/bitmap/raise.cpp:43 -#: ../src/extension/internal/bitmap/sample.cpp:42 -#: ../src/ui/dialog/object-attributes.cpp:69 -#: ../src/ui/dialog/object-attributes.cpp:78 -#: ../share/extensions/foldablebox.inx.h:3 -msgid "Height:" -msgstr "Высота:" - -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 -#: ../share/extensions/printing_marks.inx.h:12 -msgid "Offset:" -msgstr "Смещение:" - -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:47 -#: ../src/extension/internal/bitmap/addNoise.cpp:58 -#: ../src/extension/internal/bitmap/blur.cpp:45 -#: ../src/extension/internal/bitmap/channel.cpp:64 -#: ../src/extension/internal/bitmap/charcoal.cpp:45 -#: ../src/extension/internal/bitmap/colorize.cpp:56 -#: ../src/extension/internal/bitmap/contrast.cpp:46 -#: ../src/extension/internal/bitmap/crop.cpp:75 -#: ../src/extension/internal/bitmap/cycleColormap.cpp:43 -#: ../src/extension/internal/bitmap/despeckle.cpp:41 -#: ../src/extension/internal/bitmap/edge.cpp:43 -#: ../src/extension/internal/bitmap/emboss.cpp:45 -#: ../src/extension/internal/bitmap/enhance.cpp:40 -#: ../src/extension/internal/bitmap/equalize.cpp:40 -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:45 -#: ../src/extension/internal/bitmap/implode.cpp:43 -#: ../src/extension/internal/bitmap/level.cpp:49 -#: ../src/extension/internal/bitmap/levelChannel.cpp:71 -#: ../src/extension/internal/bitmap/medianFilter.cpp:43 -#: ../src/extension/internal/bitmap/modulate.cpp:48 -#: ../src/extension/internal/bitmap/negate.cpp:41 -#: ../src/extension/internal/bitmap/normalize.cpp:41 -#: ../src/extension/internal/bitmap/oilPaint.cpp:43 -#: ../src/extension/internal/bitmap/opacity.cpp:44 -#: ../src/extension/internal/bitmap/raise.cpp:48 -#: ../src/extension/internal/bitmap/reduceNoise.cpp:46 -#: ../src/extension/internal/bitmap/sample.cpp:46 -#: ../src/extension/internal/bitmap/shade.cpp:48 -#: ../src/extension/internal/bitmap/sharpen.cpp:45 -#: ../src/extension/internal/bitmap/solarize.cpp:45 -#: ../src/extension/internal/bitmap/spread.cpp:43 -#: ../src/extension/internal/bitmap/swirl.cpp:43 -#: ../src/extension/internal/bitmap/threshold.cpp:44 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:50 -#: ../src/extension/internal/bitmap/wave.cpp:45 -msgid "Raster" -msgstr "Растровые" -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:49 -#, fuzzy -msgid "Apply adaptive thresholding to selected bitmap(s)" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86 +msgctxt "Symbol" +msgid "Baggage Claim" msgstr "" -"Применить эффект адаптивной постеризации к выбранным растровым изображениям" -#: ../src/extension/internal/bitmap/addNoise.cpp:45 -msgid "Add Noise" -msgstr "Добавить шум" - -#. _settings->add_checkbutton(false, SP_ATTR_STITCHTILES, _("Stitch Tiles"), "stitch", "noStitch"); -#: ../src/extension/internal/bitmap/addNoise.cpp:47 -#: ../src/extension/internal/filter/color.h:426 -#: ../src/extension/internal/filter/color.h:1497 -#: ../src/extension/internal/filter/color.h:1585 -#: ../src/extension/internal/filter/distort.h:69 -#: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2842 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 -#: ../src/ui/dialog/object-attributes.cpp:49 -#: ../share/extensions/jessyInk_effects.inx.h:5 -#: ../share/extensions/jessyInk_export.inx.h:3 -#: ../share/extensions/jessyInk_transitions.inx.h:5 -#: ../share/extensions/webslicer_create_rect.inx.h:14 -msgid "Type:" -msgstr "Вид:" - -#: ../src/extension/internal/bitmap/addNoise.cpp:48 -msgid "Uniform Noise" -msgstr "Однообразный шум" - -#: ../src/extension/internal/bitmap/addNoise.cpp:49 -msgid "Gaussian Noise" -msgstr "Гауссов шум" - -#: ../src/extension/internal/bitmap/addNoise.cpp:50 -msgid "Multiplicative Gaussian Noise" -msgstr "Увеличивающийся гауссов шум" - -#: ../src/extension/internal/bitmap/addNoise.cpp:51 -msgid "Impulse Noise" -msgstr "Импульсный шум" - -#: ../src/extension/internal/bitmap/addNoise.cpp:52 -msgid "Laplacian Noise" -msgstr "Лапласов шум" - -#: ../src/extension/internal/bitmap/addNoise.cpp:53 -msgid "Poisson Noise" -msgstr "Шум Пуассона" - -#: ../src/extension/internal/bitmap/addNoise.cpp:60 -msgid "Add random noise to selected bitmap(s)" -msgstr "Добавить случайный шум в выбранные изображения" - -#: ../src/extension/internal/bitmap/blur.cpp:38 -#: ../src/extension/internal/filter/blurs.h:54 -#: ../src/extension/internal/filter/paint.h:710 -#: ../src/extension/internal/filter/transparency.h:343 -msgid "Blur" -msgstr "Размывание" - -#: ../src/extension/internal/bitmap/blur.cpp:40 -#: ../src/extension/internal/bitmap/charcoal.cpp:40 -#: ../src/extension/internal/bitmap/edge.cpp:39 -#: ../src/extension/internal/bitmap/emboss.cpp:40 -#: ../src/extension/internal/bitmap/medianFilter.cpp:39 -#: ../src/extension/internal/bitmap/oilPaint.cpp:39 -#: ../src/extension/internal/bitmap/sharpen.cpp:40 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:43 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 -msgid "Radius:" -msgstr "Радиус:" - -#: ../src/extension/internal/bitmap/blur.cpp:41 -#: ../src/extension/internal/bitmap/charcoal.cpp:41 -#: ../src/extension/internal/bitmap/emboss.cpp:41 -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:41 -#: ../src/extension/internal/bitmap/sharpen.cpp:41 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:44 -msgid "Sigma:" -msgstr "Сигма:" - -#: ../src/extension/internal/bitmap/blur.cpp:47 -msgid "Blur selected bitmap(s)" -msgstr "Размыть выделенные растровые объекты" - -#: ../src/extension/internal/bitmap/channel.cpp:48 -msgid "Channel" -msgstr "Извлечение канала" - -#: ../src/extension/internal/bitmap/channel.cpp:50 -msgid "Layer:" -msgstr "Слой:" - -#: ../src/extension/internal/bitmap/channel.cpp:51 -#: ../src/extension/internal/bitmap/levelChannel.cpp:55 -msgid "Red Channel" -msgstr "Красный канал (R)" - -#: ../src/extension/internal/bitmap/channel.cpp:52 -#: ../src/extension/internal/bitmap/levelChannel.cpp:56 -msgid "Green Channel" -msgstr "Зелёный канал (G)" - -#: ../src/extension/internal/bitmap/channel.cpp:53 -#: ../src/extension/internal/bitmap/levelChannel.cpp:57 -msgid "Blue Channel" -msgstr "Синий канал (B)" - -#: ../src/extension/internal/bitmap/channel.cpp:54 -#: ../src/extension/internal/bitmap/levelChannel.cpp:58 -msgid "Cyan Channel" -msgstr "Голубой канал (C)" - -#: ../src/extension/internal/bitmap/channel.cpp:55 -#: ../src/extension/internal/bitmap/levelChannel.cpp:59 -msgid "Magenta Channel" -msgstr "Пурпурный канал (M)" - -#: ../src/extension/internal/bitmap/channel.cpp:56 -#: ../src/extension/internal/bitmap/levelChannel.cpp:60 -msgid "Yellow Channel" -msgstr "Желтый канал (Y)" - -#: ../src/extension/internal/bitmap/channel.cpp:57 -#: ../src/extension/internal/bitmap/levelChannel.cpp:61 -msgid "Black Channel" -msgstr "Чёрный канал (K)" - -#: ../src/extension/internal/bitmap/channel.cpp:58 -#: ../src/extension/internal/bitmap/levelChannel.cpp:62 -msgid "Opacity Channel" -msgstr "Канал непрозрачности" - -#: ../src/extension/internal/bitmap/channel.cpp:59 -#: ../src/extension/internal/bitmap/levelChannel.cpp:63 -msgid "Matte Channel" -msgstr "Матте-канал" - -#: ../src/extension/internal/bitmap/channel.cpp:66 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88 #, fuzzy -msgid "Extract specific channel from image" -msgstr "Извлечь указанный канал из изображения" - -#: ../src/extension/internal/bitmap/charcoal.cpp:38 -msgid "Charcoal" -msgstr "Рисунок углём" +msgctxt "Symbol" +msgid "Customs" +msgstr "Другой" -#: ../src/extension/internal/bitmap/charcoal.cpp:47 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90 #, fuzzy -msgid "Apply charcoal stylization to selected bitmap(s)" -msgstr "Применить эффект рисования углем к выбранному растровому изображению" - -#: ../src/extension/internal/bitmap/colorize.cpp:50 -#: ../src/extension/internal/filter/color.h:317 -msgid "Colorize" -msgstr "Тонирование" - -#: ../src/extension/internal/bitmap/colorize.cpp:52 -#: ../src/extension/internal/filter/bumps.h:101 -#: ../src/extension/internal/filter/bumps.h:321 -#: ../src/extension/internal/filter/bumps.h:328 -#: ../src/extension/internal/filter/color.h:82 -#: ../src/extension/internal/filter/color.h:164 -#: ../src/extension/internal/filter/color.h:171 -#: ../src/extension/internal/filter/color.h:262 -#: ../src/extension/internal/filter/color.h:340 -#: ../src/extension/internal/filter/color.h:347 -#: ../src/extension/internal/filter/color.h:437 -#: ../src/extension/internal/filter/color.h:532 -#: ../src/extension/internal/filter/color.h:654 -#: ../src/extension/internal/filter/color.h:751 -#: ../src/extension/internal/filter/color.h:830 -#: ../src/extension/internal/filter/color.h:921 -#: ../src/extension/internal/filter/color.h:1049 -#: ../src/extension/internal/filter/color.h:1119 -#: ../src/extension/internal/filter/color.h:1212 -#: ../src/extension/internal/filter/color.h:1324 -#: ../src/extension/internal/filter/color.h:1429 -#: ../src/extension/internal/filter/color.h:1505 -#: ../src/extension/internal/filter/color.h:1609 -#: ../src/extension/internal/filter/color.h:1616 -#: ../src/extension/internal/filter/morphology.h:194 -#: ../src/extension/internal/filter/overlays.h:73 -#: ../src/extension/internal/filter/paint.h:99 -#: ../src/extension/internal/filter/paint.h:713 -#: ../src/extension/internal/filter/paint.h:717 -#: ../src/extension/internal/filter/shadows.h:73 -#: ../src/extension/internal/filter/transparency.h:345 -#: ../src/filter-enums.cpp:66 ../src/ui/dialog/clonetiler.cpp:832 -#: ../src/ui/dialog/clonetiler.cpp:983 -#: ../src/ui/dialog/document-properties.cpp:157 -#: ../share/extensions/color_HSL_adjust.inx.h:20 -#: ../share/extensions/color_blackandwhite.inx.h:3 -#: ../share/extensions/color_brighter.inx.h:2 -#: ../share/extensions/color_custom.inx.h:15 -#: ../share/extensions/color_darker.inx.h:2 -#: ../share/extensions/color_desaturate.inx.h:2 -#: ../share/extensions/color_grayscale.inx.h:2 -#: ../share/extensions/color_lesshue.inx.h:2 -#: ../share/extensions/color_lesslight.inx.h:2 -#: ../share/extensions/color_lesssaturation.inx.h:2 -#: ../share/extensions/color_morehue.inx.h:2 -#: ../share/extensions/color_morelight.inx.h:2 -#: ../share/extensions/color_moresaturation.inx.h:2 -#: ../share/extensions/color_negative.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:8 -#: ../share/extensions/color_removeblue.inx.h:2 -#: ../share/extensions/color_removegreen.inx.h:2 -#: ../share/extensions/color_removered.inx.h:2 -#: ../share/extensions/color_replace.inx.h:6 -#: ../share/extensions/color_rgbbarrel.inx.h:2 -#: ../share/extensions/interp_att_g.inx.h:19 -msgid "Color" -msgstr "Цвет" +msgctxt "Symbol" +msgid "Immigration" +msgstr "Основные параметры" -#: ../src/extension/internal/bitmap/colorize.cpp:58 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92 #, fuzzy -msgid "Colorize selected bitmap(s) with specified color, using given opacity" -msgstr "" -"Тонировать выделенные растровые изображения указанным цветом, с указанным " -"уровнем непрозрачности" - -#: ../src/extension/internal/bitmap/contrast.cpp:40 -#: ../src/extension/internal/filter/color.h:1114 -msgid "Contrast" -msgstr "Контраст" +msgctxt "Symbol" +msgid "Departing Flights" +msgstr "Конечная высота" -#: ../src/extension/internal/bitmap/contrast.cpp:42 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94 #, fuzzy -msgid "Adjust:" -msgstr "Значение:" - -#: ../src/extension/internal/bitmap/contrast.cpp:48 -msgid "Increase or decrease contrast in bitmap(s)" -msgstr "Повысить или понизить контраст растрового изображения" +msgctxt "Symbol" +msgid "Arriving Flights" +msgstr "Яркость" -#: ../src/extension/internal/bitmap/crop.cpp:66 -#: ../src/extension/internal/filter/bumps.h:86 -#: ../src/extension/internal/filter/bumps.h:315 -msgid "Crop" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96 +msgctxt "Symbol" +msgid "Smoking" msgstr "" -#: ../src/extension/internal/bitmap/crop.cpp:68 -msgid "Top (px):" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:97 ../share/symbols/symbols.h:98 +msgctxt "Symbol" +msgid "No Smoking" msgstr "" -#: ../src/extension/internal/bitmap/crop.cpp:69 -#, fuzzy -msgid "Bottom (px):" -msgstr "Нижнее:" - -#: ../src/extension/internal/bitmap/crop.cpp:70 -#, fuzzy -msgid "Left (px):" -msgstr "Смещение текстовой метки (px):" - -#: ../src/extension/internal/bitmap/crop.cpp:71 -#, fuzzy -msgid "Right (px):" -msgstr "Правое:" - -#: ../src/extension/internal/bitmap/crop.cpp:77 -#, fuzzy -msgid "Crop selected bitmap(s)." -msgstr "Размыть выделенные растровые объекты" - -#: ../src/extension/internal/bitmap/cycleColormap.cpp:37 -msgid "Cycle Colormap" -msgstr "Вращение цветовой карты" - -#: ../src/extension/internal/bitmap/cycleColormap.cpp:39 -#: ../src/extension/internal/bitmap/spread.cpp:39 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:45 -#: ../src/widgets/spray-toolbar.cpp:208 -msgid "Amount:" -msgstr "Количество:" - -#: ../src/extension/internal/bitmap/cycleColormap.cpp:45 -#, fuzzy -msgid "Cycle colormap(s) of selected bitmap(s)" -msgstr "Циклически вращать цветовые карты выбранных растровых изображений" - -#: ../src/extension/internal/bitmap/despeckle.cpp:36 -msgid "Despeckle" -msgstr "Убрать пятна" - -#: ../src/extension/internal/bitmap/despeckle.cpp:43 -#, fuzzy -msgid "Reduce speckle noise of selected bitmap(s)" -msgstr "Удалить пятнистый шум из выбранных изображений" - -#: ../src/extension/internal/bitmap/edge.cpp:37 -msgid "Edge" -msgstr "Выделение краёв" - -#: ../src/extension/internal/bitmap/edge.cpp:45 -#, fuzzy -msgid "Highlight edges of selected bitmap(s)" -msgstr "Высветить края в выбранном изображении" - -#: ../src/extension/internal/bitmap/emboss.cpp:38 -msgid "Emboss" -msgstr "Рельеф" - -#: ../src/extension/internal/bitmap/emboss.cpp:47 -#, fuzzy -msgid "Emboss selected bitmap(s); highlight edges with 3D effect" +#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 +#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242 +msgctxt "Symbol" +msgid "Parking" msgstr "" -"Применить эффект рельефа (имитация 3D-краев) к выделенным растровым " -"изображениям" - -#: ../src/extension/internal/bitmap/enhance.cpp:35 -msgid "Enhance" -msgstr "Повысить качество" - -#: ../src/extension/internal/bitmap/enhance.cpp:42 -#, fuzzy -msgid "Enhance selected bitmap(s); minimize noise" -msgstr "Уменьшить шум в выделенных растровых изображениях" - -#: ../src/extension/internal/bitmap/equalize.cpp:35 -msgid "Equalize" -msgstr "Выровнять освещённость" - -#: ../src/extension/internal/bitmap/equalize.cpp:42 -#, fuzzy -msgid "Equalize selected bitmap(s); histogram equalization" -msgstr "Выровнять освещенность в выделенных растровых изображениях" - -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:38 -#: ../src/filter-enums.cpp:28 -msgid "Gaussian Blur" -msgstr "Гауссово размывание" - -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:40 -#: ../src/extension/internal/bitmap/implode.cpp:39 -#: ../src/extension/internal/bitmap/solarize.cpp:41 -#, fuzzy -msgid "Factor:" -msgstr "Коэффициент" - -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:47 -#, fuzzy -msgid "Gaussian blur selected bitmap(s)" -msgstr "Размыть изображение по Гауссу" - -#: ../src/extension/internal/bitmap/implode.cpp:37 -msgid "Implode" -msgstr "Взрыв внутрь" - -#: ../src/extension/internal/bitmap/implode.cpp:45 -#, fuzzy -msgid "Implode selected bitmap(s)" -msgstr "Взорвать выбранные изображения вовнутрь" - -#: ../src/extension/internal/bitmap/level.cpp:41 -#: ../src/extension/internal/filter/color.h:742 -#: ../src/extension/internal/filter/image.h:56 -#: ../src/extension/internal/filter/morphology.h:66 -#: ../src/extension/internal/filter/paint.h:345 -msgid "Level" -msgstr "Уровни" - -#: ../src/extension/internal/bitmap/level.cpp:43 -#: ../src/extension/internal/bitmap/levelChannel.cpp:65 -#, fuzzy -msgid "Black Point:" -msgstr "Чёрная точка" - -#: ../src/extension/internal/bitmap/level.cpp:44 -#: ../src/extension/internal/bitmap/levelChannel.cpp:66 -msgid "White Point:" -msgstr "Белая точка:" -#: ../src/extension/internal/bitmap/level.cpp:45 -#: ../src/extension/internal/bitmap/levelChannel.cpp:67 -#, fuzzy -msgid "Gamma Correction:" -msgstr "Гамма-коррекция" - -#: ../src/extension/internal/bitmap/level.cpp:51 -#, fuzzy -msgid "" -"Level selected bitmap(s) by scaling values falling between the given ranges " -"to the full color range" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102 +msgctxt "Symbol" +msgid "No Parking" msgstr "" -"Изменить цветовые уровни выделенных растровых изображений по черной и белой " -"точке" - -#: ../src/extension/internal/bitmap/levelChannel.cpp:52 -msgid "Level (with Channel)" -msgstr "Уровень (с каналом)" -#: ../src/extension/internal/bitmap/levelChannel.cpp:54 -#: ../src/extension/internal/filter/color.h:636 -#, fuzzy -msgid "Channel:" -msgstr "Каналы:" - -#: ../src/extension/internal/bitmap/levelChannel.cpp:73 -#, fuzzy -msgid "" -"Level the specified channel of selected bitmap(s) by scaling values falling " -"between the given ranges to the full color range" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104 +msgctxt "Symbol" +msgid "No Dogs" msgstr "" -"Выровнять указанный канал выбранных изображений масштабированием до полного " -"диапазона значений внутри указанного диапазона." - -#: ../src/extension/internal/bitmap/medianFilter.cpp:37 -msgid "Median" -msgstr "Среднее значение" -#: ../src/extension/internal/bitmap/medianFilter.cpp:45 -#, fuzzy -msgid "" -"Replace each pixel component with the median color in a circular neighborhood" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106 +msgctxt "Symbol" +msgid "No Entry" msgstr "" -"Заменить значение каждого пиксела на усредненное значение пикселов вокруг" - -#: ../src/extension/internal/bitmap/modulate.cpp:40 -msgid "HSB Adjust" -msgstr "Коррекция в HSB" -#: ../src/extension/internal/bitmap/modulate.cpp:42 -#, fuzzy -msgid "Hue:" -msgstr "Тон" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108 +msgctxt "Symbol" +msgid "Exit" +msgstr "" -#: ../src/extension/internal/bitmap/modulate.cpp:43 -#, fuzzy -msgid "Saturation:" -msgstr "Насыщенность" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:109 ../share/symbols/symbols.h:110 +msgctxt "Symbol" +msgid "Fire Extinguisher" +msgstr "" -#: ../src/extension/internal/bitmap/modulate.cpp:44 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:111 ../share/symbols/symbols.h:112 #, fuzzy -msgid "Brightness:" -msgstr "Яркость" +msgctxt "Symbol" +msgid "Right Arrow" +msgstr "Справа" -#: ../src/extension/internal/bitmap/modulate.cpp:50 -msgid "" -"Adjust the amount of hue, saturation, and brightness in selected bitmap(s)" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114 +msgctxt "Symbol" +msgid "Forward and Right Arrow" msgstr "" -"Изменить количество тона, насыщенности и яркости в выбранных изображениях." -#: ../src/extension/internal/bitmap/negate.cpp:36 -msgid "Negate" -msgstr "Негатив" - -#: ../src/extension/internal/bitmap/negate.cpp:43 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116 #, fuzzy -msgid "Negate (take inverse) selected bitmap(s)" -msgstr "Применить к выбранным изображениям эффект негатива." - -#: ../src/extension/internal/bitmap/normalize.cpp:36 -msgid "Normalize" -msgstr "Выровнять цветовые компоненты" +msgctxt "Symbol" +msgid "Up Arrow" +msgstr "Стрелки" -#: ../src/extension/internal/bitmap/normalize.cpp:43 -#, fuzzy -msgid "" -"Normalize selected bitmap(s), expanding color range to the full possible " -"range of color" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118 +msgctxt "Symbol" +msgid "Forward and Left Arrow" msgstr "" -"Выровнять соотношение цветовых компонентов выделенных растровых изображений" -#: ../src/extension/internal/bitmap/oilPaint.cpp:37 -msgid "Oil Paint" -msgstr "Масляная краска" - -#: ../src/extension/internal/bitmap/oilPaint.cpp:45 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120 #, fuzzy -msgid "Stylize selected bitmap(s) so that they appear to be painted with oils" -msgstr "" -"Применить к выбранным изображениям эффект стилизации под живопись маслом." - -#: ../src/extension/internal/bitmap/opacity.cpp:38 -#: ../src/extension/internal/filter/blurs.h:333 -#: ../src/extension/internal/filter/transparency.h:279 -#: ../src/ui/dialog/clonetiler.cpp:840 ../src/ui/dialog/clonetiler.cpp:993 -#: ../src/widgets/tweak-toolbar.cpp:334 -#: ../share/extensions/interp_att_g.inx.h:16 -msgid "Opacity" -msgstr "Непрозрачность" - -#: ../src/extension/internal/bitmap/opacity.cpp:40 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2884 -#: ../src/widgets/dropper-toolbar.cpp:83 -msgid "Opacity:" -msgstr "Непрозрачность:" - -#: ../src/extension/internal/bitmap/opacity.cpp:46 -msgid "Modify opacity channel(s) of selected bitmap(s)." -msgstr "Изменить канал непрозрачности в выбранных изображениях." - -#: ../src/extension/internal/bitmap/raise.cpp:40 -msgid "Raise" -msgstr "Приподнятие" - -#: ../src/extension/internal/bitmap/raise.cpp:44 -msgid "Raised" -msgstr "Приподнять" +msgctxt "Symbol" +msgid "Left Arrow" +msgstr "Стрелки" -#: ../src/extension/internal/bitmap/raise.cpp:50 -#, fuzzy -msgid "" -"Alter lightness the edges of selected bitmap(s) to create a raised appearance" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122 +msgctxt "Symbol" +msgid "Left and Down Arrow" msgstr "" -"Изменить яркость краев в выбранных изображениях для создания эффекта " -"приподнятости." -#: ../src/extension/internal/bitmap/reduceNoise.cpp:40 -msgid "Reduce Noise" -msgstr "Снижение шума" - -#: ../src/extension/internal/bitmap/reduceNoise.cpp:42 -#: ../share/extensions/jessyInk_effects.inx.h:3 -#: ../share/extensions/jessyInk_view.inx.h:3 -#: ../share/extensions/lindenmayer.inx.h:5 -msgid "Order:" -msgstr "Порядок:" - -#: ../src/extension/internal/bitmap/reduceNoise.cpp:48 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124 #, fuzzy -msgid "" -"Reduce noise in selected bitmap(s) using a noise peak elimination filter" +msgctxt "Symbol" +msgid "Down Arrow" +msgstr "Стрелки" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126 +msgctxt "Symbol" +msgid "Right and Down Arrow" msgstr "" -"Удалить шум из выбранных изображений применением фильтра удаления пика шума." -#: ../src/extension/internal/bitmap/sample.cpp:39 -msgid "Resample" -msgstr "Размер" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128 +msgctxt "Symbol" +msgid "NPS Wheelchair Accessible - 1996" +msgstr "" -#: ../src/extension/internal/bitmap/sample.cpp:48 -msgid "" -"Alter the resolution of selected image by resizing it to the given pixel size" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130 +msgctxt "Symbol" +msgid "NPS Wheelchair Accessible" msgstr "" -"Изменить разрешение выделенного изображения, сменив его размер на указанный" -#: ../src/extension/internal/bitmap/shade.cpp:40 -msgid "Shade" -msgstr "Тень" +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:131 ../share/symbols/symbols.h:132 +msgctxt "Symbol" +msgid "New Wheelchair Accessible" +msgstr "" -#: ../src/extension/internal/bitmap/shade.cpp:42 -#, fuzzy -msgid "Azimuth:" -msgstr "Азимут" +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:133 +msgctxt "Symbol" +msgid "Word Balloons" +msgstr "" -#: ../src/extension/internal/bitmap/shade.cpp:43 -#, fuzzy -msgid "Elevation:" -msgstr "Высота" +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:134 +msgctxt "Symbol" +msgid "Thought Balloon" +msgstr "" -#: ../src/extension/internal/bitmap/shade.cpp:44 -msgid "Colored Shading" -msgstr "В цвете" +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:135 +msgctxt "Symbol" +msgid "Dream Speaking" +msgstr "" -#: ../src/extension/internal/bitmap/shade.cpp:50 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:136 #, fuzzy -msgid "Shade selected bitmap(s) simulating distant light source" -msgstr "Оттенить выбранные изображения, имитируя удаленный источник света." - -#: ../src/extension/internal/bitmap/sharpen.cpp:38 -msgid "Sharpen" -msgstr "Повысить резкость" +msgctxt "Symbol" +msgid "Rounded Balloon" +msgstr "Скруглённое" -#: ../src/extension/internal/bitmap/sharpen.cpp:47 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:137 #, fuzzy -msgid "Sharpen selected bitmap(s)" -msgstr "Повысить резкость выбранных изображений." +msgctxt "Symbol" +msgid "Squared Balloon" +msgstr "Квадратные" -#: ../src/extension/internal/bitmap/solarize.cpp:39 -#: ../src/extension/internal/filter/color.h:1494 -#: ../src/extension/internal/filter/color.h:1498 -msgid "Solarize" -msgstr "Соляризация" +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:138 +msgctxt "Symbol" +msgid "Over the Phone" +msgstr "" -#: ../src/extension/internal/bitmap/solarize.cpp:47 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:139 +msgctxt "Symbol" +msgid "Hip Balloon" +msgstr "" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:140 #, fuzzy -msgid "Solarize selected bitmap(s), like overexposing photographic film" +msgctxt "Symbol" +msgid "Circle Balloon" +msgstr "Окружность" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:141 +msgctxt "Symbol" +msgid "Exclaim Balloon" msgstr "" -"Применить к выделенным растровым изображениям эффект переэкспозиции " -"фотопленки" -#: ../src/extension/internal/bitmap/spread.cpp:37 -msgid "Dither" -msgstr "Сглаживание" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:142 +msgctxt "Symbol" +msgid "Flow Chart Shapes" +msgstr "" -#: ../src/extension/internal/bitmap/spread.cpp:45 -msgid "" -"Randomly scatter pixels in selected bitmap(s), within the given radius of " -"the original position" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:143 +msgctxt "Symbol" +msgid "Process" msgstr "" -"Случайным образом распределить пикселы выбранных изображений в заданном " -"радиусе от исходного положения" -#: ../src/extension/internal/bitmap/swirl.cpp:37 -msgid "Swirl" -msgstr "Вихрь" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:144 +#, fuzzy +msgctxt "Symbol" +msgid "Input/Output" +msgstr "Ввод и вывод" -#: ../src/extension/internal/bitmap/swirl.cpp:39 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:145 #, fuzzy -msgid "Degrees:" -msgstr "Градусов:" +msgctxt "Symbol" +msgid "Document" +msgstr "Документ" -#: ../src/extension/internal/bitmap/swirl.cpp:45 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:146 #, fuzzy -msgid "Swirl selected bitmap(s) around center point" -msgstr "Применить эффект вихря вокруг центральной точки выбранных изображений." +msgctxt "Symbol" +msgid "Manual Operation" +msgstr "Математические операторы" -#. TRANSLATORS: see http://docs.gimp.org/en/gimp-tool-threshold.html -#: ../src/extension/internal/bitmap/threshold.cpp:38 -msgid "Threshold" -msgstr "Постеризация" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:147 +#, fuzzy +msgctxt "Symbol" +msgid "Preparation" +msgstr "Насыщенность" -#: ../src/extension/internal/bitmap/threshold.cpp:40 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:46 -#: ../src/widgets/paintbucket-toolbar.cpp:146 -msgid "Threshold:" -msgstr "Порог:" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:148 +#, fuzzy +msgctxt "Symbol" +msgid "Merge" +msgstr "Сведение" -#: ../src/extension/internal/bitmap/threshold.cpp:46 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:149 #, fuzzy -msgid "Threshold selected bitmap(s)" -msgstr "Применить эффект постеризации к выделенным растровым изображениям" +msgctxt "Symbol" +msgid "Decision" +msgstr "Точность:" -#: ../src/extension/internal/bitmap/unsharpmask.cpp:41 -msgid "Unsharp Mask" -msgstr "Нерезкая маска" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:150 +msgctxt "Symbol" +msgid "Magnetic Tape" +msgstr "" -#: ../src/extension/internal/bitmap/unsharpmask.cpp:52 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:151 #, fuzzy -msgid "Sharpen selected bitmap(s) using unsharp mask algorithms" -msgstr "Повысить резкость выбранных изображений при помощи нерезкой маски." +msgctxt "Symbol" +msgid "Display" +msgstr "Подробность просмотр_а" -#: ../src/extension/internal/bitmap/wave.cpp:38 -msgid "Wave" -msgstr "Волна" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:152 +msgctxt "Symbol" +msgid "Auxiliary Operation" +msgstr "" -#: ../src/extension/internal/bitmap/wave.cpp:40 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:153 #, fuzzy -msgid "Amplitude:" -msgstr "Амплитуда" +msgctxt "Symbol" +msgid "Manual Input" +msgstr "Импорт EMF" -#: ../src/extension/internal/bitmap/wave.cpp:41 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:154 #, fuzzy -msgid "Wavelength:" -msgstr "Длина волны" +msgctxt "Symbol" +msgid "Extract" +msgstr "Извлечь" -#: ../src/extension/internal/bitmap/wave.cpp:47 -#, fuzzy -msgid "Alter selected bitmap(s) along sine wave" -msgstr "Изменить выбранные изображения по синусоиде" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:155 +msgctxt "Symbol" +msgid "Terminal/Interrupt" +msgstr "" -#: ../src/extension/internal/bluredge.cpp:136 -msgid "Inset/Outset Halo" -msgstr "Втяжка/растяжка ореола" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:156 +msgctxt "Symbol" +msgid "Punched Card" +msgstr "" -#: ../src/extension/internal/bluredge.cpp:138 -msgid "Width in px of the halo" -msgstr "Ширина ореола в пикселах" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:157 +msgctxt "Symbol" +msgid "Punch Tape" +msgstr "" -#: ../src/extension/internal/bluredge.cpp:139 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:158 +msgctxt "Symbol" +msgid "Online Storage" +msgstr "" + +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:159 +msgctxt "Symbol" +msgid "Keying" +msgstr "" + +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:160 +msgctxt "Symbol" +msgid "Sort" +msgstr "" + +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:161 #, fuzzy -msgid "Number of steps:" -msgstr "Количество шагов" +msgctxt "Symbol" +msgid "Connector" +msgstr "Соединительные линии" -#: ../src/extension/internal/bluredge.cpp:139 -msgid "Number of inset/outset copies of the object to make" -msgstr "Количество копий втяжки/растяжки объекта" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:162 +#, fuzzy +msgctxt "Symbol" +msgid "Off-Page Connector" +msgstr "Соединительные линии" -#: ../src/extension/internal/bluredge.cpp:143 -#: ../share/extensions/extrude.inx.h:5 -#: ../share/extensions/generate_voronoi.inx.h:9 -#: ../share/extensions/interp.inx.h:7 ../share/extensions/motion.inx.h:4 -#: ../share/extensions/pathalongpath.inx.h:18 -#: ../share/extensions/pathscatter.inx.h:20 -#: ../share/extensions/voronoi2svg.inx.h:13 -msgid "Generate from Path" -msgstr "Создание из контура" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:163 +msgctxt "Symbol" +msgid "Transmittal Tape" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:327 -#: ../share/extensions/ps_input.inx.h:3 -msgid "PostScript" -msgstr "PostScript" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:164 +msgctxt "Symbol" +msgid "Communication Link" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:329 -#: ../src/extension/internal/cairo-ps-out.cpp:368 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:165 #, fuzzy -msgid "Restrict to PS level:" -msgstr "Версия PS:" +msgctxt "Symbol" +msgid "Collate" +msgstr "Chocolate 1" -#: ../src/extension/internal/cairo-ps-out.cpp:330 -#: ../src/extension/internal/cairo-ps-out.cpp:369 -msgid "PostScript level 3" -msgstr "PostScript Level 3" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:166 +msgctxt "Symbol" +msgid "Comment/Annotation" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:331 -#: ../src/extension/internal/cairo-ps-out.cpp:370 -msgid "PostScript level 2" -msgstr "PostScript Level 2" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:167 +msgctxt "Symbol" +msgid "Core" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:333 -#: ../src/extension/internal/cairo-ps-out.cpp:372 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250 -#: ../src/extension/internal/emf-inout.cpp:3550 -#: ../src/extension/internal/wmf-inout.cpp:3141 -msgid "Convert texts to paths" -msgstr "Текст в кривые Безье" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:168 +msgctxt "Symbol" +msgid "Predefined Process" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:334 -msgid "PS+LaTeX: Omit text in PS, and create LaTeX file" -msgstr "PS+LaTeX: пропустить текст в PS, создать файл LaTeX" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:169 +msgctxt "Symbol" +msgid "Magnetic Disk (Database)" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:335 -#: ../src/extension/internal/cairo-ps-out.cpp:374 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:252 -msgid "Rasterize filter effects" -msgstr "Растеризовать фильтры эффектов" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:170 +msgctxt "Symbol" +msgid "Magnetic Drum (Direct Access)" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:336 -#: ../src/extension/internal/cairo-ps-out.cpp:375 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:253 -#, fuzzy -msgid "Resolution for rasterization (dpi):" -msgstr "Разрешение растровой копии (dpi):" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:171 +msgctxt "Symbol" +msgid "Offline Storage" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:337 -#: ../src/extension/internal/cairo-ps-out.cpp:376 -#, fuzzy -msgid "Output page size" -msgstr "Смена формата страницы" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:172 +msgctxt "Symbol" +msgid "Logical Or" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:338 -#: ../src/extension/internal/cairo-ps-out.cpp:377 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:255 -#, fuzzy -msgid "Use document's page size" -msgstr "Смена формата страницы" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:173 +msgctxt "Symbol" +msgid "Logical And" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:339 -#: ../src/extension/internal/cairo-ps-out.cpp:378 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:256 -msgid "Use exported object's size" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:174 +msgctxt "Symbol" +msgid "Delay" msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:341 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:258 -#, fuzzy -msgid "Bleed/margin (mm):" -msgstr "Поля выпуска под обрез" +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:175 +msgctxt "Symbol" +msgid "Loop Limit Begin" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:342 -#: ../src/extension/internal/cairo-ps-out.cpp:381 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:259 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:176 +msgctxt "Symbol" +msgid "Loop Limit End" +msgstr "" + +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:177 #, fuzzy -msgid "Limit export to the object with ID:" -msgstr "Только объект с ID:" +msgctxt "Symbol" +msgid "Logic Symbols" +msgstr "Кхмерские символы" -#: ../src/extension/internal/cairo-ps-out.cpp:346 -#: ../share/extensions/ps_input.inx.h:2 -msgid "PostScript (*.ps)" -msgstr "Файлы Postscript (*.ps)" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:178 +msgctxt "Symbol" +msgid "Xnor Gate" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:347 -msgid "PostScript File" -msgstr "Файл PostScript" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:179 +msgctxt "Symbol" +msgid "Xor Gate" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:366 -#: ../share/extensions/eps_input.inx.h:3 -msgid "Encapsulated PostScript" -msgstr "Encapsulated Postscript" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:180 +msgctxt "Symbol" +msgid "Nor Gate" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:373 -msgid "EPS+LaTeX: Omit text in EPS, and create LaTeX file" -msgstr "EPS+LaTeX: пропустить текст в EPS, создать файл LaTeX" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:181 +msgctxt "Symbol" +msgid "Or Gate" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:380 -#, fuzzy -msgid "Bleed/margin (mm)" -msgstr "Поля выпуска под обрез" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:182 +msgctxt "Symbol" +msgid "Nand Gate" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:385 -#: ../share/extensions/eps_input.inx.h:2 -msgid "Encapsulated PostScript (*.eps)" -msgstr "Файлы Encapsulated Postscript (*.eps)" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:183 +msgctxt "Symbol" +msgid "And Gate" +msgstr "" -#: ../src/extension/internal/cairo-ps-out.cpp:386 -msgid "Encapsulated PostScript File" -msgstr "Файл Encapsulated PostScript" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:184 +msgctxt "Symbol" +msgid "Buffer" +msgstr "" -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:244 -#, fuzzy -msgid "Restrict to PDF version:" -msgstr "Версия PDF:" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:185 +msgctxt "Symbol" +msgid "Not Gate" +msgstr "" -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:246 -#, fuzzy -msgid "PDF 1.5" -msgstr "PDF 1.4" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:186 +msgctxt "Symbol" +msgid "Buffer Small" +msgstr "" -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:248 -msgid "PDF 1.4" -msgstr "PDF 1.4" +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:187 +msgctxt "Symbol" +msgid "Not Gate Small" +msgstr "" -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251 -msgid "PDF+LaTeX: Omit text in PDF, and create LaTeX file" -msgstr "PDF+LaTeX: пропустить текст в PDF, создать файл LaTeX" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:188 +msgctxt "Symbol" +msgid "United States National Park Service Map Symbols" +msgstr "" -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:254 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190 #, fuzzy -msgid "Output page size:" -msgstr "Смена формата страницы" +msgctxt "Symbol" +msgid "Airport" +msgstr "Импорт" -#: ../src/extension/internal/cdr-input.cpp:102 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:87 -#: ../src/extension/internal/vsd-input.cpp:101 -msgid "Select page:" -msgstr "Выберите страницу:" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192 +msgctxt "Symbol" +msgid "Amphitheatre" +msgstr "" -#. Display total number of pages -#: ../src/extension/internal/cdr-input.cpp:114 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:106 -#: ../src/extension/internal/vsd-input.cpp:113 -#, c-format -msgid "out of %i" -msgstr "из %i" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194 +msgctxt "Symbol" +msgid "Bicycle Trail" +msgstr "" -#: ../src/extension/internal/cdr-input.cpp:145 -#: ../src/extension/internal/vsd-input.cpp:144 -#, fuzzy -msgid "Page Selector" -msgstr "Выделитель" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196 +msgctxt "Symbol" +msgid "Boat Launch" +msgstr "" -#: ../src/extension/internal/cdr-input.cpp:274 -#, fuzzy -msgid "Corel DRAW Input" -msgstr "Импорт Corel DRAW" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198 +msgctxt "Symbol" +msgid "Boat Tour" +msgstr "" -#: ../src/extension/internal/cdr-input.cpp:279 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200 #, fuzzy -msgid "Corel DRAW 7-X4 files (*.cdr)" -msgstr "Файлы Corel DRAW 7-X4 (*.cdr)" +msgctxt "Symbol" +msgid "Bus Stop" +msgstr "_Остановить" -#: ../src/extension/internal/cdr-input.cpp:280 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202 #, fuzzy -msgid "Open files saved in Corel DRAW 7-X4" -msgstr "Открыть файлы, сохраненные в Corel DRAW 7-X4" +msgctxt "Symbol" +msgid "Campfire" +msgstr "Плеск волн" -#: ../src/extension/internal/cdr-input.cpp:287 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204 #, fuzzy -msgid "Corel DRAW templates input" -msgstr "Импорт шаблонов Corel DRAW" +msgctxt "Symbol" +msgid "Campground" +msgstr "Закругление концов" -#: ../src/extension/internal/cdr-input.cpp:292 -#, fuzzy -msgid "Corel DRAW 7-13 template files (*.cdt)" -msgstr "Шаблоны Corel DRAW 7-13 (.cdt)" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206 +msgctxt "Symbol" +msgid "CanoeAccess" +msgstr "" -#: ../src/extension/internal/cdr-input.cpp:293 -#, fuzzy -msgid "Open files saved in Corel DRAW 7-13" -msgstr "Открыть файлы, сохранённые в Corel DRAW 7-13" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208 +msgctxt "Symbol" +msgid "Crosscountry Ski Trail" +msgstr "" -#: ../src/extension/internal/cdr-input.cpp:300 -#, fuzzy -msgid "Corel DRAW Compressed Exchange files input" -msgstr "Импорт файлов Corel DRAW Compressed Exchange" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210 +msgctxt "Symbol" +msgid "Downhill Skiing" +msgstr "" -#: ../src/extension/internal/cdr-input.cpp:305 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212 #, fuzzy -msgid "Corel DRAW Compressed Exchange files (*.ccx)" -msgstr "Файлы Corel DRAW Compressed Exchange (.ccx)" +msgctxt "Symbol" +msgid "Drinking Water" +msgstr "Метки для печати" -#: ../src/extension/internal/cdr-input.cpp:306 -#, fuzzy -msgid "Open compressed exchange files saved in Corel DRAW" -msgstr "Открыть сжатые файлы для обмена, созданные в Corel DRAW" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216 +msgctxt "Symbol" +msgid "Fishing" +msgstr "" -#: ../src/extension/internal/cdr-input.cpp:313 -#, fuzzy -msgid "Corel DRAW Presentation Exchange files input" -msgstr "Импорт файлов Corel DRAW Presentation Exchange" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218 +msgctxt "Symbol" +msgid "Food Service" +msgstr "" -#: ../src/extension/internal/cdr-input.cpp:318 +#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222 #, fuzzy -msgid "Corel DRAW Presentation Exchange files (*.cmx)" -msgstr "Файлы Corel DRAW Presentation Exchange (.cmx)" +msgctxt "Symbol" +msgid "Gas Station" +msgstr "Меньше насыщенности" -#: ../src/extension/internal/cdr-input.cpp:319 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224 #, fuzzy -msgid "Open presentation exchange files saved in Corel DRAW" -msgstr "Открыть файлы, сохраненные Corel DRAW для обмена данными" - -#: ../src/extension/internal/emf-inout.cpp:3534 -msgid "EMF Input" -msgstr "Импорт EMF" +msgctxt "Symbol" +msgid "Golfing" +msgstr "Цветопроба" -#: ../src/extension/internal/emf-inout.cpp:3539 -msgid "Enhanced Metafiles (*.emf)" -msgstr "Файлы Enhanced Metafiles (*.emf)" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226 +msgctxt "Symbol" +msgid "Horseback Riding" +msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3540 -msgid "Enhanced Metafiles" -msgstr "Файлы Enhanced Metafile" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228 +msgctxt "Symbol" +msgid "Hospital" +msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3548 -msgid "EMF Output" -msgstr "Экспорт в EMF" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230 +#, fuzzy +msgctxt "Symbol" +msgid "Ice Skating" +msgstr "Сатин" -#: ../src/extension/internal/emf-inout.cpp:3551 -#: ../src/extension/internal/wmf-inout.cpp:3142 -msgid "Map Unicode to Symbol font" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234 +msgctxt "Symbol" +msgid "Litter Receptacle" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3552 -#: ../src/extension/internal/wmf-inout.cpp:3143 -msgid "Map Unicode to Wingdings" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236 +msgctxt "Symbol" +msgid "Lodging" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3553 -#: ../src/extension/internal/wmf-inout.cpp:3144 -msgid "Map Unicode to Zapf Dingbats" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238 +msgctxt "Symbol" +msgid "Marina" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3554 -#: ../src/extension/internal/wmf-inout.cpp:3145 -msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240 +msgctxt "Symbol" +msgid "Recycling" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3555 -#: ../src/extension/internal/wmf-inout.cpp:3146 -msgid "Compensate for PPT font bug" -msgstr "" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244 +#, fuzzy +msgctxt "Symbol" +msgid "Pets On Leash" +msgstr "_Разместить по контуру" -#: ../src/extension/internal/emf-inout.cpp:3556 -#: ../src/extension/internal/wmf-inout.cpp:3147 -msgid "Convert dashed/dotted lines to single lines" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246 +#, fuzzy +msgctxt "Symbol" +msgid "Picnic Area" +msgstr "Сплошной цвет" + +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248 +msgctxt "Symbol" +msgid "Post Office" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3557 -#: ../src/extension/internal/wmf-inout.cpp:3148 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250 #, fuzzy -msgid "Convert gradients to colored polygon series" -msgstr "Смена цвета опорной точки градиента" +msgctxt "Symbol" +msgid "Ranger Station" +msgstr "Смежный" -#: ../src/extension/internal/emf-inout.cpp:3558 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252 #, fuzzy -msgid "Use native rectangular linear gradients" -msgstr "Создать линейный градиент" +msgctxt "Symbol" +msgid "RV Campground" +msgstr "Закругление концов" -#: ../src/extension/internal/emf-inout.cpp:3559 -msgid "Map all fill patterns to standard EMF hatches" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254 +msgctxt "Symbol" +msgid "Restrooms" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3560 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256 #, fuzzy -msgid "Ignore image rotations" -msgstr "Ориентация" - -#: ../src/extension/internal/emf-inout.cpp:3564 -msgid "Enhanced Metafile (*.emf)" -msgstr "Файлы Enhanced Metafile (*.emf)" +msgctxt "Symbol" +msgid "Sailing" +msgstr "Прокрутка" -#: ../src/extension/internal/emf-inout.cpp:3565 -msgid "Enhanced Metafile" -msgstr "Enhanced Metafile" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258 +msgctxt "Symbol" +msgid "Sanitary Disposal Station" +msgstr "" -#: ../src/extension/internal/filter/bevels.h:53 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260 #, fuzzy -msgid "Diffuse Light" -msgstr "Рассеянный свет" +msgctxt "Symbol" +msgid "Scuba Diving" +msgstr "Деление" -#: ../src/extension/internal/filter/bevels.h:55 -#: ../src/extension/internal/filter/bevels.h:135 -#: ../src/extension/internal/filter/bevels.h:219 -#: ../src/extension/internal/filter/paint.h:89 -#: ../src/extension/internal/filter/paint.h:340 -msgid "Smoothness" -msgstr "Сглаженность" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262 +msgctxt "Symbol" +msgid "Self Guided Trail" +msgstr "" -#: ../src/extension/internal/filter/bevels.h:56 -#: ../src/extension/internal/filter/bevels.h:137 -#: ../src/extension/internal/filter/bevels.h:221 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264 #, fuzzy -msgid "Elevation (°)" -msgstr "Высота" +msgctxt "Symbol" +msgid "Shelter" +msgstr "фильтр" -#: ../src/extension/internal/filter/bevels.h:57 -#: ../src/extension/internal/filter/bevels.h:138 -#: ../src/extension/internal/filter/bevels.h:222 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266 #, fuzzy -msgid "Azimuth (°)" -msgstr "Азимут (°):" +msgctxt "Symbol" +msgid "Showers" +msgstr "Показывать:" -#: ../src/extension/internal/filter/bevels.h:58 -#: ../src/extension/internal/filter/bevels.h:139 -#: ../src/extension/internal/filter/bevels.h:223 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268 #, fuzzy -msgid "Lighting color" -msgstr "По_дсветка:" +msgctxt "Symbol" +msgid "Sledding" +msgstr "Затенение" -#: ../src/extension/internal/filter/bevels.h:62 -#: ../src/extension/internal/filter/bevels.h:143 -#: ../src/extension/internal/filter/bevels.h:227 -#: ../src/extension/internal/filter/blurs.h:62 -#: ../src/extension/internal/filter/blurs.h:131 -#: ../src/extension/internal/filter/blurs.h:200 -#: ../src/extension/internal/filter/blurs.h:266 -#: ../src/extension/internal/filter/blurs.h:350 -#: ../src/extension/internal/filter/bumps.h:141 -#: ../src/extension/internal/filter/bumps.h:361 -#: ../src/extension/internal/filter/color.h:81 -#: ../src/extension/internal/filter/color.h:170 -#: ../src/extension/internal/filter/color.h:261 -#: ../src/extension/internal/filter/color.h:346 -#: ../src/extension/internal/filter/color.h:436 -#: ../src/extension/internal/filter/color.h:531 -#: ../src/extension/internal/filter/color.h:653 -#: ../src/extension/internal/filter/color.h:750 -#: ../src/extension/internal/filter/color.h:829 -#: ../src/extension/internal/filter/color.h:920 -#: ../src/extension/internal/filter/color.h:1048 -#: ../src/extension/internal/filter/color.h:1118 -#: ../src/extension/internal/filter/color.h:1211 -#: ../src/extension/internal/filter/color.h:1323 -#: ../src/extension/internal/filter/color.h:1428 -#: ../src/extension/internal/filter/color.h:1504 -#: ../src/extension/internal/filter/color.h:1615 -#: ../src/extension/internal/filter/distort.h:95 -#: ../src/extension/internal/filter/distort.h:204 -#: ../src/extension/internal/filter/filter-file.cpp:151 -#: ../src/extension/internal/filter/filter.cpp:214 -#: ../src/extension/internal/filter/image.h:61 -#: ../src/extension/internal/filter/morphology.h:75 -#: ../src/extension/internal/filter/morphology.h:202 -#: ../src/extension/internal/filter/overlays.h:79 -#: ../src/extension/internal/filter/paint.h:112 -#: ../src/extension/internal/filter/paint.h:243 -#: ../src/extension/internal/filter/paint.h:362 -#: ../src/extension/internal/filter/paint.h:506 -#: ../src/extension/internal/filter/paint.h:601 -#: ../src/extension/internal/filter/paint.h:724 -#: ../src/extension/internal/filter/paint.h:876 -#: ../src/extension/internal/filter/paint.h:980 -#: ../src/extension/internal/filter/protrusions.h:54 -#: ../src/extension/internal/filter/shadows.h:80 -#: ../src/extension/internal/filter/textures.h:90 -#: ../src/extension/internal/filter/transparency.h:69 -#: ../src/extension/internal/filter/transparency.h:140 -#: ../src/extension/internal/filter/transparency.h:214 -#: ../src/extension/internal/filter/transparency.h:287 -#: ../src/extension/internal/filter/transparency.h:349 -msgid "Filters" -msgstr "Фильтры" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270 +msgctxt "Symbol" +msgid "SnowmobileTrail" +msgstr "" -#: ../src/extension/internal/filter/bevels.h:63 -#: ../src/extension/internal/filter/bevels.h:144 -#: ../src/extension/internal/filter/bevels.h:228 -msgid "Bevels" -msgstr "Фаска" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272 +#, fuzzy +msgctxt "Symbol" +msgid "Stable" +msgstr "Табличная функция" -#: ../src/extension/internal/filter/bevels.h:66 -msgid "Basic diffuse bevel to use for building textures" -msgstr "Проста рассеянная фаска для создания текстур" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274 +msgctxt "Symbol" +msgid "Store" +msgstr "" -#: ../src/extension/internal/filter/bevels.h:133 -#, fuzzy -msgid "Matte Jelly" -msgstr "Матовое желе" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276 +msgctxt "Symbol" +msgid "Swimming" +msgstr "" -#: ../src/extension/internal/filter/bevels.h:136 -#: ../src/extension/internal/filter/bevels.h:220 -#: ../src/extension/internal/filter/blurs.h:187 -#: ../src/extension/internal/filter/color.h:74 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280 #, fuzzy -msgid "Brightness" -msgstr "Яркость" - -#: ../src/extension/internal/filter/bevels.h:147 -msgid "Bulging, matte jelly covering" -msgstr "Вздутый слой матового желе" +msgctxt "Symbol" +msgid "Emergency Telephone" +msgstr "Отклонение" -#: ../src/extension/internal/filter/bevels.h:217 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282 #, fuzzy -msgid "Specular Light" -msgstr "Отражение света" +msgctxt "Symbol" +msgid "Trailhead" +msgstr "Брейлева азбука" -#: ../src/extension/internal/filter/bevels.h:231 -msgid "Basic specular bevel to use for building textures" -msgstr "Типичная отражающая фаска для создания текстур" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284 +msgctxt "Symbol" +msgid "Wheelchair Accessible" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:56 -#: ../src/extension/internal/filter/blurs.h:189 -#: ../src/extension/internal/filter/blurs.h:329 -#: ../src/extension/internal/filter/distort.h:73 -#, fuzzy -msgid "Horizontal blur" -msgstr "Размывание по горизонтали:" +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286 +msgctxt "Symbol" +msgid "Wind Surfing" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:57 -#: ../src/extension/internal/filter/blurs.h:190 -#: ../src/extension/internal/filter/blurs.h:330 -#: ../src/extension/internal/filter/distort.h:74 -#, fuzzy -msgid "Vertical blur" -msgstr "Размывание по вертикали:" +#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:220 ../share/symbols/symbols.h:219 +msgctxt "Symbol" +msgid "Four Wheel Drive Road)," +msgstr "" -#: ../src/extension/internal/filter/blurs.h:58 -msgid "Blur content only" -msgstr "Размыть только содержимое" +#: ../share/templates/templates.h:1 +#, fuzzy +msgid "A4 Landscape Page" +msgstr "_Альбом" -#: ../src/extension/internal/filter/blurs.h:63 -#: ../src/extension/internal/filter/blurs.h:132 -#: ../src/extension/internal/filter/blurs.h:201 -#: ../src/extension/internal/filter/blurs.h:267 -#: ../src/extension/internal/filter/blurs.h:351 -msgid "Blurs" -msgstr "Размывание" +#: ../share/templates/templates.h:1 +msgid "Empty A4 landscape sheet" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:66 -msgid "Simple vertical and horizontal blur effect" +#: ../share/templates/templates.h:1 +msgid "A4 paper sheet empty landscape" msgstr "" -#: ../src/extension/internal/filter/blurs.h:125 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Clean Edges" -msgstr "Чистые края" +msgid "A4 Page" +msgstr "Страница" -#: ../src/extension/internal/filter/blurs.h:127 -#: ../src/extension/internal/filter/blurs.h:262 -#: ../src/extension/internal/filter/paint.h:237 -#: ../src/extension/internal/filter/paint.h:336 -#: ../src/extension/internal/filter/paint.h:341 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Strength" -msgstr "Сила:" +msgid "Empty A4 sheet" +msgstr "Выделение пусто" -#: ../src/extension/internal/filter/blurs.h:135 -msgid "" -"Removes or decreases glows and jaggeries around objects edges after applying " -"some filters" +#: ../share/templates/templates.h:1 +msgid "A4 paper sheet empty" msgstr "" -"Удаляет или уменьшает свечения по краям объектов после применения некоторых " -"фильтров" - -#: ../src/extension/internal/filter/blurs.h:185 -msgid "Cross Blur" -msgstr "Перекрёстное размывание" -#: ../src/extension/internal/filter/blurs.h:188 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Fading" -msgstr "Затенение" +msgid "Black Opaque" +msgstr "Чёрный канал (K)" -#: ../src/extension/internal/filter/blurs.h:191 -#: ../src/extension/internal/filter/textures.h:74 -msgid "Blend:" -msgstr "Режим смешивания:" +#: ../share/templates/templates.h:1 +msgid "Empty black page" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:192 -#: ../src/extension/internal/filter/blurs.h:339 -#: ../src/extension/internal/filter/bumps.h:131 -#: ../src/extension/internal/filter/bumps.h:337 -#: ../src/extension/internal/filter/bumps.h:344 -#: ../src/extension/internal/filter/color.h:329 -#: ../src/extension/internal/filter/color.h:336 -#: ../src/extension/internal/filter/color.h:1423 -#: ../src/extension/internal/filter/color.h:1596 -#: ../src/extension/internal/filter/color.h:1602 -#: ../src/extension/internal/filter/paint.h:705 -#: ../src/extension/internal/filter/transparency.h:63 -#: ../src/filter-enums.cpp:54 -msgid "Darken" -msgstr "Затемнение" +#: ../share/templates/templates.h:1 +msgid "black opaque empty" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:193 -#: ../src/extension/internal/filter/blurs.h:340 -#: ../src/extension/internal/filter/bumps.h:132 -#: ../src/extension/internal/filter/bumps.h:335 -#: ../src/extension/internal/filter/bumps.h:342 -#: ../src/extension/internal/filter/color.h:327 -#: ../src/extension/internal/filter/color.h:332 -#: ../src/extension/internal/filter/color.h:647 -#: ../src/extension/internal/filter/color.h:1415 -#: ../src/extension/internal/filter/color.h:1420 -#: ../src/extension/internal/filter/color.h:1594 -#: ../src/extension/internal/filter/paint.h:703 -#: ../src/extension/internal/filter/transparency.h:62 -#: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:382 -msgid "Screen" -msgstr "Экран" +#: ../share/templates/templates.h:1 +msgid "White Opaque" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:194 -#: ../src/extension/internal/filter/blurs.h:341 -#: ../src/extension/internal/filter/bumps.h:133 -#: ../src/extension/internal/filter/bumps.h:338 -#: ../src/extension/internal/filter/bumps.h:345 -#: ../src/extension/internal/filter/color.h:325 -#: ../src/extension/internal/filter/color.h:333 -#: ../src/extension/internal/filter/color.h:645 -#: ../src/extension/internal/filter/color.h:1414 -#: ../src/extension/internal/filter/color.h:1421 -#: ../src/extension/internal/filter/color.h:1595 -#: ../src/extension/internal/filter/color.h:1601 -#: ../src/extension/internal/filter/paint.h:701 -#: ../src/extension/internal/filter/transparency.h:60 -#: ../src/filter-enums.cpp:52 -msgid "Multiply" -msgstr "Умножение" +#: ../share/templates/templates.h:1 +msgid "Empty white page" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:195 -#: ../src/extension/internal/filter/blurs.h:342 -#: ../src/extension/internal/filter/bumps.h:134 -#: ../src/extension/internal/filter/bumps.h:339 -#: ../src/extension/internal/filter/bumps.h:346 -#: ../src/extension/internal/filter/color.h:328 -#: ../src/extension/internal/filter/color.h:335 -#: ../src/extension/internal/filter/color.h:1422 -#: ../src/extension/internal/filter/color.h:1593 -#: ../src/extension/internal/filter/paint.h:704 -#: ../src/extension/internal/filter/transparency.h:64 -#: ../src/filter-enums.cpp:55 -msgid "Lighten" -msgstr "Осветление" +#: ../share/templates/templates.h:1 +msgid "white opaque empty" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:204 -#, fuzzy -msgid "Combine vertical and horizontal blur" -msgstr "Смещение узлов по горизонтали" +#: ../share/templates/templates.h:1 +msgid "Business Card 85x54mm" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:260 -msgid "Feather" -msgstr "Растушёвка" +#: ../share/templates/templates.h:1 +msgid "Empty business card template." +msgstr "" -#: ../src/extension/internal/filter/blurs.h:270 -msgid "Blurred mask on the edge without altering the contents" -msgstr "Размытая маска по краям объекта, не меняющая его содержимое" +#: ../share/templates/templates.h:1 +msgid "business card empty 85x54" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:325 -msgid "Out of Focus" -msgstr "Вне зоны резкости" +#: ../share/templates/templates.h:1 +msgid "Business Card 90x50mm" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:331 -#: ../src/extension/internal/filter/distort.h:75 -#: ../src/extension/internal/filter/morphology.h:67 -#: ../src/extension/internal/filter/paint.h:235 -#: ../src/extension/internal/filter/paint.h:342 -#: ../src/extension/internal/filter/paint.h:346 -#, fuzzy -msgid "Dilatation" -msgstr "Дилатация:" +#: ../share/templates/templates.h:1 +msgid "business card empty 90x50" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:332 -#: ../src/extension/internal/filter/distort.h:76 -#: ../src/extension/internal/filter/morphology.h:68 -#: ../src/extension/internal/filter/paint.h:98 -#: ../src/extension/internal/filter/paint.h:236 -#: ../src/extension/internal/filter/paint.h:343 -#: ../src/extension/internal/filter/paint.h:347 -#: ../src/extension/internal/filter/transparency.h:208 -#: ../src/extension/internal/filter/transparency.h:282 -#, fuzzy -msgid "Erosion" -msgstr "Эрозия:" +#: ../share/templates/templates.h:1 +msgid "CD Cover 300dpi" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:336 -#: ../src/extension/internal/filter/color.h:1205 -#: ../src/extension/internal/filter/color.h:1317 -#: ../src/ui/dialog/document-properties.cpp:115 -msgid "Background color" -msgstr "Цвет фона" +#: ../share/templates/templates.h:1 +msgid "Empty CD box cover." +msgstr "" -#: ../src/extension/internal/filter/blurs.h:337 -#: ../src/extension/internal/filter/bumps.h:129 -msgid "Blend type:" -msgstr "Режим смешивания:" +#: ../share/templates/templates.h:1 +msgid "CD cover disc disk 300dpi box" +msgstr "" -#: ../src/extension/internal/filter/blurs.h:338 -#: ../src/extension/internal/filter/bumps.h:130 -#: ../src/extension/internal/filter/bumps.h:336 -#: ../src/extension/internal/filter/bumps.h:343 -#: ../src/extension/internal/filter/color.h:326 -#: ../src/extension/internal/filter/color.h:334 -#: ../src/extension/internal/filter/color.h:646 -#: ../src/extension/internal/filter/color.h:1413 -#: ../src/extension/internal/filter/color.h:1419 -#: ../src/extension/internal/filter/color.h:1586 -#: ../src/extension/internal/filter/color.h:1600 -#: ../src/extension/internal/filter/distort.h:78 -#: ../src/extension/internal/filter/paint.h:702 -#: ../src/extension/internal/filter/textures.h:77 -#: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:51 ../src/ui/dialog/inkscape-preferences.cpp:644 -msgid "Normal" -msgstr "Нормальный" +#: ../share/templates/templates.h:1 +msgid "CD Label 120x120 " +msgstr "" -#: ../src/extension/internal/filter/blurs.h:344 -#, fuzzy -msgid "Blend to background" -msgstr "Убрать фон" +#: ../share/templates/templates.h:1 +msgid "Simple CD Label template with disc's pattern." +msgstr "" -#: ../src/extension/internal/filter/blurs.h:354 -msgid "Blur eroded by white or transparency" +#: ../share/templates/templates.h:1 +msgid "CD label 120x120 disc disk" msgstr "" -#: ../src/extension/internal/filter/bumps.h:80 -#, fuzzy -msgid "Bump" -msgstr "Выпуклости" +#: ../share/templates/templates.h:1 +msgid "DVD Cover Regular 300dpi " +msgstr "" -#: ../src/extension/internal/filter/bumps.h:84 -#: ../src/extension/internal/filter/bumps.h:313 -#, fuzzy -msgid "Image simplification" -msgstr "Некорректный рабочий каталог: %s" +#: ../share/templates/templates.h:1 +msgid "Template for both-sides DVD covers." +msgstr "" -#: ../src/extension/internal/filter/bumps.h:85 -#: ../src/extension/internal/filter/bumps.h:314 -#, fuzzy -msgid "Bump simplification" -msgstr "Порог упрощения:" +#: ../share/templates/templates.h:1 +msgid "DVD cover regular 300dpi" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:87 -#: ../src/extension/internal/filter/bumps.h:316 -#, fuzzy -msgid "Bump source" -msgstr "Выпуклости" +#: ../share/templates/templates.h:1 +msgid "DVD Cover Slim 300dpi " +msgstr "" -#: ../src/extension/internal/filter/bumps.h:88 -#: ../src/extension/internal/filter/bumps.h:317 -#: ../src/extension/internal/filter/color.h:157 -#: ../src/extension/internal/filter/color.h:637 -#: ../src/extension/internal/filter/color.h:821 -#: ../src/extension/internal/filter/transparency.h:132 -#: ../src/filter-enums.cpp:127 ../src/ui/tools/flood-tool.cpp:193 -#: ../src/widgets/sp-color-icc-selector.cpp:355 -#: ../src/widgets/sp-color-scales.cpp:429 -#: ../src/widgets/sp-color-scales.cpp:430 -msgid "Red" -msgstr "Красный" +#: ../share/templates/templates.h:1 +msgid "Template for both-sides DVD slim covers." +msgstr "" -#: ../src/extension/internal/filter/bumps.h:89 -#: ../src/extension/internal/filter/bumps.h:318 -#: ../src/extension/internal/filter/color.h:158 -#: ../src/extension/internal/filter/color.h:638 -#: ../src/extension/internal/filter/color.h:822 -#: ../src/extension/internal/filter/transparency.h:133 -#: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:194 -#: ../src/widgets/sp-color-icc-selector.cpp:356 -#: ../src/widgets/sp-color-scales.cpp:432 -#: ../src/widgets/sp-color-scales.cpp:433 -msgid "Green" -msgstr "Зеленый" +#: ../share/templates/templates.h:1 +msgid "DVD cover slim 300dpi" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:90 -#: ../src/extension/internal/filter/bumps.h:319 -#: ../src/extension/internal/filter/color.h:159 -#: ../src/extension/internal/filter/color.h:639 -#: ../src/extension/internal/filter/color.h:823 -#: ../src/extension/internal/filter/transparency.h:134 -#: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:195 -#: ../src/widgets/sp-color-icc-selector.cpp:357 -#: ../src/widgets/sp-color-scales.cpp:435 -#: ../src/widgets/sp-color-scales.cpp:436 -msgid "Blue" -msgstr "Синий" +#: ../share/templates/templates.h:1 +msgid "DVD Cover Superslim 300dpi " +msgstr "" -#: ../src/extension/internal/filter/bumps.h:91 -#, fuzzy -msgid "Bump from background" -msgstr "Убрать фон" +#: ../share/templates/templates.h:1 +msgid "Template for both-sides DVD superslim covers." +msgstr "" -#: ../src/extension/internal/filter/bumps.h:94 -#, fuzzy -msgid "Lighting type:" -msgstr " тип: " +#: ../share/templates/templates.h:1 +msgid "DVD cover superslim 300dpi" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:95 -#, fuzzy -msgid "Specular" -msgstr "Отражение света" +#: ../share/templates/templates.h:1 +msgid "DVD Cover Ultraslim 300dpi " +msgstr "" -#: ../src/extension/internal/filter/bumps.h:96 -#, fuzzy -msgid "Diffuse" -msgstr "Рассеянный свет" +#: ../share/templates/templates.h:1 +msgid "Template for both-sides DVD ultraslim covers." +msgstr "" -#: ../src/extension/internal/filter/bumps.h:98 -#: ../src/extension/internal/filter/bumps.h:329 -#: ../src/libgdl/gdl-dock-placeholder.c:175 ../src/libgdl/gdl-dock.c:199 -#: ../src/widgets/rect-toolbar.cpp:331 -#: ../share/extensions/interp_att_g.inx.h:11 -msgid "Height" -msgstr "Высота" +#: ../share/templates/templates.h:1 +msgid "DVD cover ultraslim 300dpi" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:99 -#: ../src/extension/internal/filter/bumps.h:330 -#: ../src/extension/internal/filter/color.h:76 -#: ../src/extension/internal/filter/color.h:824 -#: ../src/extension/internal/filter/color.h:1113 -#: ../src/extension/internal/filter/paint.h:86 -#: ../src/extension/internal/filter/paint.h:592 -#: ../src/extension/internal/filter/paint.h:707 -#: ../src/ui/tools/flood-tool.cpp:198 -#: ../src/widgets/sp-color-icc-selector.cpp:366 -#: ../src/widgets/sp-color-scales.cpp:461 -#: ../src/widgets/sp-color-scales.cpp:462 ../src/widgets/tweak-toolbar.cpp:318 -#: ../share/extensions/color_randomize.inx.h:5 -msgid "Lightness" -msgstr "Яркость" +#: ../share/templates/templates.h:1 +msgid "Desktop 1024x768" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:100 -#: ../src/extension/internal/filter/bumps.h:331 -#, fuzzy -msgid "Precision" -msgstr "Точность:" +#: ../share/templates/templates.h:1 +msgid "Empty desktop size sheet" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:103 -msgid "Light source" -msgstr "Источник света" +#: ../share/templates/templates.h:1 +msgid "desktop 1024x768 wallpaper" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:104 -msgid "Light source:" -msgstr "Источник света:" +#: ../share/templates/templates.h:1 +msgid "Desktop 1600x1200" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:105 -#, fuzzy -msgid "Distant" -msgstr "Искажения" +#: ../share/templates/templates.h:1 +msgid "desktop 1600x1200 wallpaper" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:106 -#: ../src/ui/dialog/inkscape-preferences.cpp:451 -msgid "Point" -msgstr "Пункт" +#: ../share/templates/templates.h:1 +msgid "Desktop 640x480" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:107 -msgid "Spot" +#: ../share/templates/templates.h:1 +msgid "desktop 640x480 wallpaper" msgstr "" -#: ../src/extension/internal/filter/bumps.h:109 -#, fuzzy -msgid "Distant light options" -msgstr "Удалённый" +#: ../share/templates/templates.h:1 +msgid "Desktop 800x600" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:110 -#: ../src/extension/internal/filter/bumps.h:332 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1195 -msgid "Azimuth" -msgstr "Азимут" +#: ../share/templates/templates.h:1 +msgid "desktop 800x600 wallpaper" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:111 -#: ../src/extension/internal/filter/bumps.h:333 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 -msgid "Elevation" -msgstr "Высота" +#: ../share/templates/templates.h:1 +msgid "Fontforge Glyph" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:112 -#, fuzzy -msgid "Point light options" -msgstr "Точечный" +#: ../share/templates/templates.h:1 +msgid "font fontforge glyph 1000x1000" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:113 -#: ../src/extension/internal/filter/bumps.h:117 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "X location" -msgstr " расположение:" +msgid "Icon 16x16" +msgstr "16×16" -#: ../src/extension/internal/filter/bumps.h:114 -#: ../src/extension/internal/filter/bumps.h:118 -#, fuzzy -msgid "Y location" -msgstr " расположение:" +#: ../share/templates/templates.h:1 +msgid "Small 16x16 icon template." +msgstr "" -#: ../src/extension/internal/filter/bumps.h:115 -#: ../src/extension/internal/filter/bumps.h:119 -#, fuzzy -msgid "Z location" -msgstr " расположение:" +#: ../share/templates/templates.h:1 +msgid "icon 16x16 empty" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:116 -#, fuzzy -msgid "Spot light options" -msgstr "Прожектор" +#: ../share/templates/templates.h:1 +msgid "Icon 32x32" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:120 -#, fuzzy -msgid "X target" -msgstr "Target:" +#: ../share/templates/templates.h:1 +msgid "32x32 icon template." +msgstr "" -#: ../src/extension/internal/filter/bumps.h:121 -#, fuzzy -msgid "Y target" -msgstr "Target:" +#: ../share/templates/templates.h:1 +msgid "icon 32x32 empty" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:122 -#, fuzzy -msgid "Z target" -msgstr "Target:" +#: ../share/templates/templates.h:1 +msgid "Icon 48x48" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:123 -#, fuzzy -msgid "Specular exponent" -msgstr "Степень отражения" +#: ../share/templates/templates.h:1 +msgid "48x48 icon template." +msgstr "" -#: ../src/extension/internal/filter/bumps.h:124 -#, fuzzy -msgid "Cone angle" -msgstr "Угол конуса" +#: ../share/templates/templates.h:1 +msgid "icon 48x48 empty" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:127 -#, fuzzy -msgid "Image color" -msgstr "Вставить цвет" +#: ../share/templates/templates.h:1 +msgid "Icon 64x64" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:128 +#: ../share/templates/templates.h:1 +msgid "64x64 icon template." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "icon 64x64 empty" +msgstr "" + +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Color bump" -msgstr "Цвет" +msgid "Letter Landscape" +msgstr "_Альбом" -#: ../src/extension/internal/filter/bumps.h:142 -#: ../src/extension/internal/filter/bumps.h:362 -msgid "Bumps" -msgstr "Выпуклости" +#: ../share/templates/templates.h:1 +msgid "Standard letter landscape sheet - 792x612" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:145 -msgid "All purposes bump filter" +#: ../share/templates/templates.h:1 +msgid "letter landscape 792x612 empty" msgstr "" -#: ../src/extension/internal/filter/bumps.h:309 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Wax Bump" -msgstr "Выпуклости" +msgid "Letter" +msgstr "Кернинг:" -#: ../src/extension/internal/filter/bumps.h:320 -#, fuzzy -msgid "Background:" -msgstr "_Фон:" +#: ../share/templates/templates.h:1 +msgid "Standard letter sheet - 612x792" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:322 -#: ../src/extension/internal/filter/transparency.h:57 -#: ../src/filter-enums.cpp:29 ../src/sp-image.cpp:517 -msgid "Image" -msgstr "Изображение" +#: ../share/templates/templates.h:1 +msgid "letter 612x792 empty" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:323 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Blurred image" -msgstr "Встроить все растровые изображения" +msgid "No Borders" +msgstr "Край" -#: ../src/extension/internal/filter/bumps.h:325 -#, fuzzy -msgid "Background opacity" -msgstr "α-канал фонового изображения" +#: ../share/templates/templates.h:1 +msgid "Empty sheet with no borders" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:327 -#: ../src/extension/internal/filter/color.h:1040 -#, fuzzy -msgid "Lighting" -msgstr "Осветление" +#: ../share/templates/templates.h:1 +msgid "no borders empty" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:334 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Lighting blend:" -msgstr "Отмена рисования" +msgid "No Layers" +msgstr "Слой" -#: ../src/extension/internal/filter/bumps.h:341 -#, fuzzy -msgid "Highlight blend:" -msgstr "По_дсветка:" +#: ../share/templates/templates.h:1 +msgid "Empty sheet with no layers" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:350 -#, fuzzy -msgid "Bump color" -msgstr "Перенос цвета" +#: ../share/templates/templates.h:1 +msgid "no layers empty" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:351 -#, fuzzy -msgid "Revert bump" -msgstr "_Восстановить" +#: ../share/templates/templates.h:1 +msgid "Video HDTV 1920x1080" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:352 -#, fuzzy -msgid "Transparency type:" -msgstr "0 (прозрачно)" +#: ../share/templates/templates.h:1 +msgid "HDTV video template for 1920x1080 resolution." +msgstr "" -#: ../src/extension/internal/filter/bumps.h:353 -#: ../src/extension/internal/filter/morphology.h:176 -#: ../src/filter-enums.cpp:90 -msgid "Atop" -msgstr "Сверху (atop)" +#: ../share/templates/templates.h:1 +msgid "HDTV video empty 1920x1080" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:354 -#: ../src/extension/internal/filter/distort.h:70 -#: ../src/extension/internal/filter/morphology.h:174 -#: ../src/filter-enums.cpp:88 -msgid "In" -msgstr "Вход" +#: ../share/templates/templates.h:1 +msgid "Video NTSC 720x486" +msgstr "" -#: ../src/extension/internal/filter/bumps.h:365 -msgid "Turns an image to jelly" +#: ../share/templates/templates.h:1 +msgid "NTSC video template for 720x486 resolution." msgstr "" -#: ../src/extension/internal/filter/color.h:72 -#, fuzzy -msgid "Brilliance" -msgstr "Кириллица" +#: ../share/templates/templates.h:1 +msgid "NTSC video empty 720x486" +msgstr "" -#: ../src/extension/internal/filter/color.h:75 -#: ../src/extension/internal/filter/color.h:1417 -#, fuzzy -msgid "Over-saturation" -msgstr "Перенасыщенность:" +#: ../share/templates/templates.h:1 +msgid "Video PAL 728x576" +msgstr "" -#: ../src/extension/internal/filter/color.h:77 -#: ../src/extension/internal/filter/color.h:161 -#: ../src/extension/internal/filter/overlays.h:70 -#: ../src/extension/internal/filter/paint.h:85 -#: ../src/extension/internal/filter/paint.h:502 -#: ../src/extension/internal/filter/transparency.h:136 -#: ../src/extension/internal/filter/transparency.h:210 -#, fuzzy -msgid "Inverted" -msgstr "Инвертировать" +#: ../share/templates/templates.h:1 +msgid "PAL video template for 728x576 resolution." +msgstr "" -#: ../src/extension/internal/filter/color.h:85 -#, fuzzy -msgid "Brightness filter" -msgstr "Шаги яркости" +#: ../share/templates/templates.h:1 +msgid "PAL video empty 728x576" +msgstr "" -#: ../src/extension/internal/filter/color.h:152 -#, fuzzy -msgid "Channel Painting" -msgstr "Масляная краска" +#: ../share/templates/templates.h:1 +msgid "Web Banner 468x60" +msgstr "" -#: ../src/extension/internal/filter/color.h:156 -#: ../src/extension/internal/filter/color.h:257 -#: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:65 -#: ../src/ui/dialog/inkscape-preferences.cpp:943 -#: ../src/ui/tools/flood-tool.cpp:197 -#: ../src/widgets/sp-color-icc-selector.cpp:362 -#: ../src/widgets/sp-color-icc-selector.cpp:367 -#: ../src/widgets/sp-color-scales.cpp:458 -#: ../src/widgets/sp-color-scales.cpp:459 ../src/widgets/tweak-toolbar.cpp:302 -#: ../share/extensions/color_randomize.inx.h:4 -msgid "Saturation" -msgstr "Насыщенность" +#: ../share/templates/templates.h:1 +msgid "Empty 468x60 web banner template." +msgstr "" -#: ../src/extension/internal/filter/color.h:160 -#: ../src/extension/internal/filter/transparency.h:135 -#: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:199 -msgid "Alpha" -msgstr "Альфа-канал" +#: ../share/templates/templates.h:1 +msgid "web banner 468x60 empty" +msgstr "" -#: ../src/extension/internal/filter/color.h:174 -#, fuzzy -msgid "Replace RGB by any color" -msgstr "Заменить тон двумя цветами" +#: ../share/templates/templates.h:1 +msgid "Web Banner 728x90" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Empty 728x90 web banner template." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "web banner 728x90 empty" +msgstr "" -#: ../src/extension/internal/filter/color.h:254 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Color Shift" -msgstr "В цвете" +msgid "LaTeX Beamer" +msgstr "Печать в LaTeX" -#: ../src/extension/internal/filter/color.h:256 -#, fuzzy -msgid "Shift (°)" -msgstr "Сме_щение" +#: ../share/templates/templates.h:1 +msgid "LaTeX beamer template with helping grid." +msgstr "" -#: ../src/extension/internal/filter/color.h:265 -msgid "Rotate and desaturate hue" +#: ../share/templates/templates.h:1 +msgid "LaTex LaTeX latex grid beamer" msgstr "" -#: ../src/extension/internal/filter/color.h:321 +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Harsh light" -msgstr "Высота штрих-кода:" +msgid "Typography Canvas" +msgstr "1 Настроить холст" -#: ../src/extension/internal/filter/color.h:322 +#: ../share/templates/templates.h:1 +msgid "Empty typography canvas with helping guidelines." +msgstr "" + +#: ../share/templates/templates.h:1 #, fuzzy -msgid "Normal light" -msgstr "Обычное смещение:" +msgid "guidelines typography canvas" +msgstr "1 Настроить холст" -#: ../src/extension/internal/filter/color.h:323 -msgid "Duotone" -msgstr "Дуплекс" +#. 3D box +#: ../src/box3d.cpp:259 ../src/box3d.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:400 +msgid "3D Box" +msgstr "Паралеллепипед" -#: ../src/extension/internal/filter/color.h:324 -#: ../src/extension/internal/filter/color.h:1412 -#, fuzzy -msgid "Blend 1:" -msgstr "Смешивание" +#: ../src/color-profile.cpp:853 +#, c-format +msgid "Color profiles directory (%s) is unavailable." +msgstr "Каталог с профилями (%s) недоступен." -#: ../src/extension/internal/filter/color.h:331 -#: ../src/extension/internal/filter/color.h:1418 -#, fuzzy -msgid "Blend 2:" -msgstr "Смешивание" +#: ../src/color-profile.cpp:912 ../src/color-profile.cpp:929 +msgid "(invalid UTF-8 string)" +msgstr "(некорректная строка UTF-8)" -#: ../src/extension/internal/filter/color.h:350 +#: ../src/color-profile.cpp:914 #, fuzzy -msgid "Blend image or object with a flood color" +msgctxt "Profile name" +msgid "None" +msgstr "Нет" + +#: ../src/context-fns.cpp:36 ../src/context-fns.cpp:65 +msgid "<b>Current layer is hidden</b>. Unhide it to be able to draw on it." msgstr "" -"Смешать изображение или объект с цветом заливки и установить светлоту и " -"контраст" +"<b>Текущий слой скрыт</b>. Включите его показ, чтобы снова иметь возможность " +"рисовать на нём." -#: ../src/extension/internal/filter/color.h:424 ../src/filter-enums.cpp:22 -msgid "Component Transfer" -msgstr "Перенос компонента" +#: ../src/context-fns.cpp:42 ../src/context-fns.cpp:71 +msgid "<b>Current layer is locked</b>. Unlock it to be able to draw on it." +msgstr "" +"<b>Текущий слой заблокирован</b>. Разблокируйте его, чтобы иметь возможность " +"снова рисовать на нём." -#: ../src/extension/internal/filter/color.h:427 ../src/filter-enums.cpp:109 -msgid "Identity" -msgstr "Идентичная функция" +#: ../src/desktop-events.cpp:225 +msgid "Create guide" +msgstr "Создание направляющей" -#: ../src/extension/internal/filter/color.h:428 -#: ../src/extension/internal/filter/paint.h:498 ../src/filter-enums.cpp:110 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1050 -msgid "Table" -msgstr "Табличная функция" +#: ../src/desktop-events.cpp:471 +msgid "Move guide" +msgstr "Перемещение направляющей" -#: ../src/extension/internal/filter/color.h:429 -#: ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:111 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1053 -msgid "Discrete" -msgstr "Дискретная функция" +#: ../src/desktop-events.cpp:478 ../src/desktop-events.cpp:536 +#: ../src/ui/dialog/guides.cpp:138 +msgid "Delete guide" +msgstr "Удаление направляющей" -#: ../src/extension/internal/filter/color.h:430 ../src/filter-enums.cpp:112 -#: ../src/live_effects/lpe-powerstroke.cpp:188 -msgid "Linear" -msgstr "Линейная функция" +#: ../src/desktop-events.cpp:516 +#, c-format +msgid "<b>Guideline</b>: %s" +msgstr "<b>Направляющая</b>: %s" -#: ../src/extension/internal/filter/color.h:431 ../src/filter-enums.cpp:113 -msgid "Gamma" -msgstr "Гамма" +#: ../src/desktop.cpp:880 +msgid "No previous zoom." +msgstr "Нет предыдущего масштаба." -#: ../src/extension/internal/filter/color.h:440 -#, fuzzy -msgid "Basic component transfer structure" -msgstr "Простая текстура полупрозрачного шума" +#: ../src/desktop.cpp:901 +msgid "No next zoom." +msgstr "Нет следующего масштаба." -#: ../src/extension/internal/filter/color.h:509 -#, fuzzy -msgid "Duochrome" -msgstr "Хром" +#: ../src/display/canvas-axonomgrid.cpp:317 ../src/display/canvas-grid.cpp:693 +msgid "Grid _units:" +msgstr "Е_диницы сетки:" -#: ../src/extension/internal/filter/color.h:513 -#, fuzzy -msgid "Fluorescence level" -msgstr "Флюоресценция" +#: ../src/display/canvas-axonomgrid.cpp:319 ../src/display/canvas-grid.cpp:695 +msgid "_Origin X:" +msgstr "_Точка отсчёта по X:" -#: ../src/extension/internal/filter/color.h:514 -#, fuzzy -msgid "Swap:" -msgstr "Форма:" +#: ../src/display/canvas-axonomgrid.cpp:319 ../src/display/canvas-grid.cpp:695 +#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:764 +msgid "X coordinate of grid origin" +msgstr "Координата начала отсчёта по оси X" -#: ../src/extension/internal/filter/color.h:515 -#, fuzzy -msgid "No swap" -msgstr "Острые узлы" +#: ../src/display/canvas-axonomgrid.cpp:321 ../src/display/canvas-grid.cpp:697 +msgid "O_rigin Y:" +msgstr "Т_очка отсчёта по Y:" -#: ../src/extension/internal/filter/color.h:516 -#, fuzzy -msgid "Color and alpha" -msgstr "С управлением цветом" +#: ../src/display/canvas-axonomgrid.cpp:321 ../src/display/canvas-grid.cpp:697 +#: ../src/ui/dialog/inkscape-preferences.cpp:740 +#: ../src/ui/dialog/inkscape-preferences.cpp:765 +msgid "Y coordinate of grid origin" +msgstr "Координата начала отсчёта по оси Y" -#: ../src/extension/internal/filter/color.h:517 -#, fuzzy -msgid "Color only" -msgstr "Цвет" +#: ../src/display/canvas-axonomgrid.cpp:323 ../src/display/canvas-grid.cpp:701 +msgid "Spacing _Y:" +msgstr "И_нтервал по Y:" -#: ../src/extension/internal/filter/color.h:518 -#, fuzzy -msgid "Alpha only" -msgstr "Альфа-канал" +#: ../src/display/canvas-axonomgrid.cpp:323 +#: ../src/ui/dialog/inkscape-preferences.cpp:768 +msgid "Base length of z-axis" +msgstr "Основная длина оси Z" -#: ../src/extension/internal/filter/color.h:522 -#, fuzzy -msgid "Color 1" -msgstr "Цвет" +#: ../src/display/canvas-axonomgrid.cpp:325 +#: ../src/ui/dialog/inkscape-preferences.cpp:771 +#: ../src/widgets/box3d-toolbar.cpp:299 +msgid "Angle X:" +msgstr "Угол X:" -#: ../src/extension/internal/filter/color.h:525 +#: ../src/display/canvas-axonomgrid.cpp:325 +#: ../src/ui/dialog/inkscape-preferences.cpp:771 +msgid "Angle of x-axis" +msgstr "Угол оси X" + +#: ../src/display/canvas-axonomgrid.cpp:327 +#: ../src/ui/dialog/inkscape-preferences.cpp:772 +#: ../src/widgets/box3d-toolbar.cpp:378 +msgid "Angle Z:" +msgstr "Угол Z:" + +#: ../src/display/canvas-axonomgrid.cpp:327 +#: ../src/ui/dialog/inkscape-preferences.cpp:772 +msgid "Angle of z-axis" +msgstr "Угол оси Z" + +#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 #, fuzzy -msgid "Color 2" -msgstr "Цвет" +msgid "Minor grid line _color:" +msgstr "Цвет основных линий сетки:" -#: ../src/extension/internal/filter/color.h:535 +#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:723 #, fuzzy -msgid "Convert luminance values to a duochrome palette" -msgstr "Преобразовать цвета в двухцветную палитру" +msgid "Minor grid line color" +msgstr "Цвет основных линий сетки" -#: ../src/extension/internal/filter/color.h:634 +#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 #, fuzzy -msgid "Extract Channel" -msgstr "Канал непрозрачности" +msgid "Color of the minor grid lines" +msgstr "Цвет обычных линий сетки" -#: ../src/extension/internal/filter/color.h:640 -#: ../src/widgets/sp-color-icc-selector.cpp:369 -#: ../src/widgets/sp-color-icc-selector.cpp:374 -#: ../src/widgets/sp-color-scales.cpp:483 -#: ../src/widgets/sp-color-scales.cpp:484 -msgid "Cyan" -msgstr "Голубой" +#: ../src/display/canvas-axonomgrid.cpp:336 ../src/display/canvas-grid.cpp:710 +msgid "Ma_jor grid line color:" +msgstr "Цвет о_сновных линий сетки:" -#: ../src/extension/internal/filter/color.h:641 -#: ../src/widgets/sp-color-icc-selector.cpp:370 -#: ../src/widgets/sp-color-icc-selector.cpp:375 -#: ../src/widgets/sp-color-scales.cpp:486 -#: ../src/widgets/sp-color-scales.cpp:487 -msgid "Magenta" -msgstr "Пурпурный" +#: ../src/display/canvas-axonomgrid.cpp:336 ../src/display/canvas-grid.cpp:710 +#: ../src/ui/dialog/inkscape-preferences.cpp:725 +msgid "Major grid line color" +msgstr "Цвет основных линий сетки" -#: ../src/extension/internal/filter/color.h:642 -#: ../src/widgets/sp-color-icc-selector.cpp:371 -#: ../src/widgets/sp-color-icc-selector.cpp:376 -#: ../src/widgets/sp-color-scales.cpp:489 -#: ../src/widgets/sp-color-scales.cpp:490 -msgid "Yellow" -msgstr "Жёлтый" +#: ../src/display/canvas-axonomgrid.cpp:337 ../src/display/canvas-grid.cpp:711 +msgid "Color of the major (highlighted) grid lines" +msgstr "Цвет основных линий сетки" -#: ../src/extension/internal/filter/color.h:644 -#, fuzzy -msgid "Background blend mode:" -msgstr "Цвет фона:" +#: ../src/display/canvas-axonomgrid.cpp:341 ../src/display/canvas-grid.cpp:715 +msgid "_Major grid line every:" +msgstr "Осно_вная линия сетки каждые:" -#: ../src/extension/internal/filter/color.h:649 -#, fuzzy -msgid "Channel to alpha" -msgstr "Освещенность в альфа" +#: ../src/display/canvas-axonomgrid.cpp:341 ../src/display/canvas-grid.cpp:715 +msgid "lines" +msgstr "линий" -#: ../src/extension/internal/filter/color.h:657 -#, fuzzy -msgid "Extract color channel as a transparent image" -msgstr "Извлечь указанный канал из изображения" +#: ../src/display/canvas-grid.cpp:63 +msgid "Rectangular grid" +msgstr "Прямоугольная сетка" -#: ../src/extension/internal/filter/color.h:740 -#, fuzzy -msgid "Fade to Black or White" -msgstr "Только чёрный и белый" +#: ../src/display/canvas-grid.cpp:64 +msgid "Axonometric grid" +msgstr "Аксонометрическая сетка" -#: ../src/extension/internal/filter/color.h:743 -#, fuzzy -msgid "Fade to:" -msgstr "Угасание" +#: ../src/display/canvas-grid.cpp:275 +msgid "Create new grid" +msgstr "Создание новой сетки" -#: ../src/extension/internal/filter/color.h:744 -#: ../src/ui/widget/selected-style.cpp:257 -#: ../src/widgets/sp-color-icc-selector.cpp:372 -#: ../src/widgets/sp-color-scales.cpp:492 -#: ../src/widgets/sp-color-scales.cpp:493 -msgid "Black" -msgstr "Черный" +#: ../src/display/canvas-grid.cpp:341 +msgid "_Enabled" +msgstr "В_ключена" -#: ../src/extension/internal/filter/color.h:745 -#: ../src/ui/widget/selected-style.cpp:253 -msgid "White" -msgstr "Белый" +#: ../src/display/canvas-grid.cpp:342 +msgid "" +"Determines whether to snap to this grid or not. Can be 'on' for invisible " +"grids." +msgstr "" +"Определяет, включено ли прилипание к этой сетке. Прилипание может работать и " +"с невидимыми сетками." -#: ../src/extension/internal/filter/color.h:754 -#, fuzzy -msgid "Fade to black or white" -msgstr "Только ч/б" +#: ../src/display/canvas-grid.cpp:346 +msgid "Snap to visible _grid lines only" +msgstr "_Прилипать только к видимым линиям сетки" -#: ../src/extension/internal/filter/color.h:819 -msgid "Greyscale" -msgstr "Градации серого" +#: ../src/display/canvas-grid.cpp:347 +msgid "" +"When zoomed out, not all grid lines will be displayed. Only the visible ones " +"will be snapped to" +msgstr "" +"При уменьшении отображения не все линии сетки будут видны. Прилипание будет " +"выполняться только к видимым линиям." -#: ../src/extension/internal/filter/color.h:825 -#: ../src/extension/internal/filter/paint.h:83 -#: ../src/extension/internal/filter/paint.h:239 -#, fuzzy -msgid "Transparent" -msgstr "0 (прозрачно)" +#: ../src/display/canvas-grid.cpp:351 +msgid "_Visible" +msgstr "_Видима" -#: ../src/extension/internal/filter/color.h:833 -msgid "Customize greyscale components" +#: ../src/display/canvas-grid.cpp:352 +msgid "" +"Determines whether the grid is displayed or not. Objects are still snapped " +"to invisible grids." msgstr "" +"Определяет, отображается ли сетка. Объекты по-прежнему остаются " +"прилепленными к невидимым сеткам." -#: ../src/extension/internal/filter/color.h:905 -#: ../src/ui/widget/selected-style.cpp:249 -msgid "Invert" -msgstr "Инвертировать" +#: ../src/display/canvas-grid.cpp:699 +msgid "Spacing _X:" +msgstr "_Интервал по X:" -#: ../src/extension/internal/filter/color.h:907 -#, fuzzy -msgid "Invert channels:" -msgstr "Инвертировать тон" +#: ../src/display/canvas-grid.cpp:699 +#: ../src/ui/dialog/inkscape-preferences.cpp:745 +msgid "Distance between vertical grid lines" +msgstr "Расстояние между вертикальными линиями сетки" -#: ../src/extension/internal/filter/color.h:908 -#, fuzzy -msgid "No inversion" -msgstr "(без инерции)" +#: ../src/display/canvas-grid.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:746 +msgid "Distance between horizontal grid lines" +msgstr "Расстояние между горизонтальными линиями сетки" -#: ../src/extension/internal/filter/color.h:909 -msgid "Red and blue" -msgstr "Красный и синий" +#: ../src/display/canvas-grid.cpp:732 +msgid "_Show dots instead of lines" +msgstr "Показывать точки в_место линий" -#: ../src/extension/internal/filter/color.h:910 -msgid "Red and green" -msgstr "Красный и зелёный" +#: ../src/display/canvas-grid.cpp:733 +msgid "If set, displays dots at gridpoints instead of gridlines" +msgstr "Отображается ли сетка лишь точками пересечения ее линий" -#: ../src/extension/internal/filter/color.h:911 -msgid "Green and blue" -msgstr "Зелёный и синий" +#. TRANSLATORS: undefined target for snapping +#: ../src/display/snap-indicator.cpp:72 ../src/display/snap-indicator.cpp:75 +#: ../src/display/snap-indicator.cpp:180 ../src/display/snap-indicator.cpp:183 +msgid "UNDEFINED" +msgstr "НЕ ОПРЕДЕЛЕНО" -#: ../src/extension/internal/filter/color.h:913 -#, fuzzy -msgid "Light transparency" -msgstr "Полупрозрачный шум" +#: ../src/display/snap-indicator.cpp:79 +msgid "grid line" +msgstr "линии сетки" -#: ../src/extension/internal/filter/color.h:914 -msgid "Invert hue" -msgstr "Инвертировать тон" +#: ../src/display/snap-indicator.cpp:82 +msgid "grid intersection" +msgstr "пересечению линий сетки" -#: ../src/extension/internal/filter/color.h:915 -msgid "Invert lightness" -msgstr "Инвертировать светлоту" +#: ../src/display/snap-indicator.cpp:85 +#, fuzzy +msgid "grid line (perpendicular)" +msgstr "Перпендикулярная биссектриса" -#: ../src/extension/internal/filter/color.h:916 -msgid "Invert transparency" -msgstr "Инвертировать прозрачность" +#: ../src/display/snap-indicator.cpp:88 +msgid "guide" +msgstr "направляющей" -#: ../src/extension/internal/filter/color.h:924 -msgid "Manage hue, lightness and transparency inversions" -msgstr "" +#: ../src/display/snap-indicator.cpp:91 +msgid "guide intersection" +msgstr "пересечению направляющих" -#: ../src/extension/internal/filter/color.h:1042 -#, fuzzy -msgid "Lights" -msgstr "Света:" +#: ../src/display/snap-indicator.cpp:94 +msgid "guide origin" +msgstr "началу координат направляющей" -#: ../src/extension/internal/filter/color.h:1043 +#: ../src/display/snap-indicator.cpp:97 #, fuzzy -msgid "Shadows" -msgstr "Тени:" +msgid "guide (perpendicular)" +msgstr "Перпендикулярная биссектриса" -#: ../src/extension/internal/filter/color.h:1044 -#: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:32 -#: ../src/live_effects/effect.cpp:95 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1047 -#: ../src/widgets/gradient-toolbar.cpp:1156 -msgid "Offset" -msgstr "Смещение" +#: ../src/display/snap-indicator.cpp:100 +msgid "grid-guide intersection" +msgstr "пересечению сетки с направляющей" -#: ../src/extension/internal/filter/color.h:1052 -msgid "Modify lights and shadows separately" -msgstr "" +#: ../src/display/snap-indicator.cpp:103 +msgid "cusp node" +msgstr "острому узлу" -#: ../src/extension/internal/filter/color.h:1111 -msgid "Lightness-Contrast" -msgstr "Освещенность-Контраст" +#: ../src/display/snap-indicator.cpp:106 +msgid "smooth node" +msgstr "сглаженному узлу" -#: ../src/extension/internal/filter/color.h:1122 +#: ../src/display/snap-indicator.cpp:109 +msgid "path" +msgstr "контуру" + +#: ../src/display/snap-indicator.cpp:112 #, fuzzy -msgid "Modify lightness and contrast separately" -msgstr "Повысить или понизить освещенность и контраст" +msgid "path (perpendicular)" +msgstr "Перпендикулярная биссектриса" -#: ../src/extension/internal/filter/color.h:1190 -msgid "Nudge RGB" +#: ../src/display/snap-indicator.cpp:115 +msgid "path (tangential)" msgstr "" -#: ../src/extension/internal/filter/color.h:1194 -#, fuzzy -msgid "Red offset" -msgstr "Смещение пунктира" - -#: ../src/extension/internal/filter/color.h:1195 -#: ../src/extension/internal/filter/color.h:1198 -#: ../src/extension/internal/filter/color.h:1201 -#: ../src/extension/internal/filter/color.h:1307 -#: ../src/extension/internal/filter/color.h:1310 -#: ../src/extension/internal/filter/color.h:1313 -#: ../src/ui/dialog/input.cpp:1616 ../src/ui/dialog/layers.cpp:917 -msgid "X" -msgstr "X" +#: ../src/display/snap-indicator.cpp:118 +msgid "path intersection" +msgstr "пересечению контуров" -#: ../src/extension/internal/filter/color.h:1196 -#: ../src/extension/internal/filter/color.h:1199 -#: ../src/extension/internal/filter/color.h:1202 -#: ../src/extension/internal/filter/color.h:1308 -#: ../src/extension/internal/filter/color.h:1311 -#: ../src/extension/internal/filter/color.h:1314 -#: ../src/ui/dialog/input.cpp:1616 +#: ../src/display/snap-indicator.cpp:121 #, fuzzy -msgid "Y" -msgstr "Y:" +msgid "guide-path intersection" +msgstr "пересечению направляющих" -#: ../src/extension/internal/filter/color.h:1197 +#: ../src/display/snap-indicator.cpp:124 #, fuzzy -msgid "Green offset" -msgstr "Смещение пунктира" +msgid "clip-path" +msgstr "Установлен обтравочный контур" -#: ../src/extension/internal/filter/color.h:1200 +#: ../src/display/snap-indicator.cpp:127 #, fuzzy -msgid "Blue offset" -msgstr "Устанавливаемое значение:" - -#: ../src/extension/internal/filter/color.h:1215 -msgid "" -"Nudge RGB channels separately and blend them to different types of " -"backgrounds" -msgstr "" +msgid "mask-path" +msgstr "Изменить контур маски" -#: ../src/extension/internal/filter/color.h:1302 -msgid "Nudge CMY" -msgstr "" +#: ../src/display/snap-indicator.cpp:130 +msgid "bounding box corner" +msgstr "углу площадки" -#: ../src/extension/internal/filter/color.h:1306 -#, fuzzy -msgid "Cyan offset" -msgstr "Смещение пунктира" +#: ../src/display/snap-indicator.cpp:133 +msgid "bounding box side" +msgstr "стороне площадки" -#: ../src/extension/internal/filter/color.h:1309 -#, fuzzy -msgid "Magenta offset" -msgstr "Смещение по касательной:" +#: ../src/display/snap-indicator.cpp:136 +msgid "page border" +msgstr "краю страницы" -#: ../src/extension/internal/filter/color.h:1312 -#, fuzzy -msgid "Yellow offset" -msgstr "Смещение пунктира" +#: ../src/display/snap-indicator.cpp:139 +msgid "line midpoint" +msgstr "средней точке линии" -#: ../src/extension/internal/filter/color.h:1327 -msgid "" -"Nudge CMY channels separately and blend them to different types of " -"backgrounds" -msgstr "" +#: ../src/display/snap-indicator.cpp:142 +msgid "object midpoint" +msgstr "средней точке объекта" -#: ../src/extension/internal/filter/color.h:1408 -msgid "Quadritone fantasy" -msgstr "Квадроплексная фантазия" +#: ../src/display/snap-indicator.cpp:145 +msgid "object rotation center" +msgstr "центру вращения объекта" -#: ../src/extension/internal/filter/color.h:1410 -#, fuzzy -msgid "Hue distribution (°)" -msgstr "Использовать обычное распределение" +#: ../src/display/snap-indicator.cpp:148 +msgid "bounding box side midpoint" +msgstr "средней точке стороны площадки" -#: ../src/extension/internal/filter/color.h:1411 -#: ../share/extensions/svgcalendar.inx.h:19 -msgid "Colors" -msgstr "В цвете" +#: ../src/display/snap-indicator.cpp:151 +msgid "bounding box midpoint" +msgstr "средней точке площадки" -#: ../src/extension/internal/filter/color.h:1432 -msgid "Replace hue by two colors" -msgstr "Заменить тон двумя цветами" +#: ../src/display/snap-indicator.cpp:154 +msgid "page corner" +msgstr "углу страницы" -#: ../src/extension/internal/filter/color.h:1496 -#, fuzzy -msgid "Hue rotation (°)" -msgstr "Вращение тона:" +#: ../src/display/snap-indicator.cpp:157 +msgid "quadrant point" +msgstr "точке квадранта" -#: ../src/extension/internal/filter/color.h:1499 -msgid "Moonarize" -msgstr "Лунизация" +#: ../src/display/snap-indicator.cpp:161 +msgid "corner" +msgstr "углу" -#: ../src/extension/internal/filter/color.h:1508 -#, fuzzy -msgid "Classic photographic solarization effect" -msgstr "Классический фотоэффект соляризации" +#: ../src/display/snap-indicator.cpp:164 +msgid "text anchor" +msgstr "" -#: ../src/extension/internal/filter/color.h:1581 -msgid "Tritone" -msgstr "Триплекс" +#: ../src/display/snap-indicator.cpp:167 +msgid "text baseline" +msgstr "линии шрифта" -#: ../src/extension/internal/filter/color.h:1587 +#: ../src/display/snap-indicator.cpp:170 #, fuzzy -msgid "Enhance hue" -msgstr "Повысить качество" +msgid "constrained angle" +msgstr "Сокращение межстрочного интервала" -#: ../src/extension/internal/filter/color.h:1588 +#: ../src/display/snap-indicator.cpp:173 #, fuzzy -msgid "Phosphorescence" -msgstr "Наличие" +msgid "constraint" +msgstr "Константа диффузии:" -#: ../src/extension/internal/filter/color.h:1589 -#, fuzzy -msgid "Colored nights" -msgstr "В цвете" +#: ../src/display/snap-indicator.cpp:187 +msgid "Bounding box corner" +msgstr "Угол площадки" -#: ../src/extension/internal/filter/color.h:1590 -#, fuzzy -msgid "Hue to background" -msgstr "Убрать фон" +#: ../src/display/snap-indicator.cpp:190 +msgid "Bounding box midpoint" +msgstr "Средняя точка площадки" -#: ../src/extension/internal/filter/color.h:1592 -#, fuzzy -msgid "Global blend:" -msgstr "Общий изгиб" +#: ../src/display/snap-indicator.cpp:193 +msgid "Bounding box side midpoint" +msgstr "Средняя точка стороны площадки" -#: ../src/extension/internal/filter/color.h:1598 -msgid "Glow" -msgstr "Свечение" +#: ../src/display/snap-indicator.cpp:196 ../src/ui/tool/node.cpp:1319 +msgid "Smooth node" +msgstr "Сглаженный узел" -#: ../src/extension/internal/filter/color.h:1599 -#, fuzzy -msgid "Glow blend:" -msgstr "Светящийся пузырь" +#: ../src/display/snap-indicator.cpp:199 ../src/ui/tool/node.cpp:1318 +msgid "Cusp node" +msgstr "Острый узел" -#: ../src/extension/internal/filter/color.h:1604 -#, fuzzy -msgid "Local light" -msgstr "Отражение света" +#: ../src/display/snap-indicator.cpp:202 +msgid "Line midpoint" +msgstr "Средняя точка линии" -#: ../src/extension/internal/filter/color.h:1605 -#, fuzzy -msgid "Global light" -msgstr "Общий изгиб" +#: ../src/display/snap-indicator.cpp:205 +msgid "Object midpoint" +msgstr "Средняя точка объекта" -#: ../src/extension/internal/filter/color.h:1608 -#, fuzzy -msgid "Hue distribution (°):" -msgstr "Использовать обычное распределение" +#: ../src/display/snap-indicator.cpp:208 +msgid "Object rotation center" +msgstr "Центр вращения объекта" -#: ../src/extension/internal/filter/color.h:1619 -msgid "" -"Create a custom tritone palette with additional glow, blend modes and hue " -"moving" -msgstr "" +#: ../src/display/snap-indicator.cpp:212 +msgid "Handle" +msgstr "Рычаг" -#: ../src/extension/internal/filter/distort.h:67 -#, fuzzy -msgid "Felt Feather" -msgstr "Растушёвка" +#: ../src/display/snap-indicator.cpp:215 +msgid "Path intersection" +msgstr "Пересечение контуров" -#: ../src/extension/internal/filter/distort.h:71 -#: ../src/extension/internal/filter/morphology.h:175 -#: ../src/filter-enums.cpp:89 -msgid "Out" -msgstr "Выход" +#: ../src/display/snap-indicator.cpp:218 +msgid "Guide" +msgstr "Направляющая" -#: ../src/extension/internal/filter/distort.h:77 -#: ../src/extension/internal/filter/textures.h:75 -#: ../src/ui/widget/selected-style.cpp:131 -#: ../src/ui/widget/style-swatch.cpp:128 -msgid "Stroke:" -msgstr "Обводка:" +#: ../src/display/snap-indicator.cpp:221 +msgid "Guide origin" +msgstr "Начало координат направляющей" -#: ../src/extension/internal/filter/distort.h:79 -#: ../src/extension/internal/filter/textures.h:76 -msgid "Wide" -msgstr "Широкий" +#: ../src/display/snap-indicator.cpp:224 +msgid "Convex hull corner" +msgstr "Выпуклый внешний угол" -#: ../src/extension/internal/filter/distort.h:80 -#: ../src/extension/internal/filter/textures.h:78 -#, fuzzy -msgid "Narrow" -msgstr "Узкие" +#: ../src/display/snap-indicator.cpp:227 +msgid "Quadrant point" +msgstr "Точка квадранта" -#: ../src/extension/internal/filter/distort.h:81 -msgid "No fill" -msgstr "Без заливки" +#: ../src/display/snap-indicator.cpp:231 +msgid "Corner" +msgstr "Угол" -#: ../src/extension/internal/filter/distort.h:83 +#: ../src/display/snap-indicator.cpp:234 #, fuzzy -msgid "Turbulence:" -msgstr "Турбулентность" +msgid "Text anchor" +msgstr "Импорт текстовых файлов" -#: ../src/extension/internal/filter/distort.h:84 -#: ../src/extension/internal/filter/distort.h:193 -#: ../src/extension/internal/filter/overlays.h:61 -#: ../src/extension/internal/filter/paint.h:692 -#, fuzzy -msgid "Fractal noise" -msgstr "Фрактальный шум" +#: ../src/display/snap-indicator.cpp:237 +msgid "Multiple of grid spacing" +msgstr "" -#: ../src/extension/internal/filter/distort.h:85 -#: ../src/extension/internal/filter/distort.h:194 -#: ../src/extension/internal/filter/overlays.h:62 -#: ../src/extension/internal/filter/paint.h:693 ../src/filter-enums.cpp:35 -#: ../src/filter-enums.cpp:144 -msgid "Turbulence" -msgstr "Турбулентность" +#: ../src/display/snap-indicator.cpp:268 +msgid " to " +msgstr " к " -#: ../src/extension/internal/filter/distort.h:87 -#: ../src/extension/internal/filter/distort.h:196 -#: ../src/extension/internal/filter/paint.h:93 -#: ../src/extension/internal/filter/paint.h:695 -#, fuzzy -msgid "Horizontal frequency" -msgstr "Сдвиг по горизонтали, px" +#: ../src/document.cpp:541 +#, c-format +msgid "New document %d" +msgstr "Новый документ %d" -#: ../src/extension/internal/filter/distort.h:88 -#: ../src/extension/internal/filter/distort.h:197 -#: ../src/extension/internal/filter/paint.h:94 -#: ../src/extension/internal/filter/paint.h:696 -#, fuzzy -msgid "Vertical frequency" -msgstr "Сдвиг по вертикали, px" +#: ../src/document.cpp:546 +#, fuzzy, c-format +msgid "Memory document %d" +msgstr "Документ в памяти %d" -#: ../src/extension/internal/filter/distort.h:89 -#: ../src/extension/internal/filter/distort.h:198 -#: ../src/extension/internal/filter/paint.h:95 -#: ../src/extension/internal/filter/paint.h:697 +#: ../src/document.cpp:575 #, fuzzy -msgid "Complexity" -msgstr "Макс. сложность" +msgid "Memory document %1" +msgstr "Документ в памяти %d" -#: ../src/extension/internal/filter/distort.h:90 -#: ../src/extension/internal/filter/distort.h:199 -#: ../src/extension/internal/filter/paint.h:96 -#: ../src/extension/internal/filter/paint.h:698 -#, fuzzy -msgid "Variation" -msgstr "Насыщенность" +#: ../src/document.cpp:787 +#, c-format +msgid "Unnamed document %d" +msgstr "Безымянный документ %d" -#: ../src/extension/internal/filter/distort.h:91 -#: ../src/extension/internal/filter/distort.h:200 -#, fuzzy -msgid "Intensity" -msgstr "Идентичная функция" +#: ../src/event-log.cpp:185 +msgid "[Unchanged]" +msgstr "[Без изменений]" -#: ../src/extension/internal/filter/distort.h:96 -#: ../src/extension/internal/filter/distort.h:205 -msgid "Distort" -msgstr "Искажения" +#. Edit +#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2386 +msgid "_Undo" +msgstr "_Отменить" -#: ../src/extension/internal/filter/distort.h:99 -#, fuzzy -msgid "Blur and displace edges of shapes and pictures" -msgstr "" -"Создать раскрашиваемое свечение краёв внутри объектов и растровых изображений" +#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2388 +msgid "_Redo" +msgstr "Ве_рнуть" -#: ../src/extension/internal/filter/distort.h:190 -msgid "Roughen" -msgstr "Огрубление" +#: ../src/extension/dependency.cpp:243 +msgid "Dependency:" +msgstr "Зависит от:" -#: ../src/extension/internal/filter/distort.h:192 -#: ../src/extension/internal/filter/overlays.h:60 -#: ../src/extension/internal/filter/paint.h:691 -#: ../src/extension/internal/filter/textures.h:64 -#, fuzzy -msgid "Turbulence type:" -msgstr "Турбулентность" +#: ../src/extension/dependency.cpp:244 +msgid " type: " +msgstr " тип: " -#: ../src/extension/internal/filter/distort.h:208 -msgid "Small-scale roughening to edges and content" -msgstr "Небольшое загрубление краёв и содержимого" +#: ../src/extension/dependency.cpp:245 +msgid " location: " +msgstr " расположение:" -#: ../src/extension/internal/filter/filter-file.cpp:34 -msgid "Bundled" -msgstr "Из поставки" +#: ../src/extension/dependency.cpp:246 +msgid " string: " +msgstr " строка:" -#: ../src/extension/internal/filter/filter-file.cpp:35 -msgid "Personal" -msgstr "Личное" +#: ../src/extension/dependency.cpp:249 +msgid " description: " +msgstr " описание:" -#: ../src/extension/internal/filter/filter-file.cpp:47 -msgid "Null external module directory name. Filters will not be loaded." -msgstr "Нулевое имя каталога с внешними модулями. Фильтры не будут загружены." +#: ../src/extension/effect.cpp:41 +msgid " (No preferences)" +msgstr " (без параметров)" -#: ../src/extension/internal/filter/image.h:49 -#, fuzzy -msgid "Edge Detect" -msgstr "Определение краёв" +#: ../src/extension/effect.h:70 ../src/verbs.cpp:2160 +msgid "Extensions" +msgstr "Расширения" -#: ../src/extension/internal/filter/image.h:51 -msgid "Detect:" +#. This is some filler text, needs to change before relase +#: ../src/extension/error-file.cpp:52 +msgid "" +"<span weight=\"bold\" size=\"larger\">One or more extensions failed to load</" +"span>\n" +"\n" +"The failed extensions have been skipped. Inkscape will continue to run " +"normally but those extensions will be unavailable. For details to " +"troubleshoot this problem, please refer to the error log located at: " msgstr "" +"<span weight=\"bold\" size=\"larger\">Не удалось загрузить одно или " +"несколько расширений</span>\n" +"\n" +"Незагруженные сценарии пропущены. Inkscape будет работать нормально, но эти " +"расширения будут недоступны. Подробности можно найти в файле журнала " +"событий, находящегося здесь:" -#: ../src/extension/internal/filter/image.h:52 -#: ../src/ui/dialog/template-load-tab.cpp:105 -#: ../src/ui/dialog/template-load-tab.cpp:142 -#, fuzzy -msgid "All" -msgstr "Все" +#: ../src/extension/error-file.cpp:66 +msgid "Show dialog on startup" +msgstr "Показывать диалог при запуске" -#: ../src/extension/internal/filter/image.h:53 -#, fuzzy -msgid "Vertical lines" -msgstr "Вертикальный радиус" +#: ../src/extension/execution-env.cpp:144 +#, c-format +msgid "'%s' working, please wait..." +msgstr "Применяется эффект '%s' , подождите немного..." -#: ../src/extension/internal/filter/image.h:54 -#, fuzzy -msgid "Horizontal lines" -msgstr "Горизонтальный радиус" +#. static int i = 0; +#. std::cout << "Checking module[" << i++ << "]: " << name << std::endl; +#: ../src/extension/extension.cpp:271 +msgid "" +" This is caused by an improper .inx file for this extension. An improper ." +"inx file could have been caused by a faulty installation of Inkscape." +msgstr "" +"Это вызвано неправильным .inx файлом для данного расширения. Неправильный ." +"inx файл мог появиться из-за ошибки при инсталляции Inkscape." -#: ../src/extension/internal/filter/image.h:57 -msgid "Invert colors" -msgstr "Инвертировать цвета" +#: ../src/extension/extension.cpp:281 +msgid "the extension is designed for Windows only." +msgstr "" -#: ../src/extension/internal/filter/image.h:62 -msgid "Image Effects" -msgstr "Эффекты для растра" +#: ../src/extension/extension.cpp:286 +msgid "an ID was not defined for it." +msgstr "ID не был определен." -#: ../src/extension/internal/filter/image.h:65 -msgid "Detect color edges in object" -msgstr "Найти в объекте цветные края" +#: ../src/extension/extension.cpp:290 +msgid "there was no name defined for it." +msgstr "не было определено имени." -#: ../src/extension/internal/filter/morphology.h:58 -msgid "Cross-smooth" -msgstr "Перекрестное сглаживание" +#: ../src/extension/extension.cpp:294 +msgid "the XML description of it got lost." +msgstr "XML-описание было потеряно." -#: ../src/extension/internal/filter/morphology.h:61 -#: ../src/extension/internal/filter/shadows.h:66 -#, fuzzy -msgid "Inner" -msgstr "Внутреннее свечение" +#: ../src/extension/extension.cpp:298 +msgid "no implementation was defined for the extension." +msgstr "для этого расширения не была определена реализация." -#: ../src/extension/internal/filter/morphology.h:62 -#: ../src/extension/internal/filter/shadows.h:65 -msgid "Outer" -msgstr "" +#. std::cout << "Failed: " << *(_deps[i]) << std::endl; +#: ../src/extension/extension.cpp:305 +msgid "a dependency was not met." +msgstr "не установлен необходимый для выполнения сценария компонент." -#: ../src/extension/internal/filter/morphology.h:63 -#, fuzzy -msgid "Open" -msgstr "_Открыть..." +#: ../src/extension/extension.cpp:325 +msgid "Extension \"" +msgstr "Расширение \"" -#: ../src/extension/internal/filter/morphology.h:65 -#: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 -#: ../src/widgets/rect-toolbar.cpp:314 ../src/widgets/spray-toolbar.cpp:116 -#: ../src/widgets/tweak-toolbar.cpp:128 -#: ../share/extensions/interp_att_g.inx.h:10 -msgid "Width" -msgstr "Ширина" +#: ../src/extension/extension.cpp:325 +msgid "\" failed to load because " +msgstr "\" не удалось загрузить, потому что " -#: ../src/extension/internal/filter/morphology.h:69 -#: ../src/extension/internal/filter/morphology.h:190 -#, fuzzy -msgid "Antialiasing" -msgstr "Сглаживать" +#: ../src/extension/extension.cpp:674 +#, c-format +msgid "Could not create extension error log file '%s'" +msgstr "Невозможно создать файл журнала %s." -#: ../src/extension/internal/filter/morphology.h:70 -msgid "Blur content" -msgstr "Размыть содержимое" +#: ../src/extension/extension.cpp:782 +#: ../share/extensions/webslicer_create_rect.inx.h:2 +msgid "Name:" +msgstr "Имя:" -#: ../src/extension/internal/filter/morphology.h:76 -#: ../src/extension/internal/filter/morphology.h:203 -#: ../src/filter-enums.cpp:31 -msgid "Morphology" -msgstr "Морфология" +#: ../src/extension/extension.cpp:783 +msgid "ID:" +msgstr "ID" -#: ../src/extension/internal/filter/morphology.h:79 -msgid "Smooth edges and angles of shapes" -msgstr "" +#: ../src/extension/extension.cpp:784 +msgid "State:" +msgstr "Состояние:" -#: ../src/extension/internal/filter/morphology.h:166 -msgid "Outline" -msgstr "Контур" +#: ../src/extension/extension.cpp:784 +msgid "Loaded" +msgstr "Загружен" -#: ../src/extension/internal/filter/morphology.h:170 -#, fuzzy -msgid "Fill image" -msgstr "Все изображения" +#: ../src/extension/extension.cpp:784 +msgid "Unloaded" +msgstr "Не загружен" -#: ../src/extension/internal/filter/morphology.h:171 -#, fuzzy -msgid "Hide image" -msgstr "Сокрытие слоя" +#: ../src/extension/extension.cpp:784 +msgid "Deactivated" +msgstr "Деактивирован" -#: ../src/extension/internal/filter/morphology.h:172 -#, fuzzy -msgid "Composite type:" -msgstr "Совмещение" +#: ../src/extension/extension.cpp:824 +msgid "" +"Currently there is no help available for this Extension. Please look on the " +"Inkscape website or ask on the mailing lists if you have questions regarding " +"this extension." +msgstr "" +"В настоящее время для этого расширения нет справочной информации. Поищите ее " +"на сайте Inkscape или задайте вопрос в списке рассылки для пользователей." -#: ../src/extension/internal/filter/morphology.h:173 -#: ../src/filter-enums.cpp:87 -msgid "Over" -msgstr "Над" +#: ../src/extension/implementation/script.cpp:1037 +msgid "" +"Inkscape has received additional data from the script executed. The script " +"did not return an error, but this may indicate the results will not be as " +"expected." +msgstr "" +"Inkscape получил дополнительные данные от выполненного сценария. Сценарий не " +"возвратил ошибки, но это может означать и то, что результаты будут " +"отличаться от ожидаемых." -#: ../src/extension/internal/filter/morphology.h:177 -#: ../src/filter-enums.cpp:91 -msgid "XOR" -msgstr "Исключающее ИЛИ (XOR)" +#: ../src/extension/init.cpp:288 +msgid "Null external module directory name. Modules will not be loaded." +msgstr "Нулевое имя каталога с внешними модулями. Модули не будут загружены." + +#: ../src/extension/init.cpp:302 +#: ../src/extension/internal/filter/filter-file.cpp:59 +#, c-format +msgid "" +"Modules directory (%s) is unavailable. External modules in that directory " +"will not be loaded." +msgstr "" +"Каталог модулей (%s) недоступен. Внешние модули из этого каталога не будут " +"загружены." + +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:39 +msgid "Adaptive Threshold" +msgstr "Адаптивная постеризация" -#: ../src/extension/internal/filter/morphology.h:179 -#: ../src/ui/dialog/layer-properties.cpp:185 -msgid "Position:" -msgstr "Положение:" +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:41 +#: ../src/extension/internal/bitmap/raise.cpp:42 +#: ../src/extension/internal/bitmap/sample.cpp:41 +#: ../src/extension/internal/bluredge.cpp:138 +#: ../src/ui/dialog/object-attributes.cpp:68 +#: ../src/ui/dialog/object-attributes.cpp:77 +#: ../src/widgets/calligraphy-toolbar.cpp:430 +#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/tweak-toolbar.cpp:128 +#: ../share/extensions/foldablebox.inx.h:2 +msgid "Width:" +msgstr "Ширина:" -#: ../src/extension/internal/filter/morphology.h:180 -#, fuzzy -msgid "Inside" -msgstr "2-ая сторона:" +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:42 +#: ../src/extension/internal/bitmap/raise.cpp:43 +#: ../src/extension/internal/bitmap/sample.cpp:42 +#: ../src/ui/dialog/object-attributes.cpp:69 +#: ../src/ui/dialog/object-attributes.cpp:78 +#: ../share/extensions/foldablebox.inx.h:3 +msgid "Height:" +msgstr "Высота:" -#: ../src/extension/internal/filter/morphology.h:181 -#, fuzzy -msgid "Outside" -msgstr "Вы_тянуть" +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 +#: ../share/extensions/printing_marks.inx.h:12 +msgid "Offset:" +msgstr "Смещение:" -#: ../src/extension/internal/filter/morphology.h:182 -#, fuzzy -msgid "Overlayed" -msgstr "Перекрытия" +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:47 +#: ../src/extension/internal/bitmap/addNoise.cpp:58 +#: ../src/extension/internal/bitmap/blur.cpp:45 +#: ../src/extension/internal/bitmap/channel.cpp:64 +#: ../src/extension/internal/bitmap/charcoal.cpp:45 +#: ../src/extension/internal/bitmap/colorize.cpp:56 +#: ../src/extension/internal/bitmap/contrast.cpp:46 +#: ../src/extension/internal/bitmap/crop.cpp:75 +#: ../src/extension/internal/bitmap/cycleColormap.cpp:43 +#: ../src/extension/internal/bitmap/despeckle.cpp:41 +#: ../src/extension/internal/bitmap/edge.cpp:43 +#: ../src/extension/internal/bitmap/emboss.cpp:45 +#: ../src/extension/internal/bitmap/enhance.cpp:40 +#: ../src/extension/internal/bitmap/equalize.cpp:40 +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:45 +#: ../src/extension/internal/bitmap/implode.cpp:43 +#: ../src/extension/internal/bitmap/level.cpp:49 +#: ../src/extension/internal/bitmap/levelChannel.cpp:71 +#: ../src/extension/internal/bitmap/medianFilter.cpp:43 +#: ../src/extension/internal/bitmap/modulate.cpp:48 +#: ../src/extension/internal/bitmap/negate.cpp:41 +#: ../src/extension/internal/bitmap/normalize.cpp:41 +#: ../src/extension/internal/bitmap/oilPaint.cpp:43 +#: ../src/extension/internal/bitmap/opacity.cpp:44 +#: ../src/extension/internal/bitmap/raise.cpp:48 +#: ../src/extension/internal/bitmap/reduceNoise.cpp:46 +#: ../src/extension/internal/bitmap/sample.cpp:46 +#: ../src/extension/internal/bitmap/shade.cpp:48 +#: ../src/extension/internal/bitmap/sharpen.cpp:45 +#: ../src/extension/internal/bitmap/solarize.cpp:45 +#: ../src/extension/internal/bitmap/spread.cpp:43 +#: ../src/extension/internal/bitmap/swirl.cpp:43 +#: ../src/extension/internal/bitmap/threshold.cpp:44 +#: ../src/extension/internal/bitmap/unsharpmask.cpp:50 +#: ../src/extension/internal/bitmap/wave.cpp:45 +msgid "Raster" +msgstr "Растровые" -#: ../src/extension/internal/filter/morphology.h:184 +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:49 #, fuzzy -msgid "Width 1" -msgstr "Ширина:" +msgid "Apply adaptive thresholding to selected bitmap(s)" +msgstr "" +"Применить эффект адаптивной постеризации к выбранным растровым изображениям" -#: ../src/extension/internal/filter/morphology.h:185 -#, fuzzy -msgid "Dilatation 1" -msgstr "Насыщенность" +#: ../src/extension/internal/bitmap/addNoise.cpp:45 +msgid "Add Noise" +msgstr "Добавить шум" -#: ../src/extension/internal/filter/morphology.h:186 -#, fuzzy -msgid "Erosion 1" -msgstr "Положение:" +#. _settings->add_checkbutton(false, SP_ATTR_STITCHTILES, _("Stitch Tiles"), "stitch", "noStitch"); +#: ../src/extension/internal/bitmap/addNoise.cpp:47 +#: ../src/extension/internal/filter/color.h:426 +#: ../src/extension/internal/filter/color.h:1497 +#: ../src/extension/internal/filter/color.h:1585 +#: ../src/extension/internal/filter/distort.h:69 +#: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2842 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/object-attributes.cpp:49 +#: ../share/extensions/jessyInk_effects.inx.h:5 +#: ../share/extensions/jessyInk_export.inx.h:3 +#: ../share/extensions/jessyInk_transitions.inx.h:5 +#: ../share/extensions/webslicer_create_rect.inx.h:14 +msgid "Type:" +msgstr "Вид:" -#: ../src/extension/internal/filter/morphology.h:187 -#, fuzzy -msgid "Width 2" -msgstr "Ширина:" +#: ../src/extension/internal/bitmap/addNoise.cpp:48 +msgid "Uniform Noise" +msgstr "Однообразный шум" -#: ../src/extension/internal/filter/morphology.h:188 -#, fuzzy -msgid "Dilatation 2" -msgstr "Насыщенность" +#: ../src/extension/internal/bitmap/addNoise.cpp:49 +msgid "Gaussian Noise" +msgstr "Гауссов шум" -#: ../src/extension/internal/filter/morphology.h:189 -#, fuzzy -msgid "Erosion 2" -msgstr "Положение:" +#: ../src/extension/internal/bitmap/addNoise.cpp:50 +msgid "Multiplicative Gaussian Noise" +msgstr "Увеличивающийся гауссов шум" -#: ../src/extension/internal/filter/morphology.h:191 -msgid "Smooth" -msgstr "Сгладить" +#: ../src/extension/internal/bitmap/addNoise.cpp:51 +msgid "Impulse Noise" +msgstr "Импульсный шум" -#: ../src/extension/internal/filter/morphology.h:195 -msgid "Fill opacity:" -msgstr "Непрозрачность заливки:" +#: ../src/extension/internal/bitmap/addNoise.cpp:52 +msgid "Laplacian Noise" +msgstr "Лапласов шум" -#: ../src/extension/internal/filter/morphology.h:196 -msgid "Stroke opacity:" -msgstr "Непрозрачность обводки:" +#: ../src/extension/internal/bitmap/addNoise.cpp:53 +msgid "Poisson Noise" +msgstr "Шум Пуассона" -#: ../src/extension/internal/filter/morphology.h:206 -#, fuzzy -msgid "Adds a colorizable outline" -msgstr "Создать раскрашиваемое свечение изнутри" +#: ../src/extension/internal/bitmap/addNoise.cpp:60 +msgid "Add random noise to selected bitmap(s)" +msgstr "Добавить случайный шум в выбранные изображения" -#: ../src/extension/internal/filter/overlays.h:56 -#, fuzzy -msgid "Noise Fill" -msgstr "Заливка шумом" +#: ../src/extension/internal/bitmap/blur.cpp:38 +#: ../src/extension/internal/filter/blurs.h:54 +#: ../src/extension/internal/filter/paint.h:710 +#: ../src/extension/internal/filter/transparency.h:343 +msgid "Blur" +msgstr "Размывание" -#: ../src/extension/internal/filter/overlays.h:59 -#: ../src/extension/internal/filter/paint.h:690 -#: ../src/extension/internal/filter/shadows.h:60 ../src/ui/dialog/find.cpp:87 -#: ../src/ui/dialog/tracedialog.cpp:747 -#: ../share/extensions/color_HSL_adjust.inx.h:2 -#: ../share/extensions/color_custom.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:2 -#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2 -#: ../share/extensions/dxf_outlines.inx.h:2 -#: ../share/extensions/gcodetools_area.inx.h:29 -#: ../share/extensions/gcodetools_engraving.inx.h:7 -#: ../share/extensions/gcodetools_graffiti.inx.h:21 -#: ../share/extensions/gcodetools_lathe.inx.h:22 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:11 -#: ../share/extensions/generate_voronoi.inx.h:2 -#: ../share/extensions/gimp_xcf.inx.h:2 -#: ../share/extensions/interp_att_g.inx.h:2 -#: ../share/extensions/jessyInk_uninstall.inx.h:2 -#: ../share/extensions/lorem_ipsum.inx.h:2 -#: ../share/extensions/pathalongpath.inx.h:2 -#: ../share/extensions/pathscatter.inx.h:2 -#: ../share/extensions/radiusrand.inx.h:2 ../share/extensions/scour.inx.h:2 -#: ../share/extensions/split.inx.h:2 ../share/extensions/voronoi2svg.inx.h:2 -#: ../share/extensions/web-set-att.inx.h:2 -#: ../share/extensions/web-transmit-att.inx.h:2 -#: ../share/extensions/webslicer_create_group.inx.h:2 -#: ../share/extensions/webslicer_export.inx.h:2 -msgid "Options" -msgstr "Параметры" +#: ../src/extension/internal/bitmap/blur.cpp:40 +#: ../src/extension/internal/bitmap/charcoal.cpp:40 +#: ../src/extension/internal/bitmap/edge.cpp:39 +#: ../src/extension/internal/bitmap/emboss.cpp:40 +#: ../src/extension/internal/bitmap/medianFilter.cpp:39 +#: ../src/extension/internal/bitmap/oilPaint.cpp:39 +#: ../src/extension/internal/bitmap/sharpen.cpp:40 +#: ../src/extension/internal/bitmap/unsharpmask.cpp:43 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +msgid "Radius:" +msgstr "Радиус:" -#: ../src/extension/internal/filter/overlays.h:64 -#, fuzzy -msgid "Horizontal frequency:" -msgstr "Сдвиг по горизонтали, px" +#: ../src/extension/internal/bitmap/blur.cpp:41 +#: ../src/extension/internal/bitmap/charcoal.cpp:41 +#: ../src/extension/internal/bitmap/emboss.cpp:41 +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:41 +#: ../src/extension/internal/bitmap/sharpen.cpp:41 +#: ../src/extension/internal/bitmap/unsharpmask.cpp:44 +msgid "Sigma:" +msgstr "Сигма:" -#: ../src/extension/internal/filter/overlays.h:65 -#, fuzzy -msgid "Vertical frequency:" -msgstr "Сдвиг по вертикали, px" +#: ../src/extension/internal/bitmap/blur.cpp:47 +msgid "Blur selected bitmap(s)" +msgstr "Размыть выделенные растровые объекты" -#: ../src/extension/internal/filter/overlays.h:66 -#: ../src/extension/internal/filter/textures.h:69 -#, fuzzy -msgid "Complexity:" -msgstr "Макс. сложность" +#: ../src/extension/internal/bitmap/channel.cpp:48 +msgid "Channel" +msgstr "Извлечение канала" -#: ../src/extension/internal/filter/overlays.h:67 -#: ../src/extension/internal/filter/textures.h:70 -#, fuzzy -msgid "Variation:" -msgstr "Насыщенность" +#: ../src/extension/internal/bitmap/channel.cpp:50 +msgid "Layer:" +msgstr "Слой:" -#: ../src/extension/internal/filter/overlays.h:68 -msgid "Dilatation:" -msgstr "Дилатация:" +#: ../src/extension/internal/bitmap/channel.cpp:51 +#: ../src/extension/internal/bitmap/levelChannel.cpp:55 +msgid "Red Channel" +msgstr "Красный канал (R)" -#: ../src/extension/internal/filter/overlays.h:69 -msgid "Erosion:" -msgstr "Эрозия:" +#: ../src/extension/internal/bitmap/channel.cpp:52 +#: ../src/extension/internal/bitmap/levelChannel.cpp:56 +msgid "Green Channel" +msgstr "Зелёный канал (G)" -#: ../src/extension/internal/filter/overlays.h:72 -#, fuzzy -msgid "Noise color" -msgstr "Цвет года" +#: ../src/extension/internal/bitmap/channel.cpp:53 +#: ../src/extension/internal/bitmap/levelChannel.cpp:57 +msgid "Blue Channel" +msgstr "Синий канал (B)" -#: ../src/extension/internal/filter/overlays.h:80 -msgid "Overlays" -msgstr "Перекрытия" +#: ../src/extension/internal/bitmap/channel.cpp:54 +#: ../src/extension/internal/bitmap/levelChannel.cpp:58 +msgid "Cyan Channel" +msgstr "Голубой канал (C)" -#: ../src/extension/internal/filter/overlays.h:83 -#, fuzzy -msgid "Basic noise fill and transparency texture" -msgstr "Простая текстура полупрозрачного шума" +#: ../src/extension/internal/bitmap/channel.cpp:55 +#: ../src/extension/internal/bitmap/levelChannel.cpp:59 +msgid "Magenta Channel" +msgstr "Пурпурный канал (M)" -#: ../src/extension/internal/filter/paint.h:71 -msgid "Chromolitho" -msgstr "" +#: ../src/extension/internal/bitmap/channel.cpp:56 +#: ../src/extension/internal/bitmap/levelChannel.cpp:60 +msgid "Yellow Channel" +msgstr "Желтый канал (Y)" -#: ../src/extension/internal/filter/paint.h:75 -#: ../share/extensions/jessyInk_keyBindings.inx.h:16 -msgid "Drawing mode" -msgstr "Режим рисования" +#: ../src/extension/internal/bitmap/channel.cpp:57 +#: ../src/extension/internal/bitmap/levelChannel.cpp:61 +msgid "Black Channel" +msgstr "Чёрный канал (K)" -#: ../src/extension/internal/filter/paint.h:76 -#, fuzzy -msgid "Drawing blend:" -msgstr "Отмена рисования" +#: ../src/extension/internal/bitmap/channel.cpp:58 +#: ../src/extension/internal/bitmap/levelChannel.cpp:62 +msgid "Opacity Channel" +msgstr "Канал непрозрачности" -#: ../src/extension/internal/filter/paint.h:84 -#, fuzzy -msgid "Dented" -msgstr "центру" +#: ../src/extension/internal/bitmap/channel.cpp:59 +#: ../src/extension/internal/bitmap/levelChannel.cpp:63 +msgid "Matte Channel" +msgstr "Матте-канал" -#: ../src/extension/internal/filter/paint.h:88 -#: ../src/extension/internal/filter/paint.h:699 +#: ../src/extension/internal/bitmap/channel.cpp:66 #, fuzzy -msgid "Noise reduction" -msgstr "Понижение шума:" +msgid "Extract specific channel from image" +msgstr "Извлечь указанный канал из изображения" -#: ../src/extension/internal/filter/paint.h:91 -#, fuzzy -msgid "Grain" -msgstr "Режим рисования" +#: ../src/extension/internal/bitmap/charcoal.cpp:38 +msgid "Charcoal" +msgstr "Рисунок углём" -#: ../src/extension/internal/filter/paint.h:92 +#: ../src/extension/internal/bitmap/charcoal.cpp:47 #, fuzzy -msgid "Grain mode" -msgstr "Режим рисования" +msgid "Apply charcoal stylization to selected bitmap(s)" +msgstr "Применить эффект рисования углем к выбранному растровому изображению" -#: ../src/extension/internal/filter/paint.h:97 -#: ../src/extension/internal/filter/transparency.h:207 -#: ../src/extension/internal/filter/transparency.h:281 -#, fuzzy -msgid "Expansion" -msgstr "Расширение \"" +#: ../src/extension/internal/bitmap/colorize.cpp:50 +#: ../src/extension/internal/filter/color.h:317 +msgid "Colorize" +msgstr "Тонирование" -#: ../src/extension/internal/filter/paint.h:100 +#: ../src/extension/internal/bitmap/colorize.cpp:58 #, fuzzy -msgid "Grain blend:" -msgstr "Градиентная заливка" - -#: ../src/extension/internal/filter/paint.h:113 -#: ../src/extension/internal/filter/paint.h:244 -#: ../src/extension/internal/filter/paint.h:363 -#: ../src/extension/internal/filter/paint.h:507 -#: ../src/extension/internal/filter/paint.h:602 -#: ../src/extension/internal/filter/paint.h:725 -#: ../src/extension/internal/filter/paint.h:877 -#: ../src/extension/internal/filter/paint.h:981 -msgid "Image Paint and Draw" +msgid "Colorize selected bitmap(s) with specified color, using given opacity" msgstr "" +"Тонировать выделенные растровые изображения указанным цветом, с указанным " +"уровнем непрозрачности" -#: ../src/extension/internal/filter/paint.h:116 -msgid "Chromo effect with customizable edge drawing and graininess" -msgstr "" +#: ../src/extension/internal/bitmap/contrast.cpp:40 +#: ../src/extension/internal/filter/color.h:1114 +msgid "Contrast" +msgstr "Контраст" -#: ../src/extension/internal/filter/paint.h:232 +#: ../src/extension/internal/bitmap/contrast.cpp:42 #, fuzzy -msgid "Cross Engraving" -msgstr "Альфа-гравировка №1" +msgid "Adjust:" +msgstr "Значение:" -#: ../src/extension/internal/filter/paint.h:234 -#: ../src/extension/internal/filter/paint.h:337 -#, fuzzy -msgid "Clean-up" -msgstr "Концы:" +#: ../src/extension/internal/bitmap/contrast.cpp:48 +msgid "Increase or decrease contrast in bitmap(s)" +msgstr "Повысить или понизить контраст растрового изображения" -#: ../src/extension/internal/filter/paint.h:238 -#: ../share/extensions/measure.inx.h:11 -msgid "Length" -msgstr "Длина" +#: ../src/extension/internal/bitmap/crop.cpp:66 +#: ../src/extension/internal/filter/bumps.h:86 +#: ../src/extension/internal/filter/bumps.h:315 +msgid "Crop" +msgstr "" -#: ../src/extension/internal/filter/paint.h:247 -msgid "Convert image to an engraving made of vertical and horizontal lines" +#: ../src/extension/internal/bitmap/crop.cpp:68 +msgid "Top (px):" msgstr "" -#: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:1004 -#: ../src/widgets/desktop-widget.cpp:1996 -msgid "Drawing" -msgstr "Рисунок" +#: ../src/extension/internal/bitmap/crop.cpp:69 +#, fuzzy +msgid "Bottom (px):" +msgstr "Нижнее:" -#: ../src/extension/internal/filter/paint.h:335 -#: ../src/extension/internal/filter/paint.h:496 -#: ../src/extension/internal/filter/paint.h:590 -#: ../src/extension/internal/filter/paint.h:976 ../src/splivarot.cpp:2212 -msgid "Simplify" -msgstr "Упрощение контура" +#: ../src/extension/internal/bitmap/crop.cpp:70 +#, fuzzy +msgid "Left (px):" +msgstr "Смещение текстовой метки (px):" -#: ../src/extension/internal/filter/paint.h:338 -#: ../src/extension/internal/filter/paint.h:709 +#: ../src/extension/internal/bitmap/crop.cpp:71 #, fuzzy -msgid "Erase" -msgstr "Стирание:" +msgid "Right (px):" +msgstr "Правое:" -#: ../src/extension/internal/filter/paint.h:339 -msgid "Translucent" -msgstr "Ослепительно яркая" +#: ../src/extension/internal/bitmap/crop.cpp:77 +#, fuzzy +msgid "Crop selected bitmap(s)" +msgstr "Размыть выделенные растровые объекты" -#: ../src/extension/internal/filter/paint.h:344 -msgid "Melt" -msgstr "Таяние" +#: ../src/extension/internal/bitmap/cycleColormap.cpp:37 +msgid "Cycle Colormap" +msgstr "Вращение цветовой карты" -#: ../src/extension/internal/filter/paint.h:350 -#: ../src/extension/internal/filter/paint.h:712 -msgid "Fill color" -msgstr "Цвет заливки" +#: ../src/extension/internal/bitmap/cycleColormap.cpp:39 +#: ../src/extension/internal/bitmap/spread.cpp:39 +#: ../src/extension/internal/bitmap/unsharpmask.cpp:45 +#: ../src/widgets/spray-toolbar.cpp:208 +msgid "Amount:" +msgstr "Количество:" -#: ../src/extension/internal/filter/paint.h:351 -#: ../src/extension/internal/filter/paint.h:714 +#: ../src/extension/internal/bitmap/cycleColormap.cpp:45 #, fuzzy -msgid "Image on fill" -msgstr "Файл..." +msgid "Cycle colormap(s) of selected bitmap(s)" +msgstr "Циклически вращать цветовые карты выбранных растровых изображений" -#: ../src/extension/internal/filter/paint.h:354 -msgid "Stroke color" -msgstr "Цвет обводки" +#: ../src/extension/internal/bitmap/despeckle.cpp:36 +msgid "Despeckle" +msgstr "Убрать пятна" -#: ../src/extension/internal/filter/paint.h:355 +#: ../src/extension/internal/bitmap/despeckle.cpp:43 #, fuzzy -msgid "Image on stroke" -msgstr "Текстурная обводка" +msgid "Reduce speckle noise of selected bitmap(s)" +msgstr "Удалить пятнистый шум из выбранных изображений" -#: ../src/extension/internal/filter/paint.h:366 -#, fuzzy -msgid "Convert images to duochrome drawings" -msgstr "Откадрировать холст до рисунка" +#: ../src/extension/internal/bitmap/edge.cpp:37 +msgid "Edge" +msgstr "Выделение краёв" -#: ../src/extension/internal/filter/paint.h:494 -msgid "Electrize" -msgstr "" +#: ../src/extension/internal/bitmap/edge.cpp:45 +#, fuzzy +msgid "Highlight edges of selected bitmap(s)" +msgstr "Высветить края в выбранном изображении" -#: ../src/extension/internal/filter/paint.h:497 -#: ../src/extension/internal/filter/paint.h:852 -msgid "Effect type:" -msgstr "Тип эффекта:" +#: ../src/extension/internal/bitmap/emboss.cpp:38 +msgid "Emboss" +msgstr "Рельеф" -#: ../src/extension/internal/filter/paint.h:501 -#: ../src/extension/internal/filter/paint.h:860 -#: ../src/extension/internal/filter/paint.h:975 +#: ../src/extension/internal/bitmap/emboss.cpp:47 #, fuzzy -msgid "Levels" -msgstr "Уровни:" +msgid "Emboss selected bitmap(s); highlight edges with 3D effect" +msgstr "" +"Применить эффект рельефа (имитация 3D-краев) к выделенным растровым " +"изображениям" -#: ../src/extension/internal/filter/paint.h:510 -#, fuzzy -msgid "Electro solarization effects" -msgstr "Классический фотоэффект соляризации" +#: ../src/extension/internal/bitmap/enhance.cpp:35 +msgid "Enhance" +msgstr "Повысить качество" -#: ../src/extension/internal/filter/paint.h:584 +#: ../src/extension/internal/bitmap/enhance.cpp:42 #, fuzzy -msgid "Neon Draw" -msgstr "Неон" +msgid "Enhance selected bitmap(s); minimize noise" +msgstr "Уменьшить шум в выделенных растровых изображениях" -#: ../src/extension/internal/filter/paint.h:586 -#, fuzzy -msgid "Line type:" -msgstr " тип: " +#: ../src/extension/internal/bitmap/equalize.cpp:35 +msgid "Equalize" +msgstr "Выровнять освещённость" -#: ../src/extension/internal/filter/paint.h:587 +#: ../src/extension/internal/bitmap/equalize.cpp:42 #, fuzzy -msgid "Smoothed" -msgstr "Сгладить" +msgid "Equalize selected bitmap(s); histogram equalization" +msgstr "Выровнять освещенность в выделенных растровых изображениях" -#: ../src/extension/internal/filter/paint.h:588 -#, fuzzy -msgid "Contrasted" -msgstr "Контраст" +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:38 +#: ../src/filter-enums.cpp:28 +msgid "Gaussian Blur" +msgstr "Гауссово размывание" -#: ../src/extension/internal/filter/paint.h:591 +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:40 +#: ../src/extension/internal/bitmap/implode.cpp:39 +#: ../src/extension/internal/bitmap/solarize.cpp:41 #, fuzzy -msgid "Line width" -msgstr "Ширина линии" +msgid "Factor:" +msgstr "Коэффициент" -#: ../src/extension/internal/filter/paint.h:593 -#: ../src/extension/internal/filter/paint.h:861 -#: ../src/ui/widget/filter-effect-chooser.cpp:25 -msgid "Blend mode:" -msgstr "Режим смешивания:" +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:47 +#, fuzzy +msgid "Gaussian blur selected bitmap(s)" +msgstr "Размыть изображение по Гауссу" -#: ../src/extension/internal/filter/paint.h:605 -msgid "Posterize and draw smooth lines around color shapes" -msgstr "" +#: ../src/extension/internal/bitmap/implode.cpp:37 +msgid "Implode" +msgstr "Взрыв внутрь" -#: ../src/extension/internal/filter/paint.h:687 +#: ../src/extension/internal/bitmap/implode.cpp:45 #, fuzzy -msgid "Point Engraving" -msgstr "Альфа-гравировка №1" +msgid "Implode selected bitmap(s)" +msgstr "Взорвать выбранные изображения вовнутрь" -#: ../src/extension/internal/filter/paint.h:700 -#, fuzzy -msgid "Noise blend:" -msgstr "Светящийся пузырь" +#: ../src/extension/internal/bitmap/level.cpp:41 +#: ../src/extension/internal/filter/color.h:742 +#: ../src/extension/internal/filter/image.h:56 +#: ../src/extension/internal/filter/morphology.h:66 +#: ../src/extension/internal/filter/paint.h:345 +msgid "Level" +msgstr "Уровни" -#: ../src/extension/internal/filter/paint.h:708 +#: ../src/extension/internal/bitmap/level.cpp:43 +#: ../src/extension/internal/bitmap/levelChannel.cpp:65 #, fuzzy -msgid "Grain lightness" -msgstr "Яркость" +msgid "Black Point:" +msgstr "Чёрная точка" -#: ../src/extension/internal/filter/paint.h:716 -#, fuzzy -msgid "Points color" -msgstr "Цвет месяца:" +#: ../src/extension/internal/bitmap/level.cpp:44 +#: ../src/extension/internal/bitmap/levelChannel.cpp:66 +msgid "White Point:" +msgstr "Белая точка:" -#: ../src/extension/internal/filter/paint.h:718 +#: ../src/extension/internal/bitmap/level.cpp:45 +#: ../src/extension/internal/bitmap/levelChannel.cpp:67 #, fuzzy -msgid "Image on points" -msgstr "Файл..." +msgid "Gamma Correction:" +msgstr "Гамма-коррекция" -#: ../src/extension/internal/filter/paint.h:728 +#: ../src/extension/internal/bitmap/level.cpp:51 #, fuzzy -msgid "Convert image to a transparent point engraving" -msgstr "Преобразовать в раскрашиваемый прозрачный позитив или негатив" +msgid "" +"Level selected bitmap(s) by scaling values falling between the given ranges " +"to the full color range" +msgstr "" +"Изменить цветовые уровни выделенных растровых изображений по черной и белой " +"точке" -#: ../src/extension/internal/filter/paint.h:850 -#, fuzzy -msgid "Poster Paint" -msgstr "Константа диффузии:" +#: ../src/extension/internal/bitmap/levelChannel.cpp:52 +msgid "Level (with Channel)" +msgstr "Уровень (с каналом)" -#: ../src/extension/internal/filter/paint.h:856 +#: ../src/extension/internal/bitmap/levelChannel.cpp:54 +#: ../src/extension/internal/filter/color.h:636 #, fuzzy -msgid "Transfer type:" -msgstr "Логические операции" +msgid "Channel:" +msgstr "Каналы:" -#: ../src/extension/internal/filter/paint.h:857 +#: ../src/extension/internal/bitmap/levelChannel.cpp:73 #, fuzzy -msgid "Poster" -msgstr "Штукатурка" +msgid "" +"Level the specified channel of selected bitmap(s) by scaling values falling " +"between the given ranges to the full color range" +msgstr "" +"Выровнять указанный канал выбранных изображений масштабированием до полного " +"диапазона значений внутри указанного диапазона." -#: ../src/extension/internal/filter/paint.h:858 -#, fuzzy -msgid "Painting" -msgstr "Масляная краска" +#: ../src/extension/internal/bitmap/medianFilter.cpp:37 +msgid "Median" +msgstr "Среднее значение" -#: ../src/extension/internal/filter/paint.h:868 +#: ../src/extension/internal/bitmap/medianFilter.cpp:45 #, fuzzy -msgid "Simplify (primary)" -msgstr "Упрощение контуров" +msgid "" +"Replace each pixel component with the median color in a circular neighborhood" +msgstr "" +"Заменить значение каждого пиксела на усредненное значение пикселов вокруг" -#: ../src/extension/internal/filter/paint.h:869 -#, fuzzy -msgid "Simplify (secondary)" -msgstr "Упростить цвета" +#: ../src/extension/internal/bitmap/modulate.cpp:40 +msgid "HSB Adjust" +msgstr "Коррекция в HSB" -#: ../src/extension/internal/filter/paint.h:870 +#: ../src/extension/internal/bitmap/modulate.cpp:42 #, fuzzy -msgid "Pre-saturation" -msgstr "Насыщенность" +msgid "Hue:" +msgstr "Тон" -#: ../src/extension/internal/filter/paint.h:871 +#: ../src/extension/internal/bitmap/modulate.cpp:43 #, fuzzy -msgid "Post-saturation" +msgid "Saturation:" msgstr "Насыщенность" -#: ../src/extension/internal/filter/paint.h:872 -#, fuzzy -msgid "Simulate antialiasing" -msgstr "Имитация живописи маслом" - -#: ../src/extension/internal/filter/paint.h:880 +#: ../src/extension/internal/bitmap/modulate.cpp:44 #, fuzzy -msgid "Poster and painting effects" -msgstr "Вставить динамический контурный эффект" - -#: ../src/extension/internal/filter/paint.h:973 -msgid "Posterize Basic" -msgstr "" +msgid "Brightness:" +msgstr "Яркость" -#: ../src/extension/internal/filter/paint.h:984 -msgid "Simple posterizing effect" +#: ../src/extension/internal/bitmap/modulate.cpp:50 +msgid "" +"Adjust the amount of hue, saturation, and brightness in selected bitmap(s)" msgstr "" +"Изменить количество тона, насыщенности и яркости в выбранных изображениях." -#: ../src/extension/internal/filter/protrusions.h:48 -msgid "Snow crest" -msgstr "Сугроб" +#: ../src/extension/internal/bitmap/negate.cpp:36 +msgid "Negate" +msgstr "Негатив" -#: ../src/extension/internal/filter/protrusions.h:50 +#: ../src/extension/internal/bitmap/negate.cpp:43 #, fuzzy -msgid "Drift Size" -msgstr "Размер сугроба" - -#: ../src/extension/internal/filter/protrusions.h:58 -msgid "Snow has fallen on object" -msgstr "Объект присыпало снегом" +msgid "Negate (take inverse) selected bitmap(s)" +msgstr "Применить к выбранным изображениям эффект негатива." -#: ../src/extension/internal/filter/shadows.h:57 -msgid "Drop Shadow" -msgstr "Отбрасываемая тень" +#: ../src/extension/internal/bitmap/normalize.cpp:36 +msgid "Normalize" +msgstr "Выровнять цветовые компоненты" -#: ../src/extension/internal/filter/shadows.h:61 +#: ../src/extension/internal/bitmap/normalize.cpp:43 #, fuzzy -msgid "Blur radius (px)" -msgstr "Радиус размывания (px):" +msgid "" +"Normalize selected bitmap(s), expanding color range to the full possible " +"range of color" +msgstr "" +"Выровнять соотношение цветовых компонентов выделенных растровых изображений" -#: ../src/extension/internal/filter/shadows.h:62 -#, fuzzy -msgid "Horizontal offset (px)" -msgstr "Сдвиг по горизонтали, px" +#: ../src/extension/internal/bitmap/oilPaint.cpp:37 +msgid "Oil Paint" +msgstr "Масляная краска" -#: ../src/extension/internal/filter/shadows.h:63 +#: ../src/extension/internal/bitmap/oilPaint.cpp:45 #, fuzzy -msgid "Vertical offset (px)" -msgstr "Сдвиг по вертикали, px" +msgid "Stylize selected bitmap(s) so that they appear to be painted with oils" +msgstr "" +"Применить к выбранным изображениям эффект стилизации под живопись маслом." -#: ../src/extension/internal/filter/shadows.h:64 -#, fuzzy -msgid "Shadow type:" -msgstr "Тени:" +#: ../src/extension/internal/bitmap/opacity.cpp:38 +#: ../src/extension/internal/filter/blurs.h:333 +#: ../src/extension/internal/filter/transparency.h:279 +#: ../src/ui/dialog/clonetiler.cpp:840 ../src/ui/dialog/clonetiler.cpp:993 +#: ../src/widgets/tweak-toolbar.cpp:334 +#: ../share/extensions/interp_att_g.inx.h:16 +msgid "Opacity" +msgstr "Непрозрачность" -#: ../src/extension/internal/filter/shadows.h:67 -msgid "Outer cutout" -msgstr "" +#: ../src/extension/internal/bitmap/opacity.cpp:40 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2884 +#: ../src/widgets/dropper-toolbar.cpp:83 +msgid "Opacity:" +msgstr "Непрозрачность:" -#: ../src/extension/internal/filter/shadows.h:68 +#: ../src/extension/internal/bitmap/opacity.cpp:46 #, fuzzy -msgid "Inner cutout" -msgstr "Внутренний абрис" +msgid "Modify opacity channel(s) of selected bitmap(s)" +msgstr "Изменить канал непрозрачности в выбранных изображениях." -#: ../src/extension/internal/filter/shadows.h:69 -#, fuzzy -msgid "Shadow only" -msgstr "Альфа-канал" +#: ../src/extension/internal/bitmap/raise.cpp:40 +msgid "Raise" +msgstr "Приподнятие" -#: ../src/extension/internal/filter/shadows.h:72 -msgid "Blur color" -msgstr "" +#: ../src/extension/internal/bitmap/raise.cpp:44 +msgid "Raised" +msgstr "Приподнять" -#: ../src/extension/internal/filter/shadows.h:74 +#: ../src/extension/internal/bitmap/raise.cpp:50 #, fuzzy -msgid "Use object's color" -msgstr "Использовать именованные цвета" +msgid "" +"Alter lightness the edges of selected bitmap(s) to create a raised appearance" +msgstr "" +"Изменить яркость краев в выбранных изображениях для создания эффекта " +"приподнятости." -#: ../src/extension/internal/filter/shadows.h:81 -msgid "Shadows and Glows" -msgstr "Свет и тень" +#: ../src/extension/internal/bitmap/reduceNoise.cpp:40 +msgid "Reduce Noise" +msgstr "Снижение шума" -#: ../src/extension/internal/filter/shadows.h:84 +#: ../src/extension/internal/bitmap/reduceNoise.cpp:42 +#: ../share/extensions/jessyInk_effects.inx.h:3 +#: ../share/extensions/jessyInk_view.inx.h:3 +#: ../share/extensions/lindenmayer.inx.h:5 +msgid "Order:" +msgstr "Порядок:" + +#: ../src/extension/internal/bitmap/reduceNoise.cpp:48 #, fuzzy -msgid "Colorizable Drop shadow" -msgstr "Создать раскрашиваемую тень внутри" +msgid "" +"Reduce noise in selected bitmap(s) using a noise peak elimination filter" +msgstr "" +"Удалить шум из выбранных изображений применением фильтра удаления пика шума." -#: ../src/extension/internal/filter/textures.h:62 -msgid "Ink Blot" +#: ../src/extension/internal/bitmap/sample.cpp:39 +msgid "Resample" +msgstr "Размер" + +#: ../src/extension/internal/bitmap/sample.cpp:48 +msgid "" +"Alter the resolution of selected image by resizing it to the given pixel size" msgstr "" +"Изменить разрешение выделенного изображения, сменив его размер на указанный" -#: ../src/extension/internal/filter/textures.h:68 -msgid "Frequency:" -msgstr "Частота:" +#: ../src/extension/internal/bitmap/shade.cpp:40 +msgid "Shade" +msgstr "Тень" -#: ../src/extension/internal/filter/textures.h:71 +#: ../src/extension/internal/bitmap/shade.cpp:42 #, fuzzy -msgid "Horizontal inlay:" -msgstr "Горизонтальная точка:" +msgid "Azimuth:" +msgstr "Азимут" -#: ../src/extension/internal/filter/textures.h:72 +#: ../src/extension/internal/bitmap/shade.cpp:43 #, fuzzy -msgid "Vertical inlay:" -msgstr "Вертикальная точка:" +msgid "Elevation:" +msgstr "Высота" -#: ../src/extension/internal/filter/textures.h:73 -#, fuzzy -msgid "Displacement:" -msgstr "Смещение по X:" +#: ../src/extension/internal/bitmap/shade.cpp:44 +msgid "Colored Shading" +msgstr "В цвете" -#: ../src/extension/internal/filter/textures.h:79 +#: ../src/extension/internal/bitmap/shade.cpp:50 #, fuzzy -msgid "Overlapping" -msgstr "Плеск волн" +msgid "Shade selected bitmap(s) simulating distant light source" +msgstr "Оттенить выбранные изображения, имитируя удаленный источник света." -#: ../src/extension/internal/filter/textures.h:80 +#: ../src/extension/internal/bitmap/sharpen.cpp:47 #, fuzzy -msgid "External" -msgstr "Изменить извне..." +msgid "Sharpen selected bitmap(s)" +msgstr "Повысить резкость выбранных изображений." -#: ../src/extension/internal/filter/textures.h:81 -#: ../share/extensions/markers_strokepaint.inx.h:8 -msgid "Custom" -msgstr "Другой" +#: ../src/extension/internal/bitmap/solarize.cpp:39 +#: ../src/extension/internal/filter/color.h:1494 +#: ../src/extension/internal/filter/color.h:1498 +msgid "Solarize" +msgstr "Соляризация" -#: ../src/extension/internal/filter/textures.h:83 +#: ../src/extension/internal/bitmap/solarize.cpp:47 #, fuzzy -msgid "Custom stroke options" -msgstr "Заказные точки и параметры" +msgid "Solarize selected bitmap(s), like overexposing photographic film" +msgstr "" +"Применить к выделенным растровым изображениям эффект переэкспозиции " +"фотопленки" -#: ../src/extension/internal/filter/textures.h:84 -#, fuzzy -msgid "k1:" -msgstr "K1:" +#: ../src/extension/internal/bitmap/spread.cpp:37 +msgid "Dither" +msgstr "Сглаживание" -#: ../src/extension/internal/filter/textures.h:85 -#, fuzzy -msgid "k2:" -msgstr "K2:" +#: ../src/extension/internal/bitmap/spread.cpp:45 +msgid "" +"Randomly scatter pixels in selected bitmap(s), within the given radius of " +"the original position" +msgstr "" +"Случайным образом распределить пикселы выбранных изображений в заданном " +"радиусе от исходного положения" -#: ../src/extension/internal/filter/textures.h:86 +#: ../src/extension/internal/bitmap/swirl.cpp:39 #, fuzzy -msgid "k3:" -msgstr "K3:" - -#: ../src/extension/internal/filter/textures.h:94 -msgid "Inkblot on tissue or rough paper" -msgstr "Чернильное пятно на салфетке или грубой бумаге" - -#: ../src/extension/internal/filter/transparency.h:53 -#: ../src/filter-enums.cpp:20 -msgid "Blend" -msgstr "Смешивание" +msgid "Degrees:" +msgstr "Градусов:" -#: ../src/extension/internal/filter/transparency.h:55 ../src/rdf.cpp:261 +#: ../src/extension/internal/bitmap/swirl.cpp:45 #, fuzzy -msgid "Source:" -msgstr "Источник" +msgid "Swirl selected bitmap(s) around center point" +msgstr "Применить эффект вихря вокруг центральной точки выбранных изображений." -#: ../src/extension/internal/filter/transparency.h:56 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1551 -msgid "Background" -msgstr "Фон" +#. TRANSLATORS: see http://docs.gimp.org/en/gimp-tool-threshold.html +#: ../src/extension/internal/bitmap/threshold.cpp:38 +msgid "Threshold" +msgstr "Постеризация" -#: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2839 -#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 -#: ../src/widgets/pencil-toolbar.cpp:127 ../src/widgets/spray-toolbar.cpp:186 -#: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 -#: ../share/extensions/triangle.inx.h:8 -msgid "Mode:" -msgstr "Режим:" +#: ../src/extension/internal/bitmap/threshold.cpp:40 +#: ../src/extension/internal/bitmap/unsharpmask.cpp:46 +#: ../src/widgets/paintbucket-toolbar.cpp:146 +msgid "Threshold:" +msgstr "Порог:" -#: ../src/extension/internal/filter/transparency.h:70 -#: ../src/extension/internal/filter/transparency.h:141 -#: ../src/extension/internal/filter/transparency.h:215 -#: ../src/extension/internal/filter/transparency.h:288 -#: ../src/extension/internal/filter/transparency.h:350 -msgid "Fill and Transparency" -msgstr "Заливка и прозрачность" +#: ../src/extension/internal/bitmap/threshold.cpp:46 +#, fuzzy +msgid "Threshold selected bitmap(s)" +msgstr "Применить эффект постеризации к выделенным растровым изображениям" -#: ../src/extension/internal/filter/transparency.h:73 -msgid "Blend objects with background images or with themselves" -msgstr "" +#: ../src/extension/internal/bitmap/unsharpmask.cpp:41 +msgid "Unsharp Mask" +msgstr "Нерезкая маска" -#: ../src/extension/internal/filter/transparency.h:130 +#: ../src/extension/internal/bitmap/unsharpmask.cpp:52 #, fuzzy -msgid "Channel Transparency" -msgstr "Прозрачность диалога:" +msgid "Sharpen selected bitmap(s) using unsharp mask algorithms" +msgstr "Повысить резкость выбранных изображений при помощи нерезкой маски." -#: ../src/extension/internal/filter/transparency.h:144 -#, fuzzy -msgid "Replace RGB with transparency" -msgstr "Грубая прозрачность" +#: ../src/extension/internal/bitmap/wave.cpp:38 +msgid "Wave" +msgstr "Волна" -#: ../src/extension/internal/filter/transparency.h:205 +#: ../src/extension/internal/bitmap/wave.cpp:40 #, fuzzy -msgid "Light Eraser" -msgstr "Ластик для светлых областей" +msgid "Amplitude:" +msgstr "Амплитуда" -#: ../src/extension/internal/filter/transparency.h:209 -#: ../src/extension/internal/filter/transparency.h:283 +#: ../src/extension/internal/bitmap/wave.cpp:41 #, fuzzy -msgid "Global opacity" -msgstr "Общий изгиб" - -#: ../src/extension/internal/filter/transparency.h:218 -msgid "Make the lightest parts of the object progressively transparent" -msgstr "Сделать самые светлые области объекта нарастающе прозрачными" +msgid "Wavelength:" +msgstr "Длина волны" -#: ../src/extension/internal/filter/transparency.h:291 -msgid "Set opacity and strength of opacity boundaries" -msgstr "" +#: ../src/extension/internal/bitmap/wave.cpp:47 +#, fuzzy +msgid "Alter selected bitmap(s) along sine wave" +msgstr "Изменить выбранные изображения по синусоиде" -#: ../src/extension/internal/filter/transparency.h:341 -msgid "Silhouette" -msgstr "" +#: ../src/extension/internal/bluredge.cpp:136 +msgid "Inset/Outset Halo" +msgstr "Втяжка/растяжка ореола" -#: ../src/extension/internal/filter/transparency.h:344 -msgid "Cutout" -msgstr "Абрис" +#: ../src/extension/internal/bluredge.cpp:138 +msgid "Width in px of the halo" +msgstr "Ширина ореола в пикселах" -#: ../src/extension/internal/filter/transparency.h:353 +#: ../src/extension/internal/bluredge.cpp:139 #, fuzzy -msgid "Repaint anything visible monochrome" -msgstr "Закрасить всё одним цветом" +msgid "Number of steps:" +msgstr "Количество шагов" -#: ../src/extension/internal/gdkpixbuf-input.cpp:184 -#, fuzzy, c-format -msgid "%s bitmap image import" -msgstr "Импорт растра" +#: ../src/extension/internal/bluredge.cpp:139 +msgid "Number of inset/outset copies of the object to make" +msgstr "Количество копий втяжки/растяжки объекта" -#: ../src/extension/internal/gdkpixbuf-input.cpp:191 -msgid "Image Import Type:" -msgstr "" +#: ../src/extension/internal/bluredge.cpp:143 +#: ../share/extensions/extrude.inx.h:5 +#: ../share/extensions/generate_voronoi.inx.h:9 +#: ../share/extensions/interp.inx.h:7 ../share/extensions/motion.inx.h:4 +#: ../share/extensions/pathalongpath.inx.h:18 +#: ../share/extensions/pathscatter.inx.h:20 +#: ../share/extensions/voronoi2svg.inx.h:13 +msgid "Generate from Path" +msgstr "Создание из контура" -#: ../src/extension/internal/gdkpixbuf-input.cpp:191 -msgid "" -"Embed results in stand-alone, larger SVG files. Link references a file " -"outside this SVG document and all files must be moved together." -msgstr "" -"Внедрение создаёт самостоятельные большие файлы SVG. Связывание означает, " -"что файл будет вне SVG, их придётся перемещать вместе." +#: ../src/extension/internal/cairo-ps-out.cpp:327 +#: ../share/extensions/ps_input.inx.h:3 +msgid "PostScript" +msgstr "PostScript" -#: ../src/extension/internal/gdkpixbuf-input.cpp:192 -#: ../src/ui/dialog/inkscape-preferences.cpp:1447 +#: ../src/extension/internal/cairo-ps-out.cpp:329 +#: ../src/extension/internal/cairo-ps-out.cpp:368 #, fuzzy -msgid "Embed" -msgstr "внедрить" +msgid "Restrict to PS level:" +msgstr "Версия PS:" + +#: ../src/extension/internal/cairo-ps-out.cpp:330 +#: ../src/extension/internal/cairo-ps-out.cpp:369 +msgid "PostScript level 3" +msgstr "PostScript Level 3" -#: ../src/extension/internal/gdkpixbuf-input.cpp:193 ../src/sp-anchor.cpp:119 -#: ../src/ui/dialog/inkscape-preferences.cpp:1447 -#, fuzzy -msgid "Link" -msgstr "Связь:" +#: ../src/extension/internal/cairo-ps-out.cpp:331 +#: ../src/extension/internal/cairo-ps-out.cpp:370 +msgid "PostScript level 2" +msgstr "PostScript Level 2" -#: ../src/extension/internal/gdkpixbuf-input.cpp:196 -#, fuzzy -msgid "Image DPI:" -msgstr "Изображение" +#: ../src/extension/internal/cairo-ps-out.cpp:333 +#: ../src/extension/internal/cairo-ps-out.cpp:372 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250 +#: ../src/extension/internal/emf-inout.cpp:3569 +#: ../src/extension/internal/wmf-inout.cpp:3143 +msgid "Convert texts to paths" +msgstr "Текст в кривые Безье" -#: ../src/extension/internal/gdkpixbuf-input.cpp:196 -msgid "" -"Take information from file or use default bitmap import resolution as " -"defined in the preferences." -msgstr "" +#: ../src/extension/internal/cairo-ps-out.cpp:334 +msgid "PS+LaTeX: Omit text in PS, and create LaTeX file" +msgstr "PS+LaTeX: пропустить текст в PS, создать файл LaTeX" -#: ../src/extension/internal/gdkpixbuf-input.cpp:197 +#: ../src/extension/internal/cairo-ps-out.cpp:335 +#: ../src/extension/internal/cairo-ps-out.cpp:374 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:252 +msgid "Rasterize filter effects" +msgstr "Растеризовать фильтры эффектов" + +#: ../src/extension/internal/cairo-ps-out.cpp:336 +#: ../src/extension/internal/cairo-ps-out.cpp:375 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:253 #, fuzzy -msgid "From file" -msgstr "Загрузить из файла" +msgid "Resolution for rasterization (dpi):" +msgstr "Разрешение растровой копии (dpi):" -#: ../src/extension/internal/gdkpixbuf-input.cpp:198 +#: ../src/extension/internal/cairo-ps-out.cpp:337 +#: ../src/extension/internal/cairo-ps-out.cpp:376 #, fuzzy -msgid "Default import resolution" -msgstr "Разрешение для экспорта:" +msgid "Output page size" +msgstr "Смена формата страницы" -#: ../src/extension/internal/gdkpixbuf-input.cpp:201 +#: ../src/extension/internal/cairo-ps-out.cpp:338 +#: ../src/extension/internal/cairo-ps-out.cpp:377 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:255 #, fuzzy -msgid "Image Rendering Mode:" -msgstr "Тип печати" +msgid "Use document's page size" +msgstr "Смена формата страницы" -#: ../src/extension/internal/gdkpixbuf-input.cpp:201 -msgid "" -"When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " -"not work in all browsers.)" +#: ../src/extension/internal/cairo-ps-out.cpp:339 +#: ../src/extension/internal/cairo-ps-out.cpp:378 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:256 +msgid "Use exported object's size" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:202 -#: ../src/ui/dialog/inkscape-preferences.cpp:1454 +#: ../src/extension/internal/cairo-ps-out.cpp:341 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:258 #, fuzzy -msgid "None (auto)" -msgstr "Нет (по умолчанию)" +msgid "Bleed/margin (mm):" +msgstr "Поля выпуска под обрез" -#: ../src/extension/internal/gdkpixbuf-input.cpp:203 -#: ../src/ui/dialog/inkscape-preferences.cpp:1454 -msgid "Smooth (optimizeQuality)" -msgstr "" +#: ../src/extension/internal/cairo-ps-out.cpp:342 +#: ../src/extension/internal/cairo-ps-out.cpp:381 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:259 +#, fuzzy +msgid "Limit export to the object with ID:" +msgstr "Только объект с ID:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:204 -#: ../src/ui/dialog/inkscape-preferences.cpp:1454 -msgid "Blocky (optimizeSpeed)" -msgstr "" +#: ../src/extension/internal/cairo-ps-out.cpp:346 +#: ../share/extensions/ps_input.inx.h:2 +msgid "PostScript (*.ps)" +msgstr "Файлы Postscript (*.ps)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:207 -msgid "Hide the dialog next time and always apply the same actions." -msgstr "" +#: ../src/extension/internal/cairo-ps-out.cpp:347 +msgid "PostScript File" +msgstr "Файл PostScript" -#: ../src/extension/internal/gdkpixbuf-input.cpp:207 -msgid "Don't ask again" -msgstr "" +#: ../src/extension/internal/cairo-ps-out.cpp:366 +#: ../share/extensions/eps_input.inx.h:3 +msgid "Encapsulated PostScript" +msgstr "Encapsulated Postscript" -#: ../src/extension/internal/gimpgrad.cpp:272 -msgid "GIMP Gradients" -msgstr "Градиенты GIMP" +#: ../src/extension/internal/cairo-ps-out.cpp:373 +msgid "EPS+LaTeX: Omit text in EPS, and create LaTeX file" +msgstr "EPS+LaTeX: пропустить текст в EPS, создать файл LaTeX" -#: ../src/extension/internal/gimpgrad.cpp:277 -msgid "GIMP Gradient (*.ggr)" -msgstr "Градиенты GIMP (*.ggr)" +#: ../src/extension/internal/cairo-ps-out.cpp:380 +#, fuzzy +msgid "Bleed/margin (mm)" +msgstr "Поля выпуска под обрез" -#: ../src/extension/internal/gimpgrad.cpp:278 -msgid "Gradients used in GIMP" -msgstr "Градиенты, используемые в GIMP" +#: ../src/extension/internal/cairo-ps-out.cpp:385 +#: ../share/extensions/eps_input.inx.h:2 +msgid "Encapsulated PostScript (*.eps)" +msgstr "Файлы Encapsulated Postscript (*.eps)" -#: ../src/extension/internal/grid.cpp:210 ../src/ui/widget/panel.cpp:117 -msgid "Grid" -msgstr "Сетка" +#: ../src/extension/internal/cairo-ps-out.cpp:386 +msgid "Encapsulated PostScript File" +msgstr "Файл Encapsulated PostScript" -#: ../src/extension/internal/grid.cpp:212 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:244 #, fuzzy -msgid "Line Width:" -msgstr "Ширина линии" +msgid "Restrict to PDF version:" +msgstr "Версия PDF:" -#: ../src/extension/internal/grid.cpp:213 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:246 #, fuzzy -msgid "Horizontal Spacing:" -msgstr "Интервал по горизонтали" +msgid "PDF 1.5" +msgstr "PDF 1.4" -#: ../src/extension/internal/grid.cpp:214 -#, fuzzy -msgid "Vertical Spacing:" -msgstr "Интервал по вертикали" +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:248 +msgid "PDF 1.4" +msgstr "PDF 1.4" -#: ../src/extension/internal/grid.cpp:215 -#, fuzzy -msgid "Horizontal Offset:" -msgstr "Сдвиг по горизонтали" +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251 +msgid "PDF+LaTeX: Omit text in PDF, and create LaTeX file" +msgstr "PDF+LaTeX: пропустить текст в PDF, создать файл LaTeX" -#: ../src/extension/internal/grid.cpp:216 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:254 #, fuzzy -msgid "Vertical Offset:" -msgstr "Сдвиг по вертикали" - -#: ../src/extension/internal/grid.cpp:220 -#: ../src/ui/dialog/inkscape-preferences.cpp:1468 -#: ../share/extensions/draw_from_triangle.inx.h:58 -#: ../share/extensions/eqtexsvg.inx.h:4 -#: ../share/extensions/foldablebox.inx.h:9 -#: ../share/extensions/funcplot.inx.h:38 -#: ../share/extensions/grid_cartesian.inx.h:23 -#: ../share/extensions/grid_isometric.inx.h:11 -#: ../share/extensions/grid_polar.inx.h:22 -#: ../share/extensions/guides_creator.inx.h:25 -#: ../share/extensions/hershey.inx.h:52 -#: ../share/extensions/layout_nup.inx.h:35 -#: ../share/extensions/lindenmayer.inx.h:34 -#: ../share/extensions/param_curves.inx.h:30 -#: ../share/extensions/perfectboundcover.inx.h:19 -#: ../share/extensions/polyhedron_3d.inx.h:56 -#: ../share/extensions/printing_marks.inx.h:20 -#: ../share/extensions/render_alphabetsoup.inx.h:5 -#: ../share/extensions/render_barcode.inx.h:5 -#: ../share/extensions/render_barcode_datamatrix.inx.h:5 -#: ../share/extensions/render_barcode_qrcode.inx.h:18 -#: ../share/extensions/render_gear_rack.inx.h:5 -#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:4 -#: ../share/extensions/spirograph.inx.h:10 -#: ../share/extensions/svgcalendar.inx.h:38 -#: ../share/extensions/triangle.inx.h:14 -#: ../share/extensions/wireframe_sphere.inx.h:8 -msgid "Render" -msgstr "Отрисовка" - -#: ../src/extension/internal/grid.cpp:221 -#: ../src/ui/dialog/document-properties.cpp:155 -#: ../src/ui/dialog/inkscape-preferences.cpp:778 -#: ../src/widgets/toolbox.cpp:1826 -msgid "Grids" -msgstr "Сетки" +msgid "Output page size:" +msgstr "Смена формата страницы" -#: ../src/extension/internal/grid.cpp:224 -msgid "Draw a path which is a grid" -msgstr "Нарисовать контур, являющийся сеткой" +#: ../src/extension/internal/cdr-input.cpp:102 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:87 +#: ../src/extension/internal/vsd-input.cpp:101 +msgid "Select page:" +msgstr "Выберите страницу:" -#: ../src/extension/internal/javafx-out.cpp:966 -msgid "JavaFX Output" -msgstr "Экспорт в JavaFX" +#. Display total number of pages +#: ../src/extension/internal/cdr-input.cpp:114 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:106 +#: ../src/extension/internal/vsd-input.cpp:113 +#, c-format +msgid "out of %i" +msgstr "из %i" -#: ../src/extension/internal/javafx-out.cpp:971 -msgid "JavaFX (*.fx)" -msgstr "Файлы JavaFX (*.fx)" +#: ../src/extension/internal/cdr-input.cpp:145 +#: ../src/extension/internal/vsd-input.cpp:144 +#, fuzzy +msgid "Page Selector" +msgstr "Выделитель" -#: ../src/extension/internal/javafx-out.cpp:972 -msgid "JavaFX Raytracer File" -msgstr "Файл трассировщика лучей JavaFX" +#: ../src/extension/internal/cdr-input.cpp:274 +#, fuzzy +msgid "Corel DRAW Input" +msgstr "Импорт Corel DRAW" -#: ../src/extension/internal/latex-pstricks-out.cpp:95 -msgid "LaTeX Output" -msgstr "Экспорт в LaTeX" +#: ../src/extension/internal/cdr-input.cpp:279 +#, fuzzy +msgid "Corel DRAW 7-X4 files (*.cdr)" +msgstr "Файлы Corel DRAW 7-X4 (*.cdr)" -#: ../src/extension/internal/latex-pstricks-out.cpp:100 -msgid "LaTeX With PSTricks macros (*.tex)" -msgstr "LaTeX с макросами PSTricks (*.tex)" +#: ../src/extension/internal/cdr-input.cpp:280 +#, fuzzy +msgid "Open files saved in Corel DRAW 7-X4" +msgstr "Открыть файлы, сохраненные в Corel DRAW 7-X4" -#: ../src/extension/internal/latex-pstricks-out.cpp:101 -msgid "LaTeX PSTricks File" -msgstr "Файл LaTeX PSTricks" +#: ../src/extension/internal/cdr-input.cpp:287 +#, fuzzy +msgid "Corel DRAW templates input" +msgstr "Импорт шаблонов Corel DRAW" -#: ../src/extension/internal/latex-pstricks.cpp:331 -msgid "LaTeX Print" -msgstr "Печать в LaTeX" +#: ../src/extension/internal/cdr-input.cpp:292 +#, fuzzy +msgid "Corel DRAW 7-13 template files (*.cdt)" +msgstr "Шаблоны Corel DRAW 7-13 (.cdt)" -#: ../src/extension/internal/odf.cpp:2142 -msgid "OpenDocument Drawing Output" -msgstr "Экспорт в OpenDocument Drawing" +#: ../src/extension/internal/cdr-input.cpp:293 +#, fuzzy +msgid "Open files saved in Corel DRAW 7-13" +msgstr "Открыть файлы, сохранённые в Corel DRAW 7-13" -#: ../src/extension/internal/odf.cpp:2147 -msgid "OpenDocument drawing (*.odg)" -msgstr "Рисунок OpenDocument (*.odg)" +#: ../src/extension/internal/cdr-input.cpp:300 +#, fuzzy +msgid "Corel DRAW Compressed Exchange files input" +msgstr "Импорт файлов Corel DRAW Compressed Exchange" -#: ../src/extension/internal/odf.cpp:2148 -msgid "OpenDocument drawing file" -msgstr "Файл рисунков OpenDocument" +#: ../src/extension/internal/cdr-input.cpp:305 +#, fuzzy +msgid "Corel DRAW Compressed Exchange files (*.ccx)" +msgstr "Файлы Corel DRAW Compressed Exchange (.ccx)" -#. TRANSLATORS: The following are document crop settings for PDF import -#. more info: http://www.acrobatusers.com/tech_corners/javascript_corner/tips/2006/page_bounds/ -#: ../src/extension/internal/pdfinput/pdf-input.cpp:71 -msgid "media box" -msgstr "media box" +#: ../src/extension/internal/cdr-input.cpp:306 +#, fuzzy +msgid "Open compressed exchange files saved in Corel DRAW" +msgstr "Открыть сжатые файлы для обмена, созданные в Corel DRAW" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:72 -msgid "crop box" -msgstr "crop box" +#: ../src/extension/internal/cdr-input.cpp:313 +#, fuzzy +msgid "Corel DRAW Presentation Exchange files input" +msgstr "Импорт файлов Corel DRAW Presentation Exchange" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:73 -msgid "trim box" -msgstr "trim box" +#: ../src/extension/internal/cdr-input.cpp:318 +#, fuzzy +msgid "Corel DRAW Presentation Exchange files (*.cmx)" +msgstr "Файлы Corel DRAW Presentation Exchange (.cmx)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:74 -msgid "bleed box" -msgstr "bleed box" +#: ../src/extension/internal/cdr-input.cpp:319 +#, fuzzy +msgid "Open presentation exchange files saved in Corel DRAW" +msgstr "Открыть файлы, сохраненные Corel DRAW для обмена данными" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:75 -msgid "art box" -msgstr "art box" +#: ../src/extension/internal/emf-inout.cpp:3553 +msgid "EMF Input" +msgstr "Импорт EMF" -#. Crop settings -#: ../src/extension/internal/pdfinput/pdf-input.cpp:112 -msgid "Clip to:" -msgstr "Кадрировать по:" +#: ../src/extension/internal/emf-inout.cpp:3558 +msgid "Enhanced Metafiles (*.emf)" +msgstr "Файлы Enhanced Metafiles (*.emf)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:123 -msgid "Page settings" -msgstr "Параметры страницы" +#: ../src/extension/internal/emf-inout.cpp:3559 +msgid "Enhanced Metafiles" +msgstr "Файлы Enhanced Metafile" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:124 -msgid "Precision of approximating gradient meshes:" -msgstr "Точность аппроксимации градиентных сеток:" +#: ../src/extension/internal/emf-inout.cpp:3567 +msgid "EMF Output" +msgstr "Экспорт в EMF" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:125 -msgid "" -"<b>Note</b>: setting the precision too high may result in a large SVG file " -"and slow performance." +#: ../src/extension/internal/emf-inout.cpp:3570 +#: ../src/extension/internal/wmf-inout.cpp:3144 +msgid "Map Unicode to Symbol font" msgstr "" -"<b>Примечание</b>: слишком высокая точность приведёт к созданию очень " -"большого файла SVG и замедлению работы программы" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:128 -msgid "import via Poppler" +#: ../src/extension/internal/emf-inout.cpp:3571 +#: ../src/extension/internal/wmf-inout.cpp:3145 +msgid "Map Unicode to Wingdings" msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:138 -msgid "rough" -msgstr "невысокая" +#: ../src/extension/internal/emf-inout.cpp:3572 +#: ../src/extension/internal/wmf-inout.cpp:3146 +msgid "Map Unicode to Zapf Dingbats" +msgstr "" -#. Text options -#: ../src/extension/internal/pdfinput/pdf-input.cpp:142 -msgid "Text handling:" -msgstr "Импортировать текст:" +#: ../src/extension/internal/emf-inout.cpp:3573 +#: ../src/extension/internal/wmf-inout.cpp:3147 +msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" +msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:144 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:145 -msgid "Import text as text" -msgstr "Как текст" +#: ../src/extension/internal/emf-inout.cpp:3574 +#: ../src/extension/internal/wmf-inout.cpp:3148 +msgid "Compensate for PPT font bug" +msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:146 -msgid "Replace PDF fonts by closest-named installed fonts" -msgstr "Заменить шрифты подходящими из установленных" +#: ../src/extension/internal/emf-inout.cpp:3575 +#: ../src/extension/internal/wmf-inout.cpp:3149 +msgid "Convert dashed/dotted lines to single lines" +msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:149 -msgid "Embed images" -msgstr "Встроить все растровые изображения" +#: ../src/extension/internal/emf-inout.cpp:3576 +#: ../src/extension/internal/wmf-inout.cpp:3150 +#, fuzzy +msgid "Convert gradients to colored polygon series" +msgstr "Смена цвета опорной точки градиента" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:151 -msgid "Import settings" -msgstr "Параметры импорта" +#: ../src/extension/internal/emf-inout.cpp:3577 +#, fuzzy +msgid "Use native rectangular linear gradients" +msgstr "Создать линейный градиент" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:268 -msgid "PDF Import Settings" -msgstr "Параметры импорта PDF" +#: ../src/extension/internal/emf-inout.cpp:3578 +msgid "Map all fill patterns to standard EMF hatches" +msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:431 +#: ../src/extension/internal/emf-inout.cpp:3579 #, fuzzy -msgctxt "PDF input precision" -msgid "rough" -msgstr "невысокая" +msgid "Ignore image rotations" +msgstr "Ориентация" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:432 -#, fuzzy -msgctxt "PDF input precision" -msgid "medium" -msgstr "Средние" +#: ../src/extension/internal/emf-inout.cpp:3583 +msgid "Enhanced Metafile (*.emf)" +msgstr "Файлы Enhanced Metafile (*.emf)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:433 -#, fuzzy -msgctxt "PDF input precision" -msgid "fine" -msgstr "высокая" +#: ../src/extension/internal/emf-inout.cpp:3584 +msgid "Enhanced Metafile" +msgstr "Enhanced Metafile" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:434 +#: ../src/extension/internal/filter/bevels.h:53 #, fuzzy -msgctxt "PDF input precision" -msgid "very fine" -msgstr "очень высокая" - -#: ../src/extension/internal/pdfinput/pdf-input.cpp:877 -msgid "PDF Input" -msgstr "Импорт PDF" +msgid "Diffuse Light" +msgstr "Рассеянный свет" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:882 -msgid "Adobe PDF (*.pdf)" -msgstr "Adobe PDF (*.pdf)" +#: ../src/extension/internal/filter/bevels.h:55 +#: ../src/extension/internal/filter/bevels.h:135 +#: ../src/extension/internal/filter/bevels.h:219 +#: ../src/extension/internal/filter/paint.h:89 +#: ../src/extension/internal/filter/paint.h:340 +msgid "Smoothness" +msgstr "Сглаженность" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:883 -msgid "Adobe Portable Document Format" -msgstr "Adobe Portable Document Format" +#: ../src/extension/internal/filter/bevels.h:56 +#: ../src/extension/internal/filter/bevels.h:137 +#: ../src/extension/internal/filter/bevels.h:221 +#, fuzzy +msgid "Elevation (°)" +msgstr "Высота" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:890 -msgid "AI Input" -msgstr "Импорт AI" +#: ../src/extension/internal/filter/bevels.h:57 +#: ../src/extension/internal/filter/bevels.h:138 +#: ../src/extension/internal/filter/bevels.h:222 +#, fuzzy +msgid "Azimuth (°)" +msgstr "Азимут (°):" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:895 -msgid "Adobe Illustrator 9.0 and above (*.ai)" -msgstr "Adobe Illustrator 9.0 и выше (*.ai)" +#: ../src/extension/internal/filter/bevels.h:58 +#: ../src/extension/internal/filter/bevels.h:139 +#: ../src/extension/internal/filter/bevels.h:223 +#, fuzzy +msgid "Lighting color" +msgstr "По_дсветка:" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:896 -msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" -msgstr "" -"Открыть файлы, сохраненные в Adobe Illustrator 9.0 и более новых версиях" +#: ../src/extension/internal/filter/bevels.h:62 +#: ../src/extension/internal/filter/bevels.h:143 +#: ../src/extension/internal/filter/bevels.h:227 +#: ../src/extension/internal/filter/blurs.h:62 +#: ../src/extension/internal/filter/blurs.h:131 +#: ../src/extension/internal/filter/blurs.h:200 +#: ../src/extension/internal/filter/blurs.h:266 +#: ../src/extension/internal/filter/blurs.h:350 +#: ../src/extension/internal/filter/bumps.h:141 +#: ../src/extension/internal/filter/bumps.h:361 +#: ../src/extension/internal/filter/color.h:81 +#: ../src/extension/internal/filter/color.h:170 +#: ../src/extension/internal/filter/color.h:261 +#: ../src/extension/internal/filter/color.h:346 +#: ../src/extension/internal/filter/color.h:436 +#: ../src/extension/internal/filter/color.h:531 +#: ../src/extension/internal/filter/color.h:653 +#: ../src/extension/internal/filter/color.h:750 +#: ../src/extension/internal/filter/color.h:829 +#: ../src/extension/internal/filter/color.h:920 +#: ../src/extension/internal/filter/color.h:1048 +#: ../src/extension/internal/filter/color.h:1118 +#: ../src/extension/internal/filter/color.h:1211 +#: ../src/extension/internal/filter/color.h:1323 +#: ../src/extension/internal/filter/color.h:1428 +#: ../src/extension/internal/filter/color.h:1504 +#: ../src/extension/internal/filter/color.h:1615 +#: ../src/extension/internal/filter/distort.h:95 +#: ../src/extension/internal/filter/distort.h:204 +#: ../src/extension/internal/filter/filter-file.cpp:151 +#: ../src/extension/internal/filter/filter.cpp:214 +#: ../src/extension/internal/filter/image.h:61 +#: ../src/extension/internal/filter/morphology.h:75 +#: ../src/extension/internal/filter/morphology.h:202 +#: ../src/extension/internal/filter/overlays.h:79 +#: ../src/extension/internal/filter/paint.h:112 +#: ../src/extension/internal/filter/paint.h:243 +#: ../src/extension/internal/filter/paint.h:362 +#: ../src/extension/internal/filter/paint.h:506 +#: ../src/extension/internal/filter/paint.h:601 +#: ../src/extension/internal/filter/paint.h:724 +#: ../src/extension/internal/filter/paint.h:876 +#: ../src/extension/internal/filter/paint.h:980 +#: ../src/extension/internal/filter/protrusions.h:54 +#: ../src/extension/internal/filter/shadows.h:80 +#: ../src/extension/internal/filter/textures.h:90 +#: ../src/extension/internal/filter/transparency.h:69 +#: ../src/extension/internal/filter/transparency.h:140 +#: ../src/extension/internal/filter/transparency.h:214 +#: ../src/extension/internal/filter/transparency.h:287 +#: ../src/extension/internal/filter/transparency.h:349 +msgid "Filters" +msgstr "Фильтры" -#: ../src/extension/internal/pov-out.cpp:715 -msgid "PovRay Output" -msgstr "Экспорт в POV-Ray" +#: ../src/extension/internal/filter/bevels.h:66 +msgid "Basic diffuse bevel to use for building textures" +msgstr "Проста рассеянная фаска для создания текстур" -#: ../src/extension/internal/pov-out.cpp:720 -msgid "PovRay (*.pov) (paths and shapes only)" -msgstr "POV-Ray, только контуры и фигуры (*.pov)" +#: ../src/extension/internal/filter/bevels.h:133 +#, fuzzy +msgid "Matte Jelly" +msgstr "Матовое желе" -#: ../src/extension/internal/pov-out.cpp:721 -msgid "PovRay Raytracer File" -msgstr "Файл трассировщика лучей POV-Ray" +#: ../src/extension/internal/filter/bevels.h:136 +#: ../src/extension/internal/filter/bevels.h:220 +#: ../src/extension/internal/filter/blurs.h:187 +#: ../src/extension/internal/filter/color.h:74 +#, fuzzy +msgid "Brightness" +msgstr "Яркость" -#: ../src/extension/internal/svg.cpp:100 -msgid "SVG Input" -msgstr "Импорт SVG" +#: ../src/extension/internal/filter/bevels.h:147 +msgid "Bulging, matte jelly covering" +msgstr "Вздутый слой матового желе" -#: ../src/extension/internal/svg.cpp:105 -msgid "Scalable Vector Graphic (*.svg)" -msgstr "Масштабируемая векторная графика (*.svg)" +#: ../src/extension/internal/filter/bevels.h:217 +#, fuzzy +msgid "Specular Light" +msgstr "Отражение света" -#: ../src/extension/internal/svg.cpp:106 -msgid "Inkscape native file format and W3C standard" -msgstr "Файлы в собственном формате Inkscape и стандарт W3C" +#: ../src/extension/internal/filter/blurs.h:56 +#: ../src/extension/internal/filter/blurs.h:189 +#: ../src/extension/internal/filter/blurs.h:329 +#: ../src/extension/internal/filter/distort.h:73 +#, fuzzy +msgid "Horizontal blur" +msgstr "Размывание по горизонтали:" -#: ../src/extension/internal/svg.cpp:114 -msgid "SVG Output Inkscape" -msgstr "Экспорт в Inkscape SVG" +#: ../src/extension/internal/filter/blurs.h:57 +#: ../src/extension/internal/filter/blurs.h:190 +#: ../src/extension/internal/filter/blurs.h:330 +#: ../src/extension/internal/filter/distort.h:74 +#, fuzzy +msgid "Vertical blur" +msgstr "Размывание по вертикали:" -#: ../src/extension/internal/svg.cpp:119 -msgid "Inkscape SVG (*.svg)" -msgstr "Inkscape SVG (*.svg)" +#: ../src/extension/internal/filter/blurs.h:58 +msgid "Blur content only" +msgstr "Размыть только содержимое" -#: ../src/extension/internal/svg.cpp:120 -msgid "SVG format with Inkscape extensions" -msgstr "Формат SVG с расширениями Inkscape" +#: ../src/extension/internal/filter/blurs.h:66 +msgid "Simple vertical and horizontal blur effect" +msgstr "" -#: ../src/extension/internal/svg.cpp:128 -msgid "SVG Output" -msgstr "Экспорт в SVG" +#: ../src/extension/internal/filter/blurs.h:125 +#, fuzzy +msgid "Clean Edges" +msgstr "Чистые края" -#: ../src/extension/internal/svg.cpp:133 -msgid "Plain SVG (*.svg)" -msgstr "Простой SVG (*.svg)" +#: ../src/extension/internal/filter/blurs.h:127 +#: ../src/extension/internal/filter/blurs.h:262 +#: ../src/extension/internal/filter/paint.h:237 +#: ../src/extension/internal/filter/paint.h:336 +#: ../src/extension/internal/filter/paint.h:341 +#, fuzzy +msgid "Strength" +msgstr "Сила:" -#: ../src/extension/internal/svg.cpp:134 -msgid "Scalable Vector Graphics format as defined by the W3C" +#: ../src/extension/internal/filter/blurs.h:135 +msgid "" +"Removes or decreases glows and jaggeries around objects edges after applying " +"some filters" msgstr "" -"Масштабируемая векторная графика (SVG) в соответствии со спецификацией W3C" +"Удаляет или уменьшает свечения по краям объектов после применения некоторых " +"фильтров" -#: ../src/extension/internal/svgz.cpp:46 -msgid "SVGZ Input" -msgstr "Импорт файлов SVGZ" +#: ../src/extension/internal/filter/blurs.h:185 +msgid "Cross Blur" +msgstr "Перекрёстное размывание" -#: ../src/extension/internal/svgz.cpp:52 ../src/extension/internal/svgz.cpp:66 -msgid "Compressed Inkscape SVG (*.svgz)" -msgstr "Сжатые файлы Inkscape SVG (*.svgz)" +#: ../src/extension/internal/filter/blurs.h:188 +#, fuzzy +msgid "Fading" +msgstr "Затенение" -#: ../src/extension/internal/svgz.cpp:53 -msgid "SVG file format compressed with GZip" -msgstr "Файлы в формате SVG, сжатые GZip" +#: ../src/extension/internal/filter/blurs.h:191 +#: ../src/extension/internal/filter/textures.h:74 +msgid "Blend:" +msgstr "Режим смешивания:" -#: ../src/extension/internal/svgz.cpp:61 ../src/extension/internal/svgz.cpp:75 -msgid "SVGZ Output" -msgstr "Экспорт в SVGZ" +#: ../src/extension/internal/filter/blurs.h:192 +#: ../src/extension/internal/filter/blurs.h:339 +#: ../src/extension/internal/filter/bumps.h:131 +#: ../src/extension/internal/filter/bumps.h:337 +#: ../src/extension/internal/filter/bumps.h:344 +#: ../src/extension/internal/filter/color.h:329 +#: ../src/extension/internal/filter/color.h:336 +#: ../src/extension/internal/filter/color.h:1423 +#: ../src/extension/internal/filter/color.h:1596 +#: ../src/extension/internal/filter/color.h:1602 +#: ../src/extension/internal/filter/paint.h:705 +#: ../src/extension/internal/filter/transparency.h:63 +#: ../src/filter-enums.cpp:54 +msgid "Darken" +msgstr "Затемнение" -#: ../src/extension/internal/svgz.cpp:67 -msgid "Inkscape's native file format compressed with GZip" -msgstr "Файлы в формате Inkscape, сжатые GZip" +#: ../src/extension/internal/filter/blurs.h:193 +#: ../src/extension/internal/filter/blurs.h:340 +#: ../src/extension/internal/filter/bumps.h:132 +#: ../src/extension/internal/filter/bumps.h:335 +#: ../src/extension/internal/filter/bumps.h:342 +#: ../src/extension/internal/filter/color.h:327 +#: ../src/extension/internal/filter/color.h:332 +#: ../src/extension/internal/filter/color.h:647 +#: ../src/extension/internal/filter/color.h:1415 +#: ../src/extension/internal/filter/color.h:1420 +#: ../src/extension/internal/filter/color.h:1594 +#: ../src/extension/internal/filter/paint.h:703 +#: ../src/extension/internal/filter/transparency.h:62 +#: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:382 +msgid "Screen" +msgstr "Экран" -#: ../src/extension/internal/svgz.cpp:80 -msgid "Compressed plain SVG (*.svgz)" -msgstr "Сжатые файлы Inkscape SVG (*.svgz)" +#: ../src/extension/internal/filter/blurs.h:194 +#: ../src/extension/internal/filter/blurs.h:341 +#: ../src/extension/internal/filter/bumps.h:133 +#: ../src/extension/internal/filter/bumps.h:338 +#: ../src/extension/internal/filter/bumps.h:345 +#: ../src/extension/internal/filter/color.h:325 +#: ../src/extension/internal/filter/color.h:333 +#: ../src/extension/internal/filter/color.h:645 +#: ../src/extension/internal/filter/color.h:1414 +#: ../src/extension/internal/filter/color.h:1421 +#: ../src/extension/internal/filter/color.h:1595 +#: ../src/extension/internal/filter/color.h:1601 +#: ../src/extension/internal/filter/paint.h:701 +#: ../src/extension/internal/filter/transparency.h:60 +#: ../src/filter-enums.cpp:52 +msgid "Multiply" +msgstr "Умножение" -#: ../src/extension/internal/svgz.cpp:81 -msgid "Scalable Vector Graphics format compressed with GZip" -msgstr "Масштабируемая векторная графика (SVG), сжатая GZip" +#: ../src/extension/internal/filter/blurs.h:195 +#: ../src/extension/internal/filter/blurs.h:342 +#: ../src/extension/internal/filter/bumps.h:134 +#: ../src/extension/internal/filter/bumps.h:339 +#: ../src/extension/internal/filter/bumps.h:346 +#: ../src/extension/internal/filter/color.h:328 +#: ../src/extension/internal/filter/color.h:335 +#: ../src/extension/internal/filter/color.h:1422 +#: ../src/extension/internal/filter/color.h:1593 +#: ../src/extension/internal/filter/paint.h:704 +#: ../src/extension/internal/filter/transparency.h:64 +#: ../src/filter-enums.cpp:55 +msgid "Lighten" +msgstr "Осветление" -#: ../src/extension/internal/vsd-input.cpp:274 +#: ../src/extension/internal/filter/blurs.h:204 #, fuzzy -msgid "VSD Input" -msgstr "Импорт PDF" +msgid "Combine vertical and horizontal blur" +msgstr "Смещение узлов по горизонтали" -#: ../src/extension/internal/vsd-input.cpp:279 -#, fuzzy -msgid "Microsoft Visio Diagram (*.vsd)" -msgstr "Схемы Dia (*.dia)" +#: ../src/extension/internal/filter/blurs.h:260 +msgid "Feather" +msgstr "Растушёвка" -#: ../src/extension/internal/vsd-input.cpp:280 -msgid "File format used by Microsoft Visio 6 and later" -msgstr "" +#: ../src/extension/internal/filter/blurs.h:270 +msgid "Blurred mask on the edge without altering the contents" +msgstr "Размытая маска по краям объекта, не меняющая его содержимое" -#: ../src/extension/internal/vsd-input.cpp:287 +#: ../src/extension/internal/filter/blurs.h:325 +msgid "Out of Focus" +msgstr "Вне зоны резкости" + +#: ../src/extension/internal/filter/blurs.h:331 +#: ../src/extension/internal/filter/distort.h:75 +#: ../src/extension/internal/filter/morphology.h:67 +#: ../src/extension/internal/filter/paint.h:235 +#: ../src/extension/internal/filter/paint.h:342 +#: ../src/extension/internal/filter/paint.h:346 #, fuzzy -msgid "VDX Input" -msgstr "Импорт DXF" +msgid "Dilatation" +msgstr "Дилатация:" -#: ../src/extension/internal/vsd-input.cpp:292 +#: ../src/extension/internal/filter/blurs.h:332 +#: ../src/extension/internal/filter/distort.h:76 +#: ../src/extension/internal/filter/morphology.h:68 +#: ../src/extension/internal/filter/paint.h:98 +#: ../src/extension/internal/filter/paint.h:236 +#: ../src/extension/internal/filter/paint.h:343 +#: ../src/extension/internal/filter/paint.h:347 +#: ../src/extension/internal/filter/transparency.h:208 +#: ../src/extension/internal/filter/transparency.h:282 #, fuzzy -msgid "Microsoft Visio XML Diagram (*.vdx)" -msgstr "Microsoft XAML (*.xaml)" +msgid "Erosion" +msgstr "Эрозия:" -#: ../src/extension/internal/vsd-input.cpp:293 -msgid "File format used by Microsoft Visio 2010 and later" -msgstr "" +#: ../src/extension/internal/filter/blurs.h:336 +#: ../src/extension/internal/filter/color.h:1205 +#: ../src/extension/internal/filter/color.h:1317 +#: ../src/ui/dialog/document-properties.cpp:115 +msgid "Background color" +msgstr "Цвет фона" -#: ../src/extension/internal/vsd-input.cpp:300 +#: ../src/extension/internal/filter/blurs.h:337 +#: ../src/extension/internal/filter/bumps.h:129 +msgid "Blend type:" +msgstr "Режим смешивания:" + +#: ../src/extension/internal/filter/blurs.h:338 +#: ../src/extension/internal/filter/bumps.h:130 +#: ../src/extension/internal/filter/bumps.h:336 +#: ../src/extension/internal/filter/bumps.h:343 +#: ../src/extension/internal/filter/color.h:326 +#: ../src/extension/internal/filter/color.h:334 +#: ../src/extension/internal/filter/color.h:646 +#: ../src/extension/internal/filter/color.h:1413 +#: ../src/extension/internal/filter/color.h:1419 +#: ../src/extension/internal/filter/color.h:1586 +#: ../src/extension/internal/filter/color.h:1600 +#: ../src/extension/internal/filter/distort.h:78 +#: ../src/extension/internal/filter/paint.h:702 +#: ../src/extension/internal/filter/textures.h:77 +#: ../src/extension/internal/filter/transparency.h:61 +#: ../src/filter-enums.cpp:51 ../src/ui/dialog/inkscape-preferences.cpp:646 +msgid "Normal" +msgstr "Нормальный" + +#: ../src/extension/internal/filter/blurs.h:344 #, fuzzy -msgid "VSDM Input" -msgstr "Импорт EMF" +msgid "Blend to background" +msgstr "Убрать фон" -#: ../src/extension/internal/vsd-input.cpp:305 -msgid "Microsoft Visio 2013 drawing (*.vsdm)" +#: ../src/extension/internal/filter/blurs.h:354 +msgid "Blur eroded by white or transparency" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:306 -#: ../src/extension/internal/vsd-input.cpp:319 -msgid "File format used by Microsoft Visio 2013 and later" -msgstr "" +#: ../src/extension/internal/filter/bumps.h:80 +#, fuzzy +msgid "Bump" +msgstr "Выпуклости" -#: ../src/extension/internal/vsd-input.cpp:313 +#: ../src/extension/internal/filter/bumps.h:84 +#: ../src/extension/internal/filter/bumps.h:313 #, fuzzy -msgid "VSDX Input" -msgstr "Импорт DXF" +msgid "Image simplification" +msgstr "Некорректный рабочий каталог: %s" -#: ../src/extension/internal/vsd-input.cpp:318 -msgid "Microsoft Visio 2013 drawing (*.vsdx)" -msgstr "" +#: ../src/extension/internal/filter/bumps.h:85 +#: ../src/extension/internal/filter/bumps.h:314 +#, fuzzy +msgid "Bump simplification" +msgstr "Порог упрощения:" -#: ../src/extension/internal/wmf-inout.cpp:3125 -msgid "WMF Input" -msgstr "Импорт WMF" +#: ../src/extension/internal/filter/bumps.h:87 +#: ../src/extension/internal/filter/bumps.h:316 +#, fuzzy +msgid "Bump source" +msgstr "Выпуклости" -#: ../src/extension/internal/wmf-inout.cpp:3130 -msgid "Windows Metafiles (*.wmf)" -msgstr "Файлы Windows Metafile (*.wmf)" +#: ../src/extension/internal/filter/bumps.h:88 +#: ../src/extension/internal/filter/bumps.h:317 +#: ../src/extension/internal/filter/color.h:157 +#: ../src/extension/internal/filter/color.h:637 +#: ../src/extension/internal/filter/color.h:821 +#: ../src/extension/internal/filter/transparency.h:132 +#: ../src/filter-enums.cpp:127 ../src/ui/tools/flood-tool.cpp:193 +#: ../src/widgets/sp-color-icc-selector.cpp:355 +#: ../src/widgets/sp-color-scales.cpp:429 +#: ../src/widgets/sp-color-scales.cpp:430 +msgid "Red" +msgstr "Красный" -#: ../src/extension/internal/wmf-inout.cpp:3131 -msgid "Windows Metafiles" -msgstr "Файлы Windows Metafile" +#: ../src/extension/internal/filter/bumps.h:89 +#: ../src/extension/internal/filter/bumps.h:318 +#: ../src/extension/internal/filter/color.h:158 +#: ../src/extension/internal/filter/color.h:638 +#: ../src/extension/internal/filter/color.h:822 +#: ../src/extension/internal/filter/transparency.h:133 +#: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:194 +#: ../src/widgets/sp-color-icc-selector.cpp:356 +#: ../src/widgets/sp-color-scales.cpp:432 +#: ../src/widgets/sp-color-scales.cpp:433 +msgid "Green" +msgstr "Зеленый" + +#: ../src/extension/internal/filter/bumps.h:90 +#: ../src/extension/internal/filter/bumps.h:319 +#: ../src/extension/internal/filter/color.h:159 +#: ../src/extension/internal/filter/color.h:639 +#: ../src/extension/internal/filter/color.h:823 +#: ../src/extension/internal/filter/transparency.h:134 +#: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:195 +#: ../src/widgets/sp-color-icc-selector.cpp:357 +#: ../src/widgets/sp-color-scales.cpp:435 +#: ../src/widgets/sp-color-scales.cpp:436 +msgid "Blue" +msgstr "Синий" -#: ../src/extension/internal/wmf-inout.cpp:3139 +#: ../src/extension/internal/filter/bumps.h:91 #, fuzzy -msgid "WMF Output" -msgstr "Экспорт в EMF" +msgid "Bump from background" +msgstr "Убрать фон" -#: ../src/extension/internal/wmf-inout.cpp:3149 -msgid "Map all fill patterns to standard WMF hatches" -msgstr "" +#: ../src/extension/internal/filter/bumps.h:94 +#, fuzzy +msgid "Lighting type:" +msgstr " тип: " -#: ../src/extension/internal/wmf-inout.cpp:3153 -#: ../share/extensions/wmf_input.inx.h:2 -#: ../share/extensions/wmf_output.inx.h:2 -msgid "Windows Metafile (*.wmf)" -msgstr "Файлы Windows Metafile (*.wmf)" +#: ../src/extension/internal/filter/bumps.h:95 +#, fuzzy +msgid "Specular" +msgstr "Отражение света" -#: ../src/extension/internal/wmf-inout.cpp:3154 +#: ../src/extension/internal/filter/bumps.h:96 #, fuzzy -msgid "Windows Metafile" -msgstr "Файлы Windows Metafile" +msgid "Diffuse" +msgstr "Рассеянный свет" -#: ../src/extension/internal/wpg-input.cpp:129 -msgid "WPG Input" -msgstr "Импорт WPG" +#: ../src/extension/internal/filter/bumps.h:98 +#: ../src/extension/internal/filter/bumps.h:329 +#: ../src/libgdl/gdl-dock-placeholder.c:175 ../src/libgdl/gdl-dock.c:199 +#: ../src/widgets/rect-toolbar.cpp:331 +#: ../share/extensions/interp_att_g.inx.h:11 +msgid "Height" +msgstr "Высота" -#: ../src/extension/internal/wpg-input.cpp:134 -msgid "WordPerfect Graphics (*.wpg)" -msgstr "Графика WordPerfect (*.wpg)" +#: ../src/extension/internal/filter/bumps.h:99 +#: ../src/extension/internal/filter/bumps.h:330 +#: ../src/extension/internal/filter/color.h:76 +#: ../src/extension/internal/filter/color.h:824 +#: ../src/extension/internal/filter/color.h:1113 +#: ../src/extension/internal/filter/paint.h:86 +#: ../src/extension/internal/filter/paint.h:592 +#: ../src/extension/internal/filter/paint.h:707 +#: ../src/ui/tools/flood-tool.cpp:198 +#: ../src/widgets/sp-color-icc-selector.cpp:366 +#: ../src/widgets/sp-color-scales.cpp:461 +#: ../src/widgets/sp-color-scales.cpp:462 ../src/widgets/tweak-toolbar.cpp:318 +#: ../share/extensions/color_randomize.inx.h:5 +msgid "Lightness" +msgstr "Яркость" -#: ../src/extension/internal/wpg-input.cpp:135 -msgid "Vector graphics format used by Corel WordPerfect" -msgstr "Формат векторной графики, используемой Corel WordPerfect" +#: ../src/extension/internal/filter/bumps.h:100 +#: ../src/extension/internal/filter/bumps.h:331 +#, fuzzy +msgid "Precision" +msgstr "Точность:" -#: ../src/extension/prefdialog.cpp:272 -msgid "Live preview" -msgstr "Предпросмотр" +#: ../src/extension/internal/filter/bumps.h:103 +msgid "Light source" +msgstr "Источник света" -#: ../src/extension/prefdialog.cpp:272 -msgid "Is the effect previewed live on canvas?" -msgstr "Показывать ли результат применения эффекта сразу на холсте" +#: ../src/extension/internal/filter/bumps.h:104 +msgid "Light source:" +msgstr "Источник света:" -#: ../src/extension/system.cpp:125 ../src/extension/system.cpp:127 -msgid "Format autodetect failed. The file is being opened as SVG." -msgstr "Невозможно определить формат файла. Файл будет открыт как SVG." +#: ../src/extension/internal/filter/bumps.h:105 +#, fuzzy +msgid "Distant" +msgstr "Искажения" -#: ../src/file.cpp:181 -msgid "default.svg" -msgstr "default.svg" +#: ../src/extension/internal/filter/bumps.h:106 +#: ../src/ui/dialog/inkscape-preferences.cpp:453 +msgid "Point" +msgstr "Пункт" -#: ../src/file.cpp:320 -msgid "Broken links have been changed to point to existing files." +#: ../src/extension/internal/filter/bumps.h:107 +msgid "Spot" msgstr "" -#: ../src/file.cpp:331 ../src/file.cpp:1247 -#, c-format -msgid "Failed to load the requested file %s" -msgstr "Не удалось загрузить запрошенный файл %s" - -#: ../src/file.cpp:357 -msgid "Document not saved yet. Cannot revert." -msgstr "Документ еще не был сохранен. Вернуться к сохраненному невозможно." - -#: ../src/file.cpp:363 +#: ../src/extension/internal/filter/bumps.h:109 #, fuzzy -msgid "Changes will be lost! Are you sure you want to reload document %1?" -msgstr "" -"Изменения будут потеряны! Вы уверены, что хотите загрузить документ %s " -"заново?" +msgid "Distant light options" +msgstr "Удалённый" -#: ../src/file.cpp:389 -msgid "Document reverted." -msgstr "Документ возвращен к последнему сохраненному состоянию." +#: ../src/extension/internal/filter/bumps.h:110 +#: ../src/extension/internal/filter/bumps.h:332 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1195 +msgid "Azimuth" +msgstr "Азимут" -#: ../src/file.cpp:391 -msgid "Document not reverted." -msgstr "Документ не возвращен к сохраненному состоянию." +#: ../src/extension/internal/filter/bumps.h:111 +#: ../src/extension/internal/filter/bumps.h:333 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 +msgid "Elevation" +msgstr "Высота" -#: ../src/file.cpp:541 -msgid "Select file to open" -msgstr "Выберите файл" +#: ../src/extension/internal/filter/bumps.h:112 +#, fuzzy +msgid "Point light options" +msgstr "Точечный" -#: ../src/file.cpp:623 -msgid "Clean up document" -msgstr "Подчистка документа" +#: ../src/extension/internal/filter/bumps.h:113 +#: ../src/extension/internal/filter/bumps.h:117 +#, fuzzy +msgid "X location" +msgstr " расположение:" -#: ../src/file.cpp:630 -#, c-format -msgid "Removed <b>%i</b> unused definition in <defs>." -msgid_plural "Removed <b>%i</b> unused definitions in <defs>." -msgstr[0] "Удалено <b>%i</b> ненужное определение в <defs>." -msgstr[1] "Удалено <b>%i</b> ненужных определения в <defs>." -msgstr[2] "Удалено <b>%i</b> ненужных определений в <defs>." +#: ../src/extension/internal/filter/bumps.h:114 +#: ../src/extension/internal/filter/bumps.h:118 +#, fuzzy +msgid "Y location" +msgstr " расположение:" -#: ../src/file.cpp:635 -msgid "No unused definitions in <defs>." -msgstr "Нет ненужных элементов в <defs>." +#: ../src/extension/internal/filter/bumps.h:115 +#: ../src/extension/internal/filter/bumps.h:119 +#, fuzzy +msgid "Z location" +msgstr " расположение:" -#: ../src/file.cpp:667 -#, c-format -msgid "" -"No Inkscape extension found to save document (%s). This may have been " -"caused by an unknown filename extension." -msgstr "" -"Не найдено расширение Inkscape для сохранения документа (%s). Возможно, " -"задано неизвестное расширение имени файла." +#: ../src/extension/internal/filter/bumps.h:116 +#, fuzzy +msgid "Spot light options" +msgstr "Прожектор" -#: ../src/file.cpp:668 ../src/file.cpp:676 ../src/file.cpp:684 -#: ../src/file.cpp:690 ../src/file.cpp:695 -msgid "Document not saved." -msgstr "Документ не сохранен." +#: ../src/extension/internal/filter/bumps.h:120 +#, fuzzy +msgid "X target" +msgstr "Target:" -#: ../src/file.cpp:675 -#, c-format -msgid "" -"File %s is write protected. Please remove write protection and try again." -msgstr "" -"Файл %s защищён от записи. Уберите защиту от записи и попробуйте снова." +#: ../src/extension/internal/filter/bumps.h:121 +#, fuzzy +msgid "Y target" +msgstr "Target:" -#: ../src/file.cpp:683 -#, c-format -msgid "File %s could not be saved." -msgstr "Невозможно сохранить файл %s." +#: ../src/extension/internal/filter/bumps.h:122 +#, fuzzy +msgid "Z target" +msgstr "Target:" -#: ../src/file.cpp:713 ../src/file.cpp:715 -msgid "Document saved." -msgstr "Документ сохранен." +#: ../src/extension/internal/filter/bumps.h:123 +#, fuzzy +msgid "Specular exponent" +msgstr "Степень отражения" -#. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:858 ../src/file.cpp:1406 +#: ../src/extension/internal/filter/bumps.h:124 #, fuzzy -msgid "drawing" -msgstr "рисунок%s" +msgid "Cone angle" +msgstr "Угол конуса" -#: ../src/file.cpp:863 +#: ../src/extension/internal/filter/bumps.h:127 #, fuzzy -msgid "drawing-%1" -msgstr "рисунок%s" +msgid "Image color" +msgstr "Вставить цвет" -#: ../src/file.cpp:880 -msgid "Select file to save a copy to" -msgstr "Выберите файл для сохранения копии" +#: ../src/extension/internal/filter/bumps.h:128 +#, fuzzy +msgid "Color bump" +msgstr "Цвет" -#: ../src/file.cpp:882 -msgid "Select file to save to" -msgstr "Выберите файл для сохранения" +#: ../src/extension/internal/filter/bumps.h:145 +msgid "All purposes bump filter" +msgstr "" -#: ../src/file.cpp:987 ../src/file.cpp:989 -msgid "No changes need to be saved." -msgstr "Файл не был изменен. Сохранение не требуется." +#: ../src/extension/internal/filter/bumps.h:309 +#, fuzzy +msgid "Wax Bump" +msgstr "Выпуклости" -#: ../src/file.cpp:1008 -msgid "Saving document..." -msgstr "Выполняется сохранение документа..." +#: ../src/extension/internal/filter/bumps.h:320 +#, fuzzy +msgid "Background:" +msgstr "_Фон:" -#: ../src/file.cpp:1244 ../src/ui/dialog/inkscape-preferences.cpp:1441 -#: ../src/ui/dialog/ocaldialogs.cpp:1244 -msgid "Import" -msgstr "Импорт" +#: ../src/extension/internal/filter/bumps.h:322 +#: ../src/extension/internal/filter/transparency.h:57 +#: ../src/filter-enums.cpp:29 ../src/sp-image.cpp:517 +msgid "Image" +msgstr "Изображение" -#: ../src/file.cpp:1294 -msgid "Select file to import" -msgstr "Выберите файл для импорта" +#: ../src/extension/internal/filter/bumps.h:323 +#, fuzzy +msgid "Blurred image" +msgstr "Встроить все растровые изображения" -#: ../src/file.cpp:1427 -msgid "Select file to export to" -msgstr "Выберите файл для экспорта" +#: ../src/extension/internal/filter/bumps.h:325 +#, fuzzy +msgid "Background opacity" +msgstr "α-канал фонового изображения" -#: ../src/file.cpp:1680 -msgid "Import Clip Art" -msgstr "Импорт из Open Clip Art Library" +#: ../src/extension/internal/filter/bumps.h:327 +#: ../src/extension/internal/filter/color.h:1040 +#, fuzzy +msgid "Lighting" +msgstr "Осветление" -#: ../src/filter-enums.cpp:21 -msgid "Color Matrix" -msgstr "Цветовая матрица" +#: ../src/extension/internal/filter/bumps.h:334 +#, fuzzy +msgid "Lighting blend:" +msgstr "Отмена рисования" -#: ../src/filter-enums.cpp:23 -msgid "Composite" -msgstr "Совмещение" +#: ../src/extension/internal/filter/bumps.h:341 +#, fuzzy +msgid "Highlight blend:" +msgstr "По_дсветка:" -#: ../src/filter-enums.cpp:24 -msgid "Convolve Matrix" -msgstr "Матрица свертки" +#: ../src/extension/internal/filter/bumps.h:350 +#, fuzzy +msgid "Bump color" +msgstr "Перенос цвета" -#: ../src/filter-enums.cpp:25 -msgid "Diffuse Lighting" -msgstr "Рассеянный свет" +#: ../src/extension/internal/filter/bumps.h:351 +#, fuzzy +msgid "Revert bump" +msgstr "_Восстановить" -#: ../src/filter-enums.cpp:26 -msgid "Displacement Map" -msgstr "Карта смещения" +#: ../src/extension/internal/filter/bumps.h:352 +#, fuzzy +msgid "Transparency type:" +msgstr "0 (прозрачно)" -#: ../src/filter-enums.cpp:27 -msgid "Flood" -msgstr "Заливка" +#: ../src/extension/internal/filter/bumps.h:353 +#: ../src/extension/internal/filter/morphology.h:176 +#: ../src/filter-enums.cpp:90 +msgid "Atop" +msgstr "Сверху (atop)" -#: ../src/filter-enums.cpp:30 ../share/extensions/text_merge.inx.h:1 -msgid "Merge" -msgstr "Сведение" +#: ../src/extension/internal/filter/bumps.h:354 +#: ../src/extension/internal/filter/distort.h:70 +#: ../src/extension/internal/filter/morphology.h:174 +#: ../src/filter-enums.cpp:88 +msgid "In" +msgstr "Вход" -#: ../src/filter-enums.cpp:33 -msgid "Specular Lighting" -msgstr "Отражение света" +#: ../src/extension/internal/filter/bumps.h:365 +msgid "Turns an image to jelly" +msgstr "" -#: ../src/filter-enums.cpp:34 -msgid "Tile" -msgstr "Мозаика" +#: ../src/extension/internal/filter/color.h:72 +#, fuzzy +msgid "Brilliance" +msgstr "Кириллица" -#: ../src/filter-enums.cpp:40 -msgid "Source Graphic" -msgstr "Исходный объект" +#: ../src/extension/internal/filter/color.h:75 +#: ../src/extension/internal/filter/color.h:1417 +#, fuzzy +msgid "Over-saturation" +msgstr "Перенасыщенность:" -#: ../src/filter-enums.cpp:41 -msgid "Source Alpha" -msgstr "α-канал исходного объекта" +#: ../src/extension/internal/filter/color.h:77 +#: ../src/extension/internal/filter/color.h:161 +#: ../src/extension/internal/filter/overlays.h:70 +#: ../src/extension/internal/filter/paint.h:85 +#: ../src/extension/internal/filter/paint.h:502 +#: ../src/extension/internal/filter/transparency.h:136 +#: ../src/extension/internal/filter/transparency.h:210 +#, fuzzy +msgid "Inverted" +msgstr "Инвертировать" -#: ../src/filter-enums.cpp:42 -msgid "Background Image" -msgstr "Фоновое изображение" +#: ../src/extension/internal/filter/color.h:85 +#, fuzzy +msgid "Brightness filter" +msgstr "Шаги яркости" -#: ../src/filter-enums.cpp:43 -msgid "Background Alpha" -msgstr "α-канал фонового изображения" +#: ../src/extension/internal/filter/color.h:152 +#, fuzzy +msgid "Channel Painting" +msgstr "Масляная краска" -#: ../src/filter-enums.cpp:44 -msgid "Fill Paint" -msgstr "Цвет заливки" +#: ../src/extension/internal/filter/color.h:156 +#: ../src/extension/internal/filter/color.h:257 +#: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:65 +#: ../src/ui/dialog/inkscape-preferences.cpp:945 +#: ../src/ui/tools/flood-tool.cpp:197 +#: ../src/widgets/sp-color-icc-selector.cpp:362 +#: ../src/widgets/sp-color-icc-selector.cpp:367 +#: ../src/widgets/sp-color-scales.cpp:458 +#: ../src/widgets/sp-color-scales.cpp:459 ../src/widgets/tweak-toolbar.cpp:302 +#: ../share/extensions/color_randomize.inx.h:4 +msgid "Saturation" +msgstr "Насыщенность" -#: ../src/filter-enums.cpp:45 -msgid "Stroke Paint" -msgstr "Цвет обводки" +#: ../src/extension/internal/filter/color.h:160 +#: ../src/extension/internal/filter/transparency.h:135 +#: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:199 +msgid "Alpha" +msgstr "Альфа-канал" -#. New in Compositing and Blending Level 1 -#: ../src/filter-enums.cpp:57 +#: ../src/extension/internal/filter/color.h:174 #, fuzzy -msgid "Overlay" -msgstr "Перекрытия" +msgid "Replace RGB by any color" +msgstr "Заменить тон двумя цветами" -#: ../src/filter-enums.cpp:58 +#: ../src/extension/internal/filter/color.h:254 #, fuzzy -msgid "Color Dodge" -msgstr "Цвет" +msgid "Color Shift" +msgstr "В цвете" -#: ../src/filter-enums.cpp:59 +#: ../src/extension/internal/filter/color.h:256 #, fuzzy -msgid "Color Burn" -msgstr "Контрольные цветовые полосы" +msgid "Shift (°)" +msgstr "Сме_щение" -#: ../src/filter-enums.cpp:60 +#: ../src/extension/internal/filter/color.h:265 +msgid "Rotate and desaturate hue" +msgstr "" + +#: ../src/extension/internal/filter/color.h:321 #, fuzzy -msgid "Hard Light" +msgid "Harsh light" msgstr "Высота штрих-кода:" -#: ../src/filter-enums.cpp:61 +#: ../src/extension/internal/filter/color.h:322 #, fuzzy -msgid "Soft Light" -msgstr "Прожектор" +msgid "Normal light" +msgstr "Обычное смещение:" -#: ../src/filter-enums.cpp:62 ../src/splivarot.cpp:88 ../src/splivarot.cpp:94 -msgid "Difference" -msgstr "Разность" +#: ../src/extension/internal/filter/color.h:323 +msgid "Duotone" +msgstr "Дуплекс" -#: ../src/filter-enums.cpp:63 ../src/splivarot.cpp:100 -msgid "Exclusion" -msgstr "Исключающее ИЛИ" +#: ../src/extension/internal/filter/color.h:324 +#: ../src/extension/internal/filter/color.h:1412 +#, fuzzy +msgid "Blend 1:" +msgstr "Смешивание" -#: ../src/filter-enums.cpp:64 ../src/ui/tools/flood-tool.cpp:196 -#: ../src/widgets/sp-color-icc-selector.cpp:361 -#: ../src/widgets/sp-color-icc-selector.cpp:365 -#: ../src/widgets/sp-color-scales.cpp:455 -#: ../src/widgets/sp-color-scales.cpp:456 ../src/widgets/tweak-toolbar.cpp:286 -#: ../share/extensions/color_randomize.inx.h:3 -msgid "Hue" -msgstr "Тон" +#: ../src/extension/internal/filter/color.h:331 +#: ../src/extension/internal/filter/color.h:1418 +#, fuzzy +msgid "Blend 2:" +msgstr "Смешивание" -#: ../src/filter-enums.cpp:67 -msgid "Luminosity" +#: ../src/extension/internal/filter/color.h:350 +#, fuzzy +msgid "Blend image or object with a flood color" msgstr "" +"Смешать изображение или объект с цветом заливки и установить светлоту и " +"контраст" -#: ../src/filter-enums.cpp:77 -msgid "Matrix" -msgstr "Матрица" +#: ../src/extension/internal/filter/color.h:424 ../src/filter-enums.cpp:22 +msgid "Component Transfer" +msgstr "Перенос компонента" -#: ../src/filter-enums.cpp:78 -msgid "Saturate" -msgstr "Насыщенность" +#: ../src/extension/internal/filter/color.h:427 ../src/filter-enums.cpp:109 +msgid "Identity" +msgstr "Идентичная функция" -#: ../src/filter-enums.cpp:79 -msgid "Hue Rotate" -msgstr "Вращение тона" +#: ../src/extension/internal/filter/color.h:428 +#: ../src/extension/internal/filter/paint.h:498 ../src/filter-enums.cpp:110 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1050 +msgid "Table" +msgstr "Табличная функция" -#: ../src/filter-enums.cpp:80 -msgid "Luminance to Alpha" -msgstr "Освещенность в альфа" +#: ../src/extension/internal/filter/color.h:429 +#: ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:111 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1053 +msgid "Discrete" +msgstr "Дискретная функция" -#. File -#: ../src/filter-enums.cpp:86 ../src/verbs.cpp:2352 -#: ../share/extensions/jessyInk_mouseHandler.inx.h:3 -#: ../share/extensions/jessyInk_transitions.inx.h:7 -msgid "Default" -msgstr "По умолчанию" +#: ../src/extension/internal/filter/color.h:430 ../src/filter-enums.cpp:112 +#: ../src/live_effects/lpe-powerstroke.cpp:188 +msgid "Linear" +msgstr "Линейная функция" -#. New CSS -#: ../src/filter-enums.cpp:94 +#: ../src/extension/internal/filter/color.h:431 ../src/filter-enums.cpp:113 +msgid "Gamma" +msgstr "Гамма" + +#: ../src/extension/internal/filter/color.h:440 #, fuzzy -msgid "Clear" -msgstr "О_чистить" +msgid "Basic component transfer structure" +msgstr "Простая текстура полупрозрачного шума" -#: ../src/filter-enums.cpp:95 +#: ../src/extension/internal/filter/color.h:509 #, fuzzy -msgid "Copy" -msgstr "С_копировать" +msgid "Duochrome" +msgstr "Хром" -#: ../src/filter-enums.cpp:96 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1571 -msgid "Destination" -msgstr "Назначение" +#: ../src/extension/internal/filter/color.h:513 +#, fuzzy +msgid "Fluorescence level" +msgstr "Флюоресценция" -#: ../src/filter-enums.cpp:97 +#: ../src/extension/internal/filter/color.h:514 #, fuzzy -msgid "Destination Over" -msgstr "Назначение" +msgid "Swap:" +msgstr "Форма:" -#: ../src/filter-enums.cpp:98 +#: ../src/extension/internal/filter/color.h:515 #, fuzzy -msgid "Destination In" -msgstr "Назначение" +msgid "No swap" +msgstr "Острые узлы" -#: ../src/filter-enums.cpp:99 +#: ../src/extension/internal/filter/color.h:516 #, fuzzy -msgid "Destination Out" -msgstr "Назначение" +msgid "Color and alpha" +msgstr "С управлением цветом" -#: ../src/filter-enums.cpp:100 +#: ../src/extension/internal/filter/color.h:517 #, fuzzy -msgid "Destination Atop" -msgstr "Назначение" +msgid "Color only" +msgstr "Цвет" -#: ../src/filter-enums.cpp:101 +#: ../src/extension/internal/filter/color.h:518 #, fuzzy -msgid "Lighter" -msgstr "Осветление" +msgid "Alpha only" +msgstr "Альфа-канал" -#: ../src/filter-enums.cpp:103 -msgid "Arithmetic" -msgstr "Арифметический" +#: ../src/extension/internal/filter/color.h:522 +#, fuzzy +msgid "Color 1" +msgstr "Цвет" -#: ../src/filter-enums.cpp:119 ../src/selection-chemistry.cpp:535 -msgid "Duplicate" -msgstr "Продублировать" +#: ../src/extension/internal/filter/color.h:525 +#, fuzzy +msgid "Color 2" +msgstr "Цвет" -#: ../src/filter-enums.cpp:120 -msgid "Wrap" -msgstr "Крупнее" +#: ../src/extension/internal/filter/color.h:535 +#, fuzzy +msgid "Convert luminance values to a duochrome palette" +msgstr "Преобразовать цвета в двухцветную палитру" -#: ../src/filter-enums.cpp:136 -msgid "Erode" -msgstr "Эрозия" +#: ../src/extension/internal/filter/color.h:634 +#, fuzzy +msgid "Extract Channel" +msgstr "Канал непрозрачности" -#: ../src/filter-enums.cpp:137 -msgid "Dilate" -msgstr "Дилатация" +#: ../src/extension/internal/filter/color.h:640 +#: ../src/widgets/sp-color-icc-selector.cpp:369 +#: ../src/widgets/sp-color-icc-selector.cpp:374 +#: ../src/widgets/sp-color-scales.cpp:483 +#: ../src/widgets/sp-color-scales.cpp:484 +msgid "Cyan" +msgstr "Голубой" -#: ../src/filter-enums.cpp:143 -msgid "Fractal Noise" -msgstr "Фрактальный шум" +#: ../src/extension/internal/filter/color.h:641 +#: ../src/widgets/sp-color-icc-selector.cpp:370 +#: ../src/widgets/sp-color-icc-selector.cpp:375 +#: ../src/widgets/sp-color-scales.cpp:486 +#: ../src/widgets/sp-color-scales.cpp:487 +msgid "Magenta" +msgstr "Пурпурный" -#: ../src/filter-enums.cpp:150 -msgid "Distant Light" -msgstr "Удалённый" +#: ../src/extension/internal/filter/color.h:642 +#: ../src/widgets/sp-color-icc-selector.cpp:371 +#: ../src/widgets/sp-color-icc-selector.cpp:376 +#: ../src/widgets/sp-color-scales.cpp:489 +#: ../src/widgets/sp-color-scales.cpp:490 +msgid "Yellow" +msgstr "Жёлтый" -#: ../src/filter-enums.cpp:151 -msgid "Point Light" -msgstr "Точечный" +#: ../src/extension/internal/filter/color.h:644 +#, fuzzy +msgid "Background blend mode:" +msgstr "Цвет фона:" -#: ../src/filter-enums.cpp:152 -msgid "Spot Light" -msgstr "Прожектор" +#: ../src/extension/internal/filter/color.h:649 +#, fuzzy +msgid "Channel to alpha" +msgstr "Освещенность в альфа" -#: ../src/gradient-chemistry.cpp:1580 +#: ../src/extension/internal/filter/color.h:657 #, fuzzy -msgid "Invert gradient colors" -msgstr "Инвертирование градиента" +msgid "Extract color channel as a transparent image" +msgstr "Извлечь указанный канал из изображения" -#: ../src/gradient-chemistry.cpp:1606 +#: ../src/extension/internal/filter/color.h:740 #, fuzzy -msgid "Reverse gradient" -msgstr "Линейный градиент" +msgid "Fade to Black or White" +msgstr "Только чёрный и белый" -#: ../src/gradient-chemistry.cpp:1620 ../src/widgets/gradient-selector.cpp:245 +#: ../src/extension/internal/filter/color.h:743 #, fuzzy -msgid "Delete swatch" -msgstr "Удалить опорную точку" +msgid "Fade to:" +msgstr "Угасание" -#: ../src/gradient-drag.cpp:97 ../src/ui/tools/gradient-tool.cpp:100 -msgid "Linear gradient <b>start</b>" -msgstr "Линейный градиент: <b>начало</b>" +#: ../src/extension/internal/filter/color.h:744 +#: ../src/ui/widget/selected-style.cpp:261 +#: ../src/widgets/sp-color-icc-selector.cpp:372 +#: ../src/widgets/sp-color-scales.cpp:492 +#: ../src/widgets/sp-color-scales.cpp:493 +msgid "Black" +msgstr "Черный" -#. POINT_LG_BEGIN -#: ../src/gradient-drag.cpp:98 ../src/ui/tools/gradient-tool.cpp:101 -msgid "Linear gradient <b>end</b>" -msgstr "Линейный градиент: <b>конец</b>" +#: ../src/extension/internal/filter/color.h:745 +#: ../src/ui/widget/selected-style.cpp:257 +msgid "White" +msgstr "Белый" -#: ../src/gradient-drag.cpp:99 ../src/ui/tools/gradient-tool.cpp:102 -msgid "Linear gradient <b>mid stop</b>" -msgstr "<b>Опорная точка</b> линейного градиента" +#: ../src/extension/internal/filter/color.h:754 +#, fuzzy +msgid "Fade to black or white" +msgstr "Только ч/б" -#: ../src/gradient-drag.cpp:100 ../src/ui/tools/gradient-tool.cpp:103 -msgid "Radial gradient <b>center</b>" -msgstr "Радиальный градиент: <b>центр</b>" +#: ../src/extension/internal/filter/color.h:819 +msgid "Greyscale" +msgstr "Градации серого" -#: ../src/gradient-drag.cpp:101 ../src/gradient-drag.cpp:102 -#: ../src/ui/tools/gradient-tool.cpp:104 ../src/ui/tools/gradient-tool.cpp:105 -msgid "Radial gradient <b>radius</b>" -msgstr "Радиальный градиент: <b>радиус</b>" +#: ../src/extension/internal/filter/color.h:825 +#: ../src/extension/internal/filter/paint.h:83 +#: ../src/extension/internal/filter/paint.h:239 +#, fuzzy +msgid "Transparent" +msgstr "0 (прозрачно)" -#: ../src/gradient-drag.cpp:103 ../src/ui/tools/gradient-tool.cpp:106 -msgid "Radial gradient <b>focus</b>" -msgstr "Радиальный градиент: <b>фокус</b>" +#: ../src/extension/internal/filter/color.h:833 +msgid "Customize greyscale components" +msgstr "" -#. POINT_RG_FOCUS -#: ../src/gradient-drag.cpp:104 ../src/gradient-drag.cpp:105 -#: ../src/ui/tools/gradient-tool.cpp:107 ../src/ui/tools/gradient-tool.cpp:108 -msgid "Radial gradient <b>mid stop</b>" -msgstr "<b>Опорная точка</b> радиального градиента" +#: ../src/extension/internal/filter/color.h:905 +#: ../src/ui/widget/selected-style.cpp:253 +msgid "Invert" +msgstr "Инвертировать" -#: ../src/gradient-drag.cpp:106 ../src/ui/tools/mesh-tool.cpp:103 +#: ../src/extension/internal/filter/color.h:907 #, fuzzy -msgid "Mesh gradient <b>corner</b>" -msgstr "Радиальный градиент: <b>центр</b>" +msgid "Invert channels:" +msgstr "Инвертировать тон" -#: ../src/gradient-drag.cpp:107 ../src/ui/tools/mesh-tool.cpp:104 +#: ../src/extension/internal/filter/color.h:908 #, fuzzy -msgid "Mesh gradient <b>handle</b>" -msgstr "Смещение рычага градиента" +msgid "No inversion" +msgstr "(без инерции)" -#: ../src/gradient-drag.cpp:108 ../src/ui/tools/mesh-tool.cpp:105 -#, fuzzy -msgid "Mesh gradient <b>tensor</b>" -msgstr "Линейный градиент: <b>конец</b>" +#: ../src/extension/internal/filter/color.h:909 +msgid "Red and blue" +msgstr "Красный и синий" -#: ../src/gradient-drag.cpp:567 -msgid "Added patch row or column" -msgstr "" +#: ../src/extension/internal/filter/color.h:910 +msgid "Red and green" +msgstr "Красный и зелёный" -#: ../src/gradient-drag.cpp:797 -msgid "Merge gradient handles" -msgstr "Объединение рычагов градиента" +#: ../src/extension/internal/filter/color.h:911 +msgid "Green and blue" +msgstr "Зелёный и синий" -#: ../src/gradient-drag.cpp:1104 -msgid "Move gradient handle" -msgstr "Смещение рычага градиента" +#: ../src/extension/internal/filter/color.h:913 +#, fuzzy +msgid "Light transparency" +msgstr "Полупрозрачный шум" -#: ../src/gradient-drag.cpp:1163 ../src/widgets/gradient-vector.cpp:847 -msgid "Delete gradient stop" -msgstr "Удаление опорной точки" +#: ../src/extension/internal/filter/color.h:914 +msgid "Invert hue" +msgstr "Инвертировать тон" -#: ../src/gradient-drag.cpp:1426 -#, c-format -msgid "" -"%s %d for: %s%s; drag with <b>Ctrl</b> to snap offset; click with <b>Ctrl" -"+Alt</b> to delete stop" -msgstr "" -"%s %d для: %s%s; c <b>Ctrl</b> прилипать по 1/10 радиуса, щелчком с <b>Ctrl" -"+Alt</b> удалить опорную точку" +#: ../src/extension/internal/filter/color.h:915 +msgid "Invert lightness" +msgstr "Инвертировать светлоту" -#: ../src/gradient-drag.cpp:1430 ../src/gradient-drag.cpp:1437 -msgid " (stroke)" -msgstr "(штрих)" +#: ../src/extension/internal/filter/color.h:916 +msgid "Invert transparency" +msgstr "Инвертировать прозрачность" -#: ../src/gradient-drag.cpp:1434 -#, c-format -msgid "" -"%s for: %s%s; drag with <b>Ctrl</b> to snap angle, with <b>Ctrl+Alt</b> to " -"preserve angle, with <b>Ctrl+Shift</b> to scale around center" +#: ../src/extension/internal/filter/color.h:924 +msgid "Manage hue, lightness and transparency inversions" msgstr "" -"%s для: %s%s; <b>Ctrl</b> ограничивает угол, <b>Ctrl+Alt</b> фиксирует " -"угол, <b>Ctrl+Shift</b> масштабирует вокруг центра" -#: ../src/gradient-drag.cpp:1442 -msgid "" -"Radial gradient <b>center</b> and <b>focus</b>; drag with <b>Shift</b> to " -"separate focus" +#: ../src/extension/internal/filter/color.h:1042 +#, fuzzy +msgid "Lights" +msgstr "Света:" + +#: ../src/extension/internal/filter/color.h:1043 +#, fuzzy +msgid "Shadows" +msgstr "Тени:" + +#: ../src/extension/internal/filter/color.h:1044 +#: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:32 +#: ../src/live_effects/effect.cpp:95 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1047 +#: ../src/widgets/gradient-toolbar.cpp:1156 +msgid "Offset" +msgstr "Смещение" + +#: ../src/extension/internal/filter/color.h:1052 +msgid "Modify lights and shadows separately" msgstr "" -"<b>Центр</b> и <b>фокус</b> радиального градиента; перетаскивание с " -"<b>Shift</b> отделяет фокус" -#: ../src/gradient-drag.cpp:1445 -#, c-format -msgid "" -"Gradient point shared by <b>%d</b> gradient; drag with <b>Shift</b> to " -"separate" -msgid_plural "" -"Gradient point shared by <b>%d</b> gradients; drag with <b>Shift</b> to " -"separate" -msgstr[0] "" -"Точка градиента, общая для <b>%d</b> градиента; перетаскивание с <b>Shift</" -"b> разделяет точки" -msgstr[1] "" -"Точка градиента, общая для <b>%d</b> градиентов; перетаскивание с <b>Shift</" -"b> разделяет точки" -msgstr[2] "" -"Точка градиента, общая для <b>%d</b> градиентов; перетаскивание с <b>Shift</" -"b> разделяет точки" +#: ../src/extension/internal/filter/color.h:1111 +msgid "Lightness-Contrast" +msgstr "Освещенность-Контраст" -#: ../src/gradient-drag.cpp:2377 -msgid "Move gradient handle(s)" -msgstr "Смещение рычага градиента" +#: ../src/extension/internal/filter/color.h:1122 +#, fuzzy +msgid "Modify lightness and contrast separately" +msgstr "Повысить или понизить освещенность и контраст" -#: ../src/gradient-drag.cpp:2413 -msgid "Move gradient mid stop(s)" -msgstr "Смещение опорной точки градиента" +#: ../src/extension/internal/filter/color.h:1190 +msgid "Nudge RGB" +msgstr "" -#: ../src/gradient-drag.cpp:2702 -msgid "Delete gradient stop(s)" -msgstr "Удалить опорную точку (-и)" +#: ../src/extension/internal/filter/color.h:1194 +#, fuzzy +msgid "Red offset" +msgstr "Смещение пунктира" -#: ../src/inkscape.cpp:344 +#: ../src/extension/internal/filter/color.h:1195 +#: ../src/extension/internal/filter/color.h:1198 +#: ../src/extension/internal/filter/color.h:1201 +#: ../src/extension/internal/filter/color.h:1307 +#: ../src/extension/internal/filter/color.h:1310 +#: ../src/extension/internal/filter/color.h:1313 +#: ../src/ui/dialog/input.cpp:1616 ../src/ui/dialog/layers.cpp:917 +msgid "X" +msgstr "X" + +#: ../src/extension/internal/filter/color.h:1196 +#: ../src/extension/internal/filter/color.h:1199 +#: ../src/extension/internal/filter/color.h:1202 +#: ../src/extension/internal/filter/color.h:1308 +#: ../src/extension/internal/filter/color.h:1311 +#: ../src/extension/internal/filter/color.h:1314 +#: ../src/ui/dialog/input.cpp:1616 #, fuzzy -msgid "Autosave failed! Cannot create directory %1." -msgstr "Невозможно создать каталог с профилем %s." +msgid "Y" +msgstr "Y:" -#: ../src/inkscape.cpp:353 +#: ../src/extension/internal/filter/color.h:1197 #, fuzzy -msgid "Autosave failed! Cannot open directory %1." -msgstr "Некорректный рабочий каталог: %s" +msgid "Green offset" +msgstr "Смещение пунктира" -#: ../src/inkscape.cpp:369 -msgid "Autosaving documents..." -msgstr "Выполняется автоматическое сохранение документов..." +#: ../src/extension/internal/filter/color.h:1200 +#, fuzzy +msgid "Blue offset" +msgstr "Устанавливаемое значение:" -#: ../src/inkscape.cpp:442 -msgid "Autosave failed! Could not find inkscape extension to save document." +#: ../src/extension/internal/filter/color.h:1215 +msgid "" +"Nudge RGB channels separately and blend them to different types of " +"backgrounds" msgstr "" -"Автосохранение не сработало! Не удалось найти расширение Inkscape для " -"сохранения документа." -#: ../src/inkscape.cpp:445 ../src/inkscape.cpp:452 -#, c-format -msgid "Autosave failed! File %s could not be saved." -msgstr "Не удалось автоматически сохранить файл %s!" +#: ../src/extension/internal/filter/color.h:1302 +msgid "Nudge CMY" +msgstr "" -#: ../src/inkscape.cpp:467 -msgid "Autosave complete." -msgstr "Автосохранение завершено" +#: ../src/extension/internal/filter/color.h:1306 +#, fuzzy +msgid "Cyan offset" +msgstr "Смещение пунктира" -#: ../src/inkscape.cpp:715 -msgid "Untitled document" -msgstr "Без названия" +#: ../src/extension/internal/filter/color.h:1309 +#, fuzzy +msgid "Magenta offset" +msgstr "Смещение по касательной:" -#. Show nice dialog box -#: ../src/inkscape.cpp:747 -msgid "Inkscape encountered an internal error and will close now.\n" -msgstr "Внутренняя ошибка. Inkscape придется закрыть.\n" +#: ../src/extension/internal/filter/color.h:1312 +#, fuzzy +msgid "Yellow offset" +msgstr "Смещение пунктира" -#: ../src/inkscape.cpp:748 +#: ../src/extension/internal/filter/color.h:1327 msgid "" -"Automatic backups of unsaved documents were done to the following " -"locations:\n" +"Nudge CMY channels separately and blend them to different types of " +"backgrounds" msgstr "" -"Выполнено автоматическое резервное копирование несохраненных документов:\n" -#: ../src/inkscape.cpp:749 -msgid "Automatic backup of the following documents failed:\n" -msgstr "Не получилось сохранить резервную копию следующего документа:\n" +#: ../src/extension/internal/filter/color.h:1408 +msgid "Quadritone fantasy" +msgstr "Квадроплексная фантазия" -#: ../src/interface.cpp:748 -msgctxt "Interface setup" -msgid "Default" -msgstr "По умолчанию" +#: ../src/extension/internal/filter/color.h:1410 +#, fuzzy +msgid "Hue distribution (°)" +msgstr "Использовать обычное распределение" -#: ../src/interface.cpp:748 -msgid "Default interface setup" -msgstr "Вид интерфейса по умолчанию" +#: ../src/extension/internal/filter/color.h:1411 +#: ../share/extensions/svgcalendar.inx.h:19 +msgid "Colors" +msgstr "В цвете" -#: ../src/interface.cpp:749 -msgctxt "Interface setup" -msgid "Custom" -msgstr "Пользовательский" +#: ../src/extension/internal/filter/color.h:1432 +msgid "Replace hue by two colors" +msgstr "Заменить тон двумя цветами" -#: ../src/interface.cpp:749 +#: ../src/extension/internal/filter/color.h:1496 #, fuzzy -msgid "Setup for custom task" -msgstr "Назначить заказную задачу" +msgid "Hue rotation (°)" +msgstr "Вращение тона:" -#: ../src/interface.cpp:750 -msgctxt "Interface setup" -msgid "Wide" -msgstr "Широкий" +#: ../src/extension/internal/filter/color.h:1499 +msgid "Moonarize" +msgstr "Лунизация" -#: ../src/interface.cpp:750 +#: ../src/extension/internal/filter/color.h:1508 #, fuzzy -msgid "Setup for widescreen work" -msgstr "Настроить под широкоформатные экраны" - -#: ../src/interface.cpp:862 -#, c-format -msgid "Verb \"%s\" Unknown" -msgstr "Глагол \"%s\" неизвестен" - -#: ../src/interface.cpp:901 -msgid "Open _Recent" -msgstr "Открыть н_едавние" - -#: ../src/interface.cpp:1009 ../src/interface.cpp:1095 -#: ../src/interface.cpp:1198 ../src/ui/widget/selected-style.cpp:528 -msgid "Drop color" -msgstr "Перенос цвета" - -#: ../src/interface.cpp:1048 ../src/interface.cpp:1158 -msgid "Drop color on gradient" -msgstr "Перенос цвета на градиент" +msgid "Classic photographic solarization effect" +msgstr "Классический фотоэффект соляризации" -#: ../src/interface.cpp:1211 -msgid "Could not parse SVG data" -msgstr "Невозможно разобрать данные SVG" +#: ../src/extension/internal/filter/color.h:1581 +msgid "Tritone" +msgstr "Триплекс" -#: ../src/interface.cpp:1250 -msgid "Drop SVG" -msgstr "Drop SVG" +#: ../src/extension/internal/filter/color.h:1587 +#, fuzzy +msgid "Enhance hue" +msgstr "Повысить качество" -#: ../src/interface.cpp:1263 +#: ../src/extension/internal/filter/color.h:1588 #, fuzzy -msgid "Drop Symbol" -msgstr "Кхмерские символы" +msgid "Phosphorescence" +msgstr "Наличие" -#: ../src/interface.cpp:1294 -msgid "Drop bitmap image" -msgstr "Импорт растра" +#: ../src/extension/internal/filter/color.h:1589 +#, fuzzy +msgid "Colored nights" +msgstr "В цвете" -#: ../src/interface.cpp:1386 -#, c-format -msgid "" -"<span weight=\"bold\" size=\"larger\">A file named \"%s\" already exists. Do " -"you want to replace it?</span>\n" -"\n" -"The file already exists in \"%s\". Replacing it will overwrite its contents." -msgstr "" -"<span weight=\"bold\" size=\"larger\">Файл с именем \"%s\" уже существует. " -"Вы хотите его заменить?</span>\n" -"\n" -"Этот файл уже есть в каталоге \"%s\". Замена перезапишет его содержание." +#: ../src/extension/internal/filter/color.h:1590 +#, fuzzy +msgid "Hue to background" +msgstr "Убрать фон" -#: ../src/interface.cpp:1392 ../src/ui/dialog/export.cpp:1302 -#: ../src/widgets/desktop-widget.cpp:1122 -#: ../src/widgets/desktop-widget.cpp:1184 +#: ../src/extension/internal/filter/color.h:1592 #, fuzzy -msgid "_Cancel" -msgstr "Отменить" +msgid "Global blend:" +msgstr "Общий изгиб" -#: ../src/interface.cpp:1393 ../share/extensions/web-set-att.inx.h:21 -#: ../share/extensions/web-transmit-att.inx.h:19 -msgid "Replace" -msgstr "Заменить" +#: ../src/extension/internal/filter/color.h:1598 +msgid "Glow" +msgstr "Свечение" -#: ../src/interface.cpp:1464 -msgid "Go to parent" -msgstr "На уровень выше" +#: ../src/extension/internal/filter/color.h:1599 +#, fuzzy +msgid "Glow blend:" +msgstr "Светящийся пузырь" -#. TRANSLATORS: #%1 is the id of the group e.g. <g id="#g7">, not a number. -#: ../src/interface.cpp:1505 +#: ../src/extension/internal/filter/color.h:1604 #, fuzzy -msgid "Enter group #%1" -msgstr "Войти в группу #%s" +msgid "Local light" +msgstr "Отражение света" -#. Item dialog -#: ../src/interface.cpp:1641 ../src/verbs.cpp:2849 -msgid "_Object Properties..." -msgstr "_Свойства объекта..." +#: ../src/extension/internal/filter/color.h:1605 +#, fuzzy +msgid "Global light" +msgstr "Общий изгиб" -#: ../src/interface.cpp:1650 -msgid "_Select This" -msgstr "_Выделить это" +#: ../src/extension/internal/filter/color.h:1608 +#, fuzzy +msgid "Hue distribution (°):" +msgstr "Использовать обычное распределение" -#: ../src/interface.cpp:1661 -msgid "Select Same" -msgstr "Выбрать одинаковые" +#: ../src/extension/internal/filter/color.h:1619 +msgid "" +"Create a custom tritone palette with additional glow, blend modes and hue " +"moving" +msgstr "" -#. Select same fill and stroke -#: ../src/interface.cpp:1671 -msgid "Fill and Stroke" -msgstr "Заливку и обводку" +#: ../src/extension/internal/filter/distort.h:67 +#, fuzzy +msgid "Felt Feather" +msgstr "Растушёвка" -#. Select same fill color -#: ../src/interface.cpp:1678 -msgid "Fill Color" -msgstr "Цвет заливки" +#: ../src/extension/internal/filter/distort.h:71 +#: ../src/extension/internal/filter/morphology.h:175 +#: ../src/filter-enums.cpp:89 +msgid "Out" +msgstr "Выход" -#. Select same stroke color -#: ../src/interface.cpp:1685 -msgid "Stroke Color" -msgstr "Цвет обводки" +#: ../src/extension/internal/filter/distort.h:77 +#: ../src/extension/internal/filter/textures.h:75 +#: ../src/ui/widget/selected-style.cpp:131 +#: ../src/ui/widget/style-swatch.cpp:128 +msgid "Stroke:" +msgstr "Обводка:" -#. Select same stroke style -#: ../src/interface.cpp:1692 -msgid "Stroke Style" -msgstr "Стиль обводки" +#: ../src/extension/internal/filter/distort.h:79 +#: ../src/extension/internal/filter/textures.h:76 +msgid "Wide" +msgstr "Широкий" -#. Select same stroke style -#: ../src/interface.cpp:1699 -msgid "Object type" -msgstr "Тип объекта" +#: ../src/extension/internal/filter/distort.h:80 +#: ../src/extension/internal/filter/textures.h:78 +#, fuzzy +msgid "Narrow" +msgstr "Узкие" -#. Move to layer -#: ../src/interface.cpp:1706 -msgid "_Move to layer ..." -msgstr "Пере_местить на слой..." +#: ../src/extension/internal/filter/distort.h:81 +msgid "No fill" +msgstr "Без заливки" -#. Create link -#: ../src/interface.cpp:1716 +#: ../src/extension/internal/filter/distort.h:83 #, fuzzy -msgid "Create _Link" -msgstr "Создать сс_ылку" +msgid "Turbulence:" +msgstr "Турбулентность" -#. Set mask -#: ../src/interface.cpp:1739 -msgid "Set Mask" -msgstr "Применить маску" +#: ../src/extension/internal/filter/distort.h:84 +#: ../src/extension/internal/filter/distort.h:193 +#: ../src/extension/internal/filter/overlays.h:61 +#: ../src/extension/internal/filter/paint.h:692 +#, fuzzy +msgid "Fractal noise" +msgstr "Фрактальный шум" -#. Release mask -#: ../src/interface.cpp:1750 -msgid "Release Mask" -msgstr "Снять маску" +#: ../src/extension/internal/filter/distort.h:85 +#: ../src/extension/internal/filter/distort.h:194 +#: ../src/extension/internal/filter/overlays.h:62 +#: ../src/extension/internal/filter/paint.h:693 ../src/filter-enums.cpp:35 +#: ../src/filter-enums.cpp:144 +msgid "Turbulence" +msgstr "Турбулентность" -#. Set Clip -#: ../src/interface.cpp:1761 +#: ../src/extension/internal/filter/distort.h:87 +#: ../src/extension/internal/filter/distort.h:196 +#: ../src/extension/internal/filter/paint.h:93 +#: ../src/extension/internal/filter/paint.h:695 #, fuzzy -msgid "Set Cl_ip" -msgstr "Применить о_бтравочный контур" - -#. Release Clip -#: ../src/interface.cpp:1772 -msgid "Release C_lip" -msgstr "С_нять обтравочный контур" +msgid "Horizontal frequency" +msgstr "Сдвиг по горизонтали, px" -#. Group -#: ../src/interface.cpp:1783 ../src/verbs.cpp:2486 -msgid "_Group" -msgstr "С_группировать" +#: ../src/extension/internal/filter/distort.h:88 +#: ../src/extension/internal/filter/distort.h:197 +#: ../src/extension/internal/filter/paint.h:94 +#: ../src/extension/internal/filter/paint.h:696 +#, fuzzy +msgid "Vertical frequency" +msgstr "Сдвиг по вертикали, px" -#: ../src/interface.cpp:1854 -msgid "Create link" -msgstr "Создание ссылки" +#: ../src/extension/internal/filter/distort.h:89 +#: ../src/extension/internal/filter/distort.h:198 +#: ../src/extension/internal/filter/paint.h:95 +#: ../src/extension/internal/filter/paint.h:697 +#, fuzzy +msgid "Complexity" +msgstr "Макс. сложность" -#. Ungroup -#: ../src/interface.cpp:1885 ../src/verbs.cpp:2488 -msgid "_Ungroup" -msgstr "Разгр_уппировать" +#: ../src/extension/internal/filter/distort.h:90 +#: ../src/extension/internal/filter/distort.h:199 +#: ../src/extension/internal/filter/paint.h:96 +#: ../src/extension/internal/filter/paint.h:698 +#, fuzzy +msgid "Variation" +msgstr "Насыщенность" -#. Link dialog -#: ../src/interface.cpp:1910 -msgid "Link _Properties..." -msgstr "_Свойства ссылки…" +#: ../src/extension/internal/filter/distort.h:91 +#: ../src/extension/internal/filter/distort.h:200 +#, fuzzy +msgid "Intensity" +msgstr "Идентичная функция" -#. Select item -#: ../src/interface.cpp:1916 -msgid "_Follow Link" -msgstr "Перейти по ссылке" +#: ../src/extension/internal/filter/distort.h:99 +#, fuzzy +msgid "Blur and displace edges of shapes and pictures" +msgstr "" +"Создать раскрашиваемое свечение краёв внутри объектов и растровых изображений" -#. Reset transformations -#: ../src/interface.cpp:1922 -msgid "_Remove Link" -msgstr "_Удалить ссылку" +#: ../src/extension/internal/filter/distort.h:190 +msgid "Roughen" +msgstr "Огрубление" -#: ../src/interface.cpp:1953 +#: ../src/extension/internal/filter/distort.h:192 +#: ../src/extension/internal/filter/overlays.h:60 +#: ../src/extension/internal/filter/paint.h:691 +#: ../src/extension/internal/filter/textures.h:64 #, fuzzy -msgid "Remove link" -msgstr "_Удалить ссылку" +msgid "Turbulence type:" +msgstr "Турбулентность" -#. Image properties -#: ../src/interface.cpp:1964 -msgid "Image _Properties..." -msgstr "_Свойства изображения…" +#: ../src/extension/internal/filter/distort.h:208 +msgid "Small-scale roughening to edges and content" +msgstr "Небольшое загрубление краёв и содержимого" -#. Edit externally -#: ../src/interface.cpp:1970 -msgid "Edit Externally..." -msgstr "Изменить извне..." +#: ../src/extension/internal/filter/filter-file.cpp:34 +msgid "Bundled" +msgstr "Из поставки" -#. Trace Bitmap -#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/interface.cpp:1979 ../src/verbs.cpp:2549 -msgid "_Trace Bitmap..." -msgstr "_Векторизовать растр..." +#: ../src/extension/internal/filter/filter-file.cpp:35 +msgid "Personal" +msgstr "Личное" -#. Trace Pixel Art -#: ../src/interface.cpp:1988 -msgid "Trace Pixel Art" +#: ../src/extension/internal/filter/filter-file.cpp:47 +msgid "Null external module directory name. Filters will not be loaded." +msgstr "Нулевое имя каталога с внешними модулями. Фильтры не будут загружены." + +#: ../src/extension/internal/filter/image.h:49 +#, fuzzy +msgid "Edge Detect" +msgstr "Определение краёв" + +#: ../src/extension/internal/filter/image.h:51 +msgid "Detect:" msgstr "" -#: ../src/interface.cpp:1998 +#: ../src/extension/internal/filter/image.h:52 +#: ../src/ui/dialog/template-load-tab.cpp:105 +#: ../src/ui/dialog/template-load-tab.cpp:142 #, fuzzy -msgctxt "Context menu" -msgid "Embed Image" -msgstr "Встроить все растровые изображения" +msgid "All" +msgstr "Все" -#: ../src/interface.cpp:2009 +#: ../src/extension/internal/filter/image.h:53 #, fuzzy -msgctxt "Context menu" -msgid "Extract Image..." -msgstr "Извлечь растровое изображение" +msgid "Vertical lines" +msgstr "Вертикальный радиус" -#. Item dialog -#. Fill and Stroke dialog -#: ../src/interface.cpp:2154 ../src/interface.cpp:2174 ../src/verbs.cpp:2812 -msgid "_Fill and Stroke..." -msgstr "_Заливка и обводка..." +#: ../src/extension/internal/filter/image.h:54 +#, fuzzy +msgid "Horizontal lines" +msgstr "Горизонтальный радиус" -#. Edit Text dialog -#: ../src/interface.cpp:2180 ../src/verbs.cpp:2831 -msgid "_Text and Font..." -msgstr "_Текст и шрифт..." +#: ../src/extension/internal/filter/image.h:57 +msgid "Invert colors" +msgstr "Инвертировать цвета" -#. Spellcheck dialog -#: ../src/interface.cpp:2186 ../src/verbs.cpp:2839 -msgid "Check Spellin_g..." -msgstr "Проверить _орфографию..." +#: ../src/extension/internal/filter/image.h:65 +msgid "Detect color edges in object" +msgstr "Найти в объекте цветные края" -#: ../src/knot.cpp:332 -msgid "Node or handle drag canceled." -msgstr "Перемещение отменено." +#: ../src/extension/internal/filter/morphology.h:58 +msgid "Cross-smooth" +msgstr "Перекрестное сглаживание" -#: ../src/knotholder.cpp:158 -msgid "Change handle" -msgstr "Смена рычага" +#: ../src/extension/internal/filter/morphology.h:61 +#: ../src/extension/internal/filter/shadows.h:66 +#, fuzzy +msgid "Inner" +msgstr "Внутреннее свечение" -#: ../src/knotholder.cpp:237 -msgid "Move handle" -msgstr "Смещение рычага" +#: ../src/extension/internal/filter/morphology.h:62 +#: ../src/extension/internal/filter/shadows.h:65 +msgid "Outer" +msgstr "" -#. TRANSLATORS: This refers to the pattern that's inside the object -#: ../src/knotholder.cpp:256 ../src/knotholder.cpp:278 -msgid "<b>Move</b> the pattern fill inside the object" -msgstr "<b>Двигать</b> текстурную заливку внутри объекта" +#: ../src/extension/internal/filter/morphology.h:63 +#, fuzzy +msgid "Open" +msgstr "_Открыть..." -#: ../src/knotholder.cpp:260 ../src/knotholder.cpp:282 -msgid "<b>Scale</b> the pattern fill; uniformly if with <b>Ctrl</b>" +#: ../src/extension/internal/filter/morphology.h:65 +#: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 +#: ../src/widgets/rect-toolbar.cpp:314 ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/tweak-toolbar.cpp:128 +#: ../share/extensions/interp_att_g.inx.h:10 +msgid "Width" +msgstr "Ширина" + +#: ../src/extension/internal/filter/morphology.h:69 +#: ../src/extension/internal/filter/morphology.h:190 +#, fuzzy +msgid "Antialiasing" +msgstr "Сглаживать" + +#: ../src/extension/internal/filter/morphology.h:70 +msgid "Blur content" +msgstr "Размыть содержимое" + +#: ../src/extension/internal/filter/morphology.h:79 +msgid "Smooth edges and angles of shapes" msgstr "" -"<b>Масштабировать</b> текстурную заливку; с <b>Ctrl</b> — пропорционально" -#: ../src/knotholder.cpp:264 ../src/knotholder.cpp:286 -msgid "<b>Rotate</b> the pattern fill; with <b>Ctrl</b> to snap angle" -msgstr "<b>Вращать</b> текстурную заливку, <b>Ctrl</b> ограничивает угол" +#: ../src/extension/internal/filter/morphology.h:166 +msgid "Outline" +msgstr "Контур" -#: ../src/libgdl/gdl-dock-bar.c:105 -msgid "Master" -msgstr "Ведущая" +#: ../src/extension/internal/filter/morphology.h:170 +#, fuzzy +msgid "Fill image" +msgstr "Все изображения" -#: ../src/libgdl/gdl-dock-bar.c:106 -msgid "GdlDockMaster object which the dockbar widget is attached to" -msgstr "GdlDockMaster object which the dockbar widget is attached to" +#: ../src/extension/internal/filter/morphology.h:171 +#, fuzzy +msgid "Hide image" +msgstr "Сокрытие слоя" -#: ../src/libgdl/gdl-dock-bar.c:113 -msgid "Dockbar style" -msgstr "Стиль панели" +#: ../src/extension/internal/filter/morphology.h:172 +#, fuzzy +msgid "Composite type:" +msgstr "Совмещение" -#: ../src/libgdl/gdl-dock-bar.c:114 -msgid "Dockbar style to show items on it" -msgstr "Dockbar style to show items on it" +#: ../src/extension/internal/filter/morphology.h:173 +#: ../src/filter-enums.cpp:87 +msgid "Over" +msgstr "Над" -#: ../src/libgdl/gdl-dock-item-grip.c:399 -msgid "Iconify this dock" -msgstr "Свернуть эту панель" +#: ../src/extension/internal/filter/morphology.h:177 +#: ../src/filter-enums.cpp:91 +msgid "XOR" +msgstr "Исключающее ИЛИ (XOR)" -#: ../src/libgdl/gdl-dock-item-grip.c:401 -msgid "Close this dock" -msgstr "Закрыть эту панель" +#: ../src/extension/internal/filter/morphology.h:179 +#: ../src/ui/dialog/layer-properties.cpp:185 +msgid "Position:" +msgstr "Положение:" -#: ../src/libgdl/gdl-dock-item-grip.c:720 -#: ../src/libgdl/gdl-dock-tablabel.c:125 -msgid "Controlling dock item" -msgstr "Controlling dock item" +#: ../src/extension/internal/filter/morphology.h:180 +#, fuzzy +msgid "Inside" +msgstr "2-ая сторона:" -#: ../src/libgdl/gdl-dock-item-grip.c:721 -msgid "Dockitem which 'owns' this grip" -msgstr "Dockitem which 'owns' this grip" +#: ../src/extension/internal/filter/morphology.h:181 +#, fuzzy +msgid "Outside" +msgstr "Вы_тянуть" -#. Name -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:191 -#: ../src/widgets/text-toolbar.cpp:1416 -#: ../share/extensions/gcodetools_graffiti.inx.h:9 -#: ../share/extensions/gcodetools_orientation_points.inx.h:2 -msgid "Orientation" -msgstr "Ориентация" +#: ../src/extension/internal/filter/morphology.h:182 +#, fuzzy +msgid "Overlayed" +msgstr "Перекрытия" -#: ../src/libgdl/gdl-dock-item.c:299 -msgid "Orientation of the docking item" -msgstr "Ориентация прикрепленной панели" +#: ../src/extension/internal/filter/morphology.h:184 +#, fuzzy +msgid "Width 1" +msgstr "Ширина:" -#: ../src/libgdl/gdl-dock-item.c:314 -msgid "Resizable" -msgstr "Размер изменяем" +#: ../src/extension/internal/filter/morphology.h:185 +#, fuzzy +msgid "Dilatation 1" +msgstr "Насыщенность" -#: ../src/libgdl/gdl-dock-item.c:315 +#: ../src/extension/internal/filter/morphology.h:186 #, fuzzy -msgid "If set, the dock item can be resized when docked in a GtkPanel widget" -msgstr "Если включено, пришвартованный объект может менять свой размер" +msgid "Erosion 1" +msgstr "Положение:" -#: ../src/libgdl/gdl-dock-item.c:322 -msgid "Item behavior" -msgstr "Поведение панели" +#: ../src/extension/internal/filter/morphology.h:187 +#, fuzzy +msgid "Width 2" +msgstr "Ширина:" -#: ../src/libgdl/gdl-dock-item.c:323 -msgid "" -"General behavior for the dock item (i.e. whether it can float, if it's " -"locked, etc.)" -msgstr "" -"General behavior for the dock item (i.e. whether it can float, if it's " -"locked, etc.)" +#: ../src/extension/internal/filter/morphology.h:188 +#, fuzzy +msgid "Dilatation 2" +msgstr "Насыщенность" -#: ../src/libgdl/gdl-dock-item.c:331 ../src/libgdl/gdl-dock-master.c:148 -msgid "Locked" -msgstr "Заблокирована" +#: ../src/extension/internal/filter/morphology.h:189 +#, fuzzy +msgid "Erosion 2" +msgstr "Положение:" -#: ../src/libgdl/gdl-dock-item.c:332 -msgid "" -"If set, the dock item cannot be dragged around and it doesn't show a grip" -msgstr "" -"If set, the dock item cannot be dragged around and it doesn't show a grip" +#: ../src/extension/internal/filter/morphology.h:191 +msgid "Smooth" +msgstr "Сгладить" -#: ../src/libgdl/gdl-dock-item.c:340 -msgid "Preferred width" -msgstr "Предпочитаемая ширина" +#: ../src/extension/internal/filter/morphology.h:195 +msgid "Fill opacity:" +msgstr "Непрозрачность заливки:" -#: ../src/libgdl/gdl-dock-item.c:341 -msgid "Preferred width for the dock item" -msgstr "Предпочитаемая ширина прикрепленной панели" +#: ../src/extension/internal/filter/morphology.h:196 +msgid "Stroke opacity:" +msgstr "Непрозрачность обводки:" -#: ../src/libgdl/gdl-dock-item.c:347 -msgid "Preferred height" -msgstr "Предпочитаемая высота" +#: ../src/extension/internal/filter/morphology.h:206 +#, fuzzy +msgid "Adds a colorizable outline" +msgstr "Создать раскрашиваемое свечение изнутри" -#: ../src/libgdl/gdl-dock-item.c:348 -msgid "Preferred height for the dock item" -msgstr "Предпочитаемая высота прикрепленной панели" +#: ../src/extension/internal/filter/overlays.h:56 +#, fuzzy +msgid "Noise Fill" +msgstr "Заливка шумом" -#: ../src/libgdl/gdl-dock-item.c:716 -#, c-format -msgid "" -"You can't add a dock object (%p of type %s) inside a %s. Use a GdlDock or " -"some other compound dock object." -msgstr "" -"You can't add a dock object (%p of type %s) inside a %s. Use a GdlDock or " -"some other compound dock object." +#: ../src/extension/internal/filter/overlays.h:59 +#: ../src/extension/internal/filter/paint.h:690 +#: ../src/extension/internal/filter/shadows.h:60 ../src/ui/dialog/find.cpp:87 +#: ../src/ui/dialog/tracedialog.cpp:747 +#: ../share/extensions/color_HSL_adjust.inx.h:2 +#: ../share/extensions/color_custom.inx.h:2 +#: ../share/extensions/color_randomize.inx.h:2 +#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2 +#: ../share/extensions/dxf_outlines.inx.h:2 +#: ../share/extensions/gcodetools_area.inx.h:29 +#: ../share/extensions/gcodetools_engraving.inx.h:7 +#: ../share/extensions/gcodetools_graffiti.inx.h:21 +#: ../share/extensions/gcodetools_lathe.inx.h:22 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:11 +#: ../share/extensions/generate_voronoi.inx.h:2 +#: ../share/extensions/gimp_xcf.inx.h:2 +#: ../share/extensions/interp_att_g.inx.h:2 +#: ../share/extensions/jessyInk_uninstall.inx.h:2 +#: ../share/extensions/lorem_ipsum.inx.h:2 +#: ../share/extensions/pathalongpath.inx.h:2 +#: ../share/extensions/pathscatter.inx.h:2 +#: ../share/extensions/radiusrand.inx.h:2 ../share/extensions/scour.inx.h:2 +#: ../share/extensions/split.inx.h:2 ../share/extensions/voronoi2svg.inx.h:2 +#: ../share/extensions/web-set-att.inx.h:2 +#: ../share/extensions/web-transmit-att.inx.h:2 +#: ../share/extensions/webslicer_create_group.inx.h:2 +#: ../share/extensions/webslicer_export.inx.h:2 +msgid "Options" +msgstr "Параметры" -#: ../src/libgdl/gdl-dock-item.c:723 -#, c-format -msgid "" -"Attempting to add a widget with type %s to a %s, but it can only contain one " -"widget at a time; it already contains a widget of type %s" -msgstr "" -"Attempting to add a widget with type %s to a %s, but it can only contain one " -"widget at a time; it already contains a widget of type %s" +#: ../src/extension/internal/filter/overlays.h:64 +#, fuzzy +msgid "Horizontal frequency:" +msgstr "Сдвиг по горизонтали, px" -#: ../src/libgdl/gdl-dock-item.c:1471 ../src/libgdl/gdl-dock-item.c:1521 -#, c-format -msgid "Unsupported docking strategy %s in dock object of type %s" -msgstr "Unsupported docking strategy %s in dock object of type %s" +#: ../src/extension/internal/filter/overlays.h:65 +#, fuzzy +msgid "Vertical frequency:" +msgstr "Сдвиг по вертикали, px" -#. UnLock menuitem -#: ../src/libgdl/gdl-dock-item.c:1629 -msgid "UnLock" -msgstr "Разблокировать" +#: ../src/extension/internal/filter/overlays.h:66 +#: ../src/extension/internal/filter/textures.h:69 +#, fuzzy +msgid "Complexity:" +msgstr "Макс. сложность" -#. Hide menuitem. -#: ../src/libgdl/gdl-dock-item.c:1636 -msgid "Hide" -msgstr "Скрыть всю панель" +#: ../src/extension/internal/filter/overlays.h:67 +#: ../src/extension/internal/filter/textures.h:70 +#, fuzzy +msgid "Variation:" +msgstr "Насыщенность" -#. Lock menuitem -#: ../src/libgdl/gdl-dock-item.c:1641 -msgid "Lock" -msgstr "Заблокировать" +#: ../src/extension/internal/filter/overlays.h:68 +msgid "Dilatation:" +msgstr "Дилатация:" -#: ../src/libgdl/gdl-dock-item.c:1904 -#, c-format -msgid "Attempt to bind an unbound item %p" -msgstr "Attempt to bind an unbound item %p" +#: ../src/extension/internal/filter/overlays.h:69 +msgid "Erosion:" +msgstr "Эрозия:" -#: ../src/libgdl/gdl-dock-master.c:141 ../src/libgdl/gdl-dock.c:184 -msgid "Default title" -msgstr "Заголовок по умолчанию" +#: ../src/extension/internal/filter/overlays.h:72 +#, fuzzy +msgid "Noise color" +msgstr "Цвет года" -#: ../src/libgdl/gdl-dock-master.c:142 -msgid "Default title for newly created floating docks" -msgstr "Default title for newly created floating docks" +#: ../src/extension/internal/filter/overlays.h:83 +#, fuzzy +msgid "Basic noise fill and transparency texture" +msgstr "Простая текстура полупрозрачного шума" -#: ../src/libgdl/gdl-dock-master.c:149 -msgid "" -"If is set to 1, all the dock items bound to the master are locked; if it's " -"0, all are unlocked; -1 indicates inconsistency among the items" +#: ../src/extension/internal/filter/paint.h:71 +msgid "Chromolitho" msgstr "" -"If is set to 1, all the dock items bound to the master are locked; if it's " -"0, all are unlocked; -1 indicates inconsistency among the items" -#: ../src/libgdl/gdl-dock-master.c:157 ../src/libgdl/gdl-switcher.c:737 -msgid "Switcher Style" -msgstr "Стиль переключателя" +#: ../src/extension/internal/filter/paint.h:75 +#: ../share/extensions/jessyInk_keyBindings.inx.h:16 +msgid "Drawing mode" +msgstr "Режим рисования" -#: ../src/libgdl/gdl-dock-master.c:158 ../src/libgdl/gdl-switcher.c:738 -msgid "Switcher buttons style" -msgstr "Стиль кнопок переключения" +#: ../src/extension/internal/filter/paint.h:76 +#, fuzzy +msgid "Drawing blend:" +msgstr "Отмена рисования" -#: ../src/libgdl/gdl-dock-master.c:783 -#, c-format -msgid "" -"master %p: unable to add object %p[%s] to the hash. There already is an " -"item with that name (%p)." -msgstr "" -"master %p: unable to add object %p[%s] to the hash. There already is an " -"item with that name (%p)." +#: ../src/extension/internal/filter/paint.h:84 +#, fuzzy +msgid "Dented" +msgstr "центру" -#: ../src/libgdl/gdl-dock-master.c:955 -#, c-format -msgid "" -"The new dock controller %p is automatic. Only manual dock objects should be " -"named controller." -msgstr "" -"The new dock controller %p is automatic. Only manual dock objects should be " -"named controller." +#: ../src/extension/internal/filter/paint.h:88 +#: ../src/extension/internal/filter/paint.h:699 +#, fuzzy +msgid "Noise reduction" +msgstr "Понижение шума:" -#: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:1003 -#: ../src/ui/dialog/document-properties.cpp:153 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1497 -#: ../src/widgets/desktop-widget.cpp:1992 -#: ../share/extensions/voronoi2svg.inx.h:9 -msgid "Page" -msgstr "Страница" +#: ../src/extension/internal/filter/paint.h:91 +#, fuzzy +msgid "Grain" +msgstr "Режим рисования" -#: ../src/libgdl/gdl-dock-notebook.c:133 -msgid "The index of the current page" -msgstr "Индекс текущей страницы" +#: ../src/extension/internal/filter/paint.h:92 +#, fuzzy +msgid "Grain mode" +msgstr "Режим рисования" -#: ../src/libgdl/gdl-dock-object.c:125 -#: ../src/ui/dialog/inkscape-preferences.cpp:1502 -#: ../src/ui/widget/page-sizer.cpp:258 -#: ../src/widgets/gradient-selector.cpp:158 -#: ../src/widgets/sp-xmlview-attr-list.cpp:54 -msgid "Name" -msgstr "Имя" +#: ../src/extension/internal/filter/paint.h:97 +#: ../src/extension/internal/filter/transparency.h:207 +#: ../src/extension/internal/filter/transparency.h:281 +#, fuzzy +msgid "Expansion" +msgstr "Расширение \"" -#: ../src/libgdl/gdl-dock-object.c:126 -msgid "Unique name for identifying the dock object" -msgstr "Unique name for identifying the dock object" +#: ../src/extension/internal/filter/paint.h:100 +#, fuzzy +msgid "Grain blend:" +msgstr "Градиентная заливка" -#: ../src/libgdl/gdl-dock-object.c:133 -msgid "Long name" -msgstr "Длинное название" +#: ../src/extension/internal/filter/paint.h:116 +msgid "Chromo effect with customizable edge drawing and graininess" +msgstr "" -#: ../src/libgdl/gdl-dock-object.c:134 -msgid "Human readable name for the dock object" -msgstr "Человекочитаемое название прикрепленной панели" +#: ../src/extension/internal/filter/paint.h:232 +#, fuzzy +msgid "Cross Engraving" +msgstr "Альфа-гравировка №1" + +#: ../src/extension/internal/filter/paint.h:234 +#: ../src/extension/internal/filter/paint.h:337 +#, fuzzy +msgid "Clean-up" +msgstr "Концы:" + +#: ../src/extension/internal/filter/paint.h:238 +#: ../share/extensions/measure.inx.h:11 +msgid "Length" +msgstr "Длина" -#: ../src/libgdl/gdl-dock-object.c:140 -msgid "Stock Icon" -msgstr "Значок из набора" +#: ../src/extension/internal/filter/paint.h:247 +msgid "Convert image to an engraving made of vertical and horizontal lines" +msgstr "" -#: ../src/libgdl/gdl-dock-object.c:141 -msgid "Stock icon for the dock object" -msgstr "Значок из набора для прикрепленной панели" +#: ../src/extension/internal/filter/paint.h:331 +#: ../src/ui/dialog/align-and-distribute.cpp:1004 +#: ../src/widgets/desktop-widget.cpp:1996 +msgid "Drawing" +msgstr "Рисунок" -#: ../src/libgdl/gdl-dock-object.c:147 -msgid "Pixbuf Icon" -msgstr "Растровый значок" +#: ../src/extension/internal/filter/paint.h:335 +#: ../src/extension/internal/filter/paint.h:496 +#: ../src/extension/internal/filter/paint.h:590 +#: ../src/extension/internal/filter/paint.h:976 ../src/splivarot.cpp:2212 +msgid "Simplify" +msgstr "Упрощение контура" -#: ../src/libgdl/gdl-dock-object.c:148 -msgid "Pixbuf icon for the dock object" -msgstr "Растровый значок прикрепленной панели" +#: ../src/extension/internal/filter/paint.h:338 +#: ../src/extension/internal/filter/paint.h:709 +#, fuzzy +msgid "Erase" +msgstr "Стирание:" -#: ../src/libgdl/gdl-dock-object.c:153 -msgid "Dock master" -msgstr "Dock master" +#: ../src/extension/internal/filter/paint.h:344 +msgid "Melt" +msgstr "Таяние" -#: ../src/libgdl/gdl-dock-object.c:154 -msgid "Dock master this dock object is bound to" -msgstr "Dock master this dock object is bound to" +#: ../src/extension/internal/filter/paint.h:350 +#: ../src/extension/internal/filter/paint.h:712 +msgid "Fill color" +msgstr "Цвет заливки" -#: ../src/libgdl/gdl-dock-object.c:463 -#, c-format -msgid "" -"Call to gdl_dock_object_dock in a dock object %p (object type is %s) which " -"hasn't implemented this method" -msgstr "" -"Call to gdl_dock_object_dock in a dock object %p (object type is %s) which " -"hasn't implemented this method" +#: ../src/extension/internal/filter/paint.h:351 +#: ../src/extension/internal/filter/paint.h:714 +#, fuzzy +msgid "Image on fill" +msgstr "Файл..." -#: ../src/libgdl/gdl-dock-object.c:602 -#, c-format -msgid "" -"Dock operation requested in a non-bound object %p. The application might " -"crash" -msgstr "" -"Dock operation requested in a non-bound object %p. The application might " -"crash" +#: ../src/extension/internal/filter/paint.h:354 +msgid "Stroke color" +msgstr "Цвет обводки" -#: ../src/libgdl/gdl-dock-object.c:609 -#, c-format -msgid "Cannot dock %p to %p because they belong to different masters" -msgstr "Cannot dock %p to %p because they belong to different masters" +#: ../src/extension/internal/filter/paint.h:355 +#, fuzzy +msgid "Image on stroke" +msgstr "Текстурная обводка" -#: ../src/libgdl/gdl-dock-object.c:651 -#, c-format -msgid "" -"Attempt to bind to %p an already bound dock object %p (current master: %p)" +#: ../src/extension/internal/filter/paint.h:366 +#, fuzzy +msgid "Convert images to duochrome drawings" +msgstr "Откадрировать холст до рисунка" + +#: ../src/extension/internal/filter/paint.h:494 +msgid "Electrize" msgstr "" -"Attempt to bind to %p an already bound dock object %p (current master: %p)" -#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:229 -msgid "Position" -msgstr "Положение" +#: ../src/extension/internal/filter/paint.h:497 +#: ../src/extension/internal/filter/paint.h:852 +msgid "Effect type:" +msgstr "Тип эффекта:" -#: ../src/libgdl/gdl-dock-paned.c:131 -msgid "Position of the divider in pixels" -msgstr "Положение делителя в пикселах" +#: ../src/extension/internal/filter/paint.h:501 +#: ../src/extension/internal/filter/paint.h:860 +#: ../src/extension/internal/filter/paint.h:975 +#, fuzzy +msgid "Levels" +msgstr "Уровни:" -#: ../src/libgdl/gdl-dock-placeholder.c:141 -msgid "Sticky" -msgstr "Sticky" +#: ../src/extension/internal/filter/paint.h:510 +#, fuzzy +msgid "Electro solarization effects" +msgstr "Классический фотоэффект соляризации" -#: ../src/libgdl/gdl-dock-placeholder.c:142 -msgid "" -"Whether the placeholder will stick to its host or move up the hierarchy when " -"the host is redocked" -msgstr "" -"Whether the placeholder will stick to its host or move up the hierarchy when " -"the host is redocked" +#: ../src/extension/internal/filter/paint.h:584 +#, fuzzy +msgid "Neon Draw" +msgstr "Неон" -#: ../src/libgdl/gdl-dock-placeholder.c:149 -msgid "Host" -msgstr "Host" +#: ../src/extension/internal/filter/paint.h:586 +#, fuzzy +msgid "Line type:" +msgstr " тип: " -#: ../src/libgdl/gdl-dock-placeholder.c:150 -msgid "The dock object this placeholder is attached to" -msgstr "The dock object this placeholder is attached to" +#: ../src/extension/internal/filter/paint.h:587 +#, fuzzy +msgid "Smoothed" +msgstr "Сгладить" -#: ../src/libgdl/gdl-dock-placeholder.c:157 -msgid "Next placement" -msgstr "Следующее размещение" +#: ../src/extension/internal/filter/paint.h:588 +#, fuzzy +msgid "Contrasted" +msgstr "Контраст" -#: ../src/libgdl/gdl-dock-placeholder.c:158 -msgid "" -"The position an item will be docked to our host if a request is made to dock " -"to us" -msgstr "" -"The position an item will be docked to our host if a request is made to dock " -"to us" +#: ../src/extension/internal/filter/paint.h:591 +#, fuzzy +msgid "Line width" +msgstr "Ширина линии" -#: ../src/libgdl/gdl-dock-placeholder.c:168 -msgid "Width for the widget when it's attached to the placeholder" -msgstr "Width for the widget when it's attached to the placeholder" +#: ../src/extension/internal/filter/paint.h:593 +#: ../src/extension/internal/filter/paint.h:861 +#: ../src/ui/widget/filter-effect-chooser.cpp:25 +msgid "Blend mode:" +msgstr "Режим смешивания:" -#: ../src/libgdl/gdl-dock-placeholder.c:176 -msgid "Height for the widget when it's attached to the placeholder" -msgstr "Height for the widget when it's attached to the placeholder" +#: ../src/extension/internal/filter/paint.h:605 +msgid "Posterize and draw smooth lines around color shapes" +msgstr "" -#: ../src/libgdl/gdl-dock-placeholder.c:182 -msgid "Floating Toplevel" -msgstr "Плавающая сверху" +#: ../src/extension/internal/filter/paint.h:687 +#, fuzzy +msgid "Point Engraving" +msgstr "Альфа-гравировка №1" -#: ../src/libgdl/gdl-dock-placeholder.c:183 -msgid "Whether the placeholder is standing in for a floating toplevel dock" -msgstr "Whether the placeholder is standing in for a floating toplevel dock" +#: ../src/extension/internal/filter/paint.h:700 +#, fuzzy +msgid "Noise blend:" +msgstr "Светящийся пузырь" -#: ../src/libgdl/gdl-dock-placeholder.c:189 +#: ../src/extension/internal/filter/paint.h:708 #, fuzzy -msgid "X Coordinate" -msgstr "Координата X" +msgid "Grain lightness" +msgstr "Яркость" -#: ../src/libgdl/gdl-dock-placeholder.c:190 +#: ../src/extension/internal/filter/paint.h:716 #, fuzzy -msgid "X coordinate for dock when floating" -msgstr "Координата плавающей панели по оси X" +msgid "Points color" +msgstr "Цвет месяца:" -#: ../src/libgdl/gdl-dock-placeholder.c:196 +#: ../src/extension/internal/filter/paint.h:718 #, fuzzy -msgid "Y Coordinate" -msgstr "Координата Y" +msgid "Image on points" +msgstr "Файл..." -#: ../src/libgdl/gdl-dock-placeholder.c:197 +#: ../src/extension/internal/filter/paint.h:728 #, fuzzy -msgid "Y coordinate for dock when floating" -msgstr "Координата плавающей панели по оси Y" +msgid "Convert image to a transparent point engraving" +msgstr "Преобразовать в раскрашиваемый прозрачный позитив или негатив" -#: ../src/libgdl/gdl-dock-placeholder.c:499 -msgid "Attempt to dock a dock object to an unbound placeholder" -msgstr "Attempt to dock a dock object to an unbound placeholder" +#: ../src/extension/internal/filter/paint.h:850 +#, fuzzy +msgid "Poster Paint" +msgstr "Константа диффузии:" -#: ../src/libgdl/gdl-dock-placeholder.c:611 -#, c-format -msgid "Got a detach signal from an object (%p) who is not our host %p" -msgstr "Got a detach signal from an object (%p) who is not our host %p" +#: ../src/extension/internal/filter/paint.h:856 +#, fuzzy +msgid "Transfer type:" +msgstr "Логические операции" -#: ../src/libgdl/gdl-dock-placeholder.c:636 -#, c-format -msgid "" -"Something weird happened while getting the child placement for %p from " -"parent %p" -msgstr "" -"Something weird happened while getting the child placement for %p from " -"parent %p" +#: ../src/extension/internal/filter/paint.h:857 +#, fuzzy +msgid "Poster" +msgstr "Штукатурка" -#: ../src/libgdl/gdl-dock-tablabel.c:126 -msgid "Dockitem which 'owns' this tablabel" -msgstr "Dockitem which 'owns' this tablabel" +#: ../src/extension/internal/filter/paint.h:858 +#, fuzzy +msgid "Painting" +msgstr "Масляная краска" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:633 -#: ../src/ui/dialog/inkscape-preferences.cpp:676 -msgid "Floating" -msgstr "Свободно перемещаются по экрану" +#: ../src/extension/internal/filter/paint.h:868 +#, fuzzy +msgid "Simplify (primary)" +msgstr "Упрощение контуров" -#: ../src/libgdl/gdl-dock.c:177 -msgid "Whether the dock is floating in its own window" -msgstr "Плавает ли панель в собственном окне" +#: ../src/extension/internal/filter/paint.h:869 +#, fuzzy +msgid "Simplify (secondary)" +msgstr "Упростить цвета" -#: ../src/libgdl/gdl-dock.c:185 -msgid "Default title for the newly created floating docks" -msgstr "Обычное название для новых плавающих панелей" +#: ../src/extension/internal/filter/paint.h:870 +#, fuzzy +msgid "Pre-saturation" +msgstr "Насыщенность" -#: ../src/libgdl/gdl-dock.c:192 -msgid "Width for the dock when it's of floating type" -msgstr "Ширина прикрепленной панели, когда она плавающая" +#: ../src/extension/internal/filter/paint.h:871 +#, fuzzy +msgid "Post-saturation" +msgstr "Насыщенность" -#: ../src/libgdl/gdl-dock.c:200 -msgid "Height for the dock when it's of floating type" -msgstr "Высота прикрепленной панели, когда она плавающая" +#: ../src/extension/internal/filter/paint.h:872 +#, fuzzy +msgid "Simulate antialiasing" +msgstr "Имитация живописи маслом" -#: ../src/libgdl/gdl-dock.c:207 -msgid "Float X" -msgstr "Плавающая, X" +#: ../src/extension/internal/filter/paint.h:880 +#, fuzzy +msgid "Poster and painting effects" +msgstr "Вставить динамический контурный эффект" -#: ../src/libgdl/gdl-dock.c:208 -msgid "X coordinate for a floating dock" -msgstr "Координата X плавающей панели" +#: ../src/extension/internal/filter/paint.h:973 +msgid "Posterize Basic" +msgstr "" -#: ../src/libgdl/gdl-dock.c:215 -msgid "Float Y" -msgstr "Плавающая, Y" +#: ../src/extension/internal/filter/paint.h:984 +msgid "Simple posterizing effect" +msgstr "" -#: ../src/libgdl/gdl-dock.c:216 -msgid "Y coordinate for a floating dock" -msgstr "Координата Y плавающей панели" +#: ../src/extension/internal/filter/protrusions.h:48 +msgid "Snow crest" +msgstr "Сугроб" -#: ../src/libgdl/gdl-dock.c:476 -#, c-format -msgid "Dock #%d" -msgstr "Панель №%d" +#: ../src/extension/internal/filter/protrusions.h:50 +#, fuzzy +msgid "Drift Size" +msgstr "Размер сугроба" -#: ../src/libnrtype/FontFactory.cpp:767 -msgid "Ignoring font without family that will crash Pango" -msgstr "Игнорирование шрифта без гарнитуры приведет к обрушиванию Pango" +#: ../src/extension/internal/filter/protrusions.h:58 +msgid "Snow has fallen on object" +msgstr "Объект присыпало снегом" -#: ../src/live_effects/effect.cpp:84 -msgid "doEffect stack test" -msgstr "Тест эффектов" +#: ../src/extension/internal/filter/shadows.h:57 +msgid "Drop Shadow" +msgstr "Отбрасываемая тень" -#: ../src/live_effects/effect.cpp:85 -msgid "Angle bisector" -msgstr "Угловая биссектриса" +#: ../src/extension/internal/filter/shadows.h:61 +#, fuzzy +msgid "Blur radius (px)" +msgstr "Радиус размывания (px):" -#. TRANSLATORS: boolean operations -#: ../src/live_effects/effect.cpp:87 -msgid "Boolops" -msgstr "Логические операции" +#: ../src/extension/internal/filter/shadows.h:62 +#, fuzzy +msgid "Horizontal offset (px)" +msgstr "Сдвиг по горизонтали, px" -#: ../src/live_effects/effect.cpp:88 -msgid "Circle (by center and radius)" -msgstr "Окружность (центр+радиус)" +#: ../src/extension/internal/filter/shadows.h:63 +#, fuzzy +msgid "Vertical offset (px)" +msgstr "Сдвиг по вертикали, px" -#: ../src/live_effects/effect.cpp:89 -msgid "Circle by 3 points" -msgstr "Окружность через три точки" +#: ../src/extension/internal/filter/shadows.h:64 +#, fuzzy +msgid "Shadow type:" +msgstr "Тени:" -#: ../src/live_effects/effect.cpp:90 -msgid "Dynamic stroke" -msgstr "Динамический штрих" +#: ../src/extension/internal/filter/shadows.h:67 +msgid "Outer cutout" +msgstr "" -#: ../src/live_effects/effect.cpp:91 ../share/extensions/extrude.inx.h:1 -msgid "Extrude" -msgstr "Выдавливание" +#: ../src/extension/internal/filter/shadows.h:68 +#, fuzzy +msgid "Inner cutout" +msgstr "Внутренний абрис" -#: ../src/live_effects/effect.cpp:92 -msgid "Lattice Deformation" -msgstr "Деформация по сетке" +#: ../src/extension/internal/filter/shadows.h:69 +#, fuzzy +msgid "Shadow only" +msgstr "Альфа-канал" -#: ../src/live_effects/effect.cpp:93 -msgid "Line Segment" -msgstr "Сегмент линии" +#: ../src/extension/internal/filter/shadows.h:72 +msgid "Blur color" +msgstr "" -#: ../src/live_effects/effect.cpp:94 -msgid "Mirror symmetry" -msgstr "Зеркальная симметрия" +#: ../src/extension/internal/filter/shadows.h:74 +#, fuzzy +msgid "Use object's color" +msgstr "Использовать именованные цвета" -#: ../src/live_effects/effect.cpp:96 -msgid "Parallel" -msgstr "Параллель" +#: ../src/extension/internal/filter/shadows.h:84 +#, fuzzy +msgid "Colorizable Drop shadow" +msgstr "Создать раскрашиваемую тень внутри" -#: ../src/live_effects/effect.cpp:97 -msgid "Path length" -msgstr "Длина контура" +#: ../src/extension/internal/filter/textures.h:62 +msgid "Ink Blot" +msgstr "" -#: ../src/live_effects/effect.cpp:98 -msgid "Perpendicular bisector" -msgstr "Перпендикулярная биссектриса" +#: ../src/extension/internal/filter/textures.h:68 +msgid "Frequency:" +msgstr "Частота:" -#: ../src/live_effects/effect.cpp:99 -msgid "Perspective path" -msgstr "Контур в перспективе" +#: ../src/extension/internal/filter/textures.h:71 +#, fuzzy +msgid "Horizontal inlay:" +msgstr "Горизонтальная точка:" -#: ../src/live_effects/effect.cpp:100 -msgid "Rotate copies" -msgstr "Вращение копий" +#: ../src/extension/internal/filter/textures.h:72 +#, fuzzy +msgid "Vertical inlay:" +msgstr "Вертикальная точка:" -#: ../src/live_effects/effect.cpp:101 -msgid "Recursive skeleton" -msgstr "Рекурсивный скелет" +#: ../src/extension/internal/filter/textures.h:73 +#, fuzzy +msgid "Displacement:" +msgstr "Смещение по X:" -#: ../src/live_effects/effect.cpp:102 -msgid "Tangent to curve" -msgstr "Касательная к кривой" +#: ../src/extension/internal/filter/textures.h:79 +#, fuzzy +msgid "Overlapping" +msgstr "Плеск волн" -#: ../src/live_effects/effect.cpp:103 -msgid "Text label" -msgstr "Текстовая метка" +#: ../src/extension/internal/filter/textures.h:80 +#, fuzzy +msgid "External" +msgstr "Изменить извне..." -#. 0.46 -#: ../src/live_effects/effect.cpp:106 -msgid "Bend" -msgstr "Изгиб" +#: ../src/extension/internal/filter/textures.h:81 +#: ../share/extensions/markers_strokepaint.inx.h:8 +msgid "Custom" +msgstr "Другой" -#: ../src/live_effects/effect.cpp:107 -msgid "Gears" -msgstr "Шестеренка" +#: ../src/extension/internal/filter/textures.h:83 +#, fuzzy +msgid "Custom stroke options" +msgstr "Заказные точки и параметры" -#: ../src/live_effects/effect.cpp:108 -msgid "Pattern Along Path" -msgstr "Текстура по контуру" +#: ../src/extension/internal/filter/textures.h:84 +#, fuzzy +msgid "k1:" +msgstr "K1:" -#. for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG -#: ../src/live_effects/effect.cpp:109 -msgid "Stitch Sub-Paths" -msgstr "Сшивка субконтуров" +#: ../src/extension/internal/filter/textures.h:85 +#, fuzzy +msgid "k2:" +msgstr "K2:" -#. 0.47 -#: ../src/live_effects/effect.cpp:111 -msgid "VonKoch" -msgstr "Фон Кох" +#: ../src/extension/internal/filter/textures.h:86 +#, fuzzy +msgid "k3:" +msgstr "K3:" -#: ../src/live_effects/effect.cpp:112 -msgid "Knot" -msgstr "Кельтский узел" +#: ../src/extension/internal/filter/textures.h:94 +msgid "Inkblot on tissue or rough paper" +msgstr "Чернильное пятно на салфетке или грубой бумаге" -#: ../src/live_effects/effect.cpp:113 -msgid "Construct grid" -msgstr "Конструирование сетки" +#: ../src/extension/internal/filter/transparency.h:53 +#: ../src/filter-enums.cpp:20 +msgid "Blend" +msgstr "Смешивание" -#: ../src/live_effects/effect.cpp:114 -msgid "Spiro spline" -msgstr "Кривая Спиро" +#: ../src/extension/internal/filter/transparency.h:55 ../src/rdf.cpp:261 +#, fuzzy +msgid "Source:" +msgstr "Источник" -#: ../src/live_effects/effect.cpp:115 -msgid "Envelope Deformation" -msgstr "Деформация по огибающей" +#: ../src/extension/internal/filter/transparency.h:56 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1551 +msgid "Background" +msgstr "Фон" -#: ../src/live_effects/effect.cpp:116 -msgid "Interpolate Sub-Paths" -msgstr "Интерполяция субконтуров" +#: ../src/extension/internal/filter/transparency.h:59 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2839 +#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 +#: ../src/widgets/pencil-toolbar.cpp:127 ../src/widgets/spray-toolbar.cpp:186 +#: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 +#: ../share/extensions/triangle.inx.h:8 +msgid "Mode:" +msgstr "Режим:" -#: ../src/live_effects/effect.cpp:117 -msgid "Hatches (rough)" -msgstr "Внутренняя штриховка" +#: ../src/extension/internal/filter/transparency.h:73 +msgid "Blend objects with background images or with themselves" +msgstr "" -#: ../src/live_effects/effect.cpp:118 -msgid "Sketch" -msgstr "Карандашный набросок" +#: ../src/extension/internal/filter/transparency.h:130 +#, fuzzy +msgid "Channel Transparency" +msgstr "Прозрачность диалога:" -#: ../src/live_effects/effect.cpp:119 -msgid "Ruler" -msgstr "Линейка" +#: ../src/extension/internal/filter/transparency.h:144 +#, fuzzy +msgid "Replace RGB with transparency" +msgstr "Грубая прозрачность" -#. 0.49 -#: ../src/live_effects/effect.cpp:121 +#: ../src/extension/internal/filter/transparency.h:205 #, fuzzy -msgid "Power stroke" -msgstr "Текстурная обводка" +msgid "Light Eraser" +msgstr "Ластик для светлых областей" -#: ../src/live_effects/effect.cpp:122 ../src/selection-chemistry.cpp:2835 +#: ../src/extension/internal/filter/transparency.h:209 +#: ../src/extension/internal/filter/transparency.h:283 #, fuzzy -msgid "Clone original path" -msgstr "Заменить текст" +msgid "Global opacity" +msgstr "Общий изгиб" -#: ../src/live_effects/effect.cpp:284 -msgid "Is visible?" -msgstr "Видимость эффекта" +#: ../src/extension/internal/filter/transparency.h:218 +msgid "Make the lightest parts of the object progressively transparent" +msgstr "Сделать самые светлые области объекта нарастающе прозрачными" -#: ../src/live_effects/effect.cpp:284 -msgid "" -"If unchecked, the effect remains applied to the object but is temporarily " -"disabled on canvas" +#: ../src/extension/internal/filter/transparency.h:291 +msgid "Set opacity and strength of opacity boundaries" msgstr "" -"Если флажок снят, эффект остается примененным, но не отображается на холсте" - -#: ../src/live_effects/effect.cpp:305 -msgid "No effect" -msgstr "Без эффекта" - -#: ../src/live_effects/effect.cpp:352 -#, c-format -msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" -msgstr "Укажите параметрический контур для LPE '%s' %d щелчками мышью" - -#: ../src/live_effects/effect.cpp:624 -#, c-format -msgid "Editing parameter <b>%s</b>." -msgstr "Правка параметра <b>%s</b>." -#: ../src/live_effects/effect.cpp:629 -msgid "None of the applied path effect's parameters can be edited on-canvas." +#: ../src/extension/internal/filter/transparency.h:341 +msgid "Silhouette" msgstr "" -"Ни один из параметров примененного эффекта не может быть изменен на холсте." -#: ../src/live_effects/lpe-bendpath.cpp:53 +#: ../src/extension/internal/filter/transparency.h:344 +msgid "Cutout" +msgstr "Абрис" + +#: ../src/extension/internal/filter/transparency.h:353 #, fuzzy -msgid "Bend path:" -msgstr "Контур изгиба" +msgid "Repaint anything visible monochrome" +msgstr "Закрасить всё одним цветом" -#: ../src/live_effects/lpe-bendpath.cpp:53 -msgid "Path along which to bend the original path" -msgstr "Контур, по которому гнуть исходный контур" +#: ../src/extension/internal/gdkpixbuf-input.cpp:184 +#, fuzzy, c-format +msgid "%s bitmap image import" +msgstr "Импорт растра" -#: ../src/live_effects/lpe-bendpath.cpp:54 -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -#: ../src/ui/dialog/export.cpp:290 ../src/ui/dialog/transformation.cpp:80 -#: ../src/ui/widget/page-sizer.cpp:236 -msgid "_Width:" -msgstr "_Ширина:" +#: ../src/extension/internal/gdkpixbuf-input.cpp:191 +msgid "Image Import Type:" +msgstr "" -#: ../src/live_effects/lpe-bendpath.cpp:54 -msgid "Width of the path" -msgstr "Толщина контура" +#: ../src/extension/internal/gdkpixbuf-input.cpp:191 +msgid "" +"Embed results in stand-alone, larger SVG files. Link references a file " +"outside this SVG document and all files must be moved together." +msgstr "" +"Внедрение создаёт самостоятельные большие файлы SVG. Связывание означает, " +"что файл будет вне SVG, их придётся перемещать вместе." -#: ../src/live_effects/lpe-bendpath.cpp:55 +#: ../src/extension/internal/gdkpixbuf-input.cpp:192 +#: ../src/ui/dialog/inkscape-preferences.cpp:1449 #, fuzzy -msgid "W_idth in units of length" -msgstr "Единица ширины = длина контура" +msgid "Embed" +msgstr "внедрить" -#: ../src/live_effects/lpe-bendpath.cpp:55 -msgid "Scale the width of the path in units of its length" -msgstr "Измерять толщину контура в единицах, равных его длине" +#: ../src/extension/internal/gdkpixbuf-input.cpp:193 ../src/sp-anchor.cpp:119 +#: ../src/ui/dialog/inkscape-preferences.cpp:1449 +#, fuzzy +msgid "Link" +msgstr "Связь:" -#: ../src/live_effects/lpe-bendpath.cpp:56 +#: ../src/extension/internal/gdkpixbuf-input.cpp:196 #, fuzzy -msgid "_Original path is vertical" -msgstr "Исходный контур вертикален" +msgid "Image DPI:" +msgstr "Изображение" -#: ../src/live_effects/lpe-bendpath.cpp:56 -msgid "Rotates the original 90 degrees, before bending it along the bend path" -msgstr "Повернуть исходный контур на 90° перед изгибом по контуру" +#: ../src/extension/internal/gdkpixbuf-input.cpp:196 +msgid "" +"Take information from file or use default bitmap import resolution as " +"defined in the preferences." +msgstr "" -#: ../src/live_effects/lpe-clone-original.cpp:18 +#: ../src/extension/internal/gdkpixbuf-input.cpp:197 #, fuzzy -msgid "Linked path:" -msgstr "Связать с контуром" +msgid "From file" +msgstr "Загрузить из файла" -#: ../src/live_effects/lpe-clone-original.cpp:18 +#: ../src/extension/internal/gdkpixbuf-input.cpp:198 #, fuzzy -msgid "Path from which to take the original path data" -msgstr "Контур, по которому гнуть исходный контур" +msgid "Default import resolution" +msgstr "Разрешение для экспорта:" -#: ../src/live_effects/lpe-constructgrid.cpp:27 +#: ../src/extension/internal/gdkpixbuf-input.cpp:201 #, fuzzy -msgid "Size _X:" -msgstr "Ячеек по X:" +msgid "Image Rendering Mode:" +msgstr "Тип печати" -#: ../src/live_effects/lpe-constructgrid.cpp:27 -msgid "The size of the grid in X direction." -msgstr "Число ячеек сетки по оси X" +#: ../src/extension/internal/gdkpixbuf-input.cpp:201 +msgid "" +"When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " +"not work in all browsers.)" +msgstr "" -#: ../src/live_effects/lpe-constructgrid.cpp:28 +#: ../src/extension/internal/gdkpixbuf-input.cpp:202 +#: ../src/ui/dialog/inkscape-preferences.cpp:1456 #, fuzzy -msgid "Size _Y:" -msgstr "Ячеек по Y:" - -#: ../src/live_effects/lpe-constructgrid.cpp:28 -msgid "The size of the grid in Y direction." -msgstr "Число ячеек сетки по оси Y" +msgid "None (auto)" +msgstr "Нет (по умолчанию)" -#: ../src/live_effects/lpe-curvestitch.cpp:41 -#, fuzzy -msgid "Stitch path:" -msgstr "Сшивающий контур" +#: ../src/extension/internal/gdkpixbuf-input.cpp:203 +#: ../src/ui/dialog/inkscape-preferences.cpp:1456 +msgid "Smooth (optimizeQuality)" +msgstr "" -#: ../src/live_effects/lpe-curvestitch.cpp:41 -msgid "The path that will be used as stitch." -msgstr "Контур, которым сшивают" +#: ../src/extension/internal/gdkpixbuf-input.cpp:204 +#: ../src/ui/dialog/inkscape-preferences.cpp:1456 +msgid "Blocky (optimizeSpeed)" +msgstr "" -#: ../src/live_effects/lpe-curvestitch.cpp:42 -#, fuzzy -msgid "N_umber of paths:" -msgstr "Количество контуров" +#: ../src/extension/internal/gdkpixbuf-input.cpp:207 +msgid "Hide the dialog next time and always apply the same actions." +msgstr "" -#: ../src/live_effects/lpe-curvestitch.cpp:42 -msgid "The number of paths that will be generated." -msgstr "Число создаваемых контуров" +#: ../src/extension/internal/gdkpixbuf-input.cpp:207 +msgid "Don't ask again" +msgstr "" -#: ../src/live_effects/lpe-curvestitch.cpp:43 -#, fuzzy -msgid "Sta_rt edge variance:" -msgstr "Колебание края в начале" +#: ../src/extension/internal/gimpgrad.cpp:272 +msgid "GIMP Gradients" +msgstr "Градиенты GIMP" -#: ../src/live_effects/lpe-curvestitch.cpp:43 -msgid "" -"The amount of random jitter to move the start points of the stitches inside " -"& outside the guide path" -msgstr "" -"Случайное колебание при смещении начальных точек швов внутри и снаружи " -"направляющего контура" +#: ../src/extension/internal/gimpgrad.cpp:277 +msgid "GIMP Gradient (*.ggr)" +msgstr "Градиенты GIMP (*.ggr)" -#: ../src/live_effects/lpe-curvestitch.cpp:44 -#, fuzzy -msgid "Sta_rt spacing variance:" -msgstr "Колебание интервала в начале" +#: ../src/extension/internal/gimpgrad.cpp:278 +msgid "Gradients used in GIMP" +msgstr "Градиенты, используемые в GIMP" -#: ../src/live_effects/lpe-curvestitch.cpp:44 -msgid "" -"The amount of random shifting to move the start points of the stitches back " -"& forth along the guide path" -msgstr "" -"Количество случайного смещения для перемещения начальных точек швов вперед и " -"назад по направляющему контуру" +#: ../src/extension/internal/grid.cpp:210 ../src/ui/widget/panel.cpp:117 +msgid "Grid" +msgstr "Сетка" -#: ../src/live_effects/lpe-curvestitch.cpp:45 +#: ../src/extension/internal/grid.cpp:212 #, fuzzy -msgid "End ed_ge variance:" -msgstr "Колебание края в конце" +msgid "Line Width:" +msgstr "Ширина линии" -#: ../src/live_effects/lpe-curvestitch.cpp:45 -msgid "" -"The amount of randomness that moves the end points of the stitches inside & " -"outside the guide path" -msgstr "" -"Случайное колебание при смещении конечных точек швов внутри и снаружи " -"направляющего контура" +#: ../src/extension/internal/grid.cpp:213 +#, fuzzy +msgid "Horizontal Spacing:" +msgstr "Интервал по горизонтали" -#: ../src/live_effects/lpe-curvestitch.cpp:46 +#: ../src/extension/internal/grid.cpp:214 #, fuzzy -msgid "End spa_cing variance:" -msgstr "Колебание интервала в конце" +msgid "Vertical Spacing:" +msgstr "Интервал по вертикали" -#: ../src/live_effects/lpe-curvestitch.cpp:46 -msgid "" -"The amount of random shifting to move the end points of the stitches back & " -"forth along the guide path" -msgstr "" -"Количество случайного смещения для перемещения конечных точек швов вперед и " -"назад по направляющему контуру" +#: ../src/extension/internal/grid.cpp:215 +#, fuzzy +msgid "Horizontal Offset:" +msgstr "Сдвиг по горизонтали" -#: ../src/live_effects/lpe-curvestitch.cpp:47 +#: ../src/extension/internal/grid.cpp:216 #, fuzzy -msgid "Scale _width:" -msgstr "Масштаб ширины" +msgid "Vertical Offset:" +msgstr "Сдвиг по вертикали" -#: ../src/live_effects/lpe-curvestitch.cpp:47 -msgid "Scale the width of the stitch path" -msgstr "Масштабировать ширину сшивающего контура" +#: ../src/extension/internal/grid.cpp:220 +#: ../src/ui/dialog/inkscape-preferences.cpp:1470 +#: ../share/extensions/draw_from_triangle.inx.h:58 +#: ../share/extensions/eqtexsvg.inx.h:4 +#: ../share/extensions/foldablebox.inx.h:9 +#: ../share/extensions/funcplot.inx.h:38 +#: ../share/extensions/grid_cartesian.inx.h:23 +#: ../share/extensions/grid_isometric.inx.h:11 +#: ../share/extensions/grid_polar.inx.h:22 +#: ../share/extensions/guides_creator.inx.h:25 +#: ../share/extensions/hershey.inx.h:52 +#: ../share/extensions/layout_nup.inx.h:35 +#: ../share/extensions/lindenmayer.inx.h:34 +#: ../share/extensions/param_curves.inx.h:30 +#: ../share/extensions/perfectboundcover.inx.h:19 +#: ../share/extensions/polyhedron_3d.inx.h:56 +#: ../share/extensions/printing_marks.inx.h:20 +#: ../share/extensions/render_alphabetsoup.inx.h:5 +#: ../share/extensions/render_barcode.inx.h:5 +#: ../share/extensions/render_barcode_datamatrix.inx.h:5 +#: ../share/extensions/render_barcode_qrcode.inx.h:18 +#: ../share/extensions/render_gear_rack.inx.h:5 +#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:4 +#: ../share/extensions/spirograph.inx.h:10 +#: ../share/extensions/svgcalendar.inx.h:38 +#: ../share/extensions/triangle.inx.h:14 +#: ../share/extensions/wireframe_sphere.inx.h:8 +msgid "Render" +msgstr "Отрисовка" -#: ../src/live_effects/lpe-curvestitch.cpp:48 -#, fuzzy -msgid "Scale _width relative to length" -msgstr "Ширина масштабируется относительно длины" +#: ../src/extension/internal/grid.cpp:221 +#: ../src/ui/dialog/document-properties.cpp:155 +#: ../src/ui/dialog/inkscape-preferences.cpp:780 +#: ../src/widgets/toolbox.cpp:1826 +msgid "Grids" +msgstr "Сетки" -#: ../src/live_effects/lpe-curvestitch.cpp:48 -msgid "Scale the width of the stitch path relative to its length" -msgstr "Масштабировать ширины сшивающего контура относительно его длины" +#: ../src/extension/internal/grid.cpp:224 +msgid "Draw a path which is a grid" +msgstr "Нарисовать контур, являющийся сеткой" -#: ../src/live_effects/lpe-envelope.cpp:31 -#, fuzzy -msgid "Top bend path:" -msgstr "Верхний контур" +#: ../src/extension/internal/javafx-out.cpp:966 +msgid "JavaFX Output" +msgstr "Экспорт в JavaFX" -#: ../src/live_effects/lpe-envelope.cpp:31 -msgid "Top path along which to bend the original path" -msgstr "Верхний контур, по которому деформируется исходный контур" +#: ../src/extension/internal/javafx-out.cpp:971 +msgid "JavaFX (*.fx)" +msgstr "Файлы JavaFX (*.fx)" -#: ../src/live_effects/lpe-envelope.cpp:32 -#, fuzzy -msgid "Right bend path:" -msgstr "Правый контур" +#: ../src/extension/internal/javafx-out.cpp:972 +msgid "JavaFX Raytracer File" +msgstr "Файл трассировщика лучей JavaFX" -#: ../src/live_effects/lpe-envelope.cpp:32 -msgid "Right path along which to bend the original path" -msgstr "Правый контур, по которому деформируется исходный контур" +#: ../src/extension/internal/latex-pstricks-out.cpp:95 +msgid "LaTeX Output" +msgstr "Экспорт в LaTeX" -#: ../src/live_effects/lpe-envelope.cpp:33 -#, fuzzy -msgid "Bottom bend path:" -msgstr "Нижний контур" +#: ../src/extension/internal/latex-pstricks-out.cpp:100 +msgid "LaTeX With PSTricks macros (*.tex)" +msgstr "LaTeX с макросами PSTricks (*.tex)" -#: ../src/live_effects/lpe-envelope.cpp:33 -msgid "Bottom path along which to bend the original path" -msgstr "Нижний контур, по которому деформируется исходный контур" +#: ../src/extension/internal/latex-pstricks-out.cpp:101 +msgid "LaTeX PSTricks File" +msgstr "Файл LaTeX PSTricks" -#: ../src/live_effects/lpe-envelope.cpp:34 -#, fuzzy -msgid "Left bend path:" -msgstr "Левый контур" +#: ../src/extension/internal/latex-pstricks.cpp:331 +msgid "LaTeX Print" +msgstr "Печать в LaTeX" -#: ../src/live_effects/lpe-envelope.cpp:34 -msgid "Left path along which to bend the original path" -msgstr "Левый контур, по которому деформируется исходный контур" +#: ../src/extension/internal/odf.cpp:2142 +msgid "OpenDocument Drawing Output" +msgstr "Экспорт в OpenDocument Drawing" -#: ../src/live_effects/lpe-envelope.cpp:35 -#, fuzzy -msgid "E_nable left & right paths" -msgstr "Использовать левый и правый контуры" +#: ../src/extension/internal/odf.cpp:2147 +msgid "OpenDocument drawing (*.odg)" +msgstr "Рисунок OpenDocument (*.odg)" -#: ../src/live_effects/lpe-envelope.cpp:35 -msgid "Enable the left and right deformation paths" -msgstr "Использовать левый и правый деформирующие контуры" +#: ../src/extension/internal/odf.cpp:2148 +msgid "OpenDocument drawing file" +msgstr "Файл рисунков OpenDocument" -#: ../src/live_effects/lpe-envelope.cpp:36 -#, fuzzy -msgid "_Enable top & bottom paths" -msgstr "Использовать верхний и нижний контуры" +#. TRANSLATORS: The following are document crop settings for PDF import +#. more info: http://www.acrobatusers.com/tech_corners/javascript_corner/tips/2006/page_bounds/ +#: ../src/extension/internal/pdfinput/pdf-input.cpp:71 +msgid "media box" +msgstr "media box" -#: ../src/live_effects/lpe-envelope.cpp:36 -msgid "Enable the top and bottom deformation paths" -msgstr "Использовать верхний и нижний деформирующие контуры" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:72 +msgid "crop box" +msgstr "crop box" -#: ../src/live_effects/lpe-extrude.cpp:30 -msgid "Direction" -msgstr "Направление" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:73 +msgid "trim box" +msgstr "trim box" -#: ../src/live_effects/lpe-extrude.cpp:30 -msgid "Defines the direction and magnitude of the extrusion" -msgstr "Определяет направление и силу выдавливания" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:74 +msgid "bleed box" +msgstr "bleed box" -#: ../src/live_effects/lpe-gears.cpp:214 -#, fuzzy -msgid "_Teeth:" -msgstr "Зубцов:" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:75 +msgid "art box" +msgstr "art box" -#: ../src/live_effects/lpe-gears.cpp:214 -msgid "The number of teeth" -msgstr "Количество зубцов" +#. Crop settings +#: ../src/extension/internal/pdfinput/pdf-input.cpp:112 +msgid "Clip to:" +msgstr "Кадрировать по:" -#: ../src/live_effects/lpe-gears.cpp:215 -#, fuzzy -msgid "_Phi:" -msgstr "φ (фи):" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:123 +msgid "Page settings" +msgstr "Параметры страницы" -#: ../src/live_effects/lpe-gears.cpp:215 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:124 +msgid "Precision of approximating gradient meshes:" +msgstr "Точность аппроксимации градиентных сеток:" + +#: ../src/extension/internal/pdfinput/pdf-input.cpp:125 msgid "" -"Tooth pressure angle (typically 20-25 deg). The ratio of teeth not in " -"contact." +"<b>Note</b>: setting the precision too high may result in a large SVG file " +"and slow performance." msgstr "" -"Угол давления зубцов (обычно равен 20-25°). С соотношением зубцов не связан." +"<b>Примечание</b>: слишком высокая точность приведёт к созданию очень " +"большого файла SVG и замедлению работы программы" -#: ../src/live_effects/lpe-interpolate.cpp:31 -#, fuzzy -msgid "Trajectory:" -msgstr "Траектория" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:128 +msgid "import via Poppler" +msgstr "" -#: ../src/live_effects/lpe-interpolate.cpp:31 -msgid "Path along which intermediate steps are created." -msgstr "Контур, по которому будут выстроены промежуточные фигуры" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:138 +msgid "rough" +msgstr "невысокая" -#: ../src/live_effects/lpe-interpolate.cpp:32 -#, fuzzy -msgid "Steps_:" -msgstr "Шаги" +#. Text options +#: ../src/extension/internal/pdfinput/pdf-input.cpp:142 +msgid "Text handling:" +msgstr "Импортировать текст:" -#: ../src/live_effects/lpe-interpolate.cpp:32 -msgid "Determines the number of steps from start to end path." -msgstr "Количество промежуточных фигур между начальным и конечным субконтурами" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:144 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:145 +msgid "Import text as text" +msgstr "Как текст" -#: ../src/live_effects/lpe-interpolate.cpp:33 -#, fuzzy -msgid "E_quidistant spacing" -msgstr "Равномерный интервал" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:146 +msgid "Replace PDF fonts by closest-named installed fonts" +msgstr "Заменить шрифты подходящими из установленных" -#: ../src/live_effects/lpe-interpolate.cpp:33 -msgid "" -"If true, the spacing between intermediates is constant along the length of " -"the path. If false, the distance depends on the location of the nodes of the " -"trajectory path." -msgstr "" -"Если включено, интервал между промежуточными фигурами не меняется на " -"протяжении всего контура. Если выключено, расстояние меняется в зависимости " -"от положения узлов на контуре траектории." +#: ../src/extension/internal/pdfinput/pdf-input.cpp:149 +msgid "Embed images" +msgstr "Встроить все растровые изображения" -#. initialise your parameters here: -#: ../src/live_effects/lpe-knot.cpp:350 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:151 +msgid "Import settings" +msgstr "Параметры импорта" + +#: ../src/extension/internal/pdfinput/pdf-input.cpp:268 +msgid "PDF Import Settings" +msgstr "Параметры импорта PDF" + +#: ../src/extension/internal/pdfinput/pdf-input.cpp:431 #, fuzzy -msgid "Fi_xed width:" -msgstr "Фиксированная толщина" +msgctxt "PDF input precision" +msgid "rough" +msgstr "невысокая" -#: ../src/live_effects/lpe-knot.cpp:350 -msgid "Size of hidden region of lower string" -msgstr "Размер скрываемой области нижней нити" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:432 +#, fuzzy +msgctxt "PDF input precision" +msgid "medium" +msgstr "Средние" + +#: ../src/extension/internal/pdfinput/pdf-input.cpp:433 +#, fuzzy +msgctxt "PDF input precision" +msgid "fine" +msgstr "высокая" -#: ../src/live_effects/lpe-knot.cpp:351 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:434 #, fuzzy -msgid "_In units of stroke width" -msgstr "В единицах толщины обводки" +msgctxt "PDF input precision" +msgid "very fine" +msgstr "очень высокая" -#: ../src/live_effects/lpe-knot.cpp:351 -msgid "Consider 'Interruption width' as a ratio of stroke width" -msgstr "Считать толщину прерывания коэффициентом толщины штриха" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:877 +msgid "PDF Input" +msgstr "Импорт PDF" -#: ../src/live_effects/lpe-knot.cpp:352 -#, fuzzy -msgid "St_roke width" -msgstr "Прибавить толщину обводки" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:882 +msgid "Adobe PDF (*.pdf)" +msgstr "Adobe PDF (*.pdf)" -#: ../src/live_effects/lpe-knot.cpp:352 -msgid "Add the stroke width to the interruption size" -msgstr "Добавить толщину обводки к толщине прерывания" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:883 +msgid "Adobe Portable Document Format" +msgstr "Adobe Portable Document Format" -#: ../src/live_effects/lpe-knot.cpp:353 -#, fuzzy -msgid "_Crossing path stroke width" -msgstr "Прибавить толщину пересекающего контура" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:890 +msgid "AI Input" +msgstr "Импорт AI" -#: ../src/live_effects/lpe-knot.cpp:353 -msgid "Add crossed stroke width to the interruption size" -msgstr "Добавить толщину пересекающего контура к толщине прерывания" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:895 +msgid "Adobe Illustrator 9.0 and above (*.ai)" +msgstr "Adobe Illustrator 9.0 и выше (*.ai)" -#: ../src/live_effects/lpe-knot.cpp:354 -#, fuzzy -msgid "S_witcher size:" -msgstr "Размер переключателя:" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:896 +msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" +msgstr "" +"Открыть файлы, сохраненные в Adobe Illustrator 9.0 и более новых версиях" -#: ../src/live_effects/lpe-knot.cpp:354 -msgid "Orientation indicator/switcher size" -msgstr "Размер индикатора-переключателя направления" +#: ../src/extension/internal/pov-out.cpp:715 +msgid "PovRay Output" +msgstr "Экспорт в POV-Ray" -#: ../src/live_effects/lpe-knot.cpp:355 -msgid "Crossing Signs" -msgstr "Знаки пересечения" +#: ../src/extension/internal/pov-out.cpp:720 +msgid "PovRay (*.pov) (paths and shapes only)" +msgstr "POV-Ray, только контуры и фигуры (*.pov)" -#: ../src/live_effects/lpe-knot.cpp:355 -msgid "Crossings signs" -msgstr "Знаки пересечения" +#: ../src/extension/internal/pov-out.cpp:721 +msgid "PovRay Raytracer File" +msgstr "Файл трассировщика лучей POV-Ray" -#: ../src/live_effects/lpe-knot.cpp:622 -msgid "Drag to select a crossing, click to flip it" -msgstr "Перетащите для выбора пересечения, щелчком измените его тип" +#: ../src/extension/internal/svg.cpp:100 +msgid "SVG Input" +msgstr "Импорт SVG" -#. / @todo Is this the right verb? -#: ../src/live_effects/lpe-knot.cpp:660 -msgid "Change knot crossing" -msgstr "Смена типа пересечения" +#: ../src/extension/internal/svg.cpp:105 +msgid "Scalable Vector Graphic (*.svg)" +msgstr "Масштабируемая векторная графика (*.svg)" -#: ../src/live_effects/lpe-patternalongpath.cpp:50 -#: ../share/extensions/pathalongpath.inx.h:10 -msgid "Single" -msgstr "Одиночные" +#: ../src/extension/internal/svg.cpp:106 +msgid "Inkscape native file format and W3C standard" +msgstr "Файлы в собственном формате Inkscape и стандарт W3C" -#: ../src/live_effects/lpe-patternalongpath.cpp:51 -#: ../share/extensions/pathalongpath.inx.h:11 -msgid "Single, stretched" -msgstr "Одиночные, растягиваются" +#: ../src/extension/internal/svg.cpp:114 +msgid "SVG Output Inkscape" +msgstr "Экспорт в Inkscape SVG" -#: ../src/live_effects/lpe-patternalongpath.cpp:52 -#: ../share/extensions/pathalongpath.inx.h:12 -msgid "Repeated" -msgstr "Повторяются" +#: ../src/extension/internal/svg.cpp:119 +msgid "Inkscape SVG (*.svg)" +msgstr "Inkscape SVG (*.svg)" -#: ../src/live_effects/lpe-patternalongpath.cpp:53 -#: ../share/extensions/pathalongpath.inx.h:13 -msgid "Repeated, stretched" -msgstr "Повторяются и растягиваются" +#: ../src/extension/internal/svg.cpp:120 +msgid "SVG format with Inkscape extensions" +msgstr "Формат SVG с расширениями Inkscape" -#: ../src/live_effects/lpe-patternalongpath.cpp:59 -#, fuzzy -msgid "Pattern source:" -msgstr "Текстура (кисть)" +#: ../src/extension/internal/svg.cpp:128 +msgid "SVG Output" +msgstr "Экспорт в SVG" -#: ../src/live_effects/lpe-patternalongpath.cpp:59 -msgid "Path to put along the skeleton path" -msgstr "Текстура, направляемая по скелетному контуру" +#: ../src/extension/internal/svg.cpp:133 +msgid "Plain SVG (*.svg)" +msgstr "Простой SVG (*.svg)" -#: ../src/live_effects/lpe-patternalongpath.cpp:60 -#, fuzzy -msgid "Pattern copies:" -msgstr "Копии:" +#: ../src/extension/internal/svg.cpp:134 +msgid "Scalable Vector Graphics format as defined by the W3C" +msgstr "" +"Масштабируемая векторная графика (SVG) в соответствии со спецификацией W3C" -#: ../src/live_effects/lpe-patternalongpath.cpp:60 -msgid "How many pattern copies to place along the skeleton path" -msgstr "Как много копий текстуры разместить вдоль скелетного контура" +#: ../src/extension/internal/svgz.cpp:46 +msgid "SVGZ Input" +msgstr "Импорт файлов SVGZ" -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -msgid "Width of the pattern" -msgstr "Ширина текстуры" +#: ../src/extension/internal/svgz.cpp:52 ../src/extension/internal/svgz.cpp:66 +msgid "Compressed Inkscape SVG (*.svgz)" +msgstr "Сжатые файлы Inkscape SVG (*.svgz)" -#: ../src/live_effects/lpe-patternalongpath.cpp:63 -#, fuzzy -msgid "Wid_th in units of length" -msgstr "Единица ширины = длина контура" +#: ../src/extension/internal/svgz.cpp:53 +msgid "SVG file format compressed with GZip" +msgstr "Файлы в формате SVG, сжатые GZip" -#: ../src/live_effects/lpe-patternalongpath.cpp:64 -msgid "Scale the width of the pattern in units of its length" -msgstr "Измерять ширину текстуры в единицах, равных ее длине" +#: ../src/extension/internal/svgz.cpp:61 ../src/extension/internal/svgz.cpp:75 +msgid "SVGZ Output" +msgstr "Экспорт в SVGZ" -#: ../src/live_effects/lpe-patternalongpath.cpp:66 -#, fuzzy -msgid "Spa_cing:" -msgstr "Интервал:" +#: ../src/extension/internal/svgz.cpp:67 +msgid "Inkscape's native file format compressed with GZip" +msgstr "Файлы в формате Inkscape, сжатые GZip" -#: ../src/live_effects/lpe-patternalongpath.cpp:68 -#, no-c-format -msgid "" -"Space between copies of the pattern. Negative values allowed, but are " -"limited to -90% of pattern width." -msgstr "" -"Интервал между копиями текстуры. Можно указать отрицательное число не более " -"чем -90% процентов от ширины текстуры." +#: ../src/extension/internal/svgz.cpp:80 +msgid "Compressed plain SVG (*.svgz)" +msgstr "Сжатые файлы Inkscape SVG (*.svgz)" -#: ../src/live_effects/lpe-patternalongpath.cpp:70 -#, fuzzy -msgid "No_rmal offset:" -msgstr "Обычное смещение:" +#: ../src/extension/internal/svgz.cpp:81 +msgid "Scalable Vector Graphics format compressed with GZip" +msgstr "Масштабируемая векторная графика (SVG), сжатая GZip" -#: ../src/live_effects/lpe-patternalongpath.cpp:71 +#: ../src/extension/internal/vsd-input.cpp:274 #, fuzzy -msgid "Tan_gential offset:" -msgstr "Смещение по касательной:" +msgid "VSD Input" +msgstr "Импорт PDF" -#: ../src/live_effects/lpe-patternalongpath.cpp:72 +#: ../src/extension/internal/vsd-input.cpp:279 #, fuzzy -msgid "Offsets in _unit of pattern size" -msgstr "Смещения в единицах текстуры" +msgid "Microsoft Visio Diagram (*.vsd)" +msgstr "Схемы Dia (*.dia)" -#: ../src/live_effects/lpe-patternalongpath.cpp:73 -msgid "" -"Spacing, tangential and normal offset are expressed as a ratio of width/" -"height" +#: ../src/extension/internal/vsd-input.cpp:280 +msgid "File format used by Microsoft Visio 6 and later" msgstr "" -"Интервал, обычное и тангенциальное смещения выражаются как соотношение " -"ширины и высоты" -#: ../src/live_effects/lpe-patternalongpath.cpp:75 +#: ../src/extension/internal/vsd-input.cpp:287 #, fuzzy -msgid "Pattern is _vertical" -msgstr "Текстура вертикальна" - -#: ../src/live_effects/lpe-patternalongpath.cpp:75 -msgid "Rotate pattern 90 deg before applying" -msgstr "Повернуть текстуру на 90° перед применением" +msgid "VDX Input" +msgstr "Импорт DXF" -#: ../src/live_effects/lpe-patternalongpath.cpp:77 +#: ../src/extension/internal/vsd-input.cpp:292 #, fuzzy -msgid "_Fuse nearby ends:" -msgstr "Сливаться у концов" +msgid "Microsoft Visio XML Diagram (*.vdx)" +msgstr "Microsoft XAML (*.xaml)" -#: ../src/live_effects/lpe-patternalongpath.cpp:77 -msgid "Fuse ends closer than this number. 0 means don't fuse." +#: ../src/extension/internal/vsd-input.cpp:293 +msgid "File format used by Microsoft Visio 2010 and later" msgstr "" -"Сращивать концы, находящиеся ближе этого расстояния. Ноль означает не " -"сращивать." -#: ../src/live_effects/lpe-powerstroke.cpp:189 +#: ../src/extension/internal/vsd-input.cpp:300 #, fuzzy -msgid "CubicBezierFit" -msgstr "Кривые Безье" +msgid "VSDM Input" +msgstr "Импорт EMF" -#: ../src/live_effects/lpe-powerstroke.cpp:190 -msgid "CubicBezierJohan" +#: ../src/extension/internal/vsd-input.cpp:305 +msgid "Microsoft Visio 2013 drawing (*.vsdm)" msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:191 -#, fuzzy -msgid "SpiroInterpolator" -msgstr "Интерполяция" - -#: ../src/live_effects/lpe-powerstroke.cpp:203 -#, fuzzy -msgid "Butt" -msgstr "Кнопка" - -#: ../src/live_effects/lpe-powerstroke.cpp:204 -#, fuzzy -msgid "Square" -msgstr "Квадратные" +#: ../src/extension/internal/vsd-input.cpp:306 +#: ../src/extension/internal/vsd-input.cpp:319 +msgid "File format used by Microsoft Visio 2013 and later" +msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:205 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 +#: ../src/extension/internal/vsd-input.cpp:313 #, fuzzy -msgid "Round" -msgstr "Закругление" +msgid "VSDX Input" +msgstr "Импорт DXF" -#: ../src/live_effects/lpe-powerstroke.cpp:206 -msgid "Peak" +#: ../src/extension/internal/vsd-input.cpp:318 +msgid "Microsoft Visio 2013 drawing (*.vsdx)" msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:207 -#, fuzzy -msgid "Zero width" -msgstr "Толщина пера" - -#: ../src/live_effects/lpe-powerstroke.cpp:220 -#, fuzzy -msgid "Beveled" -msgstr "Фаска" +#: ../src/extension/internal/wmf-inout.cpp:3127 +msgid "WMF Input" +msgstr "Импорт WMF" -#: ../src/live_effects/lpe-powerstroke.cpp:221 -#: ../src/widgets/star-toolbar.cpp:534 -msgid "Rounded" -msgstr "Закругление" +#: ../src/extension/internal/wmf-inout.cpp:3132 +msgid "Windows Metafiles (*.wmf)" +msgstr "Файлы Windows Metafile (*.wmf)" -#: ../src/live_effects/lpe-powerstroke.cpp:222 -#, fuzzy -msgid "Extrapolated" -msgstr "Интерполяция" +#: ../src/extension/internal/wmf-inout.cpp:3133 +msgid "Windows Metafiles" +msgstr "Файлы Windows Metafile" -#: ../src/live_effects/lpe-powerstroke.cpp:223 +#: ../src/extension/internal/wmf-inout.cpp:3141 #, fuzzy -msgid "Miter" -msgstr "Острое" - -#: ../src/live_effects/lpe-powerstroke.cpp:224 -#: ../src/widgets/pencil-toolbar.cpp:103 -msgid "Spiro" -msgstr "Кривые Спиро" +msgid "WMF Output" +msgstr "Экспорт в EMF" -#: ../src/live_effects/lpe-powerstroke.cpp:226 -msgid "Extrapolated arc" +#: ../src/extension/internal/wmf-inout.cpp:3151 +msgid "Map all fill patterns to standard WMF hatches" msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:233 -#, fuzzy -msgid "Offset points" -msgstr "Растянутый контур" +#: ../src/extension/internal/wmf-inout.cpp:3155 +#: ../share/extensions/wmf_input.inx.h:2 +#: ../share/extensions/wmf_output.inx.h:2 +msgid "Windows Metafile (*.wmf)" +msgstr "Файлы Windows Metafile (*.wmf)" -#: ../src/live_effects/lpe-powerstroke.cpp:234 +#: ../src/extension/internal/wmf-inout.cpp:3156 #, fuzzy -msgid "Sort points" -msgstr "Ориентация" - -#: ../src/live_effects/lpe-powerstroke.cpp:234 -msgid "Sort offset points according to their time value along the curve" -msgstr "" +msgid "Windows Metafile" +msgstr "Файлы Windows Metafile" -#: ../src/live_effects/lpe-powerstroke.cpp:235 -#, fuzzy -msgid "Interpolator type:" -msgstr "Интерполировать стиль" +#: ../src/extension/internal/wpg-input.cpp:129 +msgid "WPG Input" +msgstr "Импорт WPG" -#: ../src/live_effects/lpe-powerstroke.cpp:235 -msgid "" -"Determines which kind of interpolator will be used to interpolate between " -"stroke width along the path" -msgstr "" +#: ../src/extension/internal/wpg-input.cpp:134 +msgid "WordPerfect Graphics (*.wpg)" +msgstr "Графика WordPerfect (*.wpg)" -#: ../src/live_effects/lpe-powerstroke.cpp:236 -#: ../share/extensions/fractalize.inx.h:3 -#, fuzzy -msgid "Smoothness:" -msgstr "Сглаженность:" +#: ../src/extension/internal/wpg-input.cpp:135 +msgid "Vector graphics format used by Corel WordPerfect" +msgstr "Формат векторной графики, используемой Corel WordPerfect" -#: ../src/live_effects/lpe-powerstroke.cpp:236 -msgid "" -"Sets the smoothness for the CubicBezierJohan interpolator; 0 = linear " -"interpolation, 1 = smooth" -msgstr "" +#: ../src/extension/prefdialog.cpp:276 +msgid "Live preview" +msgstr "Предпросмотр" -#: ../src/live_effects/lpe-powerstroke.cpp:237 -#, fuzzy -msgid "Start cap:" -msgstr "Начало:" +#: ../src/extension/prefdialog.cpp:276 +msgid "Is the effect previewed live on canvas?" +msgstr "Показывать ли результат применения эффекта сразу на холсте" -#: ../src/live_effects/lpe-powerstroke.cpp:237 -#, fuzzy -msgid "Determines the shape of the path's start" -msgstr "Количество промежуточных фигур между начальным и конечным субконтурами" +#: ../src/extension/system.cpp:125 ../src/extension/system.cpp:127 +msgid "Format autodetect failed. The file is being opened as SVG." +msgstr "Невозможно определить формат файла. Файл будет открыт как SVG." -#. Join type -#. TRANSLATORS: The line join style specifies the shape to be used at the -#. corners of paths. It can be "miter", "round" or "bevel". -#: ../src/live_effects/lpe-powerstroke.cpp:238 -#: ../src/widgets/stroke-style.cpp:227 -msgid "Join:" -msgstr "Соединение:" +#: ../src/file.cpp:183 +msgid "default.svg" +msgstr "default.svg" -#: ../src/live_effects/lpe-powerstroke.cpp:238 -#, fuzzy -msgid "Determines the shape of the path's corners" -msgstr "Количество промежуточных фигур между начальным и конечным субконтурами" +#: ../src/file.cpp:322 +msgid "Broken links have been changed to point to existing files." +msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:239 -#, fuzzy -msgid "Miter limit:" -msgstr "Пред_ел острия:" +#: ../src/file.cpp:333 ../src/file.cpp:1249 +#, c-format +msgid "Failed to load the requested file %s" +msgstr "Не удалось загрузить запрошенный файл %s" -#: ../src/live_effects/lpe-powerstroke.cpp:239 -#: ../src/widgets/stroke-style.cpp:278 -msgid "Maximum length of the miter (in units of stroke width)" -msgstr "Максимальная длина острия (в единицах толщины обводки)" +#: ../src/file.cpp:359 +msgid "Document not saved yet. Cannot revert." +msgstr "Документ еще не был сохранен. Вернуться к сохраненному невозможно." -#: ../src/live_effects/lpe-powerstroke.cpp:240 +#: ../src/file.cpp:365 #, fuzzy -msgid "End cap:" -msgstr "Круглые" +msgid "Changes will be lost! Are you sure you want to reload document %1?" +msgstr "" +"Изменения будут потеряны! Вы уверены, что хотите загрузить документ %s " +"заново?" -#: ../src/live_effects/lpe-powerstroke.cpp:240 -#, fuzzy -msgid "Determines the shape of the path's end" -msgstr "Количество промежуточных фигур между начальным и конечным субконтурами" +#: ../src/file.cpp:391 +msgid "Document reverted." +msgstr "Документ возвращен к последнему сохраненному состоянию." -#: ../src/live_effects/lpe-rough-hatches.cpp:225 -#, fuzzy -msgid "Frequency randomness:" -msgstr "Случайность интервала" +#: ../src/file.cpp:393 +msgid "Document not reverted." +msgstr "Документ не возвращен к сохраненному состоянию." -#: ../src/live_effects/lpe-rough-hatches.cpp:225 -msgid "Variation of distance between hatches, in %." -msgstr "Варьирование расстояния между штрихами, в %" +#: ../src/file.cpp:543 +msgid "Select file to open" +msgstr "Выберите файл" -#: ../src/live_effects/lpe-rough-hatches.cpp:226 -#, fuzzy -msgid "Growth:" -msgstr "Нарастание:" +#: ../src/file.cpp:625 +msgid "Clean up document" +msgstr "Подчистка документа" -#: ../src/live_effects/lpe-rough-hatches.cpp:226 -msgid "Growth of distance between hatches." -msgstr "Нарастание расстояния между штрихами" +#: ../src/file.cpp:632 +#, c-format +msgid "Removed <b>%i</b> unused definition in <defs>." +msgid_plural "Removed <b>%i</b> unused definitions in <defs>." +msgstr[0] "Удалено <b>%i</b> ненужное определение в <defs>." +msgstr[1] "Удалено <b>%i</b> ненужных определения в <defs>." +msgstr[2] "Удалено <b>%i</b> ненужных определений в <defs>." -#. FIXME: top/bottom names are inverted in the UI/svg and in the code!! -#: ../src/live_effects/lpe-rough-hatches.cpp:228 -#, fuzzy -msgid "Half-turns smoothness: 1st side, in:" -msgstr "Плавность полуповоротов, 1-ая сторона, вход:" +#: ../src/file.cpp:637 +msgid "No unused definitions in <defs>." +msgstr "Нет ненужных элементов в <defs>." -#: ../src/live_effects/lpe-rough-hatches.cpp:228 +#: ../src/file.cpp:669 +#, c-format msgid "" -"Set smoothness/sharpness of path when reaching a 'bottom' half-turn. " -"0=sharp, 1=default" +"No Inkscape extension found to save document (%s). This may have been " +"caused by an unknown filename extension." msgstr "" -"Установить плавность/остроту контура по достижении им нижнего полуповорота. " -"0 = острый, 1=по умолчанию." +"Не найдено расширение Inkscape для сохранения документа (%s). Возможно, " +"задано неизвестное расширение имени файла." -#: ../src/live_effects/lpe-rough-hatches.cpp:229 -#, fuzzy -msgid "1st side, out:" -msgstr "1-ая сторона, выход:" +#: ../src/file.cpp:670 ../src/file.cpp:678 ../src/file.cpp:686 +#: ../src/file.cpp:692 ../src/file.cpp:697 +msgid "Document not saved." +msgstr "Документ не сохранен." -#: ../src/live_effects/lpe-rough-hatches.cpp:229 +#: ../src/file.cpp:677 +#, c-format msgid "" -"Set smoothness/sharpness of path when leaving a 'bottom' half-turn. 0=sharp, " -"1=default" +"File %s is write protected. Please remove write protection and try again." msgstr "" -"Установить плавность/остроту контура при уходе от нижнего полуповорота. 0 = " -"острый, 1=по умолчанию." +"Файл %s защищён от записи. Уберите защиту от записи и попробуйте снова." -#: ../src/live_effects/lpe-rough-hatches.cpp:230 -#, fuzzy -msgid "2nd side, in:" -msgstr "2-ая сторона, вход:" +#: ../src/file.cpp:685 +#, c-format +msgid "File %s could not be saved." +msgstr "Невозможно сохранить файл %s." -#: ../src/live_effects/lpe-rough-hatches.cpp:230 -msgid "" -"Set smoothness/sharpness of path when reaching a 'top' half-turn. 0=sharp, " -"1=default" -msgstr "" -"Установить плавность/остроту контура по достижении им верхнего полуповорота. " -"0 = острый, 1=по умолчанию." +#: ../src/file.cpp:715 ../src/file.cpp:717 +msgid "Document saved." +msgstr "Документ сохранен." -#: ../src/live_effects/lpe-rough-hatches.cpp:231 +#. We are saving for the first time; create a unique default filename +#: ../src/file.cpp:860 ../src/file.cpp:1408 #, fuzzy -msgid "2nd side, out:" -msgstr "2-ая сторона, выход:" - -#: ../src/live_effects/lpe-rough-hatches.cpp:231 -msgid "" -"Set smoothness/sharpness of path when leaving a 'top' half-turn. 0=sharp, " -"1=default" -msgstr "" -"Установить плавность/остроту контура при уходе от верхнего полуповорота. 0 = " -"острый, 1=по умолчанию." +msgid "drawing" +msgstr "рисунок%s" -#: ../src/live_effects/lpe-rough-hatches.cpp:232 +#: ../src/file.cpp:865 #, fuzzy -msgid "Magnitude jitter: 1st side:" -msgstr "Колебание величины, 1-ая сторона:" +msgid "drawing-%1" +msgstr "рисунок%s" -#: ../src/live_effects/lpe-rough-hatches.cpp:232 -msgid "Randomly moves 'bottom' half-turns to produce magnitude variations." -msgstr "Случайное перемещение нижних полуповоротов для изменения величины" +#: ../src/file.cpp:882 +msgid "Select file to save a copy to" +msgstr "Выберите файл для сохранения копии" + +#: ../src/file.cpp:884 +msgid "Select file to save to" +msgstr "Выберите файл для сохранения" + +#: ../src/file.cpp:989 ../src/file.cpp:991 +msgid "No changes need to be saved." +msgstr "Файл не был изменен. Сохранение не требуется." + +#: ../src/file.cpp:1010 +msgid "Saving document..." +msgstr "Выполняется сохранение документа..." + +#: ../src/file.cpp:1246 ../src/ui/dialog/inkscape-preferences.cpp:1443 +#: ../src/ui/dialog/ocaldialogs.cpp:1244 +msgid "Import" +msgstr "Импорт" + +#: ../src/file.cpp:1296 +msgid "Select file to import" +msgstr "Выберите файл для импорта" + +#: ../src/file.cpp:1429 +msgid "Select file to export to" +msgstr "Выберите файл для экспорта" + +#: ../src/file.cpp:1682 +msgid "Import Clip Art" +msgstr "Импорт из Open Clip Art Library" -#: ../src/live_effects/lpe-rough-hatches.cpp:233 -#: ../src/live_effects/lpe-rough-hatches.cpp:235 -#: ../src/live_effects/lpe-rough-hatches.cpp:237 -#, fuzzy -msgid "2nd side:" -msgstr "2-ая сторона:" +#: ../src/filter-enums.cpp:21 +msgid "Color Matrix" +msgstr "Цветовая матрица" -#: ../src/live_effects/lpe-rough-hatches.cpp:233 -msgid "Randomly moves 'top' half-turns to produce magnitude variations." -msgstr "Случайное перемещение верхних полуповоротов для изменения величины" +#: ../src/filter-enums.cpp:23 +msgid "Composite" +msgstr "Совмещение" -#: ../src/live_effects/lpe-rough-hatches.cpp:234 -#, fuzzy -msgid "Parallelism jitter: 1st side:" -msgstr "Колебание параллелизма, 1-ая сторона:" +#: ../src/filter-enums.cpp:24 +msgid "Convolve Matrix" +msgstr "Матрица свертки" -#: ../src/live_effects/lpe-rough-hatches.cpp:234 -msgid "" -"Add direction randomness by moving 'bottom' half-turns tangentially to the " -"boundary." -msgstr "" -"Добавить случайность направления путем перемещения нижних полуповоротов по " -"касательной к границе" +#: ../src/filter-enums.cpp:25 +msgid "Diffuse Lighting" +msgstr "Рассеянный свет" -#: ../src/live_effects/lpe-rough-hatches.cpp:235 -msgid "" -"Add direction randomness by randomly moving 'top' half-turns tangentially to " -"the boundary." -msgstr "" -"Добавить случайность направления путем перемещения верхних полуповоротов по " -"касательной к границе" +#: ../src/filter-enums.cpp:26 +msgid "Displacement Map" +msgstr "Карта смещения" -#: ../src/live_effects/lpe-rough-hatches.cpp:236 -#, fuzzy -msgid "Variance: 1st side:" -msgstr "Вариативность, 1-ая сторона:" +#: ../src/filter-enums.cpp:27 +msgid "Flood" +msgstr "Заливка" -#: ../src/live_effects/lpe-rough-hatches.cpp:236 -msgid "Randomness of 'bottom' half-turns smoothness" -msgstr "Случайность плавности нижних полуповоротов" +#: ../src/filter-enums.cpp:30 ../share/extensions/text_merge.inx.h:1 +msgid "Merge" +msgstr "Сведение" -#: ../src/live_effects/lpe-rough-hatches.cpp:237 -msgid "Randomness of 'top' half-turns smoothness" -msgstr "Случайность плавности верхних полуповоротов" +#: ../src/filter-enums.cpp:33 +msgid "Specular Lighting" +msgstr "Отражение света" -#. -#: ../src/live_effects/lpe-rough-hatches.cpp:239 -msgid "Generate thick/thin path" -msgstr "Менять толщину штрихов" +#: ../src/filter-enums.cpp:34 +msgid "Tile" +msgstr "Мозаика" -#: ../src/live_effects/lpe-rough-hatches.cpp:239 -msgid "Simulate a stroke of varying width" -msgstr "Имитировать смену толщины штриха" +#: ../src/filter-enums.cpp:40 +msgid "Source Graphic" +msgstr "Исходный объект" -#: ../src/live_effects/lpe-rough-hatches.cpp:240 -msgid "Bend hatches" -msgstr "Изгибать штрихи" +#: ../src/filter-enums.cpp:41 +msgid "Source Alpha" +msgstr "α-канал исходного объекта" -#: ../src/live_effects/lpe-rough-hatches.cpp:240 -msgid "Add a global bend to the hatches (slower)" -msgstr "Добавить глобальное изгибание штрихов (медленнее)" +#: ../src/filter-enums.cpp:42 +msgid "Background Image" +msgstr "Фоновое изображение" -#: ../src/live_effects/lpe-rough-hatches.cpp:241 -#, fuzzy -msgid "Thickness: at 1st side:" -msgstr "Толщина, 1-ая сторона:" +#: ../src/filter-enums.cpp:43 +msgid "Background Alpha" +msgstr "α-канал фонового изображения" -#: ../src/live_effects/lpe-rough-hatches.cpp:241 -msgid "Width at 'bottom' half-turns" -msgstr "Толщина нижнего полуповорота" +#: ../src/filter-enums.cpp:44 +msgid "Fill Paint" +msgstr "Цвет заливки" -#: ../src/live_effects/lpe-rough-hatches.cpp:242 -#, fuzzy -msgid "At 2nd side:" -msgstr "2-ая сторона:" +#: ../src/filter-enums.cpp:45 +msgid "Stroke Paint" +msgstr "Цвет обводки" -#: ../src/live_effects/lpe-rough-hatches.cpp:242 -msgid "Width at 'top' half-turns" -msgstr "Толщина верхнего полуповорота" +#. New in Compositing and Blending Level 1 +#: ../src/filter-enums.cpp:57 +#, fuzzy +msgid "Overlay" +msgstr "Перекрытия" -#. -#: ../src/live_effects/lpe-rough-hatches.cpp:244 +#: ../src/filter-enums.cpp:58 #, fuzzy -msgid "From 2nd to 1st side:" -msgstr "От 2-ой к 1-ой стороне:" +msgid "Color Dodge" +msgstr "Цвет" -#: ../src/live_effects/lpe-rough-hatches.cpp:244 -msgid "Width from 'top' to 'bottom'" -msgstr "Толщина штрихов от верхних полуповоротов к нижним" +#: ../src/filter-enums.cpp:59 +#, fuzzy +msgid "Color Burn" +msgstr "Контрольные цветовые полосы" -#: ../src/live_effects/lpe-rough-hatches.cpp:245 +#: ../src/filter-enums.cpp:60 #, fuzzy -msgid "From 1st to 2nd side:" -msgstr "От 1-ой ко 2-ой стороне:" +msgid "Hard Light" +msgstr "Высота штрих-кода:" -#: ../src/live_effects/lpe-rough-hatches.cpp:245 -msgid "Width from 'bottom' to 'top'" -msgstr "Толщина штрихов от нижних полуповоротов к верхним" +#: ../src/filter-enums.cpp:61 +#, fuzzy +msgid "Soft Light" +msgstr "Прожектор" -#: ../src/live_effects/lpe-rough-hatches.cpp:247 -msgid "Hatches width and dir" -msgstr "Толщина и направление штриховки" +#: ../src/filter-enums.cpp:62 ../src/splivarot.cpp:88 ../src/splivarot.cpp:94 +msgid "Difference" +msgstr "Разность" -#: ../src/live_effects/lpe-rough-hatches.cpp:247 -msgid "Defines hatches frequency and direction" -msgstr "Частота и направление штриховки" +#: ../src/filter-enums.cpp:63 ../src/splivarot.cpp:100 +msgid "Exclusion" +msgstr "Исключающее ИЛИ" -#. -#: ../src/live_effects/lpe-rough-hatches.cpp:249 -msgid "Global bending" -msgstr "Общий изгиб" +#: ../src/filter-enums.cpp:64 ../src/ui/tools/flood-tool.cpp:196 +#: ../src/widgets/sp-color-icc-selector.cpp:361 +#: ../src/widgets/sp-color-icc-selector.cpp:365 +#: ../src/widgets/sp-color-scales.cpp:455 +#: ../src/widgets/sp-color-scales.cpp:456 ../src/widgets/tweak-toolbar.cpp:286 +#: ../share/extensions/color_randomize.inx.h:3 +msgid "Hue" +msgstr "Тон" -#: ../src/live_effects/lpe-rough-hatches.cpp:249 -msgid "" -"Relative position to a reference point defines global bending direction and " -"amount" +#: ../src/filter-enums.cpp:67 +msgid "Luminosity" msgstr "" -"Относительное положение к исходной точке определяет глобальное направление и " -"силу изгиба" - -#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/restack.inx.h:12 -#: ../share/extensions/text_extract.inx.h:8 -#: ../share/extensions/text_merge.inx.h:8 -msgid "Left" -msgstr "Слева" - -#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/restack.inx.h:14 -#: ../share/extensions/text_extract.inx.h:10 -#: ../share/extensions/text_merge.inx.h:10 -msgid "Right" -msgstr "Справа" -#: ../src/live_effects/lpe-ruler.cpp:27 ../src/live_effects/lpe-ruler.cpp:35 -msgid "Both" -msgstr "Оба" +#: ../src/filter-enums.cpp:77 +msgid "Matrix" +msgstr "Матрица" -#: ../src/live_effects/lpe-ruler.cpp:33 ../src/widgets/arc-toolbar.cpp:326 -msgid "Start" -msgstr "Начало" +#: ../src/filter-enums.cpp:78 +msgid "Saturate" +msgstr "Насыщенность" -#: ../src/live_effects/lpe-ruler.cpp:34 ../src/widgets/arc-toolbar.cpp:339 -msgid "End" -msgstr "Конец" +#: ../src/filter-enums.cpp:79 +msgid "Hue Rotate" +msgstr "Вращение тона" -#: ../src/live_effects/lpe-ruler.cpp:41 -msgid "_Mark distance:" -msgstr "_Расстояние между метками:" +#: ../src/filter-enums.cpp:80 +msgid "Luminance to Alpha" +msgstr "Освещенность в альфа" -#: ../src/live_effects/lpe-ruler.cpp:41 -msgid "Distance between successive ruler marks" -msgstr "Расстояние между соседними метками линейки" +#. File +#: ../src/filter-enums.cpp:86 ../src/verbs.cpp:2352 +#: ../share/extensions/jessyInk_mouseHandler.inx.h:3 +#: ../share/extensions/jessyInk_transitions.inx.h:7 +msgid "Default" +msgstr "По умолчанию" -#: ../src/live_effects/lpe-ruler.cpp:42 -#: ../share/extensions/foldablebox.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:9 -#: ../share/extensions/layout_nup.inx.h:3 -#: ../share/extensions/printing_marks.inx.h:11 -msgid "Unit:" -msgstr "Единица измерения:" +#. New CSS +#: ../src/filter-enums.cpp:94 +#, fuzzy +msgid "Clear" +msgstr "О_чистить" -#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:201 -msgid "Unit" -msgstr "Единица измерения:" +#: ../src/filter-enums.cpp:95 +#, fuzzy +msgid "Copy" +msgstr "С_копировать" -#: ../src/live_effects/lpe-ruler.cpp:43 -msgid "Ma_jor length:" -msgstr "_Основные метки:" +#: ../src/filter-enums.cpp:96 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1571 +msgid "Destination" +msgstr "Назначение" -#: ../src/live_effects/lpe-ruler.cpp:43 -msgid "Length of major ruler marks" -msgstr "Длина основных меток линейки" +#: ../src/filter-enums.cpp:97 +#, fuzzy +msgid "Destination Over" +msgstr "Назначение" -#: ../src/live_effects/lpe-ruler.cpp:44 -msgid "Mino_r length:" -msgstr "_Вспомогательные метки:" +#: ../src/filter-enums.cpp:98 +#, fuzzy +msgid "Destination In" +msgstr "Назначение" -#: ../src/live_effects/lpe-ruler.cpp:44 -msgid "Length of minor ruler marks" -msgstr "Длина вспомогательных меток линейки" +#: ../src/filter-enums.cpp:99 +#, fuzzy +msgid "Destination Out" +msgstr "Назначение" -#: ../src/live_effects/lpe-ruler.cpp:45 -msgid "Major steps_:" -msgstr "_Шаг основных меток:" +#: ../src/filter-enums.cpp:100 +#, fuzzy +msgid "Destination Atop" +msgstr "Назначение" -#: ../src/live_effects/lpe-ruler.cpp:45 -msgid "Draw a major mark every ... steps" -msgstr "Рисовать основные метки каждые .. вспомогательных меток" +#: ../src/filter-enums.cpp:101 +#, fuzzy +msgid "Lighter" +msgstr "Осветление" -#: ../src/live_effects/lpe-ruler.cpp:46 -msgid "Shift marks _by:" -msgstr "Ш_аг смещения меток:" +#: ../src/filter-enums.cpp:103 +msgid "Arithmetic" +msgstr "Арифметический" -#: ../src/live_effects/lpe-ruler.cpp:46 -msgid "Shift marks by this many steps" -msgstr "Смещать метки на это число шагов" +#: ../src/filter-enums.cpp:119 ../src/selection-chemistry.cpp:535 +msgid "Duplicate" +msgstr "Продублировать" -#: ../src/live_effects/lpe-ruler.cpp:47 -msgid "Mark direction:" -msgstr "Направление меток:" +#: ../src/filter-enums.cpp:120 +msgid "Wrap" +msgstr "Крупнее" -#: ../src/live_effects/lpe-ruler.cpp:47 -msgid "Direction of marks (when viewing along the path from start to end)" -msgstr "Направление меток (вдоль контура от начала к его концу)" +#: ../src/filter-enums.cpp:121 +#, fuzzy +msgctxt "Convolve matrix, edge mode" +msgid "None" +msgstr "Нет" -#: ../src/live_effects/lpe-ruler.cpp:48 -msgid "_Offset:" -msgstr "С_мещение:" +#: ../src/filter-enums.cpp:136 +msgid "Erode" +msgstr "Эрозия" -#: ../src/live_effects/lpe-ruler.cpp:48 -msgid "Offset of first mark" -msgstr "Смещение первой метки" +#: ../src/filter-enums.cpp:137 +msgid "Dilate" +msgstr "Дилатация" -#: ../src/live_effects/lpe-ruler.cpp:49 -msgid "Border marks:" -msgstr "Крайние метки:" +#: ../src/filter-enums.cpp:143 +msgid "Fractal Noise" +msgstr "Фрактальный шум" -#: ../src/live_effects/lpe-ruler.cpp:49 -msgid "Choose whether to draw marks at the beginning and end of the path" -msgstr "Рисовать ли метки в конце и начале контура" +#: ../src/filter-enums.cpp:150 +msgid "Distant Light" +msgstr "Удалённый" -#. initialise your parameters here: -#. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), -#: ../src/live_effects/lpe-sketch.cpp:38 -msgid "Strokes:" -msgstr "Штрихов:" +#: ../src/filter-enums.cpp:151 +msgid "Point Light" +msgstr "Точечный" -#: ../src/live_effects/lpe-sketch.cpp:38 -msgid "Draw that many approximating strokes" -msgstr "Количество рисуемых штрихов" +#: ../src/filter-enums.cpp:152 +msgid "Spot Light" +msgstr "Прожектор" -#: ../src/live_effects/lpe-sketch.cpp:39 +#: ../src/gradient-chemistry.cpp:1580 #, fuzzy -msgid "Max stroke length:" -msgstr "Макс. длина штрихов:" - -#: ../src/live_effects/lpe-sketch.cpp:40 -msgid "Maximum length of approximating strokes" -msgstr "Максимальная длина аппроксимирующих штрихов" +msgid "Invert gradient colors" +msgstr "Инвертирование градиента" -#: ../src/live_effects/lpe-sketch.cpp:41 +#: ../src/gradient-chemistry.cpp:1606 #, fuzzy -msgid "Stroke length variation:" -msgstr "Вариативность длины штрихов:" - -#: ../src/live_effects/lpe-sketch.cpp:42 -msgid "Random variation of stroke length (relative to maximum length)" -msgstr "Случайное изменение длины штриха (относительно максимальной длины)" +msgid "Reverse gradient" +msgstr "Линейный градиент" -#: ../src/live_effects/lpe-sketch.cpp:43 +#: ../src/gradient-chemistry.cpp:1620 ../src/widgets/gradient-selector.cpp:245 #, fuzzy -msgid "Max. overlap:" -msgstr "Макс. перекрытие:" +msgid "Delete swatch" +msgstr "Удалить опорную точку" -#: ../src/live_effects/lpe-sketch.cpp:44 -msgid "How much successive strokes should overlap (relative to maximum length)" -msgstr "" -"Как много последующих штрихов должно пересечься (относительно максимальной " -"длины)" +#: ../src/gradient-drag.cpp:97 ../src/ui/tools/gradient-tool.cpp:100 +msgid "Linear gradient <b>start</b>" +msgstr "Линейный градиент: <b>начало</b>" -#: ../src/live_effects/lpe-sketch.cpp:45 -#, fuzzy -msgid "Overlap variation:" -msgstr "Вариативность перекрытия:" +#. POINT_LG_BEGIN +#: ../src/gradient-drag.cpp:98 ../src/ui/tools/gradient-tool.cpp:101 +msgid "Linear gradient <b>end</b>" +msgstr "Линейный градиент: <b>конец</b>" -#: ../src/live_effects/lpe-sketch.cpp:46 -msgid "Random variation of overlap (relative to maximum overlap)" -msgstr "Случайное изменение перекрытия (относительно максимального перекрытия)" +#: ../src/gradient-drag.cpp:99 ../src/ui/tools/gradient-tool.cpp:102 +msgid "Linear gradient <b>mid stop</b>" +msgstr "<b>Опорная точка</b> линейного градиента" -#: ../src/live_effects/lpe-sketch.cpp:47 -#, fuzzy -msgid "Max. end tolerance:" -msgstr "Макс. концевое отклонение:" +#: ../src/gradient-drag.cpp:100 ../src/ui/tools/gradient-tool.cpp:103 +msgid "Radial gradient <b>center</b>" +msgstr "Радиальный градиент: <b>центр</b>" -#: ../src/live_effects/lpe-sketch.cpp:48 -msgid "" -"Maximum distance between ends of original and approximating paths (relative " -"to maximum length)" -msgstr "" -"Максимальное расстояние между концами исходного и аппроксимирующего контуров " -"(относительно максимальной длины)" +#: ../src/gradient-drag.cpp:101 ../src/gradient-drag.cpp:102 +#: ../src/ui/tools/gradient-tool.cpp:104 ../src/ui/tools/gradient-tool.cpp:105 +msgid "Radial gradient <b>radius</b>" +msgstr "Радиальный градиент: <b>радиус</b>" -#: ../src/live_effects/lpe-sketch.cpp:49 -#, fuzzy -msgid "Average offset:" -msgstr "Среднее смещение:" +#: ../src/gradient-drag.cpp:103 ../src/ui/tools/gradient-tool.cpp:106 +msgid "Radial gradient <b>focus</b>" +msgstr "Радиальный градиент: <b>фокус</b>" -#: ../src/live_effects/lpe-sketch.cpp:50 -msgid "Average distance each stroke is away from the original path" -msgstr "Среднее расстояние между каждым штрихом и исходным контуром" +#. POINT_RG_FOCUS +#: ../src/gradient-drag.cpp:104 ../src/gradient-drag.cpp:105 +#: ../src/ui/tools/gradient-tool.cpp:107 ../src/ui/tools/gradient-tool.cpp:108 +msgid "Radial gradient <b>mid stop</b>" +msgstr "<b>Опорная точка</b> радиального градиента" -#: ../src/live_effects/lpe-sketch.cpp:51 +#: ../src/gradient-drag.cpp:106 ../src/ui/tools/mesh-tool.cpp:103 #, fuzzy -msgid "Max. tremble:" -msgstr "Макс. дрожание:" +msgid "Mesh gradient <b>corner</b>" +msgstr "Радиальный градиент: <b>центр</b>" -#: ../src/live_effects/lpe-sketch.cpp:52 -msgid "Maximum tremble magnitude" -msgstr "Максимальная величина колебания" +#: ../src/gradient-drag.cpp:107 ../src/ui/tools/mesh-tool.cpp:104 +#, fuzzy +msgid "Mesh gradient <b>handle</b>" +msgstr "Смещение рычага градиента" -#: ../src/live_effects/lpe-sketch.cpp:53 +#: ../src/gradient-drag.cpp:108 ../src/ui/tools/mesh-tool.cpp:105 #, fuzzy -msgid "Tremble frequency:" -msgstr "Частота дрожания:" +msgid "Mesh gradient <b>tensor</b>" +msgstr "Линейный градиент: <b>конец</b>" -#: ../src/live_effects/lpe-sketch.cpp:54 -msgid "Average number of tremble periods in a stroke" -msgstr "Среднее количество периодов колебания в штрихе" +#: ../src/gradient-drag.cpp:567 +msgid "Added patch row or column" +msgstr "" -#: ../src/live_effects/lpe-sketch.cpp:56 -#, fuzzy -msgid "Construction lines:" -msgstr "Линий конструкции:" +#: ../src/gradient-drag.cpp:797 +msgid "Merge gradient handles" +msgstr "Объединение рычагов градиента" -#: ../src/live_effects/lpe-sketch.cpp:57 -msgid "How many construction lines (tangents) to draw" -msgstr "Как много касательных линий рисовать" +#: ../src/gradient-drag.cpp:1104 +msgid "Move gradient handle" +msgstr "Смещение рычага градиента" -#: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 -#: ../share/extensions/render_alphabetsoup.inx.h:3 -msgid "Scale:" -msgstr "Масштабирование:" +#: ../src/gradient-drag.cpp:1163 ../src/widgets/gradient-vector.cpp:847 +msgid "Delete gradient stop" +msgstr "Удаление опорной точки" -#: ../src/live_effects/lpe-sketch.cpp:59 +#: ../src/gradient-drag.cpp:1426 +#, c-format msgid "" -"Scale factor relating curvature and length of construction lines (try " -"5*offset)" +"%s %d for: %s%s; drag with <b>Ctrl</b> to snap offset; click with <b>Ctrl" +"+Alt</b> to delete stop" msgstr "" -"Коэффициент масштабирования, затрагивающий кривизну и длину линий построения " -"(попробуйте 5*смещение)" +"%s %d для: %s%s; c <b>Ctrl</b> прилипать по 1/10 радиуса, щелчком с <b>Ctrl" +"+Alt</b> удалить опорную точку" -#: ../src/live_effects/lpe-sketch.cpp:60 -#, fuzzy -msgid "Max. length:" -msgstr "Макс. длина:" +#: ../src/gradient-drag.cpp:1430 ../src/gradient-drag.cpp:1437 +msgid " (stroke)" +msgstr "(штрих)" -#: ../src/live_effects/lpe-sketch.cpp:60 -msgid "Maximum length of construction lines" -msgstr "Максимальная длина карандашных штрихов" +#: ../src/gradient-drag.cpp:1434 +#, c-format +msgid "" +"%s for: %s%s; drag with <b>Ctrl</b> to snap angle, with <b>Ctrl+Alt</b> to " +"preserve angle, with <b>Ctrl+Shift</b> to scale around center" +msgstr "" +"%s для: %s%s; <b>Ctrl</b> ограничивает угол, <b>Ctrl+Alt</b> фиксирует " +"угол, <b>Ctrl+Shift</b> масштабирует вокруг центра" -#: ../src/live_effects/lpe-sketch.cpp:61 -#, fuzzy -msgid "Length variation:" -msgstr "Вариативность длины:" +#: ../src/gradient-drag.cpp:1442 +msgid "" +"Radial gradient <b>center</b> and <b>focus</b>; drag with <b>Shift</b> to " +"separate focus" +msgstr "" +"<b>Центр</b> и <b>фокус</b> радиального градиента; перетаскивание с " +"<b>Shift</b> отделяет фокус" + +#: ../src/gradient-drag.cpp:1445 +#, c-format +msgid "" +"Gradient point shared by <b>%d</b> gradient; drag with <b>Shift</b> to " +"separate" +msgid_plural "" +"Gradient point shared by <b>%d</b> gradients; drag with <b>Shift</b> to " +"separate" +msgstr[0] "" +"Точка градиента, общая для <b>%d</b> градиента; перетаскивание с <b>Shift</" +"b> разделяет точки" +msgstr[1] "" +"Точка градиента, общая для <b>%d</b> градиентов; перетаскивание с <b>Shift</" +"b> разделяет точки" +msgstr[2] "" +"Точка градиента, общая для <b>%d</b> градиентов; перетаскивание с <b>Shift</" +"b> разделяет точки" -#: ../src/live_effects/lpe-sketch.cpp:61 -msgid "Random variation of the length of construction lines" -msgstr "Случайно варьирование длины карандашных штрихов" +#: ../src/gradient-drag.cpp:2377 +msgid "Move gradient handle(s)" +msgstr "Смещение рычага градиента" -#: ../src/live_effects/lpe-sketch.cpp:62 -#, fuzzy -msgid "Placement randomness:" -msgstr "Случайность размещения" +#: ../src/gradient-drag.cpp:2413 +msgid "Move gradient mid stop(s)" +msgstr "Смещение опорной точки градиента" -#: ../src/live_effects/lpe-sketch.cpp:62 -msgid "0: evenly distributed construction lines, 1: purely random placement" -msgstr "" -"0: равномерно расставленные линии конструкции, 1: совершенно случайное " -"размещение" +#: ../src/gradient-drag.cpp:2702 +msgid "Delete gradient stop(s)" +msgstr "Удалить опорную точку (-и)" -#: ../src/live_effects/lpe-sketch.cpp:64 +#: ../src/inkscape.cpp:344 #, fuzzy -msgid "k_min:" -msgstr "Мин. кривизна" - -#: ../src/live_effects/lpe-sketch.cpp:64 -msgid "min curvature" -msgstr "Минимальная кривизна" +msgid "Autosave failed! Cannot create directory %1." +msgstr "Невозможно создать каталог с профилем %s." -#: ../src/live_effects/lpe-sketch.cpp:65 +#: ../src/inkscape.cpp:353 #, fuzzy -msgid "k_max:" -msgstr "Макс. кривизна" +msgid "Autosave failed! Cannot open directory %1." +msgstr "Некорректный рабочий каталог: %s" -#: ../src/live_effects/lpe-sketch.cpp:65 -msgid "max curvature" -msgstr "Максимальная кривизна" +#: ../src/inkscape.cpp:369 +msgid "Autosaving documents..." +msgstr "Выполняется автоматическое сохранение документов..." -#: ../src/live_effects/lpe-vonkoch.cpp:46 -#, fuzzy -msgid "N_r of generations:" -msgstr "Количество поколений" +#: ../src/inkscape.cpp:442 +msgid "Autosave failed! Could not find inkscape extension to save document." +msgstr "" +"Автосохранение не сработало! Не удалось найти расширение Inkscape для " +"сохранения документа." -#: ../src/live_effects/lpe-vonkoch.cpp:46 -msgid "Depth of the recursion --- keep low!!" -msgstr "Глубина рекурсии — должна быть небольшой!" +#: ../src/inkscape.cpp:445 ../src/inkscape.cpp:452 +#, c-format +msgid "Autosave failed! File %s could not be saved." +msgstr "Не удалось автоматически сохранить файл %s!" -#: ../src/live_effects/lpe-vonkoch.cpp:47 -#, fuzzy -msgid "Generating path:" -msgstr "Порождающий контур" +#: ../src/inkscape.cpp:467 +msgid "Autosave complete." +msgstr "Автосохранение завершено" -#: ../src/live_effects/lpe-vonkoch.cpp:47 -msgid "Path whose segments define the iterated transforms" -msgstr "Контур, чьи сегменты определяют итерационные преобразования" +#: ../src/inkscape.cpp:715 +msgid "Untitled document" +msgstr "Без названия" -#: ../src/live_effects/lpe-vonkoch.cpp:48 -#, fuzzy -msgid "_Use uniform transforms only" -msgstr "Только однообразные преобразования" +#. Show nice dialog box +#: ../src/inkscape.cpp:747 +msgid "Inkscape encountered an internal error and will close now.\n" +msgstr "Внутренняя ошибка. Inkscape придется закрыть.\n" -#: ../src/live_effects/lpe-vonkoch.cpp:48 +#: ../src/inkscape.cpp:748 msgid "" -"2 consecutive segments are used to reverse/preserve orientation only " -"(otherwise, they define a general transform)." +"Automatic backups of unsaved documents were done to the following " +"locations:\n" msgstr "" -"Два последовательных сегмента используются только для разворота/сохранения " -"ориентации (в противном случае они определяют общее преобразование)" +"Выполнено автоматическое резервное копирование несохраненных документов:\n" -#: ../src/live_effects/lpe-vonkoch.cpp:49 -#, fuzzy -msgid "Dra_w all generations" -msgstr "Рисовать все поколения" +#: ../src/inkscape.cpp:749 +msgid "Automatic backup of the following documents failed:\n" +msgstr "Не получилось сохранить резервную копию следующего документа:\n" -#: ../src/live_effects/lpe-vonkoch.cpp:49 -msgid "If unchecked, draw only the last generation" -msgstr "Если отключено, рисовать только последнее поколение" +#: ../src/interface.cpp:748 +msgctxt "Interface setup" +msgid "Default" +msgstr "По умолчанию" -#. ,draw_boxes(_("Display boxes"), _("Display boxes instead of paths only"), "draw_boxes", &wr, this, true) -#: ../src/live_effects/lpe-vonkoch.cpp:51 +#: ../src/interface.cpp:748 +msgid "Default interface setup" +msgstr "Вид интерфейса по умолчанию" + +#: ../src/interface.cpp:749 +msgctxt "Interface setup" +msgid "Custom" +msgstr "Пользовательский" + +#: ../src/interface.cpp:749 #, fuzzy -msgid "Reference segment:" -msgstr "Ссылочный сегмент" +msgid "Setup for custom task" +msgstr "Назначить заказную задачу" -#: ../src/live_effects/lpe-vonkoch.cpp:51 -msgid "The reference segment. Defaults to the horizontal midline of the bbox." -msgstr "" -"Ссылочный сегмент. По умолчанию равен горизонтальной стороне площадки (BB)." +#: ../src/interface.cpp:750 +msgctxt "Interface setup" +msgid "Wide" +msgstr "Широкий" -#. refA(_("Ref Start"), _("Left side middle of the reference box"), "refA", &wr, this), -#. refB(_("Ref End"), _("Right side middle of the reference box"), "refB", &wr, this), -#. FIXME: a path is used here instead of 2 points to work around path/point param incompatibility bug. -#: ../src/live_effects/lpe-vonkoch.cpp:55 +#: ../src/interface.cpp:750 #, fuzzy -msgid "_Max complexity:" -msgstr "Макс. сложность" +msgid "Setup for widescreen work" +msgstr "Настроить под широкоформатные экраны" -#: ../src/live_effects/lpe-vonkoch.cpp:55 -msgid "Disable effect if the output is too complex" -msgstr "Отключить эффект, если вывод слишком сложен" +#: ../src/interface.cpp:862 +#, c-format +msgid "Verb \"%s\" Unknown" +msgstr "Глагол \"%s\" неизвестен" -#: ../src/live_effects/parameter/bool.cpp:67 -msgid "Change bool parameter" -msgstr "Смена логического параметра" +#: ../src/interface.cpp:901 +msgid "Open _Recent" +msgstr "Открыть н_едавние" -#: ../src/live_effects/parameter/enum.h:47 -msgid "Change enumeration parameter" -msgstr "Смена параметра перечня" +#: ../src/interface.cpp:1009 ../src/interface.cpp:1095 +#: ../src/interface.cpp:1198 ../src/ui/widget/selected-style.cpp:532 +msgid "Drop color" +msgstr "Перенос цвета" -#: ../src/live_effects/parameter/originalpath.cpp:71 -msgid "Link to path" -msgstr "Связать с контуром" +#: ../src/interface.cpp:1048 ../src/interface.cpp:1158 +msgid "Drop color on gradient" +msgstr "Перенос цвета на градиент" -#: ../src/live_effects/parameter/originalpath.cpp:83 -#, fuzzy -msgid "Select original" -msgstr "Выделить _оригинал" +#: ../src/interface.cpp:1211 +msgid "Could not parse SVG data" +msgstr "Невозможно разобрать данные SVG" -#: ../src/live_effects/parameter/parameter.cpp:141 -msgid "Change scalar parameter" -msgstr "Смена скалярного параметра" +#: ../src/interface.cpp:1250 +msgid "Drop SVG" +msgstr "Drop SVG" -#: ../src/live_effects/parameter/path.cpp:170 -msgid "Edit on-canvas" -msgstr "Изменить на холсте" +#: ../src/interface.cpp:1263 +#, fuzzy +msgid "Drop Symbol" +msgstr "Кхмерские символы" -#: ../src/live_effects/parameter/path.cpp:180 -msgid "Copy path" -msgstr "Скопировать контур" +#: ../src/interface.cpp:1294 +msgid "Drop bitmap image" +msgstr "Импорт растра" -#: ../src/live_effects/parameter/path.cpp:190 -msgid "Paste path" -msgstr "Вставить контур" +#: ../src/interface.cpp:1386 +#, c-format +msgid "" +"<span weight=\"bold\" size=\"larger\">A file named \"%s\" already exists. Do " +"you want to replace it?</span>\n" +"\n" +"The file already exists in \"%s\". Replacing it will overwrite its contents." +msgstr "" +"<span weight=\"bold\" size=\"larger\">Файл с именем \"%s\" уже существует. " +"Вы хотите его заменить?</span>\n" +"\n" +"Этот файл уже есть в каталоге \"%s\". Замена перезапишет его содержание." -#: ../src/live_effects/parameter/path.cpp:200 +#: ../src/interface.cpp:1392 ../src/ui/dialog/export.cpp:1302 +#: ../src/widgets/desktop-widget.cpp:1122 +#: ../src/widgets/desktop-widget.cpp:1184 #, fuzzy -msgid "Link to path on clipboard" -msgstr "В буфере обмена ничего нет." +msgid "_Cancel" +msgstr "Отменить" -#: ../src/live_effects/parameter/path.cpp:443 -msgid "Paste path parameter" -msgstr "Вставить параметр контура" +#: ../src/interface.cpp:1393 ../share/extensions/web-set-att.inx.h:21 +#: ../share/extensions/web-transmit-att.inx.h:19 +msgid "Replace" +msgstr "Заменить" -#: ../src/live_effects/parameter/path.cpp:475 -msgid "Link path parameter to path" -msgstr "Связать параметр контура с контуром" +#: ../src/interface.cpp:1464 +msgid "Go to parent" +msgstr "На уровень выше" -#: ../src/live_effects/parameter/point.cpp:89 -msgid "Change point parameter" -msgstr "Смена точечного параметра" +#. TRANSLATORS: #%1 is the id of the group e.g. <g id="#g7">, not a number. +#: ../src/interface.cpp:1505 +msgid "Enter group #%1" +msgstr "Войти в группу #%1" -#: ../src/live_effects/parameter/powerstrokepointarray.cpp:229 -#: ../src/live_effects/parameter/powerstrokepointarray.cpp:241 -msgid "" -"<b>Stroke width control point</b>: drag to alter the stroke width. <b>Ctrl" -"+click</b> adds a control point, <b>Ctrl+Alt+click</b> deletes it." -msgstr "" +#. Item dialog +#: ../src/interface.cpp:1641 ../src/verbs.cpp:2849 +msgid "_Object Properties..." +msgstr "_Свойства объекта..." -#: ../src/live_effects/parameter/random.cpp:134 -msgid "Change random parameter" -msgstr "Смена случайного параметра" +#: ../src/interface.cpp:1650 +msgid "_Select This" +msgstr "_Выделить это" -#: ../src/live_effects/parameter/text.cpp:100 -msgid "Change text parameter" -msgstr "Смена текстового параметра" +#: ../src/interface.cpp:1661 +msgid "Select Same" +msgstr "Выбрать одинаковые" -#: ../src/live_effects/parameter/unit.cpp:80 -msgid "Change unit parameter" -msgstr "Смена параметра единицы измерения" +#. Select same fill and stroke +#: ../src/interface.cpp:1671 +msgid "Fill and Stroke" +msgstr "Заливку и обводку" -#: ../src/live_effects/parameter/vector.cpp:99 -#, fuzzy -msgid "Change vector parameter" -msgstr "Смена текстового параметра" +#. Select same fill color +#: ../src/interface.cpp:1678 +msgid "Fill Color" +msgstr "Цвет заливки" -#: ../src/main-cmdlineact.cpp:50 -#, c-format -msgid "Unable to find verb ID '%s' specified on the command line.\n" -msgstr "Не удалось найти ID команды '%s', указанный, в командной строке.\n" +#. Select same stroke color +#: ../src/interface.cpp:1685 +msgid "Stroke Color" +msgstr "Цвет обводки" -#: ../src/main-cmdlineact.cpp:61 -#, c-format -msgid "Unable to find node ID: '%s'\n" -msgstr "Невозможно найти ID узла: '%s'\n" +#. Select same stroke style +#: ../src/interface.cpp:1692 +msgid "Stroke Style" +msgstr "Стиль обводки" -#: ../src/main.cpp:295 -msgid "Print the Inkscape version number" -msgstr "Напечатать версию Inkscape" +#. Select same stroke style +#: ../src/interface.cpp:1699 +msgid "Object type" +msgstr "Тип объекта" -#: ../src/main.cpp:300 -msgid "Do not use X server (only process files from console)" -msgstr "Не использовать X сервер (допустимы только консольные операции)" +#. Move to layer +#: ../src/interface.cpp:1706 +msgid "_Move to layer ..." +msgstr "Пере_местить на слой..." -#: ../src/main.cpp:305 -msgid "Try to use X server (even if $DISPLAY is not set)" -msgstr "" -"Пытаться использовать X сервер (даже если переменная $DISPLAY не установлена)" +#. Create link +#: ../src/interface.cpp:1716 +msgid "Create _Link" +msgstr "Создать сс_ылку" -#: ../src/main.cpp:310 -msgid "Open specified document(s) (option string may be excluded)" -msgstr "Открыть указанные документы (строка параметра может быть исключена)" +#. Set mask +#: ../src/interface.cpp:1739 +msgid "Set Mask" +msgstr "Применить маску" -#: ../src/main.cpp:311 ../src/main.cpp:316 ../src/main.cpp:321 -#: ../src/main.cpp:393 ../src/main.cpp:398 ../src/main.cpp:403 -#: ../src/main.cpp:414 ../src/main.cpp:430 ../src/main.cpp:435 -msgid "FILENAME" -msgstr "FILENAME" +#. Release mask +#: ../src/interface.cpp:1750 +msgid "Release Mask" +msgstr "Снять маску" -#: ../src/main.cpp:315 -msgid "Print document(s) to specified output file (use '| program' for pipe)" -msgstr "" -"Напечатать документ(ы) в указанный файл (используйте '| program' для " -"передачи программе)" +#. Set Clip +#: ../src/interface.cpp:1761 +msgid "Set Cl_ip" +msgstr "Применить о_бтравочный контур" -#: ../src/main.cpp:320 -msgid "Export document to a PNG file" -msgstr "Экспортировать документ в файл PNG" +#. Release Clip +#: ../src/interface.cpp:1772 +msgid "Release C_lip" +msgstr "С_нять обтравочный контур" -#: ../src/main.cpp:325 -msgid "" -"Resolution for exporting to bitmap and for rasterization of filters in PS/" -"EPS/PDF (default 90)" -msgstr "" -"Разрешение для экспорта в растр и растеризации фильтров в PS/EPS/PDF (по " -"умолчанию равно 90dpi)" +#. Group +#: ../src/interface.cpp:1783 ../src/verbs.cpp:2486 +msgid "_Group" +msgstr "С_группировать" -#: ../src/main.cpp:326 ../src/ui/widget/rendering-options.cpp:37 -msgid "DPI" -msgstr "DPI" +#: ../src/interface.cpp:1854 +msgid "Create link" +msgstr "Создание ссылки" -#: ../src/main.cpp:330 -msgid "" -"Exported area in SVG user units (default is the page; 0,0 is lower-left " -"corner)" -msgstr "" -"Экспортируемая область в пользовательских единицах измерения SVG (по " -"умолчанию — вся страница; 0,0 — левый нижний угол)" +#. Ungroup +#: ../src/interface.cpp:1885 ../src/verbs.cpp:2488 +msgid "_Ungroup" +msgstr "Разгр_уппировать" -#: ../src/main.cpp:331 -msgid "x0:y0:x1:y1" -msgstr "x0:y0:x1:y1" +#. Link dialog +#: ../src/interface.cpp:1910 +msgid "Link _Properties..." +msgstr "_Свойства ссылки…" -#: ../src/main.cpp:335 -msgid "Exported area is the entire drawing (not page)" -msgstr "Экспортируемая область включает в себя весь рисунок (а не страницу)" +#. Select item +#: ../src/interface.cpp:1916 +msgid "_Follow Link" +msgstr "Перейти по ссылке" -#: ../src/main.cpp:340 -msgid "Exported area is the entire page" -msgstr "Экспортируемая область включает в себя всю страницу" +#. Reset transformations +#: ../src/interface.cpp:1922 +msgid "_Remove Link" +msgstr "_Удалить ссылку" -#: ../src/main.cpp:345 -msgid "Only for PS/EPS/PDF, sets margin in mm around exported area (default 0)" -msgstr "" +#: ../src/interface.cpp:1953 +msgid "Remove link" +msgstr "_Удалить ссылку" -#: ../src/main.cpp:346 ../src/main.cpp:388 -msgid "VALUE" -msgstr "VALUE" +#. Image properties +#: ../src/interface.cpp:1964 +msgid "Image _Properties..." +msgstr "_Свойства изображения…" -#: ../src/main.cpp:350 -msgid "" -"Snap the bitmap export area outwards to the nearest integer values (in SVG " -"user units)" -msgstr "" -"Расширить область экспортируемого растра до ближайших целых значений (в " -"единицах SVG)" +#. Edit externally +#: ../src/interface.cpp:1970 +msgid "Edit Externally..." +msgstr "Изменить извне..." -#: ../src/main.cpp:355 -msgid "The width of exported bitmap in pixels (overrides export-dpi)" -msgstr "Ширина экспортируемого растра в точках (отменяет export-dpi)" +#. Trace Bitmap +#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) +#: ../src/interface.cpp:1979 ../src/verbs.cpp:2549 +msgid "_Trace Bitmap..." +msgstr "_Векторизовать растр..." -#: ../src/main.cpp:356 -msgid "WIDTH" -msgstr "WIDTH" +#. Trace Pixel Art +#: ../src/interface.cpp:1988 +msgid "Trace Pixel Art" +msgstr "Векторизация пиксельной графики" -#: ../src/main.cpp:360 -msgid "The height of exported bitmap in pixels (overrides export-dpi)" -msgstr "Высота экспортируемого растра в точках (отменяет export-dpi)" +#: ../src/interface.cpp:1998 +msgctxt "Context menu" +msgid "Embed Image" +msgstr "Встроить изображение" -#: ../src/main.cpp:361 -msgid "HEIGHT" -msgstr "HEIGHT" +#: ../src/interface.cpp:2009 +msgctxt "Context menu" +msgid "Extract Image..." +msgstr "Извлечь изображение..." -#: ../src/main.cpp:365 -msgid "The ID of the object to export" -msgstr "Идентификатор экспортируемого объекта" +#. Item dialog +#. Fill and Stroke dialog +#: ../src/interface.cpp:2154 ../src/interface.cpp:2174 ../src/verbs.cpp:2812 +msgid "_Fill and Stroke..." +msgstr "_Заливка и обводка..." -#: ../src/main.cpp:366 ../src/main.cpp:479 -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 -msgid "ID" -msgstr "ID" +#. Edit Text dialog +#: ../src/interface.cpp:2180 ../src/verbs.cpp:2831 +msgid "_Text and Font..." +msgstr "_Текст и шрифт..." -#. TRANSLATORS: this means: "Only export the object whose id is given in --export-id". -#. See "man inkscape" for details. -#: ../src/main.cpp:372 -msgid "" -"Export just the object with export-id, hide all others (only with export-id)" -msgstr "" -"Экспортировать только объект с заданным export-id, скрыв все прочие объекты " -"(только с опцией export-id)" +#. Spellcheck dialog +#: ../src/interface.cpp:2186 ../src/verbs.cpp:2839 +msgid "Check Spellin_g..." +msgstr "Проверить _орфографию..." -#: ../src/main.cpp:377 -msgid "Use stored filename and DPI hints when exporting (only with export-id)" -msgstr "" -"Использовать сохраненное имя файла и разрешение при экспорте (только с " -"опцией export-id)" +#: ../src/knot.cpp:332 +msgid "Node or handle drag canceled." +msgstr "Перемещение отменено." -#: ../src/main.cpp:382 -msgid "Background color of exported bitmap (any SVG-supported color string)" -msgstr "" -"Фоновый цвет для экспорта растра (любая поддерживаемая в SVG цветовая строка)" +#: ../src/knotholder.cpp:158 +msgid "Change handle" +msgstr "Смена рычага" -#: ../src/main.cpp:383 -msgid "COLOR" -msgstr "COLOR" +#: ../src/knotholder.cpp:237 +msgid "Move handle" +msgstr "Смещение рычага" -#: ../src/main.cpp:387 -msgid "Background opacity of exported bitmap (either 0.0 to 1.0, or 1 to 255)" +#. TRANSLATORS: This refers to the pattern that's inside the object +#: ../src/knotholder.cpp:256 ../src/knotholder.cpp:278 +msgid "<b>Move</b> the pattern fill inside the object" +msgstr "<b>Двигать</b> текстурную заливку внутри объекта" + +#: ../src/knotholder.cpp:260 ../src/knotholder.cpp:282 +msgid "<b>Scale</b> the pattern fill; uniformly if with <b>Ctrl</b>" msgstr "" -"Непрозрачность фона для экспорта растра (от 0.0 до 1.0 либо от 1 до 255)" +"<b>Масштабировать</b> текстурную заливку; с <b>Ctrl</b> — пропорционально" + +#: ../src/knotholder.cpp:264 ../src/knotholder.cpp:286 +msgid "<b>Rotate</b> the pattern fill; with <b>Ctrl</b> to snap angle" +msgstr "<b>Вращать</b> текстурную заливку, <b>Ctrl</b> ограничивает угол" -#: ../src/main.cpp:392 -msgid "Export document to plain SVG file (no sodipodi or inkscape namespaces)" -msgstr "" -"Экспортировать документ в формат чистый SVG (без пространств имен sodipodi: " -"или inkscape:)" +#: ../src/libgdl/gdl-dock-bar.c:105 +msgid "Master" +msgstr "Ведущая" -#: ../src/main.cpp:397 -msgid "Export document to a PS file" -msgstr "Экспортировать документ в файл PS" +#: ../src/libgdl/gdl-dock-bar.c:106 +msgid "GdlDockMaster object which the dockbar widget is attached to" +msgstr "GdlDockMaster object which the dockbar widget is attached to" -#: ../src/main.cpp:402 -msgid "Export document to an EPS file" -msgstr "Экспортировать документ в файл EPS" +#: ../src/libgdl/gdl-dock-bar.c:113 +msgid "Dockbar style" +msgstr "Стиль панели" -#: ../src/main.cpp:407 -msgid "" -"Choose the PostScript Level used to export. Possible choices are 2 (the " -"default) and 3" -msgstr "" +#: ../src/libgdl/gdl-dock-bar.c:114 +msgid "Dockbar style to show items on it" +msgstr "Dockbar style to show items on it" -#: ../src/main.cpp:409 -#, fuzzy -msgid "PS Level" -msgstr "Уровни" +#: ../src/libgdl/gdl-dock-item-grip.c:399 +msgid "Iconify this dock" +msgstr "Свернуть эту панель" -#: ../src/main.cpp:413 -msgid "Export document to a PDF file" -msgstr "Экспортировать документ в файл PDF" +#: ../src/libgdl/gdl-dock-item-grip.c:401 +msgid "Close this dock" +msgstr "Закрыть эту панель" -#. TRANSLATORS: "--export-pdf-version" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:419 -msgid "" -"Export PDF to given version. (hint: make sure to input the exact string " -"found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)" -msgstr "" +#: ../src/libgdl/gdl-dock-item-grip.c:720 +#: ../src/libgdl/gdl-dock-tablabel.c:125 +msgid "Controlling dock item" +msgstr "Controlling dock item" -#: ../src/main.cpp:420 -msgid "PDF_VERSION" -msgstr "" +#: ../src/libgdl/gdl-dock-item-grip.c:721 +msgid "Dockitem which 'owns' this grip" +msgstr "Dockitem which 'owns' this grip" -#: ../src/main.cpp:424 -msgid "" -"Export PDF/PS/EPS without text. Besides the PDF/PS/EPS, a LaTeX file is " -"exported, putting the text on top of the PDF/PS/EPS file. Include the result " -"in LaTeX like: \\input{latexfile.tex}" -msgstr "" -"Экспортировать PDF/PS/EPS без текста. Помимо файла PDF/PS/EPS создаётся файл " -"LaTeX, в котором текст помещается поверх рисунка из файла PDF/PS/EPS. " -"Полученный файл LaTeX вставляется в другие примерно так:: \\input{latexfile." -"tex}" +#. Name +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:191 +#: ../src/widgets/text-toolbar.cpp:1416 +#: ../share/extensions/gcodetools_graffiti.inx.h:9 +#: ../share/extensions/gcodetools_orientation_points.inx.h:2 +msgid "Orientation" +msgstr "Ориентация" -#: ../src/main.cpp:429 -msgid "Export document to an Enhanced Metafile (EMF) File" -msgstr "Экспортировать документ в файл Enhanced Metafile (EMF)" +#: ../src/libgdl/gdl-dock-item.c:299 +msgid "Orientation of the docking item" +msgstr "Ориентация прикрепленной панели" -#: ../src/main.cpp:434 -#, fuzzy -msgid "Export document to a Windows Metafile (WMF) File" -msgstr "Экспортировать документ в файл Enhanced Metafile (EMF)" +#: ../src/libgdl/gdl-dock-item.c:314 +msgid "Resizable" +msgstr "Размер изменяем" -#: ../src/main.cpp:439 +#: ../src/libgdl/gdl-dock-item.c:315 #, fuzzy -msgid "Convert text object to paths on export (PS, EPS, PDF, SVG)" -msgstr "Преобразовать текст в контуры при экспорте (PS. EPS, PDF)" +msgid "If set, the dock item can be resized when docked in a GtkPanel widget" +msgstr "Если включено, пришвартованный объект может менять свой размер" -#: ../src/main.cpp:444 -msgid "" -"Render filtered objects without filters, instead of rasterizing (PS, EPS, " -"PDF)" -msgstr "" -"Отрисовать объекты с фильтрами без оных вместо растеризации (PS, EPS, PDF)" +#: ../src/libgdl/gdl-dock-item.c:322 +msgid "Item behavior" +msgstr "Поведение панели" -#. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:450 +#: ../src/libgdl/gdl-dock-item.c:323 msgid "" -"Query the X coordinate of the drawing or, if specified, of the object with --" -"query-id" -msgstr "Запросить X координату рисунка или, если задано, объекта с --query-id" +"General behavior for the dock item (i.e. whether it can float, if it's " +"locked, etc.)" +msgstr "" +"General behavior for the dock item (i.e. whether it can float, if it's " +"locked, etc.)" -#. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:456 -msgid "" -"Query the Y coordinate of the drawing or, if specified, of the object with --" -"query-id" -msgstr "Запросить Y координату рисунка или, если задано, объекта с --query-id" +#: ../src/libgdl/gdl-dock-item.c:331 ../src/libgdl/gdl-dock-master.c:148 +msgid "Locked" +msgstr "Заблокирована" -#. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:462 +#: ../src/libgdl/gdl-dock-item.c:332 msgid "" -"Query the width of the drawing or, if specified, of the object with --query-" -"id" +"If set, the dock item cannot be dragged around and it doesn't show a grip" msgstr "" -"Запросить ширину рисунка или, если задано, объекта — при помощи --query-id" - -#. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:468 -msgid "" -"Query the height of the drawing or, if specified, of the object with --query-" -"id" -msgstr "Запросить высоту рисунка или, если задано, объекта с --query-id" +"If set, the dock item cannot be dragged around and it doesn't show a grip" -#: ../src/main.cpp:473 -msgid "List id,x,y,w,h for all objects" -msgstr "Перечислить id,x,y,w,h для всех объектов" +#: ../src/libgdl/gdl-dock-item.c:340 +msgid "Preferred width" +msgstr "Предпочитаемая ширина" -#: ../src/main.cpp:478 -msgid "The ID of the object whose dimensions are queried" -msgstr "Идентификатор объекта для запроса" +#: ../src/libgdl/gdl-dock-item.c:341 +msgid "Preferred width for the dock item" +msgstr "Предпочитаемая ширина прикрепленной панели" -#. TRANSLATORS: this option makes Inkscape print the name (path) of the extension directory -#: ../src/main.cpp:484 -msgid "Print out the extension directory and exit" -msgstr "Вывести на экран каталог расширения и выйти" +#: ../src/libgdl/gdl-dock-item.c:347 +msgid "Preferred height" +msgstr "Предпочитаемая высота" -#: ../src/main.cpp:489 -msgid "Remove unused definitions from the defs section(s) of the document" -msgstr "Убрать лишние определения из раздела <defs> документа" +#: ../src/libgdl/gdl-dock-item.c:348 +msgid "Preferred height for the dock item" +msgstr "Предпочитаемая высота прикрепленной панели" -#: ../src/main.cpp:495 -msgid "Enter a listening loop for D-Bus messages in console mode" +#: ../src/libgdl/gdl-dock-item.c:716 +#, c-format +msgid "" +"You can't add a dock object (%p of type %s) inside a %s. Use a GdlDock or " +"some other compound dock object." msgstr "" +"You can't add a dock object (%p of type %s) inside a %s. Use a GdlDock or " +"some other compound dock object." -#: ../src/main.cpp:500 +#: ../src/libgdl/gdl-dock-item.c:723 +#, c-format msgid "" -"Specify the D-Bus bus name to listen for messages on (default is org." -"inkscape)" +"Attempting to add a widget with type %s to a %s, but it can only contain one " +"widget at a time; it already contains a widget of type %s" msgstr "" +"Attempting to add a widget with type %s to a %s, but it can only contain one " +"widget at a time; it already contains a widget of type %s" -#: ../src/main.cpp:501 -msgid "BUS-NAME" -msgstr "" +#: ../src/libgdl/gdl-dock-item.c:1471 ../src/libgdl/gdl-dock-item.c:1521 +#, c-format +msgid "Unsupported docking strategy %s in dock object of type %s" +msgstr "Unsupported docking strategy %s in dock object of type %s" -#: ../src/main.cpp:506 -msgid "List the IDs of all the verbs in Inkscape" -msgstr "Вывести список ID всех действий Inkscape" +#. UnLock menuitem +#: ../src/libgdl/gdl-dock-item.c:1629 +msgid "UnLock" +msgstr "Разблокировать" -#: ../src/main.cpp:511 -msgid "Verb to call when Inkscape opens." -msgstr "Вызываемое действие при открытии Inkscape." +#. Hide menuitem. +#: ../src/libgdl/gdl-dock-item.c:1636 +msgid "Hide" +msgstr "Скрыть всю панель" -#: ../src/main.cpp:512 -msgid "VERB-ID" -msgstr "ДЕЙСТВИЕ-ID" +#. Lock menuitem +#: ../src/libgdl/gdl-dock-item.c:1641 +msgid "Lock" +msgstr "Заблокировать" -#: ../src/main.cpp:516 -msgid "Object ID to select when Inkscape opens." -msgstr "ID объекта, выделяемого при открытии документа в Inkscape." +#: ../src/libgdl/gdl-dock-item.c:1904 +#, c-format +msgid "Attempt to bind an unbound item %p" +msgstr "Attempt to bind an unbound item %p" -#: ../src/main.cpp:517 -msgid "OBJECT-ID" -msgstr "ОБЪЕКТ-ID" +#: ../src/libgdl/gdl-dock-master.c:141 ../src/libgdl/gdl-dock.c:184 +msgid "Default title" +msgstr "Заголовок по умолчанию" -#: ../src/main.cpp:521 -msgid "Start Inkscape in interactive shell mode." -msgstr "Запустить Inkscape в интерактивном командном режиме" +#: ../src/libgdl/gdl-dock-master.c:142 +msgid "Default title for newly created floating docks" +msgstr "Default title for newly created floating docks" -#: ../src/main.cpp:871 ../src/main.cpp:1283 +#: ../src/libgdl/gdl-dock-master.c:149 msgid "" -"[OPTIONS...] [FILE...]\n" -"\n" -"Available options:" +"If is set to 1, all the dock items bound to the master are locked; if it's " +"0, all are unlocked; -1 indicates inconsistency among the items" msgstr "" -"[ПАРАМЕТРЫ...] [ФАЙЛ...]\n" -"\n" -"Доступные параметры:" - -#. ## Add a menu for clear() -#: ../src/menus-skeleton.h:16 ../src/ui/dialog/debug.cpp:83 -msgid "_File" -msgstr "_Файл" - -#: ../src/menus-skeleton.h:17 -msgid "_New" -msgstr "_Создать" - -#. " <verb verb-id=\"FileExportToOCAL\" />\n" -#. " <verb verb-id=\"DialogMetadata\" />\n" -#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2634 ../src/verbs.cpp:2640 -msgid "_Edit" -msgstr "_Правка" - -#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2398 -msgid "Paste Si_ze" -msgstr "Вставить _размер" - -#: ../src/menus-skeleton.h:65 -msgid "Clo_ne" -msgstr "Клон_ы" - -#: ../src/menus-skeleton.h:79 -#, fuzzy -msgid "Select Sa_me" -msgstr "Выберите страницу:" - -#: ../src/menus-skeleton.h:97 -msgid "_View" -msgstr "_Вид" +"If is set to 1, all the dock items bound to the master are locked; if it's " +"0, all are unlocked; -1 indicates inconsistency among the items" -#: ../src/menus-skeleton.h:98 -msgid "_Zoom" -msgstr "_Масштаб" +#: ../src/libgdl/gdl-dock-master.c:157 ../src/libgdl/gdl-switcher.c:737 +msgid "Switcher Style" +msgstr "Стиль переключателя" -#: ../src/menus-skeleton.h:114 -msgid "_Display mode" -msgstr "Подробность просмотр_а" +#: ../src/libgdl/gdl-dock-master.c:158 ../src/libgdl/gdl-switcher.c:738 +msgid "Switcher buttons style" +msgstr "Стиль кнопок переключения" -#. Better location in menu needs to be found -#. " <verb verb-id=\"ViewModePrintColorsPreview\" radio=\"yes\"/>\n" -#. " <verb verb-id=\"DialogPrintColorsPreview\" />\n" -#: ../src/menus-skeleton.h:123 -msgid "_Color display mode" -msgstr "_Цветность просмотра" +#: ../src/libgdl/gdl-dock-master.c:783 +#, c-format +msgid "" +"master %p: unable to add object %p[%s] to the hash. There already is an " +"item with that name (%p)." +msgstr "" +"master %p: unable to add object %p[%s] to the hash. There already is an " +"item with that name (%p)." -#. Better location in menu needs to be found -#. " <verb verb-id=\"ViewColorModePrintColorsPreview\" radio=\"yes\"/>\n" -#. " <verb verb-id=\"DialogPrintColorsPreview\" />\n" -#: ../src/menus-skeleton.h:136 -msgid "Sh_ow/Hide" -msgstr "По_казать или скрыть" +#: ../src/libgdl/gdl-dock-master.c:955 +#, c-format +msgid "" +"The new dock controller %p is automatic. Only manual dock objects should be " +"named controller." +msgstr "" +"The new dock controller %p is automatic. Only manual dock objects should be " +"named controller." -#. Not quite ready to be in the menus. -#. " <verb verb-id=\"FocusToggle\" />\n" -#: ../src/menus-skeleton.h:156 -msgid "_Layer" -msgstr "Сло_й" +#: ../src/libgdl/gdl-dock-notebook.c:132 +#: ../src/ui/dialog/align-and-distribute.cpp:1003 +#: ../src/ui/dialog/document-properties.cpp:153 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1497 +#: ../src/widgets/desktop-widget.cpp:1992 +#: ../share/extensions/voronoi2svg.inx.h:9 +msgid "Page" +msgstr "Страница" -#: ../src/menus-skeleton.h:180 -msgid "_Object" -msgstr "_Объект" +#: ../src/libgdl/gdl-dock-notebook.c:133 +msgid "The index of the current page" +msgstr "Индекс текущей страницы" -#: ../src/menus-skeleton.h:188 -msgid "Cli_p" -msgstr "О_бтравочный контур" +#: ../src/libgdl/gdl-dock-object.c:125 +#: ../src/ui/dialog/inkscape-preferences.cpp:1504 +#: ../src/ui/widget/page-sizer.cpp:258 +#: ../src/widgets/gradient-selector.cpp:158 +#: ../src/widgets/sp-xmlview-attr-list.cpp:54 +msgid "Name" +msgstr "Имя" -#: ../src/menus-skeleton.h:192 -msgid "Mas_k" -msgstr "_Маска" +#: ../src/libgdl/gdl-dock-object.c:126 +msgid "Unique name for identifying the dock object" +msgstr "Unique name for identifying the dock object" -#: ../src/menus-skeleton.h:196 -msgid "Patter_n" -msgstr "_Текстура" +#: ../src/libgdl/gdl-dock-object.c:133 +msgid "Long name" +msgstr "Длинное название" -#: ../src/menus-skeleton.h:220 -msgid "_Path" -msgstr "_Контур" +#: ../src/libgdl/gdl-dock-object.c:134 +msgid "Human readable name for the dock object" +msgstr "Человекочитаемое название прикрепленной панели" -#: ../src/menus-skeleton.h:248 ../src/ui/dialog/find.cpp:77 -#: ../src/ui/dialog/text-edit.cpp:72 -msgid "_Text" -msgstr "_Текст" +#: ../src/libgdl/gdl-dock-object.c:140 +msgid "Stock Icon" +msgstr "Значок из набора" -#: ../src/menus-skeleton.h:266 -msgid "Filter_s" -msgstr "Фи_льтры" +#: ../src/libgdl/gdl-dock-object.c:141 +msgid "Stock icon for the dock object" +msgstr "Значок из набора для прикрепленной панели" -#: ../src/menus-skeleton.h:272 -msgid "Exte_nsions" -msgstr "_Расширения" +#: ../src/libgdl/gdl-dock-object.c:147 +msgid "Pixbuf Icon" +msgstr "Растровый значок" -#: ../src/menus-skeleton.h:278 -msgid "_Help" -msgstr "_Справка" +#: ../src/libgdl/gdl-dock-object.c:148 +msgid "Pixbuf icon for the dock object" +msgstr "Растровый значок прикрепленной панели" -#: ../src/menus-skeleton.h:282 -msgid "Tutorials" -msgstr "Учебник" +#: ../src/libgdl/gdl-dock-object.c:153 +msgid "Dock master" +msgstr "Dock master" -#: ../src/object-edit.cpp:439 -msgid "" -"Adjust the <b>horizontal rounding</b> radius; with <b>Ctrl</b> to make the " -"vertical radius the same" -msgstr "" -"Менять <b>горизонтальный радиус</b> закругления. С <b>Ctrl</b> вертикальный " -"радиус будет таким же." +#: ../src/libgdl/gdl-dock-object.c:154 +msgid "Dock master this dock object is bound to" +msgstr "Dock master this dock object is bound to" -#: ../src/object-edit.cpp:444 +#: ../src/libgdl/gdl-dock-object.c:463 +#, c-format msgid "" -"Adjust the <b>vertical rounding</b> radius; with <b>Ctrl</b> to make the " -"horizontal radius the same" +"Call to gdl_dock_object_dock in a dock object %p (object type is %s) which " +"hasn't implemented this method" msgstr "" -"Менять <b>вертикальный радиус</b> закругления. С <b>Ctrl</b> горизонтальный " -"радиус будет таким же." +"Call to gdl_dock_object_dock in a dock object %p (object type is %s) which " +"hasn't implemented this method" -#: ../src/object-edit.cpp:449 ../src/object-edit.cpp:454 +#: ../src/libgdl/gdl-dock-object.c:602 +#, c-format msgid "" -"Adjust the <b>width and height</b> of the rectangle; with <b>Ctrl</b> to " -"lock ratio or stretch in one dimension only" +"Dock operation requested in a non-bound object %p. The application might " +"crash" msgstr "" -"Менять <b>ширину и высоту</b> прямоугольника; <b>Ctrl</b> фиксирует " -"отношение сторон или растягивает только в одном измерении" +"Dock operation requested in a non-bound object %p. The application might " +"crash" -#: ../src/object-edit.cpp:689 ../src/object-edit.cpp:693 -#: ../src/object-edit.cpp:697 ../src/object-edit.cpp:701 -msgid "" -"Resize box in X/Y direction; with <b>Shift</b> along the Z axis; with " -"<b>Ctrl</b> to constrain to the directions of edges or diagonals" -msgstr "" -"Изменить размер объекта по осям X/Y; с <b>Shift</b> — вдоль оси Z, с " -"<b>Ctrl</b> — с ограничением в направлениях (края или диагонали)" +#: ../src/libgdl/gdl-dock-object.c:609 +#, c-format +msgid "Cannot dock %p to %p because they belong to different masters" +msgstr "Cannot dock %p to %p because they belong to different masters" -#: ../src/object-edit.cpp:705 ../src/object-edit.cpp:709 -#: ../src/object-edit.cpp:713 ../src/object-edit.cpp:717 +#: ../src/libgdl/gdl-dock-object.c:651 +#, c-format msgid "" -"Resize box along the Z axis; with <b>Shift</b> in X/Y direction; with " -"<b>Ctrl</b> to constrain to the directions of edges or diagonals" +"Attempt to bind to %p an already bound dock object %p (current master: %p)" msgstr "" -"Изменить размер вдоль оси Z; с <b>Shift</b> — по осям X/Y; с <b>Ctrl</b> — с " -"ограничением в направлениях (края или диагонали)" - -#: ../src/object-edit.cpp:721 -msgid "Move the box in perspective" -msgstr "Перемещение параллелепипеда в перспективе" +"Attempt to bind to %p an already bound dock object %p (current master: %p)" -#: ../src/object-edit.cpp:948 -msgid "Adjust ellipse <b>width</b>, with <b>Ctrl</b> to make circle" -msgstr "Менять <b>большую ось</b> эллипса. <b>Ctrl</b> дает круг." +#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:229 +msgid "Position" +msgstr "Положение" -#: ../src/object-edit.cpp:952 -msgid "Adjust ellipse <b>height</b>, with <b>Ctrl</b> to make circle" -msgstr "Менять <b>малую ось</b> эллипса. <b>Ctrl</b> дает круг." +#: ../src/libgdl/gdl-dock-paned.c:131 +msgid "Position of the divider in pixels" +msgstr "Положение делителя в пикселах" -#: ../src/object-edit.cpp:956 -msgid "" -"Position the <b>start point</b> of the arc or segment; with <b>Ctrl</b> to " -"snap angle; drag <b>inside</b> the ellipse for arc, <b>outside</b> for " -"segment" -msgstr "" -"<b>Начальная точка</b> сектора или дуги; <b>Ctrl</b> ограничивает угол; " -"перетаскивание <b>внутри</b> даёт дугу, <b>снаружи</b> — сектор." +#: ../src/libgdl/gdl-dock-placeholder.c:141 +msgid "Sticky" +msgstr "Sticky" -#: ../src/object-edit.cpp:961 +#: ../src/libgdl/gdl-dock-placeholder.c:142 msgid "" -"Position the <b>end point</b> of the arc or segment; with <b>Ctrl</b> to " -"snap angle; drag <b>inside</b> the ellipse for arc, <b>outside</b> for " -"segment" +"Whether the placeholder will stick to its host or move up the hierarchy when " +"the host is redocked" msgstr "" -"<b>Конечная точка</b> сектора или дуги. <b>Ctrl</b> ограничивает угол. " -"Перетаскивание <b>внутри</b> дает дугу, <b>снаружи</b> — сектор." +"Whether the placeholder will stick to its host or move up the hierarchy when " +"the host is redocked" -#: ../src/object-edit.cpp:1101 -msgid "" -"Adjust the <b>tip radius</b> of the star or polygon; with <b>Shift</b> to " -"round; with <b>Alt</b> to randomize" -msgstr "" -"Менять <b>большой радиус</b> звезды или многоугольника. <b>Shift</b> " -"закругляет, <b>Alt</b> искажает." +#: ../src/libgdl/gdl-dock-placeholder.c:149 +msgid "Host" +msgstr "Host" -#: ../src/object-edit.cpp:1109 -msgid "" -"Adjust the <b>base radius</b> of the star; with <b>Ctrl</b> to keep star " -"rays radial (no skew); with <b>Shift</b> to round; with <b>Alt</b> to " -"randomize" -msgstr "" -"Менять <b>малый радиус</b> звезды или многоугольника. <b>Ctrl</b> сохраняет " -"радиус (без наклона), <b>Shift</b> закругляет, <b>Alt</b> делает случайным." +#: ../src/libgdl/gdl-dock-placeholder.c:150 +msgid "The dock object this placeholder is attached to" +msgstr "The dock object this placeholder is attached to" -#: ../src/object-edit.cpp:1299 -msgid "" -"Roll/unroll the spiral from <b>inside</b>; with <b>Ctrl</b> to snap angle; " -"with <b>Alt</b> to converge/diverge" -msgstr "" -"Удлинять или укорачивать спираль изнутри. <b>Ctrl</b> ограничивает угол. " -"<b>Alt</b> меняет нелинейность." +#: ../src/libgdl/gdl-dock-placeholder.c:157 +msgid "Next placement" +msgstr "Следующее размещение" -#: ../src/object-edit.cpp:1303 -#, fuzzy +#: ../src/libgdl/gdl-dock-placeholder.c:158 msgid "" -"Roll/unroll the spiral from <b>outside</b>; with <b>Ctrl</b> to snap angle; " -"with <b>Shift</b> to scale/rotate; with <b>Alt</b> to lock radius" +"The position an item will be docked to our host if a request is made to dock " +"to us" msgstr "" -"Удлинять или укорачивать спираль снаружи. <b>Ctrl</b> ограничивает угол. " -"<b>Shift</b> растягивает/вращает как целое." +"The position an item will be docked to our host if a request is made to dock " +"to us" -#: ../src/object-edit.cpp:1348 -msgid "Adjust the <b>offset distance</b>" -msgstr "Менять <b>расстояние втяжки</b>" +#: ../src/libgdl/gdl-dock-placeholder.c:168 +msgid "Width for the widget when it's attached to the placeholder" +msgstr "Width for the widget when it's attached to the placeholder" -#: ../src/object-edit.cpp:1384 -msgid "Drag to resize the <b>flowed text frame</b>" -msgstr "Изменять размер <b>текстового блока</b>" +#: ../src/libgdl/gdl-dock-placeholder.c:176 +msgid "Height for the widget when it's attached to the placeholder" +msgstr "Height for the widget when it's attached to the placeholder" -#: ../src/path-chemistry.cpp:53 -msgid "Select <b>object(s)</b> to combine." -msgstr "Выделите объединяемые <b>объект(ы)</b>." +#: ../src/libgdl/gdl-dock-placeholder.c:182 +msgid "Floating Toplevel" +msgstr "Плавающая сверху" -#: ../src/path-chemistry.cpp:57 -msgid "Combining paths..." -msgstr "Выполняется объединение контуров..." +#: ../src/libgdl/gdl-dock-placeholder.c:183 +msgid "Whether the placeholder is standing in for a floating toplevel dock" +msgstr "Whether the placeholder is standing in for a floating toplevel dock" -#: ../src/path-chemistry.cpp:170 -msgid "Combine" -msgstr "Объединение" +#: ../src/libgdl/gdl-dock-placeholder.c:189 +#, fuzzy +msgid "X Coordinate" +msgstr "Координата X" -#: ../src/path-chemistry.cpp:177 -msgid "<b>No path(s)</b> to combine in the selection." -msgstr "В выделении <b>нет контуров</b> для объединения." +#: ../src/libgdl/gdl-dock-placeholder.c:190 +#, fuzzy +msgid "X coordinate for dock when floating" +msgstr "Координата плавающей панели по оси X" -#: ../src/path-chemistry.cpp:189 -msgid "Select <b>path(s)</b> to break apart." -msgstr "Выделите <b>контур(ы)</b> для разбиения." +#: ../src/libgdl/gdl-dock-placeholder.c:196 +#, fuzzy +msgid "Y Coordinate" +msgstr "Координата Y" -#: ../src/path-chemistry.cpp:193 -msgid "Breaking apart paths..." -msgstr "Выполняется разбиение контуров..." +#: ../src/libgdl/gdl-dock-placeholder.c:197 +#, fuzzy +msgid "Y coordinate for dock when floating" +msgstr "Координата плавающей панели по оси Y" -#: ../src/path-chemistry.cpp:284 -msgid "Break apart" -msgstr "Разбиение" +#: ../src/libgdl/gdl-dock-placeholder.c:499 +msgid "Attempt to dock a dock object to an unbound placeholder" +msgstr "Attempt to dock a dock object to an unbound placeholder" -#: ../src/path-chemistry.cpp:286 -msgid "<b>No path(s)</b> to break apart in the selection." -msgstr "В выделении <b>нет разбиваемых контуров</b>." +#: ../src/libgdl/gdl-dock-placeholder.c:611 +#, c-format +msgid "Got a detach signal from an object (%p) who is not our host %p" +msgstr "Got a detach signal from an object (%p) who is not our host %p" -#: ../src/path-chemistry.cpp:296 -msgid "Select <b>object(s)</b> to convert to path." -msgstr "Выделите <b>объекты</b> для преобразования в контур." +#: ../src/libgdl/gdl-dock-placeholder.c:636 +#, c-format +msgid "" +"Something weird happened while getting the child placement for %p from " +"parent %p" +msgstr "" +"Something weird happened while getting the child placement for %p from " +"parent %p" -#: ../src/path-chemistry.cpp:302 -msgid "Converting objects to paths..." -msgstr "Выполняется преобразование объектов в контуры..." +#: ../src/libgdl/gdl-dock-tablabel.c:126 +msgid "Dockitem which 'owns' this tablabel" +msgstr "Dockitem which 'owns' this tablabel" -#: ../src/path-chemistry.cpp:324 -msgid "Object to path" -msgstr "Оконтуривание объекта" +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:635 +#: ../src/ui/dialog/inkscape-preferences.cpp:678 +msgid "Floating" +msgstr "Свободно перемещаются по экрану" -#: ../src/path-chemistry.cpp:326 -msgid "<b>No objects</b> to convert to path in the selection." -msgstr "В выделении <b>нет объектов</b>, преобразуемых в контур." +#: ../src/libgdl/gdl-dock.c:177 +msgid "Whether the dock is floating in its own window" +msgstr "Плавает ли панель в собственном окне" -#: ../src/path-chemistry.cpp:603 -msgid "Select <b>path(s)</b> to reverse." -msgstr "Выделите <b>контур(ы)</b> для разворота." +#: ../src/libgdl/gdl-dock.c:185 +msgid "Default title for the newly created floating docks" +msgstr "Обычное название для новых плавающих панелей" -#: ../src/path-chemistry.cpp:612 -msgid "Reversing paths..." -msgstr "Выполняется разворот контуров..." +#: ../src/libgdl/gdl-dock.c:192 +msgid "Width for the dock when it's of floating type" +msgstr "Ширина прикрепленной панели, когда она плавающая" -#: ../src/path-chemistry.cpp:647 -msgid "Reverse path" -msgstr "Развернуть контур" +#: ../src/libgdl/gdl-dock.c:200 +msgid "Height for the dock when it's of floating type" +msgstr "Высота прикрепленной панели, когда она плавающая" -#: ../src/path-chemistry.cpp:649 -msgid "<b>No paths</b> to reverse in the selection." -msgstr "В выделении <b>нет контуров</b> для разворота." +#: ../src/libgdl/gdl-dock.c:207 +msgid "Float X" +msgstr "Плавающая, X" -#: ../src/persp3d.cpp:293 -msgid "Toggle vanishing point" -msgstr "Переключение точек схода" +#: ../src/libgdl/gdl-dock.c:208 +msgid "X coordinate for a floating dock" +msgstr "Координата X плавающей панели" -#: ../src/persp3d.cpp:304 -msgid "Toggle multiple vanishing points" -msgstr "Переключение нескольких точек схода" +#: ../src/libgdl/gdl-dock.c:215 +msgid "Float Y" +msgstr "Плавающая, Y" -#: ../src/preferences-skeleton.h:101 -msgid "Dip pen" -msgstr "Чернильное перо" +#: ../src/libgdl/gdl-dock.c:216 +msgid "Y coordinate for a floating dock" +msgstr "Координата Y плавающей панели" -#: ../src/preferences-skeleton.h:102 -msgid "Marker" -msgstr "Маркер" +#: ../src/libgdl/gdl-dock.c:476 +#, c-format +msgid "Dock #%d" +msgstr "Панель №%d" -#: ../src/preferences-skeleton.h:103 -msgid "Brush" -msgstr "Кисть" +#: ../src/libnrtype/FontFactory.cpp:891 +msgid "Ignoring font without family that will crash Pango" +msgstr "Игнорирование шрифта без гарнитуры приведет к обрушиванию Pango" -#: ../src/preferences-skeleton.h:104 -msgid "Wiggly" -msgstr "Виляющее перо" +#: ../src/live_effects/effect.cpp:84 +msgid "doEffect stack test" +msgstr "Тест эффектов" -#: ../src/preferences-skeleton.h:105 -msgid "Splotchy" -msgstr "Пачкающее перо" +#: ../src/live_effects/effect.cpp:85 +msgid "Angle bisector" +msgstr "Угловая биссектриса" -#: ../src/preferences-skeleton.h:106 -msgid "Tracing" -msgstr "Трассировка" +#. TRANSLATORS: boolean operations +#: ../src/live_effects/effect.cpp:87 +msgid "Boolops" +msgstr "Логические операции" -#: ../src/preferences.cpp:134 -msgid "" -"Inkscape will run with default settings, and new settings will not be saved. " -msgstr "" -"Inkscape запустится с исходными настройками.\n" -"Измененные настройки не будут сохранены." +#: ../src/live_effects/effect.cpp:88 +msgid "Circle (by center and radius)" +msgstr "Окружность (центр+радиус)" -#. the creation failed -#. _reportError(Glib::ustring::compose(_("Cannot create profile directory %1."), -#. Glib::filename_to_utf8(_prefs_dir)), not_saved); -#: ../src/preferences.cpp:149 -#, c-format -msgid "Cannot create profile directory %s." -msgstr "Невозможно создать каталог с профилем %s." +#: ../src/live_effects/effect.cpp:89 +msgid "Circle by 3 points" +msgstr "Окружность через три точки" -#. The profile dir is not actually a directory -#. _reportError(Glib::ustring::compose(_("%1 is not a valid directory."), -#. Glib::filename_to_utf8(_prefs_dir)), not_saved); -#: ../src/preferences.cpp:167 -#, c-format -msgid "%s is not a valid directory." -msgstr "%s в действительности не является каталогом." +#: ../src/live_effects/effect.cpp:90 +msgid "Dynamic stroke" +msgstr "Динамический штрих" -#. The write failed. -#. _reportError(Glib::ustring::compose(_("Failed to create the preferences file %1."), -#. Glib::filename_to_utf8(_prefs_filename)), not_saved); -#: ../src/preferences.cpp:178 -#, c-format -msgid "Failed to create the preferences file %s." -msgstr "Не удалось загрузить файл параметров %s." +#: ../src/live_effects/effect.cpp:91 ../share/extensions/extrude.inx.h:1 +msgid "Extrude" +msgstr "Выдавливание" -#: ../src/preferences.cpp:214 -#, c-format -msgid "The preferences file %s is not a regular file." -msgstr "Файл параметров программы %s не является обычным файлом." +#: ../src/live_effects/effect.cpp:92 +msgid "Lattice Deformation" +msgstr "Деформация по сетке" -#: ../src/preferences.cpp:224 -#, c-format -msgid "The preferences file %s could not be read." -msgstr "Не удалось прочитать файл параметров программы %s." +#: ../src/live_effects/effect.cpp:93 +msgid "Line Segment" +msgstr "Сегмент линии" -#: ../src/preferences.cpp:235 -#, c-format -msgid "The preferences file %s is not a valid XML document." -msgstr "Файл параметров программы %s не является корректным документом XML." +#: ../src/live_effects/effect.cpp:94 +msgid "Mirror symmetry" +msgstr "Зеркальная симметрия" -#: ../src/preferences.cpp:244 -#, c-format -msgid "The file %s is not a valid Inkscape preferences file." -msgstr "%s не является корректным файлом параметров Inkscape." +#: ../src/live_effects/effect.cpp:96 +msgid "Parallel" +msgstr "Параллель" -#: ../src/rdf.cpp:175 -msgid "CC Attribution" -msgstr "CC Attribution" +#: ../src/live_effects/effect.cpp:97 +msgid "Path length" +msgstr "Длина контура" -#: ../src/rdf.cpp:180 -msgid "CC Attribution-ShareAlike" -msgstr "CC Attribution-ShareAlike" +#: ../src/live_effects/effect.cpp:98 +msgid "Perpendicular bisector" +msgstr "Перпендикулярная биссектриса" -#: ../src/rdf.cpp:185 -msgid "CC Attribution-NoDerivs" -msgstr "CC Attribution-NoDerivs" +#: ../src/live_effects/effect.cpp:99 +msgid "Perspective path" +msgstr "Контур в перспективе" -#: ../src/rdf.cpp:190 -msgid "CC Attribution-NonCommercial" -msgstr "CC Attribution-NonCommercial" +#: ../src/live_effects/effect.cpp:100 +msgid "Rotate copies" +msgstr "Вращение копий" -#: ../src/rdf.cpp:195 -msgid "CC Attribution-NonCommercial-ShareAlike" -msgstr "CC Attribution-NonCommercial-ShareAlike" +#: ../src/live_effects/effect.cpp:101 +msgid "Recursive skeleton" +msgstr "Рекурсивный скелет" -#: ../src/rdf.cpp:200 -msgid "CC Attribution-NonCommercial-NoDerivs" -msgstr "CC Attribution-NonCommercial-NoDerivs" +#: ../src/live_effects/effect.cpp:102 +msgid "Tangent to curve" +msgstr "Касательная к кривой" -#: ../src/rdf.cpp:205 -#, fuzzy -msgid "CC0 Public Domain Dedication" -msgstr "Общественное достояние" +#: ../src/live_effects/effect.cpp:103 +msgid "Text label" +msgstr "Текстовая метка" -#: ../src/rdf.cpp:210 -msgid "FreeArt" -msgstr "FreeArt" +#. 0.46 +#: ../src/live_effects/effect.cpp:106 +msgid "Bend" +msgstr "Изгиб" -#: ../src/rdf.cpp:215 -msgid "Open Font License" -msgstr "Open Font License" +#: ../src/live_effects/effect.cpp:107 +msgid "Gears" +msgstr "Шестеренка" -#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkTitleAttribute -#: ../src/rdf.cpp:235 ../src/ui/dialog/object-attributes.cpp:57 -msgid "Title:" -msgstr "Название:" +#: ../src/live_effects/effect.cpp:108 +msgid "Pattern Along Path" +msgstr "Текстура по контуру" -#: ../src/rdf.cpp:236 -msgid "A name given to the resource" -msgstr "" +#. for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG +#: ../src/live_effects/effect.cpp:109 +msgid "Stitch Sub-Paths" +msgstr "Сшивка субконтуров" -#: ../src/rdf.cpp:238 -msgid "Date:" -msgstr "Дата:" +#. 0.47 +#: ../src/live_effects/effect.cpp:111 +msgid "VonKoch" +msgstr "Фон Кох" -#: ../src/rdf.cpp:239 -msgid "" -"A point or period of time associated with an event in the lifecycle of the " -"resource" -msgstr "" +#: ../src/live_effects/effect.cpp:112 +msgid "Knot" +msgstr "Кельтский узел" -#: ../src/rdf.cpp:241 ../share/extensions/webslicer_create_rect.inx.h:3 -msgid "Format:" -msgstr "Формат:" +#: ../src/live_effects/effect.cpp:113 +msgid "Construct grid" +msgstr "Конструирование сетки" -#: ../src/rdf.cpp:242 -msgid "The file format, physical medium, or dimensions of the resource" -msgstr "" +#: ../src/live_effects/effect.cpp:114 +msgid "Spiro spline" +msgstr "Кривая Спиро" -#: ../src/rdf.cpp:245 -#, fuzzy -msgid "The nature or genre of the resource" -msgstr "В каких единицах производить измерения" +#: ../src/live_effects/effect.cpp:115 +msgid "Envelope Deformation" +msgstr "Деформация по огибающей" -#: ../src/rdf.cpp:248 -#, fuzzy -msgid "Creator:" -msgstr "Создатель" +#: ../src/live_effects/effect.cpp:116 +msgid "Interpolate Sub-Paths" +msgstr "Интерполяция субконтуров" -#: ../src/rdf.cpp:249 -#, fuzzy -msgid "An entity primarily responsible for making the resource" -msgstr "" -"Название организации, в первую очередь ответственной за создание этого " -"документа." +#: ../src/live_effects/effect.cpp:117 +msgid "Hatches (rough)" +msgstr "Внутренняя штриховка" -#: ../src/rdf.cpp:251 -#, fuzzy -msgid "Rights:" -msgstr "Правое:" +#: ../src/live_effects/effect.cpp:118 +msgid "Sketch" +msgstr "Карандашный набросок" -#: ../src/rdf.cpp:252 -msgid "Information about rights held in and over the resource" -msgstr "" +#: ../src/live_effects/effect.cpp:119 +msgid "Ruler" +msgstr "Линейка" -#: ../src/rdf.cpp:254 +#. 0.49 +#: ../src/live_effects/effect.cpp:121 #, fuzzy -msgid "Publisher:" -msgstr "Издатель" +msgid "Power stroke" +msgstr "Текстурная обводка" -#: ../src/rdf.cpp:255 +#: ../src/live_effects/effect.cpp:122 ../src/selection-chemistry.cpp:2837 #, fuzzy -msgid "An entity responsible for making the resource available" -msgstr "Название организации, ответственной за публикацию этого документа." +msgid "Clone original path" +msgstr "Заменить текст" -#: ../src/rdf.cpp:258 -#, fuzzy -msgid "Identifier:" -msgstr "Идентификатор" +#: ../src/live_effects/effect.cpp:284 +msgid "Is visible?" +msgstr "Видимость эффекта" -#: ../src/rdf.cpp:259 -msgid "An unambiguous reference to the resource within a given context" +#: ../src/live_effects/effect.cpp:284 +msgid "" +"If unchecked, the effect remains applied to the object but is temporarily " +"disabled on canvas" msgstr "" +"Если флажок снят, эффект остается примененным, но не отображается на холсте" -#: ../src/rdf.cpp:262 -msgid "A related resource from which the described resource is derived" -msgstr "" +#: ../src/live_effects/effect.cpp:305 +msgid "No effect" +msgstr "Без эффекта" -#: ../src/rdf.cpp:264 -#, fuzzy -msgid "Relation:" -msgstr "Смежный" +#: ../src/live_effects/effect.cpp:352 +#, c-format +msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" +msgstr "Укажите параметрический контур для LPE '%s' %d щелчками мышью" -#: ../src/rdf.cpp:265 -#, fuzzy -msgid "A related resource" -msgstr "Режим смешивания:" +#: ../src/live_effects/effect.cpp:624 +#, c-format +msgid "Editing parameter <b>%s</b>." +msgstr "Правка параметра <b>%s</b>." -#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1857 -msgid "Language:" -msgstr "Язык:" +#: ../src/live_effects/effect.cpp:629 +msgid "None of the applied path effect's parameters can be edited on-canvas." +msgstr "" +"Ни один из параметров примененного эффекта не может быть изменен на холсте." -#: ../src/rdf.cpp:268 +#: ../src/live_effects/lpe-bendpath.cpp:53 #, fuzzy -msgid "A language of the resource" -msgstr "Угол наклона эллипса" - -#: ../src/rdf.cpp:270 -msgid "Keywords:" -msgstr "Ключевые слова:" +msgid "Bend path:" +msgstr "Контур изгиба" -#: ../src/rdf.cpp:271 -#, fuzzy -msgid "The topic of the resource" -msgstr "Исходный правый край" +#: ../src/live_effects/lpe-bendpath.cpp:53 +msgid "Path along which to bend the original path" +msgstr "Контур, по которому гнуть исходный контур" -#. TRANSLATORS: "Coverage": the spatial or temporal characteristics of the content. -#. For info, see Appendix D of http://www.w3.org/TR/1998/WD-rdf-schema-19980409/ -#: ../src/rdf.cpp:275 -#, fuzzy -msgid "Coverage:" -msgstr "Охват" +#: ../src/live_effects/lpe-bendpath.cpp:54 +#: ../src/live_effects/lpe-patternalongpath.cpp:62 +#: ../src/ui/dialog/export.cpp:290 ../src/ui/dialog/transformation.cpp:80 +#: ../src/ui/widget/page-sizer.cpp:236 +msgid "_Width:" +msgstr "_Ширина:" -#: ../src/rdf.cpp:276 -msgid "" -"The spatial or temporal topic of the resource, the spatial applicability of " -"the resource, or the jurisdiction under which the resource is relevant" -msgstr "" +#: ../src/live_effects/lpe-bendpath.cpp:54 +msgid "Width of the path" +msgstr "Толщина контура" -#: ../src/rdf.cpp:279 +#: ../src/live_effects/lpe-bendpath.cpp:55 #, fuzzy -msgid "Description:" -msgstr "Описание" +msgid "W_idth in units of length" +msgstr "Единица ширины = длина контура" -#: ../src/rdf.cpp:280 -#, fuzzy -msgid "An account of the resource" -msgstr "Краткое описание содержимого документа." +#: ../src/live_effects/lpe-bendpath.cpp:55 +msgid "Scale the width of the path in units of its length" +msgstr "Измерять толщину контура в единицах, равных его длине" -#. FIXME: need to handle 1 agent per line of input -#: ../src/rdf.cpp:284 +#: ../src/live_effects/lpe-bendpath.cpp:56 #, fuzzy -msgid "Contributors:" -msgstr "Соавторы" +msgid "_Original path is vertical" +msgstr "Исходный контур вертикален" -#: ../src/rdf.cpp:285 -#, fuzzy -msgid "An entity responsible for making contributions to the resource" -msgstr "Названия или имена тех, кто внес вклад в создание этого документа." +#: ../src/live_effects/lpe-bendpath.cpp:56 +msgid "Rotates the original 90 degrees, before bending it along the bend path" +msgstr "Повернуть исходный контур на 90° перед изгибом по контуру" -#. TRANSLATORS: URL to a page that defines the license for the document -#: ../src/rdf.cpp:289 +#: ../src/live_effects/lpe-clone-original.cpp:18 #, fuzzy -msgid "URI:" -msgstr "URI" +msgid "Linked path:" +msgstr "Связать с контуром" -#. TRANSLATORS: this is where you put a URL to a page that defines the license -#: ../src/rdf.cpp:291 +#: ../src/live_effects/lpe-clone-original.cpp:18 #, fuzzy -msgid "URI to this document's license's namespace definition" -msgstr "URI текста лицензии, применимой к данному документу." +msgid "Path from which to take the original path data" +msgstr "Контур, по которому гнуть исходный контур" -#. TRANSLATORS: fragment of XML representing the license of the document -#: ../src/rdf.cpp:295 +#: ../src/live_effects/lpe-constructgrid.cpp:27 #, fuzzy -msgid "Fragment:" -msgstr "Фрагмент" +msgid "Size _X:" +msgstr "Ячеек по X:" + +#: ../src/live_effects/lpe-constructgrid.cpp:27 +msgid "The size of the grid in X direction." +msgstr "Число ячеек сетки по оси X" -#: ../src/rdf.cpp:296 +#: ../src/live_effects/lpe-constructgrid.cpp:28 #, fuzzy -msgid "XML fragment for the RDF 'License' section" -msgstr "XML-фрагмент RDF-раздела \"Лицензия\"." +msgid "Size _Y:" +msgstr "Ячеек по Y:" -#: ../src/resource-manager.cpp:332 -msgid "Fixup broken links" -msgstr "" +#: ../src/live_effects/lpe-constructgrid.cpp:28 +msgid "The size of the grid in Y direction." +msgstr "Число ячеек сетки по оси Y" -#: ../src/selection-chemistry.cpp:396 -msgid "Delete text" -msgstr "Удалить текст" +#: ../src/live_effects/lpe-curvestitch.cpp:41 +#, fuzzy +msgid "Stitch path:" +msgstr "Сшивающий контур" -#: ../src/selection-chemistry.cpp:404 -msgid "<b>Nothing</b> was deleted." -msgstr "<b>Ничего</b> не удалено." +#: ../src/live_effects/lpe-curvestitch.cpp:41 +msgid "The path that will be used as stitch." +msgstr "Контур, которым сшивают" -#: ../src/selection-chemistry.cpp:423 -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 -#: ../src/ui/dialog/swatches.cpp:278 ../src/ui/tools/text-tool.cpp:974 -#: ../src/widgets/eraser-toolbar.cpp:93 -#: ../src/widgets/gradient-toolbar.cpp:1178 -#: ../src/widgets/gradient-toolbar.cpp:1192 -#: ../src/widgets/gradient-toolbar.cpp:1206 -#: ../src/widgets/node-toolbar.cpp:401 -msgid "Delete" -msgstr "Удаление" +#: ../src/live_effects/lpe-curvestitch.cpp:42 +#, fuzzy +msgid "N_umber of paths:" +msgstr "Количество контуров" -#: ../src/selection-chemistry.cpp:451 -msgid "Select <b>object(s)</b> to duplicate." -msgstr "Выделите <b>объекты</b> для дублирования." +#: ../src/live_effects/lpe-curvestitch.cpp:42 +msgid "The number of paths that will be generated." +msgstr "Число создаваемых контуров" -#: ../src/selection-chemistry.cpp:560 -msgid "Delete all" -msgstr "Удалить всё" +#: ../src/live_effects/lpe-curvestitch.cpp:43 +#, fuzzy +msgid "Sta_rt edge variance:" +msgstr "Колебание края в начале" -#: ../src/selection-chemistry.cpp:750 -msgid "Select <b>some objects</b> to group." -msgstr "Выделите <b>несколько объектов</b> для группировки." +#: ../src/live_effects/lpe-curvestitch.cpp:43 +msgid "" +"The amount of random jitter to move the start points of the stitches inside " +"& outside the guide path" +msgstr "" +"Случайное колебание при смещении начальных точек швов внутри и снаружи " +"направляющего контура" -#: ../src/selection-chemistry.cpp:765 ../src/sp-item-group.cpp:329 -msgid "Group" -msgstr "Группа" +#: ../src/live_effects/lpe-curvestitch.cpp:44 +#, fuzzy +msgid "Sta_rt spacing variance:" +msgstr "Колебание интервала в начале" -#: ../src/selection-chemistry.cpp:788 -msgid "Select a <b>group</b> to ungroup." -msgstr "Выделите <b>группу</b> для разгруппирования." +#: ../src/live_effects/lpe-curvestitch.cpp:44 +msgid "" +"The amount of random shifting to move the start points of the stitches back " +"& forth along the guide path" +msgstr "" +"Количество случайного смещения для перемещения начальных точек швов вперед и " +"назад по направляющему контуру" -#: ../src/selection-chemistry.cpp:803 -msgid "<b>No groups</b> to ungroup in the selection." -msgstr "В выделении <b>нет групп</b> для разгруппирования." +#: ../src/live_effects/lpe-curvestitch.cpp:45 +#, fuzzy +msgid "End ed_ge variance:" +msgstr "Колебание края в конце" -#: ../src/selection-chemistry.cpp:861 ../src/sp-item-group.cpp:562 -msgid "Ungroup" -msgstr "Разгруппировать" +#: ../src/live_effects/lpe-curvestitch.cpp:45 +msgid "" +"The amount of randomness that moves the end points of the stitches inside & " +"outside the guide path" +msgstr "" +"Случайное колебание при смещении конечных точек швов внутри и снаружи " +"направляющего контура" -#: ../src/selection-chemistry.cpp:942 -msgid "Select <b>object(s)</b> to raise." -msgstr "Выделите <b>объект(ы)</b> для поднятия." +#: ../src/live_effects/lpe-curvestitch.cpp:46 +#, fuzzy +msgid "End spa_cing variance:" +msgstr "Колебание интервала в конце" -#: ../src/selection-chemistry.cpp:948 ../src/selection-chemistry.cpp:1004 -#: ../src/selection-chemistry.cpp:1032 ../src/selection-chemistry.cpp:1093 +#: ../src/live_effects/lpe-curvestitch.cpp:46 msgid "" -"You cannot raise/lower objects from <b>different groups</b> or <b>layers</b>." +"The amount of random shifting to move the end points of the stitches back & " +"forth along the guide path" msgstr "" -"Нельзя поднять или опустить объекты из <b>разных групп</b> или <b>слоев</b>." +"Количество случайного смещения для перемещения конечных точек швов вперед и " +"назад по направляющему контуру" -#. TRANSLATORS: "Raise" means "to raise an object" in the undo history -#: ../src/selection-chemistry.cpp:988 -msgctxt "Undo action" -msgid "Raise" -msgstr "Поднятие" +#: ../src/live_effects/lpe-curvestitch.cpp:47 +#, fuzzy +msgid "Scale _width:" +msgstr "Масштаб ширины" -#: ../src/selection-chemistry.cpp:996 -msgid "Select <b>object(s)</b> to raise to top." -msgstr "Выделите <b>объект(ы)</b> для поднятия на самый верх." +#: ../src/live_effects/lpe-curvestitch.cpp:47 +msgid "Scale the width of the stitch path" +msgstr "Масштабировать ширину сшивающего контура" -#: ../src/selection-chemistry.cpp:1019 -msgid "Raise to top" -msgstr "Поднять на передний план" +#: ../src/live_effects/lpe-curvestitch.cpp:48 +#, fuzzy +msgid "Scale _width relative to length" +msgstr "Ширина масштабируется относительно длины" -#: ../src/selection-chemistry.cpp:1026 -msgid "Select <b>object(s)</b> to lower." -msgstr "Выделите <b>объект(ы)</b> для опускания." +#: ../src/live_effects/lpe-curvestitch.cpp:48 +msgid "Scale the width of the stitch path relative to its length" +msgstr "Масштабировать ширины сшивающего контура относительно его длины" -#. TRANSLATORS: "Lower" means "to lower an object" in the undo history -#: ../src/selection-chemistry.cpp:1077 +#: ../src/live_effects/lpe-envelope.cpp:31 #, fuzzy -msgctxt "Undo action" -msgid "Lower" -msgstr "Опустить" +msgid "Top bend path:" +msgstr "Верхний контур" -#: ../src/selection-chemistry.cpp:1085 -msgid "Select <b>object(s)</b> to lower to bottom." -msgstr "Выделите <b>объект(ы)</b> для опускания на самый низ." +#: ../src/live_effects/lpe-envelope.cpp:31 +msgid "Top path along which to bend the original path" +msgstr "Верхний контур, по которому деформируется исходный контур" -#: ../src/selection-chemistry.cpp:1120 -msgid "Lower to bottom" -msgstr "Опустить на задний план" +#: ../src/live_effects/lpe-envelope.cpp:32 +#, fuzzy +msgid "Right bend path:" +msgstr "Правый контур" -#: ../src/selection-chemistry.cpp:1130 -msgid "Nothing to undo." -msgstr "Нет отменяемых операций." +#: ../src/live_effects/lpe-envelope.cpp:32 +msgid "Right path along which to bend the original path" +msgstr "Правый контур, по которому деформируется исходный контур" -#: ../src/selection-chemistry.cpp:1141 -msgid "Nothing to redo." -msgstr "Нет повторяемых операций." +#: ../src/live_effects/lpe-envelope.cpp:33 +#, fuzzy +msgid "Bottom bend path:" +msgstr "Нижний контур" -#: ../src/selection-chemistry.cpp:1208 -msgid "Paste" -msgstr "Вставка" +#: ../src/live_effects/lpe-envelope.cpp:33 +msgid "Bottom path along which to bend the original path" +msgstr "Нижний контур, по которому деформируется исходный контур" -#: ../src/selection-chemistry.cpp:1216 -msgid "Paste style" -msgstr "Вставка стиля" +#: ../src/live_effects/lpe-envelope.cpp:34 +#, fuzzy +msgid "Left bend path:" +msgstr "Левый контур" -#: ../src/selection-chemistry.cpp:1226 -msgid "Paste live path effect" -msgstr "Вставить динамический контурный эффект" +#: ../src/live_effects/lpe-envelope.cpp:34 +msgid "Left path along which to bend the original path" +msgstr "Левый контур, по которому деформируется исходный контур" -#: ../src/selection-chemistry.cpp:1248 -msgid "Select <b>object(s)</b> to remove live path effects from." -msgstr "" -"Выделите <b>объект(ы)</b> для удаления динамического контурного эффекта." +#: ../src/live_effects/lpe-envelope.cpp:35 +#, fuzzy +msgid "E_nable left & right paths" +msgstr "Использовать левый и правый контуры" -#: ../src/selection-chemistry.cpp:1260 -msgid "Remove live path effect" -msgstr "Удаление контурного эффекта" +#: ../src/live_effects/lpe-envelope.cpp:35 +msgid "Enable the left and right deformation paths" +msgstr "Использовать левый и правый деформирующие контуры" -#: ../src/selection-chemistry.cpp:1271 -msgid "Select <b>object(s)</b> to remove filters from." -msgstr "Выделите <b>объект(ы)</b> для удаления фильтров." +#: ../src/live_effects/lpe-envelope.cpp:36 +#, fuzzy +msgid "_Enable top & bottom paths" +msgstr "Использовать верхний и нижний контуры" -#: ../src/selection-chemistry.cpp:1281 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1678 -msgid "Remove filter" -msgstr "Удаление фильтра" +#: ../src/live_effects/lpe-envelope.cpp:36 +msgid "Enable the top and bottom deformation paths" +msgstr "Использовать верхний и нижний деформирующие контуры" -#: ../src/selection-chemistry.cpp:1290 -msgid "Paste size" -msgstr "Вставить размер" +#: ../src/live_effects/lpe-extrude.cpp:30 +msgid "Direction" +msgstr "Направление" -#: ../src/selection-chemistry.cpp:1299 -msgid "Paste size separately" -msgstr "Вставить размер раздельно" +#: ../src/live_effects/lpe-extrude.cpp:30 +msgid "Defines the direction and magnitude of the extrusion" +msgstr "Определяет направление и силу выдавливания" -#: ../src/selection-chemistry.cpp:1309 -msgid "Select <b>object(s)</b> to move to the layer above." -msgstr "Выделите <b>объект(ы)</b> для перемещения на слой выше." +#: ../src/live_effects/lpe-gears.cpp:214 +#, fuzzy +msgid "_Teeth:" +msgstr "Зубцов:" -#: ../src/selection-chemistry.cpp:1335 -msgid "Raise to next layer" -msgstr "Поднятие на следующий слой" +#: ../src/live_effects/lpe-gears.cpp:214 +msgid "The number of teeth" +msgstr "Количество зубцов" -#: ../src/selection-chemistry.cpp:1342 -msgid "No more layers above." -msgstr "Выше слоёв нет." +#: ../src/live_effects/lpe-gears.cpp:215 +#, fuzzy +msgid "_Phi:" +msgstr "φ (фи):" -#: ../src/selection-chemistry.cpp:1354 -msgid "Select <b>object(s)</b> to move to the layer below." -msgstr "Выделите <b>объект(ы)</b> для перемещения на слой ниже." +#: ../src/live_effects/lpe-gears.cpp:215 +msgid "" +"Tooth pressure angle (typically 20-25 deg). The ratio of teeth not in " +"contact." +msgstr "" +"Угол давления зубцов (обычно равен 20-25°). С соотношением зубцов не связан." -#: ../src/selection-chemistry.cpp:1380 -msgid "Lower to previous layer" -msgstr "Опускание на предыдущий слой" +#: ../src/live_effects/lpe-interpolate.cpp:31 +#, fuzzy +msgid "Trajectory:" +msgstr "Траектория" -#: ../src/selection-chemistry.cpp:1387 -msgid "No more layers below." -msgstr "Ниже слоёв нет." +#: ../src/live_effects/lpe-interpolate.cpp:31 +msgid "Path along which intermediate steps are created." +msgstr "Контур, по которому будут выстроены промежуточные фигуры" -#: ../src/selection-chemistry.cpp:1399 +#: ../src/live_effects/lpe-interpolate.cpp:32 #, fuzzy -msgid "Select <b>object(s)</b> to move." -msgstr "Выделите <b>объект(ы)</b> для опускания." +msgid "Steps_:" +msgstr "Шаги" -#: ../src/selection-chemistry.cpp:1416 ../src/verbs.cpp:2577 -msgid "Move selection to layer" -msgstr "Перенос выделения в слой" +#: ../src/live_effects/lpe-interpolate.cpp:32 +msgid "Determines the number of steps from start to end path." +msgstr "Количество промежуточных фигур между начальным и конечным субконтурами" -#. An SVG element cannot have a transform. We could change 'x' and 'y' in response -#. to a translation... but leave that for another day. -#: ../src/selection-chemistry.cpp:1503 ../src/seltrans.cpp:388 -msgid "Cannot transform an embedded SVG." +#: ../src/live_effects/lpe-interpolate.cpp:33 +#, fuzzy +msgid "E_quidistant spacing" +msgstr "Равномерный интервал" + +#: ../src/live_effects/lpe-interpolate.cpp:33 +msgid "" +"If true, the spacing between intermediates is constant along the length of " +"the path. If false, the distance depends on the location of the nodes of the " +"trajectory path." msgstr "" +"Если включено, интервал между промежуточными фигурами не меняется на " +"протяжении всего контура. Если выключено, расстояние меняется в зависимости " +"от положения узлов на контуре траектории." -#: ../src/selection-chemistry.cpp:1647 -msgid "Remove transform" -msgstr "Убрать трансформацию" +#. initialise your parameters here: +#: ../src/live_effects/lpe-knot.cpp:350 +#, fuzzy +msgid "Fi_xed width:" +msgstr "Фиксированная толщина" + +#: ../src/live_effects/lpe-knot.cpp:350 +msgid "Size of hidden region of lower string" +msgstr "Размер скрываемой области нижней нити" -#: ../src/selection-chemistry.cpp:1750 +#: ../src/live_effects/lpe-knot.cpp:351 #, fuzzy -msgid "Rotate 90° CCW" -msgstr "Повернуть на 90° против часовой стрелки" +msgid "_In units of stroke width" +msgstr "В единицах толщины обводки" + +#: ../src/live_effects/lpe-knot.cpp:351 +msgid "Consider 'Interruption width' as a ratio of stroke width" +msgstr "Считать толщину прерывания коэффициентом толщины штриха" -#: ../src/selection-chemistry.cpp:1750 +#: ../src/live_effects/lpe-knot.cpp:352 #, fuzzy -msgid "Rotate 90° CW" -msgstr "Повернуть на 90° по часовой стрелке" +msgid "St_roke width" +msgstr "Прибавить толщину обводки" -#: ../src/selection-chemistry.cpp:1771 ../src/seltrans.cpp:483 -#: ../src/ui/dialog/transformation.cpp:894 -msgid "Rotate" -msgstr "Вращение" +#: ../src/live_effects/lpe-knot.cpp:352 +msgid "Add the stroke width to the interruption size" +msgstr "Добавить толщину обводки к толщине прерывания" -#: ../src/selection-chemistry.cpp:2142 -msgid "Rotate by pixels" -msgstr "Вращение по пикселам" +#: ../src/live_effects/lpe-knot.cpp:353 +#, fuzzy +msgid "_Crossing path stroke width" +msgstr "Прибавить толщину пересекающего контура" -#: ../src/selection-chemistry.cpp:2172 ../src/seltrans.cpp:480 -#: ../src/ui/dialog/transformation.cpp:869 -#: ../share/extensions/interp_att_g.inx.h:12 -msgid "Scale" -msgstr "Масштабирование:" +#: ../src/live_effects/lpe-knot.cpp:353 +msgid "Add crossed stroke width to the interruption size" +msgstr "Добавить толщину пересекающего контура к толщине прерывания" -#: ../src/selection-chemistry.cpp:2197 -msgid "Scale by whole factor" -msgstr "Масштабирование по целым числам" +#: ../src/live_effects/lpe-knot.cpp:354 +#, fuzzy +msgid "S_witcher size:" +msgstr "Размер переключателя:" -#: ../src/selection-chemistry.cpp:2212 -msgid "Move vertically" -msgstr "Смещение по вертикали" +#: ../src/live_effects/lpe-knot.cpp:354 +msgid "Orientation indicator/switcher size" +msgstr "Размер индикатора-переключателя направления" -#: ../src/selection-chemistry.cpp:2215 -msgid "Move horizontally" -msgstr "Смещение по горизонтали" +#: ../src/live_effects/lpe-knot.cpp:355 +msgid "Crossing Signs" +msgstr "Знаки пересечения" -#: ../src/selection-chemistry.cpp:2218 ../src/selection-chemistry.cpp:2244 -#: ../src/seltrans.cpp:477 ../src/ui/dialog/transformation.cpp:807 -msgid "Move" -msgstr "Смещение" +#: ../src/live_effects/lpe-knot.cpp:355 +msgid "Crossings signs" +msgstr "Знаки пересечения" -#: ../src/selection-chemistry.cpp:2238 -msgid "Move vertically by pixels" -msgstr "Попиксельное смещение по вертикали" +#: ../src/live_effects/lpe-knot.cpp:622 +msgid "Drag to select a crossing, click to flip it" +msgstr "Перетащите для выбора пересечения, щелчком измените его тип" -#: ../src/selection-chemistry.cpp:2241 -msgid "Move horizontally by pixels" -msgstr "Попиксельное смещение по горизонтали" +#. / @todo Is this the right verb? +#: ../src/live_effects/lpe-knot.cpp:660 +msgid "Change knot crossing" +msgstr "Смена типа пересечения" -#: ../src/selection-chemistry.cpp:2373 -msgid "The selection has no applied path effect." -msgstr "В выделении нет примененного контурного эффекта." +#: ../src/live_effects/lpe-patternalongpath.cpp:50 +#: ../share/extensions/pathalongpath.inx.h:10 +msgid "Single" +msgstr "Одиночные" -#: ../src/selection-chemistry.cpp:2542 ../src/ui/dialog/clonetiler.cpp:2218 -msgid "Select an <b>object</b> to clone." -msgstr "Выделите <b>объект</b> для клонирования." +#: ../src/live_effects/lpe-patternalongpath.cpp:51 +#: ../share/extensions/pathalongpath.inx.h:11 +msgid "Single, stretched" +msgstr "Одиночные, растягиваются" -#: ../src/selection-chemistry.cpp:2578 -#, fuzzy -msgctxt "Action" -msgid "Clone" -msgstr "Склонирована" +#: ../src/live_effects/lpe-patternalongpath.cpp:52 +#: ../share/extensions/pathalongpath.inx.h:12 +msgid "Repeated" +msgstr "Повторяются" -#: ../src/selection-chemistry.cpp:2594 -msgid "Select <b>clones</b> to relink." -msgstr "Выделите <b>клоны</b> для пересоединения" +#: ../src/live_effects/lpe-patternalongpath.cpp:53 +#: ../share/extensions/pathalongpath.inx.h:13 +msgid "Repeated, stretched" +msgstr "Повторяются и растягиваются" -#: ../src/selection-chemistry.cpp:2601 -msgid "Copy an <b>object</b> to clipboard to relink clones to." -msgstr "" -"Скопируйте <b>объект</b> в буфер обмена, чтобы затем повторно присоединить к " -"нему клоны." +#: ../src/live_effects/lpe-patternalongpath.cpp:59 +#, fuzzy +msgid "Pattern source:" +msgstr "Текстура (кисть)" -#: ../src/selection-chemistry.cpp:2625 -msgid "<b>No clones to relink</b> in the selection." -msgstr "В текущем выделении <b>нет клонов для повторного связывания</b>." +#: ../src/live_effects/lpe-patternalongpath.cpp:59 +msgid "Path to put along the skeleton path" +msgstr "Текстура, направляемая по скелетному контуру" -#: ../src/selection-chemistry.cpp:2628 -msgid "Relink clone" -msgstr "Повторно связать клон" +#: ../src/live_effects/lpe-patternalongpath.cpp:60 +#, fuzzy +msgid "Pattern copies:" +msgstr "Копии:" -#: ../src/selection-chemistry.cpp:2642 -msgid "Select <b>clones</b> to unlink." -msgstr "Выделите <b>клоны</b> для отсоединения." +#: ../src/live_effects/lpe-patternalongpath.cpp:60 +msgid "How many pattern copies to place along the skeleton path" +msgstr "Как много копий текстуры разместить вдоль скелетного контура" -#: ../src/selection-chemistry.cpp:2696 -msgid "<b>No clones to unlink</b> in the selection." -msgstr "В выделении нет <b>клонов</b>." +#: ../src/live_effects/lpe-patternalongpath.cpp:62 +msgid "Width of the pattern" +msgstr "Ширина текстуры" -#: ../src/selection-chemistry.cpp:2700 -msgid "Unlink clone" -msgstr "Отсоединение клона" +#: ../src/live_effects/lpe-patternalongpath.cpp:63 +#, fuzzy +msgid "Wid_th in units of length" +msgstr "Единица ширины = длина контура" -#: ../src/selection-chemistry.cpp:2713 -msgid "" -"Select a <b>clone</b> to go to its original. Select a <b>linked offset</b> " -"to go to its source. Select a <b>text on path</b> to go to the path. Select " -"a <b>flowed text</b> to go to its frame." -msgstr "" -"Выделите <b>клон</b>, чтобы перейти к его оригиналу. Выделите <b>связанную " -"втяжку</b>, чтобы перейти к исходному контуру. Выделите <b>текст по контуру</" -"b>, чтобы перейти к его контуру. Выделите <b>текст в рамке</b>, чтобы " -"перейти к рамке." +#: ../src/live_effects/lpe-patternalongpath.cpp:64 +msgid "Scale the width of the pattern in units of its length" +msgstr "Измерять ширину текстуры в единицах, равных ее длине" -#: ../src/selection-chemistry.cpp:2746 -msgid "" -"<b>Cannot find</b> the object to select (orphaned clone, offset, textpath, " -"flowed text?)" -msgstr "" -"<b>Невозможно найти</b> выбираемый объект (orphaned clone, offset, текст по " -"контуру, завёрстанный текст?)" +#: ../src/live_effects/lpe-patternalongpath.cpp:66 +#, fuzzy +msgid "Spa_cing:" +msgstr "Интервал:" -#: ../src/selection-chemistry.cpp:2752 +#: ../src/live_effects/lpe-patternalongpath.cpp:68 +#, no-c-format msgid "" -"The object you're trying to select is <b>not visible</b> (it is in <" -"defs>)" +"Space between copies of the pattern. Negative values allowed, but are " +"limited to -90% of pattern width." msgstr "" -"Объект, который вы пытаетесь выделить, <b>невидим</b> (находится в <" -"defs>)" +"Интервал между копиями текстуры. Можно указать отрицательное число не более " +"чем -90% процентов от ширины текстуры." -#: ../src/selection-chemistry.cpp:2797 +#: ../src/live_effects/lpe-patternalongpath.cpp:70 #, fuzzy -msgid "Select <b>one</b> path to clone." -msgstr "Выделите <b>объект</b> для клонирования." +msgid "No_rmal offset:" +msgstr "Обычное смещение:" -#: ../src/selection-chemistry.cpp:2801 +#: ../src/live_effects/lpe-patternalongpath.cpp:71 #, fuzzy -msgid "Select one <b>path</b> to clone." -msgstr "Выделите <b>объект</b> для клонирования." - -#: ../src/selection-chemistry.cpp:2857 -msgid "Select <b>object(s)</b> to convert to marker." -msgstr "Выделите <b>объект</b> для преобразования в маркер." - -#: ../src/selection-chemistry.cpp:2924 -msgid "Objects to marker" -msgstr "Объекты в маркер" - -#: ../src/selection-chemistry.cpp:2948 -msgid "Select <b>object(s)</b> to convert to guides." -msgstr "Выделите <b>объект</b> для преобразования в направляющие." - -#: ../src/selection-chemistry.cpp:2971 -msgid "Objects to guides" -msgstr "Объекты в направляющие" +msgid "Tan_gential offset:" +msgstr "Смещение по касательной:" -#: ../src/selection-chemistry.cpp:3007 +#: ../src/live_effects/lpe-patternalongpath.cpp:72 #, fuzzy -msgid "Select <b>objects</b> to convert to symbol." -msgstr "Выделите <b>объект</b> для преобразования в маркер." - -#: ../src/selection-chemistry.cpp:3113 -msgid "Group to symbol" -msgstr "Группа в символ" +msgid "Offsets in _unit of pattern size" +msgstr "Смещения в единицах текстуры" -#: ../src/selection-chemistry.cpp:3132 -#, fuzzy -msgid "Select a <b>symbol</b> to extract objects from." +#: ../src/live_effects/lpe-patternalongpath.cpp:73 +msgid "" +"Spacing, tangential and normal offset are expressed as a ratio of width/" +"height" msgstr "" -"Выделите <b>объект с текстурной заливкой</b> для извлечения из него объектов." +"Интервал, обычное и тангенциальное смещения выражаются как соотношение " +"ширины и высоты" -#: ../src/selection-chemistry.cpp:3141 +#: ../src/live_effects/lpe-patternalongpath.cpp:75 #, fuzzy -msgid "Select only one <b>symbol</b> in Symbol dialog to convert to group." -msgstr "Выделите <b>объект</b> для преобразования в направляющие." - -#: ../src/selection-chemistry.cpp:3199 -msgid "Group from symbol" -msgstr "Группа из символа" +msgid "Pattern is _vertical" +msgstr "Текстура вертикальна" -#: ../src/selection-chemistry.cpp:3217 -msgid "Select <b>object(s)</b> to convert to pattern." -msgstr "Выделите <b>объект(ы)</b> для преобразования в текстуру." +#: ../src/live_effects/lpe-patternalongpath.cpp:75 +msgid "Rotate pattern 90 deg before applying" +msgstr "Повернуть текстуру на 90° перед применением" -#: ../src/selection-chemistry.cpp:3307 -msgid "Objects to pattern" -msgstr "Объекты в текстуру" +#: ../src/live_effects/lpe-patternalongpath.cpp:77 +#, fuzzy +msgid "_Fuse nearby ends:" +msgstr "Сливаться у концов" -#: ../src/selection-chemistry.cpp:3323 -msgid "Select an <b>object with pattern fill</b> to extract objects from." +#: ../src/live_effects/lpe-patternalongpath.cpp:77 +msgid "Fuse ends closer than this number. 0 means don't fuse." msgstr "" -"Выделите <b>объект с текстурной заливкой</b> для извлечения из него объектов." - -#: ../src/selection-chemistry.cpp:3378 -msgid "<b>No pattern fills</b> in the selection." -msgstr "В выделении <b>нет текстурной заливки</b>." - -#: ../src/selection-chemistry.cpp:3381 -msgid "Pattern to objects" -msgstr "Текстура в объекты" +"Сращивать концы, находящиеся ближе этого расстояния. Ноль означает не " +"сращивать." -#: ../src/selection-chemistry.cpp:3472 -msgid "Select <b>object(s)</b> to make a bitmap copy." -msgstr "Выделите <b>объект(ы)</b> для создания растровой копии." +#: ../src/live_effects/lpe-powerstroke.cpp:189 +#, fuzzy +msgid "CubicBezierFit" +msgstr "Кривые Безье" -#: ../src/selection-chemistry.cpp:3476 -msgid "Rendering bitmap..." -msgstr "Создается растровая копия..." +#: ../src/live_effects/lpe-powerstroke.cpp:190 +msgid "CubicBezierJohan" +msgstr "" -#: ../src/selection-chemistry.cpp:3655 -msgid "Create bitmap" -msgstr "Создание растровой копии" +#: ../src/live_effects/lpe-powerstroke.cpp:191 +#, fuzzy +msgid "SpiroInterpolator" +msgstr "Интерполяция" -#: ../src/selection-chemistry.cpp:3687 -msgid "Select <b>object(s)</b> to create clippath or mask from." +#: ../src/live_effects/lpe-powerstroke.cpp:192 +msgid "Centripetal Catmull-Rom" msgstr "" -"Выделите <b>объект(ы)</b>, из которых будет создан обтравочный контур или " -"маска." -#: ../src/selection-chemistry.cpp:3690 -msgid "Select mask object and <b>object(s)</b> to apply clippath or mask to." -msgstr "" -"Выделите объект-маску и <b>объект(ы)</b>, к которым применить обтравочный " -"контур или маску." +#: ../src/live_effects/lpe-powerstroke.cpp:204 +#, fuzzy +msgid "Butt" +msgstr "Кнопка" -#: ../src/selection-chemistry.cpp:3873 -msgid "Set clipping path" -msgstr "Установлен обтравочный контур" +#: ../src/live_effects/lpe-powerstroke.cpp:205 +#, fuzzy +msgid "Square" +msgstr "Квадратные" -#: ../src/selection-chemistry.cpp:3875 -msgid "Set mask" -msgstr "Установлена маска" +#: ../src/live_effects/lpe-powerstroke.cpp:206 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 +#, fuzzy +msgid "Round" +msgstr "Закругление" -#: ../src/selection-chemistry.cpp:3890 -msgid "Select <b>object(s)</b> to remove clippath or mask from." +#: ../src/live_effects/lpe-powerstroke.cpp:207 +msgid "Peak" msgstr "" -"Выделите <b>объект(ы)</b>, с которых нужно снять обтравочный контур или " -"маску." - -#: ../src/selection-chemistry.cpp:4001 -msgid "Release clipping path" -msgstr "Обтравочный контур снят" -#: ../src/selection-chemistry.cpp:4003 -msgid "Release mask" -msgstr "Маска снята" +#: ../src/live_effects/lpe-powerstroke.cpp:208 +#, fuzzy +msgid "Zero width" +msgstr "Толщина пера" -#: ../src/selection-chemistry.cpp:4022 -msgid "Select <b>object(s)</b> to fit canvas to." -msgstr "Выделите <b>объект</b>, по размеру которого подогнать холст." +#: ../src/live_effects/lpe-powerstroke.cpp:221 +#, fuzzy +msgid "Beveled" +msgstr "Фаска" -#. Fit Page -#: ../src/selection-chemistry.cpp:4042 ../src/verbs.cpp:2905 -msgid "Fit Page to Selection" -msgstr "Cтраница до выделения" +#: ../src/live_effects/lpe-powerstroke.cpp:222 +#: ../src/widgets/star-toolbar.cpp:534 +msgid "Rounded" +msgstr "Закругление" -#: ../src/selection-chemistry.cpp:4071 ../src/verbs.cpp:2907 -msgid "Fit Page to Drawing" -msgstr "Откадрировать холст до рисунка" +#. {LINEJOIN_EXTRP_MITER, N_("Extrapolated"), "extrapolated"}, // disabled because doesn't work well +#: ../src/live_effects/lpe-powerstroke.cpp:224 +msgid "Extrapolated arc" +msgstr "" -#: ../src/selection-chemistry.cpp:4092 ../src/verbs.cpp:2909 -msgid "Fit Page to Selection or Drawing" -msgstr "Откадрировать холст до выделения или рисунка" +#: ../src/live_effects/lpe-powerstroke.cpp:225 +#, fuzzy +msgid "Miter" +msgstr "Острое" -#: ../src/selection-describer.cpp:128 -msgid "root" -msgstr "корневом слое" +#: ../src/live_effects/lpe-powerstroke.cpp:226 +#: ../src/widgets/pencil-toolbar.cpp:103 +msgid "Spiro" +msgstr "Кривые Спиро" -#: ../src/selection-describer.cpp:130 ../src/widgets/ege-paint-def.cpp:66 -#: ../src/widgets/ege-paint-def.cpp:90 -msgid "none" -msgstr "нет" +#: ../src/live_effects/lpe-powerstroke.cpp:232 +#, fuzzy +msgid "Offset points" +msgstr "Растянутый контур" -#: ../src/selection-describer.cpp:142 -#, c-format -msgid "layer <b>%s</b>" -msgstr "слое <b>%s</b>" +#: ../src/live_effects/lpe-powerstroke.cpp:233 +#, fuzzy +msgid "Sort points" +msgstr "Ориентация" -#: ../src/selection-describer.cpp:144 -#, c-format -msgid "layer <b><i>%s</i></b>" -msgstr "слой <b><i>%s</i></b>" +#: ../src/live_effects/lpe-powerstroke.cpp:233 +msgid "Sort offset points according to their time value along the curve" +msgstr "" -#: ../src/selection-describer.cpp:155 -#, c-format -msgid "<i>%s</i>" -msgstr "<i>%s</i>" +#: ../src/live_effects/lpe-powerstroke.cpp:234 +#, fuzzy +msgid "Interpolator type:" +msgstr "Интерполировать стиль" -#: ../src/selection-describer.cpp:165 -#, c-format -msgid " in %s" -msgstr " в %s" +#: ../src/live_effects/lpe-powerstroke.cpp:234 +msgid "" +"Determines which kind of interpolator will be used to interpolate between " +"stroke width along the path" +msgstr "" -#: ../src/selection-describer.cpp:167 +#: ../src/live_effects/lpe-powerstroke.cpp:235 +#: ../share/extensions/fractalize.inx.h:3 #, fuzzy -msgid " hidden in definitions" -msgstr "Не разделять определения градиентов между объектами" +msgid "Smoothness:" +msgstr "Сглаженность:" -#: ../src/selection-describer.cpp:169 -#, c-format -msgid " in group %s (%s)" -msgstr " в группе %s (%s)" +#: ../src/live_effects/lpe-powerstroke.cpp:235 +msgid "" +"Sets the smoothness for the CubicBezierJohan interpolator; 0 = linear " +"interpolation, 1 = smooth" +msgstr "" -#: ../src/selection-describer.cpp:171 -#, fuzzy, c-format -msgid " in unnamed group (%s)" -msgstr " в группе %s (%s)" +#: ../src/live_effects/lpe-powerstroke.cpp:236 +#, fuzzy +msgid "Start cap:" +msgstr "Начало:" -#: ../src/selection-describer.cpp:173 -#, fuzzy, c-format -msgid " in <b>%i</b> parent (%s)" -msgid_plural " in <b>%i</b> parents (%s)" -msgstr[0] " в <b>%i</b> родителе (%s)" -msgstr[1] " в <b>%i</b> родителях (%s)" -msgstr[2] " в <b>%i</b> родителях (%s)" +#: ../src/live_effects/lpe-powerstroke.cpp:236 +#, fuzzy +msgid "Determines the shape of the path's start" +msgstr "Количество промежуточных фигур между начальным и конечным субконтурами" -#: ../src/selection-describer.cpp:176 -#, fuzzy, c-format -msgid " in <b>%i</b> layer" -msgid_plural " in <b>%i</b> layers" -msgstr[0] " в <b>%i</b> слое." -msgstr[1] " в <b>%i</b> слоях." -msgstr[2] " в <b>%i</b> слоях.." +#. Join type +#. TRANSLATORS: The line join style specifies the shape to be used at the +#. corners of paths. It can be "miter", "round" or "bevel". +#: ../src/live_effects/lpe-powerstroke.cpp:237 +#: ../src/widgets/stroke-style.cpp:227 +msgid "Join:" +msgstr "Соединение:" -#: ../src/selection-describer.cpp:187 +#: ../src/live_effects/lpe-powerstroke.cpp:237 #, fuzzy -msgid "Convert symbol to group to edit" -msgstr "Оконтуривание обводки" +msgid "Determines the shape of the path's corners" +msgstr "Количество промежуточных фигур между начальным и конечным субконтурами" -#: ../src/selection-describer.cpp:191 +#: ../src/live_effects/lpe-powerstroke.cpp:238 #, fuzzy -msgid "Remove from symbols tray to edit symbol" -msgstr "Оконтуривание обводки" - -#: ../src/selection-describer.cpp:195 -msgid "Use <b>Shift+D</b> to look up original" -msgstr "<b>Shift+D</b> выделяет оригинал" +msgid "Miter limit:" +msgstr "Пред_ел острия:" -#: ../src/selection-describer.cpp:199 -msgid "Use <b>Shift+D</b> to look up path" -msgstr "<b>Shift+D</b> выделяет контур" +#: ../src/live_effects/lpe-powerstroke.cpp:238 +#: ../src/widgets/stroke-style.cpp:278 +msgid "Maximum length of the miter (in units of stroke width)" +msgstr "Максимальная длина острия (в единицах толщины обводки)" -#: ../src/selection-describer.cpp:203 -msgid "Use <b>Shift+D</b> to look up frame" -msgstr "<b>Shift+D</b> выделяет блок" +#: ../src/live_effects/lpe-powerstroke.cpp:239 +#, fuzzy +msgid "End cap:" +msgstr "Круглые" -#: ../src/selection-describer.cpp:215 -#, fuzzy, c-format -msgid "<b>%i</b> objects selected of type %s" -msgid_plural "<b>%i</b> objects selected of types %s" -msgstr[0] "<b>%i</b> объект выделен" -msgstr[1] "<b>%i</b> объекта выделено" -msgstr[2] "<b>%i</b> объектов выделено" +#: ../src/live_effects/lpe-powerstroke.cpp:239 +#, fuzzy +msgid "Determines the shape of the path's end" +msgstr "Количество промежуточных фигур между начальным и конечным субконтурами" -#: ../src/selection-describer.cpp:225 -#, fuzzy, c-format -msgid "; <i>%d filtered object</i> " -msgid_plural "; <i>%d filtered objects</i> " -msgstr[0] "%s; <i>с фильтром</i>" -msgstr[1] "%s; <i>с фильтром</i>" -msgstr[2] "%s; <i>с фильтром</i>" +#: ../src/live_effects/lpe-rough-hatches.cpp:225 +#, fuzzy +msgid "Frequency randomness:" +msgstr "Случайность интервала" -#: ../src/seltrans-handles.cpp:9 -msgid "" -"<b>Squeeze or stretch</b> selection; with <b>Ctrl</b> to scale uniformly; " -"with <b>Shift</b> to scale around rotation center" -msgstr "" -"<b>Сжать или растянуть</b> выделение; с <b>Ctrl</b> — сохранять пропорцию; с " -"<b>Shift</b> — вокруг центра вращения" +#: ../src/live_effects/lpe-rough-hatches.cpp:225 +msgid "Variation of distance between hatches, in %." +msgstr "Варьирование расстояния между штрихами, в %" -#: ../src/seltrans-handles.cpp:10 -msgid "" -"<b>Scale</b> selection; with <b>Ctrl</b> to scale uniformly; with <b>Shift</" -"b> to scale around rotation center" -msgstr "" -"<b>Менять размер</b> выделения; с <b>Ctrl</b> —сохранять пропорцию; с " -"<b>Shift</b> — вокруг центра вращения" +#: ../src/live_effects/lpe-rough-hatches.cpp:226 +#, fuzzy +msgid "Growth:" +msgstr "Нарастание:" -#: ../src/seltrans-handles.cpp:11 -msgid "" -"<b>Skew</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> to " -"skew around the opposite side" -msgstr "" -"<b>Наклонять</b> выделение; с <b>Ctrl</b> — ограничивать угол; с <b>Shift</" -"b> — вокруг противоположной стороны" +#: ../src/live_effects/lpe-rough-hatches.cpp:226 +msgid "Growth of distance between hatches." +msgstr "Нарастание расстояния между штрихами" -#: ../src/seltrans-handles.cpp:12 -msgid "" -"<b>Rotate</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> " -"to rotate around the opposite corner" -msgstr "" -"<b>Вращать</b> выделение; с <b>Ctrl</b> — ограничивать угол; с <b>Shift</b> " -"— вокруг противоположного угла" +#. FIXME: top/bottom names are inverted in the UI/svg and in the code!! +#: ../src/live_effects/lpe-rough-hatches.cpp:228 +#, fuzzy +msgid "Half-turns smoothness: 1st side, in:" +msgstr "Плавность полуповоротов, 1-ая сторона, вход:" -#: ../src/seltrans-handles.cpp:13 +#: ../src/live_effects/lpe-rough-hatches.cpp:228 msgid "" -"<b>Center</b> of rotation and skewing: drag to reposition; scaling with " -"Shift also uses this center" +"Set smoothness/sharpness of path when reaching a 'bottom' half-turn. " +"0=sharp, 1=default" msgstr "" -"<b>Центр</b> вращения и наклона: его можно перетащить; масштабирование с " -"Shift также выполняется по этому центру" - -#: ../src/seltrans.cpp:486 ../src/ui/dialog/transformation.cpp:982 -msgid "Skew" -msgstr "Наклон" - -#: ../src/seltrans.cpp:499 -msgid "Set center" -msgstr "Смена центра объекта" - -#: ../src/seltrans.cpp:574 -msgid "Stamp" -msgstr "Штамповка" +"Установить плавность/остроту контура по достижении им нижнего полуповорота. " +"0 = острый, 1=по умолчанию." -#: ../src/seltrans.cpp:723 -msgid "Reset center" -msgstr "Возврат к исходному центру" +#: ../src/live_effects/lpe-rough-hatches.cpp:229 +#, fuzzy +msgid "1st side, out:" +msgstr "1-ая сторона, выход:" -#: ../src/seltrans.cpp:955 ../src/seltrans.cpp:1060 -#, c-format -msgid "<b>Scale</b>: %0.2f%% x %0.2f%%; with <b>Ctrl</b> to lock ratio" +#: ../src/live_effects/lpe-rough-hatches.cpp:229 +msgid "" +"Set smoothness/sharpness of path when leaving a 'bottom' half-turn. 0=sharp, " +"1=default" msgstr "" -"<b>Изменить размер</b>: %0.2f%% x %0.2f%%; <b>Ctrl</b> сохраняет пропорцию" - -#. TRANSLATORS: don't modify the first ";" -#. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1192 -#, c-format -msgid "<b>Skew</b>: %0.2f°; with <b>Ctrl</b> to snap angle" -msgstr "<b>Наклон</b>: %0.2f°; <b>Ctrl</b> ограничивает угол" - -#. TRANSLATORS: don't modify the first ";" -#. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1267 -#, c-format -msgid "<b>Rotate</b>: %0.2f°; with <b>Ctrl</b> to snap angle" -msgstr "<b>Вращение</b>: %0.2f°; <b>Ctrl</b> ограничивает угол" +"Установить плавность/остроту контура при уходе от нижнего полуповорота. 0 = " +"острый, 1=по умолчанию." -#: ../src/seltrans.cpp:1304 -#, c-format -msgid "Move <b>center</b> to %s, %s" -msgstr "Переместить <b>центр</b> в %s, %s" +#: ../src/live_effects/lpe-rough-hatches.cpp:230 +#, fuzzy +msgid "2nd side, in:" +msgstr "2-ая сторона, вход:" -#: ../src/seltrans.cpp:1458 -#, c-format +#: ../src/live_effects/lpe-rough-hatches.cpp:230 msgid "" -"<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; " -"with <b>Shift</b> to disable snapping" +"Set smoothness/sharpness of path when reaching a 'top' half-turn. 0=sharp, " +"1=default" msgstr "" -"<b>Перемещение</b> на %s, %s; с <b>Ctrl</b> только по горизонтали/вертикали; " -"с <b>Shift</b> без прилипания" - -#: ../src/shortcuts.cpp:226 -#, fuzzy, c-format -msgid "Keyboard directory (%s) is unavailable." -msgstr "Каталог с палитрами (%s) недоступен." - -#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1299 -#: ../src/ui/dialog/export.cpp:1333 -msgid "Select a filename for exporting" -msgstr "Выберите имя файла для экспорта" +"Установить плавность/остроту контура по достижении им верхнего полуповорота. " +"0 = острый, 1=по умолчанию." -#: ../src/shortcuts.cpp:370 +#: ../src/live_effects/lpe-rough-hatches.cpp:231 #, fuzzy -msgid "Select a file to import" -msgstr "Выберите файл для импорта" +msgid "2nd side, out:" +msgstr "2-ая сторона, выход:" -#: ../src/sp-anchor.cpp:125 -#, c-format -msgid "to %s" +#: ../src/live_effects/lpe-rough-hatches.cpp:231 +msgid "" +"Set smoothness/sharpness of path when leaving a 'top' half-turn. 0=sharp, " +"1=default" msgstr "" +"Установить плавность/остроту контура при уходе от верхнего полуповорота. 0 = " +"острый, 1=по умолчанию." -#: ../src/sp-anchor.cpp:129 +#: ../src/live_effects/lpe-rough-hatches.cpp:232 #, fuzzy -msgid "without URI" -msgstr "<b>Ссылка</b> без URI" +msgid "Magnitude jitter: 1st side:" +msgstr "Колебание величины, 1-ая сторона:" -#: ../src/sp-ellipse.cpp:374 -#, fuzzy -msgid "Segment" -msgstr "Сегмент линии" +#: ../src/live_effects/lpe-rough-hatches.cpp:232 +msgid "Randomly moves 'bottom' half-turns to produce magnitude variations." +msgstr "Случайное перемещение нижних полуповоротов для изменения величины" -#: ../src/sp-ellipse.cpp:376 +#: ../src/live_effects/lpe-rough-hatches.cpp:233 +#: ../src/live_effects/lpe-rough-hatches.cpp:235 +#: ../src/live_effects/lpe-rough-hatches.cpp:237 #, fuzzy -msgid "Arc" -msgstr "Арабский" - -#. Ellipse -#: ../src/sp-ellipse.cpp:379 ../src/sp-ellipse.cpp:386 -#: ../src/ui/dialog/inkscape-preferences.cpp:403 -#: ../src/widgets/pencil-toolbar.cpp:158 -msgid "Ellipse" -msgstr "Эллипс" +msgid "2nd side:" +msgstr "2-ая сторона:" -#: ../src/sp-ellipse.cpp:383 -msgid "Circle" -msgstr "Окружность" +#: ../src/live_effects/lpe-rough-hatches.cpp:233 +msgid "Randomly moves 'top' half-turns to produce magnitude variations." +msgstr "Случайное перемещение верхних полуповоротов для изменения величины" -#. TRANSLATORS: "Flow region" is an area where text is allowed to flow -#: ../src/sp-flowregion.cpp:192 +#: ../src/live_effects/lpe-rough-hatches.cpp:234 #, fuzzy -msgid "Flow Region" -msgstr "Область верстки" +msgid "Parallelism jitter: 1st side:" +msgstr "Колебание параллелизма, 1-ая сторона:" -#. TRANSLATORS: A region "cut out of" a flow region; text is not allowed to flow inside the -#. * flow excluded region. flowRegionExclude in SVG 1.2: see -#. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegion-elem and -#. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegionExclude-elem. -#: ../src/sp-flowregion.cpp:342 -#, fuzzy -msgid "Flow Excluded Region" -msgstr "Область, исключённая из верстки" +#: ../src/live_effects/lpe-rough-hatches.cpp:234 +msgid "" +"Add direction randomness by moving 'bottom' half-turns tangentially to the " +"boundary." +msgstr "" +"Добавить случайность направления путем перемещения нижних полуповоротов по " +"касательной к границе" -#: ../src/sp-flowtext.cpp:289 -#, fuzzy -msgid "Flowed Text" -msgstr "Текст в рамке" +#: ../src/live_effects/lpe-rough-hatches.cpp:235 +msgid "" +"Add direction randomness by randomly moving 'top' half-turns tangentially to " +"the boundary." +msgstr "" +"Добавить случайность направления путем перемещения верхних полуповоротов по " +"касательной к границе" -#: ../src/sp-flowtext.cpp:291 +#: ../src/live_effects/lpe-rough-hatches.cpp:236 #, fuzzy -msgid "Linked Flowed Text" -msgstr "Текст в рамке" - -#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:353 -#: ../src/ui/tools/text-tool.cpp:1566 -msgid " [truncated]" -msgstr " [не уместились]" +msgid "Variance: 1st side:" +msgstr "Вариативность, 1-ая сторона:" -#: ../src/sp-flowtext.cpp:300 -#, fuzzy, c-format -msgid "(%d character%s)" -msgid_plural "(%d characters%s)" -msgstr[0] "Символ >никода:" -msgstr[1] "Символ >никода:" -msgstr[2] "Символ >никода:" +#: ../src/live_effects/lpe-rough-hatches.cpp:236 +msgid "Randomness of 'bottom' half-turns smoothness" +msgstr "Случайность плавности нижних полуповоротов" -#: ../src/sp-guide.cpp:303 -msgid "Create Guides Around the Page" -msgstr "Направляющие вокруг страницы" +#: ../src/live_effects/lpe-rough-hatches.cpp:237 +msgid "Randomness of 'top' half-turns smoothness" +msgstr "Случайность плавности верхних полуповоротов" -#: ../src/sp-guide.cpp:315 ../src/verbs.cpp:2470 -msgid "Delete All Guides" -msgstr "Удаление всех направляющих" +#. +#: ../src/live_effects/lpe-rough-hatches.cpp:239 +msgid "Generate thick/thin path" +msgstr "Менять толщину штрихов" -#. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:475 -msgid "Deleted" -msgstr "Удалено" +#: ../src/live_effects/lpe-rough-hatches.cpp:239 +msgid "Simulate a stroke of varying width" +msgstr "Имитировать смену толщины штриха" -#: ../src/sp-guide.cpp:484 -msgid "" -"<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to " -"delete" -msgstr "" -"<b>Shift+перетаскивание</b> вращает, <b>Ctrl+перетаскивание</b> смещает " -"исходную точку, <b>Del</b> удаляет" +#: ../src/live_effects/lpe-rough-hatches.cpp:240 +msgid "Bend hatches" +msgstr "Изгибать штрихи" -#: ../src/sp-guide.cpp:488 -#, c-format -msgid "vertical, at %s" -msgstr "вертикальная, в позиции %s" +#: ../src/live_effects/lpe-rough-hatches.cpp:240 +msgid "Add a global bend to the hatches (slower)" +msgstr "Добавить глобальное изгибание штрихов (медленнее)" -#: ../src/sp-guide.cpp:491 -#, c-format -msgid "horizontal, at %s" -msgstr "горизонтальная, в позиции %s" +#: ../src/live_effects/lpe-rough-hatches.cpp:241 +#, fuzzy +msgid "Thickness: at 1st side:" +msgstr "Толщина, 1-ая сторона:" -#: ../src/sp-guide.cpp:496 -#, c-format -msgid "at %d degrees, through (%s,%s)" -msgstr "под углом %d градусов, через (%s,%s)" +#: ../src/live_effects/lpe-rough-hatches.cpp:241 +msgid "Width at 'bottom' half-turns" +msgstr "Толщина нижнего полуповорота" -#: ../src/sp-image.cpp:525 -msgid "embedded" -msgstr "включенное" +#: ../src/live_effects/lpe-rough-hatches.cpp:242 +#, fuzzy +msgid "At 2nd side:" +msgstr "2-ая сторона:" -#: ../src/sp-image.cpp:533 -#, fuzzy, c-format -msgid "[bad reference]: %s" -msgstr "Параметры Звезды" +#: ../src/live_effects/lpe-rough-hatches.cpp:242 +msgid "Width at 'top' half-turns" +msgstr "Толщина верхнего полуповорота" -#: ../src/sp-image.cpp:534 -#, fuzzy, c-format -msgid "%d × %d: %s" -msgstr "<b>Изображение</b> %d x %d: %s" +#. +#: ../src/live_effects/lpe-rough-hatches.cpp:244 +#, fuzzy +msgid "From 2nd to 1st side:" +msgstr "От 2-ой к 1-ой стороне:" -#: ../src/sp-item-group.cpp:335 ../src/sp-switch.cpp:82 -#, fuzzy, c-format -msgid "of <b>%d</b> object" -msgstr "<b>Группа</b> из <b>%d</b> объекта" +#: ../src/live_effects/lpe-rough-hatches.cpp:244 +msgid "Width from 'top' to 'bottom'" +msgstr "Толщина штрихов от верхних полуповоротов к нижним" -#: ../src/sp-item-group.cpp:335 ../src/sp-switch.cpp:82 -#, fuzzy, c-format -msgid "of <b>%d</b> objects" -msgstr "<b>Группа</b> из <b>%d</b> объекта" +#: ../src/live_effects/lpe-rough-hatches.cpp:245 +#, fuzzy +msgid "From 1st to 2nd side:" +msgstr "От 1-ой ко 2-ой стороне:" -#: ../src/sp-item.cpp:961 ../src/verbs.cpp:213 -msgid "Object" -msgstr "Объект" +#: ../src/live_effects/lpe-rough-hatches.cpp:245 +msgid "Width from 'bottom' to 'top'" +msgstr "Толщина штрихов от нижних полуповоротов к верхним" -#: ../src/sp-item.cpp:978 -#, c-format -msgid "%s; <i>clipped</i>" -msgstr "%s; <i>под обтравочным контуром</i>" +#: ../src/live_effects/lpe-rough-hatches.cpp:247 +msgid "Hatches width and dir" +msgstr "Толщина и направление штриховки" -#: ../src/sp-item.cpp:984 -#, c-format -msgid "%s; <i>masked</i>" -msgstr "%s; <i>маскирован</i>" +#: ../src/live_effects/lpe-rough-hatches.cpp:247 +msgid "Defines hatches frequency and direction" +msgstr "Частота и направление штриховки" -#: ../src/sp-item.cpp:994 -#, c-format -msgid "%s; <i>filtered (%s)</i>" -msgstr "%s; <i>с фильтром (%s)</i>" +#. +#: ../src/live_effects/lpe-rough-hatches.cpp:249 +msgid "Global bending" +msgstr "Общий изгиб" -#: ../src/sp-item.cpp:996 -#, c-format -msgid "%s; <i>filtered</i>" -msgstr "%s; <i>с фильтром</i>" +#: ../src/live_effects/lpe-rough-hatches.cpp:249 +msgid "" +"Relative position to a reference point defines global bending direction and " +"amount" +msgstr "" +"Относительное положение к исходной точке определяет глобальное направление и " +"силу изгиба" -#: ../src/sp-line.cpp:126 -msgid "Line" -msgstr "Линия" +#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/restack.inx.h:12 +#: ../share/extensions/text_extract.inx.h:8 +#: ../share/extensions/text_merge.inx.h:8 +msgid "Left" +msgstr "Слева" -#: ../src/sp-lpe-item.cpp:262 -msgid "An exception occurred during execution of the Path Effect." -msgstr "Прерывание при выполнении контурного эффекта" +#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/restack.inx.h:14 +#: ../share/extensions/text_extract.inx.h:10 +#: ../share/extensions/text_merge.inx.h:10 +msgid "Right" +msgstr "Справа" -#: ../src/sp-offset.cpp:339 -#, fuzzy -msgid "Linked Offset" -msgstr "С_вязанная втяжка" +#: ../src/live_effects/lpe-ruler.cpp:27 ../src/live_effects/lpe-ruler.cpp:35 +msgid "Both" +msgstr "Оба" -#: ../src/sp-offset.cpp:341 +#: ../src/live_effects/lpe-ruler.cpp:32 #, fuzzy -msgid "Dynamic Offset" -msgstr "_Динамическая втяжка" +msgctxt "Border mark" +msgid "None" +msgstr "Нет" -#. TRANSLATORS COMMENT: %s is either "outset" or "inset" depending on sign -#: ../src/sp-offset.cpp:347 -#, c-format -msgid "%s by %f pt" -msgstr "" +#: ../src/live_effects/lpe-ruler.cpp:33 ../src/widgets/arc-toolbar.cpp:326 +msgid "Start" +msgstr "Начало" -#: ../src/sp-offset.cpp:348 -msgid "outset" -msgstr "оттянута" +#: ../src/live_effects/lpe-ruler.cpp:34 ../src/widgets/arc-toolbar.cpp:339 +msgid "End" +msgstr "Конец" -#: ../src/sp-offset.cpp:348 -msgid "inset" -msgstr "втянута" +#: ../src/live_effects/lpe-ruler.cpp:41 +msgid "_Mark distance:" +msgstr "_Расстояние между метками:" -#: ../src/sp-path.cpp:70 -msgid "Path" -msgstr "Контур" +#: ../src/live_effects/lpe-ruler.cpp:41 +msgid "Distance between successive ruler marks" +msgstr "Расстояние между соседними метками линейки" -#: ../src/sp-path.cpp:95 -#, fuzzy, c-format -msgid ", path effect: %s" -msgstr "Добавить контурный эффект" +#: ../src/live_effects/lpe-ruler.cpp:42 +#: ../share/extensions/foldablebox.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:9 +#: ../share/extensions/layout_nup.inx.h:3 +#: ../share/extensions/printing_marks.inx.h:11 +msgid "Unit:" +msgstr "Единица измерения:" -#: ../src/sp-path.cpp:98 -#, fuzzy, c-format -msgid "%i node%s" -msgstr "Соединение узлов" +#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:201 +msgid "Unit" +msgstr "Единица измерения:" -#: ../src/sp-path.cpp:98 -#, fuzzy, c-format -msgid "%i nodes%s" -msgstr "Соединение узлов" +#: ../src/live_effects/lpe-ruler.cpp:43 +msgid "Ma_jor length:" +msgstr "_Основные метки:" -#: ../src/sp-polygon.cpp:185 -msgid "<b>Polygon</b>" -msgstr "<b>Многоугольник</b>" +#: ../src/live_effects/lpe-ruler.cpp:43 +msgid "Length of major ruler marks" +msgstr "Длина основных меток линейки" -#: ../src/sp-polyline.cpp:131 -msgid "<b>Polyline</b>" -msgstr "<b>Полилиния</b>" +#: ../src/live_effects/lpe-ruler.cpp:44 +msgid "Mino_r length:" +msgstr "_Вспомогательные метки:" -#. Rectangle -#: ../src/sp-rect.cpp:163 ../src/ui/dialog/inkscape-preferences.cpp:393 -msgid "Rectangle" -msgstr "Прямоугольник" +#: ../src/live_effects/lpe-ruler.cpp:44 +msgid "Length of minor ruler marks" +msgstr "Длина вспомогательных меток линейки" -#. Spiral -#: ../src/sp-spiral.cpp:230 ../src/ui/dialog/inkscape-preferences.cpp:411 -#: ../share/extensions/gcodetools_area.inx.h:11 -msgid "Spiral" -msgstr "Спираль" +#: ../src/live_effects/lpe-ruler.cpp:45 +msgid "Major steps_:" +msgstr "_Шаг основных меток:" -#. TRANSLATORS: since turn count isn't an integer, please adjust the -#. string as needed to deal with an localized plural forms. -#: ../src/sp-spiral.cpp:236 -#, fuzzy, c-format -msgid "with %3f turns" -msgstr "<b>Спираль</b> на %3f оборотов" +#: ../src/live_effects/lpe-ruler.cpp:45 +msgid "Draw a major mark every ... steps" +msgstr "Рисовать основные метки каждые .. вспомогательных меток" -#. Star -#: ../src/sp-star.cpp:256 ../src/ui/dialog/inkscape-preferences.cpp:407 -#: ../src/widgets/star-toolbar.cpp:469 -msgid "Star" -msgstr "Звезда" +#: ../src/live_effects/lpe-ruler.cpp:46 +msgid "Shift marks _by:" +msgstr "Ш_аг смещения меток:" -#: ../src/sp-star.cpp:257 ../src/widgets/star-toolbar.cpp:462 -msgid "Polygon" -msgstr "Многоугольник" +#: ../src/live_effects/lpe-ruler.cpp:46 +msgid "Shift marks by this many steps" +msgstr "Смещать метки на это число шагов" -#. while there will never be less than 3 vertices, we still need to -#. make calls to ngettext because the pluralization may be different -#. for various numbers >=3. The singular form is used as the index. -#: ../src/sp-star.cpp:264 -#, fuzzy, c-format -msgid "with %d vertex" -msgstr "<b>Звезда</b> с %d лучом" +#: ../src/live_effects/lpe-ruler.cpp:47 +msgid "Mark direction:" +msgstr "Направление меток:" -#: ../src/sp-star.cpp:264 -#, fuzzy, c-format -msgid "with %d vertices" -msgstr "<b>Звезда</b> с %d лучом" +#: ../src/live_effects/lpe-ruler.cpp:47 +msgid "Direction of marks (when viewing along the path from start to end)" +msgstr "Направление меток (вдоль контура от начала к его концу)" -#: ../src/sp-switch.cpp:76 -msgid "Conditional Group" -msgstr "" +#: ../src/live_effects/lpe-ruler.cpp:48 +msgid "_Offset:" +msgstr "С_мещение:" -#: ../src/sp-text.cpp:326 ../src/verbs.cpp:328 -#: ../share/extensions/lorem_ipsum.inx.h:8 -#: ../share/extensions/replace_font.inx.h:11 -#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 -#: ../share/extensions/text_extract.inx.h:14 -#: ../share/extensions/text_flipcase.inx.h:2 -#: ../share/extensions/text_lowercase.inx.h:2 -#: ../share/extensions/text_merge.inx.h:16 -#: ../share/extensions/text_randomcase.inx.h:2 -#: ../share/extensions/text_sentencecase.inx.h:2 -#: ../share/extensions/text_titlecase.inx.h:2 -#: ../share/extensions/text_uppercase.inx.h:2 -msgid "Text" -msgstr "Текст" +#: ../src/live_effects/lpe-ruler.cpp:48 +msgid "Offset of first mark" +msgstr "Смещение первой метки" -#. TRANSLATORS: For description of font with no name. -#: ../src/sp-text.cpp:343 -msgid "<no name found>" -msgstr "<нет имени>" +#: ../src/live_effects/lpe-ruler.cpp:49 +msgid "Border marks:" +msgstr "Крайние метки:" -#: ../src/sp-text.cpp:357 -#, fuzzy, c-format -msgid "on path%s (%s, %s)" -msgstr "<b>Текст по контуру</b>%s (%s, %s)" +#: ../src/live_effects/lpe-ruler.cpp:49 +msgid "Choose whether to draw marks at the beginning and end of the path" +msgstr "Рисовать ли метки в конце и начале контура" -#: ../src/sp-text.cpp:358 -#, fuzzy, c-format -msgid "%s (%s, %s)" -msgstr "<b>Текст</b>%s (%s, %s)" +#. initialise your parameters here: +#. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), +#: ../src/live_effects/lpe-sketch.cpp:38 +msgid "Strokes:" +msgstr "Штрихов:" -#: ../src/sp-tref.cpp:230 +#: ../src/live_effects/lpe-sketch.cpp:38 +msgid "Draw that many approximating strokes" +msgstr "Количество рисуемых штрихов" + +#: ../src/live_effects/lpe-sketch.cpp:39 #, fuzzy -msgid "Cloned Character Data" -msgstr "<b>Клонированный текст</b> %s%s" +msgid "Max stroke length:" +msgstr "Макс. длина штрихов:" -#: ../src/sp-tref.cpp:246 -msgid " from " -msgstr " из " +#: ../src/live_effects/lpe-sketch.cpp:40 +msgid "Maximum length of approximating strokes" +msgstr "Максимальная длина аппроксимирующих штрихов" -#: ../src/sp-tref.cpp:252 ../src/sp-use.cpp:262 -msgid "[orphaned]" -msgstr "" +#: ../src/live_effects/lpe-sketch.cpp:41 +#, fuzzy +msgid "Stroke length variation:" +msgstr "Вариативность длины штрихов:" -#: ../src/sp-tspan.cpp:217 +#: ../src/live_effects/lpe-sketch.cpp:42 +msgid "Random variation of stroke length (relative to maximum length)" +msgstr "Случайное изменение длины штриха (относительно максимальной длины)" + +#: ../src/live_effects/lpe-sketch.cpp:43 #, fuzzy -msgid "Text Span" -msgstr "Импорт текстовых файлов" +msgid "Max. overlap:" +msgstr "Макс. перекрытие:" -#: ../src/sp-use.cpp:227 +#: ../src/live_effects/lpe-sketch.cpp:44 +msgid "How much successive strokes should overlap (relative to maximum length)" +msgstr "" +"Как много последующих штрихов должно пересечься (относительно максимальной " +"длины)" + +#: ../src/live_effects/lpe-sketch.cpp:45 #, fuzzy -msgid "Symbol" -msgstr "Симво_л" +msgid "Overlap variation:" +msgstr "Вариативность перекрытия:" -#: ../src/sp-use.cpp:230 +#: ../src/live_effects/lpe-sketch.cpp:46 +msgid "Random variation of overlap (relative to maximum overlap)" +msgstr "Случайное изменение перекрытия (относительно максимального перекрытия)" + +#: ../src/live_effects/lpe-sketch.cpp:47 #, fuzzy -msgid "Clone" -msgstr "Склонирована" +msgid "Max. end tolerance:" +msgstr "Макс. концевое отклонение:" -#: ../src/sp-use.cpp:237 ../src/sp-use.cpp:239 -#, c-format -msgid "called %s" +#: ../src/live_effects/lpe-sketch.cpp:48 +msgid "" +"Maximum distance between ends of original and approximating paths (relative " +"to maximum length)" msgstr "" +"Максимальное расстояние между концами исходного и аппроксимирующего контуров " +"(относительно максимальной длины)" -#: ../src/sp-use.cpp:239 +#: ../src/live_effects/lpe-sketch.cpp:49 #, fuzzy -msgid "Unnamed Symbol" -msgstr "Кхмерские символы" +msgid "Average offset:" +msgstr "Среднее смещение:" -#. TRANSLATORS: Used for statusbar description for long <use> chains: -#. * "Clone of: Clone of: ... in Layer 1". -#: ../src/sp-use.cpp:248 -msgid "..." -msgstr "..." +#: ../src/live_effects/lpe-sketch.cpp:50 +msgid "Average distance each stroke is away from the original path" +msgstr "Среднее расстояние между каждым штрихом и исходным контуром" -#: ../src/sp-use.cpp:257 -#, fuzzy, c-format -msgid "of: %s" -msgstr "Ошибка: %s" +#: ../src/live_effects/lpe-sketch.cpp:51 +#, fuzzy +msgid "Max. tremble:" +msgstr "Макс. дрожание:" -#: ../src/splivarot.cpp:70 ../src/splivarot.cpp:76 -msgid "Union" -msgstr "Сумма" +#: ../src/live_effects/lpe-sketch.cpp:52 +msgid "Maximum tremble magnitude" +msgstr "Максимальная величина колебания" -#: ../src/splivarot.cpp:82 -msgid "Intersection" -msgstr "Пересечение" +#: ../src/live_effects/lpe-sketch.cpp:53 +#, fuzzy +msgid "Tremble frequency:" +msgstr "Частота дрожания:" -#: ../src/splivarot.cpp:105 -msgid "Division" -msgstr "Деление" +#: ../src/live_effects/lpe-sketch.cpp:54 +msgid "Average number of tremble periods in a stroke" +msgstr "Среднее количество периодов колебания в штрихе" -#: ../src/splivarot.cpp:110 -msgid "Cut path" -msgstr "Разрезание контура" +#: ../src/live_effects/lpe-sketch.cpp:56 +#, fuzzy +msgid "Construction lines:" +msgstr "Линий конструкции:" -#: ../src/splivarot.cpp:333 -msgid "Select <b>at least 2 paths</b> to perform a boolean operation." -msgstr "Для логической операции нужно выбрать <b>не менее 2 контуров</b>." +#: ../src/live_effects/lpe-sketch.cpp:57 +msgid "How many construction lines (tangents) to draw" +msgstr "Как много касательных линий рисовать" -#: ../src/splivarot.cpp:337 -msgid "Select <b>at least 1 path</b> to perform a boolean union." -msgstr "Для объединения нужно выбрать <b>не менее 1 контура</b>." +#: ../src/live_effects/lpe-sketch.cpp:58 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 +#: ../share/extensions/render_alphabetsoup.inx.h:3 +msgid "Scale:" +msgstr "Масштабирование:" -#: ../src/splivarot.cpp:345 +#: ../src/live_effects/lpe-sketch.cpp:59 msgid "" -"Select <b>exactly 2 paths</b> to perform difference, division, or path cut." +"Scale factor relating curvature and length of construction lines (try " +"5*offset)" msgstr "" -"Выделите <b>ровно 2 контура</b> для операций разности, исключающего ИЛИ, " -"деления и разрезания контура " +"Коэффициент масштабирования, затрагивающий кривизну и длину линий построения " +"(попробуйте 5*смещение)" -#: ../src/splivarot.cpp:361 ../src/splivarot.cpp:376 -msgid "" -"Unable to determine the <b>z-order</b> of the objects selected for " -"difference, XOR, division, or path cut." -msgstr "" -"Невозможно определить <b>порядок расположения друг над другом</b> объектов, " -"выделенных для операций разности, исключающего ИЛИ, деления или разрезания " -"контура." +#: ../src/live_effects/lpe-sketch.cpp:60 +#, fuzzy +msgid "Max. length:" +msgstr "Макс. длина:" -#: ../src/splivarot.cpp:407 -msgid "" -"One of the objects is <b>not a path</b>, cannot perform boolean operation." -msgstr "" -"Один из объектов <b>не является контуром</b>, логическая операция невозможна." +#: ../src/live_effects/lpe-sketch.cpp:60 +msgid "Maximum length of construction lines" +msgstr "Максимальная длина карандашных штрихов" -#: ../src/splivarot.cpp:1157 -msgid "Select <b>stroked path(s)</b> to convert stroke to path." -msgstr "" -"Выделите <b>объекты с обводкой</b> для преобразования обводки в контур." +#: ../src/live_effects/lpe-sketch.cpp:61 +#, fuzzy +msgid "Length variation:" +msgstr "Вариативность длины:" -#: ../src/splivarot.cpp:1516 -msgid "Convert stroke to path" -msgstr "Оконтуривание обводки" +#: ../src/live_effects/lpe-sketch.cpp:61 +msgid "Random variation of the length of construction lines" +msgstr "Случайно варьирование длины карандашных штрихов" -#. TRANSLATORS: "to outline" means "to convert stroke to path" -#: ../src/splivarot.cpp:1519 -msgid "<b>No stroked paths</b> in the selection." -msgstr "В выделении <b>нет контуров с обводкой</b>." +#: ../src/live_effects/lpe-sketch.cpp:62 +#, fuzzy +msgid "Placement randomness:" +msgstr "Случайность размещения" -#: ../src/splivarot.cpp:1590 -msgid "Selected object is <b>not a path</b>, cannot inset/outset." +#: ../src/live_effects/lpe-sketch.cpp:62 +msgid "0: evenly distributed construction lines, 1: purely random placement" msgstr "" -"Выделенный объект <b>не является контуром</b>, втяжка/растяжка невозможны." - -#: ../src/splivarot.cpp:1681 ../src/splivarot.cpp:1746 -msgid "Create linked offset" -msgstr "Создание связанной втяжки" - -#: ../src/splivarot.cpp:1682 ../src/splivarot.cpp:1747 -msgid "Create dynamic offset" -msgstr "Создание динамической втяжки" - -#: ../src/splivarot.cpp:1772 -msgid "Select <b>path(s)</b> to inset/outset." -msgstr "Выделите <b>контур</b> для втяжки/растяжки." - -#: ../src/splivarot.cpp:1968 -msgid "Outset path" -msgstr "Растяжка контура" - -#: ../src/splivarot.cpp:1968 -msgid "Inset path" -msgstr "Втяжка контура" +"0: равномерно расставленные линии конструкции, 1: совершенно случайное " +"размещение" -#: ../src/splivarot.cpp:1970 -msgid "<b>No paths</b> to inset/outset in the selection." -msgstr "В выделении <b>нет контуров</b> для втяжки/растяжки." +#: ../src/live_effects/lpe-sketch.cpp:64 +#, fuzzy +msgid "k_min:" +msgstr "Мин. кривизна" -#: ../src/splivarot.cpp:2132 -msgid "Simplifying paths (separately):" -msgstr "Упрощение контуров (раздельно)" +#: ../src/live_effects/lpe-sketch.cpp:64 +msgid "min curvature" +msgstr "Минимальная кривизна" -#: ../src/splivarot.cpp:2134 -msgid "Simplifying paths:" -msgstr "Упрощение контуров" +#: ../src/live_effects/lpe-sketch.cpp:65 +#, fuzzy +msgid "k_max:" +msgstr "Макс. кривизна" -#: ../src/splivarot.cpp:2171 -#, c-format -msgid "%s <b>%d</b> of <b>%d</b> paths simplified..." -msgstr "%s: <b>%d</b> из <b>%d</b> контуров упрощено..." +#: ../src/live_effects/lpe-sketch.cpp:65 +msgid "max curvature" +msgstr "Максимальная кривизна" -#: ../src/splivarot.cpp:2184 -#, c-format -msgid "<b>%d</b> paths simplified." -msgstr "<b>%d</b> контуров упрощено." +#: ../src/live_effects/lpe-vonkoch.cpp:46 +#, fuzzy +msgid "N_r of generations:" +msgstr "Количество поколений" -#: ../src/splivarot.cpp:2198 -msgid "Select <b>path(s)</b> to simplify." -msgstr "Выделите <b>контур(ы)</b> для упрощения." +#: ../src/live_effects/lpe-vonkoch.cpp:46 +msgid "Depth of the recursion --- keep low!!" +msgstr "Глубина рекурсии — должна быть небольшой!" -#: ../src/splivarot.cpp:2214 -msgid "<b>No paths</b> to simplify in the selection." -msgstr "В выделении <b>нет контуров</b> для упрощения." +#: ../src/live_effects/lpe-vonkoch.cpp:47 +#, fuzzy +msgid "Generating path:" +msgstr "Порождающий контур" -#: ../src/text-chemistry.cpp:94 -msgid "Select <b>a text and a path</b> to put text on path." -msgstr "Выделите <b>текст и контур</b> для размещения текста по контуру." +#: ../src/live_effects/lpe-vonkoch.cpp:47 +msgid "Path whose segments define the iterated transforms" +msgstr "Контур, чьи сегменты определяют итерационные преобразования" -#: ../src/text-chemistry.cpp:99 -msgid "" -"This text object is <b>already put on a path</b>. Remove it from the path " -"first. Use <b>Shift+D</b> to look up its path." -msgstr "" -"Этот текстовый объект <b>уже размещен по контуру</b>. Сначала снимите его с " -"контура. Нажмите <b>Shift-D</b> для перехода к его контуру." +#: ../src/live_effects/lpe-vonkoch.cpp:48 +#, fuzzy +msgid "_Use uniform transforms only" +msgstr "Только однообразные преобразования" -#. rect is the only SPShape which is not <path> yet, and thus SVG forbids us from putting text on it -#: ../src/text-chemistry.cpp:105 +#: ../src/live_effects/lpe-vonkoch.cpp:48 msgid "" -"You cannot put text on a rectangle in this version. Convert rectangle to " -"path first." -msgstr "" -"В этой версии программы нельзя разместить текст по контуру прямоугольника. " -"Преобразуйте прямоугольник в контур и попробуйте снова." - -#: ../src/text-chemistry.cpp:115 -msgid "The flowed text(s) must be <b>visible</b> in order to be put on a path." +"2 consecutive segments are used to reverse/preserve orientation only " +"(otherwise, they define a general transform)." msgstr "" -"Заверстанный текст должен быть <b>видимым</b>, чтобы быть размещенным по " -"контуру." - -#: ../src/text-chemistry.cpp:185 ../src/verbs.cpp:2492 -msgid "Put text on path" -msgstr "Разместить текст по контуру" +"Два последовательных сегмента используются только для разворота/сохранения " +"ориентации (в противном случае они определяют общее преобразование)" -#: ../src/text-chemistry.cpp:197 -msgid "Select <b>a text on path</b> to remove it from path." -msgstr "Выделите <b>текст по контуру</b>, чтобы снять его с контура." +#: ../src/live_effects/lpe-vonkoch.cpp:49 +#, fuzzy +msgid "Dra_w all generations" +msgstr "Рисовать все поколения" -#: ../src/text-chemistry.cpp:218 -msgid "<b>No texts-on-paths</b> in the selection." -msgstr "В выделении нет <b>текстов по контуру</b>." +#: ../src/live_effects/lpe-vonkoch.cpp:49 +msgid "If unchecked, draw only the last generation" +msgstr "Если отключено, рисовать только последнее поколение" -#: ../src/text-chemistry.cpp:221 ../src/verbs.cpp:2494 -msgid "Remove text from path" -msgstr "Снять текст с контура" +#. ,draw_boxes(_("Display boxes"), _("Display boxes instead of paths only"), "draw_boxes", &wr, this, true) +#: ../src/live_effects/lpe-vonkoch.cpp:51 +#, fuzzy +msgid "Reference segment:" +msgstr "Ссылочный сегмент" -#: ../src/text-chemistry.cpp:262 ../src/text-chemistry.cpp:283 -msgid "Select <b>text(s)</b> to remove kerns from." -msgstr "Выделите <b>текст</b> для удаления ручного кернинга." +#: ../src/live_effects/lpe-vonkoch.cpp:51 +msgid "The reference segment. Defaults to the horizontal midline of the bbox." +msgstr "" +"Ссылочный сегмент. По умолчанию равен горизонтальной стороне площадки (BB)." -#: ../src/text-chemistry.cpp:286 -msgid "Remove manual kerns" -msgstr "Убрать ручной кернинг" +#. refA(_("Ref Start"), _("Left side middle of the reference box"), "refA", &wr, this), +#. refB(_("Ref End"), _("Right side middle of the reference box"), "refB", &wr, this), +#. FIXME: a path is used here instead of 2 points to work around path/point param incompatibility bug. +#: ../src/live_effects/lpe-vonkoch.cpp:55 +#, fuzzy +msgid "_Max complexity:" +msgstr "Макс. сложность" -#: ../src/text-chemistry.cpp:306 -msgid "" -"Select <b>a text</b> and one or more <b>paths or shapes</b> to flow text " -"into frame." -msgstr "" -"Выделите <b>текст</b> и <b>контур или фигуру</b> для заверстки текста в " -"рамку." +#: ../src/live_effects/lpe-vonkoch.cpp:55 +msgid "Disable effect if the output is too complex" +msgstr "Отключить эффект, если вывод слишком сложен" -#: ../src/text-chemistry.cpp:376 -msgid "Flow text into shape" -msgstr "Завёрстывание текста в блок" +#: ../src/live_effects/parameter/bool.cpp:67 +msgid "Change bool parameter" +msgstr "Смена логического параметра" -#: ../src/text-chemistry.cpp:398 -msgid "Select <b>a flowed text</b> to unflow it." -msgstr "Выделите <b>текст в рамке</b>, чтобы вынуть его из рамки." +#: ../src/live_effects/parameter/enum.h:47 +msgid "Change enumeration parameter" +msgstr "Смена параметра перечня" -#: ../src/text-chemistry.cpp:472 -msgid "Unflow flowed text" -msgstr "Извлечение текста из блока" +#: ../src/live_effects/parameter/originalpath.cpp:71 +msgid "Link to path" +msgstr "Связать с контуром" -#: ../src/text-chemistry.cpp:484 -msgid "Select <b>flowed text(s)</b> to convert." -msgstr "Выделите <b>завёрстанный текст</b>, чтобы вынуть его из блока." +#: ../src/live_effects/parameter/originalpath.cpp:83 +#, fuzzy +msgid "Select original" +msgstr "Выделить _оригинал" -#: ../src/text-chemistry.cpp:502 -msgid "The flowed text(s) must be <b>visible</b> in order to be converted." -msgstr "" -"Заверстанный текст должен быть <b>видимым</b>, чтобы быть преобразуемым." +#: ../src/live_effects/parameter/parameter.cpp:147 +msgid "Change scalar parameter" +msgstr "Смена скалярного параметра" -#: ../src/text-chemistry.cpp:530 -msgid "Convert flowed text to text" -msgstr "Завёрстанный текст в обычный" +#: ../src/live_effects/parameter/path.cpp:170 +msgid "Edit on-canvas" +msgstr "Изменить на холсте" -#: ../src/text-chemistry.cpp:535 -msgid "<b>No flowed text(s)</b> to convert in the selection." -msgstr "В выделении <b>нет завёрстанного текста</b>, преобразуемого в обычный." +#: ../src/live_effects/parameter/path.cpp:180 +msgid "Copy path" +msgstr "Скопировать контур" -#: ../src/text-editing.cpp:44 -msgid "You cannot edit <b>cloned character data</b>." -msgstr "Вы не можете редактировать <b>склонированный текст</b>." +#: ../src/live_effects/parameter/path.cpp:190 +msgid "Paste path" +msgstr "Вставить контур" -#: ../src/tools-switch.cpp:91 +#: ../src/live_effects/parameter/path.cpp:200 #, fuzzy -msgid "" -"<b>Click</b> to Select and Transform objects, <b>Drag</b> to select many " -"objects." -msgstr "" -"<b>Щелчком</b> выделяется ветвь, <b>перетаскиванием</b> меняется порядок." +msgid "Link to path on clipboard" +msgstr "В буфере обмена ничего нет." -#: ../src/tools-switch.cpp:92 -#, fuzzy -msgid "Modify selected path points (nodes) directly." -msgstr "Упростить выделенные контуры удалением лишних узлов" +#: ../src/live_effects/parameter/path.cpp:443 +msgid "Paste path parameter" +msgstr "Вставить параметр контура" -#: ../src/tools-switch.cpp:93 -msgid "To tweak a path by pushing, select it and drag over it." -msgstr "Для коррекции контура толканием, выберите и проведите по нему мышью" +#: ../src/live_effects/parameter/path.cpp:475 +msgid "Link path parameter to path" +msgstr "Связать параметр контура с контуром" -#: ../src/tools-switch.cpp:94 -#, fuzzy -msgid "" -"<b>Drag</b>, <b>click</b> or <b>click and scroll</b> to spray the selected " -"objects." -msgstr "" -"<b>Щелчок</b> или <b>щелчок + перетаскивание</b> закрывают этот контур." +#: ../src/live_effects/parameter/point.cpp:89 +msgid "Change point parameter" +msgstr "Смена точечного параметра" -#: ../src/tools-switch.cpp:95 +#: ../src/live_effects/parameter/powerstrokepointarray.cpp:229 +#: ../src/live_effects/parameter/powerstrokepointarray.cpp:241 msgid "" -"<b>Drag</b> to create a rectangle. <b>Drag controls</b> to round corners and " -"resize. <b>Click</b> to select." +"<b>Stroke width control point</b>: drag to alter the stroke width. <b>Ctrl" +"+click</b> adds a control point, <b>Ctrl+Alt+click</b> deletes it." msgstr "" -"<b>Перетаскивание</b> рисует прямоугольник. <b>Перетаскивание ручек</b> " -"меняет размер и закругляет углы. <b>Щелчок</b> по объекту выделяет его." -#: ../src/tools-switch.cpp:96 -msgid "" -"<b>Drag</b> to create a 3D box. <b>Drag controls</b> to resize in " -"perspective. <b>Click</b> to select (with <b>Ctrl+Alt</b> for single faces)." -msgstr "" -"<b>Перетаскивание</b> рисует параллелепипед. <b>Перетаскивание рычагов</b> " -"меняет перспективу. <b>Щелчком</b> выделяются стороны объекта." +#: ../src/live_effects/parameter/random.cpp:134 +msgid "Change random parameter" +msgstr "Смена случайного параметра" -#: ../src/tools-switch.cpp:97 -msgid "" -"<b>Drag</b> to create an ellipse. <b>Drag controls</b> to make an arc or " -"segment. <b>Click</b> to select." -msgstr "" -"<b>Перетаскивание</b> рисует эллипс. <b>Перетаскивание ручек</b> делает дугу " -"или сегмент. <b>Щелчок</b> по объекту выделяет его." +#: ../src/live_effects/parameter/text.cpp:100 +msgid "Change text parameter" +msgstr "Смена текстового параметра" -#: ../src/tools-switch.cpp:98 -msgid "" -"<b>Drag</b> to create a star. <b>Drag controls</b> to edit the star shape. " -"<b>Click</b> to select." -msgstr "" -"<b>Перетаскивание</b> рисует звезду. <b>Перетаскивание ручек</b> меняет ее " -"форму. <b>Щелчок</b> по объекту выделяет его." +#: ../src/live_effects/parameter/unit.cpp:80 +msgid "Change unit parameter" +msgstr "Смена параметра единицы измерения" -#: ../src/tools-switch.cpp:99 -msgid "" -"<b>Drag</b> to create a spiral. <b>Drag controls</b> to edit the spiral " -"shape. <b>Click</b> to select." -msgstr "" -"<b>Перетаскивание</b> рисует спираль. <b>Перетаскивание ручек</b> меняет ее " -"форму. <b>Щелчок</b> по объекту выделяет его." +#: ../src/live_effects/parameter/vector.cpp:99 +#, fuzzy +msgid "Change vector parameter" +msgstr "Смена текстового параметра" -#: ../src/tools-switch.cpp:100 -msgid "" -"<b>Drag</b> to create a freehand line. <b>Shift</b> appends to selected " -"path, <b>Alt</b> activates sketch mode." -msgstr "" -"<b>Перетаскиванием</b> рисуется произвольная линия. <b>Shift</b> " -"присоединяет линию к выделенному контуру, <b>Alt</b> активирует эскизный " -"режим." +#: ../src/main-cmdlineact.cpp:50 +#, c-format +msgid "Unable to find verb ID '%s' specified on the command line.\n" +msgstr "Не удалось найти ID команды '%s', указанный, в командной строке.\n" -#: ../src/tools-switch.cpp:101 -msgid "" -"<b>Click</b> or <b>click and drag</b> to start a path; with <b>Shift</b> to " -"append to selected path. <b>Ctrl+click</b> to create single dots (straight " -"line modes only)." -msgstr "" -"<b>Щелчок</b> и <b>щелчок с перетаскиванием</b> начинают контур. С <b>Shift</" -"b> линия добавляется к выделенному контуру. <b>Ctrl+щелчок</b> рисует точку " -"(только в режиме рисования прямых линий)." +#: ../src/main-cmdlineact.cpp:61 +#, c-format +msgid "Unable to find node ID: '%s'\n" +msgstr "Невозможно найти ID узла: '%s'\n" -#: ../src/tools-switch.cpp:102 -msgid "" -"<b>Drag</b> to draw a calligraphic stroke; with <b>Ctrl</b> to track a guide " -"path. <b>Arrow keys</b> adjust width (left/right) and angle (up/down)." -msgstr "" -"<b>Перетаскивание</b> рисует каллиграфический штрих; с <b>Ctrl</b> — " -"отслеживание направляющего контура. <b>Клавиши-стрелки</b> меняют ширину " -"(влево/вправо) и угол (вверх/вниз) пера." +#: ../src/main.cpp:295 +msgid "Print the Inkscape version number" +msgstr "Напечатать версию Inkscape" -#: ../src/tools-switch.cpp:103 ../src/ui/tools/text-tool.cpp:1593 -msgid "" -"<b>Click</b> to select or create text, <b>drag</b> to create flowed text; " -"then type." -msgstr "" -"<b>Щелчок</b> выделяет или создает текст, <b>перетаскивание</b> создает " -"текст в рамке; после этого можно набирать текст." +#: ../src/main.cpp:300 +msgid "Do not use X server (only process files from console)" +msgstr "Не использовать X сервер (допустимы только консольные операции)" -#: ../src/tools-switch.cpp:104 -msgid "" -"<b>Drag</b> or <b>double click</b> to create a gradient on selected objects, " -"<b>drag handles</b> to adjust gradients." +#: ../src/main.cpp:305 +msgid "Try to use X server (even if $DISPLAY is not set)" msgstr "" -"Новый градиент для выделенного объекта создается <b>перетаскиванием</b> или " -"<b>двойным щелчком</b> и корректируется <b>перетаскиванием за ручки</b>." +"Пытаться использовать X сервер (даже если переменная $DISPLAY не установлена)" -#: ../src/tools-switch.cpp:105 -#, fuzzy -msgid "" -"<b>Drag</b> or <b>double click</b> to create a mesh on selected objects, " -"<b>drag handles</b> to adjust meshes." -msgstr "" -"Новый градиент для выделенного объекта создается <b>перетаскиванием</b> или " -"<b>двойным щелчком</b> и корректируется <b>перетаскиванием за ручки</b>." +#: ../src/main.cpp:310 +msgid "Open specified document(s) (option string may be excluded)" +msgstr "Открыть указанные документы (строка параметра может быть исключена)" -#: ../src/tools-switch.cpp:106 -msgid "" -"<b>Click</b> or <b>drag around an area</b> to zoom in, <b>Shift+click</b> to " -"zoom out." -msgstr "" -"<b>Щелчок</b> или <b>обведение рамкой</b> приближают, <b>Shift+щелчок</b> " -"отдаляет холст." +#: ../src/main.cpp:311 ../src/main.cpp:316 ../src/main.cpp:321 +#: ../src/main.cpp:393 ../src/main.cpp:398 ../src/main.cpp:403 +#: ../src/main.cpp:414 ../src/main.cpp:430 ../src/main.cpp:435 +msgid "FILENAME" +msgstr "FILENAME" -#: ../src/tools-switch.cpp:107 -msgid "<b>Drag</b> to measure the dimensions of objects." +#: ../src/main.cpp:315 +msgid "Print document(s) to specified output file (use '| program' for pipe)" msgstr "" +"Напечатать документ(ы) в указанный файл (используйте '| program' для " +"передачи программе)" -#: ../src/tools-switch.cpp:108 ../src/ui/tools/dropper-tool.cpp:285 +#: ../src/main.cpp:320 +msgid "Export document to a PNG file" +msgstr "Экспортировать документ в файл PNG" + +#: ../src/main.cpp:325 msgid "" -"<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to " -"average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> " -"to copy the color under mouse to clipboard" +"Resolution for exporting to bitmap and for rasterization of filters in PS/" +"EPS/PDF (default 90)" msgstr "" -"<b>Щелчок</b> меняет цвет заполнения, <b>Shift+щелчок</b> меняет цвет " -"обводки. <b>Перетаскивание</b> вычисляет средний цвет области. <b>Alt</b> " -"берет обратный цвет. <b>Ctrl+C</b> копирует в буфер цвет под курсором." +"Разрешение для экспорта в растр и растеризации фильтров в PS/EPS/PDF (по " +"умолчанию равно 90dpi)" -#: ../src/tools-switch.cpp:109 -msgid "<b>Click and drag</b> between shapes to create a connector." -msgstr "" -"<b>Щелчок с перетаскиванием</b> между фигурами создают линию соединения." +#: ../src/main.cpp:326 ../src/ui/widget/rendering-options.cpp:37 +msgid "DPI" +msgstr "DPI" -#: ../src/tools-switch.cpp:110 +#: ../src/main.cpp:330 msgid "" -"<b>Click</b> to paint a bounded area, <b>Shift+click</b> to union the new " -"fill with the current selection, <b>Ctrl+click</b> to change the clicked " -"object's fill and stroke to the current setting." +"Exported area in SVG user units (default is the page; 0,0 is lower-left " +"corner)" msgstr "" -"<b>Щёлкните</b> для рисования замкнутой области, <b>Shift+щелчок</b> для " -"объединения новой заливки с активным выделением, <b>Ctrl+щелчок</b> для " -"смены заливки и обводки щелкнутого объекта до текущих параметров" - -#: ../src/tools-switch.cpp:111 -msgid "<b>Drag</b> to erase." -msgstr "Нажмите клавишу и <b>перетащите</b> курсор для стирания" - -#: ../src/tools-switch.cpp:112 -msgid "Choose a subtool from the toolbar" -msgstr "Выберите режим инструмента из его контекстной панели" - -#: ../src/trace/potrace/inkscape-potrace.cpp:512 -#: ../src/trace/potrace/inkscape-potrace.cpp:575 -#, fuzzy -msgid "Trace: %1. %2 nodes" -msgstr "Векторизация: %d. Узлов - %ld" +"Экспортируемая область в пользовательских единицах измерения SVG (по " +"умолчанию — вся страница; 0,0 — левый нижний угол)" -#: ../src/trace/trace.cpp:59 ../src/trace/trace.cpp:124 -#: ../src/trace/trace.cpp:132 ../src/trace/trace.cpp:225 -#: ../src/ui/dialog/pixelartdialog.cpp:370 -#: ../src/ui/dialog/pixelartdialog.cpp:402 -msgid "Select an <b>image</b> to trace" -msgstr "Выделите <b>растровое изображение</b> для векторизации" +#: ../src/main.cpp:331 +msgid "x0:y0:x1:y1" +msgstr "x0:y0:x1:y1" -#: ../src/trace/trace.cpp:94 -msgid "Select only one <b>image</b> to trace" -msgstr "Выделите <b>растровое изображение</b> для векторизации" +#: ../src/main.cpp:335 +msgid "Exported area is the entire drawing (not page)" +msgstr "Экспортируемая область включает в себя весь рисунок (а не страницу)" -#: ../src/trace/trace.cpp:112 -msgid "Select one image and one or more shapes above it" -msgstr "Выберите изображение и один или более объектов над ним" +#: ../src/main.cpp:340 +msgid "Exported area is the entire page" +msgstr "Экспортируемая область включает в себя всю страницу" -#: ../src/trace/trace.cpp:216 -msgid "Trace: No active desktop" -msgstr "Векторизация: нет активного рабочего стола" +#: ../src/main.cpp:345 +msgid "Only for PS/EPS/PDF, sets margin in mm around exported area (default 0)" +msgstr "" -#: ../src/trace/trace.cpp:313 -msgid "Invalid SIOX result" -msgstr "Некорректный результат SIOX" +#: ../src/main.cpp:346 ../src/main.cpp:388 +msgid "VALUE" +msgstr "VALUE" -#: ../src/trace/trace.cpp:406 -msgid "Trace: No active document" -msgstr "Векторизация: нет активного документа" +#: ../src/main.cpp:350 +msgid "" +"Snap the bitmap export area outwards to the nearest integer values (in SVG " +"user units)" +msgstr "" +"Расширить область экспортируемого растра до ближайших целых значений (в " +"единицах SVG)" -#: ../src/trace/trace.cpp:438 -msgid "Trace: Image has no bitmap data" -msgstr "Векторизация: в изображении нет растровых данных" +#: ../src/main.cpp:355 +msgid "The width of exported bitmap in pixels (overrides export-dpi)" +msgstr "Ширина экспортируемого растра в точках (отменяет export-dpi)" -#: ../src/trace/trace.cpp:445 -msgid "Trace: Starting trace..." -msgstr "Векторизация: запуск векторизации..." +#: ../src/main.cpp:356 +msgid "WIDTH" +msgstr "WIDTH" -#. ## inform the document, so we can undo -#: ../src/trace/trace.cpp:548 -msgid "Trace bitmap" -msgstr "Векторизация растра" +#: ../src/main.cpp:360 +msgid "The height of exported bitmap in pixels (overrides export-dpi)" +msgstr "Высота экспортируемого растра в точках (отменяет export-dpi)" -#: ../src/trace/trace.cpp:552 -#, c-format -msgid "Trace: Done. %ld nodes created" -msgstr "Векторизация: Готово. Создано узлов: %ld" +#: ../src/main.cpp:361 +msgid "HEIGHT" +msgstr "HEIGHT" -#. check whether something is selected -#: ../src/ui/clipboard.cpp:261 -msgid "Nothing was copied." -msgstr "Ничего не было скопировано." +#: ../src/main.cpp:365 +msgid "The ID of the object to export" +msgstr "Идентификатор экспортируемого объекта" -#: ../src/ui/clipboard.cpp:374 ../src/ui/clipboard.cpp:583 -#: ../src/ui/clipboard.cpp:612 -msgid "Nothing on the clipboard." -msgstr "В буфере обмена ничего нет." +#: ../src/main.cpp:366 ../src/main.cpp:479 +#: ../src/ui/dialog/inkscape-preferences.cpp:1507 +msgid "ID" +msgstr "ID" -#: ../src/ui/clipboard.cpp:432 -msgid "Select <b>object(s)</b> to paste style to." -msgstr "Выделите <b>объект(ы)</b> для применения стиля." +#. TRANSLATORS: this means: "Only export the object whose id is given in --export-id". +#. See "man inkscape" for details. +#: ../src/main.cpp:372 +msgid "" +"Export just the object with export-id, hide all others (only with export-id)" +msgstr "" +"Экспортировать только объект с заданным export-id, скрыв все прочие объекты " +"(только с опцией export-id)" -#: ../src/ui/clipboard.cpp:443 ../src/ui/clipboard.cpp:460 -msgid "No style on the clipboard." -msgstr "В буфере обмена нет стиля." +#: ../src/main.cpp:377 +msgid "Use stored filename and DPI hints when exporting (only with export-id)" +msgstr "" +"Использовать сохраненное имя файла и разрешение при экспорте (только с " +"опцией export-id)" -#: ../src/ui/clipboard.cpp:485 -msgid "Select <b>object(s)</b> to paste size to." -msgstr "Выделите <b>объект(ы)</b> для применения размера." +#: ../src/main.cpp:382 +msgid "Background color of exported bitmap (any SVG-supported color string)" +msgstr "" +"Фоновый цвет для экспорта растра (любая поддерживаемая в SVG цветовая строка)" -#: ../src/ui/clipboard.cpp:492 -msgid "No size on the clipboard." -msgstr "В буфере обмена нет размера." +#: ../src/main.cpp:383 +msgid "COLOR" +msgstr "COLOR" -#: ../src/ui/clipboard.cpp:545 -msgid "Select <b>object(s)</b> to paste live path effect to." +#: ../src/main.cpp:387 +msgid "Background opacity of exported bitmap (either 0.0 to 1.0, or 1 to 255)" msgstr "" -"Выделите <b>объект(ы)</b> для применения динамического контурного эффекта." - -#. no_effect: -#: ../src/ui/clipboard.cpp:570 -msgid "No effect on the clipboard." -msgstr "В буфере обмена нет эффекта." +"Непрозрачность фона для экспорта растра (от 0.0 до 1.0 либо от 1 до 255)" -#: ../src/ui/clipboard.cpp:589 ../src/ui/clipboard.cpp:626 -msgid "Clipboard does not contain a path." -msgstr "В буфере обмена нет контура" +#: ../src/main.cpp:392 +msgid "Export document to plain SVG file (no sodipodi or inkscape namespaces)" +msgstr "" +"Экспортировать документ в формат чистый SVG (без пространств имен sodipodi: " +"или inkscape:)" -#. * -#. * Constructor -#. -#: ../src/ui/dialog/aboutbox.cpp:80 -msgid "About Inkscape" -msgstr "Об Inkscape" +#: ../src/main.cpp:397 +msgid "Export document to a PS file" +msgstr "Экспортировать документ в файл PS" -#: ../src/ui/dialog/aboutbox.cpp:91 -msgid "_Splash" -msgstr "За_ставка" +#: ../src/main.cpp:402 +msgid "Export document to an EPS file" +msgstr "Экспортировать документ в файл EPS" -#: ../src/ui/dialog/aboutbox.cpp:95 -msgid "_Authors" -msgstr "_Авторы" +#: ../src/main.cpp:407 +msgid "" +"Choose the PostScript Level used to export. Possible choices are 2 (the " +"default) and 3" +msgstr "" -#: ../src/ui/dialog/aboutbox.cpp:97 -msgid "_Translators" -msgstr "Пере_водчики" +#: ../src/main.cpp:409 +#, fuzzy +msgid "PS Level" +msgstr "Уровни" -#: ../src/ui/dialog/aboutbox.cpp:99 -msgid "_License" -msgstr "_Лицензия" +#: ../src/main.cpp:413 +msgid "Export document to a PDF file" +msgstr "Экспортировать документ в файл PDF" -#. TRANSLATORS: This is the filename of the `About Inkscape' picture in -#. the `screens' directory. Thus the translation of "about.svg" should be -#. the filename of its translated version, e.g. about.zh.svg for Chinese. -#. -#. N.B. about.svg changes once per release. (We should probably rename -#. the original to about-0.40.svg etc. as soon as we have a translation. -#. If we do so, then add an item to release-checklist saying that the -#. string here should be changed.) -#. FIXME? INKSCAPE_SCREENSDIR and "about.svg" are in UTF-8, not the -#. native filename encoding... and the filename passed to sp_document_new -#. should be in UTF-*8.. -#: ../src/ui/dialog/aboutbox.cpp:166 -msgid "about.svg" -msgstr "about.svg" +#. TRANSLATORS: "--export-pdf-version" is an Inkscape command line option; see "inkscape --help" +#: ../src/main.cpp:419 +msgid "" +"Export PDF to given version. (hint: make sure to input the exact string " +"found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)" +msgstr "" -#. TRANSLATORS: Put here your name (and other national contributors') -#. one per line in the form of: name surname (email). Use \n for newline. -#: ../src/ui/dialog/aboutbox.cpp:416 -msgid "translator-credits" +#: ../src/main.cpp:420 +msgid "PDF_VERSION" msgstr "" -"Valek Filippov (frob@df.ru), 2000, 2003.\n" -"Vitaly Lipatov (lav@altlinux.ru), 2002, 2004.\n" -"Alexey Remizov (alexey@remizov.pp.ru), 2004.\n" -"bulia byak (buliabyak@users.sf.net), 2004.\n" -"Alexandre Prokoudine (alexandre.prokoudine@gmail.com), 2004-2010." -#: ../src/ui/dialog/align-and-distribute.cpp:171 -#: ../src/ui/dialog/align-and-distribute.cpp:852 -msgid "Align" -msgstr "Выровнять" +#: ../src/main.cpp:424 +msgid "" +"Export PDF/PS/EPS without text. Besides the PDF/PS/EPS, a LaTeX file is " +"exported, putting the text on top of the PDF/PS/EPS file. Include the result " +"in LaTeX like: \\input{latexfile.tex}" +msgstr "" +"Экспортировать PDF/PS/EPS без текста. Помимо файла PDF/PS/EPS создаётся файл " +"LaTeX, в котором текст помещается поверх рисунка из файла PDF/PS/EPS. " +"Полученный файл LaTeX вставляется в другие примерно так:: \\input{latexfile." +"tex}" -#: ../src/ui/dialog/align-and-distribute.cpp:341 -#: ../src/ui/dialog/align-and-distribute.cpp:853 -msgid "Distribute" -msgstr "Расставить" +#: ../src/main.cpp:429 +msgid "Export document to an Enhanced Metafile (EMF) File" +msgstr "Экспортировать документ в файл Enhanced Metafile (EMF)" -#: ../src/ui/dialog/align-and-distribute.cpp:420 -msgid "Minimum horizontal gap (in px units) between bounding boxes" -msgstr "Минимальный горизонтальный интервал между рамками (в пикселах)" +#: ../src/main.cpp:434 +#, fuzzy +msgid "Export document to a Windows Metafile (WMF) File" +msgstr "Экспортировать документ в файл Enhanced Metafile (EMF)" -#. TRANSLATORS: "H:" stands for horizontal gap -#: ../src/ui/dialog/align-and-distribute.cpp:422 -msgctxt "Gap" -msgid "_H:" -msgstr "_Г:" +#: ../src/main.cpp:439 +#, fuzzy +msgid "Convert text object to paths on export (PS, EPS, PDF, SVG)" +msgstr "Преобразовать текст в контуры при экспорте (PS. EPS, PDF)" -#: ../src/ui/dialog/align-and-distribute.cpp:430 -msgid "Minimum vertical gap (in px units) between bounding boxes" -msgstr "Минимальный вертикальный интервал между рамками (в пикселах)" +#: ../src/main.cpp:444 +msgid "" +"Render filtered objects without filters, instead of rasterizing (PS, EPS, " +"PDF)" +msgstr "" +"Отрисовать объекты с фильтрами без оных вместо растеризации (PS, EPS, PDF)" -#. TRANSLATORS: Vertical gap -#: ../src/ui/dialog/align-and-distribute.cpp:432 -msgctxt "Gap" -msgid "_V:" -msgstr "_В:" +#. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" +#: ../src/main.cpp:450 +msgid "" +"Query the X coordinate of the drawing or, if specified, of the object with --" +"query-id" +msgstr "Запросить X координату рисунка или, если задано, объекта с --query-id" -#: ../src/ui/dialog/align-and-distribute.cpp:468 -#: ../src/ui/dialog/align-and-distribute.cpp:855 -#: ../src/widgets/connector-toolbar.cpp:411 -msgid "Remove overlaps" -msgstr "Убрать перекрытия" +#. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" +#: ../src/main.cpp:456 +msgid "" +"Query the Y coordinate of the drawing or, if specified, of the object with --" +"query-id" +msgstr "Запросить Y координату рисунка или, если задано, объекта с --query-id" -#: ../src/ui/dialog/align-and-distribute.cpp:499 -#: ../src/widgets/connector-toolbar.cpp:240 -msgid "Arrange connector network" -msgstr "Гармоничная расстановка связанных объектов" +#. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" +#: ../src/main.cpp:462 +msgid "" +"Query the width of the drawing or, if specified, of the object with --query-" +"id" +msgstr "" +"Запросить ширину рисунка или, если задано, объекта — при помощи --query-id" -#: ../src/ui/dialog/align-and-distribute.cpp:592 -msgid "Exchange Positions" -msgstr "Поменять объекты местами" +#. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" +#: ../src/main.cpp:468 +msgid "" +"Query the height of the drawing or, if specified, of the object with --query-" +"id" +msgstr "Запросить высоту рисунка или, если задано, объекта с --query-id" -#: ../src/ui/dialog/align-and-distribute.cpp:626 -msgid "Unclump" -msgstr "Разровнять" +#: ../src/main.cpp:473 +msgid "List id,x,y,w,h for all objects" +msgstr "Перечислить id,x,y,w,h для всех объектов" -#: ../src/ui/dialog/align-and-distribute.cpp:698 -msgid "Randomize positions" -msgstr "Случайное расположение объектов" +#: ../src/main.cpp:478 +msgid "The ID of the object whose dimensions are queried" +msgstr "Идентификатор объекта для запроса" -#: ../src/ui/dialog/align-and-distribute.cpp:801 -msgid "Distribute text baselines" -msgstr "Расстановка линий шрифта текста" +#. TRANSLATORS: this option makes Inkscape print the name (path) of the extension directory +#: ../src/main.cpp:484 +msgid "Print out the extension directory and exit" +msgstr "Вывести на экран каталог расширения и выйти" -#: ../src/ui/dialog/align-and-distribute.cpp:824 -msgid "Align text baselines" -msgstr "Выравнивание линий шрифта текста" +#: ../src/main.cpp:489 +msgid "Remove unused definitions from the defs section(s) of the document" +msgstr "Убрать лишние определения из раздела <defs> документа" -#: ../src/ui/dialog/align-and-distribute.cpp:854 -msgid "Rearrange" -msgstr "Переставить" +#: ../src/main.cpp:495 +msgid "Enter a listening loop for D-Bus messages in console mode" +msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:856 -#: ../src/widgets/toolbox.cpp:1728 -msgid "Nodes" -msgstr "Узлы" +#: ../src/main.cpp:500 +msgid "" +"Specify the D-Bus bus name to listen for messages on (default is org." +"inkscape)" +msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:870 -msgid "Relative to: " -msgstr "Ориентир: " +#: ../src/main.cpp:501 +msgid "BUS-NAME" +msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:871 -msgid "_Treat selection as group: " -msgstr "С_читать выделение группой: " +#: ../src/main.cpp:506 +msgid "List the IDs of all the verbs in Inkscape" +msgstr "Вывести список ID всех действий Inkscape" -#. Align -#: ../src/ui/dialog/align-and-distribute.cpp:877 ../src/verbs.cpp:2937 -#: ../src/verbs.cpp:2938 -msgid "Align right edges of objects to the left edge of the anchor" -msgstr "Выровнять правые края объектов к левому краю якоря" +#: ../src/main.cpp:511 +msgid "Verb to call when Inkscape opens." +msgstr "Вызываемое действие при открытии Inkscape." -#: ../src/ui/dialog/align-and-distribute.cpp:880 ../src/verbs.cpp:2939 -#: ../src/verbs.cpp:2940 -msgid "Align left edges" -msgstr "Выровнять левые края объектов" +#: ../src/main.cpp:512 +msgid "VERB-ID" +msgstr "ДЕЙСТВИЕ-ID" -#: ../src/ui/dialog/align-and-distribute.cpp:883 ../src/verbs.cpp:2941 -#: ../src/verbs.cpp:2942 -msgid "Center on vertical axis" -msgstr "Центрировать на вертикальной оси" +#: ../src/main.cpp:516 +msgid "Object ID to select when Inkscape opens." +msgstr "ID объекта, выделяемого при открытии документа в Inkscape." -#: ../src/ui/dialog/align-and-distribute.cpp:886 ../src/verbs.cpp:2943 -#: ../src/verbs.cpp:2944 -msgid "Align right sides" -msgstr "Выровнять правые края объектов" +#: ../src/main.cpp:517 +msgid "OBJECT-ID" +msgstr "ОБЪЕКТ-ID" -#: ../src/ui/dialog/align-and-distribute.cpp:889 ../src/verbs.cpp:2945 -#: ../src/verbs.cpp:2946 -msgid "Align left edges of objects to the right edge of the anchor" -msgstr "Выровнять левые края объектов по правому краю якоря" +#: ../src/main.cpp:521 +msgid "Start Inkscape in interactive shell mode." +msgstr "Запустить Inkscape в интерактивном командном режиме" -#: ../src/ui/dialog/align-and-distribute.cpp:892 ../src/verbs.cpp:2947 -#: ../src/verbs.cpp:2948 -msgid "Align bottom edges of objects to the top edge of the anchor" -msgstr "Выровнять нижние края объектов по верхнему краю якоря" +#: ../src/main.cpp:871 ../src/main.cpp:1283 +msgid "" +"[OPTIONS...] [FILE...]\n" +"\n" +"Available options:" +msgstr "" +"[ПАРАМЕТРЫ...] [ФАЙЛ...]\n" +"\n" +"Доступные параметры:" -#: ../src/ui/dialog/align-and-distribute.cpp:895 ../src/verbs.cpp:2949 -#: ../src/verbs.cpp:2950 -msgid "Align top edges" -msgstr "Выровнять верхние края объектов" +#. ## Add a menu for clear() +#: ../src/menus-skeleton.h:16 ../src/ui/dialog/debug.cpp:83 +msgid "_File" +msgstr "_Файл" -#: ../src/ui/dialog/align-and-distribute.cpp:898 ../src/verbs.cpp:2951 -#: ../src/verbs.cpp:2952 -msgid "Center on horizontal axis" -msgstr "Центрировать на горизонтальной оси" +#: ../src/menus-skeleton.h:17 +msgid "_New" +msgstr "_Создать" -#: ../src/ui/dialog/align-and-distribute.cpp:901 ../src/verbs.cpp:2953 -#: ../src/verbs.cpp:2954 -msgid "Align bottom edges" -msgstr "Выровнять нижние края объектов" +#. " <verb verb-id=\"FileExportToOCAL\" />\n" +#. " <verb verb-id=\"DialogMetadata\" />\n" +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2634 ../src/verbs.cpp:2640 +msgid "_Edit" +msgstr "_Правка" -#: ../src/ui/dialog/align-and-distribute.cpp:904 ../src/verbs.cpp:2955 -#: ../src/verbs.cpp:2956 -msgid "Align top edges of objects to the bottom edge of the anchor" -msgstr "Выровнять верхние края объектов по нижнему краю якоря" +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2398 +msgid "Paste Si_ze" +msgstr "Вставить _размер" -#: ../src/ui/dialog/align-and-distribute.cpp:909 -msgid "Align baseline anchors of texts horizontally" -msgstr "Выровнять текстовые опорные точки по горизонтали" +#: ../src/menus-skeleton.h:65 +msgid "Clo_ne" +msgstr "Клон_ы" -#: ../src/ui/dialog/align-and-distribute.cpp:912 -msgid "Align baselines of texts" -msgstr "Выровнять линии шрифта текстовых блоков" +#: ../src/menus-skeleton.h:79 +msgid "Select Sa_me" +msgstr "Выбрат_ь одинаковые" -#: ../src/ui/dialog/align-and-distribute.cpp:917 -msgid "Make horizontal gaps between objects equal" -msgstr "Выровнять интервалы между объектами по горизонтали" +#: ../src/menus-skeleton.h:97 +msgid "_View" +msgstr "_Вид" -#: ../src/ui/dialog/align-and-distribute.cpp:921 -msgid "Distribute left edges equidistantly" -msgstr "Равноудаленно расставить левые края объектов" +#: ../src/menus-skeleton.h:98 +msgid "_Zoom" +msgstr "_Масштаб" -#: ../src/ui/dialog/align-and-distribute.cpp:924 -msgid "Distribute centers equidistantly horizontally" -msgstr "Равноудаленно расставить центры объектов по горизонтали" +#: ../src/menus-skeleton.h:114 +msgid "_Display mode" +msgstr "Подробность просмотр_а" -#: ../src/ui/dialog/align-and-distribute.cpp:927 -msgid "Distribute right edges equidistantly" -msgstr "Равноудаленно расставить правые края объектов объектов" +#. Better location in menu needs to be found +#. " <verb verb-id=\"ViewModePrintColorsPreview\" radio=\"yes\"/>\n" +#. " <verb verb-id=\"DialogPrintColorsPreview\" />\n" +#: ../src/menus-skeleton.h:123 +msgid "_Color display mode" +msgstr "_Цветность просмотра" -#: ../src/ui/dialog/align-and-distribute.cpp:931 -msgid "Make vertical gaps between objects equal" -msgstr "Выравнять интервалы между объектами по вертикали" +#. Better location in menu needs to be found +#. " <verb verb-id=\"ViewColorModePrintColorsPreview\" radio=\"yes\"/>\n" +#. " <verb verb-id=\"DialogPrintColorsPreview\" />\n" +#: ../src/menus-skeleton.h:136 +msgid "Sh_ow/Hide" +msgstr "По_казать или скрыть" -#: ../src/ui/dialog/align-and-distribute.cpp:935 -msgid "Distribute top edges equidistantly" -msgstr "Равноудаленно расставить верхние края объектов" +#. Not quite ready to be in the menus. +#. " <verb verb-id=\"FocusToggle\" />\n" +#: ../src/menus-skeleton.h:156 +msgid "_Layer" +msgstr "Сло_й" -#: ../src/ui/dialog/align-and-distribute.cpp:938 -msgid "Distribute centers equidistantly vertically" -msgstr "Равноудаленно расставить центры объектов по вертикали" +#: ../src/menus-skeleton.h:180 +msgid "_Object" +msgstr "_Объект" -#: ../src/ui/dialog/align-and-distribute.cpp:941 -msgid "Distribute bottom edges equidistantly" -msgstr "Равноудаленно расставить нижние края объектов" +#: ../src/menus-skeleton.h:188 +msgid "Cli_p" +msgstr "О_бтравочный контур" -#: ../src/ui/dialog/align-and-distribute.cpp:946 -msgid "Distribute baseline anchors of texts horizontally" -msgstr "Распределить текстовые опорные точки по горизонтали" +#: ../src/menus-skeleton.h:192 +msgid "Mas_k" +msgstr "_Маска" -#: ../src/ui/dialog/align-and-distribute.cpp:949 -msgid "Distribute baselines of texts vertically" -msgstr "Расставить линии шрифта текстовых блоков по вертикали" +#: ../src/menus-skeleton.h:196 +msgid "Patter_n" +msgstr "_Текстура" -#: ../src/ui/dialog/align-and-distribute.cpp:955 -#: ../src/widgets/connector-toolbar.cpp:373 -msgid "Nicely arrange selected connector network" -msgstr "Гармонично расставить связанные коннектором объекты" +#: ../src/menus-skeleton.h:220 +msgid "_Path" +msgstr "_Контур" -#: ../src/ui/dialog/align-and-distribute.cpp:958 -msgid "Exchange positions of selected objects - selection order" -msgstr "Поменять объекты местами в порядке их выделения" +#: ../src/menus-skeleton.h:248 ../src/ui/dialog/find.cpp:77 +#: ../src/ui/dialog/text-edit.cpp:71 +msgid "_Text" +msgstr "_Текст" -#: ../src/ui/dialog/align-and-distribute.cpp:961 -msgid "Exchange positions of selected objects - stacking order" -msgstr "Поменять объекты местами в вертикальном порядке" +#: ../src/menus-skeleton.h:266 +msgid "Filter_s" +msgstr "Фи_льтры" -#: ../src/ui/dialog/align-and-distribute.cpp:964 -msgid "Exchange positions of selected objects - clockwise rotate" -msgstr "Поменять объекты местами по часовой стрелке" +#: ../src/menus-skeleton.h:272 +msgid "Exte_nsions" +msgstr "_Расширения" -#: ../src/ui/dialog/align-and-distribute.cpp:969 -msgid "Randomize centers in both dimensions" -msgstr "Случайным образом расставить центры" +#: ../src/menus-skeleton.h:278 +msgid "_Help" +msgstr "_Справка" -#: ../src/ui/dialog/align-and-distribute.cpp:972 -msgid "Unclump objects: try to equalize edge-to-edge distances" -msgstr "Попробовать выравнять расстояния между краями объектов" +#: ../src/menus-skeleton.h:282 +msgid "Tutorials" +msgstr "Учебник" -#: ../src/ui/dialog/align-and-distribute.cpp:977 +#: ../src/object-edit.cpp:439 msgid "" -"Move objects as little as possible so that their bounding boxes do not " -"overlap" -msgstr "Переместить объекты так, чтобы их рамки едва-едва не пересекались" +"Adjust the <b>horizontal rounding</b> radius; with <b>Ctrl</b> to make the " +"vertical radius the same" +msgstr "" +"Менять <b>горизонтальный радиус</b> закругления. С <b>Ctrl</b> вертикальный " +"радиус будет таким же." -#: ../src/ui/dialog/align-and-distribute.cpp:985 -msgid "Align selected nodes to a common horizontal line" -msgstr "Выровнять выделенные узлы по общей горизонтальной линии" +#: ../src/object-edit.cpp:444 +msgid "" +"Adjust the <b>vertical rounding</b> radius; with <b>Ctrl</b> to make the " +"horizontal radius the same" +msgstr "" +"Менять <b>вертикальный радиус</b> закругления. С <b>Ctrl</b> горизонтальный " +"радиус будет таким же." -#: ../src/ui/dialog/align-and-distribute.cpp:988 -msgid "Align selected nodes to a common vertical line" -msgstr "Выровнять выделенные узлы по общей вертикальной линии" +#: ../src/object-edit.cpp:449 ../src/object-edit.cpp:454 +msgid "" +"Adjust the <b>width and height</b> of the rectangle; with <b>Ctrl</b> to " +"lock ratio or stretch in one dimension only" +msgstr "" +"Менять <b>ширину и высоту</b> прямоугольника; <b>Ctrl</b> фиксирует " +"отношение сторон или растягивает только в одном измерении" -#: ../src/ui/dialog/align-and-distribute.cpp:991 -msgid "Distribute selected nodes horizontally" -msgstr "Распределить выделенные узлы по горизонтали" +#: ../src/object-edit.cpp:689 ../src/object-edit.cpp:693 +#: ../src/object-edit.cpp:697 ../src/object-edit.cpp:701 +msgid "" +"Resize box in X/Y direction; with <b>Shift</b> along the Z axis; with " +"<b>Ctrl</b> to constrain to the directions of edges or diagonals" +msgstr "" +"Изменить размер объекта по осям X/Y; с <b>Shift</b> — вдоль оси Z, с " +"<b>Ctrl</b> — с ограничением в направлениях (края или диагонали)" -#: ../src/ui/dialog/align-and-distribute.cpp:994 -msgid "Distribute selected nodes vertically" -msgstr "Распределить выделенные узлы по вертикали" +#: ../src/object-edit.cpp:705 ../src/object-edit.cpp:709 +#: ../src/object-edit.cpp:713 ../src/object-edit.cpp:717 +msgid "" +"Resize box along the Z axis; with <b>Shift</b> in X/Y direction; with " +"<b>Ctrl</b> to constrain to the directions of edges or diagonals" +msgstr "" +"Изменить размер вдоль оси Z; с <b>Shift</b> — по осям X/Y; с <b>Ctrl</b> — с " +"ограничением в направлениях (края или диагонали)" -#. Rest of the widgetry -#: ../src/ui/dialog/align-and-distribute.cpp:999 -msgid "Last selected" -msgstr "Последний выделенный" +#: ../src/object-edit.cpp:721 +msgid "Move the box in perspective" +msgstr "Перемещение параллелепипеда в перспективе" -#: ../src/ui/dialog/align-and-distribute.cpp:1000 -msgid "First selected" -msgstr "Первый выделенный" +#: ../src/object-edit.cpp:948 +msgid "Adjust ellipse <b>width</b>, with <b>Ctrl</b> to make circle" +msgstr "Менять <b>большую ось</b> эллипса. <b>Ctrl</b> дает круг." -#: ../src/ui/dialog/align-and-distribute.cpp:1001 -msgid "Biggest object" -msgstr "Наибольший объект" +#: ../src/object-edit.cpp:952 +msgid "Adjust ellipse <b>height</b>, with <b>Ctrl</b> to make circle" +msgstr "Менять <b>малую ось</b> эллипса. <b>Ctrl</b> дает круг." -#: ../src/ui/dialog/align-and-distribute.cpp:1002 -msgid "Smallest object" -msgstr "Наименьший объект" +#: ../src/object-edit.cpp:956 +msgid "" +"Position the <b>start point</b> of the arc or segment; with <b>Ctrl</b> to " +"snap angle; drag <b>inside</b> the ellipse for arc, <b>outside</b> for " +"segment" +msgstr "" +"<b>Начальная точка</b> сектора или дуги; <b>Ctrl</b> ограничивает угол; " +"перетаскивание <b>внутри</b> даёт дугу, <b>снаружи</b> — сектор." -#: ../src/ui/dialog/align-and-distribute.cpp:1005 -#, fuzzy -msgid "Selection Area" -msgstr "Выделение" +#: ../src/object-edit.cpp:961 +msgid "" +"Position the <b>end point</b> of the arc or segment; with <b>Ctrl</b> to " +"snap angle; drag <b>inside</b> the ellipse for arc, <b>outside</b> for " +"segment" +msgstr "" +"<b>Конечная точка</b> сектора или дуги. <b>Ctrl</b> ограничивает угол. " +"Перетаскивание <b>внутри</b> дает дугу, <b>снаружи</b> — сектор." -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 -#, fuzzy -msgid "Edit profile" -msgstr "Профиль устройства вывода:" +#: ../src/object-edit.cpp:1101 +msgid "" +"Adjust the <b>tip radius</b> of the star or polygon; with <b>Shift</b> to " +"round; with <b>Alt</b> to randomize" +msgstr "" +"Менять <b>большой радиус</b> звезды или многоугольника. <b>Shift</b> " +"закругляет, <b>Alt</b> искажает." -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:53 -msgid "Profile name:" -msgstr "Название профиля:" +#: ../src/object-edit.cpp:1109 +msgid "" +"Adjust the <b>base radius</b> of the star; with <b>Ctrl</b> to keep star " +"rays radial (no skew); with <b>Shift</b> to round; with <b>Alt</b> to " +"randomize" +msgstr "" +"Менять <b>малый радиус</b> звезды или многоугольника. <b>Ctrl</b> сохраняет " +"радиус (без наклона), <b>Shift</b> закругляет, <b>Alt</b> делает случайным." -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:80 -msgid "Save" -msgstr "Сохранить" +#: ../src/object-edit.cpp:1299 +msgid "" +"Roll/unroll the spiral from <b>inside</b>; with <b>Ctrl</b> to snap angle; " +"with <b>Alt</b> to converge/diverge" +msgstr "" +"Удлинять или укорачивать спираль изнутри. <b>Ctrl</b> ограничивает угол. " +"<b>Alt</b> меняет нелинейность." -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:134 +#: ../src/object-edit.cpp:1303 #, fuzzy -msgid "Add profile" -msgstr "Добавление фильтра" +msgid "" +"Roll/unroll the spiral from <b>outside</b>; with <b>Ctrl</b> to snap angle; " +"with <b>Shift</b> to scale/rotate; with <b>Alt</b> to lock radius" +msgstr "" +"Удлинять или укорачивать спираль снаружи. <b>Ctrl</b> ограничивает угол. " +"<b>Shift</b> растягивает/вращает как целое." -#: ../src/ui/dialog/clonetiler.cpp:112 -msgid "_Symmetry" -msgstr "С_имметрия" +#: ../src/object-edit.cpp:1348 +msgid "Adjust the <b>offset distance</b>" +msgstr "Менять <b>расстояние втяжки</b>" -#. TRANSLATORS: "translation" means "shift" / "displacement" here. -#: ../src/ui/dialog/clonetiler.cpp:124 -msgid "<b>P1</b>: simple translation" -msgstr "<b>P1</b>: простое смещение" +#: ../src/object-edit.cpp:1384 +msgid "Drag to resize the <b>flowed text frame</b>" +msgstr "Изменять размер <b>текстового блока</b>" -#: ../src/ui/dialog/clonetiler.cpp:125 -msgid "<b>P2</b>: 180° rotation" -msgstr "<b>P2</b>: поворот на 180°" +#: ../src/path-chemistry.cpp:53 +msgid "Select <b>object(s)</b> to combine." +msgstr "Выделите объединяемые <b>объект(ы)</b>." -#: ../src/ui/dialog/clonetiler.cpp:126 -msgid "<b>PM</b>: reflection" -msgstr "<b>PM</b>: отражение" +#: ../src/path-chemistry.cpp:57 +msgid "Combining paths..." +msgstr "Выполняется объединение контуров..." -#. TRANSLATORS: "glide reflection" is a reflection and a translation combined. -#. For more info, see http://mathforum.org/sum95/suzanne/symsusan.html -#: ../src/ui/dialog/clonetiler.cpp:129 -msgid "<b>PG</b>: glide reflection" -msgstr "<b>PG</b>: отражение со сдвигом" +#: ../src/path-chemistry.cpp:170 +msgid "Combine" +msgstr "Объединение" -#: ../src/ui/dialog/clonetiler.cpp:130 -msgid "<b>CM</b>: reflection + glide reflection" -msgstr "<b>CM</b>: отражение + отражение со сдвигом" +#: ../src/path-chemistry.cpp:177 +msgid "<b>No path(s)</b> to combine in the selection." +msgstr "В выделении <b>нет контуров</b> для объединения." -#: ../src/ui/dialog/clonetiler.cpp:131 -msgid "<b>PMM</b>: reflection + reflection" -msgstr "<b>PMM</b>: отражение + отражение" +#: ../src/path-chemistry.cpp:189 +msgid "Select <b>path(s)</b> to break apart." +msgstr "Выделите <b>контур(ы)</b> для разбиения." -#: ../src/ui/dialog/clonetiler.cpp:132 -msgid "<b>PMG</b>: reflection + 180° rotation" -msgstr "<b>PMG</b>: отражение + поворот на 180°" +#: ../src/path-chemistry.cpp:193 +msgid "Breaking apart paths..." +msgstr "Выполняется разбиение контуров..." -#: ../src/ui/dialog/clonetiler.cpp:133 -msgid "<b>PGG</b>: glide reflection + 180° rotation" -msgstr "<b>PGG</b>: отражение со сдвигом + поворот на 180°" +#: ../src/path-chemistry.cpp:284 +msgid "Break apart" +msgstr "Разбиение" -#: ../src/ui/dialog/clonetiler.cpp:134 -msgid "<b>CMM</b>: reflection + reflection + 180° rotation" -msgstr "<b>CMM</b>: отражение + отражение + поворот на 180°" +#: ../src/path-chemistry.cpp:286 +msgid "<b>No path(s)</b> to break apart in the selection." +msgstr "В выделении <b>нет разбиваемых контуров</b>." -#: ../src/ui/dialog/clonetiler.cpp:135 -msgid "<b>P4</b>: 90° rotation" -msgstr "<b>P4</b>: поворот на 90°" +#: ../src/path-chemistry.cpp:296 +msgid "Select <b>object(s)</b> to convert to path." +msgstr "Выделите <b>объекты</b> для преобразования в контур." -#: ../src/ui/dialog/clonetiler.cpp:136 -msgid "<b>P4M</b>: 90° rotation + 45° reflection" -msgstr "<b>P4M</b>: поворот на 90° + отражение на 45°" +#: ../src/path-chemistry.cpp:302 +msgid "Converting objects to paths..." +msgstr "Выполняется преобразование объектов в контуры..." -#: ../src/ui/dialog/clonetiler.cpp:137 -msgid "<b>P4G</b>: 90° rotation + 90° reflection" -msgstr "<b>P4G</b>: поворот на 90° + отражение на 90°" +#: ../src/path-chemistry.cpp:324 +msgid "Object to path" +msgstr "Оконтуривание объекта" -#: ../src/ui/dialog/clonetiler.cpp:138 -msgid "<b>P3</b>: 120° rotation" -msgstr "<b>P3</b>: поворот на 120°" +#: ../src/path-chemistry.cpp:326 +msgid "<b>No objects</b> to convert to path in the selection." +msgstr "В выделении <b>нет объектов</b>, преобразуемых в контур." -#: ../src/ui/dialog/clonetiler.cpp:139 -msgid "<b>P31M</b>: reflection + 120° rotation, dense" -msgstr "<b>P31M</b>: отражение + поворот на 120°, плотно" +#: ../src/path-chemistry.cpp:603 +msgid "Select <b>path(s)</b> to reverse." +msgstr "Выделите <b>контур(ы)</b> для разворота." -#: ../src/ui/dialog/clonetiler.cpp:140 -msgid "<b>P3M1</b>: reflection + 120° rotation, sparse" -msgstr "<b>P3M1</b>: отражение + поворот на 120°, редко" +#: ../src/path-chemistry.cpp:612 +msgid "Reversing paths..." +msgstr "Выполняется разворот контуров..." -#: ../src/ui/dialog/clonetiler.cpp:141 -msgid "<b>P6</b>: 60° rotation" -msgstr "<b>P6</b>: поворот на 60°" +#: ../src/path-chemistry.cpp:647 +msgid "Reverse path" +msgstr "Развернуть контур" -#: ../src/ui/dialog/clonetiler.cpp:142 -msgid "<b>P6M</b>: reflection + 60° rotation" -msgstr "<b>P6M</b>: отражение + поворот на 60°" +#: ../src/path-chemistry.cpp:649 +msgid "<b>No paths</b> to reverse in the selection." +msgstr "В выделении <b>нет контуров</b> для разворота." -#: ../src/ui/dialog/clonetiler.cpp:162 -msgid "Select one of the 17 symmetry groups for the tiling" -msgstr "Выберите одну из 17 групп симметрии для узора" +#: ../src/persp3d.cpp:293 +msgid "Toggle vanishing point" +msgstr "Переключение точек схода" -#: ../src/ui/dialog/clonetiler.cpp:180 -msgid "S_hift" -msgstr "Сме_щение" +#: ../src/persp3d.cpp:304 +msgid "Toggle multiple vanishing points" +msgstr "Переключение нескольких точек схода" -#. TRANSLATORS: "shift" means: the tiles will be shifted (offset) horizontally by this amount -#: ../src/ui/dialog/clonetiler.cpp:190 -#, no-c-format -msgid "<b>Shift X:</b>" -msgstr "<b>Смещение по X:</b>" +#: ../src/preferences-skeleton.h:101 +msgid "Dip pen" +msgstr "Чернильное перо" -#: ../src/ui/dialog/clonetiler.cpp:198 -#, no-c-format -msgid "Horizontal shift per row (in % of tile width)" -msgstr "" -"Смещение по горизонтали на каждую строку\n" -"(в процентах от ширины элемента узора)" +#: ../src/preferences-skeleton.h:102 +msgid "Marker" +msgstr "Маркер" -#: ../src/ui/dialog/clonetiler.cpp:206 -#, no-c-format -msgid "Horizontal shift per column (in % of tile width)" -msgstr "" -"Смещение по горизонтали на каждый столбец\n" -"(в процентах от ширины элемента узора)" +#: ../src/preferences-skeleton.h:103 +msgid "Brush" +msgstr "Кисть" -#: ../src/ui/dialog/clonetiler.cpp:212 -msgid "Randomize the horizontal shift by this percentage" -msgstr "" -"Случайно менять смещение по горизонтали\n" -"на этот процент" +#: ../src/preferences-skeleton.h:104 +msgid "Wiggly" +msgstr "Виляющее перо" -#. TRANSLATORS: "shift" means: the tiles will be shifted (offset) vertically by this amount -#: ../src/ui/dialog/clonetiler.cpp:222 -#, no-c-format -msgid "<b>Shift Y:</b>" -msgstr "<b>Смещение по Y:</b>" +#: ../src/preferences-skeleton.h:105 +msgid "Splotchy" +msgstr "Пачкающее перо" -#: ../src/ui/dialog/clonetiler.cpp:230 -#, no-c-format -msgid "Vertical shift per row (in % of tile height)" -msgstr "" -"Смещение по вертикали на каждую строку\n" -"(в процентах от высоты элемента узора)" +#: ../src/preferences-skeleton.h:106 +msgid "Tracing" +msgstr "Трассировка" -#: ../src/ui/dialog/clonetiler.cpp:238 -#, no-c-format -msgid "Vertical shift per column (in % of tile height)" +#: ../src/preferences.cpp:134 +msgid "" +"Inkscape will run with default settings, and new settings will not be saved. " msgstr "" -"Смещение по вертикали на каждый столбец\n" -"(в процентах от высоты элемента узора)" +"Inkscape запустится с исходными настройками.\n" +"Измененные настройки не будут сохранены." -#: ../src/ui/dialog/clonetiler.cpp:245 -msgid "Randomize the vertical shift by this percentage" -msgstr "" -"Случайно менять смещение по вертикали\n" -"на этот процент" +#. the creation failed +#. _reportError(Glib::ustring::compose(_("Cannot create profile directory %1."), +#. Glib::filename_to_utf8(_prefs_dir)), not_saved); +#: ../src/preferences.cpp:149 +#, c-format +msgid "Cannot create profile directory %s." +msgstr "Невозможно создать каталог с профилем %s." -#: ../src/ui/dialog/clonetiler.cpp:253 ../src/ui/dialog/clonetiler.cpp:399 -msgid "<b>Exponent:</b>" -msgstr "<b>Экспонента:</b>" +#. The profile dir is not actually a directory +#. _reportError(Glib::ustring::compose(_("%1 is not a valid directory."), +#. Glib::filename_to_utf8(_prefs_dir)), not_saved); +#: ../src/preferences.cpp:167 +#, c-format +msgid "%s is not a valid directory." +msgstr "%s в действительности не является каталогом." -#: ../src/ui/dialog/clonetiler.cpp:260 -msgid "Whether rows are spaced evenly (1), converge (<1) or diverge (>1)" -msgstr "" -"Располагать ли строки на одинаковом расстоянии (1), постепенно сдвигая (<1) " -"или раздвигая (>1)" +#. The write failed. +#. _reportError(Glib::ustring::compose(_("Failed to create the preferences file %1."), +#. Glib::filename_to_utf8(_prefs_filename)), not_saved); +#: ../src/preferences.cpp:178 +#, c-format +msgid "Failed to create the preferences file %s." +msgstr "Не удалось загрузить файл параметров %s." -#: ../src/ui/dialog/clonetiler.cpp:267 -msgid "Whether columns are spaced evenly (1), converge (<1) or diverge (>1)" -msgstr "" -"Располагать ли столбцы на одинаковом расстоянии (1), постепенно сдвигая (<1) " -"или раздвигая (>1)" +#: ../src/preferences.cpp:214 +#, c-format +msgid "The preferences file %s is not a regular file." +msgstr "Файл параметров программы %s не является обычным файлом." -#. TRANSLATORS: "Alternate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:275 ../src/ui/dialog/clonetiler.cpp:439 -#: ../src/ui/dialog/clonetiler.cpp:515 ../src/ui/dialog/clonetiler.cpp:588 -#: ../src/ui/dialog/clonetiler.cpp:634 ../src/ui/dialog/clonetiler.cpp:761 -msgid "<small>Alternate:</small>" -msgstr "<small>Чередовать:</small>" +#: ../src/preferences.cpp:224 +#, c-format +msgid "The preferences file %s could not be read." +msgstr "Не удалось прочитать файл параметров программы %s." -#: ../src/ui/dialog/clonetiler.cpp:281 -msgid "Alternate the sign of shifts for each row" -msgstr "Чередовать знак смещения для каждой строки" +#: ../src/preferences.cpp:235 +#, c-format +msgid "The preferences file %s is not a valid XML document." +msgstr "Файл параметров программы %s не является корректным документом XML." -#: ../src/ui/dialog/clonetiler.cpp:286 -msgid "Alternate the sign of shifts for each column" -msgstr "Чередовать знак смещения для каждого столбца" +#: ../src/preferences.cpp:244 +#, c-format +msgid "The file %s is not a valid Inkscape preferences file." +msgstr "%s не является корректным файлом параметров Inkscape." -#. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:293 ../src/ui/dialog/clonetiler.cpp:457 -#: ../src/ui/dialog/clonetiler.cpp:533 -msgid "<small>Cumulate:</small>" -msgstr "<small>Накапливать:</small>" +#: ../src/rdf.cpp:175 +msgid "CC Attribution" +msgstr "CC Attribution" -#: ../src/ui/dialog/clonetiler.cpp:299 -msgid "Cumulate the shifts for each row" -msgstr "Накапливать смещение для каждой строки" +#: ../src/rdf.cpp:180 +msgid "CC Attribution-ShareAlike" +msgstr "CC Attribution-ShareAlike" -#: ../src/ui/dialog/clonetiler.cpp:304 -msgid "Cumulate the shifts for each column" -msgstr "Накапливать смещение для каждого столбца" +#: ../src/rdf.cpp:185 +msgid "CC Attribution-NoDerivs" +msgstr "CC Attribution-NoDerivs" -#. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:311 -msgid "<small>Exclude tile:</small>" -msgstr "<small>Исключить элемент:</small>" +#: ../src/rdf.cpp:190 +msgid "CC Attribution-NonCommercial" +msgstr "CC Attribution-NonCommercial" -#: ../src/ui/dialog/clonetiler.cpp:317 -msgid "Exclude tile height in shift" -msgstr "Исключить высоту элемента при смещении" +#: ../src/rdf.cpp:195 +msgid "CC Attribution-NonCommercial-ShareAlike" +msgstr "CC Attribution-NonCommercial-ShareAlike" -#: ../src/ui/dialog/clonetiler.cpp:322 -msgid "Exclude tile width in shift" -msgstr "Исключить ширину элемента при смещении" +#: ../src/rdf.cpp:200 +msgid "CC Attribution-NonCommercial-NoDerivs" +msgstr "CC Attribution-NonCommercial-NoDerivs" -#: ../src/ui/dialog/clonetiler.cpp:331 -msgid "Sc_ale" -msgstr "_Масштаб" +#: ../src/rdf.cpp:205 +#, fuzzy +msgid "CC0 Public Domain Dedication" +msgstr "Общественное достояние" -#: ../src/ui/dialog/clonetiler.cpp:339 -msgid "<b>Scale X:</b>" -msgstr "<b>Масштаб по X:</b>" +#: ../src/rdf.cpp:210 +msgid "FreeArt" +msgstr "FreeArt" -#: ../src/ui/dialog/clonetiler.cpp:347 -#, no-c-format -msgid "Horizontal scale per row (in % of tile width)" -msgstr "" -"Масштабировать по горизонтали на каждую строку\n" -"(в процентах от ширины элемента узора)" +#: ../src/rdf.cpp:215 +msgid "Open Font License" +msgstr "Open Font License" -#: ../src/ui/dialog/clonetiler.cpp:355 -#, no-c-format -msgid "Horizontal scale per column (in % of tile width)" -msgstr "" -"Масштабировать по горизонтали на каждый столбец\n" -"(в процентах от ширины элемента узора)" +#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkTitleAttribute +#: ../src/rdf.cpp:235 ../src/ui/dialog/object-attributes.cpp:57 +msgid "Title:" +msgstr "Название:" -#: ../src/ui/dialog/clonetiler.cpp:361 -msgid "Randomize the horizontal scale by this percentage" +#: ../src/rdf.cpp:236 +msgid "A name given to the resource" msgstr "" -"Случайным образом масштабировать \n" -"по горизонтали на этот процент" - -#: ../src/ui/dialog/clonetiler.cpp:369 -msgid "<b>Scale Y:</b>" -msgstr "<b>Масштаб по Y:</b>" -#: ../src/ui/dialog/clonetiler.cpp:377 -#, no-c-format -msgid "Vertical scale per row (in % of tile height)" -msgstr "" -"Масштабировать по вертикали на каждую строку\n" -"(в процентах от высоты элемента узора)" +#: ../src/rdf.cpp:238 +msgid "Date:" +msgstr "Дата:" -#: ../src/ui/dialog/clonetiler.cpp:385 -#, no-c-format -msgid "Vertical scale per column (in % of tile height)" +#: ../src/rdf.cpp:239 +msgid "" +"A point or period of time associated with an event in the lifecycle of the " +"resource" msgstr "" -"Масштабировать по вертикали на каждый столбец\n" -"(в процентах от высоты элемента узора)" -#: ../src/ui/dialog/clonetiler.cpp:391 -msgid "Randomize the vertical scale by this percentage" -msgstr "" -"Случайным образом масштабировать\n" -"по вертикали на этот процент" +#: ../src/rdf.cpp:241 ../share/extensions/webslicer_create_rect.inx.h:3 +msgid "Format:" +msgstr "Формат:" -#: ../src/ui/dialog/clonetiler.cpp:405 -msgid "Whether row scaling is uniform (1), converge (<1) or diverge (>1)" +#: ../src/rdf.cpp:242 +msgid "The file format, physical medium, or dimensions of the resource" msgstr "" -"Располагать ли строки на одинаковом расстоянии (1), постепенно сдвигая (<1) " -"или раздвигая (>1)" -#: ../src/ui/dialog/clonetiler.cpp:411 -msgid "Whether column scaling is uniform (1), converge (<1) or diverge (>1)" -msgstr "" -"Располагать ли столбцы на одинаковом расстоянии (1), постепенно сдвигая (<1) " -"или раздвигая (>1)" +#: ../src/rdf.cpp:245 +#, fuzzy +msgid "The nature or genre of the resource" +msgstr "В каких единицах производить измерения" -#: ../src/ui/dialog/clonetiler.cpp:419 -msgid "<b>Base:</b>" -msgstr "<b>Основа</b>" +#: ../src/rdf.cpp:248 +msgid "Creator:" +msgstr "Создатель:" -#: ../src/ui/dialog/clonetiler.cpp:425 ../src/ui/dialog/clonetiler.cpp:431 -msgid "" -"Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)" +#: ../src/rdf.cpp:249 +#, fuzzy +msgid "An entity primarily responsible for making the resource" msgstr "" -"Основа логарифмической спирали: не используется (0), сходящаяся спираль " -"(<1), расходящаяся спираль (>1)" - -#: ../src/ui/dialog/clonetiler.cpp:445 -msgid "Alternate the sign of scales for each row" -msgstr "Чередовать знак масштаба для каждой строки" +"Название организации, в первую очередь ответственной за создание этого " +"документа." -#: ../src/ui/dialog/clonetiler.cpp:450 -msgid "Alternate the sign of scales for each column" -msgstr "Чередовать знак масштаба для каждого столбца" +#: ../src/rdf.cpp:251 +msgid "Rights:" +msgstr "Права:" -#: ../src/ui/dialog/clonetiler.cpp:463 -msgid "Cumulate the scales for each row" -msgstr "Накапливать масштаб для каждой строки" +#: ../src/rdf.cpp:252 +msgid "Information about rights held in and over the resource" +msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:468 -msgid "Cumulate the scales for each column" -msgstr "Накапливать масштаб для каждого столбца" +#: ../src/rdf.cpp:254 +msgid "Publisher:" +msgstr "Издатель:" -#: ../src/ui/dialog/clonetiler.cpp:477 -msgid "_Rotation" -msgstr "_Поворот" +#: ../src/rdf.cpp:255 +#, fuzzy +msgid "An entity responsible for making the resource available" +msgstr "Название организации, ответственной за публикацию этого документа." -#: ../src/ui/dialog/clonetiler.cpp:485 -msgid "<b>Angle:</b>" -msgstr "<b>Угол:</b>" +#: ../src/rdf.cpp:258 +msgid "Identifier:" +msgstr "Идентификатор:" -#: ../src/ui/dialog/clonetiler.cpp:493 -#, no-c-format -msgid "Rotate tiles by this angle for each row" -msgstr "Поворачивать элементы узора на этот угол в каждой строке" +#: ../src/rdf.cpp:259 +msgid "An unambiguous reference to the resource within a given context" +msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:501 -#, no-c-format -msgid "Rotate tiles by this angle for each column" -msgstr "Поворачивать элементы узора на этот угол в каждом столбце" +#: ../src/rdf.cpp:262 +msgid "A related resource from which the described resource is derived" +msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:507 -msgid "Randomize the rotation angle by this percentage" +#: ../src/rdf.cpp:264 +msgid "Relation:" msgstr "" -"Случайным образом менять \n" -"угол поворота на этот процент" -#: ../src/ui/dialog/clonetiler.cpp:521 -msgid "Alternate the rotation direction for each row" -msgstr "Чередовать направление поворота для каждой строки" +#: ../src/rdf.cpp:265 +#, fuzzy +msgid "A related resource" +msgstr "Режим смешивания:" -#: ../src/ui/dialog/clonetiler.cpp:526 -msgid "Alternate the rotation direction for each column" -msgstr "Чередовать направление поворота для каждого столбца" +#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1859 +msgid "Language:" +msgstr "Язык:" -#: ../src/ui/dialog/clonetiler.cpp:539 -msgid "Cumulate the rotation for each row" -msgstr "Накапливать поворот для каждой строки" +#: ../src/rdf.cpp:268 +#, fuzzy +msgid "A language of the resource" +msgstr "Угол наклона эллипса" -#: ../src/ui/dialog/clonetiler.cpp:544 -msgid "Cumulate the rotation for each column" -msgstr "Накапливать поворот для каждого столбца" +#: ../src/rdf.cpp:270 +msgid "Keywords:" +msgstr "Ключевые слова:" -#: ../src/ui/dialog/clonetiler.cpp:553 -msgid "_Blur & opacity" -msgstr "_Размывание и непрозрачность" +#: ../src/rdf.cpp:271 +#, fuzzy +msgid "The topic of the resource" +msgstr "Исходный правый край" -#: ../src/ui/dialog/clonetiler.cpp:562 -msgid "<b>Blur:</b>" -msgstr "<b>Размывание:</b>" +#. TRANSLATORS: "Coverage": the spatial or temporal characteristics of the content. +#. For info, see Appendix D of http://www.w3.org/TR/1998/WD-rdf-schema-19980409/ +#: ../src/rdf.cpp:275 +msgid "Coverage:" +msgstr "Охват:" -#: ../src/ui/dialog/clonetiler.cpp:568 -msgid "Blur tiles by this percentage for each row" -msgstr "Размыть элементы узора на этот процент для каждой строки" +#: ../src/rdf.cpp:276 +msgid "" +"The spatial or temporal topic of the resource, the spatial applicability of " +"the resource, or the jurisdiction under which the resource is relevant" +msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:574 -msgid "Blur tiles by this percentage for each column" -msgstr "Размыть элементы узора на этот процент для каждого столбца" +#: ../src/rdf.cpp:279 +msgid "Description:" +msgstr "Описание:" -#: ../src/ui/dialog/clonetiler.cpp:580 -msgid "Randomize the tile blur by this percentage" -msgstr "Случайно менять размывание на этот процент" +#: ../src/rdf.cpp:280 +#, fuzzy +msgid "An account of the resource" +msgstr "Краткое описание содержимого документа." -#: ../src/ui/dialog/clonetiler.cpp:594 -msgid "Alternate the sign of blur change for each row" -msgstr "Чередовать знак изменения размывания для каждой строки" +#. FIXME: need to handle 1 agent per line of input +#: ../src/rdf.cpp:284 +msgid "Contributors:" +msgstr "Соавторы:" -#: ../src/ui/dialog/clonetiler.cpp:599 -msgid "Alternate the sign of blur change for each column" -msgstr "Чередовать знак изменения размывания для каждого столбца" +#: ../src/rdf.cpp:285 +#, fuzzy +msgid "An entity responsible for making contributions to the resource" +msgstr "Названия или имена тех, кто внес вклад в создание этого документа." -#: ../src/ui/dialog/clonetiler.cpp:608 -msgid "<b>Opacity:</b>" -msgstr "<b>Непрозрачность:</b>" +#. TRANSLATORS: URL to a page that defines the license for the document +#: ../src/rdf.cpp:289 +msgid "URI:" +msgstr "URI:" -#: ../src/ui/dialog/clonetiler.cpp:614 -msgid "Decrease tile opacity by this percentage for each row" -msgstr "" -"Увеличить прозрачность элементов узора\n" -"на этот процент для каждой строки" +#. TRANSLATORS: this is where you put a URL to a page that defines the license +#: ../src/rdf.cpp:291 +#, fuzzy +msgid "URI to this document's license's namespace definition" +msgstr "URI текста лицензии, применимой к данному документу." -#: ../src/ui/dialog/clonetiler.cpp:620 -msgid "Decrease tile opacity by this percentage for each column" +#. TRANSLATORS: fragment of XML representing the license of the document +#: ../src/rdf.cpp:295 +msgid "Fragment:" msgstr "" -"Увеличить прозрачность элементов узора\n" -"на этот процент для каждого столбца" -#: ../src/ui/dialog/clonetiler.cpp:626 -msgid "Randomize the tile opacity by this percentage" -msgstr "Случайно менять прозрачность, максимум на данный процент" +#: ../src/rdf.cpp:296 +#, fuzzy +msgid "XML fragment for the RDF 'License' section" +msgstr "XML-фрагмент RDF-раздела \"Лицензия\"." -#: ../src/ui/dialog/clonetiler.cpp:640 -msgid "Alternate the sign of opacity change for each row" +#: ../src/resource-manager.cpp:332 +msgid "Fixup broken links" msgstr "" -"Чередовать знак изменения прозрачности\n" -"для каждой строки" -#: ../src/ui/dialog/clonetiler.cpp:645 -msgid "Alternate the sign of opacity change for each column" -msgstr "" -"Чередовать знак изменения прозрачности\n" -"для каждого столбца" +#: ../src/selection-chemistry.cpp:396 +msgid "Delete text" +msgstr "Удалить текст" -#: ../src/ui/dialog/clonetiler.cpp:653 -msgid "Co_lor" -msgstr "Цвет" +#: ../src/selection-chemistry.cpp:404 +msgid "<b>Nothing</b> was deleted." +msgstr "<b>Ничего</b> не удалено." -#: ../src/ui/dialog/clonetiler.cpp:663 -msgid "Initial color: " -msgstr "Исходный цвет:" +#: ../src/selection-chemistry.cpp:423 +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 +#: ../src/ui/dialog/swatches.cpp:278 ../src/ui/tools/text-tool.cpp:974 +#: ../src/widgets/eraser-toolbar.cpp:93 +#: ../src/widgets/gradient-toolbar.cpp:1178 +#: ../src/widgets/gradient-toolbar.cpp:1192 +#: ../src/widgets/gradient-toolbar.cpp:1206 +#: ../src/widgets/node-toolbar.cpp:401 +msgid "Delete" +msgstr "Удаление" -#: ../src/ui/dialog/clonetiler.cpp:667 -msgid "Initial color of tiled clones" -msgstr "Исходный цвет элементов узора" +#: ../src/selection-chemistry.cpp:451 +msgid "Select <b>object(s)</b> to duplicate." +msgstr "Выделите <b>объекты</b> для дублирования." -#: ../src/ui/dialog/clonetiler.cpp:667 -msgid "" -"Initial color for clones (works only if the original has unset fill or " -"stroke)" -msgstr "" -"Исходный цвет клонов (у оригинала должен быть сброшен цвет заливки или " -"обводки)" +#: ../src/selection-chemistry.cpp:560 +msgid "Delete all" +msgstr "Удалить всё" -#: ../src/ui/dialog/clonetiler.cpp:682 -msgid "<b>H:</b>" -msgstr "<b>H:</b>" +#: ../src/selection-chemistry.cpp:750 +msgid "Select <b>some objects</b> to group." +msgstr "Выделите <b>несколько объектов</b> для группировки." -#: ../src/ui/dialog/clonetiler.cpp:688 -msgid "Change the tile hue by this percentage for each row" -msgstr "" -"Менять цветовой тон элементов узора\n" -"на этот процент для каждой строки" +#: ../src/selection-chemistry.cpp:765 +#, fuzzy +msgctxt "Verb" +msgid "Group" +msgstr "Группа" -#: ../src/ui/dialog/clonetiler.cpp:694 -msgid "Change the tile hue by this percentage for each column" -msgstr "" -"Менять цветовой тон элементов узора\n" -"на этот процент для каждого столбца" +#: ../src/selection-chemistry.cpp:788 +msgid "Select a <b>group</b> to ungroup." +msgstr "Выделите <b>группу</b> для разгруппирования." -#: ../src/ui/dialog/clonetiler.cpp:700 -msgid "Randomize the tile hue by this percentage" -msgstr "Случайно менять цветовой тон, максимум на этот процент" +#: ../src/selection-chemistry.cpp:803 +msgid "<b>No groups</b> to ungroup in the selection." +msgstr "В выделении <b>нет групп</b> для разгруппирования." -#: ../src/ui/dialog/clonetiler.cpp:709 -msgid "<b>S:</b>" -msgstr "<b>S:</b>" +#: ../src/selection-chemistry.cpp:861 ../src/sp-item-group.cpp:562 +msgid "Ungroup" +msgstr "Разгруппировать" -#: ../src/ui/dialog/clonetiler.cpp:715 -msgid "Change the color saturation by this percentage for each row" -msgstr "" -"Менять насыщенность цвета элементов узора\n" -"на этот процент для каждой строки" +#: ../src/selection-chemistry.cpp:942 +msgid "Select <b>object(s)</b> to raise." +msgstr "Выделите <b>объект(ы)</b> для поднятия." -#: ../src/ui/dialog/clonetiler.cpp:721 -msgid "Change the color saturation by this percentage for each column" +#: ../src/selection-chemistry.cpp:948 ../src/selection-chemistry.cpp:1004 +#: ../src/selection-chemistry.cpp:1032 ../src/selection-chemistry.cpp:1093 +msgid "" +"You cannot raise/lower objects from <b>different groups</b> or <b>layers</b>." msgstr "" -"Менять насыщенность цвета элементов узора\n" -"на этот процент для каждого столбца" +"Нельзя поднять или опустить объекты из <b>разных групп</b> или <b>слоев</b>." -#: ../src/ui/dialog/clonetiler.cpp:727 -msgid "Randomize the color saturation by this percentage" -msgstr "Случайно менять насыщенность цвета, максимум на этот процент" +#. TRANSLATORS: "Raise" means "to raise an object" in the undo history +#: ../src/selection-chemistry.cpp:988 +msgctxt "Undo action" +msgid "Raise" +msgstr "Поднятие" -#: ../src/ui/dialog/clonetiler.cpp:735 -msgid "<b>L:</b>" -msgstr "<b>L:</b>" +#: ../src/selection-chemistry.cpp:996 +msgid "Select <b>object(s)</b> to raise to top." +msgstr "Выделите <b>объект(ы)</b> для поднятия на самый верх." -#: ../src/ui/dialog/clonetiler.cpp:741 -msgid "Change the color lightness by this percentage for each row" -msgstr "Менять яркость цвета на этот процент для каждой строки" +#: ../src/selection-chemistry.cpp:1019 +msgid "Raise to top" +msgstr "Поднять на передний план" -#: ../src/ui/dialog/clonetiler.cpp:747 -msgid "Change the color lightness by this percentage for each column" -msgstr "Менять яркость цвета на этот процент для каждого столбца" +#: ../src/selection-chemistry.cpp:1026 +msgid "Select <b>object(s)</b> to lower." +msgstr "Выделите <b>объект(ы)</b> для опускания." -#: ../src/ui/dialog/clonetiler.cpp:753 -msgid "Randomize the color lightness by this percentage" -msgstr "Случайно менять яркость цвета, максимум на данный процент" +#. TRANSLATORS: "Lower" means "to lower an object" in the undo history +#: ../src/selection-chemistry.cpp:1077 +#, fuzzy +msgctxt "Undo action" +msgid "Lower" +msgstr "Опустить" -#: ../src/ui/dialog/clonetiler.cpp:767 -msgid "Alternate the sign of color changes for each row" -msgstr "" -"Чередовать знак изменения цвета\n" -"для каждой строки" +#: ../src/selection-chemistry.cpp:1085 +msgid "Select <b>object(s)</b> to lower to bottom." +msgstr "Выделите <b>объект(ы)</b> для опускания на самый низ." -#: ../src/ui/dialog/clonetiler.cpp:772 -msgid "Alternate the sign of color changes for each column" -msgstr "" -"Чередовать знак изменения цвета\n" -"для каждого столбца" +#: ../src/selection-chemistry.cpp:1120 +msgid "Lower to bottom" +msgstr "Опустить на задний план" -#: ../src/ui/dialog/clonetiler.cpp:780 -msgid "_Trace" -msgstr "_Обводка" +#: ../src/selection-chemistry.cpp:1130 +msgid "Nothing to undo." +msgstr "Нет отменяемых операций." -#: ../src/ui/dialog/clonetiler.cpp:792 -msgid "Trace the drawing under the tiles" -msgstr "Обвести узором рисунок под ним" +#: ../src/selection-chemistry.cpp:1141 +msgid "Nothing to redo." +msgstr "Нет повторяемых операций." -#: ../src/ui/dialog/clonetiler.cpp:796 -msgid "" -"For each clone, pick a value from the drawing in that clone's location and " -"apply it to the clone" -msgstr "" -"Для каждого клона в узоре взять значение под клоном и применить его к клону" +#: ../src/selection-chemistry.cpp:1208 +msgid "Paste" +msgstr "Вставка" -#: ../src/ui/dialog/clonetiler.cpp:815 -msgid "1. Pick from the drawing:" -msgstr "1. Взять значение:" +#: ../src/selection-chemistry.cpp:1216 +msgid "Paste style" +msgstr "Вставка стиля" -#: ../src/ui/dialog/clonetiler.cpp:833 -msgid "Pick the visible color and opacity" -msgstr "Взять видимый цвет (без прозрачности) в каждой точке" +#: ../src/selection-chemistry.cpp:1226 +msgid "Paste live path effect" +msgstr "Вставить динамический контурный эффект" -#: ../src/ui/dialog/clonetiler.cpp:841 -msgid "Pick the total accumulated opacity" -msgstr "Взять суммарную непрозрачность в каждой точке" +#: ../src/selection-chemistry.cpp:1248 +msgid "Select <b>object(s)</b> to remove live path effects from." +msgstr "" +"Выделите <b>объект(ы)</b> для удаления динамического контурного эффекта." -#: ../src/ui/dialog/clonetiler.cpp:848 -msgid "R" -msgstr "R" +#: ../src/selection-chemistry.cpp:1260 +msgid "Remove live path effect" +msgstr "Удаление контурного эффекта" -#: ../src/ui/dialog/clonetiler.cpp:849 -msgid "Pick the Red component of the color" -msgstr "Взять значение красного канала цвета" +#: ../src/selection-chemistry.cpp:1271 +msgid "Select <b>object(s)</b> to remove filters from." +msgstr "Выделите <b>объект(ы)</b> для удаления фильтров." -#: ../src/ui/dialog/clonetiler.cpp:856 -msgid "G" -msgstr "G" +#: ../src/selection-chemistry.cpp:1281 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1678 +msgid "Remove filter" +msgstr "Удаление фильтра" -#: ../src/ui/dialog/clonetiler.cpp:857 -msgid "Pick the Green component of the color" -msgstr "Взять значение зеленого канала цвета" +#: ../src/selection-chemistry.cpp:1290 +msgid "Paste size" +msgstr "Вставить размер" -#: ../src/ui/dialog/clonetiler.cpp:864 -msgid "B" -msgstr "B" +#: ../src/selection-chemistry.cpp:1299 +msgid "Paste size separately" +msgstr "Вставить размер раздельно" -#: ../src/ui/dialog/clonetiler.cpp:865 -msgid "Pick the Blue component of the color" -msgstr "Взять значение синего канала цвета" +#: ../src/selection-chemistry.cpp:1309 +msgid "Select <b>object(s)</b> to move to the layer above." +msgstr "Выделите <b>объект(ы)</b> для перемещения на слой выше." -#: ../src/ui/dialog/clonetiler.cpp:872 -msgctxt "Clonetiler color hue" -msgid "H" -msgstr "H" +#: ../src/selection-chemistry.cpp:1335 +msgid "Raise to next layer" +msgstr "Поднятие на следующий слой" -#: ../src/ui/dialog/clonetiler.cpp:873 -msgid "Pick the hue of the color" -msgstr "Взять цветовой тон" +#: ../src/selection-chemistry.cpp:1342 +msgid "No more layers above." +msgstr "Выше слоёв нет." -#: ../src/ui/dialog/clonetiler.cpp:880 -msgctxt "Clonetiler color saturation" -msgid "S" -msgstr "S" +#: ../src/selection-chemistry.cpp:1354 +msgid "Select <b>object(s)</b> to move to the layer below." +msgstr "Выделите <b>объект(ы)</b> для перемещения на слой ниже." -#: ../src/ui/dialog/clonetiler.cpp:881 -msgid "Pick the saturation of the color" -msgstr "Взять насыщенность цвета" +#: ../src/selection-chemistry.cpp:1380 +msgid "Lower to previous layer" +msgstr "Опускание на предыдущий слой" -#: ../src/ui/dialog/clonetiler.cpp:888 -msgctxt "Clonetiler color lightness" -msgid "L" -msgstr "L" +#: ../src/selection-chemistry.cpp:1387 +msgid "No more layers below." +msgstr "Ниже слоёв нет." -#: ../src/ui/dialog/clonetiler.cpp:889 -msgid "Pick the lightness of the color" -msgstr "Взять яркость цвета" +#: ../src/selection-chemistry.cpp:1399 +#, fuzzy +msgid "Select <b>object(s)</b> to move." +msgstr "Выделите <b>объект(ы)</b> для опускания." -#: ../src/ui/dialog/clonetiler.cpp:899 -msgid "2. Tweak the picked value:" -msgstr "2. Изменить взятое значение:" +#: ../src/selection-chemistry.cpp:1416 ../src/verbs.cpp:2577 +msgid "Move selection to layer" +msgstr "Перенос выделения в слой" -#: ../src/ui/dialog/clonetiler.cpp:916 -msgid "Gamma-correct:" -msgstr "Гамма-коррекция:" +#. An SVG element cannot have a transform. We could change 'x' and 'y' in response +#. to a translation... but leave that for another day. +#: ../src/selection-chemistry.cpp:1503 ../src/seltrans.cpp:388 +msgid "Cannot transform an embedded SVG." +msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:920 -msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" -msgstr "Сдвинуть середину диапазона снятых значений вверх (>0) или вниз (<0)" +#: ../src/selection-chemistry.cpp:1649 +msgid "Remove transform" +msgstr "Убрать трансформацию" -#: ../src/ui/dialog/clonetiler.cpp:927 -msgid "Randomize:" -msgstr "Случайно:" +#: ../src/selection-chemistry.cpp:1752 +#, fuzzy +msgid "Rotate 90° CCW" +msgstr "Повернуть на 90° против часовой стрелки" -#: ../src/ui/dialog/clonetiler.cpp:931 -msgid "Randomize the picked value by this percentage" -msgstr "Случайно менять взятое значение, максимум на данный процент" +#: ../src/selection-chemistry.cpp:1752 +#, fuzzy +msgid "Rotate 90° CW" +msgstr "Повернуть на 90° по часовой стрелке" -#: ../src/ui/dialog/clonetiler.cpp:938 -msgid "Invert:" -msgstr "Инвертировать:" +#: ../src/selection-chemistry.cpp:1773 ../src/seltrans.cpp:483 +#: ../src/ui/dialog/transformation.cpp:894 +msgid "Rotate" +msgstr "Вращение" -#: ../src/ui/dialog/clonetiler.cpp:942 -msgid "Invert the picked value" -msgstr "Инвертировать взятое значение" +#: ../src/selection-chemistry.cpp:2144 +msgid "Rotate by pixels" +msgstr "Вращение по пикселам" -#: ../src/ui/dialog/clonetiler.cpp:948 -msgid "3. Apply the value to the clones':" -msgstr "3. Применить это значение к клонам через:" +#: ../src/selection-chemistry.cpp:2174 ../src/seltrans.cpp:480 +#: ../src/ui/dialog/transformation.cpp:869 +#: ../share/extensions/interp_att_g.inx.h:12 +msgid "Scale" +msgstr "Масштабирование:" -#: ../src/ui/dialog/clonetiler.cpp:963 -msgid "Presence" -msgstr "Наличие" +#: ../src/selection-chemistry.cpp:2199 +msgid "Scale by whole factor" +msgstr "Масштабирование по целым числам" -#: ../src/ui/dialog/clonetiler.cpp:966 -msgid "" -"Each clone is created with the probability determined by the picked value in " -"that point" -msgstr "" -"Вероятность появления каждого клона определяется значением, взятым в данной " -"точке" +#: ../src/selection-chemistry.cpp:2214 +msgid "Move vertically" +msgstr "Смещение по вертикали" -#: ../src/ui/dialog/clonetiler.cpp:973 -msgid "Size" -msgstr "Размер" +#: ../src/selection-chemistry.cpp:2217 +msgid "Move horizontally" +msgstr "Смещение по горизонтали" -#: ../src/ui/dialog/clonetiler.cpp:976 -msgid "Each clone's size is determined by the picked value in that point" -msgstr "Размер каждого клона определяется значением, взятым в данной точке" +#: ../src/selection-chemistry.cpp:2220 ../src/selection-chemistry.cpp:2246 +#: ../src/seltrans.cpp:477 ../src/ui/dialog/transformation.cpp:807 +msgid "Move" +msgstr "Смещение" -#: ../src/ui/dialog/clonetiler.cpp:986 -msgid "" -"Each clone is painted by the picked color (the original must have unset fill " -"or stroke)" -msgstr "" -"Каждый клон красится взятым в данной точке цветом (у оригинала должен быть " -"сброшен цвет заливки или обводки)" +#: ../src/selection-chemistry.cpp:2240 +msgid "Move vertically by pixels" +msgstr "Попиксельное смещение по вертикали" -#: ../src/ui/dialog/clonetiler.cpp:996 -msgid "Each clone's opacity is determined by the picked value in that point" -msgstr "" -"Прозрачность каждого клона определяется значением, взятым в данной точке" +#: ../src/selection-chemistry.cpp:2243 +msgid "Move horizontally by pixels" +msgstr "Попиксельное смещение по горизонтали" -#: ../src/ui/dialog/clonetiler.cpp:1044 -msgid "How many rows in the tiling" -msgstr "Количество строк в узоре" +#: ../src/selection-chemistry.cpp:2375 +msgid "The selection has no applied path effect." +msgstr "В выделении нет примененного контурного эффекта." -#: ../src/ui/dialog/clonetiler.cpp:1074 -msgid "How many columns in the tiling" -msgstr "Количество столбцов в узоре" +#: ../src/selection-chemistry.cpp:2544 ../src/ui/dialog/clonetiler.cpp:2218 +msgid "Select an <b>object</b> to clone." +msgstr "Выделите <b>объект</b> для клонирования." -#: ../src/ui/dialog/clonetiler.cpp:1119 -msgid "Width of the rectangle to be filled" -msgstr "Ширина заполняемой области" +#: ../src/selection-chemistry.cpp:2580 +#, fuzzy +msgctxt "Action" +msgid "Clone" +msgstr "Склонирована" -#: ../src/ui/dialog/clonetiler.cpp:1152 -msgid "Height of the rectangle to be filled" -msgstr "Высота заполняемой области" +#: ../src/selection-chemistry.cpp:2596 +msgid "Select <b>clones</b> to relink." +msgstr "Выделите <b>клоны</b> для пересоединения" -#: ../src/ui/dialog/clonetiler.cpp:1169 -msgid "Rows, columns: " -msgstr "Строк, столбцов: " +#: ../src/selection-chemistry.cpp:2603 +msgid "Copy an <b>object</b> to clipboard to relink clones to." +msgstr "" +"Скопируйте <b>объект</b> в буфер обмена, чтобы затем повторно присоединить к " +"нему клоны." -#: ../src/ui/dialog/clonetiler.cpp:1170 -msgid "Create the specified number of rows and columns" -msgstr "Создать указанное количество строк и столбцов" +#: ../src/selection-chemistry.cpp:2627 +msgid "<b>No clones to relink</b> in the selection." +msgstr "В текущем выделении <b>нет клонов для повторного связывания</b>." -#: ../src/ui/dialog/clonetiler.cpp:1179 -msgid "Width, height: " -msgstr "Ширина, высота: " +#: ../src/selection-chemistry.cpp:2630 +msgid "Relink clone" +msgstr "Повторно связать клон" -#: ../src/ui/dialog/clonetiler.cpp:1180 -msgid "Fill the specified width and height with the tiling" -msgstr "Заполнить узором указанную область" +#: ../src/selection-chemistry.cpp:2644 +msgid "Select <b>clones</b> to unlink." +msgstr "Выделите <b>клоны</b> для отсоединения." -#: ../src/ui/dialog/clonetiler.cpp:1201 -msgid "Use saved size and position of the tile" -msgstr "Использовать запомненный размер и позицию оригинала" +#: ../src/selection-chemistry.cpp:2698 +msgid "<b>No clones to unlink</b> in the selection." +msgstr "В выделении нет <b>клонов</b>." -#: ../src/ui/dialog/clonetiler.cpp:1204 +#: ../src/selection-chemistry.cpp:2702 +msgid "Unlink clone" +msgstr "Отсоединение клона" + +#: ../src/selection-chemistry.cpp:2715 msgid "" -"Pretend that the size and position of the tile are the same as the last time " -"you tiled it (if any), instead of using the current size" +"Select a <b>clone</b> to go to its original. Select a <b>linked offset</b> " +"to go to its source. Select a <b>text on path</b> to go to the path. Select " +"a <b>flowed text</b> to go to its frame." msgstr "" -"Использовать те же самые размер и позицию элемента узора,\n" -"что и в прошлый раз, когда вы делали\n" -"узор из этого же объекта (если делали),\n" -"вместо того чтобы использовать его настоящий размер/позицию" - -#: ../src/ui/dialog/clonetiler.cpp:1238 -msgid " <b>_Create</b> " -msgstr "<b>_Создать</b>" - -#: ../src/ui/dialog/clonetiler.cpp:1240 -msgid "Create and tile the clones of the selection" -msgstr "Создать узор из клонов выделенного объекта" +"Выделите <b>клон</b>, чтобы перейти к его оригиналу. Выделите <b>связанную " +"втяжку</b>, чтобы перейти к исходному контуру. Выделите <b>текст по контуру</" +"b>, чтобы перейти к его контуру. Выделите <b>текст в рамке</b>, чтобы " +"перейти к рамке." -#. TRANSLATORS: if a group of objects are "clumped" together, then they -#. are unevenly spread in the given amount of space - as shown in the -#. diagrams on the left in the following screenshot: -#. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png -#. So unclumping is the process of spreading a number of objects out more evenly. -#: ../src/ui/dialog/clonetiler.cpp:1260 -msgid " _Unclump " -msgstr " _Разровнять" +#: ../src/selection-chemistry.cpp:2748 +msgid "" +"<b>Cannot find</b> the object to select (orphaned clone, offset, textpath, " +"flowed text?)" +msgstr "" +"<b>Невозможно найти</b> выбираемый объект (orphaned clone, offset, текст по " +"контуру, завёрстанный текст?)" -#: ../src/ui/dialog/clonetiler.cpp:1261 -msgid "Spread out clones to reduce clumping; can be applied repeatedly" +#: ../src/selection-chemistry.cpp:2754 +msgid "" +"The object you're trying to select is <b>not visible</b> (it is in <" +"defs>)" msgstr "" -"Распределить клоны более равномерно, избавиться от комков; можно применять " -"несколько раз подряд" +"Объект, который вы пытаетесь выделить, <b>невидим</b> (находится в <" +"defs>)" -#: ../src/ui/dialog/clonetiler.cpp:1267 -msgid " Re_move " -msgstr " _Удалить " +#: ../src/selection-chemistry.cpp:2799 +#, fuzzy +msgid "Select <b>one</b> path to clone." +msgstr "Выделите <b>объект</b> для клонирования." + +#: ../src/selection-chemistry.cpp:2803 +#, fuzzy +msgid "Select one <b>path</b> to clone." +msgstr "Выделите <b>объект</b> для клонирования." -#: ../src/ui/dialog/clonetiler.cpp:1268 -msgid "Remove existing tiled clones of the selected object (siblings only)" -msgstr "" -"Удалить составляющие узор клоны выделенного объекта\n" -"(только в том же слое/группе)" +#: ../src/selection-chemistry.cpp:2859 +msgid "Select <b>object(s)</b> to convert to marker." +msgstr "Выделите <b>объект</b> для преобразования в маркер." -#: ../src/ui/dialog/clonetiler.cpp:1284 -msgid " R_eset " -msgstr " С_бросить " +#: ../src/selection-chemistry.cpp:2926 +msgid "Objects to marker" +msgstr "Объекты в маркер" -#. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1286 -msgid "" -"Reset all shifts, scales, rotates, opacity and color changes in the dialog " -"to zero" -msgstr "" -"Обнулить все введенные значения смещения, масштабирования, поворотов, " -"непрозрачности и цвета" +#: ../src/selection-chemistry.cpp:2950 +msgid "Select <b>object(s)</b> to convert to guides." +msgstr "Выделите <b>объект</b> для преобразования в направляющие." -#: ../src/ui/dialog/clonetiler.cpp:1359 -msgid "<small>Nothing selected.</small>" -msgstr "<small>Ничего не было выделено.</small>" +#: ../src/selection-chemistry.cpp:2973 +msgid "Objects to guides" +msgstr "Объекты в направляющие" -#: ../src/ui/dialog/clonetiler.cpp:1365 -msgid "<small>More than one object selected.</small>" -msgstr "" -"<small>Выделено больше одного объекта. Невозможно взять стиль от нескольких " -"объектов сразу.</small>" +#: ../src/selection-chemistry.cpp:3009 +#, fuzzy +msgid "Select <b>objects</b> to convert to symbol." +msgstr "Выделите <b>объект</b> для преобразования в маркер." -#: ../src/ui/dialog/clonetiler.cpp:1372 -#, c-format -msgid "<small>Object has <b>%d</b> tiled clones.</small>" -msgstr "<small>У объекта узор из <b>%d</b> клонов.</small>" +#: ../src/selection-chemistry.cpp:3115 +msgid "Group to symbol" +msgstr "Группа в символ" -#: ../src/ui/dialog/clonetiler.cpp:1377 -msgid "<small>Object has no tiled clones.</small>" -msgstr "<small>У объекта нет узора из клонов.</small>" +#: ../src/selection-chemistry.cpp:3134 +#, fuzzy +msgid "Select a <b>symbol</b> to extract objects from." +msgstr "" +"Выделите <b>объект с текстурной заливкой</b> для извлечения из него объектов." -#: ../src/ui/dialog/clonetiler.cpp:2097 -msgid "Select <b>one object</b> whose tiled clones to unclump." -msgstr "Выделите <b>один объект</b> для разравнивания узора из его клонов." +#: ../src/selection-chemistry.cpp:3143 +#, fuzzy +msgid "Select only one <b>symbol</b> in Symbol dialog to convert to group." +msgstr "Выделите <b>объект</b> для преобразования в направляющие." -#: ../src/ui/dialog/clonetiler.cpp:2119 -msgid "Unclump tiled clones" -msgstr "Разравнивание узора из клонов" +#: ../src/selection-chemistry.cpp:3201 +msgid "Group from symbol" +msgstr "Группа из символа" -#: ../src/ui/dialog/clonetiler.cpp:2148 -msgid "Select <b>one object</b> whose tiled clones to remove." -msgstr "Выделите <b>один объект</b> для удаления узора из его клонов." +#: ../src/selection-chemistry.cpp:3219 +msgid "Select <b>object(s)</b> to convert to pattern." +msgstr "Выделите <b>объект(ы)</b> для преобразования в текстуру." -#: ../src/ui/dialog/clonetiler.cpp:2171 -msgid "Delete tiled clones" -msgstr "Удаление узора из клонов" +#: ../src/selection-chemistry.cpp:3309 +msgid "Objects to pattern" +msgstr "Объекты в текстуру" -#: ../src/ui/dialog/clonetiler.cpp:2224 -msgid "" -"If you want to clone several objects, <b>group</b> them and <b>clone the " -"group</b>." +#: ../src/selection-chemistry.cpp:3325 +msgid "Select an <b>object with pattern fill</b> to extract objects from." msgstr "" -"Для клонирования нескольких объектов <b>сгруппируйте</b> их и <b>клонируйте " -"группу</b>." +"Выделите <b>объект с текстурной заливкой</b> для извлечения из него объектов." -#: ../src/ui/dialog/clonetiler.cpp:2233 -msgid "<small>Creating tiled clones...</small>" -msgstr "<small>Создается узор из клонов...</small>" +#: ../src/selection-chemistry.cpp:3380 +msgid "<b>No pattern fills</b> in the selection." +msgstr "В выделении <b>нет текстурной заливки</b>." -#: ../src/ui/dialog/clonetiler.cpp:2640 -msgid "Create tiled clones" -msgstr "Создание узора из клонов" +#: ../src/selection-chemistry.cpp:3383 +msgid "Pattern to objects" +msgstr "Текстура в объекты" -#: ../src/ui/dialog/clonetiler.cpp:2873 -msgid "<small>Per row:</small>" -msgstr "<small>На строку:</small>" +#: ../src/selection-chemistry.cpp:3474 +msgid "Select <b>object(s)</b> to make a bitmap copy." +msgstr "Выделите <b>объект(ы)</b> для создания растровой копии." -#: ../src/ui/dialog/clonetiler.cpp:2891 -msgid "<small>Per column:</small>" -msgstr "<small>На столбец:</small>" +#: ../src/selection-chemistry.cpp:3478 +msgid "Rendering bitmap..." +msgstr "Создается растровая копия..." -#: ../src/ui/dialog/clonetiler.cpp:2899 -msgid "<small>Randomize:</small>" -msgstr "<small>Случайно:</small>" +#: ../src/selection-chemistry.cpp:3657 +msgid "Create bitmap" +msgstr "Создание растровой копии" -#: ../src/ui/dialog/color-item.cpp:131 -#, c-format -msgid "" -"Color: <b>%s</b>; <b>Click</b> to set fill, <b>Shift+click</b> to set stroke" +#: ../src/selection-chemistry.cpp:3689 +msgid "Select <b>object(s)</b> to create clippath or mask from." msgstr "" -"Цвет: <b>%s</b>; <b>щелчок</b> применяет к заливке, <b>Shift+щелчок</b> — к " -"обводке" +"Выделите <b>объект(ы)</b>, из которых будет создан обтравочный контур или " +"маска." -#: ../src/ui/dialog/color-item.cpp:509 -msgid "Change color definition" -msgstr "Смена определения цвета" +#: ../src/selection-chemistry.cpp:3692 +msgid "Select mask object and <b>object(s)</b> to apply clippath or mask to." +msgstr "" +"Выделите объект-маску и <b>объект(ы)</b>, к которым применить обтравочный " +"контур или маску." -#: ../src/ui/dialog/color-item.cpp:679 -msgid "Remove stroke color" -msgstr "Удалить цвет обводки" +#: ../src/selection-chemistry.cpp:3875 +msgid "Set clipping path" +msgstr "Установлен обтравочный контур" -#: ../src/ui/dialog/color-item.cpp:679 -msgid "Remove fill color" -msgstr "Удалить цвет заливки" +#: ../src/selection-chemistry.cpp:3877 +msgid "Set mask" +msgstr "Установлена маска" -#: ../src/ui/dialog/color-item.cpp:684 -msgid "Set stroke color to none" -msgstr "Убрать цвет обводки" +#: ../src/selection-chemistry.cpp:3892 +msgid "Select <b>object(s)</b> to remove clippath or mask from." +msgstr "" +"Выделите <b>объект(ы)</b>, с которых нужно снять обтравочный контур или " +"маску." -#: ../src/ui/dialog/color-item.cpp:684 -msgid "Set fill color to none" -msgstr "Убрать цвет заливки" +#: ../src/selection-chemistry.cpp:4003 +msgid "Release clipping path" +msgstr "Обтравочный контур снят" -#: ../src/ui/dialog/color-item.cpp:700 -msgid "Set stroke color from swatch" -msgstr "Обводка из палитры образцов" +#: ../src/selection-chemistry.cpp:4005 +msgid "Release mask" +msgstr "Маска снята" -#: ../src/ui/dialog/color-item.cpp:700 -msgid "Set fill color from swatch" -msgstr "Заливка из палитры образцов" +#: ../src/selection-chemistry.cpp:4024 +msgid "Select <b>object(s)</b> to fit canvas to." +msgstr "Выделите <b>объект</b>, по размеру которого подогнать холст." -#: ../src/ui/dialog/debug.cpp:73 -msgid "Messages" -msgstr "Сообщения" +#. Fit Page +#: ../src/selection-chemistry.cpp:4044 ../src/verbs.cpp:2905 +msgid "Fit Page to Selection" +msgstr "Cтраница до выделения" -#: ../src/ui/dialog/debug.cpp:87 ../src/ui/dialog/messages.cpp:47 -msgid "_Clear" -msgstr "О_чистить" +#: ../src/selection-chemistry.cpp:4073 ../src/verbs.cpp:2907 +msgid "Fit Page to Drawing" +msgstr "Откадрировать холст до рисунка" -#: ../src/ui/dialog/debug.cpp:91 ../src/ui/dialog/messages.cpp:48 -msgid "Capture log messages" -msgstr "Сохранять отладочные сообщения" +#: ../src/selection-chemistry.cpp:4094 ../src/verbs.cpp:2909 +msgid "Fit Page to Selection or Drawing" +msgstr "Откадрировать холст до выделения или рисунка" -#: ../src/ui/dialog/debug.cpp:95 -msgid "Release log messages" -msgstr "Отключить сохранение отладочных сообщений" +#: ../src/selection-describer.cpp:128 +msgid "root" +msgstr "корневом слое" -#: ../src/ui/dialog/document-metadata.cpp:88 -#: ../src/ui/dialog/document-properties.cpp:159 -msgid "Metadata" -msgstr "Метаданные" +#: ../src/selection-describer.cpp:130 ../src/widgets/ege-paint-def.cpp:66 +#: ../src/widgets/ege-paint-def.cpp:90 +msgid "none" +msgstr "нет" -#: ../src/ui/dialog/document-metadata.cpp:89 -#: ../src/ui/dialog/document-properties.cpp:160 -msgid "License" -msgstr "Лицензия" +#: ../src/selection-describer.cpp:142 +#, c-format +msgid "layer <b>%s</b>" +msgstr "слое <b>%s</b>" -#: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:1007 -msgid "<b>Dublin Core Entities</b>" -msgstr "<b>Сущности Dublin Core</b>" +#: ../src/selection-describer.cpp:144 +#, c-format +msgid "layer <b><i>%s</i></b>" +msgstr "слой <b><i>%s</i></b>" -#: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1069 -msgid "<b>License</b>" -msgstr "<b>Лицензия</b>" +#: ../src/selection-describer.cpp:155 +#, c-format +msgid "<i>%s</i>" +msgstr "<i>%s</i>" -#. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:111 -#, fuzzy -msgid "Use antialiasing" -msgstr "Сглаживать" +#: ../src/selection-describer.cpp:165 +#, c-format +msgid " in %s" +msgstr " в %s" -#: ../src/ui/dialog/document-properties.cpp:111 +#: ../src/selection-describer.cpp:167 #, fuzzy -msgid "If unset, no antialiasing will be done on the drawing" -msgstr "Если включено, кайма всегда над холстом" - -#: ../src/ui/dialog/document-properties.cpp:112 -msgid "Show page _border" -msgstr "Показывать ка_йму холста" +msgid " hidden in definitions" +msgstr "Не разделять определения градиентов между объектами" -#: ../src/ui/dialog/document-properties.cpp:112 -msgid "If set, rectangular page border is shown" -msgstr "Если включено, отображается прямоугольная кайма холста" +#: ../src/selection-describer.cpp:169 +#, c-format +msgid " in group %s (%s)" +msgstr " в группе %s (%s)" -#: ../src/ui/dialog/document-properties.cpp:113 -msgid "Border on _top of drawing" -msgstr "Кайма над р_исунком" +#: ../src/selection-describer.cpp:171 +#, fuzzy, c-format +msgid " in unnamed group (%s)" +msgstr " в группе %s (%s)" -#: ../src/ui/dialog/document-properties.cpp:113 -msgid "If set, border is always on top of the drawing" -msgstr "Если включено, кайма всегда над холстом" +#: ../src/selection-describer.cpp:173 +#, fuzzy, c-format +msgid " in <b>%i</b> parent (%s)" +msgid_plural " in <b>%i</b> parents (%s)" +msgstr[0] " в <b>%i</b> родителе (%s)" +msgstr[1] " в <b>%i</b> родителях (%s)" +msgstr[2] " в <b>%i</b> родителях (%s)" -#: ../src/ui/dialog/document-properties.cpp:114 -msgid "_Show border shadow" -msgstr "Показать _тень каймы" +#: ../src/selection-describer.cpp:176 +#, fuzzy, c-format +msgid " in <b>%i</b> layer" +msgid_plural " in <b>%i</b> layers" +msgstr[0] " в <b>%i</b> слое." +msgstr[1] " в <b>%i</b> слоях." +msgstr[2] " в <b>%i</b> слоях.." -#: ../src/ui/dialog/document-properties.cpp:114 -msgid "If set, page border shows a shadow on its right and lower side" -msgstr "Если включено, кайма холста отбрасывает тень вправо и вниз" +#: ../src/selection-describer.cpp:187 +#, fuzzy +msgid "Convert symbol to group to edit" +msgstr "Оконтуривание обводки" -#: ../src/ui/dialog/document-properties.cpp:115 +#: ../src/selection-describer.cpp:191 #, fuzzy -msgid "Back_ground color:" -msgstr "Цвет фона:" +msgid "Remove from symbols tray to edit symbol" +msgstr "Оконтуривание обводки" -#: ../src/ui/dialog/document-properties.cpp:115 -msgid "" -"Color of the page background. Note: transparency setting ignored while " -"editing but used when exporting to bitmap." -msgstr "" +#: ../src/selection-describer.cpp:195 +msgid "Use <b>Shift+D</b> to look up original" +msgstr "<b>Shift+D</b> выделяет оригинал" -#: ../src/ui/dialog/document-properties.cpp:116 -msgid "Border _color:" -msgstr "Цвет _каймы:" +#: ../src/selection-describer.cpp:199 +msgid "Use <b>Shift+D</b> to look up path" +msgstr "<b>Shift+D</b> выделяет контур" -#: ../src/ui/dialog/document-properties.cpp:116 -msgid "Page border color" -msgstr "Цвет каймы холста" +#: ../src/selection-describer.cpp:203 +msgid "Use <b>Shift+D</b> to look up frame" +msgstr "<b>Shift+D</b> выделяет блок" -#: ../src/ui/dialog/document-properties.cpp:116 -msgid "Color of the page border" -msgstr "Цвет каймы холста" +#: ../src/selection-describer.cpp:215 +#, fuzzy, c-format +msgid "<b>%i</b> objects selected of type %s" +msgid_plural "<b>%i</b> objects selected of types %s" +msgstr[0] "<b>%i</b> объект выделен" +msgstr[1] "<b>%i</b> объекта выделено" +msgstr[2] "<b>%i</b> объектов выделено" -#: ../src/ui/dialog/document-properties.cpp:117 -msgid "Default _units:" -msgstr "_Единица измерения:" +#: ../src/selection-describer.cpp:225 +#, fuzzy, c-format +msgid "; <i>%d filtered object</i> " +msgid_plural "; <i>%d filtered objects</i> " +msgstr[0] "%s; <i>с фильтром</i>" +msgstr[1] "%s; <i>с фильтром</i>" +msgstr[2] "%s; <i>с фильтром</i>" -#. --------------------------------------------------------------- -#. General snap options -#: ../src/ui/dialog/document-properties.cpp:121 -msgid "Show _guides" -msgstr "Показывать н_аправляющие" +#: ../src/seltrans-handles.cpp:9 +msgid "" +"<b>Squeeze or stretch</b> selection; with <b>Ctrl</b> to scale uniformly; " +"with <b>Shift</b> to scale around rotation center" +msgstr "" +"<b>Сжать или растянуть</b> выделение; с <b>Ctrl</b> — сохранять пропорцию; с " +"<b>Shift</b> — вокруг центра вращения" -#: ../src/ui/dialog/document-properties.cpp:121 -msgid "Show or hide guides" -msgstr "Показать или скрыть направляющие" +#: ../src/seltrans-handles.cpp:10 +msgid "" +"<b>Scale</b> selection; with <b>Ctrl</b> to scale uniformly; with <b>Shift</" +"b> to scale around rotation center" +msgstr "" +"<b>Менять размер</b> выделения; с <b>Ctrl</b> —сохранять пропорцию; с " +"<b>Shift</b> — вокруг центра вращения" -#: ../src/ui/dialog/document-properties.cpp:122 -msgid "Guide co_lor:" -msgstr "Цв_ет направляющей:" +#: ../src/seltrans-handles.cpp:11 +msgid "" +"<b>Skew</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> to " +"skew around the opposite side" +msgstr "" +"<b>Наклонять</b> выделение; с <b>Ctrl</b> — ограничивать угол; с <b>Shift</" +"b> — вокруг противоположной стороны" -#: ../src/ui/dialog/document-properties.cpp:122 -msgid "Guideline color" -msgstr "Цвет направляющей" +#: ../src/seltrans-handles.cpp:12 +msgid "" +"<b>Rotate</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> " +"to rotate around the opposite corner" +msgstr "" +"<b>Вращать</b> выделение; с <b>Ctrl</b> — ограничивать угол; с <b>Shift</b> " +"— вокруг противоположного угла" -#: ../src/ui/dialog/document-properties.cpp:122 -msgid "Color of guidelines" -msgstr "Цвет направляющих линий" +#: ../src/seltrans-handles.cpp:13 +msgid "" +"<b>Center</b> of rotation and skewing: drag to reposition; scaling with " +"Shift also uses this center" +msgstr "" +"<b>Центр</b> вращения и наклона: его можно перетащить; масштабирование с " +"Shift также выполняется по этому центру" -#: ../src/ui/dialog/document-properties.cpp:123 -msgid "_Highlight color:" -msgstr "По_дсветка:" +#: ../src/seltrans.cpp:486 ../src/ui/dialog/transformation.cpp:982 +msgid "Skew" +msgstr "Наклон" -#: ../src/ui/dialog/document-properties.cpp:123 -msgid "Highlighted guideline color" -msgstr "Цвет подсвеченной направляющей" +#: ../src/seltrans.cpp:499 +msgid "Set center" +msgstr "Смена центра объекта" -#: ../src/ui/dialog/document-properties.cpp:123 -msgid "Color of a guideline when it is under mouse" -msgstr "Цвет направляющей линии в момент её нахождения под курсором" +#: ../src/seltrans.cpp:574 +msgid "Stamp" +msgstr "Штамповка" -#. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:125 -msgid "Snap _distance" -msgstr "Радиус _прилипания" +#: ../src/seltrans.cpp:723 +msgid "Reset center" +msgstr "Возврат к исходному центру" -#: ../src/ui/dialog/document-properties.cpp:125 -msgid "Snap only when _closer than:" -msgstr "Прилипать _только если ближе чем:" +#: ../src/seltrans.cpp:955 ../src/seltrans.cpp:1060 +#, c-format +msgid "<b>Scale</b>: %0.2f%% x %0.2f%%; with <b>Ctrl</b> to lock ratio" +msgstr "" +"<b>Изменить размер</b>: %0.2f%% x %0.2f%%; <b>Ctrl</b> сохраняет пропорцию" -#: ../src/ui/dialog/document-properties.cpp:125 -#: ../src/ui/dialog/document-properties.cpp:130 -#: ../src/ui/dialog/document-properties.cpp:135 -msgid "Always snap" -msgstr "Всегда прилипать" +#. TRANSLATORS: don't modify the first ";" +#. (it will NOT be displayed as ";" - only the second one will be) +#: ../src/seltrans.cpp:1199 +#, c-format +msgid "<b>Skew</b>: %0.2f°; with <b>Ctrl</b> to snap angle" +msgstr "<b>Наклон</b>: %0.2f°; <b>Ctrl</b> ограничивает угол" -#: ../src/ui/dialog/document-properties.cpp:126 -msgid "Snapping distance, in screen pixels, for snapping to objects" -msgstr "Зона прилипания к объектам, в экранных пикселах" +#. TRANSLATORS: don't modify the first ";" +#. (it will NOT be displayed as ";" - only the second one will be) +#: ../src/seltrans.cpp:1274 +#, c-format +msgid "<b>Rotate</b>: %0.2f°; with <b>Ctrl</b> to snap angle" +msgstr "<b>Вращение</b>: %0.2f°; <b>Ctrl</b> ограничивает угол" -#: ../src/ui/dialog/document-properties.cpp:126 -msgid "Always snap to objects, regardless of their distance" -msgstr "Всегда прилипать к объектам вне зависимости от расстояния до них" +#: ../src/seltrans.cpp:1311 +#, c-format +msgid "Move <b>center</b> to %s, %s" +msgstr "Переместить <b>центр</b> в %s, %s" -#: ../src/ui/dialog/document-properties.cpp:127 +#: ../src/seltrans.cpp:1465 +#, c-format msgid "" -"If set, objects only snap to another object when it's within the range " -"specified below" +"<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; " +"with <b>Shift</b> to disable snapping" msgstr "" -"Если включено, объекты прилипают к другим объектам только на указанном " -"минимальном расстоянии" - -#. Options for snapping to grids -#: ../src/ui/dialog/document-properties.cpp:130 -msgid "Snap d_istance" -msgstr "Радиус _прилипания" +"<b>Перемещение</b> на %s, %s; с <b>Ctrl</b> только по горизонтали/вертикали; " +"с <b>Shift</b> без прилипания" -#: ../src/ui/dialog/document-properties.cpp:130 -msgid "Snap only when c_loser than:" -msgstr "Прилипать только _если ближе чем:" +#: ../src/shortcuts.cpp:226 +#, fuzzy, c-format +msgid "Keyboard directory (%s) is unavailable." +msgstr "Каталог с палитрами (%s) недоступен." -#: ../src/ui/dialog/document-properties.cpp:131 -msgid "Snapping distance, in screen pixels, for snapping to grid" -msgstr "Зона прилипания к сетке, в экранных точках" +#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1299 +#: ../src/ui/dialog/export.cpp:1333 +msgid "Select a filename for exporting" +msgstr "Выберите имя файла для экспорта" -#: ../src/ui/dialog/document-properties.cpp:131 -msgid "Always snap to grids, regardless of the distance" -msgstr "Всегда прилипать к сеткам вне зависимости от расстояния до их линий" +#: ../src/shortcuts.cpp:370 +#, fuzzy +msgid "Select a file to import" +msgstr "Выберите файл для импорта" -#: ../src/ui/dialog/document-properties.cpp:132 -msgid "" -"If set, objects only snap to a grid line when it's within the range " -"specified below" +#: ../src/sp-anchor.cpp:125 +#, c-format +msgid "to %s" msgstr "" -"Если включено, объекты прилипают к линиям сетки только на указанном " -"минимальном расстоянии" -#. Options for snapping to guides -#: ../src/ui/dialog/document-properties.cpp:135 -msgid "Snap dist_ance" -msgstr "Радиус _прилипания" +#: ../src/sp-anchor.cpp:129 +#, fuzzy +msgid "without URI" +msgstr "<b>Ссылка</b> без URI" -#: ../src/ui/dialog/document-properties.cpp:135 -msgid "Snap only when close_r than:" -msgstr "Прилипать только если _ближе чем:" +#: ../src/sp-ellipse.cpp:374 +#, fuzzy +msgid "Segment" +msgstr "Сегмент линии" -#: ../src/ui/dialog/document-properties.cpp:136 -msgid "Snapping distance, in screen pixels, for snapping to guides" -msgstr "Зона прилипания к направляющим, в экранных точках" +#: ../src/sp-ellipse.cpp:376 +#, fuzzy +msgid "Arc" +msgstr "Арабский" -#: ../src/ui/dialog/document-properties.cpp:136 -msgid "Always snap to guides, regardless of the distance" -msgstr "Всегда прилипать к направляющим вне зависимости от расстояния до них" +#. Ellipse +#: ../src/sp-ellipse.cpp:379 ../src/sp-ellipse.cpp:386 +#: ../src/ui/dialog/inkscape-preferences.cpp:405 +#: ../src/widgets/pencil-toolbar.cpp:158 +msgid "Ellipse" +msgstr "Эллипс" -#: ../src/ui/dialog/document-properties.cpp:137 -msgid "" -"If set, objects only snap to a guide when it's within the range specified " -"below" -msgstr "" -"Если включено, объекты прилипают к направляющим только на указанном " -"минимальном расстоянии" +#: ../src/sp-ellipse.cpp:383 +msgid "Circle" +msgstr "Окружность" + +#. TRANSLATORS: "Flow region" is an area where text is allowed to flow +#: ../src/sp-flowregion.cpp:192 +#, fuzzy +msgid "Flow Region" +msgstr "Область верстки" -#. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:140 +#. TRANSLATORS: A region "cut out of" a flow region; text is not allowed to flow inside the +#. * flow excluded region. flowRegionExclude in SVG 1.2: see +#. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegion-elem and +#. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegionExclude-elem. +#: ../src/sp-flowregion.cpp:342 #, fuzzy -msgid "Snap to clip paths" -msgstr "Прилипать к контурам" +msgid "Flow Excluded Region" +msgstr "Область, исключённая из верстки" -#: ../src/ui/dialog/document-properties.cpp:140 -msgid "When snapping to paths, then also try snapping to clip paths" -msgstr "" +#: ../src/sp-flowtext.cpp:289 +#, fuzzy +msgid "Flowed Text" +msgstr "Текст в рамке" -#: ../src/ui/dialog/document-properties.cpp:141 +#: ../src/sp-flowtext.cpp:291 #, fuzzy -msgid "Snap to mask paths" -msgstr "Прилипать к контурам" +msgid "Linked Flowed Text" +msgstr "Текст в рамке" -#: ../src/ui/dialog/document-properties.cpp:141 -msgid "When snapping to paths, then also try snapping to mask paths" -msgstr "" +#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:352 +#: ../src/ui/tools/text-tool.cpp:1566 +msgid " [truncated]" +msgstr " [не уместились]" -#: ../src/ui/dialog/document-properties.cpp:142 -#, fuzzy -msgid "Snap perpendicularly" -msgstr "Перпендикулярная биссектриса" +#: ../src/sp-flowtext.cpp:300 +#, fuzzy, c-format +msgid "(%d character%s)" +msgid_plural "(%d characters%s)" +msgstr[0] "Символ >никода:" +msgstr[1] "Символ >никода:" +msgstr[2] "Символ >никода:" -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/sp-guide.cpp:303 +msgid "Create Guides Around the Page" +msgstr "Направляющие вокруг страницы" + +#: ../src/sp-guide.cpp:315 ../src/verbs.cpp:2470 +msgid "Delete All Guides" +msgstr "Удаление всех направляющих" + +#. Guide has probably been deleted and no longer has an attached namedview. +#: ../src/sp-guide.cpp:475 +msgid "Deleted" +msgstr "Удалено" + +#: ../src/sp-guide.cpp:484 msgid "" -"When snapping to paths or guides, then also try snapping perpendicularly" +"<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to " +"delete" msgstr "" +"<b>Shift+перетаскивание</b> вращает, <b>Ctrl+перетаскивание</b> смещает " +"исходную точку, <b>Del</b> удаляет" -#: ../src/ui/dialog/document-properties.cpp:143 -#, fuzzy -msgid "Snap tangentially" -msgstr "Установить заливку" +#: ../src/sp-guide.cpp:488 +#, c-format +msgid "vertical, at %s" +msgstr "вертикальная, в позиции %s" -#: ../src/ui/dialog/document-properties.cpp:143 -msgid "When snapping to paths or guides, then also try snapping tangentially" -msgstr "" +#: ../src/sp-guide.cpp:491 +#, c-format +msgid "horizontal, at %s" +msgstr "горизонтальная, в позиции %s" -#: ../src/ui/dialog/document-properties.cpp:146 -msgctxt "Grid" -msgid "_New" -msgstr "_Создать" +#: ../src/sp-guide.cpp:496 +#, c-format +msgid "at %d degrees, through (%s,%s)" +msgstr "под углом %d градусов, через (%s,%s)" -#: ../src/ui/dialog/document-properties.cpp:146 -msgid "Create new grid." -msgstr "Создать новую сетку" +#: ../src/sp-image.cpp:525 +msgid "embedded" +msgstr "включенное" -#: ../src/ui/dialog/document-properties.cpp:147 -msgctxt "Grid" -msgid "_Remove" -msgstr "_Удалить" +#: ../src/sp-image.cpp:533 +#, fuzzy, c-format +msgid "[bad reference]: %s" +msgstr "Параметры Звезды" -#: ../src/ui/dialog/document-properties.cpp:147 -msgid "Remove selected grid." -msgstr "Удалить выделенную сетку" +#: ../src/sp-image.cpp:534 +#, fuzzy, c-format +msgid "%d × %d: %s" +msgstr "<b>Изображение</b> %d x %d: %s" -#: ../src/ui/dialog/document-properties.cpp:154 -#: ../src/widgets/toolbox.cpp:1835 -msgid "Guides" -msgstr "Направляющие" +#: ../src/sp-item-group.cpp:329 +msgid "Group" +msgstr "Группа" -#: ../src/ui/dialog/document-properties.cpp:156 ../src/verbs.cpp:2744 -msgid "Snap" -msgstr "Прилипание" +#: ../src/sp-item-group.cpp:335 ../src/sp-switch.cpp:82 +#, fuzzy, c-format +msgid "of <b>%d</b> object" +msgstr "<b>Группа</b> из <b>%d</b> объекта" -#: ../src/ui/dialog/document-properties.cpp:158 -msgid "Scripting" -msgstr "Сценарии" +#: ../src/sp-item-group.cpp:335 ../src/sp-switch.cpp:82 +#, fuzzy, c-format +msgid "of <b>%d</b> objects" +msgstr "<b>Группа</b> из <b>%d</b> объекта" -#: ../src/ui/dialog/document-properties.cpp:322 -msgid "<b>General</b>" -msgstr "<b>Общие</b>" +#: ../src/sp-item.cpp:970 ../src/verbs.cpp:213 +msgid "Object" +msgstr "Объект" -#: ../src/ui/dialog/document-properties.cpp:324 -msgid "<b>Page Size</b>" -msgstr "<b>Размер страницы</b>" +#: ../src/sp-item.cpp:987 +#, c-format +msgid "%s; <i>clipped</i>" +msgstr "%s; <i>под обтравочным контуром</i>" -#: ../src/ui/dialog/document-properties.cpp:326 -#, fuzzy -msgid "<b>Display</b>" -msgstr "<b>a</b>" +#: ../src/sp-item.cpp:993 +#, c-format +msgid "%s; <i>masked</i>" +msgstr "%s; <i>маскирован</i>" -#: ../src/ui/dialog/document-properties.cpp:361 -msgid "<b>Guides</b>" -msgstr "<b>Направляющие</b>" +#: ../src/sp-item.cpp:1003 +#, c-format +msgid "%s; <i>filtered (%s)</i>" +msgstr "%s; <i>с фильтром (%s)</i>" -#: ../src/ui/dialog/document-properties.cpp:379 -msgid "<b>Snap to objects</b>" -msgstr "<b>Прилипание к объектам</b>" +#: ../src/sp-item.cpp:1005 +#, c-format +msgid "%s; <i>filtered</i>" +msgstr "%s; <i>с фильтром</i>" -#: ../src/ui/dialog/document-properties.cpp:381 -msgid "<b>Snap to grids</b>" -msgstr "<b>Прилипание к сеткам</b>" +#: ../src/sp-line.cpp:126 +msgid "Line" +msgstr "Линия" -#: ../src/ui/dialog/document-properties.cpp:383 -msgid "<b>Snap to guides</b>" -msgstr "<b>Прилипание к направляющим</b>" +#: ../src/sp-lpe-item.cpp:262 +msgid "An exception occurred during execution of the Path Effect." +msgstr "Прерывание при выполнении контурного эффекта" -#: ../src/ui/dialog/document-properties.cpp:385 +#: ../src/sp-offset.cpp:339 #, fuzzy -msgid "<b>Miscellaneous</b>" -msgstr "Прочие параметры:" - -#. TODO check if this next line was sometimes needed. It being there caused an assertion. -#. Inkscape::GC::release(defsRepr); -#. inform the document, so we can undo -#. Color Management -#: ../src/ui/dialog/document-properties.cpp:498 ../src/verbs.cpp:2921 -msgid "Link Color Profile" -msgstr "Связать с цветовым профилем" +msgid "Linked Offset" +msgstr "С_вязанная втяжка" -#: ../src/ui/dialog/document-properties.cpp:599 -msgid "Remove linked color profile" -msgstr "Удалить связанный цветовой профиль" +#: ../src/sp-offset.cpp:341 +#, fuzzy +msgid "Dynamic Offset" +msgstr "_Динамическая втяжка" -#: ../src/ui/dialog/document-properties.cpp:613 -msgid "<b>Linked Color Profiles:</b>" -msgstr "<b>Связанные цветовые профили:</b>" +#. TRANSLATORS COMMENT: %s is either "outset" or "inset" depending on sign +#: ../src/sp-offset.cpp:347 +#, c-format +msgid "%s by %f pt" +msgstr "" -#: ../src/ui/dialog/document-properties.cpp:615 -msgid "<b>Available Color Profiles:</b>" -msgstr "<b>Доступные цветовые профили:</b>" +#: ../src/sp-offset.cpp:348 +msgid "outset" +msgstr "оттянута" -#: ../src/ui/dialog/document-properties.cpp:617 -msgid "Link Profile" -msgstr "Связать с профилем" +#: ../src/sp-offset.cpp:348 +msgid "inset" +msgstr "втянута" -#: ../src/ui/dialog/document-properties.cpp:626 -msgid "Unlink Profile" -msgstr "Удалить связь с профилем" +#: ../src/sp-path.cpp:70 +msgid "Path" +msgstr "Контур" -#: ../src/ui/dialog/document-properties.cpp:710 -msgid "Profile Name" -msgstr "Название профиля" +#: ../src/sp-path.cpp:95 +#, fuzzy, c-format +msgid ", path effect: %s" +msgstr "Добавить контурный эффект" -#: ../src/ui/dialog/document-properties.cpp:746 -msgid "External scripts" -msgstr "Внешние сценарии" +#: ../src/sp-path.cpp:98 +#, fuzzy, c-format +msgid "%i node%s" +msgstr "Соединение узлов" -#: ../src/ui/dialog/document-properties.cpp:747 -#, fuzzy -msgid "Embedded scripts" -msgstr "Удалить сценарий" +#: ../src/sp-path.cpp:98 +#, fuzzy, c-format +msgid "%i nodes%s" +msgstr "Соединение узлов" -#: ../src/ui/dialog/document-properties.cpp:752 -msgid "<b>External script files:</b>" -msgstr "<b>Внешние файлы сценариев:</b>" +#: ../src/sp-polygon.cpp:185 +msgid "<b>Polygon</b>" +msgstr "<b>Многоугольник</b>" -#: ../src/ui/dialog/document-properties.cpp:754 -msgid "Add the current file name or browse for a file" -msgstr "" +#: ../src/sp-polyline.cpp:131 +msgid "<b>Polyline</b>" +msgstr "<b>Полилиния</b>" -#: ../src/ui/dialog/document-properties.cpp:763 -#: ../src/ui/dialog/document-properties.cpp:852 -#: ../src/ui/widget/selected-style.cpp:339 -msgid "Remove" -msgstr "Удалить" +#. Rectangle +#: ../src/sp-rect.cpp:163 ../src/ui/dialog/inkscape-preferences.cpp:395 +msgid "Rectangle" +msgstr "Прямоугольник" -#: ../src/ui/dialog/document-properties.cpp:833 -msgid "Filename" -msgstr "Имя файла" +#. Spiral +#: ../src/sp-spiral.cpp:230 ../src/ui/dialog/inkscape-preferences.cpp:413 +#: ../share/extensions/gcodetools_area.inx.h:11 +msgid "Spiral" +msgstr "Спираль" -#: ../src/ui/dialog/document-properties.cpp:841 -#, fuzzy -msgid "<b>Embedded script files:</b>" -msgstr "<b>Внешние файлы сценариев:</b>" +#. TRANSLATORS: since turn count isn't an integer, please adjust the +#. string as needed to deal with an localized plural forms. +#: ../src/sp-spiral.cpp:236 +#, fuzzy, c-format +msgid "with %3f turns" +msgstr "<b>Спираль</b> на %3f оборотов" -#: ../src/ui/dialog/document-properties.cpp:843 -#, fuzzy -msgid "New" -msgstr "Новый" +#. Star +#: ../src/sp-star.cpp:256 ../src/ui/dialog/inkscape-preferences.cpp:409 +#: ../src/widgets/star-toolbar.cpp:469 +msgid "Star" +msgstr "Звезда" -#: ../src/ui/dialog/document-properties.cpp:922 -#, fuzzy -msgid "Script id" -msgstr "Письменность:" +#: ../src/sp-star.cpp:257 ../src/widgets/star-toolbar.cpp:462 +msgid "Polygon" +msgstr "Многоугольник" -#: ../src/ui/dialog/document-properties.cpp:928 -#, fuzzy -msgid "<b>Content:</b>" -msgstr "<b>Экспонента:</b>" +#. while there will never be less than 3 vertices, we still need to +#. make calls to ngettext because the pluralization may be different +#. for various numbers >=3. The singular form is used as the index. +#: ../src/sp-star.cpp:264 +#, fuzzy, c-format +msgid "with %d vertex" +msgstr "<b>Звезда</b> с %d лучом" -#: ../src/ui/dialog/document-properties.cpp:1045 -#, fuzzy -msgid "_Save as default" -msgstr "Сохранить как умолчание" +#: ../src/sp-star.cpp:264 +#, fuzzy, c-format +msgid "with %d vertices" +msgstr "<b>Звезда</b> с %d лучом" -#: ../src/ui/dialog/document-properties.cpp:1046 -msgid "Save this metadata as the default metadata" +#: ../src/sp-switch.cpp:76 +msgid "Conditional Group" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1047 -#, fuzzy -msgid "Use _default" -msgstr "Используемый системой" +#: ../src/sp-text.cpp:325 ../src/verbs.cpp:328 +#: ../share/extensions/lorem_ipsum.inx.h:8 +#: ../share/extensions/replace_font.inx.h:11 +#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 +#: ../share/extensions/text_extract.inx.h:14 +#: ../share/extensions/text_flipcase.inx.h:2 +#: ../share/extensions/text_lowercase.inx.h:2 +#: ../share/extensions/text_merge.inx.h:16 +#: ../share/extensions/text_randomcase.inx.h:2 +#: ../share/extensions/text_sentencecase.inx.h:2 +#: ../share/extensions/text_titlecase.inx.h:2 +#: ../share/extensions/text_uppercase.inx.h:2 +msgid "Text" +msgstr "Текст" -#: ../src/ui/dialog/document-properties.cpp:1048 -msgid "Use the previously saved default metadata here" -msgstr "" +#. TRANSLATORS: For description of font with no name. +#: ../src/sp-text.cpp:342 +msgid "<no name found>" +msgstr "<нет имени>" -#. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1121 -msgid "Add external script..." -msgstr "Добавить внешний сценарий" +#: ../src/sp-text.cpp:356 +#, fuzzy, c-format +msgid "on path%s (%s, %s)" +msgstr "<b>Текст по контуру</b>%s (%s, %s)" -#: ../src/ui/dialog/document-properties.cpp:1160 -#, fuzzy -msgid "Select a script to load" -msgstr "Выберите контур или фигуру" +#: ../src/sp-text.cpp:357 +#, fuzzy, c-format +msgid "%s (%s, %s)" +msgstr "<b>Текст</b>%s (%s, %s)" -#. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1188 +#: ../src/sp-tref.cpp:230 #, fuzzy -msgid "Add embedded script..." -msgstr "Добавить внешний сценарий" +msgid "Cloned Character Data" +msgstr "<b>Клонированный текст</b> %s%s" -#. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1219 -msgid "Remove external script" -msgstr "Удалить внешний сценарий" +#: ../src/sp-tref.cpp:246 +msgid " from " +msgstr " из " -#. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1249 -#, fuzzy -msgid "Remove embedded script" -msgstr "Удалить сценарий" +#: ../src/sp-tref.cpp:252 ../src/sp-use.cpp:262 +msgid "[orphaned]" +msgstr "" -#. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); -#. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1346 +#: ../src/sp-tspan.cpp:217 #, fuzzy -msgid "Edit embedded script" -msgstr "Удалить сценарий" +msgid "Text Span" +msgstr "Импорт текстовых файлов" -#: ../src/ui/dialog/document-properties.cpp:1429 -msgid "<b>Creation</b>" -msgstr "<b>Создание</b>" +#: ../src/sp-use.cpp:227 +#, fuzzy +msgid "Symbol" +msgstr "Симво_л" -#: ../src/ui/dialog/document-properties.cpp:1430 -msgid "<b>Defined grids</b>" -msgstr "<b>Определённые пользователем сетки</b>" +#: ../src/sp-use.cpp:230 +#, fuzzy +msgid "Clone" +msgstr "Склонирована" -#: ../src/ui/dialog/document-properties.cpp:1677 -msgid "Remove grid" -msgstr "Удаление сетки" +#: ../src/sp-use.cpp:237 ../src/sp-use.cpp:239 +#, c-format +msgid "called %s" +msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1756 +#: ../src/sp-use.cpp:239 #, fuzzy -msgid "Changed document unit" -msgstr "Безымянный документ %d" +msgid "Unnamed Symbol" +msgstr "Кхмерские символы" -#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2796 -msgid "_Page" -msgstr "_Страница" +#. TRANSLATORS: Used for statusbar description for long <use> chains: +#. * "Clone of: Clone of: ... in Layer 1". +#: ../src/sp-use.cpp:248 +msgid "..." +msgstr "..." -#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2800 -msgid "_Drawing" -msgstr "_Рисунок" +#: ../src/sp-use.cpp:257 +#, fuzzy, c-format +msgid "of: %s" +msgstr "Ошибка: %s" -#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2802 -msgid "_Selection" -msgstr "_Выделение" +#: ../src/splivarot.cpp:70 ../src/splivarot.cpp:76 +msgid "Union" +msgstr "Сумма" -#: ../src/ui/dialog/export.cpp:152 -msgid "_Custom" -msgstr "_Заказная" +#: ../src/splivarot.cpp:82 +msgid "Intersection" +msgstr "Пересечение" -#: ../src/ui/dialog/export.cpp:170 ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 -#: ../share/extensions/render_gears.inx.h:6 -msgid "Units:" -msgstr "Единица измерения:" +#: ../src/splivarot.cpp:105 +msgid "Division" +msgstr "Деление" -#: ../src/ui/dialog/export.cpp:172 -msgid "_Export As..." -msgstr "Экспортировать _как..." +#: ../src/splivarot.cpp:110 +msgid "Cut path" +msgstr "Разрезание контура" -#: ../src/ui/dialog/export.cpp:175 -msgid "B_atch export all selected objects" -msgstr "Пакетный экспорт _всех выделенных объектов" +#: ../src/splivarot.cpp:333 +msgid "Select <b>at least 2 paths</b> to perform a boolean operation." +msgstr "Для логической операции нужно выбрать <b>не менее 2 контуров</b>." -#: ../src/ui/dialog/export.cpp:175 +#: ../src/splivarot.cpp:337 +msgid "Select <b>at least 1 path</b> to perform a boolean union." +msgstr "Для объединения нужно выбрать <b>не менее 1 контура</b>." + +#: ../src/splivarot.cpp:345 msgid "" -"Export each selected object into its own PNG file, using export hints if any " -"(caution, overwrites without asking!)" +"Select <b>exactly 2 paths</b> to perform difference, division, or path cut." msgstr "" -"Экспортировать каждый выделенный объект в отдельный файл PNG, используя " -"подсказки, если таковые доступны (без подтверждения перезаписи существующих " -"файлов)" - -#: ../src/ui/dialog/export.cpp:177 -msgid "Hide a_ll except selected" -msgstr "Э_кспортировать только выделенное" - -#: ../src/ui/dialog/export.cpp:177 -msgid "In the exported image, hide all objects except those that are selected" -msgstr "Исключить из конечного изображения все невыделенные объекты" - -#: ../src/ui/dialog/export.cpp:178 -msgid "Close when complete" -msgstr "Закрыть по завершении" +"Выделите <b>ровно 2 контура</b> для операций разности, исключающего ИЛИ, " +"деления и разрезания контура " -#: ../src/ui/dialog/export.cpp:178 -msgid "Once the export completes, close this dialog" +#: ../src/splivarot.cpp:361 ../src/splivarot.cpp:376 +msgid "" +"Unable to determine the <b>z-order</b> of the objects selected for " +"difference, XOR, division, or path cut." msgstr "" +"Невозможно определить <b>порядок расположения друг над другом</b> объектов, " +"выделенных для операций разности, исключающего ИЛИ, деления или разрезания " +"контура." -#: ../src/ui/dialog/export.cpp:180 -msgid "_Export" -msgstr "_Экспорт" - -#: ../src/ui/dialog/export.cpp:198 -msgid "<b>Export area</b>" -msgstr "<b>Экспортируемая область</b>" - -#: ../src/ui/dialog/export.cpp:237 -msgid "_x0:" -msgstr "_x0" - -#: ../src/ui/dialog/export.cpp:241 -msgid "x_1:" -msgstr "x_1" - -#: ../src/ui/dialog/export.cpp:245 -msgid "Wid_th:" -msgstr "Ш_ирина:" - -#: ../src/ui/dialog/export.cpp:249 -msgid "_y0:" -msgstr "y_0" - -#: ../src/ui/dialog/export.cpp:253 -msgid "y_1:" -msgstr "_y1" - -#: ../src/ui/dialog/export.cpp:257 -msgid "Hei_ght:" -msgstr "В_ысота:" +#: ../src/splivarot.cpp:407 +msgid "" +"One of the objects is <b>not a path</b>, cannot perform boolean operation." +msgstr "" +"Один из объектов <b>не является контуром</b>, логическая операция невозможна." -#: ../src/ui/dialog/export.cpp:272 -msgid "<b>Image size</b>" -msgstr "<b>Размер изображения</b>" +#: ../src/splivarot.cpp:1157 +msgid "Select <b>stroked path(s)</b> to convert stroke to path." +msgstr "" +"Выделите <b>объекты с обводкой</b> для преобразования обводки в контур." -#: ../src/ui/dialog/export.cpp:290 ../src/ui/dialog/export.cpp:301 -msgid "pixels at" -msgstr "пикселов при" +#: ../src/splivarot.cpp:1516 +msgid "Convert stroke to path" +msgstr "Оконтуривание обводки" -#: ../src/ui/dialog/export.cpp:296 -msgid "dp_i" -msgstr "dp_i" +#. TRANSLATORS: "to outline" means "to convert stroke to path" +#: ../src/splivarot.cpp:1519 +msgid "<b>No stroked paths</b> in the selection." +msgstr "В выделении <b>нет контуров с обводкой</b>." -#: ../src/ui/dialog/export.cpp:301 ../src/ui/dialog/transformation.cpp:82 -#: ../src/ui/widget/page-sizer.cpp:237 -msgid "_Height:" -msgstr "_Высота:" +#: ../src/splivarot.cpp:1590 +msgid "Selected object is <b>not a path</b>, cannot inset/outset." +msgstr "" +"Выделенный объект <b>не является контуром</b>, втяжка/растяжка невозможны." -#: ../src/ui/dialog/export.cpp:309 -#: ../src/ui/dialog/inkscape-preferences.cpp:1434 -#: ../src/ui/dialog/inkscape-preferences.cpp:1438 -#: ../src/ui/dialog/inkscape-preferences.cpp:1462 -msgid "dpi" -msgstr "dpi" +#: ../src/splivarot.cpp:1681 ../src/splivarot.cpp:1746 +msgid "Create linked offset" +msgstr "Создание связанной втяжки" -#: ../src/ui/dialog/export.cpp:317 -msgid "<b>_Filename</b>" -msgstr "<b>_Имя файла</b>" +#: ../src/splivarot.cpp:1682 ../src/splivarot.cpp:1747 +msgid "Create dynamic offset" +msgstr "Создание динамической втяжки" -#: ../src/ui/dialog/export.cpp:359 -msgid "Export the bitmap file with these settings" -msgstr "Экспортировать файл с этими установками" +#: ../src/splivarot.cpp:1772 +msgid "Select <b>path(s)</b> to inset/outset." +msgstr "Выделите <b>контур</b> для втяжки/растяжки." -#: ../src/ui/dialog/export.cpp:612 -#, c-format -msgid "B_atch export %d selected object" -msgid_plural "B_atch export %d selected objects" -msgstr[0] "Пакетный экспорт %d выделенного объекта" -msgstr[1] "Пакетный экспорт %d выделенных объектов" -msgstr[2] "Пакетный экспорт %d выделенных объектов" +#: ../src/splivarot.cpp:1968 +msgid "Outset path" +msgstr "Растяжка контура" -#: ../src/ui/dialog/export.cpp:928 -msgid "Export in progress" -msgstr "Выполняется экспорт" +#: ../src/splivarot.cpp:1968 +msgid "Inset path" +msgstr "Втяжка контура" -#: ../src/ui/dialog/export.cpp:1018 -msgid "No items selected." -msgstr "Ни один объект не выбран" +#: ../src/splivarot.cpp:1970 +msgid "<b>No paths</b> to inset/outset in the selection." +msgstr "В выделении <b>нет контуров</b> для втяжки/растяжки." -#: ../src/ui/dialog/export.cpp:1022 ../src/ui/dialog/export.cpp:1024 -#, fuzzy -msgid "Exporting %1 files" -msgstr "Экспорт %d файлов" +#: ../src/splivarot.cpp:2132 +msgid "Simplifying paths (separately):" +msgstr "Упрощение контуров (раздельно)" -#: ../src/ui/dialog/export.cpp:1064 ../src/ui/dialog/export.cpp:1066 -#, c-format -msgid "Exporting file <b>%s</b>..." -msgstr "Экспортируется файл <b>%s</b>..." +#: ../src/splivarot.cpp:2134 +msgid "Simplifying paths:" +msgstr "Упрощение контуров" -#: ../src/ui/dialog/export.cpp:1075 ../src/ui/dialog/export.cpp:1166 +#: ../src/splivarot.cpp:2171 #, c-format -msgid "Could not export to filename %s.\n" -msgstr "Невозможно экспортировать в файл %s.\n" +msgid "%s <b>%d</b> of <b>%d</b> paths simplified..." +msgstr "%s: <b>%d</b> из <b>%d</b> контуров упрощено..." -#: ../src/ui/dialog/export.cpp:1078 +#: ../src/splivarot.cpp:2184 #, c-format -msgid "Could not export to filename <b>%s</b>." -msgstr "Не удалось экспортировать в файл <b>%s</b>." +msgid "<b>%d</b> paths simplified." +msgstr "<b>%d</b> контуров упрощено." -#: ../src/ui/dialog/export.cpp:1093 -#, c-format -msgid "Successfully exported <b>%d</b> files from <b>%d</b> selected items." -msgstr "" +#: ../src/splivarot.cpp:2198 +msgid "Select <b>path(s)</b> to simplify." +msgstr "Выделите <b>контур(ы)</b> для упрощения." -#: ../src/ui/dialog/export.cpp:1104 -msgid "You have to enter a filename." -msgstr "Необходимо ввести имя файла." +#: ../src/splivarot.cpp:2214 +msgid "<b>No paths</b> to simplify in the selection." +msgstr "В выделении <b>нет контуров</b> для упрощения." -#: ../src/ui/dialog/export.cpp:1105 -msgid "You have to enter a filename" -msgstr "Вы забыли ввести имя файла" +#: ../src/text-chemistry.cpp:94 +msgid "Select <b>a text and a path</b> to put text on path." +msgstr "Выделите <b>текст и контур</b> для размещения текста по контуру." -#: ../src/ui/dialog/export.cpp:1119 -msgid "The chosen area to be exported is invalid." -msgstr "Экспортируемая область выбрана некорректно." +#: ../src/text-chemistry.cpp:99 +msgid "" +"This text object is <b>already put on a path</b>. Remove it from the path " +"first. Use <b>Shift+D</b> to look up its path." +msgstr "" +"Этот текстовый объект <b>уже размещен по контуру</b>. Сначала снимите его с " +"контура. Нажмите <b>Shift-D</b> для перехода к его контуру." -#: ../src/ui/dialog/export.cpp:1120 -msgid "The chosen area to be exported is invalid" -msgstr "Недопустимая область для экспорта" +#. rect is the only SPShape which is not <path> yet, and thus SVG forbids us from putting text on it +#: ../src/text-chemistry.cpp:105 +msgid "" +"You cannot put text on a rectangle in this version. Convert rectangle to " +"path first." +msgstr "" +"В этой версии программы нельзя разместить текст по контуру прямоугольника. " +"Преобразуйте прямоугольник в контур и попробуйте снова." -#: ../src/ui/dialog/export.cpp:1135 -#, c-format -msgid "Directory %s does not exist or is not a directory.\n" -msgstr "Каталог %s не существует, либо это не каталог.\n" +#: ../src/text-chemistry.cpp:115 +msgid "The flowed text(s) must be <b>visible</b> in order to be put on a path." +msgstr "" +"Заверстанный текст должен быть <b>видимым</b>, чтобы быть размещенным по " +"контуру." -#. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image -#: ../src/ui/dialog/export.cpp:1149 ../src/ui/dialog/export.cpp:1151 -msgid "Exporting %1 (%2 x %3)" -msgstr "Экспорт %1 (%2 × %3)" +#: ../src/text-chemistry.cpp:185 ../src/verbs.cpp:2492 +msgid "Put text on path" +msgstr "Разместить текст по контуру" -#: ../src/ui/dialog/export.cpp:1177 -#, c-format -msgid "Drawing exported to <b>%s</b>." -msgstr "Рисунок экспортирован в <b>%s</b>." +#: ../src/text-chemistry.cpp:197 +msgid "Select <b>a text on path</b> to remove it from path." +msgstr "Выделите <b>текст по контуру</b>, чтобы снять его с контура." -#: ../src/ui/dialog/export.cpp:1181 -msgid "Export aborted." -msgstr "Экспорт прерван." +#: ../src/text-chemistry.cpp:218 +msgid "<b>No texts-on-paths</b> in the selection." +msgstr "В выделении нет <b>текстов по контуру</b>." -#: ../src/ui/dialog/export.cpp:1303 ../src/ui/dialog/input.cpp:1082 -#: ../src/verbs.cpp:2358 ../src/widgets/desktop-widget.cpp:1123 -msgid "_Save" -msgstr "Со_хранить" +#: ../src/text-chemistry.cpp:221 ../src/verbs.cpp:2494 +msgid "Remove text from path" +msgstr "Снять текст с контура" -#: ../src/ui/dialog/extension-editor.cpp:81 -msgid "Information" -msgstr "Информация" +#: ../src/text-chemistry.cpp:262 ../src/text-chemistry.cpp:283 +msgid "Select <b>text(s)</b> to remove kerns from." +msgstr "Выделите <b>текст</b> для удаления ручного кернинга." -#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:290 -#: ../src/verbs.cpp:309 ../share/extensions/color_HSL_adjust.inx.h:11 -#: ../share/extensions/color_custom.inx.h:7 -#: ../share/extensions/color_randomize.inx.h:6 -#: ../share/extensions/dots.inx.h:7 -#: ../share/extensions/draw_from_triangle.inx.h:35 -#: ../share/extensions/dxf_input.inx.h:10 -#: ../share/extensions/dxf_outlines.inx.h:24 -#: ../share/extensions/gcodetools_about.inx.h:3 -#: ../share/extensions/gcodetools_area.inx.h:53 -#: ../share/extensions/gcodetools_check_for_updates.inx.h:3 -#: ../share/extensions/gcodetools_dxf_points.inx.h:25 -#: ../share/extensions/gcodetools_engraving.inx.h:31 -#: ../share/extensions/gcodetools_graffiti.inx.h:42 -#: ../share/extensions/gcodetools_lathe.inx.h:46 -#: ../share/extensions/gcodetools_orientation_points.inx.h:14 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:35 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:17 -#: ../share/extensions/gcodetools_tools_library.inx.h:12 -#: ../share/extensions/generate_voronoi.inx.h:5 -#: ../share/extensions/gimp_xcf.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:27 -#: ../share/extensions/jessyInk_autoTexts.inx.h:8 -#: ../share/extensions/jessyInk_effects.inx.h:13 -#: ../share/extensions/jessyInk_export.inx.h:7 -#: ../share/extensions/jessyInk_install.inx.h:2 -#: ../share/extensions/jessyInk_keyBindings.inx.h:44 -#: ../share/extensions/jessyInk_masterSlide.inx.h:5 -#: ../share/extensions/jessyInk_mouseHandler.inx.h:6 -#: ../share/extensions/jessyInk_summary.inx.h:2 -#: ../share/extensions/jessyInk_transitions.inx.h:12 -#: ../share/extensions/jessyInk_uninstall.inx.h:10 -#: ../share/extensions/jessyInk_video.inx.h:2 -#: ../share/extensions/jessyInk_view.inx.h:7 -#: ../share/extensions/layout_nup.inx.h:24 -#: ../share/extensions/lindenmayer.inx.h:13 -#: ../share/extensions/lorem_ipsum.inx.h:6 -#: ../share/extensions/measure.inx.h:16 -#: ../share/extensions/pathalongpath.inx.h:16 -#: ../share/extensions/pathscatter.inx.h:18 -#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/split.inx.h:8 -#: ../share/extensions/voronoi2svg.inx.h:11 -#: ../share/extensions/web-set-att.inx.h:25 -#: ../share/extensions/web-transmit-att.inx.h:23 -#: ../share/extensions/webslicer_create_group.inx.h:11 -#: ../share/extensions/webslicer_export.inx.h:6 -msgid "Help" -msgstr "Справка" +#: ../src/text-chemistry.cpp:286 +msgid "Remove manual kerns" +msgstr "Убрать ручной кернинг" -#: ../src/ui/dialog/extension-editor.cpp:83 -msgid "Parameters" -msgstr "Параметры" +#: ../src/text-chemistry.cpp:306 +msgid "" +"Select <b>a text</b> and one or more <b>paths or shapes</b> to flow text " +"into frame." +msgstr "" +"Выделите <b>текст</b> и <b>контур или фигуру</b> для заверстки текста в " +"рамку." -#. Fill in the template -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:376 -msgid "No preview" -msgstr "Без предпросмотра" +#: ../src/text-chemistry.cpp:376 +msgid "Flow text into shape" +msgstr "Завёрстывание текста в блок" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:480 -msgid "too large for preview" -msgstr "Слишком велик для просмотра" +#: ../src/text-chemistry.cpp:398 +msgid "Select <b>a flowed text</b> to unflow it." +msgstr "Выделите <b>текст в рамке</b>, чтобы вынуть его из рамки." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:565 -msgid "Enable preview" -msgstr "Включить предпросмотр" +#: ../src/text-chemistry.cpp:472 +msgid "Unflow flowed text" +msgstr "Извлечение текста из блока" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:715 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:728 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:732 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:735 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:743 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:759 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:774 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:282 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:413 -msgid "All Files" -msgstr "Все файлы" +#: ../src/text-chemistry.cpp:484 +msgid "Select <b>flowed text(s)</b> to convert." +msgstr "Выделите <b>завёрстанный текст</b>, чтобы вынуть его из блока." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:740 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:756 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:771 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:283 -msgid "All Inkscape Files" -msgstr "Все файлы Inkscape" +#: ../src/text-chemistry.cpp:502 +msgid "The flowed text(s) must be <b>visible</b> in order to be converted." +msgstr "" +"Заверстанный текст должен быть <b>видимым</b>, чтобы быть преобразуемым." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:747 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:763 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:777 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:284 -msgid "All Images" -msgstr "Все изображения" +#: ../src/text-chemistry.cpp:530 +msgid "Convert flowed text to text" +msgstr "Завёрстанный текст в обычный" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:750 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:766 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:285 -msgid "All Vectors" -msgstr "Все векторные" +#: ../src/text-chemistry.cpp:535 +msgid "<b>No flowed text(s)</b> to convert in the selection." +msgstr "В выделении <b>нет завёрстанного текста</b>, преобразуемого в обычный." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:753 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:769 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:783 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:286 -msgid "All Bitmaps" -msgstr "Все растровые" +#: ../src/text-editing.cpp:44 +msgid "You cannot edit <b>cloned character data</b>." +msgstr "Вы не можете редактировать <b>склонированный текст</b>." -#. ###### File options -#. ###### Do we want the .xxx extension automatically added? -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1002 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1560 -msgid "Append filename extension automatically" -msgstr "Автоматически добавить расширение файла" +#: ../src/tools-switch.cpp:91 +#, fuzzy +msgid "" +"<b>Click</b> to Select and Transform objects, <b>Drag</b> to select many " +"objects." +msgstr "" +"<b>Щелчком</b> выделяется ветвь, <b>перетаскиванием</b> меняется порядок." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1175 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1428 -msgid "Guess from extension" -msgstr "Угадать по расширению" +#: ../src/tools-switch.cpp:92 +#, fuzzy +msgid "Modify selected path points (nodes) directly." +msgstr "Упростить выделенные контуры удалением лишних узлов" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1447 -msgid "Left edge of source" -msgstr "Исходный левый край" +#: ../src/tools-switch.cpp:93 +msgid "To tweak a path by pushing, select it and drag over it." +msgstr "Для коррекции контура толканием, выберите и проведите по нему мышью" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1448 -msgid "Top edge of source" -msgstr "Исходный правый край" +#: ../src/tools-switch.cpp:94 +#, fuzzy +msgid "" +"<b>Drag</b>, <b>click</b> or <b>click and scroll</b> to spray the selected " +"objects." +msgstr "" +"<b>Щелчок</b> или <b>щелчок + перетаскивание</b> закрывают этот контур." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1449 -msgid "Right edge of source" -msgstr "Исходный правый край" +#: ../src/tools-switch.cpp:95 +msgid "" +"<b>Drag</b> to create a rectangle. <b>Drag controls</b> to round corners and " +"resize. <b>Click</b> to select." +msgstr "" +"<b>Перетаскивание</b> рисует прямоугольник. <b>Перетаскивание ручек</b> " +"меняет размер и закругляет углы. <b>Щелчок</b> по объекту выделяет его." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1450 -msgid "Bottom edge of source" -msgstr "Исходный нижний край" +#: ../src/tools-switch.cpp:96 +msgid "" +"<b>Drag</b> to create a 3D box. <b>Drag controls</b> to resize in " +"perspective. <b>Click</b> to select (with <b>Ctrl+Alt</b> for single faces)." +msgstr "" +"<b>Перетаскивание</b> рисует параллелепипед. <b>Перетаскивание рычагов</b> " +"меняет перспективу. <b>Щелчком</b> выделяются стороны объекта." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1451 -msgid "Source width" -msgstr "Исходная ширина" +#: ../src/tools-switch.cpp:97 +msgid "" +"<b>Drag</b> to create an ellipse. <b>Drag controls</b> to make an arc or " +"segment. <b>Click</b> to select." +msgstr "" +"<b>Перетаскивание</b> рисует эллипс. <b>Перетаскивание ручек</b> делает дугу " +"или сегмент. <b>Щелчок</b> по объекту выделяет его." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1452 -msgid "Source height" -msgstr "Исходная высота" +#: ../src/tools-switch.cpp:98 +msgid "" +"<b>Drag</b> to create a star. <b>Drag controls</b> to edit the star shape. " +"<b>Click</b> to select." +msgstr "" +"<b>Перетаскивание</b> рисует звезду. <b>Перетаскивание ручек</b> меняет ее " +"форму. <b>Щелчок</b> по объекту выделяет его." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1453 -msgid "Destination width" -msgstr "Конечная ширина" +#: ../src/tools-switch.cpp:99 +msgid "" +"<b>Drag</b> to create a spiral. <b>Drag controls</b> to edit the spiral " +"shape. <b>Click</b> to select." +msgstr "" +"<b>Перетаскивание</b> рисует спираль. <b>Перетаскивание ручек</b> меняет ее " +"форму. <b>Щелчок</b> по объекту выделяет его." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1454 -msgid "Destination height" -msgstr "Конечная высота" +#: ../src/tools-switch.cpp:100 +msgid "" +"<b>Drag</b> to create a freehand line. <b>Shift</b> appends to selected " +"path, <b>Alt</b> activates sketch mode." +msgstr "" +"<b>Перетаскиванием</b> рисуется произвольная линия. <b>Shift</b> " +"присоединяет линию к выделенному контуру, <b>Alt</b> активирует эскизный " +"режим." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1455 -msgid "Resolution (dots per inch)" -msgstr "Разрешение (в точках на дюйм)" +#: ../src/tools-switch.cpp:101 +msgid "" +"<b>Click</b> or <b>click and drag</b> to start a path; with <b>Shift</b> to " +"append to selected path. <b>Ctrl+click</b> to create single dots (straight " +"line modes only)." +msgstr "" +"<b>Щелчок</b> и <b>щелчок с перетаскиванием</b> начинают контур. С <b>Shift</" +"b> линия добавляется к выделенному контуру. <b>Ctrl+щелчок</b> рисует точку " +"(только в режиме рисования прямых линий)." -#. ######################################### -#. ## EXTRA WIDGET -- SOURCE SIDE -#. ######################################### -#. ##### Export options buttons/spinners, etc -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1493 -msgid "Document" -msgstr "Документ" +#: ../src/tools-switch.cpp:102 +msgid "" +"<b>Drag</b> to draw a calligraphic stroke; with <b>Ctrl</b> to track a guide " +"path. <b>Arrow keys</b> adjust width (left/right) and angle (up/down)." +msgstr "" +"<b>Перетаскивание</b> рисует каллиграфический штрих; с <b>Ctrl</b> — " +"отслеживание направляющего контура. <b>Клавиши-стрелки</b> меняют ширину " +"(влево/вправо) и угол (вверх/вниз) пера." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501 ../src/verbs.cpp:175 -#: ../src/widgets/desktop-widget.cpp:2000 -#: ../share/extensions/printing_marks.inx.h:18 -msgid "Selection" -msgstr "Выделение" +#: ../src/tools-switch.cpp:103 ../src/ui/tools/text-tool.cpp:1593 +msgid "" +"<b>Click</b> to select or create text, <b>drag</b> to create flowed text; " +"then type." +msgstr "" +"<b>Щелчок</b> выделяет или создает текст, <b>перетаскивание</b> создает " +"текст в рамке; после этого можно набирать текст." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1505 -#, fuzzy -msgctxt "Export dialog" -msgid "Custom" -msgstr "Другой" +#: ../src/tools-switch.cpp:104 +msgid "" +"<b>Drag</b> or <b>double click</b> to create a gradient on selected objects, " +"<b>drag handles</b> to adjust gradients." +msgstr "" +"Новый градиент для выделенного объекта создается <b>перетаскиванием</b> или " +"<b>двойным щелчком</b> и корректируется <b>перетаскиванием за ручки</b>." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1525 -msgid "Source" -msgstr "Источник" +#: ../src/tools-switch.cpp:105 +#, fuzzy +msgid "" +"<b>Drag</b> or <b>double click</b> to create a mesh on selected objects, " +"<b>drag handles</b> to adjust meshes." +msgstr "" +"Новый градиент для выделенного объекта создается <b>перетаскиванием</b> или " +"<b>двойным щелчком</b> и корректируется <b>перетаскиванием за ручки</b>." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1545 -msgid "Cairo" -msgstr "Cairo" +#: ../src/tools-switch.cpp:106 +msgid "" +"<b>Click</b> or <b>drag around an area</b> to zoom in, <b>Shift+click</b> to " +"zoom out." +msgstr "" +"<b>Щелчок</b> или <b>обведение рамкой</b> приближают, <b>Shift+щелчок</b> " +"отдаляет холст." -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1548 -msgid "Antialias" -msgstr "Сглаживать" +#: ../src/tools-switch.cpp:107 +msgid "<b>Drag</b> to measure the dimensions of objects." +msgstr "" -#: ../src/ui/dialog/filedialogimpl-win32.cpp:414 -msgid "All Executable Files" -msgstr "Все исполняемые файлы" +#: ../src/tools-switch.cpp:108 ../src/ui/tools/dropper-tool.cpp:285 +msgid "" +"<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to " +"average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> " +"to copy the color under mouse to clipboard" +msgstr "" +"<b>Щелчок</b> меняет цвет заполнения, <b>Shift+щелчок</b> меняет цвет " +"обводки. <b>Перетаскивание</b> вычисляет средний цвет области. <b>Alt</b> " +"берет обратный цвет. <b>Ctrl+C</b> копирует в буфер цвет под курсором." -#: ../src/ui/dialog/filedialogimpl-win32.cpp:606 -msgid "Show Preview" -msgstr "Предпросмотр" +#: ../src/tools-switch.cpp:109 +msgid "<b>Click and drag</b> between shapes to create a connector." +msgstr "" +"<b>Щелчок с перетаскиванием</b> между фигурами создают линию соединения." -#: ../src/ui/dialog/filedialogimpl-win32.cpp:744 -msgid "No file selected" -msgstr "Ни один файл не выбран" +#: ../src/tools-switch.cpp:110 +msgid "" +"<b>Click</b> to paint a bounded area, <b>Shift+click</b> to union the new " +"fill with the current selection, <b>Ctrl+click</b> to change the clicked " +"object's fill and stroke to the current setting." +msgstr "" +"<b>Щёлкните</b> для рисования замкнутой области, <b>Shift+щелчок</b> для " +"объединения новой заливки с активным выделением, <b>Ctrl+щелчок</b> для " +"смены заливки и обводки щелкнутого объекта до текущих параметров" -#: ../src/ui/dialog/fill-and-stroke.cpp:62 -msgid "_Fill" -msgstr "_Заливка" +#: ../src/tools-switch.cpp:111 +msgid "<b>Drag</b> to erase." +msgstr "Нажмите клавишу и <b>перетащите</b> курсор для стирания" -#: ../src/ui/dialog/fill-and-stroke.cpp:63 -msgid "Stroke _paint" -msgstr "Об_водка" +#: ../src/tools-switch.cpp:112 +msgid "Choose a subtool from the toolbar" +msgstr "Выберите режим инструмента из его контекстной панели" -#: ../src/ui/dialog/fill-and-stroke.cpp:64 -msgid "Stroke st_yle" -msgstr "_Стиль обводки" +#: ../src/trace/potrace/inkscape-potrace.cpp:512 +#: ../src/trace/potrace/inkscape-potrace.cpp:575 +#, fuzzy +msgid "Trace: %1. %2 nodes" +msgstr "Векторизация: %d. Узлов - %ld" -#. TRANSLATORS: this dialog is accessible via menu Filters - Filter editor -#: ../src/ui/dialog/filter-effects-dialog.cpp:546 -msgid "" -"This matrix determines a linear transform on color space. Each line affects " -"one of the color components. Each column determines how much of each color " -"component from the input is passed to the output. The last column does not " -"depend on input colors, so can be used to adjust a constant component value." -msgstr "" -"Эта матрица определяет линейное преобразование цветового пространства. " -"Каждая строка влияет на один из компонентов цвета. Каждый столбец " -"определяет, как много от каждого цветового компонента на входе передаётся на " -"выход. Последний столбец не зависит от входящих цветов, поэтому его можно " -"использовать для коррекции постоянного значения компонента." +#: ../src/trace/trace.cpp:59 ../src/trace/trace.cpp:124 +#: ../src/trace/trace.cpp:132 ../src/trace/trace.cpp:225 +#: ../src/ui/dialog/pixelartdialog.cpp:370 +#: ../src/ui/dialog/pixelartdialog.cpp:402 +msgid "Select an <b>image</b> to trace" +msgstr "Выделите <b>растровое изображение</b> для векторизации" -#: ../src/ui/dialog/filter-effects-dialog.cpp:656 -msgid "Image File" -msgstr "Файл..." +#: ../src/trace/trace.cpp:94 +msgid "Select only one <b>image</b> to trace" +msgstr "Выделите <b>растровое изображение</b> для векторизации" -#: ../src/ui/dialog/filter-effects-dialog.cpp:659 -msgid "Selected SVG Element" -msgstr "Выбранный элемент SVG" +#: ../src/trace/trace.cpp:112 +msgid "Select one image and one or more shapes above it" +msgstr "Выберите изображение и один или более объектов над ним" -#. TODO: any image, not just svg -#: ../src/ui/dialog/filter-effects-dialog.cpp:729 -msgid "Select an image to be used as feImage input" -msgstr "Выберите изображение, используемое на входе feImage" +#: ../src/trace/trace.cpp:216 +msgid "Trace: No active desktop" +msgstr "Векторизация: нет активного рабочего стола" -#: ../src/ui/dialog/filter-effects-dialog.cpp:821 -msgid "This SVG filter effect does not require any parameters." -msgstr "У этого примитива эффектов SVG нет параметров." +#: ../src/trace/trace.cpp:313 +msgid "Invalid SIOX result" +msgstr "Некорректный результат SIOX" -#: ../src/ui/dialog/filter-effects-dialog.cpp:827 -msgid "This SVG filter effect is not yet implemented in Inkscape." -msgstr "Этот примитив фильтра SVG еще не реализован в Inkscape." +#: ../src/trace/trace.cpp:406 +msgid "Trace: No active document" +msgstr "Векторизация: нет активного документа" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1041 -#, fuzzy -msgid "Slope" -msgstr "Перспектива" +#: ../src/trace/trace.cpp:438 +msgid "Trace: Image has no bitmap data" +msgstr "Векторизация: в изображении нет растровых данных" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1042 -#, fuzzy -msgid "Intercept" -msgstr "Интерфейс" +#: ../src/trace/trace.cpp:445 +msgid "Trace: Starting trace..." +msgstr "Векторизация: запуск векторизации..." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1045 -#, fuzzy -msgid "Amplitude" -msgstr "Амплитуда" +#. ## inform the document, so we can undo +#: ../src/trace/trace.cpp:548 +msgid "Trace bitmap" +msgstr "Векторизация растра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1046 -#, fuzzy -msgid "Exponent" -msgstr "Экспонента:" +#: ../src/trace/trace.cpp:552 +#, c-format +msgid "Trace: Done. %ld nodes created" +msgstr "Векторизация: Готово. Создано узлов: %ld" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1143 -#, fuzzy -msgid "New transfer function type" -msgstr "Логические операции" +#. check whether something is selected +#: ../src/ui/clipboard.cpp:261 +msgid "Nothing was copied." +msgstr "Ничего не было скопировано." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1178 -msgid "Light Source:" -msgstr "Источник света:" +#: ../src/ui/clipboard.cpp:374 ../src/ui/clipboard.cpp:583 +#: ../src/ui/clipboard.cpp:612 +msgid "Nothing on the clipboard." +msgstr "В буфере обмена ничего нет." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1195 -msgid "Direction angle for the light source on the XY plane, in degrees" -msgstr "Угол, под которым источник света находится к плоскости XY (в градусах)" +#: ../src/ui/clipboard.cpp:432 +msgid "Select <b>object(s)</b> to paste style to." +msgstr "Выделите <b>объект(ы)</b> для применения стиля." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 -msgid "Direction angle for the light source on the YZ plane, in degrees" -msgstr "Угол, под которым источник света находится к плоскости YZ (в градусах)" +#: ../src/ui/clipboard.cpp:443 ../src/ui/clipboard.cpp:460 +msgid "No style on the clipboard." +msgstr "В буфере обмена нет стиля." -#. default x: -#. default y: -#. default z: -#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 -msgid "Location:" -msgstr "Расположение:" +#: ../src/ui/clipboard.cpp:485 +msgid "Select <b>object(s)</b> to paste size to." +msgstr "Выделите <b>объект(ы)</b> для применения размера." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 -msgid "X coordinate" -msgstr "Координата X" +#: ../src/ui/clipboard.cpp:492 +msgid "No size on the clipboard." +msgstr "В буфере обмена нет размера." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 -msgid "Y coordinate" -msgstr "Координата Y" +#: ../src/ui/clipboard.cpp:545 +msgid "Select <b>object(s)</b> to paste live path effect to." +msgstr "" +"Выделите <b>объект(ы)</b> для применения динамического контурного эффекта." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 -msgid "Z coordinate" -msgstr "Координата Z" +#. no_effect: +#: ../src/ui/clipboard.cpp:570 +msgid "No effect on the clipboard." +msgstr "В буфере обмена нет эффекта." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 -msgid "Points At" -msgstr "Указывает на" +#: ../src/ui/clipboard.cpp:589 ../src/ui/clipboard.cpp:626 +msgid "Clipboard does not contain a path." +msgstr "В буфере обмена нет контура" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 -msgid "Specular Exponent" -msgstr "Степень отражения" +#. * +#. * Constructor +#. +#: ../src/ui/dialog/aboutbox.cpp:80 +msgid "About Inkscape" +msgstr "Об Inkscape" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 -msgid "Exponent value controlling the focus for the light source" -msgstr "Значение экспоненты, контролирующей фокус источника света" +#: ../src/ui/dialog/aboutbox.cpp:91 +msgid "_Splash" +msgstr "За_ставка" -#. TODO: here I have used 100 degrees as default value. But spec says that if not specified, no limiting cone is applied. So, there should be a way for the user to set a "no limiting cone" option. -#: ../src/ui/dialog/filter-effects-dialog.cpp:1208 -msgid "Cone Angle" -msgstr "Угол конуса" +#: ../src/ui/dialog/aboutbox.cpp:95 +msgid "_Authors" +msgstr "_Авторы" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1208 -msgid "" -"This is the angle between the spot light axis (i.e. the axis between the " -"light source and the point to which it is pointing at) and the spot light " -"cone. No light is projected outside this cone." -msgstr "" -"Угол между осью источника света (т.е. осью, проходящей через источник света " -"и точку, на которую он указывает) и конусом прожектора. За пределы конуса " -"свет не проецируется." +#: ../src/ui/dialog/aboutbox.cpp:97 +msgid "_Translators" +msgstr "Пере_водчики" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1274 -msgid "New light source" -msgstr "Новый источник света" +#: ../src/ui/dialog/aboutbox.cpp:99 +msgid "_License" +msgstr "_Лицензия" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1325 -msgid "_Duplicate" -msgstr "_Продублировать" +#. TRANSLATORS: This is the filename of the `About Inkscape' picture in +#. the `screens' directory. Thus the translation of "about.svg" should be +#. the filename of its translated version, e.g. about.zh.svg for Chinese. +#. +#. N.B. about.svg changes once per release. (We should probably rename +#. the original to about-0.40.svg etc. as soon as we have a translation. +#. If we do so, then add an item to release-checklist saying that the +#. string here should be changed.) +#. FIXME? INKSCAPE_SCREENSDIR and "about.svg" are in UTF-8, not the +#. native filename encoding... and the filename passed to sp_document_new +#. should be in UTF-*8.. +#: ../src/ui/dialog/aboutbox.cpp:166 +msgid "about.svg" +msgstr "about.svg" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1359 -msgid "_Filter" -msgstr "_Фильтры" +#. TRANSLATORS: Put here your name (and other national contributors') +#. one per line in the form of: name surname (email). Use \n for newline. +#: ../src/ui/dialog/aboutbox.cpp:426 +msgid "translator-credits" +msgstr "" +"Valek Filippov (frob@df.ru), 2000, 2003.\n" +"Vitaly Lipatov (lav@altlinux.ru), 2002, 2004.\n" +"Alexey Remizov (alexey@remizov.pp.ru), 2004.\n" +"bulia byak (buliabyak@users.sf.net), 2004.\n" +"Alexandre Prokoudine (alexandre.prokoudine@gmail.com), 2004-2010." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1379 -msgid "R_ename" -msgstr "Пере_именовать" +#: ../src/ui/dialog/align-and-distribute.cpp:171 +#: ../src/ui/dialog/align-and-distribute.cpp:852 +msgid "Align" +msgstr "Выровнять" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1512 -msgid "Rename filter" -msgstr "Переименовать фильтр" +#: ../src/ui/dialog/align-and-distribute.cpp:341 +#: ../src/ui/dialog/align-and-distribute.cpp:853 +msgid "Distribute" +msgstr "Расставить" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1565 -msgid "Apply filter" -msgstr "Применение фильтра" +#: ../src/ui/dialog/align-and-distribute.cpp:420 +msgid "Minimum horizontal gap (in px units) between bounding boxes" +msgstr "Минимальный горизонтальный интервал между рамками (в пикселах)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1635 -msgid "filter" -msgstr "фильтр" +#. TRANSLATORS: "H:" stands for horizontal gap +#: ../src/ui/dialog/align-and-distribute.cpp:422 +msgctxt "Gap" +msgid "_H:" +msgstr "_Г:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1642 -msgid "Add filter" -msgstr "Добавление фильтра" +#: ../src/ui/dialog/align-and-distribute.cpp:430 +msgid "Minimum vertical gap (in px units) between bounding boxes" +msgstr "Минимальный вертикальный интервал между рамками (в пикселах)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1694 -msgid "Duplicate filter" -msgstr "Дублирование фильтра" +#. TRANSLATORS: Vertical gap +#: ../src/ui/dialog/align-and-distribute.cpp:432 +msgctxt "Gap" +msgid "_V:" +msgstr "_В:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1793 -msgid "_Effect" -msgstr "Эффе_кт" +#: ../src/ui/dialog/align-and-distribute.cpp:468 +#: ../src/ui/dialog/align-and-distribute.cpp:855 +#: ../src/widgets/connector-toolbar.cpp:411 +msgid "Remove overlaps" +msgstr "Убрать перекрытия" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1803 -msgid "Connections" -msgstr "Cоединения" +#: ../src/ui/dialog/align-and-distribute.cpp:499 +#: ../src/widgets/connector-toolbar.cpp:240 +msgid "Arrange connector network" +msgstr "Гармоничная расстановка связанных объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1941 -msgid "Remove filter primitive" -msgstr "Удаление примитива фильтра" +#: ../src/ui/dialog/align-and-distribute.cpp:592 +msgid "Exchange Positions" +msgstr "Поменять объекты местами" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2529 -msgid "Remove merge node" -msgstr "Удалить объединяющий узел" +#: ../src/ui/dialog/align-and-distribute.cpp:626 +msgid "Unclump" +msgstr "Разровнять" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2649 -msgid "Reorder filter primitive" -msgstr "Смена порядка примитивов фильтра" +#: ../src/ui/dialog/align-and-distribute.cpp:698 +msgid "Randomize positions" +msgstr "Случайное расположение объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2729 -msgid "Add Effect:" -msgstr "Добавить:" +#: ../src/ui/dialog/align-and-distribute.cpp:801 +msgid "Distribute text baselines" +msgstr "Расстановка линий шрифта текста" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2730 -msgid "No effect selected" -msgstr "Ни один эффект не выбран" +#: ../src/ui/dialog/align-and-distribute.cpp:824 +msgid "Align text baselines" +msgstr "Выравнивание линий шрифта текста" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2731 -msgid "No filter selected" -msgstr "Ни один фильтр не выбран" +#: ../src/ui/dialog/align-and-distribute.cpp:854 +msgid "Rearrange" +msgstr "Переставить" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2776 -msgid "Effect parameters" -msgstr "Параметры эффекта" +#: ../src/ui/dialog/align-and-distribute.cpp:856 +#: ../src/widgets/toolbox.cpp:1728 +msgid "Nodes" +msgstr "Узлы" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2777 -msgid "Filter General Settings" -msgstr "Общие параметры фильтра" +#: ../src/ui/dialog/align-and-distribute.cpp:870 +msgid "Relative to: " +msgstr "Ориентир: " -#. default x: -#. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 -msgid "Coordinates:" -msgstr "Координаты:" +#: ../src/ui/dialog/align-and-distribute.cpp:871 +msgid "_Treat selection as group: " +msgstr "С_читать выделение группой: " -#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 -msgid "X coordinate of the left corners of filter effects region" -msgstr "Координата X левых углов области действия фильтра эффектов" +#. Align +#: ../src/ui/dialog/align-and-distribute.cpp:877 ../src/verbs.cpp:2937 +#: ../src/verbs.cpp:2938 +msgid "Align right edges of objects to the left edge of the anchor" +msgstr "Выровнять правые края объектов к левому краю якоря" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 -msgid "Y coordinate of the upper corners of filter effects region" -msgstr "Координата X верхних углов области действия фильтра эффектов" +#: ../src/ui/dialog/align-and-distribute.cpp:880 ../src/verbs.cpp:2939 +#: ../src/verbs.cpp:2940 +msgid "Align left edges" +msgstr "Выровнять левые края объектов" -#. default width: -#. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 -msgid "Dimensions:" -msgstr "Размеры:" +#: ../src/ui/dialog/align-and-distribute.cpp:883 ../src/verbs.cpp:2941 +#: ../src/verbs.cpp:2942 +msgid "Center on vertical axis" +msgstr "Центрировать на вертикальной оси" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 -msgid "Width of filter effects region" -msgstr "Ширина области действия фильтра эффектов" +#: ../src/ui/dialog/align-and-distribute.cpp:886 ../src/verbs.cpp:2943 +#: ../src/verbs.cpp:2944 +msgid "Align right sides" +msgstr "Выровнять правые края объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 -msgid "Height of filter effects region" -msgstr "Высота области действия фильтра эффектов" +#: ../src/ui/dialog/align-and-distribute.cpp:889 ../src/verbs.cpp:2945 +#: ../src/verbs.cpp:2946 +msgid "Align left edges of objects to the right edge of the anchor" +msgstr "Выровнять левые края объектов по правому краю якоря" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2842 -msgid "" -"Indicates the type of matrix operation. The keyword 'matrix' indicates that " -"a full 5x4 matrix of values will be provided. The other keywords represent " -"convenience shortcuts to allow commonly used color operations to be " -"performed without specifying a complete matrix." -msgstr "" -"Тип матричной операции. Слово «матрица» означает, что будет предоставлена " -"полная матрица значений размером 5×4. Остальные варианты — это простой " -"способ выполнить наиболее популярные операции, не задавая все значения " -"матрицы вручную." +#: ../src/ui/dialog/align-and-distribute.cpp:892 ../src/verbs.cpp:2947 +#: ../src/verbs.cpp:2948 +msgid "Align bottom edges of objects to the top edge of the anchor" +msgstr "Выровнять нижние края объектов по верхнему краю якоря" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2843 -msgid "Value(s):" -msgstr "Значение(-я):" +#: ../src/ui/dialog/align-and-distribute.cpp:895 ../src/verbs.cpp:2949 +#: ../src/verbs.cpp:2950 +msgid "Align top edges" +msgstr "Выровнять верхние края объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2847 -#, fuzzy -msgid "R:" -msgstr "Гор. радиус:" +#: ../src/ui/dialog/align-and-distribute.cpp:898 ../src/verbs.cpp:2951 +#: ../src/verbs.cpp:2952 +msgid "Center on horizontal axis" +msgstr "Центрировать на горизонтальной оси" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2848 -#: ../src/widgets/sp-color-icc-selector.cpp:359 -#, fuzzy -msgid "G:" -msgstr "_G:" +#: ../src/ui/dialog/align-and-distribute.cpp:901 ../src/verbs.cpp:2953 +#: ../src/verbs.cpp:2954 +msgid "Align bottom edges" +msgstr "Выровнять нижние края объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2849 -#, fuzzy -msgid "B:" -msgstr "_B:" +#: ../src/ui/dialog/align-and-distribute.cpp:904 ../src/verbs.cpp:2955 +#: ../src/verbs.cpp:2956 +msgid "Align top edges of objects to the bottom edge of the anchor" +msgstr "Выровнять верхние края объектов по нижнему краю якоря" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 -#, fuzzy -msgid "A:" -msgstr "_A:" +#: ../src/ui/dialog/align-and-distribute.cpp:909 +msgid "Align baseline anchors of texts horizontally" +msgstr "Выровнять текстовые опорные точки по горизонтали" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2853 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 -msgid "Operator:" -msgstr "Оператор:" +#: ../src/ui/dialog/align-and-distribute.cpp:912 +msgid "Align baselines of texts" +msgstr "Выровнять линии шрифта текстовых блоков" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 -msgid "K1:" -msgstr "K1:" +#: ../src/ui/dialog/align-and-distribute.cpp:917 +msgid "Make horizontal gaps between objects equal" +msgstr "Выровнять интервалы между объектами по горизонтали" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2855 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 -msgid "" -"If the arithmetic operation is chosen, each result pixel is computed using " -"the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel " -"values of the first and second inputs respectively." -msgstr "" -"Если выбран арифметический оператор, каждый получаемый пиксел вычисляется по " -"формуле k1*i1*i2 + k2*i1 + k3*i2 + k4, где i1 и i2 — пикселы первого и " -"второго входов соответственно." +#: ../src/ui/dialog/align-and-distribute.cpp:921 +msgid "Distribute left edges equidistantly" +msgstr "Равноудаленно расставить левые края объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2855 -msgid "K2:" -msgstr "K2:" +#: ../src/ui/dialog/align-and-distribute.cpp:924 +msgid "Distribute centers equidistantly horizontally" +msgstr "Равноудаленно расставить центры объектов по горизонтали" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 -msgid "K3:" -msgstr "K3:" +#: ../src/ui/dialog/align-and-distribute.cpp:927 +msgid "Distribute right edges equidistantly" +msgstr "Равноудаленно расставить правые края объектов объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 -msgid "K4:" -msgstr "K4:" +#: ../src/ui/dialog/align-and-distribute.cpp:931 +msgid "Make vertical gaps between objects equal" +msgstr "Выравнять интервалы между объектами по вертикали" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 -msgid "Size:" -msgstr "Размер:" +#: ../src/ui/dialog/align-and-distribute.cpp:935 +msgid "Distribute top edges equidistantly" +msgstr "Равноудаленно расставить верхние края объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 -msgid "width of the convolve matrix" -msgstr "Ширина матрицы свёртки" +#: ../src/ui/dialog/align-and-distribute.cpp:938 +msgid "Distribute centers equidistantly vertically" +msgstr "Равноудаленно расставить центры объектов по вертикали" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 -msgid "height of the convolve matrix" -msgstr "Высота матрицы свёртки" +#: ../src/ui/dialog/align-and-distribute.cpp:941 +msgid "Distribute bottom edges equidistantly" +msgstr "Равноудаленно расставить нижние края объектов" -#. default x: -#. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 -#: ../src/ui/dialog/object-attributes.cpp:48 -msgid "Target:" -msgstr "Target:" +#: ../src/ui/dialog/align-and-distribute.cpp:946 +msgid "Distribute baseline anchors of texts horizontally" +msgstr "Распределить текстовые опорные точки по горизонтали" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 -msgid "" -"X coordinate of the target point in the convolve matrix. The convolution is " -"applied to pixels around this point." -msgstr "" -"Координата X конечной точки матрицы свертки. Свертка применяется к пикселам " -"вокруг этой точки." +#: ../src/ui/dialog/align-and-distribute.cpp:949 +msgid "Distribute baselines of texts vertically" +msgstr "Расставить линии шрифта текстовых блоков по вертикали" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 -msgid "" -"Y coordinate of the target point in the convolve matrix. The convolution is " -"applied to pixels around this point." -msgstr "" -"Координата Y конечной точки матрицы свертки. Свертка применяется к пикселам " -"вокруг этой точки." +#: ../src/ui/dialog/align-and-distribute.cpp:955 +#: ../src/widgets/connector-toolbar.cpp:373 +msgid "Nicely arrange selected connector network" +msgstr "Гармонично расставить связанные коннектором объекты" -#. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) -#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 -msgid "Kernel:" -msgstr "Ядро:" +#: ../src/ui/dialog/align-and-distribute.cpp:958 +msgid "Exchange positions of selected objects - selection order" +msgstr "Поменять объекты местами в порядке их выделения" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 -msgid "" -"This matrix describes the convolve operation that is applied to the input " -"image in order to calculate the pixel colors at the output. Different " -"arrangements of values in this matrix result in various possible visual " -"effects. An identity matrix would lead to a motion blur effect (parallel to " -"the matrix diagonal) while a matrix filled with a constant non-zero value " -"would lead to a common blur effect." -msgstr "" -"Эта матрица описывает операцию свертки, которая будет применена к входящему " -"изображению для вычисления цветов пикселов на выходе. Различные комбинации " -"значений дают различные визуальные эффекты. Тождественная матрица даст " -"эффект размывания движением, в то время как матрица, заполненная постоянным " -"ненулевым значением даст обычный эффект размывания." +#: ../src/ui/dialog/align-and-distribute.cpp:961 +msgid "Exchange positions of selected objects - stacking order" +msgstr "Поменять объекты местами в вертикальном порядке" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 -msgid "Divisor:" -msgstr "Делитель:" +#: ../src/ui/dialog/align-and-distribute.cpp:964 +msgid "Exchange positions of selected objects - clockwise rotate" +msgstr "Поменять объекты местами по часовой стрелке" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 -msgid "" -"After applying the kernelMatrix to the input image to yield a number, that " -"number is divided by divisor to yield the final destination color value. A " -"divisor that is the sum of all the matrix values tends to have an evening " -"effect on the overall color intensity of the result." -msgstr "" -"После применения kernelMatrix к входящему изображению для получения числа, " -"это число делится на делитель для получения конечного значения цвета. " -"Делитель, являющийся суммой всех значений матрицы, имеет тенденцию " -"приглушать общую интенсивность цветов в конечной картинке." +#: ../src/ui/dialog/align-and-distribute.cpp:969 +msgid "Randomize centers in both dimensions" +msgstr "Случайным образом расставить центры" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2866 -msgid "Bias:" -msgstr "Смещение:" +#: ../src/ui/dialog/align-and-distribute.cpp:972 +msgid "Unclump objects: try to equalize edge-to-edge distances" +msgstr "Попробовать выравнять расстояния между краями объектов" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2866 +#: ../src/ui/dialog/align-and-distribute.cpp:977 msgid "" -"This value is added to each component. This is useful to define a constant " -"value as the zero response of the filter." -msgstr "" -"Это значение добавляется к каждому компоненту. Полезно для задания константы " -"как нулевого отклика фильтра." +"Move objects as little as possible so that their bounding boxes do not " +"overlap" +msgstr "Переместить объекты так, чтобы их рамки едва-едва не пересекались" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 -msgid "Edge Mode:" -msgstr "Режим краёв:" +#: ../src/ui/dialog/align-and-distribute.cpp:985 +msgid "Align selected nodes to a common horizontal line" +msgstr "Выровнять выделенные узлы по общей горизонтальной линии" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 -msgid "" -"Determines how to extend the input image as necessary with color values so " -"that the matrix operations can be applied when the kernel is positioned at " -"or near the edge of the input image." -msgstr "" -"Определяет, как расширить входящие изображение цветными пикселами, чтобы " -"матричные операции могли работать с ядром, расположенным на крае изображения " -"или близко к нему." +#: ../src/ui/dialog/align-and-distribute.cpp:988 +msgid "Align selected nodes to a common vertical line" +msgstr "Выровнять выделенные узлы по общей вертикальной линии" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 -msgid "Preserve Alpha" -msgstr "Сохранять альфа-канал" +#: ../src/ui/dialog/align-and-distribute.cpp:991 +msgid "Distribute selected nodes horizontally" +msgstr "Распределить выделенные узлы по горизонтали" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 -msgid "If set, the alpha channel won't be altered by this filter primitive." -msgstr "Если включено, альфа-канал не будет изменен этим примитивом фильтра." +#: ../src/ui/dialog/align-and-distribute.cpp:994 +msgid "Distribute selected nodes vertically" +msgstr "Распределить выделенные узлы по вертикали" -#. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 -msgid "Diffuse Color:" -msgstr "Цвет диффузии:" +#. Rest of the widgetry +#: ../src/ui/dialog/align-and-distribute.cpp:999 +msgid "Last selected" +msgstr "Последний выделенный" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2904 -msgid "Defines the color of the light source" -msgstr "Определяет цвет источника света" +#: ../src/ui/dialog/align-and-distribute.cpp:1000 +msgid "First selected" +msgstr "Первый выделенный" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 -msgid "Surface Scale:" -msgstr "Коэфф. высоты поверхности:" +#: ../src/ui/dialog/align-and-distribute.cpp:1001 +msgid "Biggest object" +msgstr "Наибольший объект" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 -msgid "" -"This value amplifies the heights of the bump map defined by the input alpha " -"channel" -msgstr "" -"На это значение умножается высота карты рельефа, определенная входящим альфа-" -"каналом" +#: ../src/ui/dialog/align-and-distribute.cpp:1002 +msgid "Smallest object" +msgstr "Наименьший объект" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2873 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 -msgid "Constant:" -msgstr "Константа диффузии:" +#: ../src/ui/dialog/align-and-distribute.cpp:1005 +#, fuzzy +msgid "Selection Area" +msgstr "Выделение" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2873 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 -msgid "This constant affects the Phong lighting model." -msgstr "Эта константа касается модели освещения Фонга" +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 +#, fuzzy +msgid "Edit profile" +msgstr "Профиль устройства вывода:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2874 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 -msgid "Kernel Unit Length:" -msgstr "Длина единицы ядра:" +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:53 +msgid "Profile name:" +msgstr "Название профиля:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 -msgid "This defines the intensity of the displacement effect." -msgstr "Определяет интенсивность эффекта смещения" +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:80 +msgid "Save" +msgstr "Сохранить" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 -msgid "X displacement:" -msgstr "Смещение по X:" +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:134 +#, fuzzy +msgid "Add profile" +msgstr "Добавление фильтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 -msgid "Color component that controls the displacement in the X direction" -msgstr "Цветовой компонент, контролирующий смещение по оси X" +#: ../src/ui/dialog/clonetiler.cpp:112 +msgid "_Symmetry" +msgstr "С_имметрия" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 -msgid "Y displacement:" -msgstr "Смещение по Y:" +#. TRANSLATORS: "translation" means "shift" / "displacement" here. +#: ../src/ui/dialog/clonetiler.cpp:124 +msgid "<b>P1</b>: simple translation" +msgstr "<b>P1</b>: простое смещение" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 -msgid "Color component that controls the displacement in the Y direction" -msgstr "Цветовой компонент, контролирующий смещение по оси Y" +#: ../src/ui/dialog/clonetiler.cpp:125 +msgid "<b>P2</b>: 180° rotation" +msgstr "<b>P2</b>: поворот на 180°" -#. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 -msgid "Flood Color:" -msgstr "Цвет заливки:" +#: ../src/ui/dialog/clonetiler.cpp:126 +msgid "<b>PM</b>: reflection" +msgstr "<b>PM</b>: отражение" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 -msgid "The whole filter region will be filled with this color." -msgstr "Вся область действия фильтра будет залита этим цветом" +#. TRANSLATORS: "glide reflection" is a reflection and a translation combined. +#. For more info, see http://mathforum.org/sum95/suzanne/symsusan.html +#: ../src/ui/dialog/clonetiler.cpp:129 +msgid "<b>PG</b>: glide reflection" +msgstr "<b>PG</b>: отражение со сдвигом" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -msgid "Standard Deviation:" -msgstr "Стандартное отклонение:" +#: ../src/ui/dialog/clonetiler.cpp:130 +msgid "<b>CM</b>: reflection + glide reflection" +msgstr "<b>CM</b>: отражение + отражение со сдвигом" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -msgid "The standard deviation for the blur operation." -msgstr "Стандартное отклонение при размывании, выражается в процентах" +#: ../src/ui/dialog/clonetiler.cpp:131 +msgid "<b>PMM</b>: reflection + reflection" +msgstr "<b>PMM</b>: отражение + отражение" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 -msgid "" -"Erode: performs \"thinning\" of input image.\n" -"Dilate: performs \"fattenning\" of input image." -msgstr "" -"Эрозия «утоньшает» изображение на входе.\n" -"Дилатация «утолщает» изображение на входе." +#: ../src/ui/dialog/clonetiler.cpp:132 +msgid "<b>PMG</b>: reflection + 180° rotation" +msgstr "<b>PMG</b>: отражение + поворот на 180°" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 -msgid "Source of Image:" -msgstr "Источник изображения:" +#: ../src/ui/dialog/clonetiler.cpp:133 +msgid "<b>PGG</b>: glide reflection + 180° rotation" +msgstr "<b>PGG</b>: отражение со сдвигом + поворот на 180°" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 -msgid "Delta X:" -msgstr "Дельта X:" +#: ../src/ui/dialog/clonetiler.cpp:134 +msgid "<b>CMM</b>: reflection + reflection + 180° rotation" +msgstr "<b>CMM</b>: отражение + отражение + поворот на 180°" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 -msgid "This is how far the input image gets shifted to the right" -msgstr "Как далеко входящее изображение смещается вправо" +#: ../src/ui/dialog/clonetiler.cpp:135 +msgid "<b>P4</b>: 90° rotation" +msgstr "<b>P4</b>: поворот на 90°" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 -msgid "Delta Y:" -msgstr "Дельта Y:" +#: ../src/ui/dialog/clonetiler.cpp:136 +msgid "<b>P4M</b>: 90° rotation + 45° reflection" +msgstr "<b>P4M</b>: поворот на 90° + отражение на 45°" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 -msgid "This is how far the input image gets shifted downwards" -msgstr "Как далеко входящее изображение смещается вниз" +#: ../src/ui/dialog/clonetiler.cpp:137 +msgid "<b>P4G</b>: 90° rotation + 90° reflection" +msgstr "<b>P4G</b>: поворот на 90° + отражение на 90°" -#. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2904 -msgid "Specular Color:" -msgstr "Цвет отражения:" +#: ../src/ui/dialog/clonetiler.cpp:138 +msgid "<b>P3</b>: 120° rotation" +msgstr "<b>P3</b>: поворот на 120°" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 -#: ../share/extensions/interp.inx.h:2 -msgid "Exponent:" -msgstr "Экспонента:" +#: ../src/ui/dialog/clonetiler.cpp:139 +msgid "<b>P31M</b>: reflection + 120° rotation, dense" +msgstr "<b>P31M</b>: отражение + поворот на 120°, плотно" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 -msgid "Exponent for specular term, larger is more \"shiny\"." -msgstr "Экспонента отражения: чем больше значение, тем ярче отражение" +#: ../src/ui/dialog/clonetiler.cpp:140 +msgid "<b>P3M1</b>: reflection + 120° rotation, sparse" +msgstr "<b>P3M1</b>: отражение + поворот на 120°, редко" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 -msgid "" -"Indicates whether the filter primitive should perform a noise or turbulence " -"function." -msgstr "" -"Должен ли примитив выполнять функцию создания турбулентности или же шума" +#: ../src/ui/dialog/clonetiler.cpp:141 +msgid "<b>P6</b>: 60° rotation" +msgstr "<b>P6</b>: поворот на 60°" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2917 -msgid "Base Frequency:" -msgstr "Основная частота:" +#: ../src/ui/dialog/clonetiler.cpp:142 +msgid "<b>P6M</b>: reflection + 60° rotation" +msgstr "<b>P6M</b>: отражение + поворот на 60°" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 -msgid "Octaves:" -msgstr "Числа Кейли:" +#: ../src/ui/dialog/clonetiler.cpp:162 +msgid "Select one of the 17 symmetry groups for the tiling" +msgstr "Выберите одну из 17 групп симметрии для узора" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 -msgid "Seed:" -msgstr "Случайное значение:" +#: ../src/ui/dialog/clonetiler.cpp:180 +msgid "S_hift" +msgstr "Сме_щение" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 -msgid "The starting number for the pseudo random number generator." -msgstr "Начальное число для генератора псевдослучайных чисел" +#. TRANSLATORS: "shift" means: the tiles will be shifted (offset) horizontally by this amount +#: ../src/ui/dialog/clonetiler.cpp:190 +#, no-c-format +msgid "<b>Shift X:</b>" +msgstr "<b>Смещение по X:</b>" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 -msgid "Add filter primitive" -msgstr "Добавление примитива фильтра" +#: ../src/ui/dialog/clonetiler.cpp:198 +#, no-c-format +msgid "Horizontal shift per row (in % of tile width)" +msgstr "" +"Смещение по горизонтали на каждую строку\n" +"(в процентах от ширины элемента узора)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2948 -msgid "" -"The <b>feBlend</b> filter primitive provides 4 image blending modes: screen, " -"multiply, darken and lighten." +#: ../src/ui/dialog/clonetiler.cpp:206 +#, no-c-format +msgid "Horizontal shift per column (in % of tile width)" msgstr "" -"Примитив <b>feBlend</b> дает 4 режима смешивания: экран, умножение, " -"затемнение и осветление." +"Смещение по горизонтали на каждый столбец\n" +"(в процентах от ширины элемента узора)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2952 -msgid "" -"The <b>feColorMatrix</b> filter primitive applies a matrix transformation to " -"color of each rendered pixel. This allows for effects like turning object to " -"grayscale, modifying color saturation and changing color hue." +#: ../src/ui/dialog/clonetiler.cpp:212 +msgid "Randomize the horizontal shift by this percentage" msgstr "" -"Примитив <b>feColorMatrix</b> применяет матричное преобразование к цвету " -"каждого пиксела. Таким образом можно обесцвечивать, повышать насыщенность и " -"менять тон." +"Случайно менять смещение по горизонтали\n" +"на этот процент" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 -msgid "" -"The <b>feComponentTransfer</b> filter primitive manipulates the input's " -"color components (red, green, blue, and alpha) according to particular " -"transfer functions, allowing operations like brightness and contrast " -"adjustment, color balance, and thresholding." +#. TRANSLATORS: "shift" means: the tiles will be shifted (offset) vertically by this amount +#: ../src/ui/dialog/clonetiler.cpp:222 +#, no-c-format +msgid "<b>Shift Y:</b>" +msgstr "<b>Смещение по Y:</b>" + +#: ../src/ui/dialog/clonetiler.cpp:230 +#, no-c-format +msgid "Vertical shift per row (in % of tile height)" msgstr "" -"Примитив <b>feComponentTransfer</b> позволяет манипулировать цветовыми " -"компонентами входящего объекта (красный, зеленый, синий и альфа-каналы) в " -"соответствии с определенными функциями передачи, допуская операции вроде " -"коррекции яркости и контраста, цветового баланса и порога." +"Смещение по вертикали на каждую строку\n" +"(в процентах от высоты элемента узора)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2960 -msgid "" -"The <b>feComposite</b> filter primitive composites two images using one of " -"the Porter-Duff blending modes or the arithmetic mode described in SVG " -"standard. Porter-Duff blending modes are essentially logical operations " -"between the corresponding pixel values of the images." +#: ../src/ui/dialog/clonetiler.cpp:238 +#, no-c-format +msgid "Vertical shift per column (in % of tile height)" msgstr "" -"Примитив <b>feComposite</b> совмещает два изображения, используя один из " -"режимов смешивания Портера-Даффа или арифметический оператор из стандарта " -"SVG. Режимы совмещения Портера-Даффа — по сути, логические операции между " -"значениями соответствующих пикселов этих изображений." +"Смещение по вертикали на каждый столбец\n" +"(в процентах от высоты элемента узора)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2964 -msgid "" -"The <b>feConvolveMatrix</b> lets you specify a Convolution to be applied on " -"the image. Common effects created using convolution matrices are blur, " -"sharpening, embossing and edge detection. Note that while gaussian blur can " -"be created using this filter primitive, the special gaussian blur primitive " -"is faster and resolution-independent." +#: ../src/ui/dialog/clonetiler.cpp:245 +msgid "Randomize the vertical shift by this percentage" msgstr "" -"Примитив <b>feConvolveMatrix</b> позволяет указать свертку, применяемую к " -"изображению. Типичные эффекты, создаваемые при помощи матрицы свертки — " -"размывание, повышение резкости, создание рельефа и определение краев. Хотя " -"гауссово размывание можно выполнить и этим примитивом, специализированный " -"примитив работает быстрее и не зависит от разрешения." +"Случайно менять смещение по вертикали\n" +"на этот процент" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2968 -msgid "" -"The <b>feDiffuseLighting</b> and feSpecularLighting filter primitives create " -"\"embossed\" shadings. The input's alpha channel is used to provide depth " -"information: higher opacity areas are raised toward the viewer and lower " -"opacity areas recede away from the viewer." +#: ../src/ui/dialog/clonetiler.cpp:253 ../src/ui/dialog/clonetiler.cpp:399 +msgid "<b>Exponent:</b>" +msgstr "<b>Экспонента:</b>" + +#: ../src/ui/dialog/clonetiler.cpp:260 +msgid "Whether rows are spaced evenly (1), converge (<1) or diverge (>1)" msgstr "" -"Примитивы <b>feDiffuseLighting</b> и feSpecularLighting создают рельефные " -"тени. Входящий альфа-канал используется для предоставления информации о " -"глубине: чем выше непрозрачность, тем выше рельеф и, соответственно, тем " -"ближе к наблюдателю верхняя точка этого рельефа." +"Располагать ли строки на одинаковом расстоянии (1), постепенно сдвигая (<1) " +"или раздвигая (>1)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2972 -msgid "" -"The <b>feDisplacementMap</b> filter primitive displaces the pixels in the " -"first input using the second input as a displacement map, that shows from " -"how far the pixel should come from. Classical examples are whirl and pinch " -"effects." +#: ../src/ui/dialog/clonetiler.cpp:267 +msgid "Whether columns are spaced evenly (1), converge (<1) or diverge (>1)" msgstr "" -"Примитив <b>feDisplacementMap</b> смещает пикселы первого входа, используя " -"пикселы второго в качестве карты смещения, показывающей, как далеко должны " -"отойти пикселы. Типичные эффекты, создаваемые при помощи карты смещения — " -"завихрение и щипок." +"Располагать ли столбцы на одинаковом расстоянии (1), постепенно сдвигая (<1) " +"или раздвигая (>1)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2976 -msgid "" -"The <b>feFlood</b> filter primitive fills the region with a given color and " -"opacity. It is usually used as an input to other filters to apply color to " -"a graphic." +#. TRANSLATORS: "Alternate" is a verb here +#: ../src/ui/dialog/clonetiler.cpp:275 ../src/ui/dialog/clonetiler.cpp:439 +#: ../src/ui/dialog/clonetiler.cpp:515 ../src/ui/dialog/clonetiler.cpp:588 +#: ../src/ui/dialog/clonetiler.cpp:634 ../src/ui/dialog/clonetiler.cpp:761 +msgid "<small>Alternate:</small>" +msgstr "<small>Чередовать:</small>" + +#: ../src/ui/dialog/clonetiler.cpp:281 +msgid "Alternate the sign of shifts for each row" +msgstr "Чередовать знак смещения для каждой строки" + +#: ../src/ui/dialog/clonetiler.cpp:286 +msgid "Alternate the sign of shifts for each column" +msgstr "Чередовать знак смещения для каждого столбца" + +#. TRANSLATORS: "Cumulate" is a verb here +#: ../src/ui/dialog/clonetiler.cpp:293 ../src/ui/dialog/clonetiler.cpp:457 +#: ../src/ui/dialog/clonetiler.cpp:533 +msgid "<small>Cumulate:</small>" +msgstr "<small>Накапливать:</small>" + +#: ../src/ui/dialog/clonetiler.cpp:299 +msgid "Cumulate the shifts for each row" +msgstr "Накапливать смещение для каждой строки" + +#: ../src/ui/dialog/clonetiler.cpp:304 +msgid "Cumulate the shifts for each column" +msgstr "Накапливать смещение для каждого столбца" + +#. TRANSLATORS: "Cumulate" is a verb here +#: ../src/ui/dialog/clonetiler.cpp:311 +msgid "<small>Exclude tile:</small>" +msgstr "<small>Исключить элемент:</small>" + +#: ../src/ui/dialog/clonetiler.cpp:317 +msgid "Exclude tile height in shift" +msgstr "Исключить высоту элемента при смещении" + +#: ../src/ui/dialog/clonetiler.cpp:322 +msgid "Exclude tile width in shift" +msgstr "Исключить ширину элемента при смещении" + +#: ../src/ui/dialog/clonetiler.cpp:331 +msgid "Sc_ale" +msgstr "_Масштаб" + +#: ../src/ui/dialog/clonetiler.cpp:339 +msgid "<b>Scale X:</b>" +msgstr "<b>Масштаб по X:</b>" + +#: ../src/ui/dialog/clonetiler.cpp:347 +#, no-c-format +msgid "Horizontal scale per row (in % of tile width)" msgstr "" -"Примитив <b>feFlood</b> заливает область заданным цветом и непрозрачностью. " -"Обычно он используется как вход для других фильтров, применяющих цвет." +"Масштабировать по горизонтали на каждую строку\n" +"(в процентах от ширины элемента узора)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2980 -msgid "" -"The <b>feGaussianBlur</b> filter primitive uniformly blurs its input. It is " -"commonly used together with feOffset to create a drop shadow effect." +#: ../src/ui/dialog/clonetiler.cpp:355 +#, no-c-format +msgid "Horizontal scale per column (in % of tile width)" msgstr "" -"Примитив <b>feGaussianBlur</b> равномерно размывает объекты на входе. Фильтр " -"часто используется с feOffset для создания эффекта отбрасываемой тени." +"Масштабировать по горизонтали на каждый столбец\n" +"(в процентах от ширины элемента узора)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2984 -msgid "" -"The <b>feImage</b> filter primitive fills the region with an external image " -"or another part of the document." +#: ../src/ui/dialog/clonetiler.cpp:361 +msgid "Randomize the horizontal scale by this percentage" msgstr "" -"Примитив <b>feImage</b> заполняет область внешним изображением или другой " -"частью документа." +"Случайным образом масштабировать \n" +"по горизонтали на этот процент" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2988 -msgid "" -"The <b>feMerge</b> filter primitive composites several temporary images " -"inside the filter primitive to a single image. It uses normal alpha " -"compositing for this. This is equivalent to using several feBlend primitives " -"in 'normal' mode or several feComposite primitives in 'over' mode." +#: ../src/ui/dialog/clonetiler.cpp:369 +msgid "<b>Scale Y:</b>" +msgstr "<b>Масштаб по Y:</b>" + +#: ../src/ui/dialog/clonetiler.cpp:377 +#, no-c-format +msgid "Vertical scale per row (in % of tile height)" msgstr "" -"Примитив <b>feMerge</b> сводит несколько временных изображений в одно, " -"используя обычное альфа‑совмещение. Получаемый эффект эквивалентен " -"нескольким примитивам feBlend в режиме «Обычный» или нескольким примитивам " -"feComposite в режиме «Над» (over)." +"Масштабировать по вертикали на каждую строку\n" +"(в процентах от высоты элемента узора)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2992 -msgid "" -"The <b>feMorphology</b> filter primitive provides erode and dilate effects. " -"For single-color objects erode makes the object thinner and dilate makes it " -"thicker." +#: ../src/ui/dialog/clonetiler.cpp:385 +#, no-c-format +msgid "Vertical scale per column (in % of tile height)" msgstr "" -"Примитив <b>feMorphology</b> позволяет применить эффект эрозии и дилатации. " -"Одноцветные объекты с плоской заливкой при эрозии становятся тоньше, а с " -"дилатацией — толще." +"Масштабировать по вертикали на каждый столбец\n" +"(в процентах от высоты элемента узора)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2996 -msgid "" -"The <b>feOffset</b> filter primitive offsets the image by an user-defined " -"amount. For example, this is useful for drop shadows, where the shadow is in " -"a slightly different position than the actual object." +#: ../src/ui/dialog/clonetiler.cpp:391 +msgid "Randomize the vertical scale by this percentage" msgstr "" -"Примитив <b>feOffset</b> смещает изображение на заданное расстояние. Он " -"используется, к примеру, для создания эффекта отбрасываемой тени, где тень " -"слегка смещена относительно исходного объекта." +"Случайным образом масштабировать\n" +"по вертикали на этот процент" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3000 -#, fuzzy -msgid "" -"The <b>feDiffuseLighting</b> and <b>feSpecularLighting</b> filter primitives " -"create \"embossed\" shadings. The input's alpha channel is used to provide " -"depth information: higher opacity areas are raised toward the viewer and " -"lower opacity areas recede away from the viewer." +#: ../src/ui/dialog/clonetiler.cpp:405 +msgid "Whether row scaling is uniform (1), converge (<1) or diverge (>1)" msgstr "" -"Примитивы <b>feDiffuseLighting</b> и feSpecularLighting создают рельефные " -"тени. Входящий альфа-канал используется для предоставления информации о " -"глубине: чем выше непрозрачность, тем выше рельеф и, соответственно, тем " -"ближе к наблюдателю верхняя точка этого рельефа." +"Располагать ли строки на одинаковом расстоянии (1), постепенно сдвигая (<1) " +"или раздвигая (>1)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3004 -msgid "" -"The <b>feTile</b> filter primitive tiles a region with its input graphic" +#: ../src/ui/dialog/clonetiler.cpp:411 +msgid "Whether column scaling is uniform (1), converge (<1) or diverge (>1)" msgstr "" -"Примитив <b>feTile</b> заполняет область мозаикой из входящего изображения." +"Располагать ли столбцы на одинаковом расстоянии (1), постепенно сдвигая (<1) " +"или раздвигая (>1)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3008 +#: ../src/ui/dialog/clonetiler.cpp:419 +msgid "<b>Base:</b>" +msgstr "<b>Основа</b>" + +#: ../src/ui/dialog/clonetiler.cpp:425 ../src/ui/dialog/clonetiler.cpp:431 msgid "" -"The <b>feTurbulence</b> filter primitive renders Perlin noise. This kind of " -"noise is useful in simulating several nature phenomena like clouds, fire and " -"smoke and in generating complex textures like marble or granite." +"Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)" msgstr "" -"Примитив <b>feTurbulence</b> создает перлинов шум. Этот тип шума полезен для " -"имитации различных природных явлений вроде облаков, огня и дыма, а также для " -"создания сложных текстур наподобие мрамора или гранита." +"Основа логарифмической спирали: не используется (0), сходящаяся спираль " +"(<1), расходящаяся спираль (>1)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3027 -msgid "Duplicate filter primitive" -msgstr "Дубликация примитива фильтра" +#: ../src/ui/dialog/clonetiler.cpp:445 +msgid "Alternate the sign of scales for each row" +msgstr "Чередовать знак масштаба для каждой строки" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3080 -msgid "Set filter primitive attribute" -msgstr "Смена атрибута примитива фильтра" +#: ../src/ui/dialog/clonetiler.cpp:450 +msgid "Alternate the sign of scales for each column" +msgstr "Чередовать знак масштаба для каждого столбца" -#: ../src/ui/dialog/find.cpp:71 -msgid "F_ind:" -msgstr "_Найти:" +#: ../src/ui/dialog/clonetiler.cpp:463 +msgid "Cumulate the scales for each row" +msgstr "Накапливать масштаб для каждой строки" -#: ../src/ui/dialog/find.cpp:71 -#, fuzzy -msgid "Find objects by their content or properties (exact or partial match)" +#: ../src/ui/dialog/clonetiler.cpp:468 +msgid "Cumulate the scales for each column" +msgstr "Накапливать масштаб для каждого столбца" + +#: ../src/ui/dialog/clonetiler.cpp:477 +msgid "_Rotation" +msgstr "_Поворот" + +#: ../src/ui/dialog/clonetiler.cpp:485 +msgid "<b>Angle:</b>" +msgstr "<b>Угол:</b>" + +#: ../src/ui/dialog/clonetiler.cpp:493 +#, no-c-format +msgid "Rotate tiles by this angle for each row" +msgstr "Поворачивать элементы узора на этот угол в каждой строке" + +#: ../src/ui/dialog/clonetiler.cpp:501 +#, no-c-format +msgid "Rotate tiles by this angle for each column" +msgstr "Поворачивать элементы узора на этот угол в каждом столбце" + +#: ../src/ui/dialog/clonetiler.cpp:507 +msgid "Randomize the rotation angle by this percentage" msgstr "" -"Искать объекты по их текстовому содержанию (полное или частичное " -"соответствие)" +"Случайным образом менять \n" +"угол поворота на этот процент" -#: ../src/ui/dialog/find.cpp:72 -msgid "R_eplace:" -msgstr "За_менить на:" +#: ../src/ui/dialog/clonetiler.cpp:521 +msgid "Alternate the rotation direction for each row" +msgstr "Чередовать направление поворота для каждой строки" -#: ../src/ui/dialog/find.cpp:72 -#, fuzzy -msgid "Replace match with this value" -msgstr "Дублировать объекты, с Shift — удалять" +#: ../src/ui/dialog/clonetiler.cpp:526 +msgid "Alternate the rotation direction for each column" +msgstr "Чередовать направление поворота для каждого столбца" -#: ../src/ui/dialog/find.cpp:74 -msgid "_All" -msgstr "Весь _рисунок" +#: ../src/ui/dialog/clonetiler.cpp:539 +msgid "Cumulate the rotation for each row" +msgstr "Накапливать поворот для каждой строки" -#: ../src/ui/dialog/find.cpp:74 -#, fuzzy -msgid "Search in all layers" -msgstr "Работают во всех слоях" +#: ../src/ui/dialog/clonetiler.cpp:544 +msgid "Cumulate the rotation for each column" +msgstr "Накапливать поворот для каждого столбца" -#: ../src/ui/dialog/find.cpp:75 -msgid "Current _layer" -msgstr "Те_кущий слой" +#: ../src/ui/dialog/clonetiler.cpp:553 +msgid "_Blur & opacity" +msgstr "_Размывание и непрозрачность" -#: ../src/ui/dialog/find.cpp:75 -msgid "Limit search to the current layer" -msgstr "Ограничить поиск текущим слоем" +#: ../src/ui/dialog/clonetiler.cpp:562 +msgid "<b>Blur:</b>" +msgstr "<b>Размывание:</b>" -#: ../src/ui/dialog/find.cpp:76 -msgid "Sele_ction" -msgstr "В_ыделение" +#: ../src/ui/dialog/clonetiler.cpp:568 +msgid "Blur tiles by this percentage for each row" +msgstr "Размыть элементы узора на этот процент для каждой строки" -#: ../src/ui/dialog/find.cpp:76 -msgid "Limit search to the current selection" -msgstr "Ограничить поиск текущим выделением" +#: ../src/ui/dialog/clonetiler.cpp:574 +msgid "Blur tiles by this percentage for each column" +msgstr "Размыть элементы узора на этот процент для каждого столбца" -#: ../src/ui/dialog/find.cpp:77 -#, fuzzy -msgid "Search in text objects" -msgstr "Искать в текстовых объектах" +#: ../src/ui/dialog/clonetiler.cpp:580 +msgid "Randomize the tile blur by this percentage" +msgstr "Случайно менять размывание на этот процент" -#: ../src/ui/dialog/find.cpp:78 -msgid "_Properties" -msgstr "Сво_йства" +#: ../src/ui/dialog/clonetiler.cpp:594 +msgid "Alternate the sign of blur change for each row" +msgstr "Чередовать знак изменения размывания для каждой строки" -#: ../src/ui/dialog/find.cpp:78 -msgid "Search in object properties, styles, attributes and IDs" +#: ../src/ui/dialog/clonetiler.cpp:599 +msgid "Alternate the sign of blur change for each column" +msgstr "Чередовать знак изменения размывания для каждого столбца" + +#: ../src/ui/dialog/clonetiler.cpp:608 +msgid "<b>Opacity:</b>" +msgstr "<b>Непрозрачность:</b>" + +#: ../src/ui/dialog/clonetiler.cpp:614 +msgid "Decrease tile opacity by this percentage for each row" msgstr "" +"Увеличить прозрачность элементов узора\n" +"на этот процент для каждой строки" -#: ../src/ui/dialog/find.cpp:80 -msgid "Search in" -msgstr "Где искать" +#: ../src/ui/dialog/clonetiler.cpp:620 +msgid "Decrease tile opacity by this percentage for each column" +msgstr "" +"Увеличить прозрачность элементов узора\n" +"на этот процент для каждого столбца" -#: ../src/ui/dialog/find.cpp:81 -msgid "Scope" -msgstr "Охват" +#: ../src/ui/dialog/clonetiler.cpp:626 +msgid "Randomize the tile opacity by this percentage" +msgstr "Случайно менять прозрачность, максимум на данный процент" -#: ../src/ui/dialog/find.cpp:83 -msgid "Case sensiti_ve" -msgstr "У_читывать регистр" +#: ../src/ui/dialog/clonetiler.cpp:640 +msgid "Alternate the sign of opacity change for each row" +msgstr "" +"Чередовать знак изменения прозрачности\n" +"для каждой строки" -#: ../src/ui/dialog/find.cpp:83 -msgid "Match upper/lower case" +#: ../src/ui/dialog/clonetiler.cpp:645 +msgid "Alternate the sign of opacity change for each column" msgstr "" +"Чередовать знак изменения прозрачности\n" +"для каждого столбца" -#: ../src/ui/dialog/find.cpp:84 -msgid "E_xact match" -msgstr "Тол_ько полные слова" +#: ../src/ui/dialog/clonetiler.cpp:653 +msgid "Co_lor" +msgstr "Цвет" -#: ../src/ui/dialog/find.cpp:84 -#, fuzzy -msgid "Match whole objects only" -msgstr "Только выделенные объекты" +#: ../src/ui/dialog/clonetiler.cpp:663 +msgid "Initial color: " +msgstr "Исходный цвет:" -#: ../src/ui/dialog/find.cpp:85 -msgid "Include _hidden" -msgstr "Включая с_крытые" +#: ../src/ui/dialog/clonetiler.cpp:667 +msgid "Initial color of tiled clones" +msgstr "Исходный цвет элементов узора" -#: ../src/ui/dialog/find.cpp:85 -msgid "Include hidden objects in search" -msgstr "Искать среди скрытых объектов" +#: ../src/ui/dialog/clonetiler.cpp:667 +msgid "" +"Initial color for clones (works only if the original has unset fill or " +"stroke)" +msgstr "" +"Исходный цвет клонов (у оригинала должен быть сброшен цвет заливки или " +"обводки)" -#: ../src/ui/dialog/find.cpp:86 -msgid "Include loc_ked" -msgstr "Вкл_ючая заблокированные" +#: ../src/ui/dialog/clonetiler.cpp:682 +msgid "<b>H:</b>" +msgstr "<b>H:</b>" -#: ../src/ui/dialog/find.cpp:86 -msgid "Include locked objects in search" -msgstr "Искать среди заблокированных объектов" +#: ../src/ui/dialog/clonetiler.cpp:688 +msgid "Change the tile hue by this percentage for each row" +msgstr "" +"Менять цветовой тон элементов узора\n" +"на этот процент для каждой строки" -#: ../src/ui/dialog/find.cpp:88 -msgid "General" -msgstr "Общие" +#: ../src/ui/dialog/clonetiler.cpp:694 +msgid "Change the tile hue by this percentage for each column" +msgstr "" +"Менять цветовой тон элементов узора\n" +"на этот процент для каждого столбца" -#: ../src/ui/dialog/find.cpp:90 -#, fuzzy -msgid "_ID" -msgstr "_ID:" +#: ../src/ui/dialog/clonetiler.cpp:700 +msgid "Randomize the tile hue by this percentage" +msgstr "Случайно менять цветовой тон, максимум на этот процент" -#: ../src/ui/dialog/find.cpp:90 -#, fuzzy -msgid "Search id name" -msgstr "Искать в растрах" +#: ../src/ui/dialog/clonetiler.cpp:709 +msgid "<b>S:</b>" +msgstr "<b>S:</b>" -#: ../src/ui/dialog/find.cpp:91 -msgid "Attribute _name" -msgstr "_Имя атрибута" +#: ../src/ui/dialog/clonetiler.cpp:715 +msgid "Change the color saturation by this percentage for each row" +msgstr "" +"Менять насыщенность цвета элементов узора\n" +"на этот процент для каждой строки" -#: ../src/ui/dialog/find.cpp:91 -#, fuzzy -msgid "Search attribute name" -msgstr "Имя атрибута" +#: ../src/ui/dialog/clonetiler.cpp:721 +msgid "Change the color saturation by this percentage for each column" +msgstr "" +"Менять насыщенность цвета элементов узора\n" +"на этот процент для каждого столбца" -#: ../src/ui/dialog/find.cpp:92 -msgid "Attri_bute value" -msgstr "Значение атриб_ута" +#: ../src/ui/dialog/clonetiler.cpp:727 +msgid "Randomize the color saturation by this percentage" +msgstr "Случайно менять насыщенность цвета, максимум на этот процент" -#: ../src/ui/dialog/find.cpp:92 -#, fuzzy -msgid "Search attribute value" -msgstr "Значение атрибута" +#: ../src/ui/dialog/clonetiler.cpp:735 +msgid "<b>L:</b>" +msgstr "<b>L:</b>" -#: ../src/ui/dialog/find.cpp:93 -msgid "_Style" -msgstr "Сти_ль: " +#: ../src/ui/dialog/clonetiler.cpp:741 +msgid "Change the color lightness by this percentage for each row" +msgstr "Менять яркость цвета на этот процент для каждой строки" -#: ../src/ui/dialog/find.cpp:93 -#, fuzzy -msgid "Search style" -msgstr "Искать в клонах" +#: ../src/ui/dialog/clonetiler.cpp:747 +msgid "Change the color lightness by this percentage for each column" +msgstr "Менять яркость цвета на этот процент для каждого столбца" -#: ../src/ui/dialog/find.cpp:94 -msgid "F_ont" -msgstr "_Шрифт" +#: ../src/ui/dialog/clonetiler.cpp:753 +msgid "Randomize the color lightness by this percentage" +msgstr "Случайно менять яркость цвета, максимум на данный процент" -#: ../src/ui/dialog/find.cpp:94 -#, fuzzy -msgid "Search fonts" -msgstr "Искать в клонах" +#: ../src/ui/dialog/clonetiler.cpp:767 +msgid "Alternate the sign of color changes for each row" +msgstr "" +"Чередовать знак изменения цвета\n" +"для каждой строки" -#: ../src/ui/dialog/find.cpp:95 -msgid "Properties" -msgstr "Свойства" +#: ../src/ui/dialog/clonetiler.cpp:772 +msgid "Alternate the sign of color changes for each column" +msgstr "" +"Чередовать знак изменения цвета\n" +"для каждого столбца" -#: ../src/ui/dialog/find.cpp:97 -msgid "All types" -msgstr "Все типы" +#: ../src/ui/dialog/clonetiler.cpp:780 +msgid "_Trace" +msgstr "_Обводка" -#: ../src/ui/dialog/find.cpp:97 -#, fuzzy -msgid "Search all object types" -msgstr "Искать в объектах всех типов" +#: ../src/ui/dialog/clonetiler.cpp:792 +msgid "Trace the drawing under the tiles" +msgstr "Обвести узором рисунок под ним" -#: ../src/ui/dialog/find.cpp:98 -msgid "Rectangles" -msgstr "Прямоугольники" +#: ../src/ui/dialog/clonetiler.cpp:796 +msgid "" +"For each clone, pick a value from the drawing in that clone's location and " +"apply it to the clone" +msgstr "" +"Для каждого клона в узоре взять значение под клоном и применить его к клону" -#: ../src/ui/dialog/find.cpp:98 -msgid "Search rectangles" -msgstr "Искать в прямоугольниках" +#: ../src/ui/dialog/clonetiler.cpp:815 +msgid "1. Pick from the drawing:" +msgstr "1. Взять значение:" -#: ../src/ui/dialog/find.cpp:99 -msgid "Ellipses" -msgstr "Эллипсы" +#: ../src/ui/dialog/clonetiler.cpp:833 +msgid "Pick the visible color and opacity" +msgstr "Взять видимый цвет (без прозрачности) в каждой точке" -#: ../src/ui/dialog/find.cpp:99 -msgid "Search ellipses, arcs, circles" -msgstr "Искать в эллипсах, секторах, кругах" +#: ../src/ui/dialog/clonetiler.cpp:841 +msgid "Pick the total accumulated opacity" +msgstr "Взять суммарную непрозрачность в каждой точке" -#: ../src/ui/dialog/find.cpp:100 -msgid "Stars" -msgstr "Звезды" +#: ../src/ui/dialog/clonetiler.cpp:848 +msgid "R" +msgstr "R" -#: ../src/ui/dialog/find.cpp:100 -msgid "Search stars and polygons" -msgstr "Искать в звездах и многоугольниках" +#: ../src/ui/dialog/clonetiler.cpp:849 +msgid "Pick the Red component of the color" +msgstr "Взять значение красного канала цвета" -#: ../src/ui/dialog/find.cpp:101 -msgid "Spirals" -msgstr "Спирали" +#: ../src/ui/dialog/clonetiler.cpp:856 +msgid "G" +msgstr "G" -#: ../src/ui/dialog/find.cpp:101 -msgid "Search spirals" -msgstr "Искать в спиралях" +#: ../src/ui/dialog/clonetiler.cpp:857 +msgid "Pick the Green component of the color" +msgstr "Взять значение зеленого канала цвета" -#: ../src/ui/dialog/find.cpp:102 ../src/widgets/toolbox.cpp:1736 -msgid "Paths" -msgstr "Контуры" +#: ../src/ui/dialog/clonetiler.cpp:864 +msgid "B" +msgstr "B" -#: ../src/ui/dialog/find.cpp:102 -msgid "Search paths, lines, polylines" -msgstr "Искать в контурах, линиях, полилиниях" +#: ../src/ui/dialog/clonetiler.cpp:865 +msgid "Pick the Blue component of the color" +msgstr "Взять значение синего канала цвета" -#: ../src/ui/dialog/find.cpp:103 -msgid "Texts" -msgstr "Тексты" +#: ../src/ui/dialog/clonetiler.cpp:872 +msgctxt "Clonetiler color hue" +msgid "H" +msgstr "H" -#: ../src/ui/dialog/find.cpp:103 -msgid "Search text objects" -msgstr "Искать в текстовых объектах" +#: ../src/ui/dialog/clonetiler.cpp:873 +msgid "Pick the hue of the color" +msgstr "Взять цветовой тон" -#: ../src/ui/dialog/find.cpp:104 -msgid "Groups" -msgstr "Группы" +#: ../src/ui/dialog/clonetiler.cpp:880 +msgctxt "Clonetiler color saturation" +msgid "S" +msgstr "S" -#: ../src/ui/dialog/find.cpp:104 -msgid "Search groups" -msgstr "Искать в группах" +#: ../src/ui/dialog/clonetiler.cpp:881 +msgid "Pick the saturation of the color" +msgstr "Взять насыщенность цвета" -#. TRANSLATORS: "Clones" is a noun indicating type of object to find -#: ../src/ui/dialog/find.cpp:107 -msgctxt "Find dialog" -msgid "Clones" -msgstr "Клоны" +#: ../src/ui/dialog/clonetiler.cpp:888 +msgctxt "Clonetiler color lightness" +msgid "L" +msgstr "L" + +#: ../src/ui/dialog/clonetiler.cpp:889 +msgid "Pick the lightness of the color" +msgstr "Взять яркость цвета" + +#: ../src/ui/dialog/clonetiler.cpp:899 +msgid "2. Tweak the picked value:" +msgstr "2. Изменить взятое значение:" -#: ../src/ui/dialog/find.cpp:107 -msgid "Search clones" -msgstr "Искать в клонах" +#: ../src/ui/dialog/clonetiler.cpp:916 +msgid "Gamma-correct:" +msgstr "Гамма-коррекция:" -#: ../src/ui/dialog/find.cpp:109 ../share/extensions/embedimage.inx.h:3 -#: ../share/extensions/extractimage.inx.h:5 -msgid "Images" -msgstr "Изображения" +#: ../src/ui/dialog/clonetiler.cpp:920 +msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" +msgstr "Сдвинуть середину диапазона снятых значений вверх (>0) или вниз (<0)" -#: ../src/ui/dialog/find.cpp:109 -msgid "Search images" -msgstr "Искать в растрах" +#: ../src/ui/dialog/clonetiler.cpp:927 +msgid "Randomize:" +msgstr "Случайно:" -#: ../src/ui/dialog/find.cpp:110 -msgid "Offsets" -msgstr "Втяжки" +#: ../src/ui/dialog/clonetiler.cpp:931 +msgid "Randomize the picked value by this percentage" +msgstr "Случайно менять взятое значение, максимум на данный процент" -#: ../src/ui/dialog/find.cpp:110 -msgid "Search offset objects" -msgstr "Искать во втяжках" +#: ../src/ui/dialog/clonetiler.cpp:938 +msgid "Invert:" +msgstr "Инвертировать:" -#: ../src/ui/dialog/find.cpp:111 -msgid "Object types" -msgstr "Типы объектов" +#: ../src/ui/dialog/clonetiler.cpp:942 +msgid "Invert the picked value" +msgstr "Инвертировать взятое значение" -#: ../src/ui/dialog/find.cpp:114 -msgid "_Find" -msgstr "_Искать" +#: ../src/ui/dialog/clonetiler.cpp:948 +msgid "3. Apply the value to the clones':" +msgstr "3. Применить это значение к клонам через:" -#: ../src/ui/dialog/find.cpp:114 -#, fuzzy -msgid "Select all objects matching the selection criteria" -msgstr "Выделить объекты, подходящие по всем указанным критериям поиска" +#: ../src/ui/dialog/clonetiler.cpp:963 +msgid "Presence" +msgstr "Наличие" -#: ../src/ui/dialog/find.cpp:115 -msgid "_Replace All" -msgstr "_Заменить все" +#: ../src/ui/dialog/clonetiler.cpp:966 +msgid "" +"Each clone is created with the probability determined by the picked value in " +"that point" +msgstr "" +"Вероятность появления каждого клона определяется значением, взятым в данной " +"точке" -#: ../src/ui/dialog/find.cpp:115 -#, fuzzy -msgid "Replace all matches" -msgstr "Заменить все шрифты на:" +#: ../src/ui/dialog/clonetiler.cpp:973 +msgid "Size" +msgstr "Размер" -#: ../src/ui/dialog/find.cpp:775 -#, fuzzy -msgid "Nothing to replace" -msgstr "Нет повторяемых операций." +#: ../src/ui/dialog/clonetiler.cpp:976 +msgid "Each clone's size is determined by the picked value in that point" +msgstr "Размер каждого клона определяется значением, взятым в данной точке" -#. TRANSLATORS: "%s" is replaced with "exact" or "partial" when this string is displayed -#: ../src/ui/dialog/find.cpp:816 -#, c-format -msgid "<b>%d</b> object found (out of <b>%d</b>), %s match." -msgid_plural "<b>%d</b> objects found (out of <b>%d</b>), %s match." -msgstr[0] "Найден <b>%d</b> объект (из <b>%d</b>), %s соответствие." -msgstr[1] "Найдено <b>%d</b> объекта (из <b>%d</b>), %s соответствия." -msgstr[2] "Найдено <b>%d</b> объектов (из <b>%d</b>), %s соответствий." +#: ../src/ui/dialog/clonetiler.cpp:986 +msgid "" +"Each clone is painted by the picked color (the original must have unset fill " +"or stroke)" +msgstr "" +"Каждый клон красится взятым в данной точке цветом (у оригинала должен быть " +"сброшен цвет заливки или обводки)" -#: ../src/ui/dialog/find.cpp:819 -msgid "exact" -msgstr "точное" +#: ../src/ui/dialog/clonetiler.cpp:996 +msgid "Each clone's opacity is determined by the picked value in that point" +msgstr "" +"Прозрачность каждого клона определяется значением, взятым в данной точке" -#: ../src/ui/dialog/find.cpp:819 -msgid "partial" -msgstr "частичное" +#: ../src/ui/dialog/clonetiler.cpp:1044 +msgid "How many rows in the tiling" +msgstr "Количество строк в узоре" -#. TRANSLATORS: "%1" is replaced with the number of matches -#: ../src/ui/dialog/find.cpp:822 -#, fuzzy -msgid "%1 match replaced" -msgid_plural "%1 matches replaced" -msgstr[0] "Заменить" -msgstr[1] "Заменить" -msgstr[2] "Заменить" +#: ../src/ui/dialog/clonetiler.cpp:1074 +msgid "How many columns in the tiling" +msgstr "Количество столбцов в узоре" -#. TRANSLATORS: "%1" is replaced with the number of matches -#: ../src/ui/dialog/find.cpp:826 -#, fuzzy -msgid "%1 object found" -msgid_plural "%1 objects found" -msgstr[0] "Ничего не найдено" -msgstr[1] "Ничего не найдено" -msgstr[2] "Ничего не найдено" +#: ../src/ui/dialog/clonetiler.cpp:1119 +msgid "Width of the rectangle to be filled" +msgstr "Ширина заполняемой области" -#: ../src/ui/dialog/find.cpp:837 -#, fuzzy -msgid "Replace text or property" -msgstr "Выберите контур или фигуру" +#: ../src/ui/dialog/clonetiler.cpp:1152 +msgid "Height of the rectangle to be filled" +msgstr "Высота заполняемой области" -#: ../src/ui/dialog/find.cpp:841 -#, fuzzy -msgid "Nothing found" -msgstr "Нет отменяемых операций." +#: ../src/ui/dialog/clonetiler.cpp:1169 +msgid "Rows, columns: " +msgstr "Строк, столбцов: " -#: ../src/ui/dialog/find.cpp:846 -msgid "No objects found" -msgstr "Ничего не найдено" +#: ../src/ui/dialog/clonetiler.cpp:1170 +msgid "Create the specified number of rows and columns" +msgstr "Создать указанное количество строк и столбцов" -#: ../src/ui/dialog/find.cpp:867 -#, fuzzy -msgid "Select an object type" -msgstr "Выберите объект." +#: ../src/ui/dialog/clonetiler.cpp:1179 +msgid "Width, height: " +msgstr "Ширина, высота: " -#: ../src/ui/dialog/find.cpp:885 -#, fuzzy -msgid "Select a property" -msgstr "Выберите контур или фигуру" +#: ../src/ui/dialog/clonetiler.cpp:1180 +msgid "Fill the specified width and height with the tiling" +msgstr "Заполнить узором указанную область" -#: ../src/ui/dialog/font-substitution.cpp:87 +#: ../src/ui/dialog/clonetiler.cpp:1201 +msgid "Use saved size and position of the tile" +msgstr "Использовать запомненный размер и позицию оригинала" + +#: ../src/ui/dialog/clonetiler.cpp:1204 msgid "" -"\n" -"Some fonts are not available and have been substituted." +"Pretend that the size and position of the tile are the same as the last time " +"you tiled it (if any), instead of using the current size" msgstr "" +"Использовать те же самые размер и позицию элемента узора,\n" +"что и в прошлый раз, когда вы делали\n" +"узор из этого же объекта (если делали),\n" +"вместо того чтобы использовать его настоящий размер/позицию" -#: ../src/ui/dialog/font-substitution.cpp:90 -msgid "Font substitution" +#: ../src/ui/dialog/clonetiler.cpp:1238 +msgid " <b>_Create</b> " +msgstr "<b>_Создать</b>" + +#: ../src/ui/dialog/clonetiler.cpp:1240 +msgid "Create and tile the clones of the selection" +msgstr "Создать узор из клонов выделенного объекта" + +#. TRANSLATORS: if a group of objects are "clumped" together, then they +#. are unevenly spread in the given amount of space - as shown in the +#. diagrams on the left in the following screenshot: +#. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png +#. So unclumping is the process of spreading a number of objects out more evenly. +#: ../src/ui/dialog/clonetiler.cpp:1260 +msgid " _Unclump " +msgstr " _Разровнять" + +#: ../src/ui/dialog/clonetiler.cpp:1261 +msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "" +"Распределить клоны более равномерно, избавиться от комков; можно применять " +"несколько раз подряд" -#: ../src/ui/dialog/font-substitution.cpp:109 -#, fuzzy -msgid "Select all the affected items" -msgstr "Выберите объект." +#: ../src/ui/dialog/clonetiler.cpp:1267 +msgid " Re_move " +msgstr " _Удалить " -#: ../src/ui/dialog/font-substitution.cpp:114 -msgid "Don't show this warning again" +#: ../src/ui/dialog/clonetiler.cpp:1268 +msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "" +"Удалить составляющие узор клоны выделенного объекта\n" +"(только в том же слое/группе)" -#: ../src/ui/dialog/font-substitution.cpp:255 -msgid "Font '%1' substituted with '%2'" +#: ../src/ui/dialog/clonetiler.cpp:1284 +msgid " R_eset " +msgstr " С_бросить " + +#. TRANSLATORS: "change" is a noun here +#: ../src/ui/dialog/clonetiler.cpp:1286 +msgid "" +"Reset all shifts, scales, rotates, opacity and color changes in the dialog " +"to zero" msgstr "" +"Обнулить все введенные значения смещения, масштабирования, поворотов, " +"непрозрачности и цвета" -#: ../src/ui/dialog/glyphs.cpp:60 ../src/ui/dialog/glyphs.cpp:152 -msgid "all" -msgstr "Все" +#: ../src/ui/dialog/clonetiler.cpp:1359 +msgid "<small>Nothing selected.</small>" +msgstr "<small>Ничего не было выделено.</small>" -#: ../src/ui/dialog/glyphs.cpp:61 -msgid "common" -msgstr "Обычные" +#: ../src/ui/dialog/clonetiler.cpp:1365 +msgid "<small>More than one object selected.</small>" +msgstr "" +"<small>Выделено больше одного объекта. Невозможно взять стиль от нескольких " +"объектов сразу.</small>" -#: ../src/ui/dialog/glyphs.cpp:62 -msgid "inherited" -msgstr "Унаследованные" +#: ../src/ui/dialog/clonetiler.cpp:1372 +#, c-format +msgid "<small>Object has <b>%d</b> tiled clones.</small>" +msgstr "<small>У объекта узор из <b>%d</b> клонов.</small>" -#: ../src/ui/dialog/glyphs.cpp:63 ../src/ui/dialog/glyphs.cpp:165 -msgid "Arabic" -msgstr "Арабский" +#: ../src/ui/dialog/clonetiler.cpp:1377 +msgid "<small>Object has no tiled clones.</small>" +msgstr "<small>У объекта нет узора из клонов.</small>" -#: ../src/ui/dialog/glyphs.cpp:64 ../src/ui/dialog/glyphs.cpp:163 -msgid "Armenian" -msgstr "Армянский" +#: ../src/ui/dialog/clonetiler.cpp:2097 +msgid "Select <b>one object</b> whose tiled clones to unclump." +msgstr "Выделите <b>один объект</b> для разравнивания узора из его клонов." -#: ../src/ui/dialog/glyphs.cpp:65 ../src/ui/dialog/glyphs.cpp:172 -msgid "Bengali" -msgstr "Бенгальский" +#: ../src/ui/dialog/clonetiler.cpp:2119 +msgid "Unclump tiled clones" +msgstr "Разравнивание узора из клонов" -#: ../src/ui/dialog/glyphs.cpp:66 ../src/ui/dialog/glyphs.cpp:254 -msgid "Bopomofo" -msgstr "Бопомото" +#: ../src/ui/dialog/clonetiler.cpp:2148 +msgid "Select <b>one object</b> whose tiled clones to remove." +msgstr "Выделите <b>один объект</b> для удаления узора из его клонов." -#: ../src/ui/dialog/glyphs.cpp:67 ../src/ui/dialog/glyphs.cpp:189 -msgid "Cherokee" -msgstr "Чероки" +#: ../src/ui/dialog/clonetiler.cpp:2171 +msgid "Delete tiled clones" +msgstr "Удаление узора из клонов" -#: ../src/ui/dialog/glyphs.cpp:68 ../src/ui/dialog/glyphs.cpp:242 -msgid "Coptic" -msgstr "Коптский" +#: ../src/ui/dialog/clonetiler.cpp:2224 +msgid "" +"If you want to clone several objects, <b>group</b> them and <b>clone the " +"group</b>." +msgstr "" +"Для клонирования нескольких объектов <b>сгруппируйте</b> их и <b>клонируйте " +"группу</b>." -#: ../src/ui/dialog/glyphs.cpp:69 ../src/ui/dialog/glyphs.cpp:161 -#: ../share/extensions/hershey.inx.h:22 -msgid "Cyrillic" -msgstr "Кириллица" +#: ../src/ui/dialog/clonetiler.cpp:2233 +msgid "<small>Creating tiled clones...</small>" +msgstr "<small>Создается узор из клонов...</small>" -#: ../src/ui/dialog/glyphs.cpp:70 -msgid "Deseret" -msgstr "Дезерет" +#: ../src/ui/dialog/clonetiler.cpp:2640 +msgid "Create tiled clones" +msgstr "Создание узора из клонов" -#: ../src/ui/dialog/glyphs.cpp:71 ../src/ui/dialog/glyphs.cpp:171 -msgid "Devanagari" -msgstr "Деванагари" +#: ../src/ui/dialog/clonetiler.cpp:2873 +msgid "<small>Per row:</small>" +msgstr "<small>На строку:</small>" -#: ../src/ui/dialog/glyphs.cpp:72 ../src/ui/dialog/glyphs.cpp:187 -msgid "Ethiopic" -msgstr "Эфиопский" +#: ../src/ui/dialog/clonetiler.cpp:2891 +msgid "<small>Per column:</small>" +msgstr "<small>На столбец:</small>" -#: ../src/ui/dialog/glyphs.cpp:73 ../src/ui/dialog/glyphs.cpp:185 -msgid "Georgian" -msgstr "Грузинский" +#: ../src/ui/dialog/clonetiler.cpp:2899 +msgid "<small>Randomize:</small>" +msgstr "<small>Случайно:</small>" -#: ../src/ui/dialog/glyphs.cpp:74 -msgid "Gothic" -msgstr "Готское письмо" +#: ../src/ui/dialog/color-item.cpp:131 +#, c-format +msgid "" +"Color: <b>%s</b>; <b>Click</b> to set fill, <b>Shift+click</b> to set stroke" +msgstr "" +"Цвет: <b>%s</b>; <b>щелчок</b> применяет к заливке, <b>Shift+щелчок</b> — к " +"обводке" -#: ../src/ui/dialog/glyphs.cpp:75 -msgid "Greek" -msgstr "Греческий" +#: ../src/ui/dialog/color-item.cpp:509 +msgid "Change color definition" +msgstr "Смена определения цвета" -#: ../src/ui/dialog/glyphs.cpp:76 ../src/ui/dialog/glyphs.cpp:174 -msgid "Gujarati" -msgstr "Гуджарати" +#: ../src/ui/dialog/color-item.cpp:679 +msgid "Remove stroke color" +msgstr "Удалить цвет обводки" -#: ../src/ui/dialog/glyphs.cpp:77 ../src/ui/dialog/glyphs.cpp:173 -msgid "Gurmukhi" -msgstr "Гурмухи" +#: ../src/ui/dialog/color-item.cpp:679 +msgid "Remove fill color" +msgstr "Удалить цвет заливки" -#: ../src/ui/dialog/glyphs.cpp:78 -#, fuzzy -msgid "Han" -msgstr "Рычаг" +#: ../src/ui/dialog/color-item.cpp:684 +msgid "Set stroke color to none" +msgstr "Убрать цвет обводки" -#: ../src/ui/dialog/glyphs.cpp:79 -msgid "Hangul" -msgstr "Хангыль" +#: ../src/ui/dialog/color-item.cpp:684 +msgid "Set fill color to none" +msgstr "Убрать цвет заливки" -#: ../src/ui/dialog/glyphs.cpp:80 ../src/ui/dialog/glyphs.cpp:164 -msgid "Hebrew" -msgstr "Иврит" +#: ../src/ui/dialog/color-item.cpp:700 +msgid "Set stroke color from swatch" +msgstr "Обводка из палитры образцов" -#: ../src/ui/dialog/glyphs.cpp:81 ../src/ui/dialog/glyphs.cpp:252 -msgid "Hiragana" -msgstr "Хирагана" +#: ../src/ui/dialog/color-item.cpp:700 +msgid "Set fill color from swatch" +msgstr "Заливка из палитры образцов" -#: ../src/ui/dialog/glyphs.cpp:82 ../src/ui/dialog/glyphs.cpp:178 -msgid "Kannada" -msgstr "Каннада" +#: ../src/ui/dialog/debug.cpp:73 +msgid "Messages" +msgstr "Сообщения" -#: ../src/ui/dialog/glyphs.cpp:83 ../src/ui/dialog/glyphs.cpp:253 -msgid "Katakana" -msgstr "Каталонский" +#: ../src/ui/dialog/debug.cpp:87 ../src/ui/dialog/messages.cpp:47 +msgid "_Clear" +msgstr "О_чистить" -#: ../src/ui/dialog/glyphs.cpp:84 ../src/ui/dialog/glyphs.cpp:197 -msgid "Khmer" -msgstr "Кхмерский" +#: ../src/ui/dialog/debug.cpp:91 ../src/ui/dialog/messages.cpp:48 +msgid "Capture log messages" +msgstr "Сохранять отладочные сообщения" -#: ../src/ui/dialog/glyphs.cpp:85 ../src/ui/dialog/glyphs.cpp:182 -msgid "Lao" -msgstr "Лаосский" +#: ../src/ui/dialog/debug.cpp:95 +msgid "Release log messages" +msgstr "Отключить сохранение отладочных сообщений" -#: ../src/ui/dialog/glyphs.cpp:86 -msgid "Latin" -msgstr "Латиница" +#: ../src/ui/dialog/document-metadata.cpp:88 +#: ../src/ui/dialog/document-properties.cpp:159 +msgid "Metadata" +msgstr "Метаданные" -#: ../src/ui/dialog/glyphs.cpp:87 ../src/ui/dialog/glyphs.cpp:179 -msgid "Malayalam" -msgstr "Малаялам" +#: ../src/ui/dialog/document-metadata.cpp:89 +#: ../src/ui/dialog/document-properties.cpp:160 +msgid "License" +msgstr "Лицензия" -#: ../src/ui/dialog/glyphs.cpp:88 ../src/ui/dialog/glyphs.cpp:198 -msgid "Mongolian" -msgstr "Монгольский" +#: ../src/ui/dialog/document-metadata.cpp:126 +#: ../src/ui/dialog/document-properties.cpp:1007 +msgid "<b>Dublin Core Entities</b>" +msgstr "<b>Сущности Dublin Core</b>" -#: ../src/ui/dialog/glyphs.cpp:89 ../src/ui/dialog/glyphs.cpp:184 -msgid "Myanmar" -msgstr "Мьянма" +#: ../src/ui/dialog/document-metadata.cpp:168 +#: ../src/ui/dialog/document-properties.cpp:1069 +msgid "<b>License</b>" +msgstr "<b>Лицензия</b>" -#: ../src/ui/dialog/glyphs.cpp:90 ../src/ui/dialog/glyphs.cpp:191 -msgid "Ogham" -msgstr "Огамическое письмо" +#. --------------------------------------------------------------- +#: ../src/ui/dialog/document-properties.cpp:111 +msgid "Use antialiasing" +msgstr "Использовать сглаживание" -#: ../src/ui/dialog/glyphs.cpp:91 -msgid "Old Italic" -msgstr "Этрусский" +#: ../src/ui/dialog/document-properties.cpp:111 +#, fuzzy +msgid "If unset, no antialiasing will be done on the drawing" +msgstr "Если включено, кайма всегда над холстом" -#: ../src/ui/dialog/glyphs.cpp:92 ../src/ui/dialog/glyphs.cpp:175 -msgid "Oriya" -msgstr "Орийя" +#: ../src/ui/dialog/document-properties.cpp:112 +msgid "Show page _border" +msgstr "Показывать ка_йму холста" -#: ../src/ui/dialog/glyphs.cpp:93 ../src/ui/dialog/glyphs.cpp:192 -msgid "Runic" -msgstr "Руны" +#: ../src/ui/dialog/document-properties.cpp:112 +msgid "If set, rectangular page border is shown" +msgstr "Если включено, отображается прямоугольная кайма холста" -#: ../src/ui/dialog/glyphs.cpp:94 ../src/ui/dialog/glyphs.cpp:180 -msgid "Sinhala" -msgstr "Сингальский" +#: ../src/ui/dialog/document-properties.cpp:113 +msgid "Border on _top of drawing" +msgstr "Кайма над р_исунком" -#: ../src/ui/dialog/glyphs.cpp:95 ../src/ui/dialog/glyphs.cpp:166 -msgid "Syriac" -msgstr "Сирийский" +#: ../src/ui/dialog/document-properties.cpp:113 +msgid "If set, border is always on top of the drawing" +msgstr "Если включено, кайма всегда над холстом" -#: ../src/ui/dialog/glyphs.cpp:96 ../src/ui/dialog/glyphs.cpp:176 -msgid "Tamil" -msgstr "Тамильский" +#: ../src/ui/dialog/document-properties.cpp:114 +msgid "_Show border shadow" +msgstr "Показать _тень каймы" -#: ../src/ui/dialog/glyphs.cpp:97 ../src/ui/dialog/glyphs.cpp:177 -msgid "Telugu" -msgstr "Телугу" +#: ../src/ui/dialog/document-properties.cpp:114 +msgid "If set, page border shows a shadow on its right and lower side" +msgstr "Если включено, кайма холста отбрасывает тень вправо и вниз" -#: ../src/ui/dialog/glyphs.cpp:98 ../src/ui/dialog/glyphs.cpp:168 -msgid "Thaana" -msgstr "Таана" +#: ../src/ui/dialog/document-properties.cpp:115 +msgid "Back_ground color:" +msgstr "Цвет _фона:" -#: ../src/ui/dialog/glyphs.cpp:99 ../src/ui/dialog/glyphs.cpp:181 -msgid "Thai" -msgstr "Тайский" +#: ../src/ui/dialog/document-properties.cpp:115 +msgid "" +"Color of the page background. Note: transparency setting ignored while " +"editing but used when exporting to bitmap." +msgstr "" +"Цвет фона страницы. Внимание: полупрозрачность игнорируется при работе над " +"иллюстрацией, но учитывается при экспорте." -#: ../src/ui/dialog/glyphs.cpp:100 ../src/ui/dialog/glyphs.cpp:183 -msgid "Tibetan" -msgstr "Тибетский" +#: ../src/ui/dialog/document-properties.cpp:116 +msgid "Border _color:" +msgstr "Цвет _каймы:" -#: ../src/ui/dialog/glyphs.cpp:101 -msgid "Canadian Aboriginal" -msgstr "Слоговое письмо канадских аборигенов" +#: ../src/ui/dialog/document-properties.cpp:116 +msgid "Page border color" +msgstr "Цвет каймы холста" -#: ../src/ui/dialog/glyphs.cpp:102 -msgid "Yi" -msgstr "Юи" +#: ../src/ui/dialog/document-properties.cpp:116 +msgid "Color of the page border" +msgstr "Цвет каймы холста" -#: ../src/ui/dialog/glyphs.cpp:103 ../src/ui/dialog/glyphs.cpp:193 -msgid "Tagalog" -msgstr "Тагальский" +#: ../src/ui/dialog/document-properties.cpp:117 +msgid "Default _units:" +msgstr "_Единица измерения:" -#: ../src/ui/dialog/glyphs.cpp:104 ../src/ui/dialog/glyphs.cpp:194 -msgid "Hanunoo" -msgstr "Хануноо" +#. --------------------------------------------------------------- +#. General snap options +#: ../src/ui/dialog/document-properties.cpp:121 +msgid "Show _guides" +msgstr "Показывать н_аправляющие" -#: ../src/ui/dialog/glyphs.cpp:105 ../src/ui/dialog/glyphs.cpp:195 -msgid "Buhid" -msgstr "Бухид" +#: ../src/ui/dialog/document-properties.cpp:121 +msgid "Show or hide guides" +msgstr "Показать или скрыть направляющие" -#: ../src/ui/dialog/glyphs.cpp:106 ../src/ui/dialog/glyphs.cpp:196 -msgid "Tagbanwa" -msgstr "Тагбанва" +#: ../src/ui/dialog/document-properties.cpp:122 +msgid "Guide co_lor:" +msgstr "Цв_ет направляющей:" -#: ../src/ui/dialog/glyphs.cpp:107 -msgid "Braille" -msgstr "Брейлева азбука" +#: ../src/ui/dialog/document-properties.cpp:122 +msgid "Guideline color" +msgstr "Цвет направляющей" -#: ../src/ui/dialog/glyphs.cpp:108 -msgid "Cypriot" -msgstr "Кипрское письмо" +#: ../src/ui/dialog/document-properties.cpp:122 +msgid "Color of guidelines" +msgstr "Цвет направляющих линий" -#: ../src/ui/dialog/glyphs.cpp:109 ../src/ui/dialog/glyphs.cpp:200 -msgid "Limbu" -msgstr "Лимбу" +#: ../src/ui/dialog/document-properties.cpp:123 +msgid "_Highlight color:" +msgstr "По_дсветка:" -#: ../src/ui/dialog/glyphs.cpp:110 -msgid "Osmanya" -msgstr "Сомалийское письмо" +#: ../src/ui/dialog/document-properties.cpp:123 +msgid "Highlighted guideline color" +msgstr "Цвет подсвеченной направляющей" -#: ../src/ui/dialog/glyphs.cpp:111 -msgid "Shavian" -msgstr "Скорописный алфавит Бернарда Шоу" +#: ../src/ui/dialog/document-properties.cpp:123 +msgid "Color of a guideline when it is under mouse" +msgstr "Цвет направляющей линии в момент её нахождения под курсором" -#: ../src/ui/dialog/glyphs.cpp:112 -msgid "Linear B" -msgstr "Линейное письмо Б" +#. --------------------------------------------------------------- +#: ../src/ui/dialog/document-properties.cpp:125 +msgid "Snap _distance" +msgstr "Радиус _прилипания" -#: ../src/ui/dialog/glyphs.cpp:113 ../src/ui/dialog/glyphs.cpp:201 -msgid "Tai Le" -msgstr "Тайский Ле" +#: ../src/ui/dialog/document-properties.cpp:125 +msgid "Snap only when _closer than:" +msgstr "Прилипать _только если ближе чем:" -#: ../src/ui/dialog/glyphs.cpp:114 -msgid "Ugaritic" -msgstr "Древнеперсидский" +#: ../src/ui/dialog/document-properties.cpp:125 +#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:135 +msgid "Always snap" +msgstr "Всегда прилипать" -#: ../src/ui/dialog/glyphs.cpp:115 ../src/ui/dialog/glyphs.cpp:202 -msgid "New Tai Lue" -msgstr "Новый тайский Ле" +#: ../src/ui/dialog/document-properties.cpp:126 +msgid "Snapping distance, in screen pixels, for snapping to objects" +msgstr "Зона прилипания к объектам, в экранных пикселах" -#: ../src/ui/dialog/glyphs.cpp:116 ../src/ui/dialog/glyphs.cpp:204 -msgid "Buginese" -msgstr "Бугинский" +#: ../src/ui/dialog/document-properties.cpp:126 +msgid "Always snap to objects, regardless of their distance" +msgstr "Всегда прилипать к объектам вне зависимости от расстояния до них" -#: ../src/ui/dialog/glyphs.cpp:117 ../src/ui/dialog/glyphs.cpp:240 -msgid "Glagolitic" -msgstr "Глаголица" +#: ../src/ui/dialog/document-properties.cpp:127 +msgid "" +"If set, objects only snap to another object when it's within the range " +"specified below" +msgstr "" +"Если включено, объекты прилипают к другим объектам только на указанном " +"минимальном расстоянии" -#: ../src/ui/dialog/glyphs.cpp:118 ../src/ui/dialog/glyphs.cpp:244 -msgid "Tifinagh" -msgstr "Тифинаг (берберский)" +#. Options for snapping to grids +#: ../src/ui/dialog/document-properties.cpp:130 +msgid "Snap d_istance" +msgstr "Радиус _прилипания" -#: ../src/ui/dialog/glyphs.cpp:119 ../src/ui/dialog/glyphs.cpp:273 -msgid "Syloti Nagri" -msgstr "Силоти нагри" +#: ../src/ui/dialog/document-properties.cpp:130 +msgid "Snap only when c_loser than:" +msgstr "Прилипать только _если ближе чем:" -#: ../src/ui/dialog/glyphs.cpp:120 -msgid "Old Persian" -msgstr "Древнеперсидский" +#: ../src/ui/dialog/document-properties.cpp:131 +msgid "Snapping distance, in screen pixels, for snapping to grid" +msgstr "Зона прилипания к сетке, в экранных точках" -#: ../src/ui/dialog/glyphs.cpp:121 -msgid "Kharoshthi" -msgstr "Кхароштхи" +#: ../src/ui/dialog/document-properties.cpp:131 +msgid "Always snap to grids, regardless of the distance" +msgstr "Всегда прилипать к сеткам вне зависимости от расстояния до их линий" -#: ../src/ui/dialog/glyphs.cpp:122 -#, fuzzy -msgid "unassigned" -msgstr "Назначить" +#: ../src/ui/dialog/document-properties.cpp:132 +msgid "" +"If set, objects only snap to a grid line when it's within the range " +"specified below" +msgstr "" +"Если включено, объекты прилипают к линиям сетки только на указанном " +"минимальном расстоянии" -#: ../src/ui/dialog/glyphs.cpp:123 ../src/ui/dialog/glyphs.cpp:206 -msgid "Balinese" -msgstr "Балинезийский" +#. Options for snapping to guides +#: ../src/ui/dialog/document-properties.cpp:135 +msgid "Snap dist_ance" +msgstr "Радиус _прилипания" -#: ../src/ui/dialog/glyphs.cpp:124 -msgid "Cuneiform" -msgstr "Клинопись" +#: ../src/ui/dialog/document-properties.cpp:135 +msgid "Snap only when close_r than:" +msgstr "Прилипать только если _ближе чем:" -#: ../src/ui/dialog/glyphs.cpp:125 -msgid "Phoenician" -msgstr "Финикийский" +#: ../src/ui/dialog/document-properties.cpp:136 +msgid "Snapping distance, in screen pixels, for snapping to guides" +msgstr "Зона прилипания к направляющим, в экранных точках" -#: ../src/ui/dialog/glyphs.cpp:126 ../src/ui/dialog/glyphs.cpp:275 -msgid "Phags-pa" -msgstr "Фагс-па" +#: ../src/ui/dialog/document-properties.cpp:136 +msgid "Always snap to guides, regardless of the distance" +msgstr "Всегда прилипать к направляющим вне зависимости от расстояния до них" -#: ../src/ui/dialog/glyphs.cpp:127 -msgid "N'Ko" -msgstr "Н'ко" +#: ../src/ui/dialog/document-properties.cpp:137 +msgid "" +"If set, objects only snap to a guide when it's within the range specified " +"below" +msgstr "" +"Если включено, объекты прилипают к направляющим только на указанном " +"минимальном расстоянии" -#: ../src/ui/dialog/glyphs.cpp:128 ../src/ui/dialog/glyphs.cpp:278 -msgid "Kayah Li" -msgstr "Кайях Ли" +#. --------------------------------------------------------------- +#: ../src/ui/dialog/document-properties.cpp:140 +#, fuzzy +msgid "Snap to clip paths" +msgstr "Прилипать к контурам" -#: ../src/ui/dialog/glyphs.cpp:129 ../src/ui/dialog/glyphs.cpp:208 -msgid "Lepcha" -msgstr "Лепча" +#: ../src/ui/dialog/document-properties.cpp:140 +msgid "When snapping to paths, then also try snapping to clip paths" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:130 ../src/ui/dialog/glyphs.cpp:279 -msgid "Rejang" -msgstr "Реджанг" +#: ../src/ui/dialog/document-properties.cpp:141 +#, fuzzy +msgid "Snap to mask paths" +msgstr "Прилипать к контурам" -#: ../src/ui/dialog/glyphs.cpp:131 ../src/ui/dialog/glyphs.cpp:207 -msgid "Sundanese" -msgstr "Сунданский" +#: ../src/ui/dialog/document-properties.cpp:141 +msgid "When snapping to paths, then also try snapping to mask paths" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:132 ../src/ui/dialog/glyphs.cpp:276 -msgid "Saurashtra" -msgstr "Саураштра" +#: ../src/ui/dialog/document-properties.cpp:142 +#, fuzzy +msgid "Snap perpendicularly" +msgstr "Перпендикулярная биссектриса" -#: ../src/ui/dialog/glyphs.cpp:133 ../src/ui/dialog/glyphs.cpp:282 -msgid "Cham" -msgstr "Тямское письмо " +#: ../src/ui/dialog/document-properties.cpp:142 +msgid "" +"When snapping to paths or guides, then also try snapping perpendicularly" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:134 ../src/ui/dialog/glyphs.cpp:209 -msgid "Ol Chiki" -msgstr "Ол Чики" +#: ../src/ui/dialog/document-properties.cpp:143 +#, fuzzy +msgid "Snap tangentially" +msgstr "Установить заливку" -#: ../src/ui/dialog/glyphs.cpp:135 ../src/ui/dialog/glyphs.cpp:268 -msgid "Vai" -msgstr "Ваи" +#: ../src/ui/dialog/document-properties.cpp:143 +msgid "When snapping to paths or guides, then also try snapping tangentially" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:136 -msgid "Carian" -msgstr "Карийский" +#: ../src/ui/dialog/document-properties.cpp:146 +msgctxt "Grid" +msgid "_New" +msgstr "_Создать" -#: ../src/ui/dialog/glyphs.cpp:137 -msgid "Lycian" -msgstr "Ликийский" +#: ../src/ui/dialog/document-properties.cpp:146 +msgid "Create new grid." +msgstr "Создать новую сетку" -#: ../src/ui/dialog/glyphs.cpp:138 -msgid "Lydian" -msgstr "Лидийский" +#: ../src/ui/dialog/document-properties.cpp:147 +msgctxt "Grid" +msgid "_Remove" +msgstr "_Удалить" -#: ../src/ui/dialog/glyphs.cpp:153 -msgid "Basic Latin" -msgstr "Базовая латиница" +#: ../src/ui/dialog/document-properties.cpp:147 +msgid "Remove selected grid." +msgstr "Удалить выделенную сетку" -#: ../src/ui/dialog/glyphs.cpp:154 -msgid "Latin-1 Supplement" -msgstr "Латиница, дополнение 1" +#: ../src/ui/dialog/document-properties.cpp:154 +#: ../src/widgets/toolbox.cpp:1835 +msgid "Guides" +msgstr "Направляющие" -#: ../src/ui/dialog/glyphs.cpp:155 -msgid "Latin Extended-A" -msgstr "Латиница, расширение А" +#: ../src/ui/dialog/document-properties.cpp:156 ../src/verbs.cpp:2744 +msgid "Snap" +msgstr "Прилипание" -#: ../src/ui/dialog/glyphs.cpp:156 -msgid "Latin Extended-B" -msgstr "Латиница, расширение B" +#: ../src/ui/dialog/document-properties.cpp:158 +msgid "Scripting" +msgstr "Сценарии" -#: ../src/ui/dialog/glyphs.cpp:157 -msgid "IPA Extensions" -msgstr "Расширения IPA" +#: ../src/ui/dialog/document-properties.cpp:322 +msgid "<b>General</b>" +msgstr "<b>Общие</b>" -#: ../src/ui/dialog/glyphs.cpp:158 -msgid "Spacing Modifier Letters" -msgstr "Модификаторы пробелов" +#: ../src/ui/dialog/document-properties.cpp:324 +msgid "<b>Page Size</b>" +msgstr "<b>Размер страницы</b>" -#: ../src/ui/dialog/glyphs.cpp:159 -msgid "Combining Diacritical Marks" -msgstr "Объединяющие диакритические метки" +#: ../src/ui/dialog/document-properties.cpp:326 +msgid "<b>Display</b>" +msgstr "<b>Отображение</b>" -#: ../src/ui/dialog/glyphs.cpp:160 -msgid "Greek and Coptic" -msgstr "Греческий и коптский" +#: ../src/ui/dialog/document-properties.cpp:361 +msgid "<b>Guides</b>" +msgstr "<b>Направляющие</b>" -#: ../src/ui/dialog/glyphs.cpp:162 -msgid "Cyrillic Supplement" -msgstr "Кириллица, дополнение" +#: ../src/ui/dialog/document-properties.cpp:379 +msgid "<b>Snap to objects</b>" +msgstr "<b>Прилипание к объектам</b>" -#: ../src/ui/dialog/glyphs.cpp:167 -msgid "Arabic Supplement" -msgstr "Арабский, дополнение" +#: ../src/ui/dialog/document-properties.cpp:381 +msgid "<b>Snap to grids</b>" +msgstr "<b>Прилипание к сеткам</b>" -#: ../src/ui/dialog/glyphs.cpp:169 -msgid "NKo" -msgstr "Нко" +#: ../src/ui/dialog/document-properties.cpp:383 +msgid "<b>Snap to guides</b>" +msgstr "<b>Прилипание к направляющим</b>" -#: ../src/ui/dialog/glyphs.cpp:170 -msgid "Samaritan" -msgstr "Самаритянское письмо " +#: ../src/ui/dialog/document-properties.cpp:385 +msgid "<b>Miscellaneous</b>" +msgstr "<b>Разное</b>" -#: ../src/ui/dialog/glyphs.cpp:186 -msgid "Hangul Jamo" -msgstr "Хангул Ямо" +#. TODO check if this next line was sometimes needed. It being there caused an assertion. +#. Inkscape::GC::release(defsRepr); +#. inform the document, so we can undo +#. Color Management +#: ../src/ui/dialog/document-properties.cpp:498 ../src/verbs.cpp:2921 +msgid "Link Color Profile" +msgstr "Связать с цветовым профилем" -#: ../src/ui/dialog/glyphs.cpp:188 -msgid "Ethiopic Supplement" -msgstr "Эфиопский, дополнение" +#: ../src/ui/dialog/document-properties.cpp:599 +msgid "Remove linked color profile" +msgstr "Удалить связанный цветовой профиль" -#: ../src/ui/dialog/glyphs.cpp:190 -msgid "Unified Canadian Aboriginal Syllabics" -msgstr "Объединённое слоговое письмо канадских аборигенов" +#: ../src/ui/dialog/document-properties.cpp:613 +msgid "<b>Linked Color Profiles:</b>" +msgstr "<b>Связанные цветовые профили:</b>" -#: ../src/ui/dialog/glyphs.cpp:199 -msgid "Unified Canadian Aboriginal Syllabics Extended" -msgstr "Расширенное объединённое слоговое письмо канадских аборигенов" +#: ../src/ui/dialog/document-properties.cpp:615 +msgid "<b>Available Color Profiles:</b>" +msgstr "<b>Доступные цветовые профили:</b>" -#: ../src/ui/dialog/glyphs.cpp:203 -msgid "Khmer Symbols" -msgstr "Кхмерские символы" +#: ../src/ui/dialog/document-properties.cpp:617 +msgid "Link Profile" +msgstr "Связать с профилем" -#: ../src/ui/dialog/glyphs.cpp:205 -msgid "Tai Tham" -msgstr "Тай Там" +#: ../src/ui/dialog/document-properties.cpp:626 +msgid "Unlink Profile" +msgstr "Удалить связь с профилем" -#: ../src/ui/dialog/glyphs.cpp:210 -msgid "Vedic Extensions" -msgstr "Ведические расширения" +#: ../src/ui/dialog/document-properties.cpp:710 +msgid "Profile Name" +msgstr "Название профиля" -#: ../src/ui/dialog/glyphs.cpp:211 -msgid "Phonetic Extensions" -msgstr "Фонетические расширения" +#: ../src/ui/dialog/document-properties.cpp:746 +msgid "External scripts" +msgstr "Внешние скрипты" -#: ../src/ui/dialog/glyphs.cpp:212 -msgid "Phonetic Extensions Supplement" -msgstr "Фонетические расширения, дополнение" +#: ../src/ui/dialog/document-properties.cpp:747 +msgid "Embedded scripts" +msgstr "Встроенные скрипты" -#: ../src/ui/dialog/glyphs.cpp:213 -msgid "Combining Diacritical Marks Supplement" -msgstr "Объединяющие диакритические метки, дополнение" +#: ../src/ui/dialog/document-properties.cpp:752 +msgid "<b>External script files:</b>" +msgstr "<b>Внешние файлы скриптов:</b>" -#: ../src/ui/dialog/glyphs.cpp:214 -msgid "Latin Extended Additional" -msgstr "Латиница расширенная дополнительная" +#: ../src/ui/dialog/document-properties.cpp:754 +msgid "Add the current file name or browse for a file" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:215 -msgid "Greek Extended" -msgstr "Расширенный греческий" +#: ../src/ui/dialog/document-properties.cpp:763 +#: ../src/ui/dialog/document-properties.cpp:852 +#: ../src/ui/widget/selected-style.cpp:343 +msgid "Remove" +msgstr "Удалить" -#: ../src/ui/dialog/glyphs.cpp:216 -msgid "General Punctuation" -msgstr "Общие знаки препинания" +#: ../src/ui/dialog/document-properties.cpp:833 +msgid "Filename" +msgstr "Имя файла" -#: ../src/ui/dialog/glyphs.cpp:217 -msgid "Superscripts and Subscripts" -msgstr "Верхний и нижний индексы" +#: ../src/ui/dialog/document-properties.cpp:841 +msgid "<b>Embedded script files:</b>" +msgstr "<b>Встроенные файлы скриптов:</b>" -#: ../src/ui/dialog/glyphs.cpp:218 -msgid "Currency Symbols" -msgstr "Символы валют" +#: ../src/ui/dialog/document-properties.cpp:843 +msgid "New" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:219 -msgid "Combining Diacritical Marks for Symbols" -msgstr "Объединяющие диакритические метки для символов" +#: ../src/ui/dialog/document-properties.cpp:922 +msgid "Script id" +msgstr "ID скрипта" -#: ../src/ui/dialog/glyphs.cpp:220 -msgid "Letterlike Symbols" -msgstr "Буквообразные символы" +#: ../src/ui/dialog/document-properties.cpp:928 +msgid "<b>Content:</b>" +msgstr "<b>Содержание:</b>" -#: ../src/ui/dialog/glyphs.cpp:221 -msgid "Number Forms" -msgstr "Числовые формы" +#: ../src/ui/dialog/document-properties.cpp:1045 +msgid "_Save as default" +msgstr "_Сохранить и использовать по умолчанию" -#: ../src/ui/dialog/glyphs.cpp:222 -msgid "Arrows" -msgstr "Стрелки" +#: ../src/ui/dialog/document-properties.cpp:1046 +msgid "Save this metadata as the default metadata" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:223 -msgid "Mathematical Operators" -msgstr "Математические операторы" +#: ../src/ui/dialog/document-properties.cpp:1047 +msgid "Use _default" +msgstr "_Использовать значения по умолчанию" -#: ../src/ui/dialog/glyphs.cpp:224 -msgid "Miscellaneous Technical" -msgstr "Различные технические символы" +#: ../src/ui/dialog/document-properties.cpp:1048 +msgid "Use the previously saved default metadata here" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:225 -msgid "Control Pictures" -msgstr "Управляющие картинки" +#. inform the document, so we can undo +#: ../src/ui/dialog/document-properties.cpp:1121 +msgid "Add external script..." +msgstr "Добавить внешний скрипт..." -#: ../src/ui/dialog/glyphs.cpp:226 -msgid "Optical Character Recognition" -msgstr "Оптическое распознавание символов" +#: ../src/ui/dialog/document-properties.cpp:1160 +msgid "Select a script to load" +msgstr "Выберите скрипт для загрузки" -#: ../src/ui/dialog/glyphs.cpp:227 -msgid "Enclosed Alphanumerics" -msgstr "Алфавитно-цифровые символы в рамке" +#. inform the document, so we can undo +#: ../src/ui/dialog/document-properties.cpp:1188 +msgid "Add embedded script..." +msgstr "Добавить встроенный скрипт..." -#: ../src/ui/dialog/glyphs.cpp:228 -msgid "Box Drawing" -msgstr "Для рисования рамок" +#. inform the document, so we can undo +#: ../src/ui/dialog/document-properties.cpp:1219 +msgid "Remove external script" +msgstr "Удалить внешний сценарий" -#: ../src/ui/dialog/glyphs.cpp:229 -msgid "Block Elements" -msgstr "Блочные элементы" +#. inform the document, so we can undo +#: ../src/ui/dialog/document-properties.cpp:1249 +msgid "Remove embedded script" +msgstr "Удалить встроенный скрипт" -#: ../src/ui/dialog/glyphs.cpp:230 -msgid "Geometric Shapes" -msgstr "Геометрические фигуры" +#. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); +#. inform the document, so we can undo +#: ../src/ui/dialog/document-properties.cpp:1346 +msgid "Edit embedded script" +msgstr "Изменить встроенный скрипт" -#: ../src/ui/dialog/glyphs.cpp:231 -msgid "Miscellaneous Symbols" -msgstr "Различные символы" +#: ../src/ui/dialog/document-properties.cpp:1429 +msgid "<b>Creation</b>" +msgstr "<b>Создание</b>" -#: ../src/ui/dialog/glyphs.cpp:232 -msgid "Dingbats" -msgstr "Условные знаки" +#: ../src/ui/dialog/document-properties.cpp:1430 +msgid "<b>Defined grids</b>" +msgstr "<b>Определённые пользователем сетки</b>" -#: ../src/ui/dialog/glyphs.cpp:233 -msgid "Miscellaneous Mathematical Symbols-A" -msgstr "Различные математические символы A" +#: ../src/ui/dialog/document-properties.cpp:1677 +msgid "Remove grid" +msgstr "Удаление сетки" -#: ../src/ui/dialog/glyphs.cpp:234 -msgid "Supplemental Arrows-A" -msgstr "Дополнительные стрелки A" +#: ../src/ui/dialog/document-properties.cpp:1761 +msgid "Changed document unit" +msgstr "Изменена единица измерения" -#: ../src/ui/dialog/glyphs.cpp:235 -msgid "Braille Patterns" -msgstr "Азбука Брейля" +#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2796 +msgid "_Page" +msgstr "_Страница" -#: ../src/ui/dialog/glyphs.cpp:236 -msgid "Supplemental Arrows-B" -msgstr "Дополнительные стрелки B" +#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2800 +msgid "_Drawing" +msgstr "_Рисунок" -#: ../src/ui/dialog/glyphs.cpp:237 -msgid "Miscellaneous Mathematical Symbols-B" -msgstr "Различные математические символы B" +#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2802 +msgid "_Selection" +msgstr "_Выделение" -#: ../src/ui/dialog/glyphs.cpp:238 -msgid "Supplemental Mathematical Operators" -msgstr "Дополнительные математические операторы" +#: ../src/ui/dialog/export.cpp:152 +msgid "_Custom" +msgstr "_Заказная" + +#: ../src/ui/dialog/export.cpp:170 ../src/widgets/measure-toolbar.cpp:99 +#: ../src/widgets/measure-toolbar.cpp:107 +#: ../share/extensions/render_gears.inx.h:6 +msgid "Units:" +msgstr "Единица измерения:" -#: ../src/ui/dialog/glyphs.cpp:239 -msgid "Miscellaneous Symbols and Arrows" -msgstr "Различные символы и стрелки" +#: ../src/ui/dialog/export.cpp:172 +msgid "_Export As..." +msgstr "Экспортировать _как..." -#: ../src/ui/dialog/glyphs.cpp:241 -msgid "Latin Extended-C" -msgstr "Латиница, расширение C" +#: ../src/ui/dialog/export.cpp:175 +msgid "B_atch export all selected objects" +msgstr "Пакетный экспорт _всех выделенных объектов" -#: ../src/ui/dialog/glyphs.cpp:243 -msgid "Georgian Supplement" -msgstr "Грузинский, дополнение" +#: ../src/ui/dialog/export.cpp:175 +msgid "" +"Export each selected object into its own PNG file, using export hints if any " +"(caution, overwrites without asking!)" +msgstr "" +"Экспортировать каждый выделенный объект в отдельный файл PNG, используя " +"подсказки, если таковые доступны (без подтверждения перезаписи существующих " +"файлов)" -#: ../src/ui/dialog/glyphs.cpp:245 -msgid "Ethiopic Extended" -msgstr "Эфиопский расширенный" +#: ../src/ui/dialog/export.cpp:177 +msgid "Hide a_ll except selected" +msgstr "Э_кспортировать только выделенное" -#: ../src/ui/dialog/glyphs.cpp:246 -msgid "Cyrillic Extended-A" -msgstr "Кириллический расширенный A" +#: ../src/ui/dialog/export.cpp:177 +msgid "In the exported image, hide all objects except those that are selected" +msgstr "Исключить из конечного изображения все невыделенные объекты" -#: ../src/ui/dialog/glyphs.cpp:247 -msgid "Supplemental Punctuation" -msgstr "Дополнительные знаки препинания" +#: ../src/ui/dialog/export.cpp:178 +msgid "Close when complete" +msgstr "Закрыть по завершении" -#: ../src/ui/dialog/glyphs.cpp:248 -msgid "CJK Radicals Supplement" -msgstr "Корни CJK, дополнение" +#: ../src/ui/dialog/export.cpp:178 +msgid "Once the export completes, close this dialog" +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:249 -msgid "Kangxi Radicals" -msgstr "Корни Канси" +#: ../src/ui/dialog/export.cpp:180 +msgid "_Export" +msgstr "_Экспорт" -#: ../src/ui/dialog/glyphs.cpp:250 -msgid "Ideographic Description Characters" -msgstr "Символы идеографического описания" +#: ../src/ui/dialog/export.cpp:198 +msgid "<b>Export area</b>" +msgstr "<b>Экспортируемая область</b>" -#: ../src/ui/dialog/glyphs.cpp:251 -msgid "CJK Symbols and Punctuation" -msgstr "Символы и знаки препинания CJK" +#: ../src/ui/dialog/export.cpp:237 +msgid "_x0:" +msgstr "_x0" -#: ../src/ui/dialog/glyphs.cpp:255 -msgid "Hangul Compatibility Jamo" -msgstr "Хангул, совместимый с Ямо" +#: ../src/ui/dialog/export.cpp:241 +msgid "x_1:" +msgstr "x_1" -#: ../src/ui/dialog/glyphs.cpp:256 -msgid "Kanbun" -msgstr "Канбун" +#: ../src/ui/dialog/export.cpp:245 +msgid "Wid_th:" +msgstr "Ш_ирина:" -#: ../src/ui/dialog/glyphs.cpp:257 -msgid "Bopomofo Extended" -msgstr "Расширенный бопомото" +#: ../src/ui/dialog/export.cpp:249 +msgid "_y0:" +msgstr "y_0" -#: ../src/ui/dialog/glyphs.cpp:258 -msgid "CJK Strokes" -msgstr "Росчерки CJK" +#: ../src/ui/dialog/export.cpp:253 +msgid "y_1:" +msgstr "_y1" -#: ../src/ui/dialog/glyphs.cpp:259 -msgid "Katakana Phonetic Extensions" -msgstr "Фонетические расширения катаканы" +#: ../src/ui/dialog/export.cpp:257 +msgid "Hei_ght:" +msgstr "В_ысота:" -#: ../src/ui/dialog/glyphs.cpp:260 -msgid "Enclosed CJK Letters and Months" -msgstr "Знаки и месяца CJK в рамке" +#: ../src/ui/dialog/export.cpp:272 +msgid "<b>Image size</b>" +msgstr "<b>Размер изображения</b>" -#: ../src/ui/dialog/glyphs.cpp:261 -msgid "CJK Compatibility" -msgstr "CJK, совместимость" +#: ../src/ui/dialog/export.cpp:290 ../src/ui/dialog/export.cpp:301 +msgid "pixels at" +msgstr "пикселов при" -#: ../src/ui/dialog/glyphs.cpp:262 -msgid "CJK Unified Ideographs Extension A" -msgstr "" +#: ../src/ui/dialog/export.cpp:296 +msgid "dp_i" +msgstr "dp_i" -#: ../src/ui/dialog/glyphs.cpp:263 -msgid "Yijing Hexagram Symbols" -msgstr "Гексаграммы И-Цзин" +#: ../src/ui/dialog/export.cpp:301 ../src/ui/dialog/transformation.cpp:82 +#: ../src/ui/widget/page-sizer.cpp:237 +msgid "_Height:" +msgstr "_Высота:" -#: ../src/ui/dialog/glyphs.cpp:264 -msgid "CJK Unified Ideographs" -msgstr "Объединенные идеограммы CJK" +#: ../src/ui/dialog/export.cpp:309 +#: ../src/ui/dialog/inkscape-preferences.cpp:1436 +#: ../src/ui/dialog/inkscape-preferences.cpp:1440 +#: ../src/ui/dialog/inkscape-preferences.cpp:1464 +msgid "dpi" +msgstr "dpi" -#: ../src/ui/dialog/glyphs.cpp:265 -msgid "Yi Syllables" -msgstr "Слоги Юи" +#: ../src/ui/dialog/export.cpp:317 +msgid "<b>_Filename</b>" +msgstr "<b>_Имя файла</b>" -#: ../src/ui/dialog/glyphs.cpp:266 -msgid "Yi Radicals" -msgstr "Корни Юи" +#: ../src/ui/dialog/export.cpp:359 +msgid "Export the bitmap file with these settings" +msgstr "Экспортировать файл с этими установками" -#: ../src/ui/dialog/glyphs.cpp:267 -msgid "Lisu" -msgstr "Лису" +#: ../src/ui/dialog/export.cpp:612 +#, c-format +msgid "B_atch export %d selected object" +msgid_plural "B_atch export %d selected objects" +msgstr[0] "Пакетный экспорт %d выделенного объекта" +msgstr[1] "Пакетный экспорт %d выделенных объектов" +msgstr[2] "Пакетный экспорт %d выделенных объектов" -#: ../src/ui/dialog/glyphs.cpp:269 -msgid "Cyrillic Extended-B" -msgstr "Кириллический расширенный B" +#: ../src/ui/dialog/export.cpp:928 +msgid "Export in progress" +msgstr "Выполняется экспорт" -#: ../src/ui/dialog/glyphs.cpp:270 -msgid "Bamum" -msgstr "Бамум" +#: ../src/ui/dialog/export.cpp:1018 +msgid "No items selected." +msgstr "Ни один объект не выбран" -#: ../src/ui/dialog/glyphs.cpp:271 -msgid "Modifier Tone Letters" -msgstr "" +#: ../src/ui/dialog/export.cpp:1022 ../src/ui/dialog/export.cpp:1024 +#, fuzzy +msgid "Exporting %1 files" +msgstr "Экспорт %d файлов" -#: ../src/ui/dialog/glyphs.cpp:272 -msgid "Latin Extended-D" -msgstr "Латиница, расширение D" +#: ../src/ui/dialog/export.cpp:1064 ../src/ui/dialog/export.cpp:1066 +#, c-format +msgid "Exporting file <b>%s</b>..." +msgstr "Экспортируется файл <b>%s</b>..." -#: ../src/ui/dialog/glyphs.cpp:274 -msgid "Common Indic Number Forms" -msgstr "Обычные индийские числовые формы" +#: ../src/ui/dialog/export.cpp:1075 ../src/ui/dialog/export.cpp:1166 +#, c-format +msgid "Could not export to filename %s.\n" +msgstr "Невозможно экспортировать в файл %s.\n" -#: ../src/ui/dialog/glyphs.cpp:277 -msgid "Devanagari Extended" -msgstr "Деванагари, расширение" +#: ../src/ui/dialog/export.cpp:1078 +#, c-format +msgid "Could not export to filename <b>%s</b>." +msgstr "Не удалось экспортировать в файл <b>%s</b>." -#: ../src/ui/dialog/glyphs.cpp:280 -msgid "Hangul Jamo Extended-A" -msgstr "Хангыль Ямо, расширение A" +#: ../src/ui/dialog/export.cpp:1093 +#, c-format +msgid "Successfully exported <b>%d</b> files from <b>%d</b> selected items." +msgstr "" -#: ../src/ui/dialog/glyphs.cpp:281 -msgid "Javanese" -msgstr "Яванский" +#: ../src/ui/dialog/export.cpp:1104 +msgid "You have to enter a filename." +msgstr "Необходимо ввести имя файла." -#: ../src/ui/dialog/glyphs.cpp:283 -msgid "Myanmar Extended-A" -msgstr "Мьянма, расширение A" +#: ../src/ui/dialog/export.cpp:1105 +msgid "You have to enter a filename" +msgstr "Вы забыли ввести имя файла" -#: ../src/ui/dialog/glyphs.cpp:284 -msgid "Tai Viet" -msgstr "Тай Вьет" +#: ../src/ui/dialog/export.cpp:1119 +msgid "The chosen area to be exported is invalid." +msgstr "Экспортируемая область выбрана некорректно." -#: ../src/ui/dialog/glyphs.cpp:285 -#, fuzzy -msgid "Meetei Mayek" -msgstr "Слой удалён" +#: ../src/ui/dialog/export.cpp:1120 +msgid "The chosen area to be exported is invalid" +msgstr "Недопустимая область для экспорта" -#: ../src/ui/dialog/glyphs.cpp:286 -msgid "Hangul Syllables" -msgstr "Слоги Хангул" +#: ../src/ui/dialog/export.cpp:1135 +#, c-format +msgid "Directory %s does not exist or is not a directory.\n" +msgstr "Каталог %s не существует, либо это не каталог.\n" -#: ../src/ui/dialog/glyphs.cpp:287 -msgid "Hangul Jamo Extended-B" -msgstr "Хангыль Ямо, расширение B" +#. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image +#: ../src/ui/dialog/export.cpp:1149 ../src/ui/dialog/export.cpp:1151 +msgid "Exporting %1 (%2 x %3)" +msgstr "Экспорт %1 (%2 × %3)" -#: ../src/ui/dialog/glyphs.cpp:288 -msgid "High Surrogates" -msgstr "Верхняя часть суррогатных пар " +#: ../src/ui/dialog/export.cpp:1177 +#, c-format +msgid "Drawing exported to <b>%s</b>." +msgstr "Рисунок экспортирован в <b>%s</b>." -#: ../src/ui/dialog/glyphs.cpp:289 -msgid "High Private Use Surrogates" -msgstr "Верхняя часть суррогатных пар для частного использования" +#: ../src/ui/dialog/export.cpp:1181 +msgid "Export aborted." +msgstr "Экспорт прерван." -#: ../src/ui/dialog/glyphs.cpp:290 -msgid "Low Surrogates" -msgstr "Нижняя часть суррогатных пар" +#: ../src/ui/dialog/export.cpp:1303 ../src/ui/dialog/input.cpp:1082 +#: ../src/verbs.cpp:2358 ../src/widgets/desktop-widget.cpp:1123 +msgid "_Save" +msgstr "Со_хранить" -#: ../src/ui/dialog/glyphs.cpp:291 -msgid "Private Use Area" -msgstr "Область для частного использования" +#: ../src/ui/dialog/extension-editor.cpp:81 +msgid "Information" +msgstr "Информация" -#: ../src/ui/dialog/glyphs.cpp:292 -msgid "CJK Compatibility Ideographs" -msgstr "Совместимые иероглифы CJK" +#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:290 +#: ../src/verbs.cpp:309 ../share/extensions/color_HSL_adjust.inx.h:11 +#: ../share/extensions/color_custom.inx.h:7 +#: ../share/extensions/color_randomize.inx.h:6 +#: ../share/extensions/dots.inx.h:7 +#: ../share/extensions/draw_from_triangle.inx.h:35 +#: ../share/extensions/dxf_input.inx.h:10 +#: ../share/extensions/dxf_outlines.inx.h:24 +#: ../share/extensions/gcodetools_about.inx.h:3 +#: ../share/extensions/gcodetools_area.inx.h:53 +#: ../share/extensions/gcodetools_check_for_updates.inx.h:3 +#: ../share/extensions/gcodetools_dxf_points.inx.h:25 +#: ../share/extensions/gcodetools_engraving.inx.h:31 +#: ../share/extensions/gcodetools_graffiti.inx.h:42 +#: ../share/extensions/gcodetools_lathe.inx.h:46 +#: ../share/extensions/gcodetools_orientation_points.inx.h:14 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:35 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:17 +#: ../share/extensions/gcodetools_tools_library.inx.h:12 +#: ../share/extensions/generate_voronoi.inx.h:5 +#: ../share/extensions/gimp_xcf.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:27 +#: ../share/extensions/jessyInk_autoTexts.inx.h:8 +#: ../share/extensions/jessyInk_effects.inx.h:13 +#: ../share/extensions/jessyInk_export.inx.h:7 +#: ../share/extensions/jessyInk_install.inx.h:2 +#: ../share/extensions/jessyInk_keyBindings.inx.h:44 +#: ../share/extensions/jessyInk_masterSlide.inx.h:5 +#: ../share/extensions/jessyInk_mouseHandler.inx.h:6 +#: ../share/extensions/jessyInk_summary.inx.h:2 +#: ../share/extensions/jessyInk_transitions.inx.h:12 +#: ../share/extensions/jessyInk_uninstall.inx.h:10 +#: ../share/extensions/jessyInk_video.inx.h:2 +#: ../share/extensions/jessyInk_view.inx.h:7 +#: ../share/extensions/layout_nup.inx.h:24 +#: ../share/extensions/lindenmayer.inx.h:13 +#: ../share/extensions/lorem_ipsum.inx.h:6 +#: ../share/extensions/measure.inx.h:16 +#: ../share/extensions/pathalongpath.inx.h:16 +#: ../share/extensions/pathscatter.inx.h:18 +#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/split.inx.h:8 +#: ../share/extensions/voronoi2svg.inx.h:11 +#: ../share/extensions/web-set-att.inx.h:25 +#: ../share/extensions/web-transmit-att.inx.h:23 +#: ../share/extensions/webslicer_create_group.inx.h:11 +#: ../share/extensions/webslicer_export.inx.h:6 +msgid "Help" +msgstr "Справка" -#: ../src/ui/dialog/glyphs.cpp:293 -msgid "Alphabetic Presentation Forms" -msgstr "Алфавитные формы представления" +#: ../src/ui/dialog/extension-editor.cpp:83 +msgid "Parameters" +msgstr "Параметры" -#: ../src/ui/dialog/glyphs.cpp:294 -msgid "Arabic Presentation Forms-A" -msgstr "Арабские формы представления A" +#. Fill in the template +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:376 +msgid "No preview" +msgstr "Без предпросмотра" -#: ../src/ui/dialog/glyphs.cpp:295 -msgid "Variation Selectors" -msgstr "Селекторы вариантов начертания" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:480 +msgid "too large for preview" +msgstr "Слишком велик для просмотра" -#: ../src/ui/dialog/glyphs.cpp:296 -msgid "Vertical Forms" -msgstr "Вертикальные формы" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:565 +msgid "Enable preview" +msgstr "Включить предпросмотр" -#: ../src/ui/dialog/glyphs.cpp:297 -msgid "Combining Half Marks" -msgstr "Комбинируемые половины символов" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:715 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:728 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:732 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:735 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:743 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:759 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:774 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:282 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:413 +msgid "All Files" +msgstr "Все файлы" -#: ../src/ui/dialog/glyphs.cpp:298 -msgid "CJK Compatibility Forms" -msgstr "CJK, формы для совместимости" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:740 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:756 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:771 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:283 +msgid "All Inkscape Files" +msgstr "Все файлы Inkscape" -#: ../src/ui/dialog/glyphs.cpp:299 -msgid "Small Form Variants" -msgstr "Малые варианты форм" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:747 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:763 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:777 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:284 +msgid "All Images" +msgstr "Все изображения" -#: ../src/ui/dialog/glyphs.cpp:300 -msgid "Arabic Presentation Forms-B" -msgstr "Арабские формы представления B" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:750 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:766 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:285 +msgid "All Vectors" +msgstr "Все векторные" -#: ../src/ui/dialog/glyphs.cpp:301 -msgid "Halfwidth and Fullwidth Forms" -msgstr "Формы в половинную и полную ширину" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:753 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:769 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:783 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:286 +msgid "All Bitmaps" +msgstr "Все растровые" -#: ../src/ui/dialog/glyphs.cpp:302 -#, fuzzy -msgid "Specials" -msgstr "Спирали" +#. ###### File options +#. ###### Do we want the .xxx extension automatically added? +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1002 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1560 +msgid "Append filename extension automatically" +msgstr "Автоматически добавить расширение файла" -#: ../src/ui/dialog/glyphs.cpp:377 -msgid "Script: " -msgstr "Письменность:" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1175 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1428 +msgid "Guess from extension" +msgstr "Угадать по расширению" -#: ../src/ui/dialog/glyphs.cpp:414 -msgid "Range: " -msgstr "Диапазон: " +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1447 +msgid "Left edge of source" +msgstr "Исходный левый край" -#: ../src/ui/dialog/glyphs.cpp:497 -msgid "Append" -msgstr "Вставить" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1448 +msgid "Top edge of source" +msgstr "Исходный правый край" -#: ../src/ui/dialog/glyphs.cpp:618 -msgid "Append text" -msgstr "Вставить текст" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1449 +msgid "Right edge of source" +msgstr "Исходный правый край" -#: ../src/ui/dialog/grid-arrange-tab.cpp:351 -msgid "Arrange in a grid" -msgstr "Расстановка по сетке" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1450 +msgid "Bottom edge of source" +msgstr "Исходный нижний край" -#: ../src/ui/dialog/grid-arrange-tab.cpp:589 -#: ../src/ui/dialog/object-attributes.cpp:66 -#: ../src/ui/dialog/object-attributes.cpp:75 -#: ../src/widgets/desktop-widget.cpp:666 ../src/widgets/node-toolbar.cpp:581 -msgid "X:" -msgstr "X:" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1451 +msgid "Source width" +msgstr "Исходная ширина" -#: ../src/ui/dialog/grid-arrange-tab.cpp:589 -msgid "Horizontal spacing between columns." -msgstr "Горизонтальный интервал между столбцами" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1452 +msgid "Source height" +msgstr "Исходная высота" -#: ../src/ui/dialog/grid-arrange-tab.cpp:590 -#: ../src/ui/dialog/object-attributes.cpp:67 -#: ../src/ui/dialog/object-attributes.cpp:76 -#: ../src/widgets/desktop-widget.cpp:676 ../src/widgets/node-toolbar.cpp:599 -msgid "Y:" -msgstr "Y:" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1453 +msgid "Destination width" +msgstr "Конечная ширина" -#: ../src/ui/dialog/grid-arrange-tab.cpp:590 -msgid "Vertical spacing between rows." -msgstr "Вертикальный интервал между строками" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1454 +msgid "Destination height" +msgstr "Конечная высота" -#: ../src/ui/dialog/grid-arrange-tab.cpp:637 -msgid "_Rows:" -msgstr "_Строки:" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1455 +msgid "Resolution (dots per inch)" +msgstr "Разрешение (в точках на дюйм)" -#: ../src/ui/dialog/grid-arrange-tab.cpp:646 -msgid "Number of rows" -msgstr "Количество строк" +#. ######################################### +#. ## EXTRA WIDGET -- SOURCE SIDE +#. ######################################### +#. ##### Export options buttons/spinners, etc +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1493 +msgid "Document" +msgstr "Документ" -#: ../src/ui/dialog/grid-arrange-tab.cpp:650 -msgid "Equal _height" -msgstr "Равная _высота" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501 ../src/verbs.cpp:175 +#: ../src/widgets/desktop-widget.cpp:2000 +#: ../share/extensions/printing_marks.inx.h:18 +msgid "Selection" +msgstr "Выделение" -#: ../src/ui/dialog/grid-arrange-tab.cpp:661 -msgid "If not set, each row has the height of the tallest object in it" -msgstr "" -"Без этой опции каждая строка принимает высоту самого высокого в ней объекта" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1505 +#, fuzzy +msgctxt "Export dialog" +msgid "Custom" +msgstr "Другой" -#. #### Number of columns #### -#: ../src/ui/dialog/grid-arrange-tab.cpp:677 -msgid "_Columns:" -msgstr "С_толбцы:" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1525 +msgid "Source" +msgstr "Источник" -#: ../src/ui/dialog/grid-arrange-tab.cpp:686 -msgid "Number of columns" -msgstr "Сколько столбцов в таблице" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1545 +msgid "Cairo" +msgstr "Cairo" -#: ../src/ui/dialog/grid-arrange-tab.cpp:690 -msgid "Equal _width" -msgstr "Равная _ширина" +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1548 +msgid "Antialias" +msgstr "Сглаживать" -#: ../src/ui/dialog/grid-arrange-tab.cpp:700 -msgid "If not set, each column has the width of the widest object in it" -msgstr "" -"Если выключено, каждый столбец принимает ширину самого широкого в нем объекта" +#: ../src/ui/dialog/filedialogimpl-win32.cpp:414 +msgid "All Executable Files" +msgstr "Все исполняемые файлы" -#. Anchor selection widget -#: ../src/ui/dialog/grid-arrange-tab.cpp:711 -#, fuzzy -msgid "Alignment:" -msgstr "Выключка" +#: ../src/ui/dialog/filedialogimpl-win32.cpp:606 +msgid "Show Preview" +msgstr "Предпросмотр" -#. #### Radio buttons to control spacing manually or to fit selection bbox #### -#: ../src/ui/dialog/grid-arrange-tab.cpp:720 -msgid "_Fit into selection box" -msgstr "В_писать в площадку выделения" +#: ../src/ui/dialog/filedialogimpl-win32.cpp:744 +msgid "No file selected" +msgstr "Ни один файл не выбран" -#: ../src/ui/dialog/grid-arrange-tab.cpp:727 -msgid "_Set spacing:" -msgstr "Установить _интервал:" +#: ../src/ui/dialog/fill-and-stroke.cpp:62 +msgid "_Fill" +msgstr "_Заливка" -#: ../src/ui/dialog/guides.cpp:47 -msgid "Rela_tive change" -msgstr "Относительное _смещение" +#: ../src/ui/dialog/fill-and-stroke.cpp:63 +msgid "Stroke _paint" +msgstr "Об_водка" -#: ../src/ui/dialog/guides.cpp:47 -msgid "Move and/or rotate the guide relative to current settings" -msgstr "Сместить и/или повернуть направляющую относительно текущих параметров" +#: ../src/ui/dialog/fill-and-stroke.cpp:64 +msgid "Stroke st_yle" +msgstr "_Стиль обводки" -#: ../src/ui/dialog/guides.cpp:48 -#, fuzzy -msgctxt "Guides" -msgid "_X:" -msgstr "_X:" +#. TRANSLATORS: this dialog is accessible via menu Filters - Filter editor +#: ../src/ui/dialog/filter-effects-dialog.cpp:546 +msgid "" +"This matrix determines a linear transform on color space. Each line affects " +"one of the color components. Each column determines how much of each color " +"component from the input is passed to the output. The last column does not " +"depend on input colors, so can be used to adjust a constant component value." +msgstr "" +"Эта матрица определяет линейное преобразование цветового пространства. " +"Каждая строка влияет на один из компонентов цвета. Каждый столбец " +"определяет, как много от каждого цветового компонента на входе передаётся на " +"выход. Последний столбец не зависит от входящих цветов, поэтому его можно " +"использовать для коррекции постоянного значения компонента." -#: ../src/ui/dialog/guides.cpp:49 +#: ../src/ui/dialog/filter-effects-dialog.cpp:549 +#: ../share/extensions/grid_polar.inx.h:4 #, fuzzy -msgctxt "Guides" -msgid "_Y:" -msgstr "_Y:" - -#: ../src/ui/dialog/guides.cpp:50 ../src/ui/dialog/object-properties.cpp:59 -msgid "_Label:" -msgstr "_Метка:" +msgctxt "Label" +msgid "None" +msgstr "Нет" -#: ../src/ui/dialog/guides.cpp:50 -msgid "Optionally give this guideline a name" -msgstr "" +#: ../src/ui/dialog/filter-effects-dialog.cpp:656 +msgid "Image File" +msgstr "Файл..." -#: ../src/ui/dialog/guides.cpp:51 -msgid "_Angle:" -msgstr "_Угол:" +#: ../src/ui/dialog/filter-effects-dialog.cpp:659 +msgid "Selected SVG Element" +msgstr "Выбранный элемент SVG" -#: ../src/ui/dialog/guides.cpp:130 -msgid "Set guide properties" -msgstr "Смена свойств направляющей" +#. TODO: any image, not just svg +#: ../src/ui/dialog/filter-effects-dialog.cpp:729 +msgid "Select an image to be used as feImage input" +msgstr "Выберите изображение, используемое на входе feImage" -#: ../src/ui/dialog/guides.cpp:160 -msgid "Guideline" -msgstr "Направляющая" +#: ../src/ui/dialog/filter-effects-dialog.cpp:821 +msgid "This SVG filter effect does not require any parameters." +msgstr "У этого примитива эффектов SVG нет параметров." -#: ../src/ui/dialog/guides.cpp:310 -#, c-format -msgid "Guideline ID: %s" -msgstr "ID направляющей: %s" +#: ../src/ui/dialog/filter-effects-dialog.cpp:827 +msgid "This SVG filter effect is not yet implemented in Inkscape." +msgstr "Этот примитив фильтра SVG еще не реализован в Inkscape." -#: ../src/ui/dialog/guides.cpp:316 -#, c-format -msgid "Current: %s" -msgstr "Сейчас: %s" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1041 +#, fuzzy +msgid "Slope" +msgstr "Перспектива" -#: ../src/ui/dialog/icon-preview.cpp:159 -#, c-format -msgid "%d x %d" -msgstr "%d x %d" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1042 +#, fuzzy +msgid "Intercept" +msgstr "Интерфейс" -#: ../src/ui/dialog/icon-preview.cpp:171 -msgid "Magnified:" -msgstr "Увеличение:" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1045 +#, fuzzy +msgid "Amplitude" +msgstr "Амплитуда" -#: ../src/ui/dialog/icon-preview.cpp:240 -msgid "Actual Size:" -msgstr "Обычный размер:" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1046 +#, fuzzy +msgid "Exponent" +msgstr "Экспонента:" -#: ../src/ui/dialog/icon-preview.cpp:245 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1143 #, fuzzy -msgctxt "Icon preview window" -msgid "Sele_ction" -msgstr "Выделение" +msgid "New transfer function type" +msgstr "Логические операции" -#: ../src/ui/dialog/icon-preview.cpp:247 -msgid "Selection only or whole document" -msgstr "Либо только выделение, либо весь документ" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1178 +msgid "Light Source:" +msgstr "Источник света:" -#: ../src/ui/dialog/inkscape-preferences.cpp:181 -msgid "Show selection cue" -msgstr "Показывать пометку выделения" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1195 +msgid "Direction angle for the light source on the XY plane, in degrees" +msgstr "Угол, под которым источник света находится к плоскости XY (в градусах)" -#: ../src/ui/dialog/inkscape-preferences.cpp:182 -msgid "" -"Whether selected objects display a selection cue (the same as in selector)" -msgstr "Будет ли отображаться пометка выделения (как и в Выделителе)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 +msgid "Direction angle for the light source on the YZ plane, in degrees" +msgstr "Угол, под которым источник света находится к плоскости YZ (в градусах)" -#: ../src/ui/dialog/inkscape-preferences.cpp:188 -msgid "Enable gradient editing" -msgstr "Включить правку градиентов" +#. default x: +#. default y: +#. default z: +#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 +msgid "Location:" +msgstr "Расположение:" -#: ../src/ui/dialog/inkscape-preferences.cpp:189 -msgid "Whether selected objects display gradient editing controls" -msgstr "Будут ли отображаться средства правки градиентов" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 +msgid "X coordinate" +msgstr "Координата X" -#: ../src/ui/dialog/inkscape-preferences.cpp:194 -msgid "Conversion to guides uses edges instead of bounding box" -msgstr "" -"При преобразовании в направляющие вместо\n" -"площадки (BB) используются края" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 +msgid "Y coordinate" +msgstr "Координата Y" -#: ../src/ui/dialog/inkscape-preferences.cpp:195 -msgid "" -"Converting an object to guides places these along the object's true edges " -"(imitating the object's shape), not along the bounding box" -msgstr "" -"При преобразовании объекта в направляющие эти направляющие будут размещены " -"по настоящим краям объекта, а не по его площадке (BB)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 +msgid "Z coordinate" +msgstr "Координата Z" -#: ../src/ui/dialog/inkscape-preferences.cpp:202 -msgid "Ctrl+click _dot size:" -msgstr "Размер точки по Ctrl+щелчок в" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 +msgid "Points At" +msgstr "Указывает на" -#: ../src/ui/dialog/inkscape-preferences.cpp:202 -msgid "times current stroke width" -msgstr "раза больше текущей обводки" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 +msgid "Specular Exponent" +msgstr "Степень отражения" -#: ../src/ui/dialog/inkscape-preferences.cpp:203 -msgid "Size of dots created with Ctrl+click (relative to current stroke width)" -msgstr "" -"Размер точек, создаваемых по Ctrl+щелчок (относительно текущей толщины " -"штриха)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 +msgid "Exponent value controlling the focus for the light source" +msgstr "Значение экспоненты, контролирующей фокус источника света" -#: ../src/ui/dialog/inkscape-preferences.cpp:218 -msgid "<b>No objects selected</b> to take the style from." -msgstr "<b>Нет выделенных объектов</b>, откуда можно было бы взять стиль." +#. TODO: here I have used 100 degrees as default value. But spec says that if not specified, no limiting cone is applied. So, there should be a way for the user to set a "no limiting cone" option. +#: ../src/ui/dialog/filter-effects-dialog.cpp:1208 +msgid "Cone Angle" +msgstr "Угол конуса" -#: ../src/ui/dialog/inkscape-preferences.cpp:227 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1208 msgid "" -"<b>More than one object selected.</b> Cannot take style from multiple " -"objects." +"This is the angle between the spot light axis (i.e. the axis between the " +"light source and the point to which it is pointing at) and the spot light " +"cone. No light is projected outside this cone." msgstr "" -"<b>Выделено больше одного объекта.</b> Невозможно взять стиль от нескольких " -"объектов сразу." - -#: ../src/ui/dialog/inkscape-preferences.cpp:260 -msgid "Style of new objects" -msgstr "Стиль новых объектов" - -#: ../src/ui/dialog/inkscape-preferences.cpp:262 -msgid "Last used style" -msgstr "Последним использованным стилем" - -#: ../src/ui/dialog/inkscape-preferences.cpp:264 -msgid "Apply the style you last set on an object" -msgstr "Применить последний использованный стиль" +"Угол между осью источника света (т.е. осью, проходящей через источник света " +"и точку, на которую он указывает) и конусом прожектора. За пределы конуса " +"свет не проецируется." -#: ../src/ui/dialog/inkscape-preferences.cpp:269 -msgid "This tool's own style:" -msgstr "Собственным стилем инструмента:" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1274 +msgid "New light source" +msgstr "Новый источник света" -#: ../src/ui/dialog/inkscape-preferences.cpp:273 -msgid "" -"Each tool may store its own style to apply to the newly created objects. Use " -"the button below to set it." -msgstr "" -"Каждый инструмент может использовать свой собственный стиль для создаваемых " -"объектов. Кнопка внизу устанавливает этот стиль." +#: ../src/ui/dialog/filter-effects-dialog.cpp:1325 +msgid "_Duplicate" +msgstr "_Продублировать" -#. style swatch -#: ../src/ui/dialog/inkscape-preferences.cpp:277 -msgid "Take from selection" -msgstr "Взять от выделения" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1359 +msgid "_Filter" +msgstr "_Фильтры" -#: ../src/ui/dialog/inkscape-preferences.cpp:282 -msgid "This tool's style of new objects" -msgstr "Стиль новых объектов, создаваемых этим инструментом" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1379 +msgid "R_ename" +msgstr "Пере_именовать" -#: ../src/ui/dialog/inkscape-preferences.cpp:289 -msgid "Remember the style of the (first) selected object as this tool's style" -msgstr "" -"Запомнить стиль (первого) выделенного объекта как стиль данного инструмента" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1512 +msgid "Rename filter" +msgstr "Переименовать фильтр" -#: ../src/ui/dialog/inkscape-preferences.cpp:294 -msgid "Tools" -msgstr "Инструменты" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1565 +msgid "Apply filter" +msgstr "Применение фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:297 -#, fuzzy -msgid "Bounding box to use" -msgstr "Используемая площадка (BB):" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1635 +msgid "filter" +msgstr "фильтр" -#: ../src/ui/dialog/inkscape-preferences.cpp:298 -msgid "Visual bounding box" -msgstr "Видимая площадка (BB)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1642 +msgid "Add filter" +msgstr "Добавление фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:300 -msgid "This bounding box includes stroke width, markers, filter margins, etc." -msgstr "Сюда входит толщина обводки, маркеры, поля фильтра и т.д." +#: ../src/ui/dialog/filter-effects-dialog.cpp:1694 +msgid "Duplicate filter" +msgstr "Дублирование фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:301 -msgid "Geometric bounding box" -msgstr "Геометрическая площадка (BB)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1793 +msgid "_Effect" +msgstr "Эффе_кт" -#: ../src/ui/dialog/inkscape-preferences.cpp:303 -msgid "This bounding box includes only the bare path" -msgstr "Сюда входит только сам контур" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1803 +msgid "Connections" +msgstr "Cоединения" -#: ../src/ui/dialog/inkscape-preferences.cpp:305 -#, fuzzy -msgid "Conversion to guides" -msgstr "Преобразование в направляющие:" +#: ../src/ui/dialog/filter-effects-dialog.cpp:1941 +msgid "Remove filter primitive" +msgstr "Удаление примитива фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:306 -msgid "Keep objects after conversion to guides" -msgstr "Сохранять объекты после преобразования" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2529 +msgid "Remove merge node" +msgstr "Удалить объединяющий узел" -#: ../src/ui/dialog/inkscape-preferences.cpp:308 -msgid "" -"When converting an object to guides, don't delete the object after the " -"conversion" -msgstr "После преобразования в направляющие не удалять исходный объект." +#: ../src/ui/dialog/filter-effects-dialog.cpp:2649 +msgid "Reorder filter primitive" +msgstr "Смена порядка примитивов фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:309 -msgid "Treat groups as a single object" -msgstr "Считать группы единым объектом" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2729 +msgid "Add Effect:" +msgstr "Добавить:" -#: ../src/ui/dialog/inkscape-preferences.cpp:311 -msgid "" -"Treat groups as a single object during conversion to guides rather than " -"converting each child separately" -msgstr "" -"Считать группы одним объектом при преобразовании в направляющие, не " -"преобразовывать каждый элемент группы отдельно" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2730 +msgid "No effect selected" +msgstr "Ни один эффект не выбран" -#: ../src/ui/dialog/inkscape-preferences.cpp:313 -msgid "Average all sketches" -msgstr "Усреднять все штрихи" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2731 +msgid "No filter selected" +msgstr "Ни один фильтр не выбран" -#: ../src/ui/dialog/inkscape-preferences.cpp:314 -msgid "Width is in absolute units" -msgstr "Ширина в абсолютных единицах измерения" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2776 +msgid "Effect parameters" +msgstr "Параметры эффекта" -#: ../src/ui/dialog/inkscape-preferences.cpp:315 -msgid "Select new path" -msgstr "Выделять новый контур" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2777 +msgid "Filter General Settings" +msgstr "Общие параметры фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:316 -msgid "Don't attach connectors to text objects" -msgstr "Не соединяться линиями с текстовыми объектами" +#. default x: +#. default y: +#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 +msgid "Coordinates:" +msgstr "Координаты:" -#. Selector -#: ../src/ui/dialog/inkscape-preferences.cpp:319 -msgid "Selector" -msgstr "Выделитель" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 +msgid "X coordinate of the left corners of filter effects region" +msgstr "Координата X левых углов области действия фильтра эффектов" -#: ../src/ui/dialog/inkscape-preferences.cpp:324 -msgid "When transforming, show" -msgstr "При трансформации показывать" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 +msgid "Y coordinate of the upper corners of filter effects region" +msgstr "Координата X верхних углов области действия фильтра эффектов" -#: ../src/ui/dialog/inkscape-preferences.cpp:325 -msgid "Objects" -msgstr "Объекты" +#. default width: +#. default height: +#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 +msgid "Dimensions:" +msgstr "Размеры:" -#: ../src/ui/dialog/inkscape-preferences.cpp:327 -msgid "Show the actual objects when moving or transforming" -msgstr "Показывать объекты полностью при перемещении или трансформации" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 +msgid "Width of filter effects region" +msgstr "Ширина области действия фильтра эффектов" -#: ../src/ui/dialog/inkscape-preferences.cpp:328 -msgid "Box outline" -msgstr "Рамку" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 +msgid "Height of filter effects region" +msgstr "Высота области действия фильтра эффектов" -#: ../src/ui/dialog/inkscape-preferences.cpp:330 -msgid "Show only a box outline of the objects when moving or transforming" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2842 +msgid "" +"Indicates the type of matrix operation. The keyword 'matrix' indicates that " +"a full 5x4 matrix of values will be provided. The other keywords represent " +"convenience shortcuts to allow commonly used color operations to be " +"performed without specifying a complete matrix." msgstr "" -"Показывать только прямоугольную рамку объектов при перемещении или " -"трансформации" +"Тип матричной операции. Слово «матрица» означает, что будет предоставлена " +"полная матрица значений размером 5×4. Остальные варианты — это простой " +"способ выполнить наиболее популярные операции, не задавая все значения " +"матрицы вручную." -#: ../src/ui/dialog/inkscape-preferences.cpp:331 -msgid "Per-object selection cue" -msgstr "Пометка выделенных объектов" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2843 +msgid "Value(s):" +msgstr "Значение(-я):" -#: ../src/ui/dialog/inkscape-preferences.cpp:334 -msgid "No per-object selection indication" -msgstr "Выделенные объекты никак не помечены" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2847 +#, fuzzy +msgid "R:" +msgstr "Гор. радиус:" -#: ../src/ui/dialog/inkscape-preferences.cpp:335 -msgid "Mark" -msgstr "Метка" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2848 +#: ../src/widgets/sp-color-icc-selector.cpp:359 +#, fuzzy +msgid "G:" +msgstr "_G:" -#: ../src/ui/dialog/inkscape-preferences.cpp:337 -msgid "Each selected object has a diamond mark in the top left corner" -msgstr "" -"Каждый выделенный объект имеет метку в виде ромбика в левом верхнем углу" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2849 +#, fuzzy +msgid "B:" +msgstr "_B:" -#: ../src/ui/dialog/inkscape-preferences.cpp:338 -msgid "Box" -msgstr "Рамка" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#, fuzzy +msgid "A:" +msgstr "_A:" -#: ../src/ui/dialog/inkscape-preferences.cpp:340 -msgid "Each selected object displays its bounding box" -msgstr "Каждый выделенный объект помечен пунктирной рамкой" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2853 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +msgid "Operator:" +msgstr "Оператор:" -#. Node -#: ../src/ui/dialog/inkscape-preferences.cpp:343 -msgid "Node" -msgstr "Узлы" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 +msgid "K1:" +msgstr "K1:" -#: ../src/ui/dialog/inkscape-preferences.cpp:346 -msgid "Path outline" -msgstr "Абрис контура" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2855 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +msgid "" +"If the arithmetic operation is chosen, each result pixel is computed using " +"the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel " +"values of the first and second inputs respectively." +msgstr "" +"Если выбран арифметический оператор, каждый получаемый пиксел вычисляется по " +"формуле k1*i1*i2 + k2*i1 + k3*i2 + k4, где i1 и i2 — пикселы первого и " +"второго входов соответственно." -#: ../src/ui/dialog/inkscape-preferences.cpp:347 -msgid "Path outline color" -msgstr "Цвет обводки контура" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2855 +msgid "K2:" +msgstr "K2:" -#: ../src/ui/dialog/inkscape-preferences.cpp:348 -msgid "Selects the color used for showing the path outline" -msgstr "Выбрать цвет, используемый для отображения абриса контура." +#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 +msgid "K3:" +msgstr "K3:" -#: ../src/ui/dialog/inkscape-preferences.cpp:349 -msgid "Always show outline" -msgstr "Всегда показывать абрис" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +msgid "K4:" +msgstr "K4:" -#: ../src/ui/dialog/inkscape-preferences.cpp:350 -msgid "Show outlines for all paths, not only invisible paths" -msgstr "Показывать абрисы для всех контуров, не только невидимых" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 +msgid "Size:" +msgstr "Размер:" -#: ../src/ui/dialog/inkscape-preferences.cpp:351 -msgid "Update outline when dragging nodes" -msgstr "Обновлять абрис при перемещении узлов" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 +msgid "width of the convolve matrix" +msgstr "Ширина матрицы свёртки" -#: ../src/ui/dialog/inkscape-preferences.cpp:352 -msgid "" -"Update the outline when dragging or transforming nodes; if this is off, the " -"outline will only update when completing a drag" -msgstr "" -"Обновлять абрис при перетаскивании или трансформации узлов. Если выключено, " -"абрисы обновятся лишь по завершении действия." +#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 +msgid "height of the convolve matrix" +msgstr "Высота матрицы свёртки" -#: ../src/ui/dialog/inkscape-preferences.cpp:353 -msgid "Update paths when dragging nodes" -msgstr "Обновлять контуры при перемещении узлов" +#. default x: +#. default y: +#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 +#: ../src/ui/dialog/object-attributes.cpp:48 +msgid "Target:" +msgstr "Target:" -#: ../src/ui/dialog/inkscape-preferences.cpp:354 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 msgid "" -"Update paths when dragging or transforming nodes; if this is off, paths will " -"only be updated when completing a drag" +"X coordinate of the target point in the convolve matrix. The convolution is " +"applied to pixels around this point." msgstr "" -"Обновлять контуры при перетаскивании или трансформации узлов. Если " -"выключено, контуры обновятся лишь по завершении действия." - -#: ../src/ui/dialog/inkscape-preferences.cpp:355 -msgid "Show path direction on outlines" -msgstr "Показывать направление контура на абрисе" +"Координата X конечной точки матрицы свертки. Свертка применяется к пикселам " +"вокруг этой точки." -#: ../src/ui/dialog/inkscape-preferences.cpp:356 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 msgid "" -"Visualize the direction of selected paths by drawing small arrows in the " -"middle of each outline segment" +"Y coordinate of the target point in the convolve matrix. The convolution is " +"applied to pixels around this point." msgstr "" -"Показывать направление выделенных контуров при помощи небольших стрелок " -"посередине каждого сегмента" +"Координата Y конечной точки матрицы свертки. Свертка применяется к пикселам " +"вокруг этой точки." -#: ../src/ui/dialog/inkscape-preferences.cpp:357 -msgid "Show temporary path outline" -msgstr "На время показывать абрис" +#. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) +#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 +msgid "Kernel:" +msgstr "Ядро:" -#: ../src/ui/dialog/inkscape-preferences.cpp:358 -msgid "When hovering over a path, briefly flash its outline" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 +msgid "" +"This matrix describes the convolve operation that is applied to the input " +"image in order to calculate the pixel colors at the output. Different " +"arrangements of values in this matrix result in various possible visual " +"effects. An identity matrix would lead to a motion blur effect (parallel to " +"the matrix diagonal) while a matrix filled with a constant non-zero value " +"would lead to a common blur effect." msgstr "" -"Мерцать скелетом контура, когда курсор мыши или иного устройства ввода " -"проходит над ним." +"Эта матрица описывает операцию свертки, которая будет применена к входящему " +"изображению для вычисления цветов пикселов на выходе. Различные комбинации " +"значений дают различные визуальные эффекты. Тождественная матрица даст " +"эффект размывания движением, в то время как матрица, заполненная постоянным " +"ненулевым значением даст обычный эффект размывания." -#: ../src/ui/dialog/inkscape-preferences.cpp:359 -msgid "Show temporary outline for selected paths" -msgstr "На время показывать абрис выделенных контуров" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 +msgid "Divisor:" +msgstr "Делитель:" -#: ../src/ui/dialog/inkscape-preferences.cpp:360 -msgid "Show temporary outline even when a path is selected for editing" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 +msgid "" +"After applying the kernelMatrix to the input image to yield a number, that " +"number is divided by divisor to yield the final destination color value. A " +"divisor that is the sum of all the matrix values tends to have an evening " +"effect on the overall color intensity of the result." msgstr "" -"На время показывать абрис контура, даже если этот контур выделен для " -"изменения" +"После применения kernelMatrix к входящему изображению для получения числа, " +"это число делится на делитель для получения конечного значения цвета. " +"Делитель, являющийся суммой всех значений матрицы, имеет тенденцию " +"приглушать общую интенсивность цветов в конечной картинке." -#: ../src/ui/dialog/inkscape-preferences.cpp:362 -#, fuzzy -msgid "_Flash time:" -msgstr "Длительность мерцания:" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2866 +msgid "Bias:" +msgstr "Смещение:" -#: ../src/ui/dialog/inkscape-preferences.cpp:362 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2866 msgid "" -"Specifies how long the path outline will be visible after a mouse-over (in " -"milliseconds); specify 0 to have the outline shown until mouse leaves the " -"path" +"This value is added to each component. This is useful to define a constant " +"value as the zero response of the filter." msgstr "" -"Как долго (мс) должен подсвечиваться контур при прохождении курсора " -"инструмента над ним. Ноль означает постоянную подсветку." - -#: ../src/ui/dialog/inkscape-preferences.cpp:363 -msgid "Editing preferences" -msgstr "Параметры редактирования" - -#: ../src/ui/dialog/inkscape-preferences.cpp:364 -msgid "Show transform handles for single nodes" -msgstr "Показывать рычаги единичных узлов" - -#: ../src/ui/dialog/inkscape-preferences.cpp:365 -msgid "Show transform handles even when only a single node is selected" -msgstr "Показывать рычаги единичных узлов, даже если выделен только один узел" +"Это значение добавляется к каждому компоненту. Полезно для задания константы " +"как нулевого отклика фильтра." -#: ../src/ui/dialog/inkscape-preferences.cpp:366 -msgid "Deleting nodes preserves shape" -msgstr "Сохранять форму объекта при удалении узлов" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 +msgid "Edge Mode:" +msgstr "Режим краёв:" -#: ../src/ui/dialog/inkscape-preferences.cpp:367 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 msgid "" -"Move handles next to deleted nodes to resemble original shape; hold Ctrl to " -"get the other behavior" +"Determines how to extend the input image as necessary with color values so " +"that the matrix operations can be applied when the kernel is positioned at " +"or near the edge of the input image." msgstr "" -"Перемещать рычаги оставшихся после удаления узлов так, чтобы фигура по " -"возможности сохраняла свою форму; при нажатом Ctrl форма не сохраняется" +"Определяет, как расширить входящие изображение цветными пикселами, чтобы " +"матричные операции могли работать с ядром, расположенным на крае изображения " +"или близко к нему." -#. Tweak -#: ../src/ui/dialog/inkscape-preferences.cpp:370 -msgid "Tweak" -msgstr "Корректор" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 +msgid "Preserve Alpha" +msgstr "Сохранять альфа-канал" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 -msgid "Object paint style" -msgstr "Стиль раскрашивания объекта" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 +msgid "If set, the alpha channel won't be altered by this filter primitive." +msgstr "Если включено, альфа-канал не будет изменен этим примитивом фильтра." -#. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:376 -#: ../src/widgets/desktop-widget.cpp:631 -msgid "Zoom" -msgstr "Лупа" +#. default: white +#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +msgid "Diffuse Color:" +msgstr "Цвет диффузии:" -#. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:381 ../src/verbs.cpp:2678 -msgctxt "ContextVerb" -msgid "Measure" -msgstr "Измеритель" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2904 +msgid "Defines the color of the light source" +msgstr "Определяет цвет источника света" -#: ../src/ui/dialog/inkscape-preferences.cpp:383 -msgid "Ignore first and last points" -msgstr "Игнорировать первую и последнюю точки" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 +msgid "Surface Scale:" +msgstr "Коэфф. высоты поверхности:" -#: ../src/ui/dialog/inkscape-preferences.cpp:384 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 msgid "" -"The start and end of the measurement tool's control line will not be " -"considered for calculating lengths. Only lengths between actual curve " -"intersections will be displayed." +"This value amplifies the heights of the bump map defined by the input alpha " +"channel" msgstr "" +"На это значение умножается высота карты рельефа, определенная входящим альфа-" +"каналом" -#. Shapes -#: ../src/ui/dialog/inkscape-preferences.cpp:387 -msgid "Shapes" -msgstr "Фигуры" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2873 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 +msgid "Constant:" +msgstr "Константа диффузии:" -#. Pencil -#: ../src/ui/dialog/inkscape-preferences.cpp:415 -msgid "Pencil" -msgstr "Карандаш" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2873 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 +msgid "This constant affects the Phong lighting model." +msgstr "Эта константа касается модели освещения Фонга" -#: ../src/ui/dialog/inkscape-preferences.cpp:419 -msgid "Sketch mode" -msgstr "Эскизный режим" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2874 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 +msgid "Kernel Unit Length:" +msgstr "Длина единицы ядра:" -#: ../src/ui/dialog/inkscape-preferences.cpp:421 -#, fuzzy -msgid "" -"If on, the sketch result will be the normal average of all sketches made, " -"instead of averaging the old result with the new sketch" -msgstr "" -"Если включено, результат штриховки будет усредненным значением всех " -"сделанных штрихов, а не усредненным значением старого результата и новой " -"штриховки." +#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 +msgid "This defines the intensity of the displacement effect." +msgstr "Определяет интенсивность эффекта смещения" -#. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:424 -#: ../src/ui/dialog/input.cpp:1485 -msgid "Pen" -msgstr "Перо" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +msgid "X displacement:" +msgstr "Смещение по X:" -#. Calligraphy -#: ../src/ui/dialog/inkscape-preferences.cpp:430 -msgid "Calligraphy" -msgstr "Каллиграфическое перо" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +msgid "Color component that controls the displacement in the X direction" +msgstr "Цветовой компонент, контролирующий смещение по оси X" -#: ../src/ui/dialog/inkscape-preferences.cpp:434 -msgid "" -"If on, pen width is in absolute units (px) independent of zoom; otherwise " -"pen width depends on zoom so that it looks the same at any zoom" -msgstr "" -"Если включено, толщина линии в абсолютных единицах (px) независима от " -"масштаба; в противном случае толщина линии зависит от масштаба и выглядит " -"одинаково при любом масштабе" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +msgid "Y displacement:" +msgstr "Смещение по Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:436 -msgid "" -"If on, each newly created object will be selected (deselecting previous " -"selection)" -msgstr "" -"Если включено, каждый новый объект будет автоматически выделяться (со " -"сбросом предыдущего выделения)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +msgid "Color component that controls the displacement in the Y direction" +msgstr "Цветовой компонент, контролирующий смещение по оси Y" -#. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:439 ../src/verbs.cpp:2670 -msgctxt "ContextVerb" -msgid "Text" -msgstr "Текст" +#. default: black +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +msgid "Flood Color:" +msgstr "Цвет заливки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:444 -msgid "Show font samples in the drop-down list" -msgstr "Показывать образцы шрифтов в раскрывающемся списке" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +msgid "The whole filter region will be filled with this color." +msgstr "Вся область действия фильтра будет залита этим цветом" -#: ../src/ui/dialog/inkscape-preferences.cpp:445 -msgid "" -"Show font samples alongside font names in the drop-down list in Text bar" -msgstr "" -"Показывать образцы шрифтов рядом с их названиями в раскрывающемся списке" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +msgid "Standard Deviation:" +msgstr "Стандартное отклонение:" -#: ../src/ui/dialog/inkscape-preferences.cpp:447 -msgid "Show font substitution warning dialog" -msgstr "Показывать диалог подстановки шрифтов" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +msgid "The standard deviation for the blur operation." +msgstr "Стандартное отклонение при размывании, выражается в процентах" -#: ../src/ui/dialog/inkscape-preferences.cpp:448 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 msgid "" -"Show font substitution warning dialog when requested fonts are not available " -"on the system" +"Erode: performs \"thinning\" of input image.\n" +"Dilate: performs \"fattenning\" of input image." msgstr "" +"Эрозия «утоньшает» изображение на входе.\n" +"Дилатация «утолщает» изображение на входе." -#: ../src/ui/dialog/inkscape-preferences.cpp:451 -msgid "Pixel" -msgstr "Пиксел" - -#: ../src/ui/dialog/inkscape-preferences.cpp:451 -msgid "Pica" -msgstr "Пика" - -#: ../src/ui/dialog/inkscape-preferences.cpp:451 -msgid "Millimeter" -msgstr "Миллиметр" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 +msgid "Source of Image:" +msgstr "Источник изображения:" -#: ../src/ui/dialog/inkscape-preferences.cpp:451 -msgid "Centimeter" -msgstr "Сантиметр" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 +msgid "Delta X:" +msgstr "Дельта X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:451 -msgid "Inch" -msgstr "Дюйм" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 +msgid "This is how far the input image gets shifted to the right" +msgstr "Как далеко входящее изображение смещается вправо" -#: ../src/ui/dialog/inkscape-preferences.cpp:451 -msgid "Em square" -msgstr "Em square" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 +msgid "Delta Y:" +msgstr "Дельта Y:" -#. , _("Ex square"), _("Percent") -#. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT -#: ../src/ui/dialog/inkscape-preferences.cpp:454 -msgid "Text units" -msgstr "Единицы кегля" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 +msgid "This is how far the input image gets shifted downwards" +msgstr "Как далеко входящее изображение смещается вниз" -#: ../src/ui/dialog/inkscape-preferences.cpp:456 -msgid "Text size unit type:" -msgstr "Единица измерения кегля" +#. default: white +#: ../src/ui/dialog/filter-effects-dialog.cpp:2904 +msgid "Specular Color:" +msgstr "Цвет отражения:" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 -msgid "Set the type of unit used in the text toolbar and text dialogs" -msgstr "" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 +#: ../share/extensions/interp.inx.h:2 +msgid "Exponent:" +msgstr "Экспонента:" -#: ../src/ui/dialog/inkscape-preferences.cpp:458 -msgid "Always output text size in pixels (px)" -msgstr "Всегда выводить кегль текста в пикселах (px)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 +msgid "Exponent for specular term, larger is more \"shiny\"." +msgstr "Экспонента отражения: чем больше значение, тем ярче отражение" -#: ../src/ui/dialog/inkscape-preferences.cpp:459 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 msgid "" -"Always convert the text size units above into pixels (px) before saving to " -"file" +"Indicates whether the filter primitive should perform a noise or turbulence " +"function." msgstr "" +"Должен ли примитив выполнять функцию создания турбулентности или же шума" -#. Spray -#: ../src/ui/dialog/inkscape-preferences.cpp:464 -msgid "Spray" -msgstr "Распылитель" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2917 +msgid "Base Frequency:" +msgstr "Основная частота:" -#. Eraser -#: ../src/ui/dialog/inkscape-preferences.cpp:469 -msgid "Eraser" -msgstr "Ластик" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 +msgid "Octaves:" +msgstr "Числа Кейли:" -#. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:473 -msgid "Paint Bucket" -msgstr "Сплошная заливка" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +msgid "Seed:" +msgstr "Случайное значение:" -#. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:478 -#: ../src/widgets/gradient-selector.cpp:152 -#: ../src/widgets/gradient-selector.cpp:320 -msgid "Gradient" -msgstr "Градиентная заливка" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +msgid "The starting number for the pseudo random number generator." +msgstr "Начальное число для генератора псевдослучайных чисел" -#: ../src/ui/dialog/inkscape-preferences.cpp:480 -msgid "Prevent sharing of gradient definitions" -msgstr "Не разделять определения градиентов между объектами" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 +msgid "Add filter primitive" +msgstr "Добавление примитива фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:482 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2948 msgid "" -"When on, shared gradient definitions are automatically forked on change; " -"uncheck to allow sharing of gradient definitions so that editing one object " -"may affect other objects using the same gradient" +"The <b>feBlend</b> filter primitive provides 4 image blending modes: screen, " +"multiply, darken and lighten." msgstr "" -"Если параметр включен, разделяемые определения (defs) градиентов при " -"изменении копируются в новые; если выключен, определения разделяются между " -"объектами, так что изменение градиента для одного объекта может сказаться на " -"другом объекте." - -#: ../src/ui/dialog/inkscape-preferences.cpp:483 -msgid "Use legacy Gradient Editor" -msgstr "Использовать старый редактор градиентов" +"Примитив <b>feBlend</b> дает 4 режима смешивания: экран, умножение, " +"затемнение и осветление." -#: ../src/ui/dialog/inkscape-preferences.cpp:485 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2952 msgid "" -"When on, the Gradient Edit button in the Fill & Stroke dialog will show the " -"legacy Gradient Editor dialog, when off the Gradient Tool will be used" +"The <b>feColorMatrix</b> filter primitive applies a matrix transformation to " +"color of each rendered pixel. This allows for effects like turning object to " +"grayscale, modifying color saturation and changing color hue." msgstr "" +"Примитив <b>feColorMatrix</b> применяет матричное преобразование к цвету " +"каждого пиксела. Таким образом можно обесцвечивать, повышать насыщенность и " +"менять тон." -#: ../src/ui/dialog/inkscape-preferences.cpp:488 -msgid "Linear gradient _angle:" -msgstr "_Угол линейного градиента:" - -#: ../src/ui/dialog/inkscape-preferences.cpp:489 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 msgid "" -"Default angle of new linear gradients in degrees (clockwise from horizontal)" +"The <b>feComponentTransfer</b> filter primitive manipulates the input's " +"color components (red, green, blue, and alpha) according to particular " +"transfer functions, allowing operations like brightness and contrast " +"adjustment, color balance, and thresholding." msgstr "" +"Примитив <b>feComponentTransfer</b> позволяет манипулировать цветовыми " +"компонентами входящего объекта (красный, зеленый, синий и альфа-каналы) в " +"соответствии с определенными функциями передачи, допуская операции вроде " +"коррекции яркости и контраста, цветового баланса и порога." -#. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:493 -msgid "Dropper" -msgstr "Пипетка" - -#. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:498 -msgid "Connector" -msgstr "Соединительные линии" - -#: ../src/ui/dialog/inkscape-preferences.cpp:501 -msgid "If on, connector attachment points will not be shown for text objects" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2960 +msgid "" +"The <b>feComposite</b> filter primitive composites two images using one of " +"the Porter-Duff blending modes or the arithmetic mode described in SVG " +"standard. Porter-Duff blending modes are essentially logical operations " +"between the corresponding pixel values of the images." msgstr "" -"Если включено, точки соединения линиями не показываются на текстовых объектах" - -#. LPETool -#. disabled, because the LPETool is not finished yet. -#: ../src/ui/dialog/inkscape-preferences.cpp:506 -#, fuzzy -msgid "LPE Tool" -msgstr "Геометрические построения" - -#: ../src/ui/dialog/inkscape-preferences.cpp:513 -msgid "Interface" -msgstr "Интерфейс" - -#: ../src/ui/dialog/inkscape-preferences.cpp:516 -msgid "System default" -msgstr "Используемый системой" - -#: ../src/ui/dialog/inkscape-preferences.cpp:516 -msgid "Albanian (sq)" -msgstr "Албанский (sq)" - -#: ../src/ui/dialog/inkscape-preferences.cpp:516 -msgid "Amharic (am)" -msgstr "Амхарский (am)" - -#: ../src/ui/dialog/inkscape-preferences.cpp:516 -msgid "Arabic (ar)" -msgstr "Арабский (ar)" - -#: ../src/ui/dialog/inkscape-preferences.cpp:516 -msgid "Armenian (hy)" -msgstr "Армянский (hy)" - -#: ../src/ui/dialog/inkscape-preferences.cpp:516 -msgid "Azerbaijani (az)" -msgstr "Азербайджанский (az)" +"Примитив <b>feComposite</b> совмещает два изображения, используя один из " +"режимов смешивания Портера-Даффа или арифметический оператор из стандарта " +"SVG. Режимы совмещения Портера-Даффа — по сути, логические операции между " +"значениями соответствующих пикселов этих изображений." -#: ../src/ui/dialog/inkscape-preferences.cpp:516 -msgid "Basque (eu)" -msgstr "Баскский (eu)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2964 +msgid "" +"The <b>feConvolveMatrix</b> lets you specify a Convolution to be applied on " +"the image. Common effects created using convolution matrices are blur, " +"sharpening, embossing and edge detection. Note that while gaussian blur can " +"be created using this filter primitive, the special gaussian blur primitive " +"is faster and resolution-independent." +msgstr "" +"Примитив <b>feConvolveMatrix</b> позволяет указать свертку, применяемую к " +"изображению. Типичные эффекты, создаваемые при помощи матрицы свертки — " +"размывание, повышение резкости, создание рельефа и определение краев. Хотя " +"гауссово размывание можно выполнить и этим примитивом, специализированный " +"примитив работает быстрее и не зависит от разрешения." -#: ../src/ui/dialog/inkscape-preferences.cpp:516 -msgid "Belarusian (be)" -msgstr "Белорусский (be)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2968 +msgid "" +"The <b>feDiffuseLighting</b> and feSpecularLighting filter primitives create " +"\"embossed\" shadings. The input's alpha channel is used to provide depth " +"information: higher opacity areas are raised toward the viewer and lower " +"opacity areas recede away from the viewer." +msgstr "" +"Примитивы <b>feDiffuseLighting</b> и feSpecularLighting создают рельефные " +"тени. Входящий альфа-канал используется для предоставления информации о " +"глубине: чем выше непрозрачность, тем выше рельеф и, соответственно, тем " +"ближе к наблюдателю верхняя точка этого рельефа." -#: ../src/ui/dialog/inkscape-preferences.cpp:517 -msgid "Bulgarian (bg)" -msgstr "Болгарский (bg)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2972 +msgid "" +"The <b>feDisplacementMap</b> filter primitive displaces the pixels in the " +"first input using the second input as a displacement map, that shows from " +"how far the pixel should come from. Classical examples are whirl and pinch " +"effects." +msgstr "" +"Примитив <b>feDisplacementMap</b> смещает пикселы первого входа, используя " +"пикселы второго в качестве карты смещения, показывающей, как далеко должны " +"отойти пикселы. Типичные эффекты, создаваемые при помощи карты смещения — " +"завихрение и щипок." -#: ../src/ui/dialog/inkscape-preferences.cpp:517 -msgid "Bengali (bn)" -msgstr "Бенгальский (bn)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2976 +msgid "" +"The <b>feFlood</b> filter primitive fills the region with a given color and " +"opacity. It is usually used as an input to other filters to apply color to " +"a graphic." +msgstr "" +"Примитив <b>feFlood</b> заливает область заданным цветом и непрозрачностью. " +"Обычно он используется как вход для других фильтров, применяющих цвет." -#: ../src/ui/dialog/inkscape-preferences.cpp:517 -#, fuzzy -msgid "Bengali/Bangladesh (bn_BD)" -msgstr "Бенгальский (bn)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2980 +msgid "" +"The <b>feGaussianBlur</b> filter primitive uniformly blurs its input. It is " +"commonly used together with feOffset to create a drop shadow effect." +msgstr "" +"Примитив <b>feGaussianBlur</b> равномерно размывает объекты на входе. Фильтр " +"часто используется с feOffset для создания эффекта отбрасываемой тени." -#: ../src/ui/dialog/inkscape-preferences.cpp:517 -msgid "Breton (br)" -msgstr "Бретонский (br)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2984 +msgid "" +"The <b>feImage</b> filter primitive fills the region with an external image " +"or another part of the document." +msgstr "" +"Примитив <b>feImage</b> заполняет область внешним изображением или другой " +"частью документа." -#: ../src/ui/dialog/inkscape-preferences.cpp:517 -msgid "Catalan (ca)" -msgstr "Каталонский (ca)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2988 +msgid "" +"The <b>feMerge</b> filter primitive composites several temporary images " +"inside the filter primitive to a single image. It uses normal alpha " +"compositing for this. This is equivalent to using several feBlend primitives " +"in 'normal' mode or several feComposite primitives in 'over' mode." +msgstr "" +"Примитив <b>feMerge</b> сводит несколько временных изображений в одно, " +"используя обычное альфа‑совмещение. Получаемый эффект эквивалентен " +"нескольким примитивам feBlend в режиме «Обычный» или нескольким примитивам " +"feComposite в режиме «Над» (over)." -#: ../src/ui/dialog/inkscape-preferences.cpp:517 -msgid "Valencian Catalan (ca@valencia)" -msgstr "Каталонский, Валенсия (ca@valencia)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2992 +msgid "" +"The <b>feMorphology</b> filter primitive provides erode and dilate effects. " +"For single-color objects erode makes the object thinner and dilate makes it " +"thicker." +msgstr "" +"Примитив <b>feMorphology</b> позволяет применить эффект эрозии и дилатации. " +"Одноцветные объекты с плоской заливкой при эрозии становятся тоньше, а с " +"дилатацией — толще." -#: ../src/ui/dialog/inkscape-preferences.cpp:517 -msgid "Chinese/China (zh_CN)" -msgstr "Китайский, Китай (zh_CN)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2996 +msgid "" +"The <b>feOffset</b> filter primitive offsets the image by an user-defined " +"amount. For example, this is useful for drop shadows, where the shadow is in " +"a slightly different position than the actual object." +msgstr "" +"Примитив <b>feOffset</b> смещает изображение на заданное расстояние. Он " +"используется, к примеру, для создания эффекта отбрасываемой тени, где тень " +"слегка смещена относительно исходного объекта." -#: ../src/ui/dialog/inkscape-preferences.cpp:518 -msgid "Chinese/Taiwan (zh_TW)" -msgstr "Китайский, Тайвань (zh_TW)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:3000 +#, fuzzy +msgid "" +"The <b>feDiffuseLighting</b> and <b>feSpecularLighting</b> filter primitives " +"create \"embossed\" shadings. The input's alpha channel is used to provide " +"depth information: higher opacity areas are raised toward the viewer and " +"lower opacity areas recede away from the viewer." +msgstr "" +"Примитивы <b>feDiffuseLighting</b> и feSpecularLighting создают рельефные " +"тени. Входящий альфа-канал используется для предоставления информации о " +"глубине: чем выше непрозрачность, тем выше рельеф и, соответственно, тем " +"ближе к наблюдателю верхняя точка этого рельефа." -#: ../src/ui/dialog/inkscape-preferences.cpp:518 -msgid "Croatian (hr)" -msgstr "Хорватский (hr)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:3004 +msgid "" +"The <b>feTile</b> filter primitive tiles a region with its input graphic" +msgstr "" +"Примитив <b>feTile</b> заполняет область мозаикой из входящего изображения." -#: ../src/ui/dialog/inkscape-preferences.cpp:518 -msgid "Czech (cs)" -msgstr "Чешский (cs)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:3008 +msgid "" +"The <b>feTurbulence</b> filter primitive renders Perlin noise. This kind of " +"noise is useful in simulating several nature phenomena like clouds, fire and " +"smoke and in generating complex textures like marble or granite." +msgstr "" +"Примитив <b>feTurbulence</b> создает перлинов шум. Этот тип шума полезен для " +"имитации различных природных явлений вроде облаков, огня и дыма, а также для " +"создания сложных текстур наподобие мрамора или гранита." -#: ../src/ui/dialog/inkscape-preferences.cpp:519 -msgid "Danish (da)" -msgstr "Датский (da)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:3027 +msgid "Duplicate filter primitive" +msgstr "Дубликация примитива фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 -msgid "Dutch (nl)" -msgstr "Голландский (nl)" +#: ../src/ui/dialog/filter-effects-dialog.cpp:3080 +msgid "Set filter primitive attribute" +msgstr "Смена атрибута примитива фильтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 -msgid "Dzongkha (dz)" -msgstr "Дзонг-кэ (dz)" +#: ../src/ui/dialog/find.cpp:71 +msgid "F_ind:" +msgstr "_Найти:" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 -msgid "German (de)" -msgstr "Немецкий (de)" +#: ../src/ui/dialog/find.cpp:71 +#, fuzzy +msgid "Find objects by their content or properties (exact or partial match)" +msgstr "" +"Искать объекты по их текстовому содержанию (полное или частичное " +"соответствие)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 -msgid "Greek (el)" -msgstr "Греческий (el)" +#: ../src/ui/dialog/find.cpp:72 +msgid "R_eplace:" +msgstr "За_менить на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 -msgid "English (en)" -msgstr "Английский (en)" +#: ../src/ui/dialog/find.cpp:72 +#, fuzzy +msgid "Replace match with this value" +msgstr "Дублировать объекты, с Shift — удалять" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 -msgid "English/Australia (en_AU)" -msgstr "Английский, Австралия (en_AU)" +#: ../src/ui/dialog/find.cpp:74 +msgid "_All" +msgstr "Весь _рисунок" -#: ../src/ui/dialog/inkscape-preferences.cpp:520 -msgid "English/Canada (en_CA)" -msgstr "Английский, Канада (en_CA)" +#: ../src/ui/dialog/find.cpp:74 +#, fuzzy +msgid "Search in all layers" +msgstr "Работают во всех слоях" -#: ../src/ui/dialog/inkscape-preferences.cpp:520 -msgid "English/Great Britain (en_GB)" -msgstr "Английский, Великобритания (en_GB)" +#: ../src/ui/dialog/find.cpp:75 +msgid "Current _layer" +msgstr "Те_кущий слой" -#: ../src/ui/dialog/inkscape-preferences.cpp:520 -msgid "Pig Latin (en_US@piglatin)" -msgstr "Поросячья латынь (en_US@piglatin)" +#: ../src/ui/dialog/find.cpp:75 +msgid "Limit search to the current layer" +msgstr "Ограничить поиск текущим слоем" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 -msgid "Esperanto (eo)" -msgstr "Эсперанто (eo)" +#: ../src/ui/dialog/find.cpp:76 +msgid "Sele_ction" +msgstr "В_ыделение" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 -msgid "Estonian (et)" -msgstr "Эстонский (et)" +#: ../src/ui/dialog/find.cpp:76 +msgid "Limit search to the current selection" +msgstr "Ограничить поиск текущим выделением" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 -msgid "Farsi (fa)" -msgstr "Фарси (fa)" +#: ../src/ui/dialog/find.cpp:77 +#, fuzzy +msgid "Search in text objects" +msgstr "Искать в текстовых объектах" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 -msgid "Finnish (fi)" -msgstr "Финский (fi)" +#: ../src/ui/dialog/find.cpp:78 +msgid "_Properties" +msgstr "Сво_йства" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 -msgid "French (fr)" -msgstr "Французский (fr)" +#: ../src/ui/dialog/find.cpp:78 +msgid "Search in object properties, styles, attributes and IDs" +msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 -msgid "Irish (ga)" -msgstr "Ирландский (ga)" +#: ../src/ui/dialog/find.cpp:80 +msgid "Search in" +msgstr "Где искать" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 -msgid "Galician (gl)" -msgstr "Галицийский (gl)" +#: ../src/ui/dialog/find.cpp:81 +msgid "Scope" +msgstr "Охват" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 -msgid "Hebrew (he)" -msgstr "Иврит (he)" +#: ../src/ui/dialog/find.cpp:83 +msgid "Case sensiti_ve" +msgstr "У_читывать регистр" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 -msgid "Hungarian (hu)" -msgstr "Венгерский (hu)" +#: ../src/ui/dialog/find.cpp:83 +msgid "Match upper/lower case" +msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 -msgid "Indonesian (id)" -msgstr "Индонезийский (id)" +#: ../src/ui/dialog/find.cpp:84 +msgid "E_xact match" +msgstr "Тол_ько полные слова" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 -msgid "Italian (it)" -msgstr "Итальянский (it)" +#: ../src/ui/dialog/find.cpp:84 +#, fuzzy +msgid "Match whole objects only" +msgstr "Только выделенные объекты" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 -msgid "Japanese (ja)" -msgstr "Японский (ja)" +#: ../src/ui/dialog/find.cpp:85 +msgid "Include _hidden" +msgstr "Включая с_крытые" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 -msgid "Khmer (km)" -msgstr "Кхмерский (km)" +#: ../src/ui/dialog/find.cpp:85 +msgid "Include hidden objects in search" +msgstr "Искать среди скрытых объектов" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 -msgid "Kinyarwanda (rw)" -msgstr "Руанда (rw)" +#: ../src/ui/dialog/find.cpp:86 +msgid "Include loc_ked" +msgstr "Вкл_ючая заблокированные" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 -msgid "Korean (ko)" -msgstr "Корейский (ko)" +#: ../src/ui/dialog/find.cpp:86 +msgid "Include locked objects in search" +msgstr "Искать среди заблокированных объектов" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 -msgid "Lithuanian (lt)" -msgstr "Литовский (lt)" +#: ../src/ui/dialog/find.cpp:88 +msgid "General" +msgstr "Общие" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/find.cpp:90 #, fuzzy -msgid "Latvian (lv)" -msgstr "Литовский (lt)" - -#: ../src/ui/dialog/inkscape-preferences.cpp:523 -msgid "Macedonian (mk)" -msgstr "Македонский (mk)" +msgid "_ID" +msgstr "_ID:" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 -msgid "Mongolian (mn)" -msgstr "Монгольский (mn)" +#: ../src/ui/dialog/find.cpp:90 +#, fuzzy +msgid "Search id name" +msgstr "Искать в растрах" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 -msgid "Nepali (ne)" -msgstr "Непальский (ne)" +#: ../src/ui/dialog/find.cpp:91 +msgid "Attribute _name" +msgstr "_Имя атрибута" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 -msgid "Norwegian Bokmål (nb)" -msgstr "Норвежский, бокмол (nb)" +#: ../src/ui/dialog/find.cpp:91 +#, fuzzy +msgid "Search attribute name" +msgstr "Имя атрибута" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 -msgid "Norwegian Nynorsk (nn)" -msgstr "Норвежский, нюнорск (nn)" +#: ../src/ui/dialog/find.cpp:92 +msgid "Attri_bute value" +msgstr "Значение атриб_ута" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 -msgid "Panjabi (pa)" -msgstr "Пенджаби (pa)" +#: ../src/ui/dialog/find.cpp:92 +#, fuzzy +msgid "Search attribute value" +msgstr "Значение атрибута" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -msgid "Polish (pl)" -msgstr "Польский (pl)" +#: ../src/ui/dialog/find.cpp:93 +msgid "_Style" +msgstr "Сти_ль: " -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -msgid "Portuguese (pt)" -msgstr "Португальский (pt)" +#: ../src/ui/dialog/find.cpp:93 +#, fuzzy +msgid "Search style" +msgstr "Искать в клонах" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -msgid "Portuguese/Brazil (pt_BR)" -msgstr "Португальский, Бразилия (pt_BR)" +#: ../src/ui/dialog/find.cpp:94 +msgid "F_ont" +msgstr "_Шрифт" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -msgid "Romanian (ro)" -msgstr "Румынский (ro)" +#: ../src/ui/dialog/find.cpp:94 +#, fuzzy +msgid "Search fonts" +msgstr "Искать в клонах" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -msgid "Russian (ru)" -msgstr "Русский (ru)" +#: ../src/ui/dialog/find.cpp:95 +msgid "Properties" +msgstr "Свойства" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -msgid "Serbian (sr)" -msgstr "Сербский, кириллица (sr)" +#: ../src/ui/dialog/find.cpp:97 +msgid "All types" +msgstr "Все типы" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -msgid "Serbian in Latin script (sr@latin)" -msgstr "Сербский, латиница (sr@latin)" +#: ../src/ui/dialog/find.cpp:97 +#, fuzzy +msgid "Search all object types" +msgstr "Искать в объектах всех типов" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -msgid "Slovak (sk)" -msgstr "Словацкий (sk)" +#: ../src/ui/dialog/find.cpp:98 +msgid "Rectangles" +msgstr "Прямоугольники" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -msgid "Slovenian (sl)" -msgstr "Словенский (sl)" +#: ../src/ui/dialog/find.cpp:98 +msgid "Search rectangles" +msgstr "Искать в прямоугольниках" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -msgid "Spanish (es)" -msgstr "Испанский (es)" +#: ../src/ui/dialog/find.cpp:99 +msgid "Ellipses" +msgstr "Эллипсы" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -msgid "Spanish/Mexico (es_MX)" -msgstr "Испанский, Мексика (es_MX)" +#: ../src/ui/dialog/find.cpp:99 +msgid "Search ellipses, arcs, circles" +msgstr "Искать в эллипсах, секторах, кругах" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -msgid "Swedish (sv)" -msgstr "Шведский (sv)" +#: ../src/ui/dialog/find.cpp:100 +msgid "Stars" +msgstr "Звезды" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -#, fuzzy -msgid "Telugu (te_IN)" -msgstr "Телугу" +#: ../src/ui/dialog/find.cpp:100 +msgid "Search stars and polygons" +msgstr "Искать в звездах и многоугольниках" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -msgid "Thai (th)" -msgstr "Тайский (th)" +#: ../src/ui/dialog/find.cpp:101 +msgid "Spirals" +msgstr "Спирали" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -msgid "Turkish (tr)" -msgstr "Турецкий (tr)" +#: ../src/ui/dialog/find.cpp:101 +msgid "Search spirals" +msgstr "Искать в спиралях" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -msgid "Ukrainian (uk)" -msgstr "Украинский (uk)" +#: ../src/ui/dialog/find.cpp:102 ../src/widgets/toolbox.cpp:1736 +msgid "Paths" +msgstr "Контуры" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -msgid "Vietnamese (vi)" -msgstr "Вьетнамский (vi)" +#: ../src/ui/dialog/find.cpp:102 +msgid "Search paths, lines, polylines" +msgstr "Искать в контурах, линиях, полилиниях" -#: ../src/ui/dialog/inkscape-preferences.cpp:559 -msgid "Language (requires restart):" -msgstr "Язык (нужен перезапуск):" +#: ../src/ui/dialog/find.cpp:103 +msgid "Texts" +msgstr "Тексты" -#: ../src/ui/dialog/inkscape-preferences.cpp:560 -msgid "Set the language for menus and number formats" -msgstr "Укажите язык интерфейса и формата чисел" +#: ../src/ui/dialog/find.cpp:103 +msgid "Search text objects" +msgstr "Искать в текстовых объектах" -#: ../src/ui/dialog/inkscape-preferences.cpp:563 -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -msgid "Large" -msgstr "Большие" +#: ../src/ui/dialog/find.cpp:104 +msgid "Groups" +msgstr "Группы" -#: ../src/ui/dialog/inkscape-preferences.cpp:563 -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -msgid "Small" -msgstr "Маленькие" +#: ../src/ui/dialog/find.cpp:104 +msgid "Search groups" +msgstr "Искать в группах" -#: ../src/ui/dialog/inkscape-preferences.cpp:563 -msgid "Smaller" -msgstr "Еще меньше" +#. TRANSLATORS: "Clones" is a noun indicating type of object to find +#: ../src/ui/dialog/find.cpp:107 +msgctxt "Find dialog" +msgid "Clones" +msgstr "Клоны" -#: ../src/ui/dialog/inkscape-preferences.cpp:567 -msgid "Toolbox icon size:" -msgstr "Значки панели инструментов:" +#: ../src/ui/dialog/find.cpp:107 +msgid "Search clones" +msgstr "Искать в клонах" -#: ../src/ui/dialog/inkscape-preferences.cpp:568 -msgid "Set the size for the tool icons (requires restart)" -msgstr "" -"Изменить размер значков в панели инструментов (требует перезапуска программы)" +#: ../src/ui/dialog/find.cpp:109 ../share/extensions/embedimage.inx.h:3 +#: ../share/extensions/extractimage.inx.h:5 +msgid "Images" +msgstr "Изображения" -#: ../src/ui/dialog/inkscape-preferences.cpp:571 -msgid "Control bar icon size:" -msgstr "Значки панели параметров:" +#: ../src/ui/dialog/find.cpp:109 +msgid "Search images" +msgstr "Искать в растрах" -#: ../src/ui/dialog/inkscape-preferences.cpp:572 -msgid "" -"Set the size for the icons in tools' control bars to use (requires restart)" -msgstr "" -"Изменить размер значков в панели команд (требует перезапуска программы)" +#: ../src/ui/dialog/find.cpp:110 +msgid "Offsets" +msgstr "Втяжки" -#: ../src/ui/dialog/inkscape-preferences.cpp:575 -msgid "Secondary toolbar icon size:" -msgstr "Значки второй панели:" +#: ../src/ui/dialog/find.cpp:110 +msgid "Search offset objects" +msgstr "Искать во втяжках" -#: ../src/ui/dialog/inkscape-preferences.cpp:576 -msgid "" -"Set the size for the icons in secondary toolbars to use (requires restart)" -msgstr "" -"Изменить размер значков в панели параметров инструментов (требует " -"перезапуска программы)" +#: ../src/ui/dialog/find.cpp:111 +msgid "Object types" +msgstr "Типы объектов" -#: ../src/ui/dialog/inkscape-preferences.cpp:579 -msgid "Work-around color sliders not drawing" -msgstr "Попытаться исправить ползунок альфа-канала" +#: ../src/ui/dialog/find.cpp:114 +msgid "_Find" +msgstr "_Искать" -#: ../src/ui/dialog/inkscape-preferences.cpp:581 -msgid "" -"When on, will attempt to work around bugs in certain GTK themes drawing " -"color sliders" -msgstr "" -"При использовании некоторых тем GTK+ ползунок альфа-канал замирает на " -"отметке 244. Inkscape может попытаться исправить это." +#: ../src/ui/dialog/find.cpp:114 +#, fuzzy +msgid "Select all objects matching the selection criteria" +msgstr "Выделить объекты, подходящие по всем указанным критериям поиска" -#: ../src/ui/dialog/inkscape-preferences.cpp:586 -msgid "Clear list" -msgstr "Очистить список" +#: ../src/ui/dialog/find.cpp:115 +msgid "_Replace All" +msgstr "_Заменить все" -#: ../src/ui/dialog/inkscape-preferences.cpp:589 +#: ../src/ui/dialog/find.cpp:115 #, fuzzy -msgid "Maximum documents in Open _Recent:" -msgstr "Недавних документов в меню:" - -#: ../src/ui/dialog/inkscape-preferences.cpp:590 -msgid "" -"Set the maximum length of the Open Recent list in the File menu, or clear " -"the list" -msgstr "Сколько недавно открывавшихся документов помнить" +msgid "Replace all matches" +msgstr "Заменить все шрифты на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:593 +#: ../src/ui/dialog/find.cpp:775 #, fuzzy -msgid "_Zoom correction factor (in %):" -msgstr "Масштаб видимой страницы (%):" +msgid "Nothing to replace" +msgstr "Нет повторяемых операций." -#: ../src/ui/dialog/inkscape-preferences.cpp:594 -msgid "" -"Adjust the slider until the length of the ruler on your screen matches its " -"real length. This information is used when zooming to 1:1, 1:2, etc., to " -"display objects in their true sizes" -msgstr "" -"Приложите к экрану линейку и перетащите ползунок до позиции, при которой " -"деления на линейке и на экране совпадают. После этого масштаб отображения " -"документа 1:1 будет соответствовать реальному." +#. TRANSLATORS: "%s" is replaced with "exact" or "partial" when this string is displayed +#: ../src/ui/dialog/find.cpp:816 +#, c-format +msgid "<b>%d</b> object found (out of <b>%d</b>), %s match." +msgid_plural "<b>%d</b> objects found (out of <b>%d</b>), %s match." +msgstr[0] "Найден <b>%d</b> объект (из <b>%d</b>), %s соответствие." +msgstr[1] "Найдено <b>%d</b> объекта (из <b>%d</b>), %s соответствия." +msgstr[2] "Найдено <b>%d</b> объектов (из <b>%d</b>), %s соответствий." -#: ../src/ui/dialog/inkscape-preferences.cpp:597 -msgid "Enable dynamic relayout for incomplete sections" -msgstr "Динамическое размещение недоработанных частей интерфейса" +#: ../src/ui/dialog/find.cpp:819 +msgid "exact" +msgstr "точное" -#: ../src/ui/dialog/inkscape-preferences.cpp:599 -msgid "" -"When on, will allow dynamic layout of components that are not completely " -"finished being refactored" -msgstr "" -"Если включено, будет выполняться динамическое размещение недоработанных " -"частей интерфейса" +#: ../src/ui/dialog/find.cpp:819 +msgid "partial" +msgstr "частичное" -#. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:602 +#. TRANSLATORS: "%1" is replaced with the number of matches +#: ../src/ui/dialog/find.cpp:822 #, fuzzy -msgid "Show filter primitives infobox (requires restart)" -msgstr "Показывать справку по примитивам фильтра" +msgid "%1 match replaced" +msgid_plural "%1 matches replaced" +msgstr[0] "Заменить" +msgstr[1] "Заменить" +msgstr[2] "Заменить" -#: ../src/ui/dialog/inkscape-preferences.cpp:604 -msgid "" -"Show icons and descriptions for the filter primitives available at the " -"filter effects dialog" -msgstr "" -"Показывать значки и описания для каждого примитива фильтров в диалоге " -"фильтров эффектов" +#. TRANSLATORS: "%1" is replaced with the number of matches +#: ../src/ui/dialog/find.cpp:826 +#, fuzzy +msgid "%1 object found" +msgid_plural "%1 objects found" +msgstr[0] "Ничего не найдено" +msgstr[1] "Ничего не найдено" +msgstr[2] "Ничего не найдено" -#: ../src/ui/dialog/inkscape-preferences.cpp:607 -#: ../src/ui/dialog/inkscape-preferences.cpp:615 +#: ../src/ui/dialog/find.cpp:837 #, fuzzy -msgid "Icons only" -msgstr "Цвет" +msgid "Replace text or property" +msgstr "Выберите контур или фигуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:607 -#: ../src/ui/dialog/inkscape-preferences.cpp:615 +#: ../src/ui/dialog/find.cpp:841 #, fuzzy -msgid "Text only" -msgstr "Импорт текстовых файлов" +msgid "Nothing found" +msgstr "Нет отменяемых операций." -#: ../src/ui/dialog/inkscape-preferences.cpp:607 -#: ../src/ui/dialog/inkscape-preferences.cpp:615 +#: ../src/ui/dialog/find.cpp:846 +msgid "No objects found" +msgstr "Ничего не найдено" + +#: ../src/ui/dialog/find.cpp:867 #, fuzzy -msgid "Icons and text" -msgstr "Внутри и снаружи" +msgid "Select an object type" +msgstr "Выберите объект." -#: ../src/ui/dialog/inkscape-preferences.cpp:612 +#: ../src/ui/dialog/find.cpp:885 #, fuzzy -msgid "Dockbar style (requires restart):" -msgstr "Язык (нужен перезапуск):" +msgid "Select a property" +msgstr "Выберите контур или фигуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:613 +#: ../src/ui/dialog/font-substitution.cpp:87 msgid "" -"Selects whether the vertical bars on the dockbar will show text labels, " -"icons, or both" +"\n" +"Some fonts are not available and have been substituted." +msgstr "" + +#: ../src/ui/dialog/font-substitution.cpp:90 +msgid "Font substitution" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:620 +#: ../src/ui/dialog/font-substitution.cpp:109 #, fuzzy -msgid "Switcher style (requires restart):" -msgstr "(требует перезапуска программы)" +msgid "Select all the affected items" +msgstr "Выберите объект." -#: ../src/ui/dialog/inkscape-preferences.cpp:621 -msgid "" -"Selects whether the dockbar switcher will show text labels, icons, or both" +#: ../src/ui/dialog/font-substitution.cpp:114 +msgid "Don't show this warning again" msgstr "" -#. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:625 -msgid "Save and restore window geometry for each document" -msgstr "Запоминать и использовать геометрию окна для каждого документа" - -#: ../src/ui/dialog/inkscape-preferences.cpp:626 -msgid "Remember and use last window's geometry" -msgstr "Запоминать и использовать геометрию последнего окна" +#: ../src/ui/dialog/font-substitution.cpp:255 +msgid "Font '%1' substituted with '%2'" +msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:627 -msgid "Don't save window geometry" -msgstr "Не запоминать геометрию окон" +#: ../src/ui/dialog/glyphs.cpp:60 ../src/ui/dialog/glyphs.cpp:152 +msgid "all" +msgstr "Все" -#: ../src/ui/dialog/inkscape-preferences.cpp:629 -msgid "Save and restore dialogs status" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:61 +msgid "common" +msgstr "Обычные" -#: ../src/ui/dialog/inkscape-preferences.cpp:630 -#: ../src/ui/dialog/inkscape-preferences.cpp:666 -msgid "Don't save dialogs status" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:62 +msgid "inherited" +msgstr "Унаследованные" -#: ../src/ui/dialog/inkscape-preferences.cpp:632 -#: ../src/ui/dialog/inkscape-preferences.cpp:674 -msgid "Dockable" -msgstr "Прикрепляются к правому краю окна" +#: ../src/ui/dialog/glyphs.cpp:63 ../src/ui/dialog/glyphs.cpp:165 +msgid "Arabic" +msgstr "Арабский" -#: ../src/ui/dialog/inkscape-preferences.cpp:636 -msgid "Native open/save dialogs" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:64 ../src/ui/dialog/glyphs.cpp:163 +msgid "Armenian" +msgstr "Армянский" -#: ../src/ui/dialog/inkscape-preferences.cpp:637 -msgid "GTK open/save dialogs" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:65 ../src/ui/dialog/glyphs.cpp:172 +msgid "Bengali" +msgstr "Бенгальский" -#: ../src/ui/dialog/inkscape-preferences.cpp:639 -msgid "Dialogs are hidden in taskbar" -msgstr "Диалоги не видны на панели задач" +#: ../src/ui/dialog/glyphs.cpp:66 ../src/ui/dialog/glyphs.cpp:254 +msgid "Bopomofo" +msgstr "Бопомото" -#: ../src/ui/dialog/inkscape-preferences.cpp:640 -#, fuzzy -msgid "Save and restore documents viewport" -msgstr "Запоминать и использовать геометрию окна для каждого документа" +#: ../src/ui/dialog/glyphs.cpp:67 ../src/ui/dialog/glyphs.cpp:189 +msgid "Cherokee" +msgstr "Чероки" -#: ../src/ui/dialog/inkscape-preferences.cpp:641 -msgid "Zoom when window is resized" -msgstr "Масштабировать рисунок при изменении размеров окна" +#: ../src/ui/dialog/glyphs.cpp:68 ../src/ui/dialog/glyphs.cpp:242 +msgid "Coptic" +msgstr "Коптский" -#: ../src/ui/dialog/inkscape-preferences.cpp:642 -msgid "Show close button on dialogs" -msgstr "Показывать кнопку «Закрыть» во всех диалогах" +#: ../src/ui/dialog/glyphs.cpp:69 ../src/ui/dialog/glyphs.cpp:161 +#: ../share/extensions/hershey.inx.h:22 +msgid "Cyrillic" +msgstr "Кириллица" -#: ../src/ui/dialog/inkscape-preferences.cpp:645 -msgid "Aggressive" -msgstr "Настойчивый" +#: ../src/ui/dialog/glyphs.cpp:70 +msgid "Deseret" +msgstr "Дезерет" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#, fuzzy -msgid "Maximized" -msgstr "С оптимизацией" +#: ../src/ui/dialog/glyphs.cpp:71 ../src/ui/dialog/glyphs.cpp:171 +msgid "Devanagari" +msgstr "Деванагари" -#: ../src/ui/dialog/inkscape-preferences.cpp:652 -#, fuzzy -msgid "Default window size:" -msgstr "Параметры сетки по умолчанию" +#: ../src/ui/dialog/glyphs.cpp:72 ../src/ui/dialog/glyphs.cpp:187 +msgid "Ethiopic" +msgstr "Эфиопский" -#: ../src/ui/dialog/inkscape-preferences.cpp:653 -#, fuzzy -msgid "Set the default window size" -msgstr "Создание обычного градиента" +#: ../src/ui/dialog/glyphs.cpp:73 ../src/ui/dialog/glyphs.cpp:185 +msgid "Georgian" +msgstr "Грузинский" -#: ../src/ui/dialog/inkscape-preferences.cpp:656 -#, fuzzy -msgid "Saving window geometry (size and position)" -msgstr "Запоминание геометрии окна (размера и положения)" +#: ../src/ui/dialog/glyphs.cpp:74 +msgid "Gothic" +msgstr "Готское письмо" -#: ../src/ui/dialog/inkscape-preferences.cpp:658 -msgid "Let the window manager determine placement of all windows" -msgstr "Пусть оконный менеджер сам определяет располжение окон" +#: ../src/ui/dialog/glyphs.cpp:75 +msgid "Greek" +msgstr "Греческий" -#: ../src/ui/dialog/inkscape-preferences.cpp:660 -msgid "" -"Remember and use the last window's geometry (saves geometry to user " -"preferences)" -msgstr "" -"Запоминать (в параметрах программы) и использовать геометрию последнего окна" +#: ../src/ui/dialog/glyphs.cpp:76 ../src/ui/dialog/glyphs.cpp:174 +msgid "Gujarati" +msgstr "Гуджарати" -#: ../src/ui/dialog/inkscape-preferences.cpp:662 -msgid "" -"Save and restore window geometry for each document (saves geometry in the " -"document)" -msgstr "" -"Запоминать (в параметрах документа) и использовать геометрию окна каждого " -"документа" +#: ../src/ui/dialog/glyphs.cpp:77 ../src/ui/dialog/glyphs.cpp:173 +msgid "Gurmukhi" +msgstr "Гурмухи" -#: ../src/ui/dialog/inkscape-preferences.cpp:664 +#: ../src/ui/dialog/glyphs.cpp:78 #, fuzzy -msgid "Saving dialogs status" -msgstr "Показывать диалог при запуске" +msgid "Han" +msgstr "Рычаг" -#: ../src/ui/dialog/inkscape-preferences.cpp:668 -msgid "" -"Save and restore dialogs status (the last open windows dialogs are saved " -"when it closes)" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:79 +msgid "Hangul" +msgstr "Хангыль" -#: ../src/ui/dialog/inkscape-preferences.cpp:672 -#, fuzzy -msgid "Dialog behavior (requires restart)" -msgstr "Поведение диалогов (требует перезапуска программы)" +#: ../src/ui/dialog/glyphs.cpp:80 ../src/ui/dialog/glyphs.cpp:164 +msgid "Hebrew" +msgstr "Иврит" -#: ../src/ui/dialog/inkscape-preferences.cpp:678 -#, fuzzy -msgid "Desktop integration" -msgstr "Назначение" +#: ../src/ui/dialog/glyphs.cpp:81 ../src/ui/dialog/glyphs.cpp:252 +msgid "Hiragana" +msgstr "Хирагана" -#: ../src/ui/dialog/inkscape-preferences.cpp:680 -msgid "Use Windows like open and save dialogs" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:82 ../src/ui/dialog/glyphs.cpp:178 +msgid "Kannada" +msgstr "Каннада" -#: ../src/ui/dialog/inkscape-preferences.cpp:682 -msgid "Use GTK open and save dialogs " -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:83 ../src/ui/dialog/glyphs.cpp:253 +msgid "Katakana" +msgstr "Каталонский" -#: ../src/ui/dialog/inkscape-preferences.cpp:686 -msgid "Dialogs on top:" -msgstr "Способ размещения диалогов поверх окна:" +#: ../src/ui/dialog/glyphs.cpp:84 ../src/ui/dialog/glyphs.cpp:197 +msgid "Khmer" +msgstr "Кхмерский" -#: ../src/ui/dialog/inkscape-preferences.cpp:689 -msgid "Dialogs are treated as regular windows" -msgstr "Диалоги рассматриваются как обычные окна" +#: ../src/ui/dialog/glyphs.cpp:85 ../src/ui/dialog/glyphs.cpp:182 +msgid "Lao" +msgstr "Лаосский" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 -msgid "Dialogs stay on top of document windows" -msgstr "Диалоги остаются поверх окон с документами" +#: ../src/ui/dialog/glyphs.cpp:86 +msgid "Latin" +msgstr "Латиница" -#: ../src/ui/dialog/inkscape-preferences.cpp:693 -msgid "Same as Normal but may work better with some window managers" -msgstr "" -"То же, что и «Нормальный», но может лучше работать с некоторыми оконными " -"менеджерами" +#: ../src/ui/dialog/glyphs.cpp:87 ../src/ui/dialog/glyphs.cpp:179 +msgid "Malayalam" +msgstr "Малаялам" -#: ../src/ui/dialog/inkscape-preferences.cpp:696 -#, fuzzy -msgid "Dialog Transparency" -msgstr "Прозрачность диалога:" +#: ../src/ui/dialog/glyphs.cpp:88 ../src/ui/dialog/glyphs.cpp:198 +msgid "Mongolian" +msgstr "Монгольский" -#: ../src/ui/dialog/inkscape-preferences.cpp:698 -#, fuzzy -msgid "_Opacity when focused:" -msgstr "Непрозрачность в фокусе:" +#: ../src/ui/dialog/glyphs.cpp:89 ../src/ui/dialog/glyphs.cpp:184 +msgid "Myanmar" +msgstr "Мьянма" -#: ../src/ui/dialog/inkscape-preferences.cpp:700 -#, fuzzy -msgid "Opacity when _unfocused:" -msgstr "Непрозрачность вне фокуса:" +#: ../src/ui/dialog/glyphs.cpp:90 ../src/ui/dialog/glyphs.cpp:191 +msgid "Ogham" +msgstr "Огамическое письмо" -#: ../src/ui/dialog/inkscape-preferences.cpp:702 -#, fuzzy -msgid "_Time of opacity change animation:" -msgstr "Длительность анимации:" +#: ../src/ui/dialog/glyphs.cpp:91 +msgid "Old Italic" +msgstr "Этрусский" -#: ../src/ui/dialog/inkscape-preferences.cpp:705 -#, fuzzy -msgid "Miscellaneous" -msgstr "Прочие параметры:" +#: ../src/ui/dialog/glyphs.cpp:92 ../src/ui/dialog/glyphs.cpp:175 +msgid "Oriya" +msgstr "Орийя" -#: ../src/ui/dialog/inkscape-preferences.cpp:708 -msgid "Whether dialog windows are to be hidden in the window manager taskbar" -msgstr "Убирать ли диалоговые окна из панели задач оконного менеджера" +#: ../src/ui/dialog/glyphs.cpp:93 ../src/ui/dialog/glyphs.cpp:192 +msgid "Runic" +msgstr "Руны" -#: ../src/ui/dialog/inkscape-preferences.cpp:711 -msgid "" -"Zoom drawing when document window is resized, to keep the same area visible " -"(this is the default which can be changed in any window using the button " -"above the right scrollbar)" -msgstr "" -"Масштабировать рисунок при изменении размеров окна, чтобы сохранить видимую " -"область (для каждого окна это можно изменить с помощью кнопки над правой " -"полосой прокрутки)" +#: ../src/ui/dialog/glyphs.cpp:94 ../src/ui/dialog/glyphs.cpp:180 +msgid "Sinhala" +msgstr "Сингальский" -#: ../src/ui/dialog/inkscape-preferences.cpp:713 -msgid "" -"Save documents viewport (zoom and panning position). Useful to turn off when " -"sharing version controlled files." -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:95 ../src/ui/dialog/glyphs.cpp:166 +msgid "Syriac" +msgstr "Сирийский" -#: ../src/ui/dialog/inkscape-preferences.cpp:715 -msgid "Whether dialog windows have a close button (requires restart)" -msgstr "Отображается ли в диалогах кнопка «Закрыть»" +#: ../src/ui/dialog/glyphs.cpp:96 ../src/ui/dialog/glyphs.cpp:176 +msgid "Tamil" +msgstr "Тамильский" -#: ../src/ui/dialog/inkscape-preferences.cpp:716 -msgid "Windows" -msgstr "Окна" +#: ../src/ui/dialog/glyphs.cpp:97 ../src/ui/dialog/glyphs.cpp:177 +msgid "Telugu" +msgstr "Телугу" -#. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:719 -msgid "Line color when zooming out" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:98 ../src/ui/dialog/glyphs.cpp:168 +msgid "Thaana" +msgstr "Таана" -#: ../src/ui/dialog/inkscape-preferences.cpp:722 -#, fuzzy -msgid "The gridlines will be shown in minor grid line color" -msgstr "" -"При просмотре на большом удалении основные линии сетки будут отображаться " -"обычным цветом." +#: ../src/ui/dialog/glyphs.cpp:99 ../src/ui/dialog/glyphs.cpp:181 +msgid "Thai" +msgstr "Тайский" -#: ../src/ui/dialog/inkscape-preferences.cpp:724 -#, fuzzy -msgid "The gridlines will be shown in major grid line color" -msgstr "" -"При просмотре на большом удалении основные линии сетки будут отображаться " -"обычным цветом." +#: ../src/ui/dialog/glyphs.cpp:100 ../src/ui/dialog/glyphs.cpp:183 +msgid "Tibetan" +msgstr "Тибетский" -#: ../src/ui/dialog/inkscape-preferences.cpp:726 -msgid "Default grid settings" -msgstr "Параметры сетки по умолчанию" +#: ../src/ui/dialog/glyphs.cpp:101 +msgid "Canadian Aboriginal" +msgstr "Слоговое письмо канадских аборигенов" -#: ../src/ui/dialog/inkscape-preferences.cpp:732 -#: ../src/ui/dialog/inkscape-preferences.cpp:757 -msgid "Grid units:" -msgstr "Единицы сетки:" +#: ../src/ui/dialog/glyphs.cpp:102 +msgid "Yi" +msgstr "Юи" -#: ../src/ui/dialog/inkscape-preferences.cpp:737 -#: ../src/ui/dialog/inkscape-preferences.cpp:762 -msgid "Origin X:" -msgstr "Точка отсчета по X:" +#: ../src/ui/dialog/glyphs.cpp:103 ../src/ui/dialog/glyphs.cpp:193 +msgid "Tagalog" +msgstr "Тагальский" -#: ../src/ui/dialog/inkscape-preferences.cpp:738 -#: ../src/ui/dialog/inkscape-preferences.cpp:763 -msgid "Origin Y:" -msgstr "Точка отсчета по Y:" +#: ../src/ui/dialog/glyphs.cpp:104 ../src/ui/dialog/glyphs.cpp:194 +msgid "Hanunoo" +msgstr "Хануноо" -#: ../src/ui/dialog/inkscape-preferences.cpp:743 -msgid "Spacing X:" -msgstr "Интервал по X:" +#: ../src/ui/dialog/glyphs.cpp:105 ../src/ui/dialog/glyphs.cpp:195 +msgid "Buhid" +msgstr "Бухид" -#: ../src/ui/dialog/inkscape-preferences.cpp:744 -#: ../src/ui/dialog/inkscape-preferences.cpp:766 -msgid "Spacing Y:" -msgstr "Интервал по Y:" +#: ../src/ui/dialog/glyphs.cpp:106 ../src/ui/dialog/glyphs.cpp:196 +msgid "Tagbanwa" +msgstr "Тагбанва" -#: ../src/ui/dialog/inkscape-preferences.cpp:746 -#: ../src/ui/dialog/inkscape-preferences.cpp:747 -#: ../src/ui/dialog/inkscape-preferences.cpp:771 -#: ../src/ui/dialog/inkscape-preferences.cpp:772 -#, fuzzy -msgid "Minor grid line color:" -msgstr "Цвет основных линий сетки:" +#: ../src/ui/dialog/glyphs.cpp:107 +msgid "Braille" +msgstr "Брейлева азбука" -#: ../src/ui/dialog/inkscape-preferences.cpp:747 -#: ../src/ui/dialog/inkscape-preferences.cpp:772 -msgid "Color used for normal grid lines" -msgstr "Цвет обычных линий сетки" +#: ../src/ui/dialog/glyphs.cpp:108 +msgid "Cypriot" +msgstr "Кипрское письмо" -#: ../src/ui/dialog/inkscape-preferences.cpp:748 -#: ../src/ui/dialog/inkscape-preferences.cpp:749 -#: ../src/ui/dialog/inkscape-preferences.cpp:773 -#: ../src/ui/dialog/inkscape-preferences.cpp:774 -msgid "Major grid line color:" -msgstr "Цвет основных линий сетки:" +#: ../src/ui/dialog/glyphs.cpp:109 ../src/ui/dialog/glyphs.cpp:200 +msgid "Limbu" +msgstr "Лимбу" -#: ../src/ui/dialog/inkscape-preferences.cpp:749 -#: ../src/ui/dialog/inkscape-preferences.cpp:774 -msgid "Color used for major (highlighted) grid lines" -msgstr "Цвет основных линий сетки" +#: ../src/ui/dialog/glyphs.cpp:110 +msgid "Osmanya" +msgstr "Сомалийское письмо" -#: ../src/ui/dialog/inkscape-preferences.cpp:751 -#: ../src/ui/dialog/inkscape-preferences.cpp:776 -msgid "Major grid line every:" -msgstr "Основная линия сетки каждые:" +#: ../src/ui/dialog/glyphs.cpp:111 +msgid "Shavian" +msgstr "Скорописный алфавит Бернарда Шоу" -#: ../src/ui/dialog/inkscape-preferences.cpp:752 -msgid "Show dots instead of lines" -msgstr "Показывать точки вместо линий" +#: ../src/ui/dialog/glyphs.cpp:112 +msgid "Linear B" +msgstr "Линейное письмо Б" -#: ../src/ui/dialog/inkscape-preferences.cpp:753 -msgid "If set, display dots at gridpoints instead of gridlines" -msgstr "" -"Если включено, сетка отображается лишь точками пересечения ее линий, а не " -"самими линиями" +#: ../src/ui/dialog/glyphs.cpp:113 ../src/ui/dialog/glyphs.cpp:201 +msgid "Tai Le" +msgstr "Тайский Ле" -#: ../src/ui/dialog/inkscape-preferences.cpp:834 -msgid "Input/Output" -msgstr "Ввод и вывод" +#: ../src/ui/dialog/glyphs.cpp:114 +msgid "Ugaritic" +msgstr "Древнеперсидский" -#: ../src/ui/dialog/inkscape-preferences.cpp:837 -msgid "Use current directory for \"Save As ...\"" -msgstr "Использовать текущий каталог при сохранении файла под другим именем" +#: ../src/ui/dialog/glyphs.cpp:115 ../src/ui/dialog/glyphs.cpp:202 +msgid "New Tai Lue" +msgstr "Новый тайский Ле" -#: ../src/ui/dialog/inkscape-preferences.cpp:839 -#, fuzzy -msgid "" -"When this option is on, the \"Save as...\" and \"Save a Copy\" dialogs will " -"always open in the directory where the currently open document is; when it's " -"off, each will open in the directory where you last saved a file using it" -msgstr "" -"Если включено, при сохранении файла под другим именем диалога всегда будет " -"открываться в каталоге, где сохранён текущий файл. Если выключено, будет " -"открываться каталог, в котором был в последний раз сохранён какой-либо файл." +#: ../src/ui/dialog/glyphs.cpp:116 ../src/ui/dialog/glyphs.cpp:204 +msgid "Buginese" +msgstr "Бугинский" -#: ../src/ui/dialog/inkscape-preferences.cpp:841 -msgid "Add label comments to printing output" -msgstr "Добавлять метки в виде комментариев при выводе на печать" +#: ../src/ui/dialog/glyphs.cpp:117 ../src/ui/dialog/glyphs.cpp:240 +msgid "Glagolitic" +msgstr "Глаголица" -#: ../src/ui/dialog/inkscape-preferences.cpp:843 -msgid "" -"When on, a comment will be added to the raw print output, marking the " -"rendered output for an object with its label" -msgstr "" -"С этой опцией при выводе на печать будут добавляться комментарии, содержащие " -"метки для каждого объекта" +#: ../src/ui/dialog/glyphs.cpp:118 ../src/ui/dialog/glyphs.cpp:244 +msgid "Tifinagh" +msgstr "Тифинаг (берберский)" -#: ../src/ui/dialog/inkscape-preferences.cpp:845 -#, fuzzy -msgid "Add default metadata to new documents" -msgstr "Изменить сведения о документе, сохраняемые вместе с ним" +#: ../src/ui/dialog/glyphs.cpp:119 ../src/ui/dialog/glyphs.cpp:273 +msgid "Syloti Nagri" +msgstr "Силоти нагри" -#: ../src/ui/dialog/inkscape-preferences.cpp:847 -msgid "" -"Add default metadata to new documents. Default metadata can be set from " -"Document Properties->Metadata." -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:120 +msgid "Old Persian" +msgstr "Древнеперсидский" -#: ../src/ui/dialog/inkscape-preferences.cpp:851 -msgid "_Grab sensitivity:" -msgstr "_Чувствительность захвата:" +#: ../src/ui/dialog/glyphs.cpp:121 +msgid "Kharoshthi" +msgstr "Кхароштхи" -#: ../src/ui/dialog/inkscape-preferences.cpp:851 +#: ../src/ui/dialog/glyphs.cpp:122 #, fuzzy -msgid "pixels (requires restart)" -msgstr "(требует перезапуска программы)" +msgid "unassigned" +msgstr "Назначить" -#: ../src/ui/dialog/inkscape-preferences.cpp:852 -msgid "" -"How close on the screen you need to be to an object to be able to grab it " -"with mouse (in screen pixels)" -msgstr "" -"Насколько близко (в пикселах) нужно подвести курсор мыши к объекту, чтобы " -"ухватить его мышью" +#: ../src/ui/dialog/glyphs.cpp:123 ../src/ui/dialog/glyphs.cpp:206 +msgid "Balinese" +msgstr "Балинезийский" + +#: ../src/ui/dialog/glyphs.cpp:124 +msgid "Cuneiform" +msgstr "Клинопись" + +#: ../src/ui/dialog/glyphs.cpp:125 +msgid "Phoenician" +msgstr "Финикийский" + +#: ../src/ui/dialog/glyphs.cpp:126 ../src/ui/dialog/glyphs.cpp:275 +msgid "Phags-pa" +msgstr "Фагс-па" + +#: ../src/ui/dialog/glyphs.cpp:127 +msgid "N'Ko" +msgstr "Н'ко" + +#: ../src/ui/dialog/glyphs.cpp:128 ../src/ui/dialog/glyphs.cpp:278 +msgid "Kayah Li" +msgstr "Кайях Ли" -#: ../src/ui/dialog/inkscape-preferences.cpp:854 -msgid "_Click/drag threshold:" -msgstr "Порог _щелчка/перетаскивания:" +#: ../src/ui/dialog/glyphs.cpp:129 ../src/ui/dialog/glyphs.cpp:208 +msgid "Lepcha" +msgstr "Лепча" -#: ../src/ui/dialog/inkscape-preferences.cpp:854 -#: ../src/ui/dialog/inkscape-preferences.cpp:1196 -#: ../src/ui/dialog/inkscape-preferences.cpp:1200 -#: ../src/ui/dialog/inkscape-preferences.cpp:1210 -msgid "pixels" -msgstr "пикселов" +#: ../src/ui/dialog/glyphs.cpp:130 ../src/ui/dialog/glyphs.cpp:279 +msgid "Rejang" +msgstr "Реджанг" -#: ../src/ui/dialog/inkscape-preferences.cpp:855 -msgid "" -"Maximum mouse drag (in screen pixels) which is considered a click, not a drag" -msgstr "" -"Максимальное количество пикселов, перетаскивание на которое\n" -"воспринимается как щелчок, а не как перетаскивание" +#: ../src/ui/dialog/glyphs.cpp:131 ../src/ui/dialog/glyphs.cpp:207 +msgid "Sundanese" +msgstr "Сунданский" -#: ../src/ui/dialog/inkscape-preferences.cpp:858 -msgid "_Handle size:" -msgstr "_Размер рычагов:" +#: ../src/ui/dialog/glyphs.cpp:132 ../src/ui/dialog/glyphs.cpp:276 +msgid "Saurashtra" +msgstr "Саураштра" -#: ../src/ui/dialog/inkscape-preferences.cpp:859 -#, fuzzy -msgid "Set the relative size of node handles" -msgstr "Смещение рычагов узла" +#: ../src/ui/dialog/glyphs.cpp:133 ../src/ui/dialog/glyphs.cpp:282 +msgid "Cham" +msgstr "Тямское письмо " -#: ../src/ui/dialog/inkscape-preferences.cpp:861 -msgid "Use pressure-sensitive tablet (requires restart)" -msgstr "Использовать графический планшет (требует перезапуска)" +#: ../src/ui/dialog/glyphs.cpp:134 ../src/ui/dialog/glyphs.cpp:209 +msgid "Ol Chiki" +msgstr "Ол Чики" -#: ../src/ui/dialog/inkscape-preferences.cpp:863 -msgid "" -"Use the capabilities of a tablet or other pressure-sensitive device. Disable " -"this only if you have problems with the tablet (you can still use it as a " -"mouse)" -msgstr "" -"Использовать возможности графического планшета или иного устройства, " -"распознающего силу нажатия. Отключайте этот параметр только при " -"возникновении неполадок с устройством. Мышь по-прежнему будет доступна." +#: ../src/ui/dialog/glyphs.cpp:135 ../src/ui/dialog/glyphs.cpp:268 +msgid "Vai" +msgstr "Ваи" -#: ../src/ui/dialog/inkscape-preferences.cpp:865 -msgid "Switch tool based on tablet device (requires restart)" -msgstr "" -"Менять инструмент в зависимости от активного устройства\n" -"графического планшета (требует перезапуска)" +#: ../src/ui/dialog/glyphs.cpp:136 +msgid "Carian" +msgstr "Карийский" -#: ../src/ui/dialog/inkscape-preferences.cpp:867 -msgid "" -"Change tool as different devices are used on the tablet (pen, eraser, mouse)" -msgstr "Менять инструмент в зависимости от активного инструмента планшета" +#: ../src/ui/dialog/glyphs.cpp:137 +msgid "Lycian" +msgstr "Ликийский" -#: ../src/ui/dialog/inkscape-preferences.cpp:868 -msgid "Input devices" -msgstr "Устройства ввода" +#: ../src/ui/dialog/glyphs.cpp:138 +msgid "Lydian" +msgstr "Лидийский" -#. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:871 -msgid "Use named colors" -msgstr "Использовать именованные цвета" +#: ../src/ui/dialog/glyphs.cpp:153 +msgid "Basic Latin" +msgstr "Базовая латиница" -#: ../src/ui/dialog/inkscape-preferences.cpp:872 -msgid "" -"If set, write the CSS name of the color when available (e.g. 'red' or " -"'magenta') instead of the numeric value" -msgstr "" -"Если включено, записывать название цвета по CSS (например, 'red' или " -"'magenta') вместо числового значения" +#: ../src/ui/dialog/glyphs.cpp:154 +msgid "Latin-1 Supplement" +msgstr "Латиница, дополнение 1" -#: ../src/ui/dialog/inkscape-preferences.cpp:874 -msgid "XML formatting" -msgstr "Форматирование XML" +#: ../src/ui/dialog/glyphs.cpp:155 +msgid "Latin Extended-A" +msgstr "Латиница, расширение А" -#: ../src/ui/dialog/inkscape-preferences.cpp:876 -msgid "Inline attributes" -msgstr "Внутристрочные атрибуты" +#: ../src/ui/dialog/glyphs.cpp:156 +msgid "Latin Extended-B" +msgstr "Латиница, расширение B" -#: ../src/ui/dialog/inkscape-preferences.cpp:877 -msgid "Put attributes on the same line as the element tag" -msgstr "Атрибуты пишутся в той же строке, что и тэги элемента" +#: ../src/ui/dialog/glyphs.cpp:157 +msgid "IPA Extensions" +msgstr "Расширения IPA" -#: ../src/ui/dialog/inkscape-preferences.cpp:880 -#, fuzzy -msgid "_Indent, spaces:" -msgstr "Отступ в пробелах:" +#: ../src/ui/dialog/glyphs.cpp:158 +msgid "Spacing Modifier Letters" +msgstr "Модификаторы пробелов" -#: ../src/ui/dialog/inkscape-preferences.cpp:880 -msgid "" -"The number of spaces to use for indenting nested elements; set to 0 for no " -"indentation" -msgstr "" -"Количество пробелов, используемых для отступов вложенных элементов; ноль " -"выключает отступы" +#: ../src/ui/dialog/glyphs.cpp:159 +msgid "Combining Diacritical Marks" +msgstr "Объединяющие диакритические метки" -#: ../src/ui/dialog/inkscape-preferences.cpp:882 -msgid "Path data" -msgstr "Данные контуров" +#: ../src/ui/dialog/glyphs.cpp:160 +msgid "Greek and Coptic" +msgstr "Греческий и коптский" -#: ../src/ui/dialog/inkscape-preferences.cpp:885 -msgid "Absolute" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:162 +msgid "Cyrillic Supplement" +msgstr "Кириллица, дополнение" -#: ../src/ui/dialog/inkscape-preferences.cpp:885 -#, fuzzy -msgid "Relative" -msgstr "Ориентир: " +#: ../src/ui/dialog/glyphs.cpp:167 +msgid "Arabic Supplement" +msgstr "Арабский, дополнение" -#: ../src/ui/dialog/inkscape-preferences.cpp:885 -#: ../src/ui/dialog/inkscape-preferences.cpp:1175 -msgid "Optimized" -msgstr "С оптимизацией" +#: ../src/ui/dialog/glyphs.cpp:169 +msgid "NKo" +msgstr "Нко" -#: ../src/ui/dialog/inkscape-preferences.cpp:889 -msgid "Path string format:" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:170 +msgid "Samaritan" +msgstr "Самаритянское письмо " -#: ../src/ui/dialog/inkscape-preferences.cpp:889 -msgid "" -"Path data should be written: only with absolute coordinates, only with " -"relative coordinates, or optimized for string length (mixed absolute and " -"relative coordinates)" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:186 +msgid "Hangul Jamo" +msgstr "Хангул Ямо" -#: ../src/ui/dialog/inkscape-preferences.cpp:891 -msgid "Force repeat commands" -msgstr "Принудительно повторять команды" +#: ../src/ui/dialog/glyphs.cpp:188 +msgid "Ethiopic Supplement" +msgstr "Эфиопский, дополнение" -#: ../src/ui/dialog/inkscape-preferences.cpp:892 -msgid "" -"Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " -"of 'L 1,2 3,4')" -msgstr "" -"Принудительно повторять команды контуров (например, 'L 1,2 L 3,4' вместо 'L " -"1,2 3,4')" +#: ../src/ui/dialog/glyphs.cpp:190 +msgid "Unified Canadian Aboriginal Syllabics" +msgstr "Объединённое слоговое письмо канадских аборигенов" -#: ../src/ui/dialog/inkscape-preferences.cpp:894 -msgid "Numbers" -msgstr "Числа" +#: ../src/ui/dialog/glyphs.cpp:199 +msgid "Unified Canadian Aboriginal Syllabics Extended" +msgstr "Расширенное объединённое слоговое письмо канадских аборигенов" -#: ../src/ui/dialog/inkscape-preferences.cpp:897 -#, fuzzy -msgid "_Numeric precision:" -msgstr "Точность чисел:" +#: ../src/ui/dialog/glyphs.cpp:203 +msgid "Khmer Symbols" +msgstr "Кхмерские символы" -#: ../src/ui/dialog/inkscape-preferences.cpp:897 -msgid "Significant figures of the values written to the SVG file" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:205 +msgid "Tai Tham" +msgstr "Тай Там" -#: ../src/ui/dialog/inkscape-preferences.cpp:900 -#, fuzzy -msgid "Minimum _exponent:" -msgstr "Минимальная экспонента:" +#: ../src/ui/dialog/glyphs.cpp:210 +msgid "Vedic Extensions" +msgstr "Ведические расширения" -#: ../src/ui/dialog/inkscape-preferences.cpp:900 -msgid "" -"The smallest number written to SVG is 10 to the power of this exponent; " -"anything smaller is written as zero" -msgstr "" -"Самое малое число, записываемое в файл SVG равно десяти в этой степени; всё, " -"что меньше, записывается как ноль." +#: ../src/ui/dialog/glyphs.cpp:211 +msgid "Phonetic Extensions" +msgstr "Фонетические расширения" -#. Code to add controls for attribute checking options -#. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:905 -msgid "Improper Attributes Actions" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:212 +msgid "Phonetic Extensions Supplement" +msgstr "Фонетические расширения, дополнение" -#: ../src/ui/dialog/inkscape-preferences.cpp:907 -#: ../src/ui/dialog/inkscape-preferences.cpp:915 -#: ../src/ui/dialog/inkscape-preferences.cpp:923 -#, fuzzy -msgid "Print warnings" -msgstr "Метки для печати" +#: ../src/ui/dialog/glyphs.cpp:213 +msgid "Combining Diacritical Marks Supplement" +msgstr "Объединяющие диакритические метки, дополнение" -#: ../src/ui/dialog/inkscape-preferences.cpp:908 -msgid "" -"Print warning if invalid or non-useful attributes found. Database files " -"located in inkscape_data_dir/attributes." -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:214 +msgid "Latin Extended Additional" +msgstr "Латиница расширенная дополнительная" -#: ../src/ui/dialog/inkscape-preferences.cpp:909 -#, fuzzy -msgid "Remove attributes" -msgstr "Установить атрибут" +#: ../src/ui/dialog/glyphs.cpp:215 +msgid "Greek Extended" +msgstr "Расширенный греческий" -#: ../src/ui/dialog/inkscape-preferences.cpp:910 -msgid "Delete invalid or non-useful attributes from element tag" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:216 +msgid "General Punctuation" +msgstr "Общие знаки препинания" -#. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:913 -msgid "Inappropriate Style Properties Actions" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:217 +msgid "Superscripts and Subscripts" +msgstr "Верхний и нижний индексы" -#: ../src/ui/dialog/inkscape-preferences.cpp:916 -msgid "" -"Print warning if inappropriate style properties found (i.e. 'font-family' " -"set on a <rect>). Database files located in inkscape_data_dir/attributes." -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:218 +msgid "Currency Symbols" +msgstr "Символы валют" -#: ../src/ui/dialog/inkscape-preferences.cpp:917 -#: ../src/ui/dialog/inkscape-preferences.cpp:925 -#, fuzzy -msgid "Remove style properties" -msgstr "Вывести свойства этого треугольника" +#: ../src/ui/dialog/glyphs.cpp:219 +msgid "Combining Diacritical Marks for Symbols" +msgstr "Объединяющие диакритические метки для символов" -#: ../src/ui/dialog/inkscape-preferences.cpp:918 -#, fuzzy -msgid "Delete inappropriate style properties" -msgstr "Смена свойств направляющей" +#: ../src/ui/dialog/glyphs.cpp:220 +msgid "Letterlike Symbols" +msgstr "Буквообразные символы" -#. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:921 -msgid "Non-useful Style Properties Actions" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:221 +msgid "Number Forms" +msgstr "Числовые формы" -#: ../src/ui/dialog/inkscape-preferences.cpp:924 -msgid "" -"Print warning if redundant style properties found (i.e. if a property has " -"the default value and a different value is not inherited or if value is the " -"same as would be inherited). Database files located in inkscape_data_dir/" -"attributes." -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:222 +msgid "Arrows" +msgstr "Стрелки" -#: ../src/ui/dialog/inkscape-preferences.cpp:926 -#, fuzzy -msgid "Delete redundant style properties" -msgstr "Смена свойств направляющей" +#: ../src/ui/dialog/glyphs.cpp:223 +msgid "Mathematical Operators" +msgstr "Математические операторы" -#: ../src/ui/dialog/inkscape-preferences.cpp:928 -msgid "Check Attributes and Style Properties on" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:224 +msgid "Miscellaneous Technical" +msgstr "Различные технические символы" -#: ../src/ui/dialog/inkscape-preferences.cpp:930 -#, fuzzy -msgid "Reading" -msgstr "Затенение" +#: ../src/ui/dialog/glyphs.cpp:225 +msgid "Control Pictures" +msgstr "Управляющие картинки" -#: ../src/ui/dialog/inkscape-preferences.cpp:931 -msgid "" -"Check attributes and style properties on reading in SVG files (including " -"those internal to Inkscape which will slow down startup)" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:226 +msgid "Optical Character Recognition" +msgstr "Оптическое распознавание символов" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 -#, fuzzy -msgid "Editing" -msgstr "Осветление" +#: ../src/ui/dialog/glyphs.cpp:227 +msgid "Enclosed Alphanumerics" +msgstr "Алфавитно-цифровые символы в рамке" -#: ../src/ui/dialog/inkscape-preferences.cpp:933 -msgid "" -"Check attributes and style properties while editing SVG files (may slow down " -"Inkscape, mostly useful for debugging)" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:228 +msgid "Box Drawing" +msgstr "Для рисования рамок" -#: ../src/ui/dialog/inkscape-preferences.cpp:934 -#, fuzzy -msgid "Writing" -msgstr "Сценарии" +#: ../src/ui/dialog/glyphs.cpp:229 +msgid "Block Elements" +msgstr "Блочные элементы" -#: ../src/ui/dialog/inkscape-preferences.cpp:935 -msgid "Check attributes and style properties on writing out SVG files" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:230 +msgid "Geometric Shapes" +msgstr "Геометрические фигуры" -#: ../src/ui/dialog/inkscape-preferences.cpp:937 -msgid "SVG output" -msgstr "Экспорт в SVG" +#: ../src/ui/dialog/glyphs.cpp:231 +msgid "Miscellaneous Symbols" +msgstr "Различные символы" -#. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm -#: ../src/ui/dialog/inkscape-preferences.cpp:943 -msgid "Perceptual" -msgstr "Воспринимаемая" +#: ../src/ui/dialog/glyphs.cpp:232 +msgid "Dingbats" +msgstr "Условные знаки" -#: ../src/ui/dialog/inkscape-preferences.cpp:943 -msgid "Relative Colorimetric" -msgstr "Относительная колориметрическая" +#: ../src/ui/dialog/glyphs.cpp:233 +msgid "Miscellaneous Mathematical Symbols-A" +msgstr "Различные математические символы A" -#: ../src/ui/dialog/inkscape-preferences.cpp:943 -msgid "Absolute Colorimetric" -msgstr "Абсолютная колориметрическая" +#: ../src/ui/dialog/glyphs.cpp:234 +msgid "Supplemental Arrows-A" +msgstr "Дополнительные стрелки A" -#: ../src/ui/dialog/inkscape-preferences.cpp:947 -msgid "(Note: Color management has been disabled in this build)" -msgstr "(Примечание: в этой сборке управление цветом отключено)" +#: ../src/ui/dialog/glyphs.cpp:235 +msgid "Braille Patterns" +msgstr "Азбука Брейля" -#: ../src/ui/dialog/inkscape-preferences.cpp:951 -msgid "Display adjustment" -msgstr "Коррекция вывода на монитор" +#: ../src/ui/dialog/glyphs.cpp:236 +msgid "Supplemental Arrows-B" +msgstr "Дополнительные стрелки B" -#: ../src/ui/dialog/inkscape-preferences.cpp:961 -#, c-format -msgid "" -"The ICC profile to use to calibrate display output.\n" -"Searched directories:%s" -msgstr "" -"Профиль ICC, используемый для коррекции вывода на дисплей.\n" -"В этих каталогах ищутся профили: %s" +#: ../src/ui/dialog/glyphs.cpp:237 +msgid "Miscellaneous Mathematical Symbols-B" +msgstr "Различные математические символы B" -#: ../src/ui/dialog/inkscape-preferences.cpp:962 -msgid "Display profile:" -msgstr "Профиль монитора:" +#: ../src/ui/dialog/glyphs.cpp:238 +msgid "Supplemental Mathematical Operators" +msgstr "Дополнительные математические операторы" -#: ../src/ui/dialog/inkscape-preferences.cpp:967 -msgid "Retrieve profile from display" -msgstr "Получать профиль от видеоподсистемы" +#: ../src/ui/dialog/glyphs.cpp:239 +msgid "Miscellaneous Symbols and Arrows" +msgstr "Различные символы и стрелки" -#: ../src/ui/dialog/inkscape-preferences.cpp:970 -msgid "Retrieve profiles from those attached to displays via XICC" -msgstr "Использовать профиль, назначенный монитору через xicc" +#: ../src/ui/dialog/glyphs.cpp:241 +msgid "Latin Extended-C" +msgstr "Латиница, расширение C" -#: ../src/ui/dialog/inkscape-preferences.cpp:972 -msgid "Retrieve profiles from those attached to displays" -msgstr "" -"Использовать профили, используемые видеподсистемой для каждого из мониторов" +#: ../src/ui/dialog/glyphs.cpp:243 +msgid "Georgian Supplement" +msgstr "Грузинский, дополнение" -#: ../src/ui/dialog/inkscape-preferences.cpp:977 -msgid "Display rendering intent:" -msgstr "Цветопередача монитора:" +#: ../src/ui/dialog/glyphs.cpp:245 +msgid "Ethiopic Extended" +msgstr "Эфиопский расширенный" -#: ../src/ui/dialog/inkscape-preferences.cpp:978 -msgid "The rendering intent to use to calibrate display output" -msgstr "Цветопередача выводимых на дисплей изображений" +#: ../src/ui/dialog/glyphs.cpp:246 +msgid "Cyrillic Extended-A" +msgstr "Кириллический расширенный A" -#: ../src/ui/dialog/inkscape-preferences.cpp:980 -msgid "Proofing" -msgstr "Цветопроба" +#: ../src/ui/dialog/glyphs.cpp:247 +msgid "Supplemental Punctuation" +msgstr "Дополнительные знаки препинания" -#: ../src/ui/dialog/inkscape-preferences.cpp:982 -msgid "Simulate output on screen" -msgstr "Имитировать устройство вывода" +#: ../src/ui/dialog/glyphs.cpp:248 +msgid "CJK Radicals Supplement" +msgstr "Корни CJK, дополнение" -#: ../src/ui/dialog/inkscape-preferences.cpp:984 -msgid "Simulates output of target device" -msgstr "Имитировать на экране устройство вывода" +#: ../src/ui/dialog/glyphs.cpp:249 +msgid "Kangxi Radicals" +msgstr "Корни Канси" -#: ../src/ui/dialog/inkscape-preferences.cpp:986 -msgid "Mark out of gamut colors" -msgstr "Помечать цвета вне цветового охвата" +#: ../src/ui/dialog/glyphs.cpp:250 +msgid "Ideographic Description Characters" +msgstr "Символы идеографического описания" -#: ../src/ui/dialog/inkscape-preferences.cpp:988 -msgid "Highlights colors that are out of gamut for the target device" -msgstr "" -"Помечать цвета, выходящие за рамки цветового охвата для данного устройства" +#: ../src/ui/dialog/glyphs.cpp:251 +msgid "CJK Symbols and Punctuation" +msgstr "Символы и знаки препинания CJK" -#: ../src/ui/dialog/inkscape-preferences.cpp:1000 -msgid "Out of gamut warning color:" -msgstr "Цвета вне цветового охвата:" +#: ../src/ui/dialog/glyphs.cpp:255 +msgid "Hangul Compatibility Jamo" +msgstr "Хангул, совместимый с Ямо" -#: ../src/ui/dialog/inkscape-preferences.cpp:1001 -msgid "Selects the color used for out of gamut warning" -msgstr "Выберите цвет предупреждения о выходе за цветовой охват" +#: ../src/ui/dialog/glyphs.cpp:256 +msgid "Kanbun" +msgstr "Канбун" -#: ../src/ui/dialog/inkscape-preferences.cpp:1003 -msgid "Device profile:" -msgstr "Профиль устройства вывода:" +#: ../src/ui/dialog/glyphs.cpp:257 +msgid "Bopomofo Extended" +msgstr "Расширенный бопомото" -#: ../src/ui/dialog/inkscape-preferences.cpp:1004 -msgid "The ICC profile to use to simulate device output" -msgstr "ICC-профиль, используемый для имитации устройства вывода" +#: ../src/ui/dialog/glyphs.cpp:258 +msgid "CJK Strokes" +msgstr "Росчерки CJK" -#: ../src/ui/dialog/inkscape-preferences.cpp:1007 -msgid "Device rendering intent:" -msgstr "Цветопередача устройства вывода:" +#: ../src/ui/dialog/glyphs.cpp:259 +msgid "Katakana Phonetic Extensions" +msgstr "Фонетические расширения катаканы" -#: ../src/ui/dialog/inkscape-preferences.cpp:1008 -msgid "The rendering intent to use to calibrate device output" -msgstr "Цветопередача выводимых на дисплей изображений" +#: ../src/ui/dialog/glyphs.cpp:260 +msgid "Enclosed CJK Letters and Months" +msgstr "Знаки и месяца CJK в рамке" -#: ../src/ui/dialog/inkscape-preferences.cpp:1010 -msgid "Black point compensation" -msgstr "Использовать компенсацию черной точки" +#: ../src/ui/dialog/glyphs.cpp:261 +msgid "CJK Compatibility" +msgstr "CJK, совместимость" -#: ../src/ui/dialog/inkscape-preferences.cpp:1012 -msgid "Enables black point compensation" -msgstr "Включить компенсацию чёрной точки" +#: ../src/ui/dialog/glyphs.cpp:262 +msgid "CJK Unified Ideographs Extension A" +msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1014 -msgid "Preserve black" -msgstr "Сохранять черный цвет" +#: ../src/ui/dialog/glyphs.cpp:263 +msgid "Yijing Hexagram Symbols" +msgstr "Гексаграммы И-Цзин" -#: ../src/ui/dialog/inkscape-preferences.cpp:1021 -msgid "(LittleCMS 1.15 or later required)" -msgstr "(необходима библиотека LittleCMS версии 1.15 или новее)" +#: ../src/ui/dialog/glyphs.cpp:264 +msgid "CJK Unified Ideographs" +msgstr "Объединенные идеограммы CJK" -#: ../src/ui/dialog/inkscape-preferences.cpp:1023 -msgid "Preserve K channel in CMYK -> CMYK transforms" -msgstr "Сохранять канал K при преобразованиях CMYK → CMYK" +#: ../src/ui/dialog/glyphs.cpp:265 +msgid "Yi Syllables" +msgstr "Слоги Юи" -#: ../src/ui/dialog/inkscape-preferences.cpp:1037 -#: ../src/widgets/sp-color-icc-selector.cpp:474 -#: ../src/widgets/sp-color-icc-selector.cpp:766 -msgid "<none>" -msgstr "<нет>" +#: ../src/ui/dialog/glyphs.cpp:266 +msgid "Yi Radicals" +msgstr "Корни Юи" + +#: ../src/ui/dialog/glyphs.cpp:267 +msgid "Lisu" +msgstr "Лису" -#: ../src/ui/dialog/inkscape-preferences.cpp:1082 -msgid "Color management" -msgstr "Управление цветом" +#: ../src/ui/dialog/glyphs.cpp:269 +msgid "Cyrillic Extended-B" +msgstr "Кириллический расширенный B" -#. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1085 -msgid "Enable autosave (requires restart)" -msgstr "Включить автосохранение (требует перезапуска программы)" +#: ../src/ui/dialog/glyphs.cpp:270 +msgid "Bamum" +msgstr "Бамум" -#: ../src/ui/dialog/inkscape-preferences.cpp:1086 -msgid "" -"Automatically save the current document(s) at a given interval, thus " -"minimizing loss in case of a crash" +#: ../src/ui/dialog/glyphs.cpp:271 +msgid "Modifier Tone Letters" msgstr "" -"Автоматически сохранять текущий документ через заданный временной интервал, " -"минимизируя риск потери данных" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1092 -msgctxt "Filesystem" -msgid "Autosave _directory:" -msgstr "Каталог для временных файлов:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1092 -msgid "" -"The directory where autosaves will be written. This should be an absolute " -"path (starts with / on UNIX or a drive letter such as C: on Windows). " -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:272 +msgid "Latin Extended-D" +msgstr "Латиница, расширение D" -#: ../src/ui/dialog/inkscape-preferences.cpp:1094 -msgid "_Interval (in minutes):" -msgstr "_Интервал (в минутах):" +#: ../src/ui/dialog/glyphs.cpp:274 +msgid "Common Indic Number Forms" +msgstr "Обычные индийские числовые формы" -#: ../src/ui/dialog/inkscape-preferences.cpp:1094 -msgid "Interval (in minutes) at which document will be autosaved" -msgstr "Интервал в минутах, через который документ автоматически сохраняется" +#: ../src/ui/dialog/glyphs.cpp:277 +msgid "Devanagari Extended" +msgstr "Деванагари, расширение" -#: ../src/ui/dialog/inkscape-preferences.cpp:1096 -msgid "_Maximum number of autosaves:" -msgstr "_Максимальное число автосохранений:" +#: ../src/ui/dialog/glyphs.cpp:280 +msgid "Hangul Jamo Extended-A" +msgstr "Хангыль Ямо, расширение A" -#: ../src/ui/dialog/inkscape-preferences.cpp:1096 -msgid "" -"Maximum number of autosaved files; use this to limit the storage space used" -msgstr "" -"Максимальное число файлов автосохранения; используйте этот параметр для " -"ограничения используемого дискового пространства" +#: ../src/ui/dialog/glyphs.cpp:281 +msgid "Javanese" +msgstr "Яванский" -#. When changing the interval or enabling/disabling the autosave function, -#. * update our running configuration -#. * -#. * FIXME! -#. * the inkscape_autosave_init should be called AFTER the values have been changed -#. * (which cannot be guaranteed from here) - use a PrefObserver somewhere -#. -#. -#. _autosave_autosave_enable.signal_toggled().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); -#. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); -#. -#. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1111 -msgid "Autosave" -msgstr "Автосохранение" +#: ../src/ui/dialog/glyphs.cpp:283 +msgid "Myanmar Extended-A" +msgstr "Мьянма, расширение A" -#: ../src/ui/dialog/inkscape-preferences.cpp:1115 -msgid "Open Clip Art Library _Server Name:" -msgstr "_Сервер Open Clip Art Library:" +#: ../src/ui/dialog/glyphs.cpp:284 +msgid "Tai Viet" +msgstr "Тай Вьет" -#: ../src/ui/dialog/inkscape-preferences.cpp:1116 -msgid "" -"The server name of the Open Clip Art Library webdav server; it's used by the " -"Import and Export to OCAL function" -msgstr "" -"Имя webdav-сервера Open Clip Art Library. Используется для функций импорта и " -"экспорта в OCAL" +#: ../src/ui/dialog/glyphs.cpp:285 +#, fuzzy +msgid "Meetei Mayek" +msgstr "Слой удалён" -#: ../src/ui/dialog/inkscape-preferences.cpp:1118 -msgid "Open Clip Art Library _Username:" -msgstr "П_ользователь Open Clip Art Library:" +#: ../src/ui/dialog/glyphs.cpp:286 +msgid "Hangul Syllables" +msgstr "Слоги Хангул" -#: ../src/ui/dialog/inkscape-preferences.cpp:1119 -msgid "The username used to log into Open Clip Art Library" -msgstr "Имя пользователя для авторизации на Open Clip Art Library" +#: ../src/ui/dialog/glyphs.cpp:287 +msgid "Hangul Jamo Extended-B" +msgstr "Хангыль Ямо, расширение B" -#: ../src/ui/dialog/inkscape-preferences.cpp:1121 -msgid "Open Clip Art Library _Password:" -msgstr "П_ароль на Open Clip Art Library:" +#: ../src/ui/dialog/glyphs.cpp:288 +msgid "High Surrogates" +msgstr "Верхняя часть суррогатных пар " -#: ../src/ui/dialog/inkscape-preferences.cpp:1122 -msgid "The password used to log into Open Clip Art Library" -msgstr "Пароль для авторизации на Open Clip Art Library" +#: ../src/ui/dialog/glyphs.cpp:289 +msgid "High Private Use Surrogates" +msgstr "Верхняя часть суррогатных пар для частного использования" -#: ../src/ui/dialog/inkscape-preferences.cpp:1123 -msgid "Open Clip Art" -msgstr "Open Clip Art" +#: ../src/ui/dialog/glyphs.cpp:290 +msgid "Low Surrogates" +msgstr "Нижняя часть суррогатных пар" -#: ../src/ui/dialog/inkscape-preferences.cpp:1128 -#, fuzzy -msgid "Behavior" -msgstr "Поведение" +#: ../src/ui/dialog/glyphs.cpp:291 +msgid "Private Use Area" +msgstr "Область для частного использования" -#: ../src/ui/dialog/inkscape-preferences.cpp:1132 -#, fuzzy -msgid "_Simplification threshold:" -msgstr "Порог упрощения:" +#: ../src/ui/dialog/glyphs.cpp:292 +msgid "CJK Compatibility Ideographs" +msgstr "Совместимые иероглифы CJK" -#: ../src/ui/dialog/inkscape-preferences.cpp:1133 -msgid "" -"How strong is the Node tool's Simplify command by default. If you invoke " -"this command several times in quick succession, it will act more and more " -"aggressively; invoking it again after a pause restores the default threshold." -msgstr "" -"Степень упрощения по команде «Упростить». Если вызывать эту команду " -"несколько раз подряд, она будет действовать с каждым разом все более " -"агрессивно; чтобы вернуться к значению по умолчанию, сделайте паузу перед " -"очередным вызовом команды." +#: ../src/ui/dialog/glyphs.cpp:293 +msgid "Alphabetic Presentation Forms" +msgstr "Алфавитные формы представления" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 -msgid "Color stock markers the same color as object" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:294 +msgid "Arabic Presentation Forms-A" +msgstr "Арабские формы представления A" -#: ../src/ui/dialog/inkscape-preferences.cpp:1136 -msgid "Color custom markers the same color as object" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:295 +msgid "Variation Selectors" +msgstr "Селекторы вариантов начертания" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 -#: ../src/ui/dialog/inkscape-preferences.cpp:1347 -msgid "Update marker color when object color changes" -msgstr "" +#: ../src/ui/dialog/glyphs.cpp:296 +msgid "Vertical Forms" +msgstr "Вертикальные формы" -#. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1140 -msgid "Select in all layers" -msgstr "Работают во всех слоях" +#: ../src/ui/dialog/glyphs.cpp:297 +msgid "Combining Half Marks" +msgstr "Комбинируемые половины символов" -#: ../src/ui/dialog/inkscape-preferences.cpp:1141 -msgid "Select only within current layer" -msgstr "Работают только в текущем слое" +#: ../src/ui/dialog/glyphs.cpp:298 +msgid "CJK Compatibility Forms" +msgstr "CJK, формы для совместимости" -#: ../src/ui/dialog/inkscape-preferences.cpp:1142 -msgid "Select in current layer and sublayers" -msgstr "Работают только в текущем слое и субслоях" +#: ../src/ui/dialog/glyphs.cpp:299 +msgid "Small Form Variants" +msgstr "Малые варианты форм" -#: ../src/ui/dialog/inkscape-preferences.cpp:1143 -msgid "Ignore hidden objects and layers" -msgstr "Игнорируют скрытые объекты и слои" +#: ../src/ui/dialog/glyphs.cpp:300 +msgid "Arabic Presentation Forms-B" +msgstr "Арабские формы представления B" -#: ../src/ui/dialog/inkscape-preferences.cpp:1144 -msgid "Ignore locked objects and layers" -msgstr "Игнорируют заблокированные объекты и слои" +#: ../src/ui/dialog/glyphs.cpp:301 +msgid "Halfwidth and Fullwidth Forms" +msgstr "Формы в половинную и полную ширину" -#: ../src/ui/dialog/inkscape-preferences.cpp:1145 -msgid "Deselect upon layer change" -msgstr "Снять выделение при изменениях в слое" +#: ../src/ui/dialog/glyphs.cpp:302 +#, fuzzy +msgid "Specials" +msgstr "Спирали" -#: ../src/ui/dialog/inkscape-preferences.cpp:1148 -msgid "" -"Uncheck this to be able to keep the current objects selected when the " -"current layer changes" -msgstr "" -"Отключите эту опцию, если хотите оставлять объекты выбранными при изменениях " -"в текущем слое." +#: ../src/ui/dialog/glyphs.cpp:377 +msgid "Script: " +msgstr "Письменность:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1150 -msgid "Ctrl+A, Tab, Shift+Tab" -msgstr "Ctrl+A, Tab, Shift+Tab" +#: ../src/ui/dialog/glyphs.cpp:414 +msgid "Range: " +msgstr "Диапазон: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1152 -msgid "Make keyboard selection commands work on objects in all layers" -msgstr "Команды выделения с клавиатуры работают во всех слоях." +#: ../src/ui/dialog/glyphs.cpp:497 +msgid "Append" +msgstr "Вставить" -#: ../src/ui/dialog/inkscape-preferences.cpp:1154 -msgid "Make keyboard selection commands work on objects in current layer only" -msgstr "Команды выделения с клавиатуры работают только в текущем слое." +#: ../src/ui/dialog/glyphs.cpp:618 +msgid "Append text" +msgstr "Вставить текст" -#: ../src/ui/dialog/inkscape-preferences.cpp:1156 -msgid "" -"Make keyboard selection commands work on objects in current layer and all " -"its sublayers" -msgstr "" -"Команды выделения с клавиатуры работают в текущем слое и всех его субслоях." +#: ../src/ui/dialog/grid-arrange-tab.cpp:351 +msgid "Arrange in a grid" +msgstr "Расстановка по сетке" -#: ../src/ui/dialog/inkscape-preferences.cpp:1158 -msgid "" -"Uncheck this to be able to select objects that are hidden (either by " -"themselves or by being in a hidden layer)" -msgstr "" -"Отключите этот параметр, если хотите выделять скрытые объекты или объекты на " -"скрытом слое" +#: ../src/ui/dialog/grid-arrange-tab.cpp:589 +#: ../src/ui/dialog/object-attributes.cpp:66 +#: ../src/ui/dialog/object-attributes.cpp:75 +#: ../src/widgets/desktop-widget.cpp:666 ../src/widgets/node-toolbar.cpp:581 +msgid "X:" +msgstr "X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1160 -msgid "" -"Uncheck this to be able to select objects that are locked (either by " -"themselves or by being in a locked layer)" -msgstr "" -"Отключите эту опцию, если хотите выделять заблокированные объекты или " -"объекты на заблокированном слое" +#: ../src/ui/dialog/grid-arrange-tab.cpp:589 +msgid "Horizontal spacing between columns." +msgstr "Горизонтальный интервал между столбцами" -#: ../src/ui/dialog/inkscape-preferences.cpp:1162 -msgid "Wrap when cycling objects in z-order" -msgstr "" +#: ../src/ui/dialog/grid-arrange-tab.cpp:590 +#: ../src/ui/dialog/object-attributes.cpp:67 +#: ../src/ui/dialog/object-attributes.cpp:76 +#: ../src/widgets/desktop-widget.cpp:676 ../src/widgets/node-toolbar.cpp:599 +msgid "Y:" +msgstr "Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1164 -msgid "Alt+Scroll Wheel" -msgstr "" +#: ../src/ui/dialog/grid-arrange-tab.cpp:590 +msgid "Vertical spacing between rows." +msgstr "Вертикальный интервал между строками" -#: ../src/ui/dialog/inkscape-preferences.cpp:1166 -msgid "Wrap around at start and end when cycling objects in z-order" -msgstr "" +#: ../src/ui/dialog/grid-arrange-tab.cpp:637 +msgid "_Rows:" +msgstr "_Строки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1168 -msgid "Selecting" -msgstr "Выделение" +#: ../src/ui/dialog/grid-arrange-tab.cpp:646 +msgid "Number of rows" +msgstr "Количество строк" -#. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1171 -#: ../src/widgets/select-toolbar.cpp:570 -msgid "Scale stroke width" -msgstr "Менять толщину обводки" +#: ../src/ui/dialog/grid-arrange-tab.cpp:650 +msgid "Equal _height" +msgstr "Равная _высота" -#: ../src/ui/dialog/inkscape-preferences.cpp:1172 -msgid "Scale rounded corners in rectangles" -msgstr "Менять радиус закругленных углов" +#: ../src/ui/dialog/grid-arrange-tab.cpp:661 +msgid "If not set, each row has the height of the tallest object in it" +msgstr "" +"Без этой опции каждая строка принимает высоту самого высокого в ней объекта" -#: ../src/ui/dialog/inkscape-preferences.cpp:1173 -msgid "Transform gradients" -msgstr "Трансформировать градиенты" +#. #### Number of columns #### +#: ../src/ui/dialog/grid-arrange-tab.cpp:677 +msgid "_Columns:" +msgstr "С_толбцы:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1174 -msgid "Transform patterns" -msgstr "Трансформировать текстуры" +#: ../src/ui/dialog/grid-arrange-tab.cpp:686 +msgid "Number of columns" +msgstr "Сколько столбцов в таблице" -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 -msgid "Preserved" -msgstr "Без оптимизации" +#: ../src/ui/dialog/grid-arrange-tab.cpp:690 +msgid "Equal _width" +msgstr "Равная _ширина" -#: ../src/ui/dialog/inkscape-preferences.cpp:1179 -#: ../src/widgets/select-toolbar.cpp:571 -msgid "When scaling objects, scale the stroke width by the same proportion" +#: ../src/ui/dialog/grid-arrange-tab.cpp:700 +msgid "If not set, each column has the width of the widest object in it" msgstr "" -"При изменении размера объектов менять в той же пропорции и толщину обводки" +"Если выключено, каждый столбец принимает ширину самого широкого в нем объекта" -#: ../src/ui/dialog/inkscape-preferences.cpp:1181 -#: ../src/widgets/select-toolbar.cpp:582 -msgid "When scaling rectangles, scale the radii of rounded corners" -msgstr "" -"При изменении размера прямоугольников менять в той же пропорции и радиус " -"закруглённых углов" +#. Anchor selection widget +#: ../src/ui/dialog/grid-arrange-tab.cpp:711 +msgid "Alignment:" +msgstr "Выравнивание:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1183 -#: ../src/widgets/select-toolbar.cpp:593 -msgid "Move gradients (in fill or stroke) along with the objects" -msgstr "Трансформировать градиенты (в заливке или обводке) вместе с объектом" +#. #### Radio buttons to control spacing manually or to fit selection bbox #### +#: ../src/ui/dialog/grid-arrange-tab.cpp:720 +msgid "_Fit into selection box" +msgstr "В_писать в площадку выделения" -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 -#: ../src/widgets/select-toolbar.cpp:604 -msgid "Move patterns (in fill or stroke) along with the objects" -msgstr "Трансформировать текстуры (в заливке или обводке) вместе с объектом" +#: ../src/ui/dialog/grid-arrange-tab.cpp:727 +msgid "_Set spacing:" +msgstr "Установить _интервал:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1186 -msgid "Store transformation" -msgstr "Сохранение трансформации" +#: ../src/ui/dialog/guides.cpp:47 +msgid "Rela_tive change" +msgstr "Относительное _смещение" -#: ../src/ui/dialog/inkscape-preferences.cpp:1188 -msgid "" -"If possible, apply transformation to objects without adding a transform= " -"attribute" -msgstr "" -"По возможности применять трансформацию к объектам без добавления атрибута " -"transform=" +#: ../src/ui/dialog/guides.cpp:47 +msgid "Move and/or rotate the guide relative to current settings" +msgstr "Сместить и/или повернуть направляющую относительно текущих параметров" -#: ../src/ui/dialog/inkscape-preferences.cpp:1190 -msgid "Always store transformation as a transform= attribute on objects" -msgstr "Всегда сохранять трансформацию в виде атрибута transform=" +#: ../src/ui/dialog/guides.cpp:48 +msgctxt "Guides" +msgid "_X:" +msgstr "_X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1192 -msgid "Transforms" -msgstr "Трансформации" +#: ../src/ui/dialog/guides.cpp:49 +msgctxt "Guides" +msgid "_Y:" +msgstr "_Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1196 -msgid "Mouse _wheel scrolls by:" -msgstr "_Колёсико мыши прокручивает на:" +#: ../src/ui/dialog/guides.cpp:50 ../src/ui/dialog/object-properties.cpp:59 +msgid "_Label:" +msgstr "_Метка:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 -msgid "" -"One mouse wheel notch scrolls by this distance in screen pixels " -"(horizontally with Shift)" -msgstr "" -"На это расстояние в пикселах изображение сдвигается одним щелчком\n" -"колесика мыши (с нажатой клавишей Shift - по горизонтали)" +#: ../src/ui/dialog/guides.cpp:50 +msgid "Optionally give this guideline a name" +msgstr "Необязательное название направляющей" -#: ../src/ui/dialog/inkscape-preferences.cpp:1198 -msgid "Ctrl+arrows" -msgstr "Ctrl+стрелки" +#: ../src/ui/dialog/guides.cpp:51 +msgid "_Angle:" +msgstr "_Угол:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1200 -msgid "Sc_roll by:" -msgstr "_Шаг прокрутки:" +#: ../src/ui/dialog/guides.cpp:130 +msgid "Set guide properties" +msgstr "Смена свойств направляющей" -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 -msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" -msgstr "" -"На это расстояние в пикселах изображение сдвигается при нажатии Ctrl+стрелки" +#: ../src/ui/dialog/guides.cpp:160 +msgid "Guideline" +msgstr "Направляющая" -#: ../src/ui/dialog/inkscape-preferences.cpp:1203 -msgid "_Acceleration:" -msgstr "_Ускорение:" +#: ../src/ui/dialog/guides.cpp:310 +#, c-format +msgid "Guideline ID: %s" +msgstr "ID направляющей: %s" -#: ../src/ui/dialog/inkscape-preferences.cpp:1204 -msgid "" -"Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " -"acceleration)" -msgstr "" -"Если удерживать нажатыми Ctrl+стрелку, скорость прокрутки будет возрастать " -"(0 отменяет ускорение)" +#: ../src/ui/dialog/guides.cpp:316 +#, c-format +msgid "Current: %s" +msgstr "Сейчас: %s" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 -msgid "Autoscrolling" -msgstr "Автопрокрутка" +#: ../src/ui/dialog/icon-preview.cpp:159 +#, c-format +msgid "%d x %d" +msgstr "%d x %d" -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 -msgid "_Speed:" -msgstr "_Скорость:" +#: ../src/ui/dialog/icon-preview.cpp:171 +msgid "Magnified:" +msgstr "Увеличение:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1208 -msgid "" -"How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " -"autoscroll off)" -msgstr "" -"С какой скоростью будет происходить прокрутка при перетаскивании объекта за " -"пределы окна (0 отменяет автопрокрутку)" +#: ../src/ui/dialog/icon-preview.cpp:240 +msgid "Actual Size:" +msgstr "Обычный размер:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1210 -#: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 -msgid "_Threshold:" -msgstr "Поро_г:" +#: ../src/ui/dialog/icon-preview.cpp:245 +#, fuzzy +msgctxt "Icon preview window" +msgid "Sele_ction" +msgstr "Выделение" -#: ../src/ui/dialog/inkscape-preferences.cpp:1211 -msgid "" -"How far (in screen pixels) you need to be from the canvas edge to trigger " -"autoscroll; positive is outside the canvas, negative is within the canvas" -msgstr "" -"Насколько далеко (в пикселах) нужно отстоять от края окна, чтобы\n" -"включилась автопрокрутка; положительные значения - за пределами окна,\n" -"отрицательные - внутри окна" +#: ../src/ui/dialog/icon-preview.cpp:247 +msgid "Selection only or whole document" +msgstr "Либо только выделение, либо весь документ" -#. -#. _scroll_space.init ( _("Left mouse button pans when Space is pressed"), "/options/spacepans/value", false); -#. _page_scrolling.add_line( false, "", _scroll_space, "", -#. _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily switches to Selector tool (default)")); -#. -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 -msgid "Mouse wheel zooms by default" -msgstr "По умолчанию колесо мыши масштабирует вид" +#: ../src/ui/dialog/inkscape-preferences.cpp:183 +msgid "Show selection cue" +msgstr "Показывать пометку выделения" -#: ../src/ui/dialog/inkscape-preferences.cpp:1219 +#: ../src/ui/dialog/inkscape-preferences.cpp:184 msgid "" -"When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " -"off, it zooms with Ctrl and scrolls without Ctrl" -msgstr "" -"Если включено, прокрутка колеса мыши без Ctrl масштабирует вид документа, а " -"с Ctrl — прокручивает холст; если выключено, с Ctrl масштабируется вид " -"документа, а без - прокручивается холст." - -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 -msgid "Scrolling" -msgstr "Прокрутка" +"Whether selected objects display a selection cue (the same as in selector)" +msgstr "Будет ли отображаться пометка выделения (как и в Выделителе)" -#. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1223 -msgid "Enable snap indicator" -msgstr "Включить индикатор прилипания" +#: ../src/ui/dialog/inkscape-preferences.cpp:190 +msgid "Enable gradient editing" +msgstr "Включить правку градиентов" -#: ../src/ui/dialog/inkscape-preferences.cpp:1225 -msgid "After snapping, a symbol is drawn at the point that has snapped" -msgstr "В предполагаемой точке прилипания рисуется символ" +#: ../src/ui/dialog/inkscape-preferences.cpp:191 +msgid "Whether selected objects display gradient editing controls" +msgstr "Будут ли отображаться средства правки градиентов" -#: ../src/ui/dialog/inkscape-preferences.cpp:1228 -msgid "_Delay (in ms):" -msgstr "За_держка (мс):" +#: ../src/ui/dialog/inkscape-preferences.cpp:196 +msgid "Conversion to guides uses edges instead of bounding box" +msgstr "" +"При преобразовании в направляющие вместо\n" +"площадки (BB) используются края" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:197 msgid "" -"Postpone snapping as long as the mouse is moving, and then wait an " -"additional fraction of a second. This additional delay is specified here. " -"When set to zero or to a very small number, snapping will be immediate." +"Converting an object to guides places these along the object's true edges " +"(imitating the object's shape), not along the bounding box" msgstr "" -"Не прилипать, пока курсор мыши движется, а затем подождать указанное здесь " -"время. Если значение очень мало или равно нулю, прилипание будет выполняться " -"немедленно." +"При преобразовании объекта в направляющие эти направляющие будут размещены " +"по настоящим краям объекта, а не по его площадке (BB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1231 -msgid "Only snap the node closest to the pointer" -msgstr "Прилипает только ближайший к указателю узел" +#: ../src/ui/dialog/inkscape-preferences.cpp:204 +msgid "Ctrl+click _dot size:" +msgstr "Размер точки по Ctrl+щелчок в" -#: ../src/ui/dialog/inkscape-preferences.cpp:1233 -msgid "" -"Only try to snap the node that is initially closest to the mouse pointer" +#: ../src/ui/dialog/inkscape-preferences.cpp:204 +msgid "times current stroke width" +msgstr "раза больше текущей обводки" + +#: ../src/ui/dialog/inkscape-preferences.cpp:205 +msgid "Size of dots created with Ctrl+click (relative to current stroke width)" msgstr "" -"Прилипать только к тому узлу, который изначально расположен ближе остальных " -"к указателю мыши" +"Размер точек, создаваемых по Ctrl+щелчок (относительно текущей толщины " +"штриха)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1236 -msgid "_Weight factor:" -msgstr "Коэффициент _взвешивания:" +#: ../src/ui/dialog/inkscape-preferences.cpp:220 +msgid "<b>No objects selected</b> to take the style from." +msgstr "<b>Нет выделенных объектов</b>, откуда можно было бы взять стиль." -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 +#: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "" -"When multiple snap solutions are found, then Inkscape can either prefer the " -"closest transformation (when set to 0), or prefer the node that was " -"initially the closest to the pointer (when set to 1)" +"<b>More than one object selected.</b> Cannot take style from multiple " +"objects." msgstr "" -"Когда найдено несколько вариантов прилипания, Inkscape может предпочесть " -"либо ближайшую трансформацию (0), либо узел, изначально более близкий к " -"курсору мыши (1)." +"<b>Выделено больше одного объекта.</b> Невозможно взять стиль от нескольких " +"объектов сразу." -#: ../src/ui/dialog/inkscape-preferences.cpp:1239 -msgid "Snap the mouse pointer when dragging a constrained knot" -msgstr "Указатель мыши прилипает при перетаскивании узла с ограничением" +#: ../src/ui/dialog/inkscape-preferences.cpp:262 +msgid "Style of new objects" +msgstr "Стиль новых объектов" -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 -msgid "" -"When dragging a knot along a constraint line, then snap the position of the " -"mouse pointer instead of snapping the projection of the knot onto the " -"constraint line" -msgstr "" -"При перемещении узла вдоль ограничительной линии прилипает указатель мыши, а " -"не проекция узла на ограничительную линию" +#: ../src/ui/dialog/inkscape-preferences.cpp:264 +msgid "Last used style" +msgstr "Последним использованным стилем" -#: ../src/ui/dialog/inkscape-preferences.cpp:1243 -msgid "Snapping" -msgstr "Прилипание" +#: ../src/ui/dialog/inkscape-preferences.cpp:266 +msgid "Apply the style you last set on an object" +msgstr "Применить последний использованный стиль" -#. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1248 -msgid "_Arrow keys move by:" -msgstr "_Стрелки двигают на:" +#: ../src/ui/dialog/inkscape-preferences.cpp:271 +msgid "This tool's own style:" +msgstr "Собственным стилем инструмента:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 -#, fuzzy +#: ../src/ui/dialog/inkscape-preferences.cpp:275 msgid "" -"Pressing an arrow key moves selected object(s) or node(s) by this distance" +"Each tool may store its own style to apply to the newly created objects. Use " +"the button below to set it." msgstr "" -"На это расстояние (в SVG пикселах) выделенный объект или узел перемещается " -"по нажатию клавиши со стрелкой" +"Каждый инструмент может использовать свой собственный стиль для создаваемых " +"объектов. Кнопка внизу устанавливает этот стиль." -#. defaultscale is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1252 -#, fuzzy -msgid "> and < _scale by:" -msgstr "Шаг масштабирования по > и <:" +#. style swatch +#: ../src/ui/dialog/inkscape-preferences.cpp:279 +msgid "Take from selection" +msgstr "Взять от выделения" -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 -#, fuzzy -msgid "Pressing > or < scales selection up or down by this increment" +#: ../src/ui/dialog/inkscape-preferences.cpp:284 +msgid "This tool's style of new objects" +msgstr "Стиль новых объектов, создаваемых этим инструментом" + +#: ../src/ui/dialog/inkscape-preferences.cpp:291 +msgid "Remember the style of the (first) selected object as this tool's style" msgstr "" -"На эту величину (в SVG пикселах) изменяется размер выделения по нажатию " -"клавиш > и <" +"Запомнить стиль (первого) выделенного объекта как стиль данного инструмента" -#: ../src/ui/dialog/inkscape-preferences.cpp:1255 -#, fuzzy -msgid "_Inset/Outset by:" -msgstr "Втяжка или растяжка на:" +#: ../src/ui/dialog/inkscape-preferences.cpp:296 +msgid "Tools" +msgstr "Инструменты" -#: ../src/ui/dialog/inkscape-preferences.cpp:1256 +#: ../src/ui/dialog/inkscape-preferences.cpp:299 #, fuzzy -msgid "Inset and Outset commands displace the path by this distance" -msgstr "" -"На это расстояние (в SVG пикселах) команды втяжки и растяжки смещают контур" +msgid "Bounding box to use" +msgstr "Используемая площадка (BB):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1257 -msgid "Compass-like display of angles" -msgstr "Компасообразное отображение углов" +#: ../src/ui/dialog/inkscape-preferences.cpp:300 +msgid "Visual bounding box" +msgstr "Видимая площадка (BB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1259 -msgid "" -"When on, angles are displayed with 0 at north, 0 to 360 range, positive " -"clockwise; otherwise with 0 at east, -180 to 180 range, positive " -"counterclockwise" -msgstr "" -"Если включено, угол со значением 0° показывает на север с диапазоном от 0° " -"до 360°, причем значение увеличивается по часовой стрелке. В противном " -"случае 0° показывает на восток, диапазон значений находится между -180° и " -"180°, приращение угла происходит против часовой стрелки." +#: ../src/ui/dialog/inkscape-preferences.cpp:302 +msgid "This bounding box includes stroke width, markers, filter margins, etc." +msgstr "Сюда входит толщина обводки, маркеры, поля фильтра и т.д." + +#: ../src/ui/dialog/inkscape-preferences.cpp:303 +msgid "Geometric bounding box" +msgstr "Геометрическая площадка (BB)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:305 +msgid "This bounding box includes only the bare path" +msgstr "Сюда входит только сам контур" -#: ../src/ui/dialog/inkscape-preferences.cpp:1265 +#: ../src/ui/dialog/inkscape-preferences.cpp:307 #, fuzzy -msgid "_Rotation snaps every:" -msgstr "Ограничение вращения:" +msgid "Conversion to guides" +msgstr "Преобразование в направляющие:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1265 -msgid "degrees" -msgstr "градусов" +#: ../src/ui/dialog/inkscape-preferences.cpp:308 +msgid "Keep objects after conversion to guides" +msgstr "Сохранять объекты после преобразования" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:310 msgid "" -"Rotating with Ctrl pressed snaps every that much degrees; also, pressing " -"[ or ] rotates by this amount" -msgstr "" -"Вращение с нажатым Ctrl ограничивает угол значениями, кратными выбранному; " -"нажатие [ или ] поворачивает на выбранный угол" +"When converting an object to guides, don't delete the object after the " +"conversion" +msgstr "После преобразования в направляющие не удалять исходный объект." -#: ../src/ui/dialog/inkscape-preferences.cpp:1267 -msgid "Relative snapping of guideline angles" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:311 +msgid "Treat groups as a single object" +msgstr "Считать группы единым объектом" -#: ../src/ui/dialog/inkscape-preferences.cpp:1269 +#: ../src/ui/dialog/inkscape-preferences.cpp:313 msgid "" -"When on, the snap angles when rotating a guideline will be relative to the " -"original angle" +"Treat groups as a single object during conversion to guides rather than " +"converting each child separately" msgstr "" +"Считать группы одним объектом при преобразовании в направляющие, не " +"преобразовывать каждый элемент группы отдельно" -#: ../src/ui/dialog/inkscape-preferences.cpp:1271 -#, fuzzy -msgid "_Zoom in/out by:" -msgstr "Шаг масштаба:" +#: ../src/ui/dialog/inkscape-preferences.cpp:315 +msgid "Average all sketches" +msgstr "Усреднять все штрихи" -#: ../src/ui/dialog/inkscape-preferences.cpp:1271 -msgid "%" -msgstr "%" +#: ../src/ui/dialog/inkscape-preferences.cpp:316 +msgid "Width is in absolute units" +msgstr "Ширина в абсолютных единицах измерения" -#: ../src/ui/dialog/inkscape-preferences.cpp:1272 -msgid "" -"Zoom tool click, +/- keys, and middle click zoom in and out by this " -"multiplier" -msgstr "" -"Шаг для щелчка инструментом масштаба,\n" -"нажатия клавиш +/- и щелчка средней клавишей мыши" +#: ../src/ui/dialog/inkscape-preferences.cpp:317 +msgid "Select new path" +msgstr "Выделять новый контур" -#: ../src/ui/dialog/inkscape-preferences.cpp:1273 -msgid "Steps" -msgstr "Шаги" +#: ../src/ui/dialog/inkscape-preferences.cpp:318 +msgid "Don't attach connectors to text objects" +msgstr "Не соединяться линиями с текстовыми объектами" -#. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1276 -msgid "Move in parallel" -msgstr "Двигаются параллельно" +#. Selector +#: ../src/ui/dialog/inkscape-preferences.cpp:321 +msgid "Selector" +msgstr "Выделитель" -#: ../src/ui/dialog/inkscape-preferences.cpp:1278 -msgid "Stay unmoved" -msgstr "Остаются неподвижными" +#: ../src/ui/dialog/inkscape-preferences.cpp:326 +msgid "When transforming, show" +msgstr "При трансформации показывать" -#: ../src/ui/dialog/inkscape-preferences.cpp:1280 -msgid "Move according to transform" -msgstr "Двигаются в соответствии с transform=" +#: ../src/ui/dialog/inkscape-preferences.cpp:327 +msgid "Objects" +msgstr "Объекты" -#: ../src/ui/dialog/inkscape-preferences.cpp:1282 -msgid "Are unlinked" -msgstr "Отсоединяются" +#: ../src/ui/dialog/inkscape-preferences.cpp:329 +msgid "Show the actual objects when moving or transforming" +msgstr "Показывать объекты полностью при перемещении или трансформации" -#: ../src/ui/dialog/inkscape-preferences.cpp:1284 -msgid "Are deleted" -msgstr "Удаляются" +#: ../src/ui/dialog/inkscape-preferences.cpp:330 +msgid "Box outline" +msgstr "Рамку" + +#: ../src/ui/dialog/inkscape-preferences.cpp:332 +msgid "Show only a box outline of the objects when moving or transforming" +msgstr "" +"Показывать только прямоугольную рамку объектов при перемещении или " +"трансформации" -#: ../src/ui/dialog/inkscape-preferences.cpp:1287 +#: ../src/ui/dialog/inkscape-preferences.cpp:333 +msgid "Per-object selection cue" +msgstr "Пометка выделенных объектов" + +#: ../src/ui/dialog/inkscape-preferences.cpp:334 #, fuzzy -msgid "Moving original: clones and linked offsets" -msgstr "Когда перемещается оригинал, его клоны и потомки:" +msgctxt "Selection cue" +msgid "None" +msgstr "Нет" -#: ../src/ui/dialog/inkscape-preferences.cpp:1289 -msgid "Clones are translated by the same vector as their original" -msgstr "Каждый клон сдвигается по тому же вектору, что и его оригинал." +#: ../src/ui/dialog/inkscape-preferences.cpp:336 +msgid "No per-object selection indication" +msgstr "Выделенные объекты никак не помечены" -#: ../src/ui/dialog/inkscape-preferences.cpp:1291 -msgid "Clones preserve their positions when their original is moved" -msgstr "Клоны остаются на месте, когда перемещаются их оригиналы." +#: ../src/ui/dialog/inkscape-preferences.cpp:337 +msgid "Mark" +msgstr "Метка" -#: ../src/ui/dialog/inkscape-preferences.cpp:1293 -msgid "" -"Each clone moves according to the value of its transform= attribute; for " -"example, a rotated clone will move in a different direction than its original" +#: ../src/ui/dialog/inkscape-preferences.cpp:339 +msgid "Each selected object has a diamond mark in the top left corner" msgstr "" -"Каждый клон двигается в соответствии со значением его атрибута transform=. " -"Например, повёрнутый клон будет перемещаться в ином направлении, нежели его " -"оригинал." +"Каждый выделенный объект имеет метку в виде ромбика в левом верхнем углу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 -#, fuzzy -msgid "Deleting original: clones" -msgstr "При дублировании оригиналов с клонами:" +#: ../src/ui/dialog/inkscape-preferences.cpp:340 +msgid "Box" +msgstr "Рамка" -#: ../src/ui/dialog/inkscape-preferences.cpp:1296 -msgid "Orphaned clones are converted to regular objects" -msgstr "Осиротевшие клоны преобразуются в обычные объекты" +#: ../src/ui/dialog/inkscape-preferences.cpp:342 +msgid "Each selected object displays its bounding box" +msgstr "Каждый выделенный объект помечен пунктирной рамкой" -#: ../src/ui/dialog/inkscape-preferences.cpp:1298 -msgid "Orphaned clones are deleted along with their original" -msgstr "Осиротевшие клоны удаляются вместе с их оригиналом" +#. Node +#: ../src/ui/dialog/inkscape-preferences.cpp:345 +msgid "Node" +msgstr "Узлы" -#: ../src/ui/dialog/inkscape-preferences.cpp:1300 -#, fuzzy -msgid "Duplicating original+clones/linked offset" -msgstr "При дублировании оригиналов с клонами:" +#: ../src/ui/dialog/inkscape-preferences.cpp:348 +msgid "Path outline" +msgstr "Абрис контура" -#: ../src/ui/dialog/inkscape-preferences.cpp:1302 -msgid "Relink duplicated clones" -msgstr "Повторно связывать продублированные клоны" +#: ../src/ui/dialog/inkscape-preferences.cpp:349 +msgid "Path outline color" +msgstr "Цвет обводки контура" -#: ../src/ui/dialog/inkscape-preferences.cpp:1304 -msgid "" -"When duplicating a selection containing both a clone and its original " -"(possibly in groups), relink the duplicated clone to the duplicated original " -"instead of the old original" -msgstr "" -"При дублировании выделения, содержащего как клон, так и оригинал (например, " -"в группе), повторно связывать продублированный клон с продублированным " -"оригиналом вместо первого оригинала." +#: ../src/ui/dialog/inkscape-preferences.cpp:350 +msgid "Selects the color used for showing the path outline" +msgstr "Выбрать цвет, используемый для отображения абриса контура." -#. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1307 -msgid "Clones" -msgstr "Клоны" +#: ../src/ui/dialog/inkscape-preferences.cpp:351 +msgid "Always show outline" +msgstr "Всегда показывать абрис" -#. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1310 -msgid "When applying, use the topmost selected object as clippath/mask" -msgstr "Верхний выбранный объект — обтравочный контур или маска" +#: ../src/ui/dialog/inkscape-preferences.cpp:352 +msgid "Show outlines for all paths, not only invisible paths" +msgstr "Показывать абрисы для всех контуров, не только невидимых" -#: ../src/ui/dialog/inkscape-preferences.cpp:1312 +#: ../src/ui/dialog/inkscape-preferences.cpp:353 +msgid "Update outline when dragging nodes" +msgstr "Обновлять абрис при перемещении узлов" + +#: ../src/ui/dialog/inkscape-preferences.cpp:354 msgid "" -"Uncheck this to use the bottom selected object as the clipping path or mask" +"Update the outline when dragging or transforming nodes; if this is off, the " +"outline will only update when completing a drag" msgstr "" -"Отключите эту опцию, если хотите использовать в качестве обтравочного " -"контура или маски самый нижний из выбранных объектов" +"Обновлять абрис при перетаскивании или трансформации узлов. Если выключено, " +"абрисы обновятся лишь по завершении действия." -#: ../src/ui/dialog/inkscape-preferences.cpp:1313 -msgid "Remove clippath/mask object after applying" -msgstr "Убрать обтравочный контур или маску после применения" +#: ../src/ui/dialog/inkscape-preferences.cpp:355 +msgid "Update paths when dragging nodes" +msgstr "Обновлять контуры при перемещении узлов" -#: ../src/ui/dialog/inkscape-preferences.cpp:1315 +#: ../src/ui/dialog/inkscape-preferences.cpp:356 msgid "" -"After applying, remove the object used as the clipping path or mask from the " -"drawing" +"Update paths when dragging or transforming nodes; if this is off, paths will " +"only be updated when completing a drag" msgstr "" -"По применении удалить из рисунка объект, использованный в качестве " -"обтравочного контура или маски" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1317 -#, fuzzy -msgid "Before applying" -msgstr "Перед применением обтравочного контура или маски:" +"Обновлять контуры при перетаскивании или трансформации узлов. Если " +"выключено, контуры обновятся лишь по завершении действия." -#: ../src/ui/dialog/inkscape-preferences.cpp:1319 -msgid "Do not group clipped/masked objects" -msgstr "Не группировать обтравленные или замаскированные объекты" +#: ../src/ui/dialog/inkscape-preferences.cpp:357 +msgid "Show path direction on outlines" +msgstr "Показывать направление контура на абрисе" -#: ../src/ui/dialog/inkscape-preferences.cpp:1320 -#, fuzzy -msgid "Put every clipped/masked object in its own group" +#: ../src/ui/dialog/inkscape-preferences.cpp:358 +msgid "" +"Visualize the direction of selected paths by drawing small arrows in the " +"middle of each outline segment" msgstr "" -"Включать каждый обтравленный или замаскированный объект в собственную группу" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1321 -msgid "Put all clipped/masked objects into one group" -msgstr "Помещать все обтравленные или замаскированные объекты в одну группу" +"Показывать направление выделенных контуров при помощи небольших стрелок " +"посередине каждого сегмента" -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 -msgid "Apply clippath/mask to every object" -msgstr "Применить обтравочный контур или маску к каждому объекту" +#: ../src/ui/dialog/inkscape-preferences.cpp:359 +msgid "Show temporary path outline" +msgstr "На время показывать абрис" -#: ../src/ui/dialog/inkscape-preferences.cpp:1327 -msgid "Apply clippath/mask to groups containing single object" +#: ../src/ui/dialog/inkscape-preferences.cpp:360 +msgid "When hovering over a path, briefly flash its outline" msgstr "" -"Применить обтравочный контур или маску к группам, содержащим единичные " -"объекты" +"Мерцать скелетом контура, когда курсор мыши или иного устройства ввода " +"проходит над ним." -#: ../src/ui/dialog/inkscape-preferences.cpp:1330 -msgid "Apply clippath/mask to group containing all objects" +#: ../src/ui/dialog/inkscape-preferences.cpp:361 +msgid "Show temporary outline for selected paths" +msgstr "На время показывать абрис выделенных контуров" + +#: ../src/ui/dialog/inkscape-preferences.cpp:362 +msgid "Show temporary outline even when a path is selected for editing" msgstr "" -"Применить обтравочный контур или маску к группе, содержащей все объекты" +"На время показывать абрис контура, даже если этот контур выделен для " +"изменения" -#: ../src/ui/dialog/inkscape-preferences.cpp:1332 +#: ../src/ui/dialog/inkscape-preferences.cpp:364 #, fuzzy -msgid "After releasing" -msgstr "После снятия обтравочного контура или маски:" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1334 -msgid "Ungroup automatically created groups" -msgstr "Разгруппировать автоматически созданные группы" +msgid "_Flash time:" +msgstr "Длительность мерцания:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1336 -msgid "Ungroup groups created when setting clip/mask" +#: ../src/ui/dialog/inkscape-preferences.cpp:364 +msgid "" +"Specifies how long the path outline will be visible after a mouse-over (in " +"milliseconds); specify 0 to have the outline shown until mouse leaves the " +"path" msgstr "" -"Разгруппировать группы, созданные при наложении обтравочного контура или " -"маски" +"Как долго (мс) должен подсвечиваться контур при прохождении курсора " +"инструмента над ним. Ноль означает постоянную подсветку." -#: ../src/ui/dialog/inkscape-preferences.cpp:1338 -msgid "Clippaths and masks" -msgstr "Обтравочные контуры и маски" +#: ../src/ui/dialog/inkscape-preferences.cpp:365 +msgid "Editing preferences" +msgstr "Параметры редактирования" -#: ../src/ui/dialog/inkscape-preferences.cpp:1341 -#, fuzzy -msgid "Stroke Style Markers" -msgstr "_Стиль обводки" +#: ../src/ui/dialog/inkscape-preferences.cpp:366 +msgid "Show transform handles for single nodes" +msgstr "Показывать рычаги единичных узлов" -#: ../src/ui/dialog/inkscape-preferences.cpp:1343 -#: ../src/ui/dialog/inkscape-preferences.cpp:1345 +#: ../src/ui/dialog/inkscape-preferences.cpp:367 +msgid "Show transform handles even when only a single node is selected" +msgstr "Показывать рычаги единичных узлов, даже если выделен только один узел" + +#: ../src/ui/dialog/inkscape-preferences.cpp:368 +msgid "Deleting nodes preserves shape" +msgstr "Сохранять форму объекта при удалении узлов" + +#: ../src/ui/dialog/inkscape-preferences.cpp:369 msgid "" -"Stroke color same as object, fill color either object fill color or marker " -"fill color" +"Move handles next to deleted nodes to resemble original shape; hold Ctrl to " +"get the other behavior" msgstr "" +"Перемещать рычаги оставшихся после удаления узлов так, чтобы фигура по " +"возможности сохраняла свою форму; при нажатом Ctrl форма не сохраняется" -#: ../src/ui/dialog/inkscape-preferences.cpp:1349 -#: ../share/extensions/hershey.inx.h:27 -msgid "Markers" -msgstr "Маркеры" +#. Tweak +#: ../src/ui/dialog/inkscape-preferences.cpp:372 +msgid "Tweak" +msgstr "Корректор" -#: ../src/ui/dialog/inkscape-preferences.cpp:1352 -#, fuzzy -msgid "Document cleanup" -msgstr "Документ" +#: ../src/ui/dialog/inkscape-preferences.cpp:373 +msgid "Object paint style" +msgstr "Стиль раскрашивания объекта" -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 -#: ../src/ui/dialog/inkscape-preferences.cpp:1355 -msgid "Remove unused swatches when doing a document cleanup" -msgstr "" +#. Zoom +#: ../src/ui/dialog/inkscape-preferences.cpp:378 +#: ../src/widgets/desktop-widget.cpp:631 +msgid "Zoom" +msgstr "Лупа" -#. tooltip -#: ../src/ui/dialog/inkscape-preferences.cpp:1356 -#, fuzzy -msgid "Cleanup" -msgstr "Концы:" +#. Measure +#: ../src/ui/dialog/inkscape-preferences.cpp:383 ../src/verbs.cpp:2678 +msgctxt "ContextVerb" +msgid "Measure" +msgstr "Измеритель" -#: ../src/ui/dialog/inkscape-preferences.cpp:1364 -msgid "Number of _Threads:" -msgstr "_Количество потоков:" +#: ../src/ui/dialog/inkscape-preferences.cpp:385 +msgid "Ignore first and last points" +msgstr "Игнорировать первую и последнюю точки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1364 -#: ../src/ui/dialog/inkscape-preferences.cpp:1896 -msgid "(requires restart)" -msgstr "(требует перезапуска программы)" +#: ../src/ui/dialog/inkscape-preferences.cpp:386 +msgid "" +"The start and end of the measurement tool's control line will not be " +"considered for calculating lengths. Only lengths between actual curve " +"intersections will be displayed." +msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1365 -#, fuzzy -msgid "Configure number of processors/threads to use when rendering filters" -msgstr "Количество процессоров/потоков при визуализации гауссова размывания" +#. Shapes +#: ../src/ui/dialog/inkscape-preferences.cpp:389 +msgid "Shapes" +msgstr "Фигуры" -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 -msgid "Rendering _cache size:" -msgstr "_Размер кэша для рендеринга:" +#: ../src/ui/dialog/inkscape-preferences.cpp:421 +msgid "Sketch mode" +msgstr "Эскизный режим" -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 +#: ../src/ui/dialog/inkscape-preferences.cpp:423 #, fuzzy -msgctxt "mebibyte (2^20 bytes) abbreviation" -msgid "MiB" -msgstr "Мин:" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 msgid "" -"Set the amount of memory per document which can be used to store rendered " -"parts of the drawing for later reuse; set to zero to disable caching" +"If on, the sketch result will be the normal average of all sketches made, " +"instead of averaging the old result with the new sketch" msgstr "" +"Если включено, результат штриховки будет усредненным значением всех " +"сделанных штрихов, а не усредненным значением старого результата и новой " +"штриховки." -#. blur quality -#. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1372 -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 -msgid "Best quality (slowest)" -msgstr "Наилучшее качество (самая медленная отрисовка)" +#. Pen +#: ../src/ui/dialog/inkscape-preferences.cpp:426 +#: ../src/ui/dialog/input.cpp:1485 +msgid "Pen" +msgstr "Перо" -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 -#: ../src/ui/dialog/inkscape-preferences.cpp:1398 -msgid "Better quality (slower)" -msgstr "Хорошее качество (медленная отрисовка)" +#. Calligraphy +#: ../src/ui/dialog/inkscape-preferences.cpp:432 +msgid "Calligraphy" +msgstr "Каллиграфическое перо" -#: ../src/ui/dialog/inkscape-preferences.cpp:1376 -#: ../src/ui/dialog/inkscape-preferences.cpp:1400 -msgid "Average quality" -msgstr "Среднее качество" +#: ../src/ui/dialog/inkscape-preferences.cpp:436 +msgid "" +"If on, pen width is in absolute units (px) independent of zoom; otherwise " +"pen width depends on zoom so that it looks the same at any zoom" +msgstr "" +"Если включено, толщина линии в абсолютных единицах (px) независима от " +"масштаба; в противном случае толщина линии зависит от масштаба и выглядит " +"одинаково при любом масштабе" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 -#: ../src/ui/dialog/inkscape-preferences.cpp:1402 -msgid "Lower quality (faster)" -msgstr "Низкое качество (быстрая отрисовка)" +#: ../src/ui/dialog/inkscape-preferences.cpp:438 +msgid "" +"If on, each newly created object will be selected (deselecting previous " +"selection)" +msgstr "" +"Если включено, каждый новый объект будет автоматически выделяться (со " +"сбросом предыдущего выделения)" + +#. Text +#: ../src/ui/dialog/inkscape-preferences.cpp:441 ../src/verbs.cpp:2670 +msgctxt "ContextVerb" +msgid "Text" +msgstr "Текст" + +#: ../src/ui/dialog/inkscape-preferences.cpp:446 +msgid "Show font samples in the drop-down list" +msgstr "Показывать образцы шрифтов в раскрывающемся списке" -#: ../src/ui/dialog/inkscape-preferences.cpp:1380 -#: ../src/ui/dialog/inkscape-preferences.cpp:1404 -msgid "Lowest quality (fastest)" -msgstr "Самое низкое качество (самая быстрая отрисовка)" +#: ../src/ui/dialog/inkscape-preferences.cpp:447 +msgid "" +"Show font samples alongside font names in the drop-down list in Text bar" +msgstr "" +"Показывать образцы шрифтов рядом с их названиями в раскрывающемся списке" -#: ../src/ui/dialog/inkscape-preferences.cpp:1383 -msgid "Gaussian blur quality for display" -msgstr "Качество гауссова размывания на экране" +#: ../src/ui/dialog/inkscape-preferences.cpp:449 +msgid "Show font substitution warning dialog" +msgstr "Показывать диалог подстановки шрифтов" -#: ../src/ui/dialog/inkscape-preferences.cpp:1385 -#: ../src/ui/dialog/inkscape-preferences.cpp:1409 +#: ../src/ui/dialog/inkscape-preferences.cpp:450 msgid "" -"Best quality, but display may be very slow at high zooms (bitmap export " -"always uses best quality)" +"Show font substitution warning dialog when requested fonts are not available " +"on the system" msgstr "" -"Наилучшее качество, но при большом масштабе отрисовка очень медленная (при " -"экспорте качество остаётся максимальным)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1387 -#: ../src/ui/dialog/inkscape-preferences.cpp:1411 -msgid "Better quality, but slower display" -msgstr "Хорошее качество, но невысокая скорость" +#: ../src/ui/dialog/inkscape-preferences.cpp:453 +msgid "Pixel" +msgstr "Пиксел" -#: ../src/ui/dialog/inkscape-preferences.cpp:1389 -#: ../src/ui/dialog/inkscape-preferences.cpp:1413 -msgid "Average quality, acceptable display speed" -msgstr "Среднее качество, приемлимая скорость отрисовки" +#: ../src/ui/dialog/inkscape-preferences.cpp:453 +msgid "Pica" +msgstr "Пика" -#: ../src/ui/dialog/inkscape-preferences.cpp:1391 -#: ../src/ui/dialog/inkscape-preferences.cpp:1415 -msgid "Lower quality (some artifacts), but display is faster" -msgstr "Низкое качество с видимым артефактами, но быстрая отрисовка" +#: ../src/ui/dialog/inkscape-preferences.cpp:453 +msgid "Millimeter" +msgstr "Миллиметр" -#: ../src/ui/dialog/inkscape-preferences.cpp:1393 -#: ../src/ui/dialog/inkscape-preferences.cpp:1417 -msgid "Lowest quality (considerable artifacts), but display is fastest" -msgstr "" -"Очень низкое качество с достаточно заметными артефактами, но очень быстрая " -"отрисовка" +#: ../src/ui/dialog/inkscape-preferences.cpp:453 +msgid "Centimeter" +msgstr "Сантиметр" -#: ../src/ui/dialog/inkscape-preferences.cpp:1407 -msgid "Filter effects quality for display" -msgstr "Качество фильтров эффектов на экране" +#: ../src/ui/dialog/inkscape-preferences.cpp:453 +msgid "Inch" +msgstr "Дюйм" -#. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1419 -#: ../src/ui/dialog/print.cpp:232 -msgid "Rendering" -msgstr "Тип печати" +#: ../src/ui/dialog/inkscape-preferences.cpp:453 +msgid "Em square" +msgstr "Em square" -#. Note: /options/bitmapoversample removed with Cairo renderer -#: ../src/ui/dialog/inkscape-preferences.cpp:1425 ../src/verbs.cpp:156 -#: ../src/widgets/calligraphy-toolbar.cpp:626 -#, fuzzy -msgid "Edit" -msgstr "_Правка" +#. , _("Ex square"), _("Percent") +#. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT +#: ../src/ui/dialog/inkscape-preferences.cpp:456 +msgid "Text units" +msgstr "Единицы кегля" -#: ../src/ui/dialog/inkscape-preferences.cpp:1426 -msgid "Automatically reload bitmaps" -msgstr "Автоматически перезагружать растровые файлы" +#: ../src/ui/dialog/inkscape-preferences.cpp:458 +msgid "Text size unit type:" +msgstr "Единица измерения кегля" -#: ../src/ui/dialog/inkscape-preferences.cpp:1428 -msgid "Automatically reload linked images when file is changed on disk" +#: ../src/ui/dialog/inkscape-preferences.cpp:459 +msgid "Set the type of unit used in the text toolbar and text dialogs" msgstr "" -"Автоматически заново загружать связанные изображения, когда они меняются на " -"диске" -#: ../src/ui/dialog/inkscape-preferences.cpp:1430 -#, fuzzy -msgid "_Bitmap editor:" -msgstr "Редактор растровых файлов:" +#: ../src/ui/dialog/inkscape-preferences.cpp:460 +msgid "Always output text size in pixels (px)" +msgstr "Всегда выводить кегль текста в пикселах (px)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1432 -#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:55 -#: ../share/extensions/print_win32_vector.inx.h:2 -msgid "Export" -msgstr "Экспорт" +#: ../src/ui/dialog/inkscape-preferences.cpp:461 +msgid "" +"Always convert the text size units above into pixels (px) before saving to " +"file" +msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1434 -#, fuzzy -msgid "Default export _resolution:" -msgstr "Разрешение для экспорта:" +#. Spray +#: ../src/ui/dialog/inkscape-preferences.cpp:466 +msgid "Spray" +msgstr "Распылитель" -#: ../src/ui/dialog/inkscape-preferences.cpp:1435 -msgid "Default bitmap resolution (in dots per inch) in the Export dialog" -msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию" +#. Eraser +#: ../src/ui/dialog/inkscape-preferences.cpp:471 +msgid "Eraser" +msgstr "Ластик" -#: ../src/ui/dialog/inkscape-preferences.cpp:1436 -#: ../src/ui/dialog/xml-tree.cpp:912 -msgid "Create" -msgstr "Создать" +#. Paint Bucket +#: ../src/ui/dialog/inkscape-preferences.cpp:475 +msgid "Paint Bucket" +msgstr "Сплошная заливка" -#: ../src/ui/dialog/inkscape-preferences.cpp:1438 -#, fuzzy -msgid "Resolution for Create Bitmap _Copy:" -msgstr "Разрешение растровой копии:" +#. Gradient +#: ../src/ui/dialog/inkscape-preferences.cpp:480 +#: ../src/widgets/gradient-selector.cpp:152 +#: ../src/widgets/gradient-selector.cpp:320 +msgid "Gradient" +msgstr "Градиентная заливка" -#: ../src/ui/dialog/inkscape-preferences.cpp:1439 -msgid "Resolution used by the Create Bitmap Copy command" -msgstr "Разрешение растра при создании растровой копии выделения" +#: ../src/ui/dialog/inkscape-preferences.cpp:482 +msgid "Prevent sharing of gradient definitions" +msgstr "Не разделять определения градиентов между объектами" -#: ../src/ui/dialog/inkscape-preferences.cpp:1442 -msgid "Ask about linking and scaling when importing" +#: ../src/ui/dialog/inkscape-preferences.cpp:484 +msgid "" +"When on, shared gradient definitions are automatically forked on change; " +"uncheck to allow sharing of gradient definitions so that editing one object " +"may affect other objects using the same gradient" msgstr "" +"Если параметр включен, разделяемые определения (defs) градиентов при " +"изменении копируются в новые; если выключен, определения разделяются между " +"объектами, так что изменение градиента для одного объекта может сказаться на " +"другом объекте." -#: ../src/ui/dialog/inkscape-preferences.cpp:1444 -msgid "Pop-up linking and scaling dialog when importing bitmap image." +#: ../src/ui/dialog/inkscape-preferences.cpp:485 +msgid "Use legacy Gradient Editor" +msgstr "Использовать старый редактор градиентов" + +#: ../src/ui/dialog/inkscape-preferences.cpp:487 +msgid "" +"When on, the Gradient Edit button in the Fill & Stroke dialog will show the " +"legacy Gradient Editor dialog, when off the Gradient Tool will be used" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1450 -#, fuzzy -msgid "Bitmap link:" -msgstr "Редактор растровых файлов:" +#: ../src/ui/dialog/inkscape-preferences.cpp:490 +msgid "Linear gradient _angle:" +msgstr "_Угол линейного градиента:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1457 -msgid "Bitmap scale (image-rendering):" +#: ../src/ui/dialog/inkscape-preferences.cpp:491 +msgid "" +"Default angle of new linear gradients in degrees (clockwise from horizontal)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1462 -#, fuzzy -msgid "Default _import resolution:" -msgstr "Разрешение для экспорта:" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1463 -#, fuzzy -msgid "Default bitmap resolution (in dots per inch) for bitmap import" -msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию" +#. Dropper +#: ../src/ui/dialog/inkscape-preferences.cpp:495 +msgid "Dropper" +msgstr "Пипетка" -#: ../src/ui/dialog/inkscape-preferences.cpp:1464 -#, fuzzy -msgid "Override file resolution" -msgstr "Разрешение для экспорта:" +#. Connector +#: ../src/ui/dialog/inkscape-preferences.cpp:500 +msgid "Connector" +msgstr "Соединительные линии" -#: ../src/ui/dialog/inkscape-preferences.cpp:1466 -#, fuzzy -msgid "Use default bitmap resolution in favor of information from file" -msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию" +#: ../src/ui/dialog/inkscape-preferences.cpp:503 +msgid "If on, connector attachment points will not be shown for text objects" +msgstr "" +"Если включено, точки соединения линиями не показываются на текстовых объектах" -#. rendering outlines for pixmap image tags -#: ../src/ui/dialog/inkscape-preferences.cpp:1470 +#. LPETool +#. disabled, because the LPETool is not finished yet. +#: ../src/ui/dialog/inkscape-preferences.cpp:508 #, fuzzy -msgid "Images in Outline Mode" -msgstr "Нарисовать абрис вокруг" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1471 -msgid "" -"When active will render images while in outline mode instead of a red box " -"with an x. This is useful for manual tracing." -msgstr "" +msgid "LPE Tool" +msgstr "Геометрические построения" -#: ../src/ui/dialog/inkscape-preferences.cpp:1473 -msgid "Bitmaps" -msgstr "Растр" +#: ../src/ui/dialog/inkscape-preferences.cpp:515 +msgid "Interface" +msgstr "Интерфейс" -#: ../src/ui/dialog/inkscape-preferences.cpp:1485 -msgid "" -"Select a file of predefined shortcuts to use. Any customized shortcuts you " -"create will be added seperately to " -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:518 +msgid "System default" +msgstr "Используемый системой" -#: ../src/ui/dialog/inkscape-preferences.cpp:1488 -msgid "Shortcut file:" -msgstr "Файл схемы:" +#: ../src/ui/dialog/inkscape-preferences.cpp:518 +msgid "Albanian (sq)" +msgstr "Албанский (sq)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1491 -#: ../src/ui/dialog/template-load-tab.cpp:48 -msgid "Search:" -msgstr "Искать:" +#: ../src/ui/dialog/inkscape-preferences.cpp:518 +msgid "Amharic (am)" +msgstr "Амхарский (am)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1503 -msgid "Shortcut" -msgstr "Комбинация" +#: ../src/ui/dialog/inkscape-preferences.cpp:518 +msgid "Arabic (ar)" +msgstr "Арабский (ar)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1504 -#: ../src/ui/widget/page-sizer.cpp:260 -msgid "Description" -msgstr "Описание" +#: ../src/ui/dialog/inkscape-preferences.cpp:518 +msgid "Armenian (hy)" +msgstr "Армянский (hy)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1559 -#: ../src/ui/dialog/pixelartdialog.cpp:296 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:698 -#: ../src/ui/dialog/tracedialog.cpp:813 -#: ../src/ui/widget/preferences-widget.cpp:749 -msgid "Reset" -msgstr "Сбросить " +#: ../src/ui/dialog/inkscape-preferences.cpp:518 +msgid "Azerbaijani (az)" +msgstr "Азербайджанский (az)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1559 -msgid "" -"Remove all your customized keyboard shortcuts, and revert to the shortcuts " -"in the shortcut file listed above" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:518 +msgid "Basque (eu)" +msgstr "Баскский (eu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1563 -#, fuzzy -msgid "Import ..." -msgstr "_Импортировать..." +#: ../src/ui/dialog/inkscape-preferences.cpp:518 +msgid "Belarusian (be)" +msgstr "Белорусский (be)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1563 -msgid "Import custom keyboard shortcuts from a file" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:519 +msgid "Bulgarian (bg)" +msgstr "Болгарский (bg)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1566 -#, fuzzy -msgid "Export ..." -msgstr "_Экспортировать в растр..." +#: ../src/ui/dialog/inkscape-preferences.cpp:519 +msgid "Bengali (bn)" +msgstr "Бенгальский (bn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1566 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 #, fuzzy -msgid "Export custom keyboard shortcuts to a file" -msgstr "Экспортировать документ в файл PS" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1576 -msgid "Keyboard Shortcuts" -msgstr "Клавиатурные комбинации" +msgid "Bengali/Bangladesh (bn_BD)" +msgstr "Бенгальский (bn)" -#. Find this group in the tree -#: ../src/ui/dialog/inkscape-preferences.cpp:1739 -msgid "Misc" -msgstr "Прочее" +#: ../src/ui/dialog/inkscape-preferences.cpp:519 +msgid "Breton (br)" +msgstr "Бретонский (br)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1858 -msgid "Set the main spell check language" -msgstr "Первый по важности язык для проверки орфографии" +#: ../src/ui/dialog/inkscape-preferences.cpp:519 +msgid "Catalan (ca)" +msgstr "Каталонский (ca)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1861 -msgid "Second language:" -msgstr "Второй язык:" +#: ../src/ui/dialog/inkscape-preferences.cpp:519 +msgid "Valencian Catalan (ca@valencia)" +msgstr "Каталонский, Валенсия (ca@valencia)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1862 -msgid "" -"Set the second spell check language; checking will only stop on words " -"unknown in ALL chosen languages" -msgstr "" -"Второй по важности язык для проверки орфографии; проверка завершится лишь в " -"случае ненахождения слов во ВСЕХ выбранных языках." +#: ../src/ui/dialog/inkscape-preferences.cpp:519 +msgid "Chinese/China (zh_CN)" +msgstr "Китайский, Китай (zh_CN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1865 -msgid "Third language:" -msgstr "Третий язык:" +#: ../src/ui/dialog/inkscape-preferences.cpp:520 +msgid "Chinese/Taiwan (zh_TW)" +msgstr "Китайский, Тайвань (zh_TW)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1866 -msgid "" -"Set the third spell check language; checking will only stop on words unknown " -"in ALL chosen languages" -msgstr "" -"Третий по важности язык для проверки орфографии; проверка завершится лишь в " -"случае ненахождения слов во ВСЕХ выбранных языках." +#: ../src/ui/dialog/inkscape-preferences.cpp:520 +msgid "Croatian (hr)" +msgstr "Хорватский (hr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1868 -msgid "Ignore words with digits" -msgstr "Игнорировать слова с цифрами" +#: ../src/ui/dialog/inkscape-preferences.cpp:520 +msgid "Czech (cs)" +msgstr "Чешский (cs)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1870 -msgid "Ignore words containing digits, such as \"R2D2\"" -msgstr "Инорировать слова, содержащие цифры — например, \"R2D2\"" +#: ../src/ui/dialog/inkscape-preferences.cpp:521 +msgid "Danish (da)" +msgstr "Датский (da)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1872 -msgid "Ignore words in ALL CAPITALS" -msgstr "Игнорировать слова, написанные заглавными" +#: ../src/ui/dialog/inkscape-preferences.cpp:521 +msgid "Dutch (nl)" +msgstr "Голландский (nl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1874 -msgid "Ignore words in all capitals, such as \"IUPAC\"" -msgstr "Игнорировать слова, написанные заглавными — например, «НИИЧАВО»" +#: ../src/ui/dialog/inkscape-preferences.cpp:521 +msgid "Dzongkha (dz)" +msgstr "Дзонг-кэ (dz)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1876 -msgid "Spellcheck" -msgstr "Проверка орфографии" +#: ../src/ui/dialog/inkscape-preferences.cpp:521 +msgid "German (de)" +msgstr "Немецкий (de)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1896 -#, fuzzy -msgid "Latency _skew:" -msgstr "Отклонение задержки:" +#: ../src/ui/dialog/inkscape-preferences.cpp:521 +msgid "Greek (el)" +msgstr "Греческий (el)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1897 -#, fuzzy -msgid "" -"Factor by which the event clock is skewed from the actual time (0.9766 on " -"some systems)" -msgstr "" -"Коэффициент, на который часы событий отклоняются от настоящего времени " -"(0.9766 в некоторых системах)" +#: ../src/ui/dialog/inkscape-preferences.cpp:521 +msgid "English (en)" +msgstr "Английский (en)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1899 -msgid "Pre-render named icons" -msgstr "Предварительно отрисовывать именованные значки" +#: ../src/ui/dialog/inkscape-preferences.cpp:521 +msgid "English/Australia (en_AU)" +msgstr "Английский, Австралия (en_AU)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1901 -msgid "" -"When on, named icons will be rendered before displaying the ui. This is for " -"working around bugs in GTK+ named icon notification" -msgstr "" -"Если включено, именованные значки будут отрисовываться перед отображением " -"интерфейса. Это местечковое решение ошибки в GTK+, касающейся именованных " -"значков." +#: ../src/ui/dialog/inkscape-preferences.cpp:522 +msgid "English/Canada (en_CA)" +msgstr "Английский, Канада (en_CA)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1909 -msgid "System info" -msgstr "Информация о системе" +#: ../src/ui/dialog/inkscape-preferences.cpp:522 +msgid "English/Great Britain (en_GB)" +msgstr "Английский, Великобритания (en_GB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1913 -msgid "User config: " -msgstr "Пользовательская конфигурация:" +#: ../src/ui/dialog/inkscape-preferences.cpp:522 +msgid "Pig Latin (en_US@piglatin)" +msgstr "Поросячья латынь (en_US@piglatin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1913 -msgid "Location of users configuration" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:523 +msgid "Esperanto (eo)" +msgstr "Эсперанто (eo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1917 -msgid "User preferences: " -msgstr "Пользовательские предпочтения:" +#: ../src/ui/dialog/inkscape-preferences.cpp:523 +msgid "Estonian (et)" +msgstr "Эстонский (et)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1917 -#, fuzzy -msgid "Location of the users preferences file" -msgstr "Не удалось загрузить файл параметров %s." +#: ../src/ui/dialog/inkscape-preferences.cpp:523 +msgid "Farsi (fa)" +msgstr "Фарси (fa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1921 -msgid "User extensions: " -msgstr "Пользовательские расширения:" +#: ../src/ui/dialog/inkscape-preferences.cpp:523 +msgid "Finnish (fi)" +msgstr "Финский (fi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1921 -#, fuzzy -msgid "Location of the users extensions" -msgstr "Информация о расширениях Inkscape" +#: ../src/ui/dialog/inkscape-preferences.cpp:524 +msgid "French (fr)" +msgstr "Французский (fr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1925 -msgid "User cache: " -msgstr "Кэш пользователя:" +#: ../src/ui/dialog/inkscape-preferences.cpp:524 +msgid "Irish (ga)" +msgstr "Ирландский (ga)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1925 -msgid "Location of users cache" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:524 +msgid "Galician (gl)" +msgstr "Галицийский (gl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1933 -msgid "Temporary files: " -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:524 +msgid "Hebrew (he)" +msgstr "Иврит (he)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1933 -msgid "Location of the temporary files used for autosave" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:524 +msgid "Hungarian (hu)" +msgstr "Венгерский (hu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1937 -#, fuzzy -msgid "Inkscape data: " -msgstr "Руководство по Inkscape" +#: ../src/ui/dialog/inkscape-preferences.cpp:525 +msgid "Indonesian (id)" +msgstr "Индонезийский (id)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1937 -#, fuzzy -msgid "Location of Inkscape data" -msgstr "Информация о расширениях Inkscape" +#: ../src/ui/dialog/inkscape-preferences.cpp:525 +msgid "Italian (it)" +msgstr "Итальянский (it)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1941 -msgid "Inkscape extensions: " -msgstr "Расширения Inkscape:" +#: ../src/ui/dialog/inkscape-preferences.cpp:525 +msgid "Japanese (ja)" +msgstr "Японский (ja)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1941 -#, fuzzy -msgid "Location of the Inkscape extensions" -msgstr "Информация о расширениях Inkscape" +#: ../src/ui/dialog/inkscape-preferences.cpp:525 +msgid "Khmer (km)" +msgstr "Кхмерский (km)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1950 -msgid "System data: " -msgstr "Данные о системе" +#: ../src/ui/dialog/inkscape-preferences.cpp:525 +msgid "Kinyarwanda (rw)" +msgstr "Руанда (rw)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1950 -msgid "Locations of system data" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:525 +msgid "Korean (ko)" +msgstr "Корейский (ko)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1974 -msgid "Icon theme: " -msgstr "Тема значков:" +#: ../src/ui/dialog/inkscape-preferences.cpp:525 +msgid "Lithuanian (lt)" +msgstr "Литовский (lt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1974 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 #, fuzzy -msgid "Locations of icon themes" -msgstr "Информация о расширениях Inkscape" +msgid "Latvian (lv)" +msgstr "Литовский (lt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1976 -msgid "System" -msgstr "Системный" +#: ../src/ui/dialog/inkscape-preferences.cpp:525 +msgid "Macedonian (mk)" +msgstr "Македонский (mk)" -#: ../src/ui/dialog/input.cpp:360 ../src/ui/dialog/input.cpp:381 -#: ../src/ui/dialog/input.cpp:1641 -msgid "Disabled" -msgstr "Отключено" +#: ../src/ui/dialog/inkscape-preferences.cpp:526 +msgid "Mongolian (mn)" +msgstr "Монгольский (mn)" -#: ../src/ui/dialog/input.cpp:361 -msgctxt "Input device" -msgid "Screen" -msgstr "Экран" +#: ../src/ui/dialog/inkscape-preferences.cpp:526 +msgid "Nepali (ne)" +msgstr "Непальский (ne)" -#: ../src/ui/dialog/input.cpp:362 ../src/ui/dialog/input.cpp:383 -msgid "Window" -msgstr "Окно" +#: ../src/ui/dialog/inkscape-preferences.cpp:526 +msgid "Norwegian Bokmål (nb)" +msgstr "Норвежский, бокмол (nb)" -#: ../src/ui/dialog/input.cpp:618 -msgid "Test Area" -msgstr "Область тестирования" +#: ../src/ui/dialog/inkscape-preferences.cpp:526 +msgid "Norwegian Nynorsk (nn)" +msgstr "Норвежский, нюнорск (nn)" -#: ../src/ui/dialog/input.cpp:619 -msgid "Axis" -msgstr "Ось" +#: ../src/ui/dialog/inkscape-preferences.cpp:526 +msgid "Panjabi (pa)" +msgstr "Пенджаби (pa)" -#: ../src/ui/dialog/input.cpp:708 ../share/extensions/svgcalendar.inx.h:2 -msgid "Configuration" -msgstr "Основные параметры" +#: ../src/ui/dialog/inkscape-preferences.cpp:527 +msgid "Polish (pl)" +msgstr "Польский (pl)" -#: ../src/ui/dialog/input.cpp:709 -msgid "Hardware" -msgstr "Устройства" +#: ../src/ui/dialog/inkscape-preferences.cpp:527 +msgid "Portuguese (pt)" +msgstr "Португальский (pt)" -#: ../src/ui/dialog/input.cpp:732 -msgid "Link:" -msgstr "Связь:" +#: ../src/ui/dialog/inkscape-preferences.cpp:527 +msgid "Portuguese/Brazil (pt_BR)" +msgstr "Португальский, Бразилия (pt_BR)" -#: ../src/ui/dialog/input.cpp:758 -msgid "Axes count:" -msgstr "Число осей:" +#: ../src/ui/dialog/inkscape-preferences.cpp:527 +msgid "Romanian (ro)" +msgstr "Румынский (ro)" -#: ../src/ui/dialog/input.cpp:788 -msgid "axis:" -msgstr "ось:" +#: ../src/ui/dialog/inkscape-preferences.cpp:527 +msgid "Russian (ru)" +msgstr "Русский (ru)" -#: ../src/ui/dialog/input.cpp:812 -msgid "Button count:" -msgstr "Число кнопок:" +#: ../src/ui/dialog/inkscape-preferences.cpp:528 +msgid "Serbian (sr)" +msgstr "Сербский, кириллица (sr)" -#: ../src/ui/dialog/input.cpp:1010 -msgid "Tablet" -msgstr "Планшет" +#: ../src/ui/dialog/inkscape-preferences.cpp:528 +msgid "Serbian in Latin script (sr@latin)" +msgstr "Сербский, латиница (sr@latin)" -#: ../src/ui/dialog/input.cpp:1039 ../src/ui/dialog/input.cpp:1928 -msgid "pad" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:528 +msgid "Slovak (sk)" +msgstr "Словацкий (sk)" -#: ../src/ui/dialog/input.cpp:1081 -msgid "_Use pressure-sensitive tablet (requires restart)" -msgstr "_Использовать графический планшет (нужен перезапуск)" +#: ../src/ui/dialog/inkscape-preferences.cpp:528 +msgid "Slovenian (sl)" +msgstr "Словенский (sl)" -#: ../src/ui/dialog/input.cpp:1086 -#, fuzzy -msgid "Axes" -msgstr "Нарисовать оси" +#: ../src/ui/dialog/inkscape-preferences.cpp:528 +msgid "Spanish (es)" +msgstr "Испанский (es)" -#: ../src/ui/dialog/input.cpp:1087 -msgid "Keys" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:528 +msgid "Spanish/Mexico (es_MX)" +msgstr "Испанский, Мексика (es_MX)" -#: ../src/ui/dialog/input.cpp:1170 -msgid "" -"A device can be 'Disabled', its co-ordinates mapped to the whole 'Screen', " -"or to a single (usually focused) 'Window'" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:529 +msgid "Swedish (sv)" +msgstr "Шведский (sv)" -#: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578 -#: ../src/widgets/spray-toolbar.cpp:224 ../src/widgets/tweak-toolbar.cpp:372 -msgid "Pressure" -msgstr "Нажим" +#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#, fuzzy +msgid "Telugu (te)" +msgstr "Телугу" -#: ../src/ui/dialog/input.cpp:1616 -msgid "X tilt" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:529 +msgid "Thai (th)" +msgstr "Тайский (th)" -#: ../src/ui/dialog/input.cpp:1616 -msgid "Y tilt" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:529 +msgid "Turkish (tr)" +msgstr "Турецкий (tr)" -#: ../src/ui/dialog/input.cpp:1616 -#: ../src/widgets/sp-color-wheel-selector.cpp:59 -msgid "Wheel" -msgstr "Круг" +#: ../src/ui/dialog/inkscape-preferences.cpp:529 +msgid "Ukrainian (uk)" +msgstr "Украинский (uk)" -#: ../src/ui/dialog/layer-properties.cpp:55 -msgid "Layer name:" -msgstr "Имя слоя:" +#: ../src/ui/dialog/inkscape-preferences.cpp:529 +msgid "Vietnamese (vi)" +msgstr "Вьетнамский (vi)" -#: ../src/ui/dialog/layer-properties.cpp:136 -msgid "Add layer" -msgstr "Добавление слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:561 +msgid "Language (requires restart):" +msgstr "Язык (нужен перезапуск):" -#: ../src/ui/dialog/layer-properties.cpp:176 -msgid "Above current" -msgstr "Над текущим слоем" +#: ../src/ui/dialog/inkscape-preferences.cpp:562 +msgid "Set the language for menus and number formats" +msgstr "Укажите язык интерфейса и формата чисел" -#: ../src/ui/dialog/layer-properties.cpp:180 -msgid "Below current" -msgstr "Под текущим слоем" +#: ../src/ui/dialog/inkscape-preferences.cpp:565 +#: ../src/ui/dialog/inkscape-preferences.cpp:650 +msgid "Large" +msgstr "Большие" -#: ../src/ui/dialog/layer-properties.cpp:183 -msgid "As sublayer of current" -msgstr "Внутри текущего слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:565 +#: ../src/ui/dialog/inkscape-preferences.cpp:650 +msgid "Small" +msgstr "Маленькие" -#: ../src/ui/dialog/layer-properties.cpp:352 -msgid "Rename Layer" -msgstr "Переименование слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:565 +msgid "Smaller" +msgstr "Еще меньше" -#. TODO: find an unused layer number, forming name from _("Layer ") + "%d" -#: ../src/ui/dialog/layer-properties.cpp:354 -#: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 -#: ../src/verbs.cpp:2289 -msgid "Layer" -msgstr "Слой" +#: ../src/ui/dialog/inkscape-preferences.cpp:569 +msgid "Toolbox icon size:" +msgstr "Значки панели инструментов:" -#: ../src/ui/dialog/layer-properties.cpp:355 -msgid "_Rename" -msgstr "Пере_именовать" +#: ../src/ui/dialog/inkscape-preferences.cpp:570 +msgid "Set the size for the tool icons (requires restart)" +msgstr "" +"Изменить размер значков в панели инструментов (требует перезапуска программы)" -#: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:750 -msgid "Rename layer" -msgstr "Переименование слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:573 +msgid "Control bar icon size:" +msgstr "Значки панели параметров:" -#. TRANSLATORS: This means "The layer has been renamed" -#: ../src/ui/dialog/layer-properties.cpp:370 -msgid "Renamed layer" -msgstr "Переименованный слой" +#: ../src/ui/dialog/inkscape-preferences.cpp:574 +msgid "" +"Set the size for the icons in tools' control bars to use (requires restart)" +msgstr "" +"Изменить размер значков в панели команд (требует перезапуска программы)" -#: ../src/ui/dialog/layer-properties.cpp:374 -msgid "Add Layer" -msgstr "Добавка слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:577 +msgid "Secondary toolbar icon size:" +msgstr "Значки второй панели:" -#: ../src/ui/dialog/layer-properties.cpp:380 -msgid "_Add" -msgstr "_Добавить" +#: ../src/ui/dialog/inkscape-preferences.cpp:578 +msgid "" +"Set the size for the icons in secondary toolbars to use (requires restart)" +msgstr "" +"Изменить размер значков в панели параметров инструментов (требует " +"перезапуска программы)" -#: ../src/ui/dialog/layer-properties.cpp:404 -msgid "New layer created." -msgstr "Создание нового слоя." +#: ../src/ui/dialog/inkscape-preferences.cpp:581 +msgid "Work-around color sliders not drawing" +msgstr "Попытаться исправить ползунок альфа-канала" -#: ../src/ui/dialog/layer-properties.cpp:408 -msgid "Move to Layer" -msgstr "Перемещение на слой" +#: ../src/ui/dialog/inkscape-preferences.cpp:583 +msgid "" +"When on, will attempt to work around bugs in certain GTK themes drawing " +"color sliders" +msgstr "" +"При использовании некоторых тем GTK+ ползунок альфа-канал замирает на " +"отметке 244. Inkscape может попытаться исправить это." -#: ../src/ui/dialog/layer-properties.cpp:411 -#: ../src/ui/dialog/transformation.cpp:114 -msgid "_Move" -msgstr "_Смещение" +#: ../src/ui/dialog/inkscape-preferences.cpp:588 +msgid "Clear list" +msgstr "Очистить список" -#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 -msgid "Unhide layer" -msgstr "Раскрытие объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:591 +#, fuzzy +msgid "Maximum documents in Open _Recent:" +msgstr "Недавних документов в меню:" -#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 -msgid "Hide layer" -msgstr "Сокрытие слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:592 +msgid "" +"Set the maximum length of the Open Recent list in the File menu, or clear " +"the list" +msgstr "Сколько недавно открывавшихся документов помнить" -#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 -msgid "Lock layer" -msgstr "Блокировка слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:595 +#, fuzzy +msgid "_Zoom correction factor (in %):" +msgstr "Масштаб видимой страницы (%):" -#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 -msgid "Unlock layer" -msgstr "Разблокировка слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:596 +msgid "" +"Adjust the slider until the length of the ruler on your screen matches its " +"real length. This information is used when zooming to 1:1, 1:2, etc., to " +"display objects in their true sizes" +msgstr "" +"Приложите к экрану линейку и перетащите ползунок до позиции, при которой " +"деления на линейке и на экране совпадают. После этого масштаб отображения " +"документа 1:1 будет соответствовать реальному." -#: ../src/ui/dialog/layers.cpp:624 ../src/verbs.cpp:1405 -msgid "Toggle layer solo" -msgstr "Солирующий слой" +#: ../src/ui/dialog/inkscape-preferences.cpp:599 +msgid "Enable dynamic relayout for incomplete sections" +msgstr "Динамическое размещение недоработанных частей интерфейса" -#: ../src/ui/dialog/layers.cpp:627 ../src/verbs.cpp:1429 -msgid "Lock other layers" -msgstr "Блокировка остальных слоёв" +#: ../src/ui/dialog/inkscape-preferences.cpp:601 +msgid "" +"When on, will allow dynamic layout of components that are not completely " +"finished being refactored" +msgstr "" +"Если включено, будет выполняться динамическое размещение недоработанных " +"частей интерфейса" -#: ../src/ui/dialog/layers.cpp:721 +#. show infobox +#: ../src/ui/dialog/inkscape-preferences.cpp:604 #, fuzzy -msgid "Moved layer" -msgstr "Опускание слоя" +msgid "Show filter primitives infobox (requires restart)" +msgstr "Показывать справку по примитивам фильтра" -#: ../src/ui/dialog/layers.cpp:884 -#, fuzzy -msgctxt "Layers" -msgid "New" -msgstr "Новый" +#: ../src/ui/dialog/inkscape-preferences.cpp:606 +msgid "" +"Show icons and descriptions for the filter primitives available at the " +"filter effects dialog" +msgstr "" +"Показывать значки и описания для каждого примитива фильтров в диалоге " +"фильтров эффектов" -#: ../src/ui/dialog/layers.cpp:889 +#: ../src/ui/dialog/inkscape-preferences.cpp:609 +#: ../src/ui/dialog/inkscape-preferences.cpp:617 #, fuzzy -msgctxt "Layers" -msgid "Bot" -msgstr "Низ" +msgid "Icons only" +msgstr "Цвет" -#: ../src/ui/dialog/layers.cpp:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:609 +#: ../src/ui/dialog/inkscape-preferences.cpp:617 #, fuzzy -msgctxt "Layers" -msgid "Dn" -msgstr "Ниже" +msgid "Text only" +msgstr "Импорт текстовых файлов" -#: ../src/ui/dialog/layers.cpp:901 +#: ../src/ui/dialog/inkscape-preferences.cpp:609 +#: ../src/ui/dialog/inkscape-preferences.cpp:617 #, fuzzy -msgctxt "Layers" -msgid "Up" -msgstr "Выше" +msgid "Icons and text" +msgstr "Внутри и снаружи" -#: ../src/ui/dialog/layers.cpp:907 +#: ../src/ui/dialog/inkscape-preferences.cpp:614 #, fuzzy -msgctxt "Layers" -msgid "Top" -msgstr "Верх" +msgid "Dockbar style (requires restart):" +msgstr "Язык (нужен перезапуск):" -#: ../src/ui/dialog/livepatheffect-add.cpp:32 -#, fuzzy -msgid "Add Path Effect" -msgstr "Добавить контурный эффект" +#: ../src/ui/dialog/inkscape-preferences.cpp:615 +msgid "" +"Selects whether the vertical bars on the dockbar will show text labels, " +"icons, or both" +msgstr "" -#: ../src/ui/dialog/livepatheffect-editor.cpp:109 -msgid "Add path effect" -msgstr "Добавить контурный эффект" +#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#, fuzzy +msgid "Switcher style (requires restart):" +msgstr "(требует перезапуска программы)" -#: ../src/ui/dialog/livepatheffect-editor.cpp:119 -msgid "Delete current path effect" -msgstr "Удалить контурный эффект" +#: ../src/ui/dialog/inkscape-preferences.cpp:623 +msgid "" +"Selects whether the dockbar switcher will show text labels, icons, or both" +msgstr "" -#: ../src/ui/dialog/livepatheffect-editor.cpp:129 -msgid "Raise the current path effect" -msgstr "Поднять текущий контурный эффект" +#. Windows +#: ../src/ui/dialog/inkscape-preferences.cpp:627 +msgid "Save and restore window geometry for each document" +msgstr "Запоминать и использовать геометрию окна для каждого документа" -#: ../src/ui/dialog/livepatheffect-editor.cpp:139 -msgid "Lower the current path effect" -msgstr "Опустить текущий контурный эффект" +#: ../src/ui/dialog/inkscape-preferences.cpp:628 +msgid "Remember and use last window's geometry" +msgstr "Запоминать и использовать геометрию последнего окна" -#: ../src/ui/dialog/livepatheffect-editor.cpp:313 -msgid "Unknown effect is applied" -msgstr "Применен неизвестный эффект" +#: ../src/ui/dialog/inkscape-preferences.cpp:629 +msgid "Don't save window geometry" +msgstr "Не запоминать геометрию окон" -#: ../src/ui/dialog/livepatheffect-editor.cpp:316 -msgid "Click button to add an effect" -msgstr "Щёлкните кнопку для добавления эффекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:631 +msgid "Save and restore dialogs status" +msgstr "" -#: ../src/ui/dialog/livepatheffect-editor.cpp:329 -#, fuzzy -msgid "Click add button to convert clone" -msgstr "Щёлкните кнопку для добавления эффекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:632 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 +msgid "Don't save dialogs status" +msgstr "" -#: ../src/ui/dialog/livepatheffect-editor.cpp:334 -#: ../src/ui/dialog/livepatheffect-editor.cpp:338 -#: ../src/ui/dialog/livepatheffect-editor.cpp:346 -msgid "Select a path or shape" -msgstr "Выберите контур или фигуру" +#: ../src/ui/dialog/inkscape-preferences.cpp:634 +#: ../src/ui/dialog/inkscape-preferences.cpp:676 +msgid "Dockable" +msgstr "Прикрепляются к правому краю окна" -#: ../src/ui/dialog/livepatheffect-editor.cpp:342 -msgid "Only one item can be selected" -msgstr "Можно выбрать только один объект" +#: ../src/ui/dialog/inkscape-preferences.cpp:638 +msgid "Native open/save dialogs" +msgstr "" -#: ../src/ui/dialog/livepatheffect-editor.cpp:374 -msgid "Unknown effect" -msgstr "Неизвестный эффект" +#: ../src/ui/dialog/inkscape-preferences.cpp:639 +msgid "GTK open/save dialogs" +msgstr "" -#: ../src/ui/dialog/livepatheffect-editor.cpp:450 -msgid "Create and apply path effect" -msgstr "Создание контурного эффекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:641 +msgid "Dialogs are hidden in taskbar" +msgstr "Диалоги не видны на панели задач" -#: ../src/ui/dialog/livepatheffect-editor.cpp:485 +#: ../src/ui/dialog/inkscape-preferences.cpp:642 #, fuzzy -msgid "Create and apply Clone original path effect" -msgstr "Создание контурного эффекта" - -#: ../src/ui/dialog/livepatheffect-editor.cpp:505 -msgid "Remove path effect" -msgstr "Удаление контурного эффекта" +msgid "Save and restore documents viewport" +msgstr "Запоминать и использовать геометрию окна для каждого документа" -#: ../src/ui/dialog/livepatheffect-editor.cpp:522 -msgid "Move path effect up" -msgstr "Поднятие контурного эффекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:643 +msgid "Zoom when window is resized" +msgstr "Масштабировать рисунок при изменении размеров окна" -#: ../src/ui/dialog/livepatheffect-editor.cpp:538 -msgid "Move path effect down" -msgstr "Опускание контурного эффекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:644 +msgid "Show close button on dialogs" +msgstr "Показывать кнопку «Закрыть» во всех диалогах" -#: ../src/ui/dialog/livepatheffect-editor.cpp:577 -msgid "Activate path effect" -msgstr "Активация контурного эффекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#, fuzzy +msgctxt "Dialog on top" +msgid "None" +msgstr "Нет" -#: ../src/ui/dialog/livepatheffect-editor.cpp:577 -msgid "Deactivate path effect" -msgstr "Деактивация контурного эффекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:647 +msgid "Aggressive" +msgstr "Настойчивый" -#: ../src/ui/dialog/memory.cpp:96 -msgid "Heap" -msgstr "Динам. память" +#: ../src/ui/dialog/inkscape-preferences.cpp:650 +#, fuzzy +msgid "Maximized" +msgstr "С оптимизацией" -#: ../src/ui/dialog/memory.cpp:97 -msgid "In Use" -msgstr "Используется" +#: ../src/ui/dialog/inkscape-preferences.cpp:654 +#, fuzzy +msgid "Default window size:" +msgstr "Параметры сетки по умолчанию" -#. TRANSLATORS: "Slack" refers to memory which is in the heap but currently unused. -#. More typical usage is to call this memory "free" rather than "slack". -#: ../src/ui/dialog/memory.cpp:100 -msgid "Slack" -msgstr "Резерв" +#: ../src/ui/dialog/inkscape-preferences.cpp:655 +#, fuzzy +msgid "Set the default window size" +msgstr "Создание обычного градиента" -#: ../src/ui/dialog/memory.cpp:101 -msgid "Total" -msgstr "Всего" +#: ../src/ui/dialog/inkscape-preferences.cpp:658 +#, fuzzy +msgid "Saving window geometry (size and position)" +msgstr "Запоминание геометрии окна (размера и положения)" -#: ../src/ui/dialog/memory.cpp:141 ../src/ui/dialog/memory.cpp:147 -#: ../src/ui/dialog/memory.cpp:154 ../src/ui/dialog/memory.cpp:186 -msgid "Unknown" -msgstr "Неизвестно" +#: ../src/ui/dialog/inkscape-preferences.cpp:660 +msgid "Let the window manager determine placement of all windows" +msgstr "Пусть оконный менеджер сам определяет располжение окон" -#: ../src/ui/dialog/memory.cpp:167 -msgid "Combined" -msgstr "Совокупно" +#: ../src/ui/dialog/inkscape-preferences.cpp:662 +msgid "" +"Remember and use the last window's geometry (saves geometry to user " +"preferences)" +msgstr "" +"Запоминать (в параметрах программы) и использовать геометрию последнего окна" -#: ../src/ui/dialog/memory.cpp:209 -msgid "Recalculate" -msgstr "Пересчитать" +#: ../src/ui/dialog/inkscape-preferences.cpp:664 +msgid "" +"Save and restore window geometry for each document (saves geometry in the " +"document)" +msgstr "" +"Запоминать (в параметрах документа) и использовать геометрию окна каждого " +"документа" -#: ../src/ui/dialog/messages.cpp:47 +#: ../src/ui/dialog/inkscape-preferences.cpp:666 #, fuzzy -msgid "Clear log messages" -msgstr "Сохранять отладочные сообщения" - -#: ../src/ui/dialog/messages.cpp:81 -msgid "Ready." -msgstr "Готово." +msgid "Saving dialogs status" +msgstr "Показывать диалог при запуске" -#: ../src/ui/dialog/messages.cpp:174 -msgid "Log capture started." +#: ../src/ui/dialog/inkscape-preferences.cpp:670 +msgid "" +"Save and restore dialogs status (the last open windows dialogs are saved " +"when it closes)" msgstr "" -#: ../src/ui/dialog/messages.cpp:203 -msgid "Log capture stopped." -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:674 +#, fuzzy +msgid "Dialog behavior (requires restart)" +msgstr "Поведение диалогов (требует перезапуска программы)" -#: ../src/ui/dialog/new-from-template.cpp:24 +#: ../src/ui/dialog/inkscape-preferences.cpp:680 #, fuzzy -msgid "Create from template" -msgstr "Рисовать кривую Спиро" +msgid "Desktop integration" +msgstr "Назначение" -#: ../src/ui/dialog/new-from-template.cpp:26 -msgid "New From Template" +#: ../src/ui/dialog/inkscape-preferences.cpp:682 +msgid "Use Windows like open and save dialogs" msgstr "" -#: ../src/ui/dialog/object-attributes.cpp:47 -msgid "Href:" -msgstr "Href:" +#: ../src/ui/dialog/inkscape-preferences.cpp:684 +msgid "Use GTK open and save dialogs " +msgstr "" -#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkRoleAttribute -#. Identifies the type of the related resource with an absolute URI -#: ../src/ui/dialog/object-attributes.cpp:52 -msgid "Role:" -msgstr "Role:" +#: ../src/ui/dialog/inkscape-preferences.cpp:688 +msgid "Dialogs on top:" +msgstr "Способ размещения диалогов поверх окна:" -#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkArcRoleAttribute -#. For situations where the nature/role alone isn't enough, this offers an additional URI defining the purpose of the link. -#: ../src/ui/dialog/object-attributes.cpp:55 -msgid "Arcrole:" -msgstr "Arcrole:" +#: ../src/ui/dialog/inkscape-preferences.cpp:691 +msgid "Dialogs are treated as regular windows" +msgstr "Диалоги рассматриваются как обычные окна" -#: ../src/ui/dialog/object-attributes.cpp:58 -#: ../share/extensions/polyhedron_3d.inx.h:47 -msgid "Show:" -msgstr "Показывать:" +#: ../src/ui/dialog/inkscape-preferences.cpp:693 +msgid "Dialogs stay on top of document windows" +msgstr "Диалоги остаются поверх окон с документами" -#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkActuateAttribute -#: ../src/ui/dialog/object-attributes.cpp:60 -msgid "Actuate:" -msgstr "Actuate:" +#: ../src/ui/dialog/inkscape-preferences.cpp:695 +msgid "Same as Normal but may work better with some window managers" +msgstr "" +"То же, что и «Нормальный», но может лучше работать с некоторыми оконными " +"менеджерами" -#: ../src/ui/dialog/object-attributes.cpp:65 -msgid "URL:" -msgstr "URL:" +#: ../src/ui/dialog/inkscape-preferences.cpp:698 +#, fuzzy +msgid "Dialog Transparency" +msgstr "Прозрачность диалога:" -#: ../src/ui/dialog/object-attributes.cpp:70 +#: ../src/ui/dialog/inkscape-preferences.cpp:700 #, fuzzy -msgid "Image Rendering:" -msgstr "Тип печати" +msgid "_Opacity when focused:" +msgstr "Непрозрачность в фокусе:" -#: ../src/ui/dialog/object-properties.cpp:58 -#: ../src/ui/dialog/object-properties.cpp:399 -#: ../src/ui/dialog/object-properties.cpp:470 -#: ../src/ui/dialog/object-properties.cpp:477 -msgid "_ID:" -msgstr "_ID:" +#: ../src/ui/dialog/inkscape-preferences.cpp:702 +#, fuzzy +msgid "Opacity when _unfocused:" +msgstr "Непрозрачность вне фокуса:" -#: ../src/ui/dialog/object-properties.cpp:60 -msgid "_Title:" -msgstr "_Название:" +#: ../src/ui/dialog/inkscape-preferences.cpp:704 +#, fuzzy +msgid "_Time of opacity change animation:" +msgstr "Длительность анимации:" -#: ../src/ui/dialog/object-properties.cpp:61 +#: ../src/ui/dialog/inkscape-preferences.cpp:707 #, fuzzy -msgid "_Image Rendering:" -msgstr "Тип печати" +msgid "Miscellaneous" +msgstr "Прочие параметры:" -#: ../src/ui/dialog/object-properties.cpp:62 -msgid "_Hide" -msgstr "С_крыть" +#: ../src/ui/dialog/inkscape-preferences.cpp:710 +msgid "Whether dialog windows are to be hidden in the window manager taskbar" +msgstr "Убирать ли диалоговые окна из панели задач оконного менеджера" -#: ../src/ui/dialog/object-properties.cpp:63 -msgid "L_ock" -msgstr "За_блокировать" +#: ../src/ui/dialog/inkscape-preferences.cpp:713 +msgid "" +"Zoom drawing when document window is resized, to keep the same area visible " +"(this is the default which can be changed in any window using the button " +"above the right scrollbar)" +msgstr "" +"Масштабировать рисунок при изменении размеров окна, чтобы сохранить видимую " +"область (для каждого окна это можно изменить с помощью кнопки над правой " +"полосой прокрутки)" -#. Create the entry box for the object id -#: ../src/ui/dialog/object-properties.cpp:139 +#: ../src/ui/dialog/inkscape-preferences.cpp:715 msgid "" -"The id= attribute (only letters, digits, and the characters .-_: allowed)" -msgstr "Атрибут id= (разрешены только латинские буквы, цифры и символы .-_:)" +"Save documents viewport (zoom and panning position). Useful to turn off when " +"sharing version controlled files." +msgstr "" -#. Create the entry box for the object label -#: ../src/ui/dialog/object-properties.cpp:174 -msgid "A freeform label for the object" -msgstr "Произвольная метка объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:717 +msgid "Whether dialog windows have a close button (requires restart)" +msgstr "Отображается ли в диалогах кнопка «Закрыть»" -#. Create the frame for the object description -#: ../src/ui/dialog/object-properties.cpp:225 -#, fuzzy -msgid "_Description:" -msgstr "Описание" +#: ../src/ui/dialog/inkscape-preferences.cpp:718 +msgid "Windows" +msgstr "Окна" -#: ../src/ui/dialog/object-properties.cpp:260 -msgid "" -"The 'image-rendering' property can influence how a bitmap is up-scaled:\n" -"\t'auto' no preference;\n" -"\t'optimizeQuality' smooth;\n" -"\t'optimizeSpeed' blocky.\n" -"Note that this behaviour is not defined in the SVG 1.1 specification and not " -"all browsers follow this interpretation." +#. Grids +#: ../src/ui/dialog/inkscape-preferences.cpp:721 +msgid "Line color when zooming out" msgstr "" -#. Hide -#: ../src/ui/dialog/object-properties.cpp:293 -msgid "Check to make the object invisible" -msgstr "Сделать этот объект невидимым" - -#. Lock -#. TRANSLATORS: "Lock" is a verb here -#: ../src/ui/dialog/object-properties.cpp:309 -msgid "Check to make the object insensitive (not selectable by mouse)" -msgstr "Сделать этот объект невыделяемым" +#: ../src/ui/dialog/inkscape-preferences.cpp:724 +#, fuzzy +msgid "The gridlines will be shown in minor grid line color" +msgstr "" +"При просмотре на большом удалении основные линии сетки будут отображаться " +"обычным цветом." -#. Button for setting the object's id, label, title and description. -#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2632 -#: ../src/verbs.cpp:2638 -msgid "_Set" -msgstr "_Установить" +#: ../src/ui/dialog/inkscape-preferences.cpp:726 +#, fuzzy +msgid "The gridlines will be shown in major grid line color" +msgstr "" +"При просмотре на большом удалении основные линии сетки будут отображаться " +"обычным цветом." -#. Create the frame for interactivity options -#: ../src/ui/dialog/object-properties.cpp:339 -msgid "_Interactivity" -msgstr "_Интерактивность" +#: ../src/ui/dialog/inkscape-preferences.cpp:728 +msgid "Default grid settings" +msgstr "Параметры сетки по умолчанию" -#: ../src/ui/dialog/object-properties.cpp:386 -#: ../src/ui/dialog/object-properties.cpp:391 -msgid "Ref" -msgstr "Ref" +#: ../src/ui/dialog/inkscape-preferences.cpp:734 +#: ../src/ui/dialog/inkscape-preferences.cpp:759 +msgid "Grid units:" +msgstr "Единицы сетки:" -#: ../src/ui/dialog/object-properties.cpp:472 -msgid "Id invalid! " -msgstr "ID неверен" +#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:764 +msgid "Origin X:" +msgstr "Точка отсчета по X:" -#: ../src/ui/dialog/object-properties.cpp:474 -msgid "Id exists! " -msgstr "Такой ID уже есть" +#: ../src/ui/dialog/inkscape-preferences.cpp:740 +#: ../src/ui/dialog/inkscape-preferences.cpp:765 +msgid "Origin Y:" +msgstr "Точка отсчета по Y:" -#: ../src/ui/dialog/object-properties.cpp:480 -msgid "Set object ID" -msgstr "Установка ID объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:745 +msgid "Spacing X:" +msgstr "Интервал по X:" -#: ../src/ui/dialog/object-properties.cpp:494 -msgid "Set object label" -msgstr "Установка метки объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:746 +#: ../src/ui/dialog/inkscape-preferences.cpp:768 +msgid "Spacing Y:" +msgstr "Интервал по Y:" -#: ../src/ui/dialog/object-properties.cpp:500 -msgid "Set object title" -msgstr "Установка заголовка объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:748 +#: ../src/ui/dialog/inkscape-preferences.cpp:749 +#: ../src/ui/dialog/inkscape-preferences.cpp:773 +#: ../src/ui/dialog/inkscape-preferences.cpp:774 +msgid "Minor grid line color:" +msgstr "Цвет дополнительных линий сетки:" -#: ../src/ui/dialog/object-properties.cpp:509 -msgid "Set object description" -msgstr "Установка описания объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:749 +#: ../src/ui/dialog/inkscape-preferences.cpp:774 +msgid "Color used for normal grid lines" +msgstr "Цвет обычных линий сетки" -#: ../src/ui/dialog/object-properties.cpp:552 -msgid "Lock object" -msgstr "Блокировка объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:750 +#: ../src/ui/dialog/inkscape-preferences.cpp:751 +#: ../src/ui/dialog/inkscape-preferences.cpp:775 +#: ../src/ui/dialog/inkscape-preferences.cpp:776 +msgid "Major grid line color:" +msgstr "Цвет основных линий сетки:" -#: ../src/ui/dialog/object-properties.cpp:552 -msgid "Unlock object" -msgstr "Разблокировка объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:751 +#: ../src/ui/dialog/inkscape-preferences.cpp:776 +msgid "Color used for major (highlighted) grid lines" +msgstr "Цвет основных линий сетки" -#: ../src/ui/dialog/object-properties.cpp:568 -msgid "Hide object" -msgstr "Сокрытие объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:753 +#: ../src/ui/dialog/inkscape-preferences.cpp:778 +msgid "Major grid line every:" +msgstr "Основная линия сетки каждые:" -#: ../src/ui/dialog/object-properties.cpp:568 -msgid "Unhide object" -msgstr "Раскрытие объекта" +#: ../src/ui/dialog/inkscape-preferences.cpp:754 +msgid "Show dots instead of lines" +msgstr "Показывать точки вместо линий" -#: ../src/ui/dialog/ocaldialogs.cpp:715 -msgid "Clipart found" +#: ../src/ui/dialog/inkscape-preferences.cpp:755 +msgid "If set, display dots at gridpoints instead of gridlines" msgstr "" +"Если включено, сетка отображается лишь точками пересечения ее линий, а не " +"самими линиями" -#: ../src/ui/dialog/ocaldialogs.cpp:764 -#, fuzzy -msgid "Downloading image..." -msgstr "Создается растровая копия..." +#: ../src/ui/dialog/inkscape-preferences.cpp:836 +msgid "Input/Output" +msgstr "Ввод и вывод" -#: ../src/ui/dialog/ocaldialogs.cpp:912 -#, fuzzy -msgid "Could not download image" -msgstr "Не удалось найти файл: %s" +#: ../src/ui/dialog/inkscape-preferences.cpp:839 +msgid "Use current directory for \"Save As ...\"" +msgstr "Использовать текущий каталог при сохранении файла под другим именем" -#: ../src/ui/dialog/ocaldialogs.cpp:922 -msgid "Clipart downloaded successfully" +#: ../src/ui/dialog/inkscape-preferences.cpp:841 +#, fuzzy +msgid "" +"When this option is on, the \"Save as...\" and \"Save a Copy\" dialogs will " +"always open in the directory where the currently open document is; when it's " +"off, each will open in the directory where you last saved a file using it" msgstr "" +"Если включено, при сохранении файла под другим именем диалога всегда будет " +"открываться в каталоге, где сохранён текущий файл. Если выключено, будет " +"открываться каталог, в котором был в последний раз сохранён какой-либо файл." -#: ../src/ui/dialog/ocaldialogs.cpp:936 -#, fuzzy -msgid "Could not download thumbnail file" -msgstr "Не удалось найти файл: %s" +#: ../src/ui/dialog/inkscape-preferences.cpp:843 +msgid "Add label comments to printing output" +msgstr "Добавлять метки в виде комментариев при выводе на печать" -#: ../src/ui/dialog/ocaldialogs.cpp:1011 -#, fuzzy -msgid "No description" -msgstr " описание:" +#: ../src/ui/dialog/inkscape-preferences.cpp:845 +msgid "" +"When on, a comment will be added to the raw print output, marking the " +"rendered output for an object with its label" +msgstr "" +"С этой опцией при выводе на печать будут добавляться комментарии, содержащие " +"метки для каждого объекта" -#: ../src/ui/dialog/ocaldialogs.cpp:1079 +#: ../src/ui/dialog/inkscape-preferences.cpp:847 #, fuzzy -msgid "Searching clipart..." -msgstr "Выполняется разворот контуров..." +msgid "Add default metadata to new documents" +msgstr "Изменить сведения о документе, сохраняемые вместе с ним" -#: ../src/ui/dialog/ocaldialogs.cpp:1099 ../src/ui/dialog/ocaldialogs.cpp:1120 -#, fuzzy -msgid "Could not connect to the Open Clip Art Library" -msgstr "Импортировать документ из Open Clip Art Library" +#: ../src/ui/dialog/inkscape-preferences.cpp:849 +msgid "" +"Add default metadata to new documents. Default metadata can be set from " +"Document Properties->Metadata." +msgstr "" -#: ../src/ui/dialog/ocaldialogs.cpp:1145 -#, fuzzy -msgid "Could not parse search results" -msgstr "Невозможно разобрать данные SVG" +#: ../src/ui/dialog/inkscape-preferences.cpp:853 +msgid "_Grab sensitivity:" +msgstr "_Чувствительность захвата:" -#: ../src/ui/dialog/ocaldialogs.cpp:1177 +#: ../src/ui/dialog/inkscape-preferences.cpp:853 #, fuzzy -msgid "No clipart named <b>%1</b> was found." -msgstr "Из буфера обмена" +msgid "pixels (requires restart)" +msgstr "(требует перезапуска программы)" -#: ../src/ui/dialog/ocaldialogs.cpp:1179 +#: ../src/ui/dialog/inkscape-preferences.cpp:854 msgid "" -"Please make sure all keywords are spelled correctly, or try again with " -"different keywords." +"How close on the screen you need to be to an object to be able to grab it " +"with mouse (in screen pixels)" msgstr "" +"Насколько близко (в пикселах) нужно подвести курсор мыши к объекту, чтобы " +"ухватить его мышью" -#: ../src/ui/dialog/ocaldialogs.cpp:1231 -msgid "Search" -msgstr "Искать" +#: ../src/ui/dialog/inkscape-preferences.cpp:856 +msgid "_Click/drag threshold:" +msgstr "Порог _щелчка/перетаскивания:" -#: ../src/ui/dialog/ocaldialogs.cpp:1243 -msgid "Close" -msgstr "Закрыть" +#: ../src/ui/dialog/inkscape-preferences.cpp:856 +#: ../src/ui/dialog/inkscape-preferences.cpp:1198 +#: ../src/ui/dialog/inkscape-preferences.cpp:1202 +#: ../src/ui/dialog/inkscape-preferences.cpp:1212 +msgid "pixels" +msgstr "пикселов" -#: ../src/ui/dialog/pixelartdialog.cpp:190 -msgid "_Curves (multiplier):" +#: ../src/ui/dialog/inkscape-preferences.cpp:857 +msgid "" +"Maximum mouse drag (in screen pixels) which is considered a click, not a drag" msgstr "" +"Максимальное количество пикселов, перетаскивание на которое\n" +"воспринимается как щелчок, а не как перетаскивание" -#: ../src/ui/dialog/pixelartdialog.cpp:193 -msgid "Favors connections that are part of a long curve" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:860 +msgid "_Handle size:" +msgstr "_Размер рычагов:" -#: ../src/ui/dialog/pixelartdialog.cpp:204 +#: ../src/ui/dialog/inkscape-preferences.cpp:861 #, fuzzy -msgid "_Islands (weight):" -msgstr "Высота прописных:" - -#: ../src/ui/dialog/pixelartdialog.cpp:207 -msgid "Avoid single disconnected pixels" -msgstr "" +msgid "Set the relative size of node handles" +msgstr "Смещение рычагов узла" -#: ../src/ui/dialog/pixelartdialog.cpp:209 -#, fuzzy -msgid "A constant vote value" -msgstr "Сокращение межстрочного интервала" +#: ../src/ui/dialog/inkscape-preferences.cpp:863 +msgid "Use pressure-sensitive tablet (requires restart)" +msgstr "Использовать графический планшет (требует перезапуска)" -#: ../src/ui/dialog/pixelartdialog.cpp:219 -msgid "Sparse pixels (window _radius):" +#: ../src/ui/dialog/inkscape-preferences.cpp:865 +msgid "" +"Use the capabilities of a tablet or other pressure-sensitive device. Disable " +"this only if you have problems with the tablet (you can still use it as a " +"mouse)" msgstr "" +"Использовать возможности графического планшета или иного устройства, " +"распознающего силу нажатия. Отключайте этот параметр только при " +"возникновении неполадок с устройством. Мышь по-прежнему будет доступна." -#: ../src/ui/dialog/pixelartdialog.cpp:228 -msgid "The radius of the window analyzed" +#: ../src/ui/dialog/inkscape-preferences.cpp:867 +msgid "Switch tool based on tablet device (requires restart)" msgstr "" +"Менять инструмент в зависимости от активного устройства\n" +"графического планшета (требует перезапуска)" -#: ../src/ui/dialog/pixelartdialog.cpp:229 -msgid "Sparse pixels (_multiplier):" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:869 +msgid "" +"Change tool as different devices are used on the tablet (pen, eraser, mouse)" +msgstr "Менять инструмент в зависимости от активного инструмента планшета" -#: ../src/ui/dialog/pixelartdialog.cpp:240 -msgid "Favors connections that are part of foreground color" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:870 +msgid "Input devices" +msgstr "Устройства ввода" -#: ../src/ui/dialog/pixelartdialog.cpp:246 -msgid "The heuristic computed vote will be multiplied by this value" -msgstr "" +#. SVG output options +#: ../src/ui/dialog/inkscape-preferences.cpp:873 +msgid "Use named colors" +msgstr "Использовать именованные цвета" -#: ../src/ui/dialog/pixelartdialog.cpp:259 -msgid "Heuristics" +#: ../src/ui/dialog/inkscape-preferences.cpp:874 +msgid "" +"If set, write the CSS name of the color when available (e.g. 'red' or " +"'magenta') instead of the numeric value" msgstr "" +"Если включено, записывать название цвета по CSS (например, 'red' или " +"'magenta') вместо числового значения" -#: ../src/ui/dialog/pixelartdialog.cpp:266 -#, fuzzy -msgid "_Voronoi diagram" -msgstr "Мозаика Вороного" +#: ../src/ui/dialog/inkscape-preferences.cpp:876 +msgid "XML formatting" +msgstr "Форматирование XML" -#: ../src/ui/dialog/pixelartdialog.cpp:267 -msgid "Output composed of straight lines" -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:878 +msgid "Inline attributes" +msgstr "Внутристрочные атрибуты" -#: ../src/ui/dialog/pixelartdialog.cpp:273 +#: ../src/ui/dialog/inkscape-preferences.cpp:879 +msgid "Put attributes on the same line as the element tag" +msgstr "Атрибуты пишутся в той же строке, что и тэги элемента" + +#: ../src/ui/dialog/inkscape-preferences.cpp:882 #, fuzzy -msgid "Convert to _B-spline curves" -msgstr "Преобразовать в пунктир" +msgid "_Indent, spaces:" +msgstr "Отступ в пробелах:" -#: ../src/ui/dialog/pixelartdialog.cpp:274 -msgid "Preserve staircasing artifacts" +#: ../src/ui/dialog/inkscape-preferences.cpp:882 +msgid "" +"The number of spaces to use for indenting nested elements; set to 0 for no " +"indentation" msgstr "" +"Количество пробелов, используемых для отступов вложенных элементов; ноль " +"выключает отступы" -#: ../src/ui/dialog/pixelartdialog.cpp:281 -#, fuzzy -msgid "_Smooth curves" -msgstr "Сгладить _углы" +#: ../src/ui/dialog/inkscape-preferences.cpp:884 +msgid "Path data" +msgstr "Данные контуров" -#: ../src/ui/dialog/pixelartdialog.cpp:282 -msgid "The Kopf-Lischinski algorithm" +#: ../src/ui/dialog/inkscape-preferences.cpp:887 +msgid "Absolute" msgstr "" -#: ../src/ui/dialog/pixelartdialog.cpp:289 -msgid "Output" -msgstr "Вывод" - -#: ../src/ui/dialog/pixelartdialog.cpp:297 -#: ../src/ui/dialog/tracedialog.cpp:814 -msgid "Reset all settings to defaults" -msgstr "Сбросить значения всех параметров до исходных" +#: ../src/ui/dialog/inkscape-preferences.cpp:887 +#, fuzzy +msgid "Relative" +msgstr "Ориентир: " -#: ../src/ui/dialog/pixelartdialog.cpp:302 -#: ../src/ui/dialog/tracedialog.cpp:819 -msgid "Abort a trace in progress" -msgstr "Прервать векторизацию" +#: ../src/ui/dialog/inkscape-preferences.cpp:887 +#: ../src/ui/dialog/inkscape-preferences.cpp:1177 +msgid "Optimized" +msgstr "С оптимизацией" -#: ../src/ui/dialog/pixelartdialog.cpp:306 -#: ../src/ui/dialog/tracedialog.cpp:823 -msgid "Execute the trace" -msgstr "Векторизовать" +#: ../src/ui/dialog/inkscape-preferences.cpp:891 +msgid "Path string format:" +msgstr "" -#: ../src/ui/dialog/pixelartdialog.cpp:388 +#: ../src/ui/dialog/inkscape-preferences.cpp:891 msgid "" -"Image looks too big. Process may take a while and is wise to save your " -"document before continue.\n" -"\n" -"Continue the procedure (without saving)?" +"Path data should be written: only with absolute coordinates, only with " +"relative coordinates, or optimized for string length (mixed absolute and " +"relative coordinates)" msgstr "" -#: ../src/ui/dialog/pixelartdialog.cpp:422 +#: ../src/ui/dialog/inkscape-preferences.cpp:893 +msgid "Force repeat commands" +msgstr "Принудительно повторять команды" + +#: ../src/ui/dialog/inkscape-preferences.cpp:894 msgid "" -"Image looks too big. Process may take a while and it is wise to save your " -"document before continuing.\n" -"\n" -"Continue the procedure (without saving)?" +"Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " +"of 'L 1,2 3,4')" msgstr "" +"Принудительно повторять команды контуров (например, 'L 1,2 L 3,4' вместо 'L " +"1,2 3,4')" -#: ../src/ui/dialog/pixelartdialog.cpp:499 -#, fuzzy -msgid "Trace pixel art" -msgstr "пикселов при" +#: ../src/ui/dialog/inkscape-preferences.cpp:896 +msgid "Numbers" +msgstr "Числа" -#: ../src/ui/dialog/polar-arrange-tab.cpp:43 +#: ../src/ui/dialog/inkscape-preferences.cpp:899 #, fuzzy -msgctxt "Polar arrange tab" -msgid "Anchor point:" -msgstr "Ориентация" +msgid "_Numeric precision:" +msgstr "Точность чисел:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:47 -#, fuzzy -msgctxt "Polar arrange tab" -msgid "Object's bounding box:" -msgstr "площадке" +#: ../src/ui/dialog/inkscape-preferences.cpp:899 +msgid "Significant figures of the values written to the SVG file" +msgstr "" -#: ../src/ui/dialog/polar-arrange-tab.cpp:54 +#: ../src/ui/dialog/inkscape-preferences.cpp:902 #, fuzzy -msgctxt "Polar arrange tab" -msgid "Object's rotational center" -msgstr "Центр вращения объекта" +msgid "Minimum _exponent:" +msgstr "Минимальная экспонента:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:59 +#: ../src/ui/dialog/inkscape-preferences.cpp:902 +msgid "" +"The smallest number written to SVG is 10 to the power of this exponent; " +"anything smaller is written as zero" +msgstr "" +"Самое малое число, записываемое в файл SVG равно десяти в этой степени; всё, " +"что меньше, записывается как ноль." + +#. Code to add controls for attribute checking options +#. Add incorrect style properties options +#: ../src/ui/dialog/inkscape-preferences.cpp:907 +msgid "Improper Attributes Actions" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:909 +#: ../src/ui/dialog/inkscape-preferences.cpp:917 +#: ../src/ui/dialog/inkscape-preferences.cpp:925 #, fuzzy -msgctxt "Polar arrange tab" -msgid "Arrange on:" -msgstr "Расстановка" +msgid "Print warnings" +msgstr "Метки для печати" -#: ../src/ui/dialog/polar-arrange-tab.cpp:63 +#: ../src/ui/dialog/inkscape-preferences.cpp:910 +msgid "" +"Print warning if invalid or non-useful attributes found. Database files " +"located in inkscape_data_dir/attributes." +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:911 #, fuzzy -msgctxt "Polar arrange tab" -msgid "First selected circle/ellipse/arc" -msgstr "Рисовать круги, эллипсы и дуги" +msgid "Remove attributes" +msgstr "Установить атрибут" -#: ../src/ui/dialog/polar-arrange-tab.cpp:68 +#: ../src/ui/dialog/inkscape-preferences.cpp:912 +msgid "Delete invalid or non-useful attributes from element tag" +msgstr "" + +#. Add incorrect style properties options +#: ../src/ui/dialog/inkscape-preferences.cpp:915 +msgid "Inappropriate Style Properties Actions" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:918 +msgid "" +"Print warning if inappropriate style properties found (i.e. 'font-family' " +"set on a <rect>). Database files located in inkscape_data_dir/attributes." +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:919 +#: ../src/ui/dialog/inkscape-preferences.cpp:927 #, fuzzy -msgctxt "Polar arrange tab" -msgid "Last selected circle/ellipse/arc" -msgstr "Последним выбранным цветом" +msgid "Remove style properties" +msgstr "Вывести свойства этого треугольника" -#: ../src/ui/dialog/polar-arrange-tab.cpp:73 +#: ../src/ui/dialog/inkscape-preferences.cpp:920 #, fuzzy -msgctxt "Polar arrange tab" -msgid "Parameterized:" -msgstr "Параметры" +msgid "Delete inappropriate style properties" +msgstr "Смена свойств направляющей" -#: ../src/ui/dialog/polar-arrange-tab.cpp:78 +#. Add default or inherited style properties options +#: ../src/ui/dialog/inkscape-preferences.cpp:923 +msgid "Non-useful Style Properties Actions" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:926 +msgid "" +"Print warning if redundant style properties found (i.e. if a property has " +"the default value and a different value is not inherited or if value is the " +"same as would be inherited). Database files located in inkscape_data_dir/" +"attributes." +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:928 #, fuzzy -msgid "Center X/Y:" -msgstr "Выключка по центру" +msgid "Delete redundant style properties" +msgstr "Смена свойств направляющей" + +#: ../src/ui/dialog/inkscape-preferences.cpp:930 +msgid "Check Attributes and Style Properties on" +msgstr "" -#: ../src/ui/dialog/polar-arrange-tab.cpp:91 +#: ../src/ui/dialog/inkscape-preferences.cpp:932 #, fuzzy -msgid "Radius X/Y:" -msgstr "Радиус:" +msgid "Reading" +msgstr "Затенение" -#: ../src/ui/dialog/polar-arrange-tab.cpp:104 -#, fuzzy -msgid "Angle X/Y:" -msgstr "Угол X:" +#: ../src/ui/dialog/inkscape-preferences.cpp:933 +msgid "" +"Check attributes and style properties on reading in SVG files (including " +"those internal to Inkscape which will slow down startup)" +msgstr "" -#: ../src/ui/dialog/polar-arrange-tab.cpp:118 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 #, fuzzy -msgid "Rotate objects" -msgstr "Вращение узлов" +msgid "Editing" +msgstr "Осветление" -#: ../src/ui/dialog/polar-arrange-tab.cpp:306 -msgid "Couldn't find an ellipse in selection" +#: ../src/ui/dialog/inkscape-preferences.cpp:935 +msgid "" +"Check attributes and style properties while editing SVG files (may slow down " +"Inkscape, mostly useful for debugging)" msgstr "" -#: ../src/ui/dialog/polar-arrange-tab.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:936 #, fuzzy -msgid "Arrange on ellipse" -msgstr "Создание эллипса" - -#: ../src/ui/dialog/print.cpp:111 -msgid "Could not open temporary PNG for bitmap printing" -msgstr "Не удалось открыть временный файл PNG для растровой печати" +msgid "Writing" +msgstr "Сценарии" -#: ../src/ui/dialog/print.cpp:155 -msgid "Could not set up Document" -msgstr "Не удалось подготовить документ" +#: ../src/ui/dialog/inkscape-preferences.cpp:937 +msgid "Check attributes and style properties on writing out SVG files" +msgstr "" -#: ../src/ui/dialog/print.cpp:159 -msgid "Failed to set CairoRenderContext" -msgstr "Не удалось установить CairoRenderContext" +#: ../src/ui/dialog/inkscape-preferences.cpp:939 +msgid "SVG output" +msgstr "Экспорт в SVG" -#. set up dialog title, based on document name -#: ../src/ui/dialog/print.cpp:197 -msgid "SVG Document" -msgstr "Документ SVG" +#. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm +#: ../src/ui/dialog/inkscape-preferences.cpp:945 +msgid "Perceptual" +msgstr "Воспринимаемая" -#: ../src/ui/dialog/print.cpp:198 -msgid "Print" -msgstr "Напечатать" +#: ../src/ui/dialog/inkscape-preferences.cpp:945 +msgid "Relative Colorimetric" +msgstr "Относительная колориметрическая" -#: ../src/ui/dialog/spellcheck.cpp:73 -msgid "_Accept" -msgstr "_Принять" +#: ../src/ui/dialog/inkscape-preferences.cpp:945 +msgid "Absolute Colorimetric" +msgstr "Абсолютная колориметрическая" -#: ../src/ui/dialog/spellcheck.cpp:74 -msgid "_Ignore once" -msgstr "_Пропустить единожды" +#: ../src/ui/dialog/inkscape-preferences.cpp:949 +msgid "(Note: Color management has been disabled in this build)" +msgstr "(Примечание: в этой сборке управление цветом отключено)" -#: ../src/ui/dialog/spellcheck.cpp:75 -msgid "_Ignore" -msgstr "_Пропустить" +#: ../src/ui/dialog/inkscape-preferences.cpp:953 +msgid "Display adjustment" +msgstr "Коррекция вывода на монитор" -#: ../src/ui/dialog/spellcheck.cpp:76 -msgid "A_dd" +#: ../src/ui/dialog/inkscape-preferences.cpp:963 +#, c-format +msgid "" +"The ICC profile to use to calibrate display output.\n" +"Searched directories:%s" msgstr "" +"Профиль ICC, используемый для коррекции вывода на дисплей.\n" +"В этих каталогах ищутся профили: %s" -#: ../src/ui/dialog/spellcheck.cpp:78 -msgid "_Stop" -msgstr "_Остановить" +#: ../src/ui/dialog/inkscape-preferences.cpp:964 +msgid "Display profile:" +msgstr "Профиль монитора:" -#: ../src/ui/dialog/spellcheck.cpp:79 -msgid "_Start" -msgstr "_Начать" +#: ../src/ui/dialog/inkscape-preferences.cpp:969 +msgid "Retrieve profile from display" +msgstr "Получать профиль от видеоподсистемы" -#: ../src/ui/dialog/spellcheck.cpp:109 -msgid "Suggestions:" -msgstr "Варианты:" +#: ../src/ui/dialog/inkscape-preferences.cpp:972 +msgid "Retrieve profiles from those attached to displays via XICC" +msgstr "Использовать профиль, назначенный монитору через xicc" -#: ../src/ui/dialog/spellcheck.cpp:124 -msgid "Accept the chosen suggestion" -msgstr "Принять выбранный вариант" +#: ../src/ui/dialog/inkscape-preferences.cpp:974 +msgid "Retrieve profiles from those attached to displays" +msgstr "" +"Использовать профили, используемые видеподсистемой для каждого из мониторов" -#: ../src/ui/dialog/spellcheck.cpp:125 -msgid "Ignore this word only once" -msgstr "Проигнорировать это слово только один раз" +#: ../src/ui/dialog/inkscape-preferences.cpp:979 +msgid "Display rendering intent:" +msgstr "Цветопередача монитора:" -#: ../src/ui/dialog/spellcheck.cpp:126 -msgid "Ignore this word in this session" -msgstr "Проигнорировать это слово для текущего сеанса" +#: ../src/ui/dialog/inkscape-preferences.cpp:980 +msgid "The rendering intent to use to calibrate display output" +msgstr "Цветопередача выводимых на дисплей изображений" -#: ../src/ui/dialog/spellcheck.cpp:127 -msgid "Add this word to the chosen dictionary" -msgstr "Добавить это слово в выбранный словарь" +#: ../src/ui/dialog/inkscape-preferences.cpp:982 +msgid "Proofing" +msgstr "Цветопроба" -#: ../src/ui/dialog/spellcheck.cpp:141 -msgid "Stop the check" -msgstr "Остановить проверку орфографии" +#: ../src/ui/dialog/inkscape-preferences.cpp:984 +msgid "Simulate output on screen" +msgstr "Имитировать устройство вывода" -#: ../src/ui/dialog/spellcheck.cpp:142 -msgid "Start the check" -msgstr "Начать проверку" +#: ../src/ui/dialog/inkscape-preferences.cpp:986 +msgid "Simulates output of target device" +msgstr "Имитировать на экране устройство вывода" -#: ../src/ui/dialog/spellcheck.cpp:460 -#, c-format -msgid "<b>Finished</b>, <b>%d</b> words added to dictionary" -msgstr "Проверка <b>завершена</b>, добавленных в словарь слов: <b>%d</b>" +#: ../src/ui/dialog/inkscape-preferences.cpp:988 +msgid "Mark out of gamut colors" +msgstr "Помечать цвета вне цветового охвата" -#: ../src/ui/dialog/spellcheck.cpp:462 -msgid "<b>Finished</b>, nothing suspicious found" -msgstr "Проверка <b>завершена</b>, ошибок не найдено" +#: ../src/ui/dialog/inkscape-preferences.cpp:990 +msgid "Highlights colors that are out of gamut for the target device" +msgstr "" +"Помечать цвета, выходящие за рамки цветового охвата для данного устройства" -#: ../src/ui/dialog/spellcheck.cpp:578 -#, c-format -msgid "Not in dictionary (%s): <b>%s</b>" -msgstr "Нет в словаре (%s): <b>%s</b>" +#: ../src/ui/dialog/inkscape-preferences.cpp:1002 +msgid "Out of gamut warning color:" +msgstr "Цвета вне цветового охвата:" -#: ../src/ui/dialog/spellcheck.cpp:727 -msgid "<i>Checking...</i>" -msgstr "<i>Выполняется проверка...</i>" +#: ../src/ui/dialog/inkscape-preferences.cpp:1003 +msgid "Selects the color used for out of gamut warning" +msgstr "Выберите цвет предупреждения о выходе за цветовой охват" -#: ../src/ui/dialog/spellcheck.cpp:796 -msgid "Fix spelling" -msgstr "Исправить орфографию" +#: ../src/ui/dialog/inkscape-preferences.cpp:1005 +msgid "Device profile:" +msgstr "Профиль устройства вывода:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:138 -msgid "Set SVG Font attribute" -msgstr "Установить атрибут SVG Font" +#: ../src/ui/dialog/inkscape-preferences.cpp:1006 +msgid "The ICC profile to use to simulate device output" +msgstr "ICC-профиль, используемый для имитации устройства вывода" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:196 -msgid "Adjust kerning value" -msgstr "Изменить значение кернинга" +#: ../src/ui/dialog/inkscape-preferences.cpp:1009 +msgid "Device rendering intent:" +msgstr "Цветопередача устройства вывода:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:386 -msgid "Family Name:" -msgstr "Гарнитура:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1010 +msgid "The rendering intent to use to calibrate device output" +msgstr "Цветопередача выводимых на дисплей изображений" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:396 -msgid "Set width:" -msgstr "Ширина:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1012 +msgid "Black point compensation" +msgstr "Использовать компенсацию черной точки" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:455 -msgid "glyph" -msgstr "глиф" +#: ../src/ui/dialog/inkscape-preferences.cpp:1014 +msgid "Enables black point compensation" +msgstr "Включить компенсацию чёрной точки" -#. SPGlyph* glyph = -#: ../src/ui/dialog/svg-fonts-dialog.cpp:487 -msgid "Add glyph" -msgstr "Добавка глифа" +#: ../src/ui/dialog/inkscape-preferences.cpp:1016 +msgid "Preserve black" +msgstr "Сохранять черный цвет" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:521 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:563 -msgid "Select a <b>path</b> to define the curves of a glyph" -msgstr "Выберите <b>контур</b> для определения кривых глифа" +#: ../src/ui/dialog/inkscape-preferences.cpp:1023 +msgid "(LittleCMS 1.15 or later required)" +msgstr "(необходима библиотека LittleCMS версии 1.15 или новее)" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:529 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:571 -msgid "The selected object does not have a <b>path</b> description." -msgstr "Выделенный объект не содержит описание <b>контура</b>." +#: ../src/ui/dialog/inkscape-preferences.cpp:1025 +msgid "Preserve K channel in CMYK -> CMYK transforms" +msgstr "Сохранять канал K при преобразованиях CMYK → CMYK" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:536 -msgid "No glyph selected in the SVGFonts dialog." -msgstr "Ни один глиф не выбран в диалоге «Шрифты SVG»" +#: ../src/ui/dialog/inkscape-preferences.cpp:1039 +#: ../src/widgets/sp-color-icc-selector.cpp:474 +#: ../src/widgets/sp-color-icc-selector.cpp:766 +msgid "<none>" +msgstr "<нет>" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:547 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:586 -msgid "Set glyph curves" -msgstr "Установка кривых глифа" +#: ../src/ui/dialog/inkscape-preferences.cpp:1084 +msgid "Color management" +msgstr "Управление цветом" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:606 -msgid "Reset missing-glyph" -msgstr "Сбросить отсутствующий глиф" +#. Autosave options +#: ../src/ui/dialog/inkscape-preferences.cpp:1087 +msgid "Enable autosave (requires restart)" +msgstr "Включить автосохранение (требует перезапуска программы)" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:622 -msgid "Edit glyph name" -msgstr "Изменить название глифа" +#: ../src/ui/dialog/inkscape-preferences.cpp:1088 +msgid "" +"Automatically save the current document(s) at a given interval, thus " +"minimizing loss in case of a crash" +msgstr "" +"Автоматически сохранять текущий документ через заданный временной интервал, " +"минимизируя риск потери данных" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:636 -msgid "Set glyph unicode" -msgstr "Задание значения Unicode" +#: ../src/ui/dialog/inkscape-preferences.cpp:1094 +msgctxt "Filesystem" +msgid "Autosave _directory:" +msgstr "Каталог для временных файлов:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:648 -msgid "Remove font" -msgstr "Удалить шрифт" +#: ../src/ui/dialog/inkscape-preferences.cpp:1094 +msgid "" +"The directory where autosaves will be written. This should be an absolute " +"path (starts with / on UNIX or a drive letter such as C: on Windows). " +msgstr "" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:665 -msgid "Remove glyph" -msgstr "Удалить глиф" +#: ../src/ui/dialog/inkscape-preferences.cpp:1096 +msgid "_Interval (in minutes):" +msgstr "_Интервал (в минутах):" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:682 -msgid "Remove kerning pair" -msgstr "Удалить кернинговую пару" +#: ../src/ui/dialog/inkscape-preferences.cpp:1096 +msgid "Interval (in minutes) at which document will be autosaved" +msgstr "Интервал в минутах, через который документ автоматически сохраняется" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:692 -msgid "Missing Glyph:" -msgstr "Отсутствующий глиф:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1098 +msgid "_Maximum number of autosaves:" +msgstr "_Максимальное число автосохранений:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:696 -msgid "From selection..." -msgstr "Взять из выделения" +#: ../src/ui/dialog/inkscape-preferences.cpp:1098 +msgid "" +"Maximum number of autosaved files; use this to limit the storage space used" +msgstr "" +"Максимальное число файлов автосохранения; используйте этот параметр для " +"ограничения используемого дискового пространства" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:709 -msgid "Glyph name" -msgstr "Название глифа" +#. When changing the interval or enabling/disabling the autosave function, +#. * update our running configuration +#. * +#. * FIXME! +#. * the inkscape_autosave_init should be called AFTER the values have been changed +#. * (which cannot be guaranteed from here) - use a PrefObserver somewhere +#. +#. +#. _autosave_autosave_enable.signal_toggled().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); +#. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); +#. +#. ----------- +#: ../src/ui/dialog/inkscape-preferences.cpp:1113 +msgid "Autosave" +msgstr "Автосохранение" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:710 -msgid "Matching string" -msgstr "Соответствующая строка" +#: ../src/ui/dialog/inkscape-preferences.cpp:1117 +msgid "Open Clip Art Library _Server Name:" +msgstr "_Сервер Open Clip Art Library:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:713 -msgid "Add Glyph" -msgstr "Добавить глиф" +#: ../src/ui/dialog/inkscape-preferences.cpp:1118 +msgid "" +"The server name of the Open Clip Art Library webdav server; it's used by the " +"Import and Export to OCAL function" +msgstr "" +"Имя webdav-сервера Open Clip Art Library. Используется для функций импорта и " +"экспорта в OCAL" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:720 -msgid "Get curves from selection..." -msgstr "Получить кривые из выделения" +#: ../src/ui/dialog/inkscape-preferences.cpp:1120 +msgid "Open Clip Art Library _Username:" +msgstr "П_ользователь Open Clip Art Library:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:769 -msgid "Add kerning pair" -msgstr "Добавить кернинговую пару" +#: ../src/ui/dialog/inkscape-preferences.cpp:1121 +msgid "The username used to log into Open Clip Art Library" +msgstr "Имя пользователя для авторизации на Open Clip Art Library" -#. Kerning Setup: -#: ../src/ui/dialog/svg-fonts-dialog.cpp:777 -msgid "Kerning Setup" -msgstr "Параметры кернинга:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1123 +msgid "Open Clip Art Library _Password:" +msgstr "П_ароль на Open Clip Art Library:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:779 -msgid "1st Glyph:" -msgstr "Первый глиф:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1124 +msgid "The password used to log into Open Clip Art Library" +msgstr "Пароль для авторизации на Open Clip Art Library" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:781 -msgid "2nd Glyph:" -msgstr "Второй глиф:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1125 +msgid "Open Clip Art" +msgstr "Open Clip Art" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:784 -msgid "Add pair" -msgstr "Добавить пару" +#: ../src/ui/dialog/inkscape-preferences.cpp:1130 +#, fuzzy +msgid "Behavior" +msgstr "Поведение" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:796 -msgid "First Unicode range" -msgstr "Первый символ Unicode" +#: ../src/ui/dialog/inkscape-preferences.cpp:1134 +#, fuzzy +msgid "_Simplification threshold:" +msgstr "Порог упрощения:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:797 -msgid "Second Unicode range" -msgstr "Второй символ Unicode" +#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +msgid "" +"How strong is the Node tool's Simplify command by default. If you invoke " +"this command several times in quick succession, it will act more and more " +"aggressively; invoking it again after a pause restores the default threshold." +msgstr "" +"Степень упрощения по команде «Упростить». Если вызывать эту команду " +"несколько раз подряд, она будет действовать с каждым разом все более " +"агрессивно; чтобы вернуться к значению по умолчанию, сделайте паузу перед " +"очередным вызовом команды." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:804 -msgid "Kerning value:" -msgstr "Значение кернинга:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +msgid "Color stock markers the same color as object" +msgstr "" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:862 -msgid "Set font family" -msgstr "Указать гарнитуру" +#: ../src/ui/dialog/inkscape-preferences.cpp:1138 +msgid "Color custom markers the same color as object" +msgstr "" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:871 -msgid "font" -msgstr "шрифт" +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1349 +msgid "Update marker color when object color changes" +msgstr "" -#. select_font(font); -#: ../src/ui/dialog/svg-fonts-dialog.cpp:886 -msgid "Add font" -msgstr "Добавить шрифт" +#. Selecting options +#: ../src/ui/dialog/inkscape-preferences.cpp:1142 +msgid "Select in all layers" +msgstr "Работают во всех слоях" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:912 ../src/ui/dialog/text-edit.cpp:70 -msgid "_Font" -msgstr "_Шрифт" +#: ../src/ui/dialog/inkscape-preferences.cpp:1143 +msgid "Select only within current layer" +msgstr "Работают только в текущем слое" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:920 -msgid "_Global Settings" -msgstr "О_бщие параметры" +#: ../src/ui/dialog/inkscape-preferences.cpp:1144 +msgid "Select in current layer and sublayers" +msgstr "Работают только в текущем слое и субслоях" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:921 -msgid "_Glyphs" -msgstr "_Глифы" +#: ../src/ui/dialog/inkscape-preferences.cpp:1145 +msgid "Ignore hidden objects and layers" +msgstr "Игнорируют скрытые объекты и слои" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:922 -msgid "_Kerning" -msgstr "_Кернинг" +#: ../src/ui/dialog/inkscape-preferences.cpp:1146 +msgid "Ignore locked objects and layers" +msgstr "Игнорируют заблокированные объекты и слои" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:929 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:930 -msgid "Sample Text" -msgstr "Текст примера" +#: ../src/ui/dialog/inkscape-preferences.cpp:1147 +msgid "Deselect upon layer change" +msgstr "Снять выделение при изменениях в слое" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:934 -msgid "Preview Text:" -msgstr "Текст:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 +msgid "" +"Uncheck this to be able to keep the current objects selected when the " +"current layer changes" +msgstr "" +"Отключите эту опцию, если хотите оставлять объекты выбранными при изменениях " +"в текущем слое." -#: ../src/ui/dialog/swatches.cpp:203 ../src/ui/tools/gradient-tool.cpp:367 -#: ../src/ui/tools/gradient-tool.cpp:465 -#: ../src/widgets/gradient-vector.cpp:814 -msgid "Add gradient stop" -msgstr "Добавка опорной точки в градиент" +#: ../src/ui/dialog/inkscape-preferences.cpp:1152 +msgid "Ctrl+A, Tab, Shift+Tab" +msgstr "Ctrl+A, Tab, Shift+Tab" -#. TRANSLATORS: An item in context menu on a colour in the swatches -#: ../src/ui/dialog/swatches.cpp:258 -msgid "Set fill" -msgstr "Установить заливку" +#: ../src/ui/dialog/inkscape-preferences.cpp:1154 +msgid "Make keyboard selection commands work on objects in all layers" +msgstr "Команды выделения с клавиатуры работают во всех слоях." -#. TRANSLATORS: An item in context menu on a colour in the swatches -#: ../src/ui/dialog/swatches.cpp:266 -msgid "Set stroke" -msgstr "Установить обводку" +#: ../src/ui/dialog/inkscape-preferences.cpp:1156 +msgid "Make keyboard selection commands work on objects in current layer only" +msgstr "Команды выделения с клавиатуры работают только в текущем слое." -#: ../src/ui/dialog/swatches.cpp:287 -msgid "Edit..." -msgstr "Изменить..." +#: ../src/ui/dialog/inkscape-preferences.cpp:1158 +msgid "" +"Make keyboard selection commands work on objects in current layer and all " +"its sublayers" +msgstr "" +"Команды выделения с клавиатуры работают в текущем слое и всех его субслоях." -#: ../src/ui/dialog/swatches.cpp:299 -msgid "Convert" -msgstr "Преобразовать" +#: ../src/ui/dialog/inkscape-preferences.cpp:1160 +msgid "" +"Uncheck this to be able to select objects that are hidden (either by " +"themselves or by being in a hidden layer)" +msgstr "" +"Отключите этот параметр, если хотите выделять скрытые объекты или объекты на " +"скрытом слое" -#: ../src/ui/dialog/swatches.cpp:543 -#, c-format -msgid "Palettes directory (%s) is unavailable." -msgstr "Каталог с палитрами (%s) недоступен." +#: ../src/ui/dialog/inkscape-preferences.cpp:1162 +msgid "" +"Uncheck this to be able to select objects that are locked (either by " +"themselves or by being in a locked layer)" +msgstr "" +"Отключите эту опцию, если хотите выделять заблокированные объекты или " +"объекты на заблокированном слое" -#. ******************* Symbol Sets ************************ -#: ../src/ui/dialog/symbols.cpp:127 -msgid "Symbol set: " -msgstr "Набор:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1164 +msgid "Wrap when cycling objects in z-order" +msgstr "" -#. Fill in later -#: ../src/ui/dialog/symbols.cpp:136 ../src/ui/dialog/symbols.cpp:137 -msgid "Current Document" -msgstr "Текущий документ" +#: ../src/ui/dialog/inkscape-preferences.cpp:1166 +msgid "Alt+Scroll Wheel" +msgstr "" -#: ../src/ui/dialog/symbols.cpp:204 -#, fuzzy -msgid "Add Symbol from the current document." -msgstr "Отображение только активного слоя" +#: ../src/ui/dialog/inkscape-preferences.cpp:1168 +msgid "Wrap around at start and end when cycling objects in z-order" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1170 +msgid "Selecting" +msgstr "Выделение" + +#. Transforms options +#: ../src/ui/dialog/inkscape-preferences.cpp:1173 +#: ../src/widgets/select-toolbar.cpp:570 +msgid "Scale stroke width" +msgstr "Менять толщину обводки" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1174 +msgid "Scale rounded corners in rectangles" +msgstr "Менять радиус закругленных углов" -#: ../src/ui/dialog/symbols.cpp:213 -#, fuzzy -msgid "Remove Symbol from the current document." -msgstr "Выбрать опорную точку градиента" +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 +msgid "Transform gradients" +msgstr "Трансформировать градиенты" -#: ../src/ui/dialog/symbols.cpp:227 -#, fuzzy -msgid "Display more icons in row." -msgstr "Показывать данные измерений" +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +msgid "Transform patterns" +msgstr "Трансформировать текстуры" -#: ../src/ui/dialog/symbols.cpp:236 -#, fuzzy -msgid "Display fewer icons in row." -msgstr "Показывать данные измерений" +#: ../src/ui/dialog/inkscape-preferences.cpp:1178 +msgid "Preserved" +msgstr "Без оптимизации" -#: ../src/ui/dialog/symbols.cpp:246 -msgid "Toggle 'fit' symbols in icon space." +#: ../src/ui/dialog/inkscape-preferences.cpp:1181 +#: ../src/widgets/select-toolbar.cpp:571 +msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "" +"При изменении размера объектов менять в той же пропорции и толщину обводки" -#: ../src/ui/dialog/symbols.cpp:258 -msgid "Make symbols smaller by zooming out." +#: ../src/ui/dialog/inkscape-preferences.cpp:1183 +#: ../src/widgets/select-toolbar.cpp:582 +msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" +"При изменении размера прямоугольников менять в той же пропорции и радиус " +"закруглённых углов" -#: ../src/ui/dialog/symbols.cpp:268 -msgid "Make symbols bigger by zooming in." -msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:1185 +#: ../src/widgets/select-toolbar.cpp:593 +msgid "Move gradients (in fill or stroke) along with the objects" +msgstr "Трансформировать градиенты (в заливке или обводке) вместе с объектом" -#: ../src/ui/dialog/symbols.cpp:622 -#, fuzzy -msgid "Unnamed Symbols" -msgstr "Кхмерские символы" +#: ../src/ui/dialog/inkscape-preferences.cpp:1187 +#: ../src/widgets/select-toolbar.cpp:604 +msgid "Move patterns (in fill or stroke) along with the objects" +msgstr "Трансформировать текстуры (в заливке или обводке) вместе с объектом" -#: ../src/ui/dialog/template-widget.cpp:36 -#, fuzzy -msgid "More info" -msgstr "Больше яркости" +#: ../src/ui/dialog/inkscape-preferences.cpp:1188 +msgid "Store transformation" +msgstr "Сохранение трансформации" -#: ../src/ui/dialog/template-widget.cpp:38 -#, fuzzy -msgid "no template selected" -msgstr "Ни один объект не выбран" +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 +msgid "" +"If possible, apply transformation to objects without adding a transform= " +"attribute" +msgstr "" +"По возможности применять трансформацию к объектам без добавления атрибута " +"transform=" -#: ../src/ui/dialog/template-widget.cpp:119 -#, fuzzy -msgid "Path: " -msgstr "Контур" +#: ../src/ui/dialog/inkscape-preferences.cpp:1192 +msgid "Always store transformation as a transform= attribute on objects" +msgstr "Всегда сохранять трансформацию в виде атрибута transform=" -#: ../src/ui/dialog/template-widget.cpp:122 -#, fuzzy -msgid "Description: " -msgstr "Описание" +#: ../src/ui/dialog/inkscape-preferences.cpp:1194 +msgid "Transforms" +msgstr "Трансформации" -#: ../src/ui/dialog/template-widget.cpp:124 -#, fuzzy -msgid "Keywords: " -msgstr "Ключевые слова:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1198 +msgid "Mouse _wheel scrolls by:" +msgstr "_Колёсико мыши прокручивает на:" -#: ../src/ui/dialog/template-widget.cpp:131 -msgid "By: " +#: ../src/ui/dialog/inkscape-preferences.cpp:1199 +msgid "" +"One mouse wheel notch scrolls by this distance in screen pixels " +"(horizontally with Shift)" msgstr "" +"На это расстояние в пикселах изображение сдвигается одним щелчком\n" +"колесика мыши (с нажатой клавишей Shift - по горизонтали)" -#: ../src/ui/dialog/text-edit.cpp:73 -msgid "Set as _default" -msgstr "_Использовать по умолчанию" +#: ../src/ui/dialog/inkscape-preferences.cpp:1200 +msgid "Ctrl+arrows" +msgstr "Ctrl+стрелки" -#: ../src/ui/dialog/text-edit.cpp:87 -msgid "AaBbCcIiPpQq12369$€¢?.;/()" -msgstr "АаБбВвГгЁёФфЩщЯя$€¢?.;/()" +#: ../src/ui/dialog/inkscape-preferences.cpp:1202 +msgid "Sc_roll by:" +msgstr "_Шаг прокрутки:" -#. Align buttons -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1344 -#: ../src/widgets/text-toolbar.cpp:1345 -msgid "Align left" -msgstr "Выключка влево" +#: ../src/ui/dialog/inkscape-preferences.cpp:1203 +msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" +msgstr "" +"На это расстояние в пикселах изображение сдвигается при нажатии Ctrl+стрелки" -#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1352 -#: ../src/widgets/text-toolbar.cpp:1353 -msgid "Align center" -msgstr "Выключка по центру" +#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +msgid "_Acceleration:" +msgstr "_Ускорение:" -#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1360 -#: ../src/widgets/text-toolbar.cpp:1361 -msgid "Align right" -msgstr "Выключка вправо" +#: ../src/ui/dialog/inkscape-preferences.cpp:1206 +msgid "" +"Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " +"acceleration)" +msgstr "" +"Если удерживать нажатыми Ctrl+стрелку, скорость прокрутки будет возрастать " +"(0 отменяет ускорение)" -#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1369 -msgid "Justify (only flowed text)" -msgstr "Выключка по ширине (только завёрстанный текст)" +#: ../src/ui/dialog/inkscape-preferences.cpp:1207 +msgid "Autoscrolling" +msgstr "Автопрокрутка" -#. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1404 -msgid "Horizontal text" -msgstr "Горизонтальный текст" +#: ../src/ui/dialog/inkscape-preferences.cpp:1209 +msgid "_Speed:" +msgstr "_Скорость:" -#: ../src/ui/dialog/text-edit.cpp:110 ../src/widgets/text-toolbar.cpp:1411 -msgid "Vertical text" -msgstr "Вертикальный текст" +#: ../src/ui/dialog/inkscape-preferences.cpp:1210 +msgid "" +"How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " +"autoscroll off)" +msgstr "" +"С какой скоростью будет происходить прокрутка при перетаскивании объекта за " +"пределы окна (0 отменяет автопрокрутку)" -#: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -#, fuzzy -msgid "Spacing between lines (percent of font size)" -msgstr "Межстрочный интервал (кратный кеглю шрифта)" +#: ../src/ui/dialog/inkscape-preferences.cpp:1212 +#: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 +msgid "_Threshold:" +msgstr "Поро_г:" -#: ../src/ui/dialog/text-edit.cpp:147 -#, fuzzy -msgid "Text path offset" -msgstr "Смещение по касательной:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1213 +msgid "" +"How far (in screen pixels) you need to be from the canvas edge to trigger " +"autoscroll; positive is outside the canvas, negative is within the canvas" +msgstr "" +"Насколько далеко (в пикселах) нужно отстоять от края окна, чтобы\n" +"включилась автопрокрутка; положительные значения - за пределами окна,\n" +"отрицательные - внутри окна" -#: ../src/ui/dialog/text-edit.cpp:588 ../src/ui/dialog/text-edit.cpp:662 -#: ../src/ui/tools/text-tool.cpp:1455 -msgid "Set text style" -msgstr "Смена стиля текста" +#. +#. _scroll_space.init ( _("Left mouse button pans when Space is pressed"), "/options/spacepans/value", false); +#. _page_scrolling.add_line( false, "", _scroll_space, "", +#. _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily switches to Selector tool (default)")); +#. +#: ../src/ui/dialog/inkscape-preferences.cpp:1219 +msgid "Mouse wheel zooms by default" +msgstr "По умолчанию колесо мыши масштабирует вид" -#: ../src/ui/dialog/tile.cpp:36 -#, fuzzy -msgctxt "Arrange dialog" -msgid "Rectangular grid" -msgstr "Прямоугольная сетка" +#: ../src/ui/dialog/inkscape-preferences.cpp:1221 +msgid "" +"When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " +"off, it zooms with Ctrl and scrolls without Ctrl" +msgstr "" +"Если включено, прокрутка колеса мыши без Ctrl масштабирует вид документа, а " +"с Ctrl — прокручивает холст; если выключено, с Ctrl масштабируется вид " +"документа, а без - прокручивается холст." -#: ../src/ui/dialog/tile.cpp:37 -#, fuzzy -msgctxt "Arrange dialog" -msgid "Polar Coordinates" -msgstr "трилинейными координатами" +#: ../src/ui/dialog/inkscape-preferences.cpp:1222 +msgid "Scrolling" +msgstr "Прокрутка" -#: ../src/ui/dialog/tile.cpp:40 -#, fuzzy -msgctxt "Arrange dialog" -msgid "_Arrange" -msgstr "_Расставить" +#. Snapping options +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 +msgid "Enable snap indicator" +msgstr "Включить индикатор прилипания" -#: ../src/ui/dialog/tile.cpp:42 -msgid "Arrange selected objects" -msgstr "Расставить выделенные объекты" +#: ../src/ui/dialog/inkscape-preferences.cpp:1227 +msgid "After snapping, a symbol is drawn at the point that has snapped" +msgstr "В предполагаемой точке прилипания рисуется символ" -#. #### begin left panel -#. ### begin notebook -#. ## begin mode page -#. # begin single scan -#. brightness -#: ../src/ui/dialog/tracedialog.cpp:508 -msgid "_Brightness cutoff" -msgstr "Сокращение _яркости" +#: ../src/ui/dialog/inkscape-preferences.cpp:1230 +msgid "_Delay (in ms):" +msgstr "За_держка (мс):" -#: ../src/ui/dialog/tracedialog.cpp:512 -msgid "Trace by a given brightness level" -msgstr "Векторизовать по заданному уровню яркости" +#: ../src/ui/dialog/inkscape-preferences.cpp:1231 +msgid "" +"Postpone snapping as long as the mouse is moving, and then wait an " +"additional fraction of a second. This additional delay is specified here. " +"When set to zero or to a very small number, snapping will be immediate." +msgstr "" +"Не прилипать, пока курсор мыши движется, а затем подождать указанное здесь " +"время. Если значение очень мало или равно нулю, прилипание будет выполняться " +"немедленно." -#: ../src/ui/dialog/tracedialog.cpp:519 -msgid "Brightness cutoff for black/white" -msgstr "Порог яркости для черно-белого" +#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +msgid "Only snap the node closest to the pointer" +msgstr "Прилипает только ближайший к указателю узел" -#: ../src/ui/dialog/tracedialog.cpp:529 -msgid "Single scan: creates a path" -msgstr "Одиночное сканирование: создаёт контур" +#: ../src/ui/dialog/inkscape-preferences.cpp:1235 +msgid "" +"Only try to snap the node that is initially closest to the mouse pointer" +msgstr "" +"Прилипать только к тому узлу, который изначально расположен ближе остальных " +"к указателю мыши" -#. canny edge detection -#. TRANSLATORS: "Canny" is the name of the inventor of this edge detection method -#: ../src/ui/dialog/tracedialog.cpp:534 -msgid "_Edge detection" -msgstr "Опр_еделение краёв" +#: ../src/ui/dialog/inkscape-preferences.cpp:1238 +msgid "_Weight factor:" +msgstr "Коэффициент _взвешивания:" -#: ../src/ui/dialog/tracedialog.cpp:538 -msgid "Trace with optimal edge detection by J. Canny's algorithm" -msgstr "Векторизовать с оптимальным определением краев по алгоритму J. Canny" +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +msgid "" +"When multiple snap solutions are found, then Inkscape can either prefer the " +"closest transformation (when set to 0), or prefer the node that was " +"initially the closest to the pointer (when set to 1)" +msgstr "" +"Когда найдено несколько вариантов прилипания, Inkscape может предпочесть " +"либо ближайшую трансформацию (0), либо узел, изначально более близкий к " +"курсору мыши (1)." -#: ../src/ui/dialog/tracedialog.cpp:556 -msgid "Brightness cutoff for adjacent pixels (determines edge thickness)" -msgstr "Порог яркости для смежных пикселов (определяет толщину краев)" +#: ../src/ui/dialog/inkscape-preferences.cpp:1241 +msgid "Snap the mouse pointer when dragging a constrained knot" +msgstr "Указатель мыши прилипает при перетаскивании узла с ограничением" -#: ../src/ui/dialog/tracedialog.cpp:559 -msgid "T_hreshold:" -msgstr "По_рог:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1243 +msgid "" +"When dragging a knot along a constraint line, then snap the position of the " +"mouse pointer instead of snapping the projection of the knot onto the " +"constraint line" +msgstr "" +"При перемещении узла вдоль ограничительной линии прилипает указатель мыши, а " +"не проекция узла на ограничительную линию" -#. quantization -#. TRANSLATORS: Color Quantization: the process of reducing the number -#. of colors in an image by selecting an optimized set of representative -#. colors and then re-applying this reduced set to the original image. -#: ../src/ui/dialog/tracedialog.cpp:571 -msgid "Color _quantization" -msgstr "_Квантование цветов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1245 +msgid "Snapping" +msgstr "Прилипание" -#: ../src/ui/dialog/tracedialog.cpp:575 -msgid "Trace along the boundaries of reduced colors" -msgstr "Векторизовать вдоль границы сокращенных цветов" +#. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +msgid "_Arrow keys move by:" +msgstr "_Стрелки двигают на:" -#: ../src/ui/dialog/tracedialog.cpp:583 -msgid "The number of reduced colors" -msgstr "Количество цветов после сокращения" +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#, fuzzy +msgid "" +"Pressing an arrow key moves selected object(s) or node(s) by this distance" +msgstr "" +"На это расстояние (в SVG пикселах) выделенный объект или узел перемещается " +"по нажатию клавиши со стрелкой" -#: ../src/ui/dialog/tracedialog.cpp:586 -msgid "_Colors:" -msgstr "_Цветов:" +#. defaultscale is limited to 1000 in select-context.cpp: use the same limit here +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#, fuzzy +msgid "> and < _scale by:" +msgstr "Шаг масштабирования по > и <:" -#. swap black and white -#: ../src/ui/dialog/tracedialog.cpp:594 -msgid "_Invert image" -msgstr "_Инвертировать изображение" +#: ../src/ui/dialog/inkscape-preferences.cpp:1255 +#, fuzzy +msgid "Pressing > or < scales selection up or down by this increment" +msgstr "" +"На эту величину (в SVG пикселах) изменяется размер выделения по нажатию " +"клавиш > и <" -#: ../src/ui/dialog/tracedialog.cpp:599 -msgid "Invert black and white regions" -msgstr "Поменять местами чёрные и белые области" +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 +#, fuzzy +msgid "_Inset/Outset by:" +msgstr "Втяжка или растяжка на:" -#. # end single scan -#. # begin multiple scan -#: ../src/ui/dialog/tracedialog.cpp:609 -msgid "B_rightness steps" -msgstr "_Шаги яркости" +#: ../src/ui/dialog/inkscape-preferences.cpp:1258 +#, fuzzy +msgid "Inset and Outset commands displace the path by this distance" +msgstr "" +"На это расстояние (в SVG пикселах) команды втяжки и растяжки смещают контур" -#: ../src/ui/dialog/tracedialog.cpp:613 -msgid "Trace the given number of brightness levels" -msgstr "Трассировать указанное количество уровней яркости" +#: ../src/ui/dialog/inkscape-preferences.cpp:1259 +msgid "Compass-like display of angles" +msgstr "Компасообразное отображение углов" -#: ../src/ui/dialog/tracedialog.cpp:621 -msgid "Sc_ans:" -msgstr "Ска_нирований:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1261 +msgid "" +"When on, angles are displayed with 0 at north, 0 to 360 range, positive " +"clockwise; otherwise with 0 at east, -180 to 180 range, positive " +"counterclockwise" +msgstr "" +"Если включено, угол со значением 0° показывает на север с диапазоном от 0° " +"до 360°, причем значение увеличивается по часовой стрелке. В противном " +"случае 0° показывает на восток, диапазон значений находится между -180° и " +"180°, приращение угла происходит против часовой стрелки." -#: ../src/ui/dialog/tracedialog.cpp:625 -msgid "The desired number of scans" -msgstr "Желаемое количество сканирований" +#: ../src/ui/dialog/inkscape-preferences.cpp:1263 +#, fuzzy +msgctxt "Rotation angle" +msgid "None" +msgstr "Нет" -#: ../src/ui/dialog/tracedialog.cpp:630 -msgid "Co_lors" -msgstr "Ц_вет" +#: ../src/ui/dialog/inkscape-preferences.cpp:1267 +#, fuzzy +msgid "_Rotation snaps every:" +msgstr "Ограничение вращения:" -#: ../src/ui/dialog/tracedialog.cpp:634 -msgid "Trace the given number of reduced colors" -msgstr "Трассировать указанное количество цветов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1267 +msgid "degrees" +msgstr "градусов" -#: ../src/ui/dialog/tracedialog.cpp:639 -msgid "_Grays" -msgstr "Гр_адации серого" +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +msgid "" +"Rotating with Ctrl pressed snaps every that much degrees; also, pressing " +"[ or ] rotates by this amount" +msgstr "" +"Вращение с нажатым Ctrl ограничивает угол значениями, кратными выбранному; " +"нажатие [ или ] поворачивает на выбранный угол" -#: ../src/ui/dialog/tracedialog.cpp:643 -msgid "Same as Colors, but the result is converted to grayscale" +#: ../src/ui/dialog/inkscape-preferences.cpp:1269 +msgid "Relative snapping of guideline angles" msgstr "" -"То же, что и для «В цвете», но конечное\n" -"изображение будет в градациях серого" -#. TRANSLATORS: "Smooth" is a verb here -#: ../src/ui/dialog/tracedialog.cpp:649 -msgid "S_mooth" -msgstr "Сгладит_ь" +#: ../src/ui/dialog/inkscape-preferences.cpp:1271 +msgid "" +"When on, the snap angles when rotating a guideline will be relative to the " +"original angle" +msgstr "" -#: ../src/ui/dialog/tracedialog.cpp:653 -msgid "Apply Gaussian blur to the bitmap before tracing" -msgstr "Применить Гауссово размывание растра перед векторизацией" +#: ../src/ui/dialog/inkscape-preferences.cpp:1273 +#, fuzzy +msgid "_Zoom in/out by:" +msgstr "Шаг масштаба:" -#. TRANSLATORS: "Stack" is a verb here -#: ../src/ui/dialog/tracedialog.cpp:657 -msgid "Stac_k scans" -msgstr "С_ложить стопкой" +#: ../src/ui/dialog/inkscape-preferences.cpp:1273 +msgid "%" +msgstr "%" -#: ../src/ui/dialog/tracedialog.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:1274 msgid "" -"Stack scans on top of one another (no gaps) instead of tiling (usually with " -"gaps)" +"Zoom tool click, +/- keys, and middle click zoom in and out by this " +"multiplier" msgstr "" -"Слои выкладываются стопкой один над другим (без щелей), а не встык (обычно " -"со щелями)" - -#: ../src/ui/dialog/tracedialog.cpp:665 -msgid "Remo_ve background" -msgstr "Убрать _фон" +"Шаг для щелчка инструментом масштаба,\n" +"нажатия клавиш +/- и щелчка средней клавишей мыши" -#. TRANSLATORS: "Layer" refers to one of the stacked paths in the multiscan -#: ../src/ui/dialog/tracedialog.cpp:670 -msgid "Remove bottom (background) layer when done" -msgstr "Удалить нижнюю стопку объектов по завершении" +#: ../src/ui/dialog/inkscape-preferences.cpp:1275 +msgid "Steps" +msgstr "Шаги" -#: ../src/ui/dialog/tracedialog.cpp:675 -msgid "Multiple scans: creates a group of paths" -msgstr "Множественное сканирование: создаёт группу контуров" +#. Clones options +#: ../src/ui/dialog/inkscape-preferences.cpp:1278 +msgid "Move in parallel" +msgstr "Двигаются параллельно" -#. # end multiple scan -#. ## end mode page -#: ../src/ui/dialog/tracedialog.cpp:684 -msgid "_Mode" -msgstr "Ре_жим" +#: ../src/ui/dialog/inkscape-preferences.cpp:1280 +msgid "Stay unmoved" +msgstr "Остаются неподвижными" -#. ## begin option page -#. # potrace parameters -#: ../src/ui/dialog/tracedialog.cpp:690 -msgid "Suppress _speckles" -msgstr "Убрать п_ятна" +#: ../src/ui/dialog/inkscape-preferences.cpp:1282 +msgid "Move according to transform" +msgstr "Двигаются в соответствии с transform=" -#: ../src/ui/dialog/tracedialog.cpp:692 -msgid "Ignore small spots (speckles) in the bitmap" -msgstr "Проигнорировать мелкие точки (пятна) на изображении" +#: ../src/ui/dialog/inkscape-preferences.cpp:1284 +msgid "Are unlinked" +msgstr "Отсоединяются" -#: ../src/ui/dialog/tracedialog.cpp:700 -msgid "Speckles of up to this many pixels will be suppressed" -msgstr "Пятна такого диаметра в пикселах будут подавлены" +#: ../src/ui/dialog/inkscape-preferences.cpp:1286 +msgid "Are deleted" +msgstr "Удаляются" -#: ../src/ui/dialog/tracedialog.cpp:703 -msgid "S_ize:" -msgstr "Ра_змер:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1289 +#, fuzzy +msgid "Moving original: clones and linked offsets" +msgstr "Когда перемещается оригинал, его клоны и потомки:" -#: ../src/ui/dialog/tracedialog.cpp:708 -msgid "Smooth _corners" -msgstr "Сгладить _углы" +#: ../src/ui/dialog/inkscape-preferences.cpp:1291 +msgid "Clones are translated by the same vector as their original" +msgstr "Каждый клон сдвигается по тому же вектору, что и его оригинал." -#: ../src/ui/dialog/tracedialog.cpp:710 -msgid "Smooth out sharp corners of the trace" -msgstr "Сгладить острые углы при векторизации" +#: ../src/ui/dialog/inkscape-preferences.cpp:1293 +msgid "Clones preserve their positions when their original is moved" +msgstr "Клоны остаются на месте, когда перемещаются их оригиналы." -#: ../src/ui/dialog/tracedialog.cpp:719 -msgid "Increase this to smooth corners more" -msgstr "Чем больше значение, тем глаже углы" +#: ../src/ui/dialog/inkscape-preferences.cpp:1295 +msgid "" +"Each clone moves according to the value of its transform= attribute; for " +"example, a rotated clone will move in a different direction than its original" +msgstr "" +"Каждый клон двигается в соответствии со значением его атрибута transform=. " +"Например, повёрнутый клон будет перемещаться в ином направлении, нежели его " +"оригинал." -#: ../src/ui/dialog/tracedialog.cpp:726 -msgid "Optimize p_aths" -msgstr "Опти_мизировать контуры" +#: ../src/ui/dialog/inkscape-preferences.cpp:1296 +#, fuzzy +msgid "Deleting original: clones" +msgstr "При дублировании оригиналов с клонами:" -#: ../src/ui/dialog/tracedialog.cpp:729 -msgid "Try to optimize paths by joining adjacent Bezier curve segments" -msgstr "" -"Попытаться оптимизировать контуры соединением соседних сегментов кривых Безье" +#: ../src/ui/dialog/inkscape-preferences.cpp:1298 +msgid "Orphaned clones are converted to regular objects" +msgstr "Осиротевшие клоны преобразуются в обычные объекты" -#: ../src/ui/dialog/tracedialog.cpp:737 -msgid "" -"Increase this to reduce the number of nodes in the trace by more aggressive " -"optimization" -msgstr "Чем больше значение, тем меньше количество узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1300 +msgid "Orphaned clones are deleted along with their original" +msgstr "Осиротевшие клоны удаляются вместе с их оригиналом" -#: ../src/ui/dialog/tracedialog.cpp:739 -msgid "To_lerance:" -msgstr "Сг_лаживание:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1302 +#, fuzzy +msgid "Duplicating original+clones/linked offset" +msgstr "При дублировании оригиналов с клонами:" -#. ## end option page -#: ../src/ui/dialog/tracedialog.cpp:753 -msgid "O_ptions" -msgstr "_Параметры" +#: ../src/ui/dialog/inkscape-preferences.cpp:1304 +msgid "Relink duplicated clones" +msgstr "Повторно связывать продублированные клоны" -#. ### credits -#: ../src/ui/dialog/tracedialog.cpp:757 +#: ../src/ui/dialog/inkscape-preferences.cpp:1306 msgid "" -"Inkscape bitmap tracing\n" -"is based on Potrace,\n" -"created by Peter Selinger\n" -"\n" -"http://potrace.sourceforge.net" +"When duplicating a selection containing both a clone and its original " +"(possibly in groups), relink the duplicated clone to the duplicated original " +"instead of the old original" msgstr "" -"Функция векторизации основана\n" -"на программе Potrace, написанной\n" -"Питером Селинджером\n" -"\n" -"http://potrace.sourceforge.net" - -#: ../src/ui/dialog/tracedialog.cpp:760 -msgid "Credits" -msgstr "Благодарности" +"При дублировании выделения, содержащего как клон, так и оригинал (например, " +"в группе), повторно связывать продублированный клон с продублированным " +"оригиналом вместо первого оригинала." -#. #### begin right panel -#. ## SIOX -#: ../src/ui/dialog/tracedialog.cpp:774 -msgid "SIOX _foreground selection" -msgstr "В_ыделение переднего плана при помощи SIOX" +#. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page +#: ../src/ui/dialog/inkscape-preferences.cpp:1309 +msgid "Clones" +msgstr "Клоны" -#: ../src/ui/dialog/tracedialog.cpp:777 -msgid "Cover the area you want to select as the foreground" -msgstr "Обведите область изображения, которая находится на переднем плане" +#. Clip paths and masks options +#: ../src/ui/dialog/inkscape-preferences.cpp:1312 +msgid "When applying, use the topmost selected object as clippath/mask" +msgstr "Верхний выбранный объект — обтравочный контур или маска" -#: ../src/ui/dialog/tracedialog.cpp:782 -msgid "Live Preview" +#: ../src/ui/dialog/inkscape-preferences.cpp:1314 +msgid "" +"Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "" +"Отключите эту опцию, если хотите использовать в качестве обтравочного " +"контура или маски самый нижний из выбранных объектов" -#: ../src/ui/dialog/tracedialog.cpp:788 -msgid "_Update" -msgstr "О_бновить" +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 +msgid "Remove clippath/mask object after applying" +msgstr "Убрать обтравочный контур или маску после применения" -#. I guess it's correct to call the "intermediate bitmap" a preview of the trace -#: ../src/ui/dialog/tracedialog.cpp:796 +#: ../src/ui/dialog/inkscape-preferences.cpp:1317 msgid "" -"Preview the intermediate bitmap with the current settings, without actual " -"tracing" -msgstr "Просмотреть будущий результат перед собственно векторизацией" +"After applying, remove the object used as the clipping path or mask from the " +"drawing" +msgstr "" +"По применении удалить из рисунка объект, использованный в качестве " +"обтравочного контура или маски" -#: ../src/ui/dialog/tracedialog.cpp:800 -msgid "Preview" -msgstr "Предпросмотр" +#: ../src/ui/dialog/inkscape-preferences.cpp:1319 +#, fuzzy +msgid "Before applying" +msgstr "Перед применением обтравочного контура или маски:" -#: ../src/ui/dialog/transformation.cpp:76 -#: ../src/ui/dialog/transformation.cpp:86 -msgid "_Horizontal:" -msgstr "По _горизонтали:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1321 +msgid "Do not group clipped/masked objects" +msgstr "Не группировать обтравленные или замаскированные объекты" -#: ../src/ui/dialog/transformation.cpp:76 -msgid "Horizontal displacement (relative) or position (absolute)" +#: ../src/ui/dialog/inkscape-preferences.cpp:1322 +#, fuzzy +msgid "Put every clipped/masked object in its own group" msgstr "" -"Смещение (относительное) или позиционирование (абсолютное) по горизонтали" +"Включать каждый обтравленный или замаскированный объект в собственную группу" -#: ../src/ui/dialog/transformation.cpp:78 -#: ../src/ui/dialog/transformation.cpp:88 -msgid "_Vertical:" -msgstr "По _вертикали:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1323 +msgid "Put all clipped/masked objects into one group" +msgstr "Помещать все обтравленные или замаскированные объекты в одну группу" -#: ../src/ui/dialog/transformation.cpp:78 -msgid "Vertical displacement (relative) or position (absolute)" -msgstr "" -"Смещение (относительное) или позиционирование (абсолютное) по вертикали" +#: ../src/ui/dialog/inkscape-preferences.cpp:1326 +msgid "Apply clippath/mask to every object" +msgstr "Применить обтравочный контур или маску к каждому объекту" -#: ../src/ui/dialog/transformation.cpp:80 -msgid "Horizontal size (absolute or percentage of current)" -msgstr "Размер по горизонтали (абсолютный или в %)" +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 +msgid "Apply clippath/mask to groups containing single object" +msgstr "" +"Применить обтравочный контур или маску к группам, содержащим единичные " +"объекты" -#: ../src/ui/dialog/transformation.cpp:82 -msgid "Vertical size (absolute or percentage of current)" -msgstr "Размер по вертикали (абсолютный или в %)" +#: ../src/ui/dialog/inkscape-preferences.cpp:1332 +msgid "Apply clippath/mask to group containing all objects" +msgstr "" +"Применить обтравочный контур или маску к группе, содержащей все объекты" -#: ../src/ui/dialog/transformation.cpp:84 -msgid "A_ngle:" -msgstr "_Угол:" +#: ../src/ui/dialog/inkscape-preferences.cpp:1334 +#, fuzzy +msgid "After releasing" +msgstr "После снятия обтравочного контура или маски:" -#: ../src/ui/dialog/transformation.cpp:84 -#: ../src/ui/dialog/transformation.cpp:1104 -msgid "Rotation angle (positive = counterclockwise)" -msgstr "Угол поворота (больше 0 = против часовой стрелки)" +#: ../src/ui/dialog/inkscape-preferences.cpp:1336 +msgid "Ungroup automatically created groups" +msgstr "Разгруппировать автоматически созданные группы" -#: ../src/ui/dialog/transformation.cpp:86 -msgid "" -"Horizontal skew angle (positive = counterclockwise), or absolute " -"displacement, or percentage displacement" +#: ../src/ui/dialog/inkscape-preferences.cpp:1338 +msgid "Ungroup groups created when setting clip/mask" msgstr "" -"Угол наклона по горизонтали (больше 0 = против часовой стрелки), либо " -"абсолютное смещение, либо процентное смещение" +"Разгруппировать группы, созданные при наложении обтравочного контура или " +"маски" -#: ../src/ui/dialog/transformation.cpp:88 +#: ../src/ui/dialog/inkscape-preferences.cpp:1340 +msgid "Clippaths and masks" +msgstr "Обтравочные контуры и маски" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1343 +#, fuzzy +msgid "Stroke Style Markers" +msgstr "_Стиль обводки" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1345 +#: ../src/ui/dialog/inkscape-preferences.cpp:1347 msgid "" -"Vertical skew angle (positive = counterclockwise), or absolute displacement, " -"or percentage displacement" +"Stroke color same as object, fill color either object fill color or marker " +"fill color" msgstr "" -"Угол наклона по вертикали (больше 0 = против часовой стрелки), либо " -"абсолютное смещение, либо процентное смещение" -#: ../src/ui/dialog/transformation.cpp:91 -msgid "Transformation matrix element A" -msgstr "Преобразование элемента матрицы A" +#: ../src/ui/dialog/inkscape-preferences.cpp:1351 +#: ../share/extensions/hershey.inx.h:27 +msgid "Markers" +msgstr "Маркеры" -#: ../src/ui/dialog/transformation.cpp:92 -msgid "Transformation matrix element B" -msgstr "Преобразование элемента матрицы B" +#: ../src/ui/dialog/inkscape-preferences.cpp:1354 +#, fuzzy +msgid "Document cleanup" +msgstr "Документ" -#: ../src/ui/dialog/transformation.cpp:93 -msgid "Transformation matrix element C" -msgstr "Преобразование элемента матрицы C" +#: ../src/ui/dialog/inkscape-preferences.cpp:1355 +#: ../src/ui/dialog/inkscape-preferences.cpp:1357 +msgid "Remove unused swatches when doing a document cleanup" +msgstr "" -#: ../src/ui/dialog/transformation.cpp:94 -msgid "Transformation matrix element D" -msgstr "Преобразование элемента матрицы D" +#. tooltip +#: ../src/ui/dialog/inkscape-preferences.cpp:1358 +#, fuzzy +msgid "Cleanup" +msgstr "Концы:" -#: ../src/ui/dialog/transformation.cpp:95 -msgid "Transformation matrix element E" -msgstr "Преобразование элемента матрицы E" +#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +msgid "Number of _Threads:" +msgstr "_Количество потоков:" -#: ../src/ui/dialog/transformation.cpp:96 -msgid "Transformation matrix element F" -msgstr "Преобразование элемента матрицы F" +#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1898 +msgid "(requires restart)" +msgstr "(требует перезапуска программы)" -#: ../src/ui/dialog/transformation.cpp:101 -msgid "Rela_tive move" -msgstr "_Относительное смещение" +#: ../src/ui/dialog/inkscape-preferences.cpp:1367 +#, fuzzy +msgid "Configure number of processors/threads to use when rendering filters" +msgstr "Количество процессоров/потоков при визуализации гауссова размывания" -#: ../src/ui/dialog/transformation.cpp:101 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +msgid "Rendering _cache size:" +msgstr "_Размер кэша для рендеринга:" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +#, fuzzy +msgctxt "mebibyte (2^20 bytes) abbreviation" +msgid "MiB" +msgstr "Мин:" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "" -"Add the specified relative displacement to the current position; otherwise, " -"edit the current absolute position directly" +"Set the amount of memory per document which can be used to store rendered " +"parts of the drawing for later reuse; set to zero to disable caching" msgstr "" -"Добавить указанное относительное смещение к текущей позиции; в противном " -"случае изменить текущую абсолютную позицию напрямую" -#: ../src/ui/dialog/transformation.cpp:102 -msgid "_Scale proportionally" -msgstr "_Пропорциональное масштабирование" +#. blur quality +#. filter quality +#: ../src/ui/dialog/inkscape-preferences.cpp:1374 +#: ../src/ui/dialog/inkscape-preferences.cpp:1398 +msgid "Best quality (slowest)" +msgstr "Наилучшее качество (самая медленная отрисовка)" -#: ../src/ui/dialog/transformation.cpp:102 -msgid "Preserve the width/height ratio of the scaled objects" -msgstr "Сохранять соотношение ширины и высоты масштабируемых объектов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1376 +#: ../src/ui/dialog/inkscape-preferences.cpp:1400 +msgid "Better quality (slower)" +msgstr "Хорошее качество (медленная отрисовка)" -#: ../src/ui/dialog/transformation.cpp:103 -msgid "Apply to each _object separately" -msgstr "Применить к _каждому объекту отдельно" +#: ../src/ui/dialog/inkscape-preferences.cpp:1378 +#: ../src/ui/dialog/inkscape-preferences.cpp:1402 +msgid "Average quality" +msgstr "Среднее качество" -#: ../src/ui/dialog/transformation.cpp:103 -msgid "" -"Apply the scale/rotate/skew to each selected object separately; otherwise, " -"transform the selection as a whole" -msgstr "" -"Применить масштабирование/вращение/наклон к каждому объекту отдельно; в " -"противном случае выделенное преобразовывается как один объект" +#: ../src/ui/dialog/inkscape-preferences.cpp:1380 +#: ../src/ui/dialog/inkscape-preferences.cpp:1404 +msgid "Lower quality (faster)" +msgstr "Низкое качество (быстрая отрисовка)" -#: ../src/ui/dialog/transformation.cpp:104 -msgid "Edit c_urrent matrix" -msgstr "Изменить текущую _матрицу" +#: ../src/ui/dialog/inkscape-preferences.cpp:1382 +#: ../src/ui/dialog/inkscape-preferences.cpp:1406 +msgid "Lowest quality (fastest)" +msgstr "Самое низкое качество (самая быстрая отрисовка)" -#: ../src/ui/dialog/transformation.cpp:104 +#: ../src/ui/dialog/inkscape-preferences.cpp:1385 +msgid "Gaussian blur quality for display" +msgstr "Качество гауссова размывания на экране" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1411 msgid "" -"Edit the current transform= matrix; otherwise, post-multiply transform= by " -"this matrix" +"Best quality, but display may be very slow at high zooms (bitmap export " +"always uses best quality)" msgstr "" -"Изменить текущую матрицу transform=; в противном случае, послеумножить " -"transform= на эту матрицу" +"Наилучшее качество, но при большом масштабе отрисовка очень медленная (при " +"экспорте качество остаётся максимальным)" -#: ../src/ui/dialog/transformation.cpp:117 -msgid "_Scale" -msgstr "_Масштаб" +#: ../src/ui/dialog/inkscape-preferences.cpp:1389 +#: ../src/ui/dialog/inkscape-preferences.cpp:1413 +msgid "Better quality, but slower display" +msgstr "Хорошее качество, но невысокая скорость" -#: ../src/ui/dialog/transformation.cpp:120 -msgid "_Rotate" -msgstr "_Вращение" +#: ../src/ui/dialog/inkscape-preferences.cpp:1391 +#: ../src/ui/dialog/inkscape-preferences.cpp:1415 +msgid "Average quality, acceptable display speed" +msgstr "Среднее качество, приемлимая скорость отрисовки" -#: ../src/ui/dialog/transformation.cpp:123 -msgid "Ske_w" -msgstr "_Наклон" +#: ../src/ui/dialog/inkscape-preferences.cpp:1393 +#: ../src/ui/dialog/inkscape-preferences.cpp:1417 +msgid "Lower quality (some artifacts), but display is faster" +msgstr "Низкое качество с видимым артефактами, но быстрая отрисовка" -#: ../src/ui/dialog/transformation.cpp:126 -msgid "Matri_x" -msgstr "М_атрица" +#: ../src/ui/dialog/inkscape-preferences.cpp:1395 +#: ../src/ui/dialog/inkscape-preferences.cpp:1419 +msgid "Lowest quality (considerable artifacts), but display is fastest" +msgstr "" +"Очень низкое качество с достаточно заметными артефактами, но очень быстрая " +"отрисовка" -#: ../src/ui/dialog/transformation.cpp:150 -msgid "Reset the values on the current tab to defaults" -msgstr "Сбросить значения в этой вкладке до исходных" +#: ../src/ui/dialog/inkscape-preferences.cpp:1409 +msgid "Filter effects quality for display" +msgstr "Качество фильтров эффектов на экране" -#: ../src/ui/dialog/transformation.cpp:157 -msgid "Apply transformation to selection" -msgstr "Применить эти изменения к выбранному" +#. build custom preferences tab +#: ../src/ui/dialog/inkscape-preferences.cpp:1421 +#: ../src/ui/dialog/print.cpp:232 +msgid "Rendering" +msgstr "Тип печати" -#: ../src/ui/dialog/transformation.cpp:332 +#. Note: /options/bitmapoversample removed with Cairo renderer +#: ../src/ui/dialog/inkscape-preferences.cpp:1427 ../src/verbs.cpp:156 +#: ../src/widgets/calligraphy-toolbar.cpp:626 #, fuzzy -msgid "Rotate in a counterclockwise direction" -msgstr "Поворот против часовой стрелки" +msgid "Edit" +msgstr "_Правка" -#: ../src/ui/dialog/transformation.cpp:338 -#, fuzzy -msgid "Rotate in a clockwise direction" -msgstr "Поворот по часовой стрелке" +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 +msgid "Automatically reload bitmaps" +msgstr "Автоматически перезагружать растровые файлы" -#: ../src/ui/dialog/transformation.cpp:908 -#: ../src/ui/dialog/transformation.cpp:919 -#: ../src/ui/dialog/transformation.cpp:933 -#: ../src/ui/dialog/transformation.cpp:952 -#: ../src/ui/dialog/transformation.cpp:963 -#: ../src/ui/dialog/transformation.cpp:973 -#: ../src/ui/dialog/transformation.cpp:997 -msgid "Transform matrix is singular, <b>not used</b>." +#: ../src/ui/dialog/inkscape-preferences.cpp:1430 +msgid "Automatically reload linked images when file is changed on disk" msgstr "" +"Автоматически заново загружать связанные изображения, когда они меняются на " +"диске" -#: ../src/ui/dialog/transformation.cpp:1012 -msgid "Edit transformation matrix" -msgstr "Правка матрицы преобразования" +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 +#, fuzzy +msgid "_Bitmap editor:" +msgstr "Редактор растровых файлов:" -#: ../src/ui/dialog/transformation.cpp:1111 +#: ../src/ui/dialog/inkscape-preferences.cpp:1434 +#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:55 +#: ../share/extensions/print_win32_vector.inx.h:2 +msgid "Export" +msgstr "Экспорт" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1436 #, fuzzy -msgid "Rotation angle (positive = clockwise)" -msgstr "Угол поворота (больше 0 = против часовой стрелки)" +msgid "Default export _resolution:" +msgstr "Разрешение для экспорта:" -#: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:126 -msgid "New element node" -msgstr "Создать ветвь элемента" +#: ../src/ui/dialog/inkscape-preferences.cpp:1437 +msgid "Default bitmap resolution (in dots per inch) in the Export dialog" +msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию" -#: ../src/ui/dialog/xml-tree.cpp:71 ../src/ui/dialog/xml-tree.cpp:132 -msgid "New text node" -msgstr "Создать ветвь с текстом" +#: ../src/ui/dialog/inkscape-preferences.cpp:1438 +#: ../src/ui/dialog/xml-tree.cpp:912 +msgid "Create" +msgstr "Создать" -#: ../src/ui/dialog/xml-tree.cpp:72 ../src/ui/dialog/xml-tree.cpp:146 -msgid "nodeAsInXMLdialogTooltip|Delete node" -msgstr "Удалить элемент дерева XML" +#: ../src/ui/dialog/inkscape-preferences.cpp:1440 +#, fuzzy +msgid "Resolution for Create Bitmap _Copy:" +msgstr "Разрешение растровой копии:" -#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:138 -#: ../src/ui/dialog/xml-tree.cpp:977 -msgid "Duplicate node" -msgstr "Дублирование ветви" +#: ../src/ui/dialog/inkscape-preferences.cpp:1441 +msgid "Resolution used by the Create Bitmap Copy command" +msgstr "Разрешение растра при создании растровой копии выделения" -#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:191 -#: ../src/ui/dialog/xml-tree.cpp:1013 -msgid "Delete attribute" -msgstr "Удалить атрибут" +#: ../src/ui/dialog/inkscape-preferences.cpp:1444 +msgid "Ask about linking and scaling when importing" +msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:87 -msgid "Set" -msgstr "Установить" +#: ../src/ui/dialog/inkscape-preferences.cpp:1446 +msgid "Pop-up linking and scaling dialog when importing bitmap image." +msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:121 -msgid "Drag to reorder nodes" -msgstr "Используйте мышь для перетаскивания ветвей" +#: ../src/ui/dialog/inkscape-preferences.cpp:1452 +#, fuzzy +msgid "Bitmap link:" +msgstr "Редактор растровых файлов:" -#: ../src/ui/dialog/xml-tree.cpp:152 ../src/ui/dialog/xml-tree.cpp:153 -#: ../src/ui/dialog/xml-tree.cpp:1135 -msgid "Unindent node" -msgstr "Переместить к корню" +#: ../src/ui/dialog/inkscape-preferences.cpp:1459 +msgid "Bitmap scale (image-rendering):" +msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:157 ../src/ui/dialog/xml-tree.cpp:158 -#: ../src/ui/dialog/xml-tree.cpp:1113 -msgid "Indent node" -msgstr "Переместить от корня" +#: ../src/ui/dialog/inkscape-preferences.cpp:1464 +#, fuzzy +msgid "Default _import resolution:" +msgstr "Разрешение для экспорта:" -#: ../src/ui/dialog/xml-tree.cpp:162 ../src/ui/dialog/xml-tree.cpp:163 -#: ../src/ui/dialog/xml-tree.cpp:1064 -msgid "Raise node" -msgstr "Поднять ветвь" +#: ../src/ui/dialog/inkscape-preferences.cpp:1465 +#, fuzzy +msgid "Default bitmap resolution (in dots per inch) for bitmap import" +msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию" -#: ../src/ui/dialog/xml-tree.cpp:167 ../src/ui/dialog/xml-tree.cpp:168 -#: ../src/ui/dialog/xml-tree.cpp:1082 -msgid "Lower node" -msgstr "Опустить ветвь" +#: ../src/ui/dialog/inkscape-preferences.cpp:1466 +#, fuzzy +msgid "Override file resolution" +msgstr "Разрешение для экспорта:" -#: ../src/ui/dialog/xml-tree.cpp:208 -msgid "Attribute name" -msgstr "Имя атрибута" +#: ../src/ui/dialog/inkscape-preferences.cpp:1468 +#, fuzzy +msgid "Use default bitmap resolution in favor of information from file" +msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию" -#: ../src/ui/dialog/xml-tree.cpp:223 -msgid "Attribute value" -msgstr "Значение атрибута" +#. rendering outlines for pixmap image tags +#: ../src/ui/dialog/inkscape-preferences.cpp:1472 +#, fuzzy +msgid "Images in Outline Mode" +msgstr "Нарисовать абрис вокруг" -#: ../src/ui/dialog/xml-tree.cpp:311 -msgid "<b>Click</b> to select nodes, <b>drag</b> to rearrange." +#: ../src/ui/dialog/inkscape-preferences.cpp:1473 +msgid "" +"When active will render images while in outline mode instead of a red box " +"with an x. This is useful for manual tracing." msgstr "" -"<b>Щелчком</b> выделяется ветвь, <b>перетаскиванием</b> меняется порядок." -#: ../src/ui/dialog/xml-tree.cpp:322 -msgid "<b>Click</b> attribute to edit." -msgstr "<b>Щелкните мышкой</b> по атрибуту для его правки." +#: ../src/ui/dialog/inkscape-preferences.cpp:1475 +msgid "Bitmaps" +msgstr "Растр" -#: ../src/ui/dialog/xml-tree.cpp:326 -#, c-format +#: ../src/ui/dialog/inkscape-preferences.cpp:1487 msgid "" -"Attribute <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to " -"commit changes." +"Select a file of predefined shortcuts to use. Any customized shortcuts you " +"create will be added seperately to " msgstr "" -"Выбран атрибут <b>%s</b>. Нажмите <b>Ctrl+Enter</b>, когда закончите правку." -#: ../src/ui/dialog/xml-tree.cpp:566 -msgid "Drag XML subtree" -msgstr "Перетаскивание поддерева XML" +#: ../src/ui/dialog/inkscape-preferences.cpp:1490 +msgid "Shortcut file:" +msgstr "Файл схемы:" -#: ../src/ui/dialog/xml-tree.cpp:868 -msgid "New element node..." -msgstr "Создать ветвь элемента..." +#: ../src/ui/dialog/inkscape-preferences.cpp:1493 +#: ../src/ui/dialog/template-load-tab.cpp:48 +msgid "Search:" +msgstr "Искать:" -#: ../src/ui/dialog/xml-tree.cpp:906 -msgid "Cancel" -msgstr "Отменить" +#: ../src/ui/dialog/inkscape-preferences.cpp:1505 +msgid "Shortcut" +msgstr "Комбинация" -#: ../src/ui/dialog/xml-tree.cpp:943 -msgid "Create new element node" -msgstr "Создание ветви элемента" +#: ../src/ui/dialog/inkscape-preferences.cpp:1506 +#: ../src/ui/widget/page-sizer.cpp:260 +msgid "Description" +msgstr "Описание" -#: ../src/ui/dialog/xml-tree.cpp:959 -msgid "Create new text node" -msgstr "Создание текстовой ветви" +#: ../src/ui/dialog/inkscape-preferences.cpp:1561 +#: ../src/ui/dialog/pixelartdialog.cpp:296 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:698 +#: ../src/ui/dialog/tracedialog.cpp:813 +#: ../src/ui/widget/preferences-widget.cpp:749 +msgid "Reset" +msgstr "Сбросить " + +#: ../src/ui/dialog/inkscape-preferences.cpp:1561 +msgid "" +"Remove all your customized keyboard shortcuts, and revert to the shortcuts " +"in the shortcut file listed above" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1565 +#, fuzzy +msgid "Import ..." +msgstr "_Импортировать..." + +#: ../src/ui/dialog/inkscape-preferences.cpp:1565 +msgid "Import custom keyboard shortcuts from a file" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1568 +#, fuzzy +msgid "Export ..." +msgstr "_Экспортировать в растр..." -#: ../src/ui/dialog/xml-tree.cpp:994 -msgid "nodeAsInXMLinHistoryDialog|Delete node" -msgstr "Удаление элемента XML" +#: ../src/ui/dialog/inkscape-preferences.cpp:1568 +#, fuzzy +msgid "Export custom keyboard shortcuts to a file" +msgstr "Экспортировать документ в файл PS" -#: ../src/ui/dialog/xml-tree.cpp:1038 -msgid "Change attribute" -msgstr "Смена атрибута" +#: ../src/ui/dialog/inkscape-preferences.cpp:1578 +msgid "Keyboard Shortcuts" +msgstr "Клавиатурные комбинации" -#: ../src/ui/tool/curve-drag-point.cpp:100 -msgid "Drag curve" -msgstr "Перетаскивание кривой" +#. Find this group in the tree +#: ../src/ui/dialog/inkscape-preferences.cpp:1741 +msgid "Misc" +msgstr "Прочее" -#: ../src/ui/tool/curve-drag-point.cpp:157 -msgid "Add node" -msgstr "Добавление узла" +#: ../src/ui/dialog/inkscape-preferences.cpp:1839 +#, fuzzy +msgctxt "Spellchecker language" +msgid "None" +msgstr "Нет" -#: ../src/ui/tool/curve-drag-point.cpp:167 -msgctxt "Path segment tip" -msgid "<b>Shift</b>: click to toggle segment selection" -msgstr "<b>Shift</b>: щелчок переключает выделение сегмента" +#: ../src/ui/dialog/inkscape-preferences.cpp:1860 +msgid "Set the main spell check language" +msgstr "Первый по важности язык для проверки орфографии" -#: ../src/ui/tool/curve-drag-point.cpp:171 -msgctxt "Path segment tip" -msgid "<b>Ctrl+Alt</b>: click to insert a node" -msgstr "<b>Ctrl+Alt</b>: щелчок вставляет узел" +#: ../src/ui/dialog/inkscape-preferences.cpp:1863 +msgid "Second language:" +msgstr "Второй язык:" -#: ../src/ui/tool/curve-drag-point.cpp:175 -msgctxt "Path segment tip" +#: ../src/ui/dialog/inkscape-preferences.cpp:1864 msgid "" -"<b>Linear segment</b>: drag to convert to a Bezier segment, doubleclick to " -"insert node, click to select (more: Shift, Ctrl+Alt)" +"Set the second spell check language; checking will only stop on words " +"unknown in ALL chosen languages" msgstr "" -"<b>Линейный сегмент</b>: перетаскивание превращает его в сегмент Безье, " -"двойной щелчок вставляет узел, щелчок выделяет (попробуйте Shift, Ctrl+Alt)" +"Второй по важности язык для проверки орфографии; проверка завершится лишь в " +"случае ненахождения слов во ВСЕХ выбранных языках." -#: ../src/ui/tool/curve-drag-point.cpp:179 -msgctxt "Path segment tip" +#: ../src/ui/dialog/inkscape-preferences.cpp:1867 +msgid "Third language:" +msgstr "Третий язык:" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1868 msgid "" -"<b>Bezier segment</b>: drag to shape the segment, doubleclick to insert " -"node, click to select (more: Shift, Ctrl+Alt)" +"Set the third spell check language; checking will only stop on words unknown " +"in ALL chosen languages" msgstr "" -"<b>Сегмент Безье</b>: перетаскивание меняет форму, двойной щелчок вставляет " -"узел, щелчок выделяет (попробуйте Shift, Ctrl+Alt)" +"Третий по важности язык для проверки орфографии; проверка завершится лишь в " +"случае ненахождения слов во ВСЕХ выбранных языках." -#: ../src/ui/tool/multi-path-manipulator.cpp:315 -#, fuzzy -msgid "Retract handles" -msgstr "Втяжка узла" +#: ../src/ui/dialog/inkscape-preferences.cpp:1870 +msgid "Ignore words with digits" +msgstr "Игнорировать слова с цифрами" -#: ../src/ui/tool/multi-path-manipulator.cpp:315 ../src/ui/tool/node.cpp:270 -msgid "Change node type" -msgstr "Смена типа узла" +#: ../src/ui/dialog/inkscape-preferences.cpp:1872 +msgid "Ignore words containing digits, such as \"R2D2\"" +msgstr "Инорировать слова, содержащие цифры — например, \"R2D2\"" -#: ../src/ui/tool/multi-path-manipulator.cpp:323 -msgid "Straighten segments" -msgstr "Выпрямить сегменты" +#: ../src/ui/dialog/inkscape-preferences.cpp:1874 +msgid "Ignore words in ALL CAPITALS" +msgstr "Игнорировать слова, написанные заглавными" -#: ../src/ui/tool/multi-path-manipulator.cpp:325 -msgid "Make segments curves" -msgstr "Сделать сегменты кривыми" +#: ../src/ui/dialog/inkscape-preferences.cpp:1876 +msgid "Ignore words in all capitals, such as \"IUPAC\"" +msgstr "Игнорировать слова, написанные заглавными — например, «НИИЧАВО»" -#: ../src/ui/tool/multi-path-manipulator.cpp:333 -msgid "Add nodes" -msgstr "Добавление узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1878 +msgid "Spellcheck" +msgstr "Проверка орфографии" -#: ../src/ui/tool/multi-path-manipulator.cpp:339 +#: ../src/ui/dialog/inkscape-preferences.cpp:1898 #, fuzzy -msgid "Add extremum nodes" -msgstr "Добавление узлов" +msgid "Latency _skew:" +msgstr "Отклонение задержки:" -#: ../src/ui/tool/multi-path-manipulator.cpp:346 +#: ../src/ui/dialog/inkscape-preferences.cpp:1899 #, fuzzy -msgid "Duplicate nodes" -msgstr "Дублирование ветви" +msgid "" +"Factor by which the event clock is skewed from the actual time (0.9766 on " +"some systems)" +msgstr "" +"Коэффициент, на который часы событий отклоняются от настоящего времени " +"(0.9766 в некоторых системах)" -#: ../src/ui/tool/multi-path-manipulator.cpp:409 -#: ../src/widgets/node-toolbar.cpp:408 -msgid "Join nodes" -msgstr "Соединение узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1901 +msgid "Pre-render named icons" +msgstr "Предварительно отрисовывать именованные значки" -#: ../src/ui/tool/multi-path-manipulator.cpp:416 -#: ../src/widgets/node-toolbar.cpp:419 -msgid "Break nodes" -msgstr "Разбить узлы" +#: ../src/ui/dialog/inkscape-preferences.cpp:1903 +msgid "" +"When on, named icons will be rendered before displaying the ui. This is for " +"working around bugs in GTK+ named icon notification" +msgstr "" +"Если включено, именованные значки будут отрисовываться перед отображением " +"интерфейса. Это местечковое решение ошибки в GTK+, касающейся именованных " +"значков." -#: ../src/ui/tool/multi-path-manipulator.cpp:423 -msgid "Delete nodes" -msgstr "Удаление узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1911 +msgid "System info" +msgstr "Информация о системе" -#: ../src/ui/tool/multi-path-manipulator.cpp:757 -msgid "Move nodes" -msgstr "Смещение узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1915 +msgid "User config: " +msgstr "Пользовательская конфигурация:" -#: ../src/ui/tool/multi-path-manipulator.cpp:760 -msgid "Move nodes horizontally" -msgstr "Смещение узлов по горизонтали" +#: ../src/ui/dialog/inkscape-preferences.cpp:1915 +msgid "Location of users configuration" +msgstr "" -#: ../src/ui/tool/multi-path-manipulator.cpp:764 -msgid "Move nodes vertically" -msgstr "Смещение узлов по вертикали" +#: ../src/ui/dialog/inkscape-preferences.cpp:1919 +msgid "User preferences: " +msgstr "Пользовательские предпочтения:" -#: ../src/ui/tool/multi-path-manipulator.cpp:768 -#: ../src/ui/tool/multi-path-manipulator.cpp:771 -msgid "Rotate nodes" -msgstr "Вращение узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1919 +#, fuzzy +msgid "Location of the users preferences file" +msgstr "Не удалось загрузить файл параметров %s." -#: ../src/ui/tool/multi-path-manipulator.cpp:775 -#: ../src/ui/tool/multi-path-manipulator.cpp:781 -msgid "Scale nodes uniformly" -msgstr "Единообразное масштабирование узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1923 +msgid "User extensions: " +msgstr "Пользовательские расширения:" -#: ../src/ui/tool/multi-path-manipulator.cpp:778 -msgid "Scale nodes" -msgstr "Масштабирование узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1923 +#, fuzzy +msgid "Location of the users extensions" +msgstr "Информация о расширениях Inkscape" -#: ../src/ui/tool/multi-path-manipulator.cpp:785 -msgid "Scale nodes horizontally" -msgstr "Горизонтальное масштабирование узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1927 +msgid "User cache: " +msgstr "Кэш пользователя:" -#: ../src/ui/tool/multi-path-manipulator.cpp:789 -msgid "Scale nodes vertically" -msgstr "Вертикальное масштабирование узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1927 +msgid "Location of users cache" +msgstr "" -#: ../src/ui/tool/multi-path-manipulator.cpp:793 -#, fuzzy -msgid "Skew nodes horizontally" -msgstr "Горизонтальное масштабирование узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1935 +msgid "Temporary files: " +msgstr "" -#: ../src/ui/tool/multi-path-manipulator.cpp:797 +#: ../src/ui/dialog/inkscape-preferences.cpp:1935 +msgid "Location of the temporary files used for autosave" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1939 #, fuzzy -msgid "Skew nodes vertically" -msgstr "Вертикальное масштабирование узлов" +msgid "Inkscape data: " +msgstr "Руководство по Inkscape" -#: ../src/ui/tool/multi-path-manipulator.cpp:801 -msgid "Flip nodes horizontally" -msgstr "Горизонтальное отражение узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1939 +#, fuzzy +msgid "Location of Inkscape data" +msgstr "Информация о расширениях Inkscape" -#: ../src/ui/tool/multi-path-manipulator.cpp:804 -msgid "Flip nodes vertically" -msgstr "Вертикальное отражение узлов" +#: ../src/ui/dialog/inkscape-preferences.cpp:1943 +msgid "Inkscape extensions: " +msgstr "Расширения Inkscape:" -#: ../src/ui/tool/node.cpp:245 -msgid "Cusp node handle" -msgstr "Рычаг острого узла" +#: ../src/ui/dialog/inkscape-preferences.cpp:1943 +#, fuzzy +msgid "Location of the Inkscape extensions" +msgstr "Информация о расширениях Inkscape" -#: ../src/ui/tool/node.cpp:246 -msgid "Smooth node handle" -msgstr "Рычаг сглаженного узла" +#: ../src/ui/dialog/inkscape-preferences.cpp:1952 +msgid "System data: " +msgstr "Данные о системе" -#: ../src/ui/tool/node.cpp:247 -msgid "Symmetric node handle" -msgstr "Рычаг симметричного узла" +#: ../src/ui/dialog/inkscape-preferences.cpp:1952 +msgid "Locations of system data" +msgstr "" -#: ../src/ui/tool/node.cpp:248 -msgid "Auto-smooth node handle" -msgstr "Рычаг автоматически сглаженного узла" +#: ../src/ui/dialog/inkscape-preferences.cpp:1976 +msgid "Icon theme: " +msgstr "Тема значков:" -#: ../src/ui/tool/node.cpp:432 -msgctxt "Path handle tip" -msgid "more: Shift, Ctrl, Alt" -msgstr "попробуйте Shift, Ctrl, Alt" +#: ../src/ui/dialog/inkscape-preferences.cpp:1976 +#, fuzzy +msgid "Locations of icon themes" +msgstr "Информация о расширениях Inkscape" -#: ../src/ui/tool/node.cpp:434 -msgctxt "Path handle tip" -msgid "more: Ctrl, Alt" -msgstr "попробуйте Ctrl, Alt" +#: ../src/ui/dialog/inkscape-preferences.cpp:1978 +msgid "System" +msgstr "Системный" -#: ../src/ui/tool/node.cpp:440 -#, c-format -msgctxt "Path handle tip" -msgid "" -"<b>Shift+Ctrl+Alt</b>: preserve length and snap rotation angle to %g° " -"increments while rotating both handles" -msgstr "" -"<b>Shift+Ctrl+Alt</b>: сохраняет длину и вращает оба рычага с шагом %g°" +#: ../src/ui/dialog/input.cpp:360 ../src/ui/dialog/input.cpp:381 +#: ../src/ui/dialog/input.cpp:1641 +msgid "Disabled" +msgstr "Отключено" -#: ../src/ui/tool/node.cpp:445 -#, c-format -msgctxt "Path handle tip" -msgid "" -"<b>Ctrl+Alt</b>: preserve length and snap rotation angle to %g° increments" -msgstr "<b>Ctrl+Alt</b>: сохраняет длину, с шагом вращения %g°" +#: ../src/ui/dialog/input.cpp:361 +msgctxt "Input device" +msgid "Screen" +msgstr "Экран" -#: ../src/ui/tool/node.cpp:451 -msgctxt "Path handle tip" -msgid "<b>Shift+Alt</b>: preserve handle length and rotate both handles" -msgstr "<b>Shift+Alt</b>: сохраняет длину рычагов и вращает оба рычага" +#: ../src/ui/dialog/input.cpp:362 ../src/ui/dialog/input.cpp:383 +msgid "Window" +msgstr "Окно" -#: ../src/ui/tool/node.cpp:454 -msgctxt "Path handle tip" -msgid "<b>Alt</b>: preserve handle length while dragging" -msgstr "<b>Alt</b>: сохраняет длину рычагов при перетаскивании" +#: ../src/ui/dialog/input.cpp:618 +msgid "Test Area" +msgstr "Область тестирования" -#: ../src/ui/tool/node.cpp:461 -#, c-format -msgctxt "Path handle tip" -msgid "" -"<b>Shift+Ctrl</b>: snap rotation angle to %g° increments and rotate both " -"handles" -msgstr "<b>Shift+Ctrl</b>: вращает оба рычага с шагом по %g°" +#: ../src/ui/dialog/input.cpp:619 +msgid "Axis" +msgstr "Ось" -#: ../src/ui/tool/node.cpp:465 -#, c-format -msgctxt "Path handle tip" -msgid "<b>Ctrl</b>: snap rotation angle to %g° increments, click to retract" -msgstr "<b>Ctrl</b>: вращение шагами по %g°, щелчок втягивает" +#: ../src/ui/dialog/input.cpp:708 ../share/extensions/svgcalendar.inx.h:2 +msgid "Configuration" +msgstr "Основные параметры" -#: ../src/ui/tool/node.cpp:470 -msgctxt "Path hande tip" -msgid "<b>Shift</b>: rotate both handles by the same angle" -msgstr "<b>Shift</b>: вращает оба рычага на одинаковый угол" +#: ../src/ui/dialog/input.cpp:709 +msgid "Hardware" +msgstr "Устройства" -#: ../src/ui/tool/node.cpp:477 -#, c-format -msgctxt "Path handle tip" -msgid "<b>Auto node handle</b>: drag to convert to smooth node (%s)" -msgstr "" -"<b>Автоматический рычаг узла</b>: перетаскивание делает узел сглаженным (%s)" +#: ../src/ui/dialog/input.cpp:732 +msgid "Link:" +msgstr "Связь:" -#: ../src/ui/tool/node.cpp:480 -#, c-format -msgctxt "Path handle tip" -msgid "<b>%s</b>: drag to shape the segment (%s)" -msgstr "<b>%s</b>: перетаскивание меняет форму сегмента (%s)" +#: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743 +#: ../src/ui/dialog/input.cpp:1571 +msgid "None" +msgstr "Нет" -#: ../src/ui/tool/node.cpp:500 -#, c-format -msgctxt "Path handle tip" -msgid "Move handle by %s, %s; angle %.2f°, length %s" -msgstr "Перемещение узла на %s, %s; угол %.2f°, длина %s" +#: ../src/ui/dialog/input.cpp:758 +msgid "Axes count:" +msgstr "Число осей:" -#: ../src/ui/tool/node.cpp:1270 -msgctxt "Path node tip" -msgid "<b>Shift</b>: drag out a handle, click to toggle selection" -msgstr "<b>Shift</b>: вытаскивает рычаг, щелчок переключает выделение" +#: ../src/ui/dialog/input.cpp:788 +msgid "axis:" +msgstr "ось:" -#: ../src/ui/tool/node.cpp:1272 -msgctxt "Path node tip" -msgid "<b>Shift</b>: click to toggle selection" -msgstr "<b>Shift</b>: щелчок переключает выделение" +#: ../src/ui/dialog/input.cpp:812 +msgid "Button count:" +msgstr "Число кнопок:" -#: ../src/ui/tool/node.cpp:1277 -msgctxt "Path node tip" -msgid "<b>Ctrl+Alt</b>: move along handle lines, click to delete node" -msgstr "<b>Ctrl+Alt</b>: перемещает вдоль линий рычага, щелчок удаляет узел" +#: ../src/ui/dialog/input.cpp:1010 +msgid "Tablet" +msgstr "Планшет" -#: ../src/ui/tool/node.cpp:1280 -msgctxt "Path node tip" -msgid "<b>Ctrl</b>: move along axes, click to change node type" -msgstr "<b>Ctrl</b>: перемещает вдоль осей, щелчок меняет тип узла" +#: ../src/ui/dialog/input.cpp:1039 ../src/ui/dialog/input.cpp:1928 +msgid "pad" +msgstr "" -#: ../src/ui/tool/node.cpp:1284 -msgctxt "Path node tip" -msgid "<b>Alt</b>: sculpt nodes" -msgstr "<b>Alt</b>: лепка узлов" +#: ../src/ui/dialog/input.cpp:1081 +msgid "_Use pressure-sensitive tablet (requires restart)" +msgstr "_Использовать графический планшет (нужен перезапуск)" -#: ../src/ui/tool/node.cpp:1292 -#, c-format -msgctxt "Path node tip" -msgid "<b>%s</b>: drag to shape the path (more: Shift, Ctrl, Alt)" -msgstr "" -"<b>%s</b>: перетаскивание меняет форму контура (попробуйте Shift, Ctrl, Alt)" +#: ../src/ui/dialog/input.cpp:1086 +#, fuzzy +msgid "Axes" +msgstr "Нарисовать оси" -#: ../src/ui/tool/node.cpp:1295 -#, c-format -msgctxt "Path node tip" -msgid "" -"<b>%s</b>: drag to shape the path, click to toggle scale/rotation handles " -"(more: Shift, Ctrl, Alt)" +#: ../src/ui/dialog/input.cpp:1087 +msgid "Keys" msgstr "" -"<b>%s</b>: перетаскивание меняет форму контура, щелчок переключает рычаги " -"масштабирования/вращения (попробуйте Shift, Ctrl, Alt)" -#: ../src/ui/tool/node.cpp:1298 -#, c-format -msgctxt "Path node tip" +#: ../src/ui/dialog/input.cpp:1170 msgid "" -"<b>%s</b>: drag to shape the path, click to select only this node (more: " -"Shift, Ctrl, Alt)" +"A device can be 'Disabled', its co-ordinates mapped to the whole 'Screen', " +"or to a single (usually focused) 'Window'" msgstr "" -"<b>%s</b>: перетаскивание меняет форму контура, щелчок выделяет только этот " -"узел (попробуйте Shift, Ctrl, Alt)" - -#: ../src/ui/tool/node.cpp:1309 -#, c-format -msgctxt "Path node tip" -msgid "Move node by %s, %s" -msgstr "Перемещение узла на %s, %s" -#: ../src/ui/tool/node.cpp:1320 -msgid "Symmetric node" -msgstr "Симметричный узел" +#: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578 +#: ../src/widgets/spray-toolbar.cpp:224 ../src/widgets/tweak-toolbar.cpp:372 +msgid "Pressure" +msgstr "Нажим" -#: ../src/ui/tool/node.cpp:1321 -msgid "Auto-smooth node" -msgstr "Автоматически сглаженный узел" +#: ../src/ui/dialog/input.cpp:1616 +msgid "X tilt" +msgstr "" -#: ../src/ui/tool/path-manipulator.cpp:821 -msgid "Scale handle" -msgstr "Рычаг масштабирования" +#: ../src/ui/dialog/input.cpp:1616 +msgid "Y tilt" +msgstr "" -#: ../src/ui/tool/path-manipulator.cpp:845 -msgid "Rotate handle" -msgstr "Рычаг вращения" +#: ../src/ui/dialog/input.cpp:1616 +#: ../src/widgets/sp-color-wheel-selector.cpp:59 +msgid "Wheel" +msgstr "Круг" -#. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1384 -#: ../src/widgets/node-toolbar.cpp:397 -msgid "Delete node" -msgstr "Удалить узел" +#: ../src/ui/dialog/input.cpp:1625 +#, fuzzy +msgctxt "Input device axe" +msgid "None" +msgstr "Нет" -#: ../src/ui/tool/path-manipulator.cpp:1392 -msgid "Cycle node type" -msgstr "Циклически менять тип узла" +#: ../src/ui/dialog/layer-properties.cpp:55 +msgid "Layer name:" +msgstr "Имя слоя:" -#: ../src/ui/tool/path-manipulator.cpp:1407 -#, fuzzy -msgid "Drag handle" -msgstr "Нарисовать рычаги" +#: ../src/ui/dialog/layer-properties.cpp:136 +msgid "Add layer" +msgstr "Добавление слоя" -#: ../src/ui/tool/path-manipulator.cpp:1416 -msgid "Retract handle" -msgstr "Втяжка узла" +#: ../src/ui/dialog/layer-properties.cpp:176 +msgid "Above current" +msgstr "Над текущим слоем" -#: ../src/ui/tool/transform-handle-set.cpp:195 -msgctxt "Transform handle tip" -msgid "<b>Shift+Ctrl</b>: scale uniformly about the rotation center" -msgstr "" -"<b>Shift+Ctrl</b>: масштабирование относительно точки вращения с сохранением " -"пропорций" +#: ../src/ui/dialog/layer-properties.cpp:180 +msgid "Below current" +msgstr "Под текущим слоем" -#: ../src/ui/tool/transform-handle-set.cpp:197 -msgctxt "Transform handle tip" -msgid "<b>Ctrl:</b> scale uniformly" -msgstr "<b>Shift+Ctrl</b>: масштабирование с сохранением пропорций" +#: ../src/ui/dialog/layer-properties.cpp:183 +msgid "As sublayer of current" +msgstr "Внутри текущего слоя" -#: ../src/ui/tool/transform-handle-set.cpp:202 -msgctxt "Transform handle tip" -msgid "" -"<b>Shift+Alt</b>: scale using an integer ratio about the rotation center" -msgstr "" -"<b>Shift+Alt</b>: масштабирование относительно точки вращения с " -"коэффициентом соотношения сторон" +#: ../src/ui/dialog/layer-properties.cpp:352 +msgid "Rename Layer" +msgstr "Переименование слоя" -#: ../src/ui/tool/transform-handle-set.cpp:204 -msgctxt "Transform handle tip" -msgid "<b>Shift</b>: scale from the rotation center" -msgstr "<b>Shift</b>: масштабирование относительно точки вращения" +#. TODO: find an unused layer number, forming name from _("Layer ") + "%d" +#: ../src/ui/dialog/layer-properties.cpp:354 +#: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 +#: ../src/verbs.cpp:2289 +msgid "Layer" +msgstr "Слой" -#: ../src/ui/tool/transform-handle-set.cpp:207 -msgctxt "Transform handle tip" -msgid "<b>Alt</b>: scale using an integer ratio" -msgstr "<b>Alt</b>: масштабирование с коэффициентом соотношения сторон" +#: ../src/ui/dialog/layer-properties.cpp:355 +msgid "_Rename" +msgstr "Пере_именовать" -#: ../src/ui/tool/transform-handle-set.cpp:209 -msgctxt "Transform handle tip" -msgid "<b>Scale handle</b>: drag to scale the selection" -msgstr "<b>Рычаг масштабирования</b>: перетаскивание масштабирует выделение" +#: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:750 +msgid "Rename layer" +msgstr "Переименование слоя" -#: ../src/ui/tool/transform-handle-set.cpp:214 -#, c-format -msgctxt "Transform handle tip" -msgid "Scale by %.2f%% x %.2f%%" -msgstr "Масштабирование на %.2f%%×%.2f%%" +#. TRANSLATORS: This means "The layer has been renamed" +#: ../src/ui/dialog/layer-properties.cpp:370 +msgid "Renamed layer" +msgstr "Переименованный слой" -#: ../src/ui/tool/transform-handle-set.cpp:438 -#, c-format -msgctxt "Transform handle tip" -msgid "" -"<b>Shift+Ctrl</b>: rotate around the opposite corner and snap angle to %f° " -"increments" -msgstr "" -"<b>Shift+Ctrl</b>: вращает относительно противоположного угла с шагом в %f°" +#: ../src/ui/dialog/layer-properties.cpp:374 +msgid "Add Layer" +msgstr "Добавка слоя" -#: ../src/ui/tool/transform-handle-set.cpp:441 -msgctxt "Transform handle tip" -msgid "<b>Shift</b>: rotate around the opposite corner" -msgstr "<b>Shift</b>: вращает относительно противоположного угла" +#: ../src/ui/dialog/layer-properties.cpp:380 +msgid "_Add" +msgstr "_Добавить" -#: ../src/ui/tool/transform-handle-set.cpp:445 -#, c-format -msgctxt "Transform handle tip" -msgid "<b>Ctrl</b>: snap angle to %f° increments" -msgstr "<b>Ctrl</b>: вращает с шагом %f°" +#: ../src/ui/dialog/layer-properties.cpp:404 +msgid "New layer created." +msgstr "Создание нового слоя." -#: ../src/ui/tool/transform-handle-set.cpp:447 -msgctxt "Transform handle tip" -msgid "" -"<b>Rotation handle</b>: drag to rotate the selection around the rotation " -"center" -msgstr "" -"<b>Рычаг вращения</b>: перетаскивание вращает выделение относительно центра " -"вращения" +#: ../src/ui/dialog/layer-properties.cpp:408 +msgid "Move to Layer" +msgstr "Перемещение на слой" -#. event -#: ../src/ui/tool/transform-handle-set.cpp:452 -#, c-format -msgctxt "Transform handle tip" -msgid "Rotate by %.2f°" -msgstr "Вращение на %.2f°" +#: ../src/ui/dialog/layer-properties.cpp:411 +#: ../src/ui/dialog/transformation.cpp:114 +msgid "_Move" +msgstr "_Смещение" -#: ../src/ui/tool/transform-handle-set.cpp:578 -#, c-format -msgctxt "Transform handle tip" -msgid "" -"<b>Shift+Ctrl</b>: skew about the rotation center with snapping to %f° " -"increments" -msgstr "<b>Shift+Ctrl</b>: наклон относительно центра вращения шагами по %f°" +#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 +msgid "Unhide layer" +msgstr "Раскрытие объекта" -#: ../src/ui/tool/transform-handle-set.cpp:581 -msgctxt "Transform handle tip" -msgid "<b>Shift</b>: skew about the rotation center" -msgstr "<b>Shift</b>: наклон относительно центра вращения" +#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 +msgid "Hide layer" +msgstr "Сокрытие слоя" -#: ../src/ui/tool/transform-handle-set.cpp:585 -#, c-format -msgctxt "Transform handle tip" -msgid "<b>Ctrl</b>: snap skew angle to %f° increments" -msgstr "<b>Ctrl</b>: наклон шагами по %f°" +#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 +msgid "Lock layer" +msgstr "Блокировка слоя" -#: ../src/ui/tool/transform-handle-set.cpp:588 -msgctxt "Transform handle tip" -msgid "" -"<b>Skew handle</b>: drag to skew (shear) selection about the opposite handle" -msgstr "" -"<b>Рычаг наклона</b>: перетаскивание наклоняет выделение относительно " -"противоположного рычага" +#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 +msgid "Unlock layer" +msgstr "Разблокировка слоя" -#: ../src/ui/tool/transform-handle-set.cpp:594 -#, c-format -msgctxt "Transform handle tip" -msgid "Skew horizontally by %.2f°" -msgstr "Наклонить по горизонтали на %.2f°" +#: ../src/ui/dialog/layers.cpp:624 ../src/verbs.cpp:1405 +msgid "Toggle layer solo" +msgstr "Солирующий слой" -#: ../src/ui/tool/transform-handle-set.cpp:597 -#, c-format -msgctxt "Transform handle tip" -msgid "Skew vertically by %.2f°" -msgstr "Наклонить по вертикали на %.2f°" +#: ../src/ui/dialog/layers.cpp:627 ../src/verbs.cpp:1429 +msgid "Lock other layers" +msgstr "Блокировка остальных слоёв" -#: ../src/ui/tool/transform-handle-set.cpp:656 -msgctxt "Transform handle tip" -msgid "<b>Rotation center</b>: drag to change the origin of transforms" -msgstr "" -"<b>Центр вращения</b>: переместите для смены исходной точки трансформаций" +#: ../src/ui/dialog/layers.cpp:721 +#, fuzzy +msgid "Moved layer" +msgstr "Опускание слоя" -#: ../src/ui/tools/arc-tool.cpp:252 -msgid "" -"<b>Ctrl</b>: make circle or integer-ratio ellipse, snap arc/segment angle" -msgstr "" -"<b>Ctrl</b>: создать круг или эллипс с целым отношением сторон, ограничить " -"угол дуги/сегмента" +#: ../src/ui/dialog/layers.cpp:884 +#, fuzzy +msgctxt "Layers" +msgid "New" +msgstr "Новый" -#: ../src/ui/tools/arc-tool.cpp:253 ../src/ui/tools/rect-tool.cpp:289 -msgid "<b>Shift</b>: draw around the starting point" -msgstr "<b>Shift</b>: рисовать вокруг начальной точки" +#: ../src/ui/dialog/layers.cpp:889 +#, fuzzy +msgctxt "Layers" +msgid "Bot" +msgstr "Низ" -#: ../src/ui/tools/arc-tool.cpp:422 -#, c-format -msgid "" -"<b>Ellipse</b>: %s × %s (constrained to ratio %d:%d); with <b>Shift</b> " -"to draw around the starting point" -msgstr "" -"<b>Эллипс</b>: %s × %s; (с соотношением сторон %d:%d); с <b>Shift</b> " -"рисует вокруг начальной точки" +#: ../src/ui/dialog/layers.cpp:895 +#, fuzzy +msgctxt "Layers" +msgid "Dn" +msgstr "Ниже" -#: ../src/ui/tools/arc-tool.cpp:424 -#, c-format -msgid "" -"<b>Ellipse</b>: %s × %s; with <b>Ctrl</b> to make square or integer-" -"ratio ellipse; with <b>Shift</b> to draw around the starting point" -msgstr "" -"<b>Эллипс</b>: %s × %s; с <b>Ctrl</b> рисует круг или эллипс с целым " -"отношением сторон; с <b>Shift</b> рисует вокруг начальной точки" +#: ../src/ui/dialog/layers.cpp:901 +#, fuzzy +msgctxt "Layers" +msgid "Up" +msgstr "Выше" -#: ../src/ui/tools/arc-tool.cpp:447 -msgid "Create ellipse" -msgstr "Создание эллипса" +#: ../src/ui/dialog/layers.cpp:907 +#, fuzzy +msgctxt "Layers" +msgid "Top" +msgstr "Верх" -#: ../src/ui/tools/box3d-tool.cpp:370 ../src/ui/tools/box3d-tool.cpp:377 -#: ../src/ui/tools/box3d-tool.cpp:384 ../src/ui/tools/box3d-tool.cpp:391 -#: ../src/ui/tools/box3d-tool.cpp:398 ../src/ui/tools/box3d-tool.cpp:405 -msgid "Change perspective (angle of PLs)" -msgstr "Менять перспективу (угол параллельных линий)" +#: ../src/ui/dialog/livepatheffect-add.cpp:32 +msgid "Add Path Effect" +msgstr "Добавка контурного эффекта" -#. status text -#: ../src/ui/tools/box3d-tool.cpp:583 -msgid "<b>3D Box</b>; with <b>Shift</b> to extrude along the Z axis" -msgstr "<b>Параллелепипед</b>; с <b>Shift</b> — для выдавливания вдоль оси Z" +#: ../src/ui/dialog/livepatheffect-editor.cpp:109 +msgid "Add path effect" +msgstr "Добавить контурный эффект" -#: ../src/ui/tools/box3d-tool.cpp:609 -msgid "Create 3D box" -msgstr "Создание паралеллепипеда" +#: ../src/ui/dialog/livepatheffect-editor.cpp:119 +msgid "Delete current path effect" +msgstr "Удалить контурный эффект" -#: ../src/ui/tools/calligraphic-tool.cpp:536 -msgid "" -"<b>Guide path selected</b>; start drawing along the guide with <b>Ctrl</b>" -msgstr "" -"<b>Выбран направляющий контур</b>; начните рисовать вдоль него с нажатой " -"клавишой <b>Ctrl</b>" +#: ../src/ui/dialog/livepatheffect-editor.cpp:129 +msgid "Raise the current path effect" +msgstr "Поднять текущий контурный эффект" -#: ../src/ui/tools/calligraphic-tool.cpp:538 -msgid "<b>Select a guide path</b> to track with <b>Ctrl</b>" -msgstr "<b>Выберите направляющий контур</b> с нажатой клавишой <b>Ctrl</b>" +#: ../src/ui/dialog/livepatheffect-editor.cpp:139 +msgid "Lower the current path effect" +msgstr "Опустить текущий контурный эффект" -#: ../src/ui/tools/calligraphic-tool.cpp:673 -msgid "Tracking: <b>connection to guide path lost!</b>" -msgstr "Отслеживание: <b>соединение с направляющим контуром потеряно!</b>" +#: ../src/ui/dialog/livepatheffect-editor.cpp:313 +msgid "Unknown effect is applied" +msgstr "Применен неизвестный эффект" -#: ../src/ui/tools/calligraphic-tool.cpp:673 -msgid "<b>Tracking</b> a guide path" -msgstr "<b>Отслеживание</b> направляющего контура" +#: ../src/ui/dialog/livepatheffect-editor.cpp:316 +msgid "Click button to add an effect" +msgstr "Щёлкните кнопку для добавления эффекта" -#: ../src/ui/tools/calligraphic-tool.cpp:676 -msgid "<b>Drawing</b> a calligraphic stroke" -msgstr "<b>Рисование</b> каллиграфическим пером" +#: ../src/ui/dialog/livepatheffect-editor.cpp:329 +#, fuzzy +msgid "Click add button to convert clone" +msgstr "Щёлкните кнопку для добавления эффекта" -#: ../src/ui/tools/calligraphic-tool.cpp:977 -msgid "Draw calligraphic stroke" -msgstr "Рисование каллиграфическим пером" +#: ../src/ui/dialog/livepatheffect-editor.cpp:334 +#: ../src/ui/dialog/livepatheffect-editor.cpp:338 +#: ../src/ui/dialog/livepatheffect-editor.cpp:346 +msgid "Select a path or shape" +msgstr "Выберите контур или фигуру" -#: ../src/ui/tools/connector-tool.cpp:499 -msgid "Creating new connector" -msgstr "Создается новая соединительная линия" +#: ../src/ui/dialog/livepatheffect-editor.cpp:342 +msgid "Only one item can be selected" +msgstr "Можно выбрать только один объект" -#: ../src/ui/tools/connector-tool.cpp:740 -msgid "Connector endpoint drag cancelled." -msgstr "Перемещение конечных точек соединительной линии отменено." +#: ../src/ui/dialog/livepatheffect-editor.cpp:374 +msgid "Unknown effect" +msgstr "Неизвестный эффект" -#: ../src/ui/tools/connector-tool.cpp:783 -msgid "Reroute connector" -msgstr "Объекты пересоединены" +#: ../src/ui/dialog/livepatheffect-editor.cpp:450 +msgid "Create and apply path effect" +msgstr "Создание контурного эффекта" -#: ../src/ui/tools/connector-tool.cpp:936 -msgid "Create connector" -msgstr "Создание соединительной линии" +#: ../src/ui/dialog/livepatheffect-editor.cpp:485 +#, fuzzy +msgid "Create and apply Clone original path effect" +msgstr "Создание контурного эффекта" -#: ../src/ui/tools/connector-tool.cpp:953 -msgid "Finishing connector" -msgstr "Соединительная линия закрывается" +#: ../src/ui/dialog/livepatheffect-editor.cpp:505 +msgid "Remove path effect" +msgstr "Удаление контурного эффекта" -#: ../src/ui/tools/connector-tool.cpp:1191 -msgid "<b>Connector endpoint</b>: drag to reroute or connect to new shapes" -msgstr "" -"<b>Конечная соединительная точка</b>: перетащите для пересоединения или " -"соединения с новыми фигурами" +#: ../src/ui/dialog/livepatheffect-editor.cpp:522 +msgid "Move path effect up" +msgstr "Поднятие контурного эффекта" -#: ../src/ui/tools/connector-tool.cpp:1336 -msgid "Select <b>at least one non-connector object</b>." -msgstr "Выделите <b>как минимум один объект (не соединительную линию)</b>." +#: ../src/ui/dialog/livepatheffect-editor.cpp:538 +msgid "Move path effect down" +msgstr "Опускание контурного эффекта" -#: ../src/ui/tools/connector-tool.cpp:1341 -#: ../src/widgets/connector-toolbar.cpp:314 -msgid "Make connectors avoid selected objects" -msgstr "Линии обходят выделенные объекты" +#: ../src/ui/dialog/livepatheffect-editor.cpp:577 +msgid "Activate path effect" +msgstr "Активация контурного эффекта" -#: ../src/ui/tools/connector-tool.cpp:1342 -#: ../src/widgets/connector-toolbar.cpp:324 -msgid "Make connectors ignore selected objects" -msgstr "Линии игнорируют выделенные объекты" +#: ../src/ui/dialog/livepatheffect-editor.cpp:577 +msgid "Deactivate path effect" +msgstr "Деактивация контурного эффекта" -#. alpha of color under cursor, to show in the statusbar -#. locale-sensitive printf is OK, since this goes to the UI, not into SVG -#: ../src/ui/tools/dropper-tool.cpp:281 -#, c-format -msgid " alpha %.3g" -msgstr " альфа %.3g" +#: ../src/ui/dialog/memory.cpp:96 +msgid "Heap" +msgstr "Динам. память" -#. where the color is picked, to show in the statusbar -#: ../src/ui/tools/dropper-tool.cpp:283 -#, c-format -msgid ", averaged with radius %d" -msgstr ", усредненный с радиусом %d" +#: ../src/ui/dialog/memory.cpp:97 +msgid "In Use" +msgstr "Используется" -#: ../src/ui/tools/dropper-tool.cpp:283 -msgid " under cursor" -msgstr " под курсором" +#. TRANSLATORS: "Slack" refers to memory which is in the heap but currently unused. +#. More typical usage is to call this memory "free" rather than "slack". +#: ../src/ui/dialog/memory.cpp:100 +msgid "Slack" +msgstr "Резерв" -#. message, to show in the statusbar -#: ../src/ui/tools/dropper-tool.cpp:285 -msgid "<b>Release mouse</b> to set color." -msgstr "<b>Отпустите кнопку мыши</b> для установки цвета." +#: ../src/ui/dialog/memory.cpp:101 +msgid "Total" +msgstr "Всего" -#: ../src/ui/tools/dropper-tool.cpp:333 -msgid "Set picked color" -msgstr "Использование снятого пипеткой цвета" +#: ../src/ui/dialog/memory.cpp:141 ../src/ui/dialog/memory.cpp:147 +#: ../src/ui/dialog/memory.cpp:154 ../src/ui/dialog/memory.cpp:186 +msgid "Unknown" +msgstr "Неизвестно" -#: ../src/ui/tools/eraser-tool.cpp:437 -msgid "<b>Drawing</b> an eraser stroke" -msgstr "<b>Рисуется</b> стирающий штрих ластика" +#: ../src/ui/dialog/memory.cpp:167 +msgid "Combined" +msgstr "Совокупно" -#: ../src/ui/tools/eraser-tool.cpp:770 -msgid "Draw eraser stroke" -msgstr "Стирание ластиком" +#: ../src/ui/dialog/memory.cpp:209 +msgid "Recalculate" +msgstr "Пересчитать" -#: ../src/ui/tools/flood-tool.cpp:192 -msgid "Visible Colors" -msgstr "Видимые цвета" +#: ../src/ui/dialog/messages.cpp:47 +#, fuzzy +msgid "Clear log messages" +msgstr "Сохранять отладочные сообщения" -#: ../src/ui/tools/flood-tool.cpp:210 -msgctxt "Flood autogap" -msgid "None" -msgstr "Нет" +#: ../src/ui/dialog/messages.cpp:81 +msgid "Ready." +msgstr "Готово." -#: ../src/ui/tools/flood-tool.cpp:211 -msgctxt "Flood autogap" -msgid "Small" -msgstr "Маленькие" +#: ../src/ui/dialog/messages.cpp:174 +msgid "Log capture started." +msgstr "" -#: ../src/ui/tools/flood-tool.cpp:212 -msgctxt "Flood autogap" -msgid "Medium" -msgstr "Средние" +#: ../src/ui/dialog/messages.cpp:203 +msgid "Log capture stopped." +msgstr "" -#: ../src/ui/tools/flood-tool.cpp:213 -msgctxt "Flood autogap" -msgid "Large" -msgstr "Большие" +#: ../src/ui/dialog/new-from-template.cpp:24 +#, fuzzy +msgid "Create from template" +msgstr "Рисовать кривую Спиро" -#: ../src/ui/tools/flood-tool.cpp:435 -msgid "<b>Too much inset</b>, the result is empty." -msgstr "<b>Слишком сильная втяжка</b>, в результате ничего не осталось." +#: ../src/ui/dialog/new-from-template.cpp:26 +msgid "New From Template" +msgstr "" -#: ../src/ui/tools/flood-tool.cpp:476 -#, c-format -msgid "" -"Area filled, path with <b>%d</b> node created and unioned with selection." -msgid_plural "" -"Area filled, path with <b>%d</b> nodes created and unioned with selection." -msgstr[0] "" -"Область залита, контур с <b>%d</b> узлом создан и объединен с выделением." -msgstr[1] "" -"Область залита, контур с <b>%d</b> узлами создан и объединен с выделением." -msgstr[2] "" -"Область залита, контур с <b>%d</b> узлами создан и объединен с выделением." +#: ../src/ui/dialog/object-attributes.cpp:47 +msgid "Href:" +msgstr "Href:" -#: ../src/ui/tools/flood-tool.cpp:482 -#, c-format -msgid "Area filled, path with <b>%d</b> node created." -msgid_plural "Area filled, path with <b>%d</b> nodes created." -msgstr[0] "Область залита, создан контур с <b>%d</b> узлом." -msgstr[1] "Область залита, создан контур с <b>%d</b> узлами." -msgstr[2] "Область залита, создан контур с <b>%d</b> узлами." +#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkRoleAttribute +#. Identifies the type of the related resource with an absolute URI +#: ../src/ui/dialog/object-attributes.cpp:52 +msgid "Role:" +msgstr "Role:" -#: ../src/ui/tools/flood-tool.cpp:750 ../src/ui/tools/flood-tool.cpp:1060 -msgid "<b>Area is not bounded</b>, cannot fill." -msgstr "<b>Область не замкнута</b>, заливка невозможна" +#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkArcRoleAttribute +#. For situations where the nature/role alone isn't enough, this offers an additional URI defining the purpose of the link. +#: ../src/ui/dialog/object-attributes.cpp:55 +msgid "Arcrole:" +msgstr "Arcrole:" -#: ../src/ui/tools/flood-tool.cpp:1065 -msgid "" -"<b>Only the visible part of the bounded area was filled.</b> If you want to " -"fill all of the area, undo, zoom out, and fill again." -msgstr "" -"<b>Только видимая часть замнутой области была заполнена.</b> Если вы хотите " -"залить цветом всю область, отмените предыдущее действие, уменьшите масштаб " -"отображения и попробуйте снова." +#: ../src/ui/dialog/object-attributes.cpp:58 +#: ../share/extensions/polyhedron_3d.inx.h:47 +msgid "Show:" +msgstr "Показывать:" -#: ../src/ui/tools/flood-tool.cpp:1083 ../src/ui/tools/flood-tool.cpp:1234 -msgid "Fill bounded area" -msgstr "Заливка замкнутой области" +#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkActuateAttribute +#: ../src/ui/dialog/object-attributes.cpp:60 +msgid "Actuate:" +msgstr "Actuate:" -#: ../src/ui/tools/flood-tool.cpp:1099 -msgid "Set style on object" -msgstr "Установка стиля объекта" +#: ../src/ui/dialog/object-attributes.cpp:65 +msgid "URL:" +msgstr "URL:" -#: ../src/ui/tools/flood-tool.cpp:1159 -msgid "<b>Draw over</b> areas to add to fill, hold <b>Alt</b> for touch fill" -msgstr "" -"<b>Проведите курсором мыши</b> по областям, добавляемым в заливку, нажмите " -"<b>Alt</b> для переключения на касательную заливку" +#: ../src/ui/dialog/object-attributes.cpp:70 +#, fuzzy +msgid "Image Rendering:" +msgstr "Тип печати" -#. We hit green anchor, closing Green-Blue-Red -#: ../src/ui/tools/freehand-base.cpp:518 -msgid "Path is closed." -msgstr "Контур закрыт." +#: ../src/ui/dialog/object-properties.cpp:58 +#: ../src/ui/dialog/object-properties.cpp:399 +#: ../src/ui/dialog/object-properties.cpp:470 +#: ../src/ui/dialog/object-properties.cpp:477 +msgid "_ID:" +msgstr "_ID:" -#. We hit bot start and end of single curve, closing paths -#: ../src/ui/tools/freehand-base.cpp:533 -msgid "Closing path." -msgstr "Закрываем контур" +#: ../src/ui/dialog/object-properties.cpp:60 +msgid "_Title:" +msgstr "_Название:" -#: ../src/ui/tools/freehand-base.cpp:635 -msgid "Draw path" -msgstr "Создание контура" +#: ../src/ui/dialog/object-properties.cpp:61 +#, fuzzy +msgid "_Image Rendering:" +msgstr "Тип печати" -#: ../src/ui/tools/freehand-base.cpp:792 -msgid "Creating single dot" -msgstr "Рисуется точка" +#: ../src/ui/dialog/object-properties.cpp:62 +msgid "_Hide" +msgstr "С_крыть" -#: ../src/ui/tools/freehand-base.cpp:793 -msgid "Create single dot" -msgstr "Рисование точки" +#: ../src/ui/dialog/object-properties.cpp:63 +msgid "L_ock" +msgstr "За_блокировать" -#. TRANSLATORS: %s will be substituted with the point name (see previous messages); This is part of a compound message -#: ../src/ui/tools/gradient-tool.cpp:131 ../src/ui/tools/mesh-tool.cpp:130 -#, c-format -msgid "%s selected" -msgstr "%s выбран(а)" +#. Create the entry box for the object id +#: ../src/ui/dialog/object-properties.cpp:139 +msgid "" +"The id= attribute (only letters, digits, and the characters .-_: allowed)" +msgstr "Атрибут id= (разрешены только латинские буквы, цифры и символы .-_:)" -#. TRANSLATORS: Mind the space in front. This is part of a compound message -#: ../src/ui/tools/gradient-tool.cpp:133 ../src/ui/tools/gradient-tool.cpp:142 -#, c-format -msgid " out of %d gradient handle" -msgid_plural " out of %d gradient handles" -msgstr[0] " из %d опорной точки градиента" -msgstr[1] " из %d опорных точек градиента" -msgstr[2] " из %d опорных точек градиента" +#. Create the entry box for the object label +#: ../src/ui/dialog/object-properties.cpp:174 +msgid "A freeform label for the object" +msgstr "Произвольная метка объекта" -#. TRANSLATORS: Mind the space in front. (Refers to gradient handles selected). This is part of a compound message -#: ../src/ui/tools/gradient-tool.cpp:134 ../src/ui/tools/gradient-tool.cpp:143 -#: ../src/ui/tools/gradient-tool.cpp:150 ../src/ui/tools/mesh-tool.cpp:133 -#: ../src/ui/tools/mesh-tool.cpp:144 ../src/ui/tools/mesh-tool.cpp:152 -#, c-format -msgid " on %d selected object" -msgid_plural " on %d selected objects" -msgstr[0] " в %d выбранном объекте" -msgstr[1] " в %d выбранных объектах" -msgstr[2] " в %d выбранных объектах" +#. Create the frame for the object description +#: ../src/ui/dialog/object-properties.cpp:225 +#, fuzzy +msgid "_Description:" +msgstr "Описание" + +#: ../src/ui/dialog/object-properties.cpp:260 +msgid "" +"The 'image-rendering' property can influence how a bitmap is up-scaled:\n" +"\t'auto' no preference;\n" +"\t'optimizeQuality' smooth;\n" +"\t'optimizeSpeed' blocky.\n" +"Note that this behaviour is not defined in the SVG 1.1 specification and not " +"all browsers follow this interpretation." +msgstr "" + +#. Hide +#: ../src/ui/dialog/object-properties.cpp:293 +msgid "Check to make the object invisible" +msgstr "Сделать этот объект невидимым" -#. TRANSLATORS: This is a part of a compound message (out of two more indicating: grandint handle count & object count) -#: ../src/ui/tools/gradient-tool.cpp:140 ../src/ui/tools/mesh-tool.cpp:140 -#, c-format -msgid "" -"One handle merging %d stop (drag with <b>Shift</b> to separate) selected" -msgid_plural "" -"One handle merging %d stops (drag with <b>Shift</b> to separate) selected" -msgstr[0] "" -"Выделен один рычаг, объединяющий %d опорную точку (перетаскивание с " -"<b>Shift</b> разделит их)" -msgstr[1] "" -"Выделен один рычаг, объединяющий %d опорные точки (перетаскивание с " -"<b>Shift</b> разделит их)" -msgstr[2] "" -"Выделен один рычаг, объединяющий %d опорных точек (перетаскивание с " -"<b>Shift</b> разделит их)" +#. Lock +#. TRANSLATORS: "Lock" is a verb here +#: ../src/ui/dialog/object-properties.cpp:309 +msgid "Check to make the object insensitive (not selectable by mouse)" +msgstr "Сделать этот объект невыделяемым" -#. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count) -#: ../src/ui/tools/gradient-tool.cpp:148 -#, c-format -msgid "<b>%d</b> gradient handle selected out of %d" -msgid_plural "<b>%d</b> gradient handles selected out of %d" -msgstr[0] "<b>%d</b> опорная точка градиента выбрана из %d" -msgstr[1] "<b>%d</b> опорных точки градиента выбрано из %d" -msgstr[2] "<b>%d</b> опорных точек градиента выбрано из %d" +#. Button for setting the object's id, label, title and description. +#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2632 +#: ../src/verbs.cpp:2638 +msgid "_Set" +msgstr "_Установить" -#. TRANSLATORS: The plural refers to number of selected objects -#: ../src/ui/tools/gradient-tool.cpp:155 -#, c-format -msgid "<b>No</b> gradient handles selected out of %d on %d selected object" -msgid_plural "" -"<b>No</b> gradient handles selected out of %d on %d selected objects" -msgstr[0] "" -"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранном " -"объекте" -msgstr[1] "" -"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранных " -"объектах" -msgstr[2] "" -"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранных " -"объектах" +#. Create the frame for interactivity options +#: ../src/ui/dialog/object-properties.cpp:339 +msgid "_Interactivity" +msgstr "_Интерактивность" -#: ../src/ui/tools/gradient-tool.cpp:440 -msgid "Simplify gradient" -msgstr "Упростить градиент" +#: ../src/ui/dialog/object-properties.cpp:386 +#: ../src/ui/dialog/object-properties.cpp:391 +msgid "Ref" +msgstr "Ref" -#: ../src/ui/tools/gradient-tool.cpp:516 -msgid "Create default gradient" -msgstr "Создание обычного градиента" +#: ../src/ui/dialog/object-properties.cpp:472 +msgid "Id invalid! " +msgstr "ID неверен" -#: ../src/ui/tools/gradient-tool.cpp:575 ../src/ui/tools/mesh-tool.cpp:570 -msgid "<b>Draw around</b> handles to select them" -msgstr "<b>Обведите курсором мыши</b> рычаги, чтобы выделить их" +#: ../src/ui/dialog/object-properties.cpp:474 +msgid "Id exists! " +msgstr "Такой ID уже есть" -#: ../src/ui/tools/gradient-tool.cpp:698 -msgid "<b>Ctrl</b>: snap gradient angle" -msgstr "<b>Ctrl</b>: ограничить угол" +#: ../src/ui/dialog/object-properties.cpp:480 +msgid "Set object ID" +msgstr "Установка ID объекта" -#: ../src/ui/tools/gradient-tool.cpp:699 -msgid "<b>Shift</b>: draw gradient around the starting point" -msgstr "<b>Shift</b>: рисовать градиент вокруг начальной точки" +#: ../src/ui/dialog/object-properties.cpp:494 +msgid "Set object label" +msgstr "Установка метки объекта" -#: ../src/ui/tools/gradient-tool.cpp:953 ../src/ui/tools/mesh-tool.cpp:993 -#, c-format -msgid "<b>Gradient</b> for %d object; with <b>Ctrl</b> to snap angle" -msgid_plural "<b>Gradient</b> for %d objects; with <b>Ctrl</b> to snap angle" -msgstr[0] "<b>Градиент</b> для %d объекта; <b>Ctrl</b> ограничивает угол" -msgstr[1] "<b>Градиент</b> для %d объектов; <b>Ctrl</b> ограничивает угол" -msgstr[2] "<b>Градиент</b> для %d объектов; <b>Ctrl</b> ограничивает угол" +#: ../src/ui/dialog/object-properties.cpp:500 +msgid "Set object title" +msgstr "Установка заголовка объекта" -#: ../src/ui/tools/gradient-tool.cpp:957 ../src/ui/tools/mesh-tool.cpp:997 -msgid "Select <b>objects</b> on which to create gradient." -msgstr "Выделите <b>объекты</b>, к которым будет применен градиент." +#: ../src/ui/dialog/object-properties.cpp:509 +msgid "Set object description" +msgstr "Установка описания объекта" -#: ../src/ui/tools/lpe-tool.cpp:207 -#, fuzzy -msgid "Choose a construction tool from the toolbar." -msgstr "Выберите режим инструмента из его контекстной панели" +#: ../src/ui/dialog/object-properties.cpp:552 +msgid "Lock object" +msgstr "Блокировка объекта" -#. TRANSLATORS: Mind the space in front. This is part of a compound message -#: ../src/ui/tools/mesh-tool.cpp:132 ../src/ui/tools/mesh-tool.cpp:143 -#, fuzzy, c-format -msgid " out of %d mesh handle" -msgid_plural " out of %d mesh handles" -msgstr[0] " из %d опорной точки градиента" -msgstr[1] " из %d опорных точек градиента" -msgstr[2] " из %d опорных точек градиента" +#: ../src/ui/dialog/object-properties.cpp:552 +msgid "Unlock object" +msgstr "Разблокировка объекта" -#: ../src/ui/tools/mesh-tool.cpp:150 -#, fuzzy, c-format -msgid "<b>%d</b> mesh handle selected out of %d" -msgid_plural "<b>%d</b> mesh handles selected out of %d" -msgstr[0] "<b>%d</b> опорная точка градиента выбрана из %d" -msgstr[1] "<b>%d</b> опорных точки градиента выбрано из %d" -msgstr[2] "<b>%d</b> опорных точек градиента выбрано из %d" +#: ../src/ui/dialog/object-properties.cpp:568 +msgid "Hide object" +msgstr "Сокрытие объекта" -#. TRANSLATORS: The plural refers to number of selected objects -#: ../src/ui/tools/mesh-tool.cpp:157 -#, fuzzy, c-format -msgid "<b>No</b> mesh handles selected out of %d on %d selected object" -msgid_plural "<b>No</b> mesh handles selected out of %d on %d selected objects" -msgstr[0] "" -"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранном " -"объекте" -msgstr[1] "" -"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранных " -"объектах" -msgstr[2] "" -"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранных " -"объектах" +#: ../src/ui/dialog/object-properties.cpp:568 +msgid "Unhide object" +msgstr "Раскрытие объекта" -#: ../src/ui/tools/mesh-tool.cpp:321 -msgid "Split mesh row/column" +#: ../src/ui/dialog/ocaldialogs.cpp:715 +msgid "Clipart found" msgstr "" -#: ../src/ui/tools/mesh-tool.cpp:407 -msgid "Toggled mesh path type." -msgstr "" +#: ../src/ui/dialog/ocaldialogs.cpp:764 +#, fuzzy +msgid "Downloading image..." +msgstr "Создается растровая копия..." -#: ../src/ui/tools/mesh-tool.cpp:411 -msgid "Approximated arc for mesh side." -msgstr "" +#: ../src/ui/dialog/ocaldialogs.cpp:912 +#, fuzzy +msgid "Could not download image" +msgstr "Не удалось найти файл: %s" -#: ../src/ui/tools/mesh-tool.cpp:415 -msgid "Toggled mesh tensors." +#: ../src/ui/dialog/ocaldialogs.cpp:922 +msgid "Clipart downloaded successfully" msgstr "" -#: ../src/ui/tools/mesh-tool.cpp:419 +#: ../src/ui/dialog/ocaldialogs.cpp:936 #, fuzzy -msgid "Smoothed mesh corner color." -msgstr "Сгладить _углы" +msgid "Could not download thumbnail file" +msgstr "Не удалось найти файл: %s" -#: ../src/ui/tools/mesh-tool.cpp:423 +#: ../src/ui/dialog/ocaldialogs.cpp:1011 #, fuzzy -msgid "Picked mesh corner color." -msgstr "Взять цветовой тон" +msgid "No description" +msgstr " описание:" -#: ../src/ui/tools/mesh-tool.cpp:498 +#: ../src/ui/dialog/ocaldialogs.cpp:1079 #, fuzzy -msgid "Create default mesh" -msgstr "Создание обычного градиента" +msgid "Searching clipart..." +msgstr "Выполняется разворот контуров..." -#: ../src/ui/tools/mesh-tool.cpp:718 +#: ../src/ui/dialog/ocaldialogs.cpp:1099 ../src/ui/dialog/ocaldialogs.cpp:1120 #, fuzzy -msgid "FIXME<b>Ctrl</b>: snap mesh angle" -msgstr "<b>Ctrl</b>: ограничить угол" +msgid "Could not connect to the Open Clip Art Library" +msgstr "Импортировать документ из Open Clip Art Library" -#: ../src/ui/tools/mesh-tool.cpp:719 +#: ../src/ui/dialog/ocaldialogs.cpp:1145 #, fuzzy -msgid "FIXME<b>Shift</b>: draw mesh around the starting point" -msgstr "<b>Shift</b>: рисовать вокруг начальной точки" +msgid "Could not parse search results" +msgstr "Невозможно разобрать данные SVG" -#: ../src/ui/tools/node-tool.cpp:598 -msgctxt "Node tool tip" +#: ../src/ui/dialog/ocaldialogs.cpp:1177 +#, fuzzy +msgid "No clipart named <b>%1</b> was found." +msgstr "Из буфера обмена" + +#: ../src/ui/dialog/ocaldialogs.cpp:1179 msgid "" -"<b>Shift</b>: drag to add nodes to the selection, click to toggle object " -"selection" +"Please make sure all keywords are spelled correctly, or try again with " +"different keywords." msgstr "" -"<b>Shift</b>: перетаскивание добавляет узлы в выделение, щелчок переключает " -"выделение" -#: ../src/ui/tools/node-tool.cpp:602 -msgctxt "Node tool tip" -msgid "<b>Shift</b>: drag to add nodes to the selection" -msgstr "<b>Shift</b>: перетаскивание добавляет узлы в выделение" +#: ../src/ui/dialog/ocaldialogs.cpp:1231 +msgid "Search" +msgstr "Искать" -#: ../src/ui/tools/node-tool.cpp:614 -#, fuzzy, c-format -msgid "<b>%u of %u</b> node selected." -msgid_plural "<b>%u of %u</b> nodes selected." -msgstr[0] "<b>%i</b> из <b>%i</b> узла выделен. %s." -msgstr[1] "<b>%i</b> из <b>%i</b> узлов выделено. %s." -msgstr[2] "<b>%i</b> из <b>%i</b> узлов выделено. %s." +#: ../src/ui/dialog/ocaldialogs.cpp:1243 +msgid "Close" +msgstr "Закрыть" -#: ../src/ui/tools/node-tool.cpp:620 -#, fuzzy, c-format -msgctxt "Node tool tip" -msgid "%s Drag to select nodes, click to edit only this object (more: Shift)" +#: ../src/ui/dialog/pixelartdialog.cpp:190 +msgid "_Curves (multiplier):" msgstr "" -"Перетаскивание выделяет узлы, щелчок включает изменение только этого объекта" - -#: ../src/ui/tools/node-tool.cpp:626 -#, fuzzy, c-format -msgctxt "Node tool tip" -msgid "%s Drag to select nodes, click clear the selection" -msgstr "Перетаскивание выделяет узлы, щелчок снимает выделение" -#: ../src/ui/tools/node-tool.cpp:635 -msgctxt "Node tool tip" -msgid "Drag to select nodes, click to edit only this object" +#: ../src/ui/dialog/pixelartdialog.cpp:193 +msgid "Favors connections that are part of a long curve" msgstr "" -"Перетаскивание выделяет узлы, щелчок включает изменение только этого объекта" -#: ../src/ui/tools/node-tool.cpp:638 -msgctxt "Node tool tip" -msgid "Drag to select nodes, click to clear the selection" -msgstr "Перетаскивание выделяет узлы, щелчок снимает выделение" +#: ../src/ui/dialog/pixelartdialog.cpp:204 +#, fuzzy +msgid "_Islands (weight):" +msgstr "Высота прописных:" -#: ../src/ui/tools/node-tool.cpp:643 -msgctxt "Node tool tip" -msgid "Drag to select objects to edit, click to edit this object (more: Shift)" +#: ../src/ui/dialog/pixelartdialog.cpp:207 +msgid "Avoid single disconnected pixels" msgstr "" -"Перетаскивание выделяет объекты для изменения, щелчок включает изменение " -"объекта (попробуйте Shift)" - -#: ../src/ui/tools/node-tool.cpp:646 -msgctxt "Node tool tip" -msgid "Drag to select objects to edit" -msgstr "Перетаскивание выделяет объекты для изменения" - -#: ../src/ui/tools/pen-tool.cpp:186 ../src/ui/tools/pencil-tool.cpp:465 -msgid "Drawing cancelled" -msgstr "Отмена рисования" - -#: ../src/ui/tools/pen-tool.cpp:407 ../src/ui/tools/pencil-tool.cpp:203 -msgid "Continuing selected path" -msgstr "Продолжение выделенного контура" - -#: ../src/ui/tools/pen-tool.cpp:417 ../src/ui/tools/pencil-tool.cpp:211 -msgid "Creating new path" -msgstr "Создание нового контура" -#: ../src/ui/tools/pen-tool.cpp:419 ../src/ui/tools/pencil-tool.cpp:214 -msgid "Appending to selected path" -msgstr "Добавление к выделенному контуру" +#: ../src/ui/dialog/pixelartdialog.cpp:209 +#, fuzzy +msgid "A constant vote value" +msgstr "Сокращение межстрочного интервала" -#: ../src/ui/tools/pen-tool.cpp:576 -msgid "<b>Click</b> or <b>click and drag</b> to close and finish the path." +#: ../src/ui/dialog/pixelartdialog.cpp:219 +msgid "Sparse pixels (window _radius):" msgstr "" -"<b>Щелчок</b> или <b>щелчок + перетаскивание</b> закрывают этот контур." -#: ../src/ui/tools/pen-tool.cpp:586 -msgid "" -"<b>Click</b> or <b>click and drag</b> to continue the path from this point." +#: ../src/ui/dialog/pixelartdialog.cpp:228 +msgid "The radius of the window analyzed" msgstr "" -"<b>Щелчок</b> или <b>щелчок + перетаскивание</b> продолжает контур из этой " -"точки." -#: ../src/ui/tools/pen-tool.cpp:1211 -#, c-format -msgid "" -"<b>Curve segment</b>: angle %3.2f°, distance %s; with <b>Ctrl</b> to " -"snap angle, <b>Enter</b> to finish the path" +#: ../src/ui/dialog/pixelartdialog.cpp:229 +msgid "Sparse pixels (_multiplier):" msgstr "" -"<b>Сегмент кривой</b>: угол %3.2f°, расстояние %s; <b>Ctrl</b> " -"ограничивает угол, <b>Enter</b> завершает контур" -#: ../src/ui/tools/pen-tool.cpp:1212 -#, c-format -msgid "" -"<b>Line segment</b>: angle %3.2f°, distance %s; with <b>Ctrl</b> to " -"snap angle, <b>Enter</b> to finish the path" +#: ../src/ui/dialog/pixelartdialog.cpp:240 +msgid "Favors connections that are part of foreground color" msgstr "" -"<b>Сегмент линии</b>: угол %3.2f°, расстояние %s; <b>Ctrl</b> " -"ограничивает угол, <b>Enter</b> завершает контур" -#: ../src/ui/tools/pen-tool.cpp:1228 -#, c-format -msgid "" -"<b>Curve handle</b>: angle %3.2f°, length %s; with <b>Ctrl</b> to snap " -"angle" +#: ../src/ui/dialog/pixelartdialog.cpp:246 +msgid "The heuristic computed vote will be multiplied by this value" msgstr "" -"<b>Рычаг узла кривой</b>: угол %3.2f°, длина %s; <b>Ctrl</b> " -"ограничивает угол" -#: ../src/ui/tools/pen-tool.cpp:1250 -#, c-format -msgid "" -"<b>Curve handle, symmetric</b>: angle %3.2f°, length %s; with <b>Ctrl</" -"b> to snap angle, with <b>Shift</b> to move this handle only" +#: ../src/ui/dialog/pixelartdialog.cpp:259 +msgid "Heuristics" +msgstr "Эвристика" + +#: ../src/ui/dialog/pixelartdialog.cpp:266 +msgid "_Voronoi diagram" +msgstr "_Диаграмма Вороного" + +#: ../src/ui/dialog/pixelartdialog.cpp:267 +msgid "Output composed of straight lines" +msgstr "Вывод составлен из прямых линий" + +#: ../src/ui/dialog/pixelartdialog.cpp:273 +msgid "Convert to _B-spline curves" +msgstr "Преобразовать в кривые _Безье" + +#: ../src/ui/dialog/pixelartdialog.cpp:274 +msgid "Preserve staircasing artifacts" +msgstr "Сохранить артефакты в виде «лесенки»" + +#: ../src/ui/dialog/pixelartdialog.cpp:281 +msgid "_Smooth curves" +msgstr "С_глаженные кривые" + +#: ../src/ui/dialog/pixelartdialog.cpp:282 +msgid "The Kopf-Lischinski algorithm" msgstr "" -"<b>Рычаг узла, симметричный</b>: угол %3.2f°, длина %s; <b>Ctrl</b> " -"ограничивает угол; с <b>Shift</b> меняется только этот рычаг" -#: ../src/ui/tools/pen-tool.cpp:1251 -#, c-format +#: ../src/ui/dialog/pixelartdialog.cpp:289 +msgid "Output" +msgstr "Вывод" + +#: ../src/ui/dialog/pixelartdialog.cpp:297 +#: ../src/ui/dialog/tracedialog.cpp:814 +msgid "Reset all settings to defaults" +msgstr "Сбросить значения всех параметров до исходных" + +#: ../src/ui/dialog/pixelartdialog.cpp:302 +#: ../src/ui/dialog/tracedialog.cpp:819 +msgid "Abort a trace in progress" +msgstr "Прервать векторизацию" + +#: ../src/ui/dialog/pixelartdialog.cpp:306 +#: ../src/ui/dialog/tracedialog.cpp:823 +msgid "Execute the trace" +msgstr "Векторизовать" + +#: ../src/ui/dialog/pixelartdialog.cpp:388 +#: ../src/ui/dialog/pixelartdialog.cpp:422 msgid "" -"<b>Curve handle</b>: angle %3.2f°, length %s; with <b>Ctrl</b> to snap " -"angle, with <b>Shift</b> to move this handle only" +"Image looks too big. Process may take a while and it is wise to save your " +"document before continuing.\n" +"\n" +"Continue the procedure (without saving)?" msgstr "" -"<b>Рычаг узла</b>: угол %3.2f°, длина %s; <b>Ctrl</b> ограничивает угол; " -"<b>Shift</b> синхронно вращает противоположный рычаг" -#: ../src/ui/tools/pen-tool.cpp:1294 -msgid "Drawing finished" -msgstr "Рисование закончено" +#: ../src/ui/dialog/pixelartdialog.cpp:499 +msgid "Trace pixel art" +msgstr "Векторизация пиксельной графики" -#: ../src/ui/tools/pencil-tool.cpp:315 -msgid "<b>Release</b> here to close and finish the path." -msgstr "<b>Отпустите</b> здесь для закрытия и завершения контура." +#: ../src/ui/dialog/polar-arrange-tab.cpp:43 +msgctxt "Polar arrange tab" +msgid "Anchor point:" +msgstr "Точка привязки:" -#: ../src/ui/tools/pencil-tool.cpp:321 -msgid "Drawing a freehand path" -msgstr "Рисуется произвольный контур" +#: ../src/ui/dialog/polar-arrange-tab.cpp:47 +msgctxt "Polar arrange tab" +msgid "Object's bounding box:" +msgstr "В площадке (BB) объекта:" -#: ../src/ui/tools/pencil-tool.cpp:326 -msgid "<b>Drag</b> to continue the path from this point." -msgstr "<b>Перетащите</b> для продолжения контура из этой точки." +#: ../src/ui/dialog/polar-arrange-tab.cpp:54 +msgctxt "Polar arrange tab" +msgid "Object's rotational center" +msgstr "Центр вращения объекта" -#. Write curves to object -#: ../src/ui/tools/pencil-tool.cpp:411 -msgid "Finishing freehand" -msgstr "Завершается произвольный контур" +#: ../src/ui/dialog/polar-arrange-tab.cpp:59 +msgctxt "Polar arrange tab" +msgid "Arrange on:" +msgstr "Расставить:" -#: ../src/ui/tools/pencil-tool.cpp:514 -msgid "" -"<b>Sketch mode</b>: holding <b>Alt</b> interpolates between sketched paths. " -"Release <b>Alt</b> to finalize." -msgstr "" -"<b>Эскизный режим</b>: удерживайте нажатой <b>Alt</b> для интерполяции между " -"рисуемыми контурами, отпустите <b>Alt</b> для завершения." +#: ../src/ui/dialog/polar-arrange-tab.cpp:63 +msgctxt "Polar arrange tab" +msgid "First selected circle/ellipse/arc" +msgstr "По первой выбранной окружности, эллипсу или дуге" -#: ../src/ui/tools/pencil-tool.cpp:541 -msgid "Finishing freehand sketch" -msgstr "Завершается эскизный контур" +#: ../src/ui/dialog/polar-arrange-tab.cpp:68 +msgctxt "Polar arrange tab" +msgid "Last selected circle/ellipse/arc" +msgstr "По последней выбранной окружности, эллипсу или дуге" -#: ../src/ui/tools/rect-tool.cpp:288 -msgid "" -"<b>Ctrl</b>: make square or integer-ratio rect, lock a rounded corner " -"circular" -msgstr "" -"<b>Ctrl</b>: квадрат или прямоугольник с целым соотношением сторон, " -"закругленные углы" +#: ../src/ui/dialog/polar-arrange-tab.cpp:73 +msgctxt "Polar arrange tab" +msgid "Parameterized:" +msgstr "Параметрически:" -#: ../src/ui/tools/rect-tool.cpp:449 -#, c-format -msgid "" -"<b>Rectangle</b>: %s × %s (constrained to ratio %d:%d); with <b>Shift</" -"b> to draw around the starting point" -msgstr "" -"<b>Прямоугольник</b>: %s × %s; (с соотношением сторон %d:%d); с " -"<b>Shift</b> рисует вокруг начальной точки" +#: ../src/ui/dialog/polar-arrange-tab.cpp:78 +#, fuzzy +msgid "Center X/Y:" +msgstr "Выключка по центру" -#: ../src/ui/tools/rect-tool.cpp:452 -#, c-format -msgid "" -"<b>Rectangle</b>: %s × %s (constrained to golden ratio 1.618 : 1); with " -"<b>Shift</b> to draw around the starting point" -msgstr "" -"<b>Прямоугольник</b>: %s × %s; (с «золотым» соотношением сторон 1.618 : " -"1); с <b>Shift</b> рисует вокруг начальной точки" +#: ../src/ui/dialog/polar-arrange-tab.cpp:91 +#, fuzzy +msgid "Radius X/Y:" +msgstr "Радиус:" -#: ../src/ui/tools/rect-tool.cpp:454 -#, c-format -msgid "" -"<b>Rectangle</b>: %s × %s (constrained to golden ratio 1 : 1.618); with " -"<b>Shift</b> to draw around the starting point" -msgstr "" -"<b>Прямоугольник</b>: %s × %s; (с «золотым» соотношением сторон 1 : " -"1.618); с <b>Shift</b> рисует вокруг начальной точки" +#: ../src/ui/dialog/polar-arrange-tab.cpp:104 +#, fuzzy +msgid "Angle X/Y:" +msgstr "Угол X:" -#: ../src/ui/tools/rect-tool.cpp:458 -#, c-format -msgid "" -"<b>Rectangle</b>: %s × %s; with <b>Ctrl</b> to make square or integer-" -"ratio rectangle; with <b>Shift</b> to draw around the starting point" -msgstr "" -"<b>Прямоугольник</b>: %s x %s; с <b>Ctrl</b>: квадрат или прямоугольник с " -"целым соотношением сторон, с <b>Shift</b> рисовать вокруг начальной точки" +#: ../src/ui/dialog/polar-arrange-tab.cpp:118 +msgid "Rotate objects" +msgstr "Повернуть объекты" -#: ../src/ui/tools/rect-tool.cpp:481 -msgid "Create rectangle" -msgstr "Создание прямоугольника" +#: ../src/ui/dialog/polar-arrange-tab.cpp:306 +msgid "Couldn't find an ellipse in selection" +msgstr "Не удалось найти эллипс в выделении" + +#: ../src/ui/dialog/polar-arrange-tab.cpp:371 +msgid "Arrange on ellipse" +msgstr "Расставить по эллипсу" + +#: ../src/ui/dialog/print.cpp:111 +msgid "Could not open temporary PNG for bitmap printing" +msgstr "Не удалось открыть временный файл PNG для растровой печати" + +#: ../src/ui/dialog/print.cpp:155 +msgid "Could not set up Document" +msgstr "Не удалось подготовить документ" + +#: ../src/ui/dialog/print.cpp:159 +msgid "Failed to set CairoRenderContext" +msgstr "Не удалось установить CairoRenderContext" + +#. set up dialog title, based on document name +#: ../src/ui/dialog/print.cpp:197 +msgid "SVG Document" +msgstr "Документ SVG" + +#: ../src/ui/dialog/print.cpp:198 +msgid "Print" +msgstr "Напечатать" + +#: ../src/ui/dialog/spellcheck.cpp:73 +msgid "_Accept" +msgstr "_Принять" -#: ../src/ui/tools/select-tool.cpp:169 -msgid "Click selection to toggle scale/rotation handles" -msgstr "Щелчок по объекту переключает стрелки масштабирования/вращения" +#: ../src/ui/dialog/spellcheck.cpp:74 +msgid "_Ignore once" +msgstr "_Пропустить единожды" -#: ../src/ui/tools/select-tool.cpp:170 -msgid "" -"No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, " -"or drag around objects to select." -msgstr "" -"Нет выделенных объектов. Используйте щелчок, Shift+щелчок, Alt+прокрутка " -"колесом мыши, либо обведите объекты рамкой." +#: ../src/ui/dialog/spellcheck.cpp:75 +msgid "_Ignore" +msgstr "_Пропустить" -#: ../src/ui/tools/select-tool.cpp:223 -msgid "Move canceled." -msgstr "Перемещение отменено." +#: ../src/ui/dialog/spellcheck.cpp:76 +msgid "A_dd" +msgstr "_Добавить" -#: ../src/ui/tools/select-tool.cpp:231 -msgid "Selection canceled." -msgstr "Выделение отменено." +#: ../src/ui/dialog/spellcheck.cpp:78 +msgid "_Stop" +msgstr "_Остановить" -#: ../src/ui/tools/select-tool.cpp:642 -msgid "" -"<b>Draw over</b> objects to select them; release <b>Alt</b> to switch to " -"rubberband selection" -msgstr "" -"<b>Проведите курсором мыши</b> по объектам, чтобы выделить их; отпустите " -"<b>Alt</b>, чтобы переключиться на обычное выделение" +#: ../src/ui/dialog/spellcheck.cpp:79 +msgid "_Start" +msgstr "_Начать" -#: ../src/ui/tools/select-tool.cpp:644 -msgid "" -"<b>Drag around</b> objects to select them; press <b>Alt</b> to switch to " -"touch selection" -msgstr "" -"<b>Проведите курсором мыши</b> вокруг объектов, чтобы выделить их; нажмите " -"<b>Alt</b> для переключения на касательное выделение" +#: ../src/ui/dialog/spellcheck.cpp:109 +msgid "Suggestions:" +msgstr "Варианты:" -#: ../src/ui/tools/select-tool.cpp:932 -msgid "<b>Ctrl</b>: click to select in groups; drag to move hor/vert" -msgstr "" -"<b>Ctrl</b>: щелчок выделяет в группе; перетаскивание двигает по горизонтали/" -"вертикали" +#: ../src/ui/dialog/spellcheck.cpp:124 +msgid "Accept the chosen suggestion" +msgstr "Принять выбранный вариант" -#: ../src/ui/tools/select-tool.cpp:933 -msgid "<b>Shift</b>: click to toggle select; drag for rubberband selection" -msgstr "" -"<b>Shift</b>: выделить/снять выделение; перетаскивание включает выделение " -"«липкой лентой»" +#: ../src/ui/dialog/spellcheck.cpp:125 +msgid "Ignore this word only once" +msgstr "Проигнорировать это слово только один раз" -#: ../src/ui/tools/select-tool.cpp:934 -#, fuzzy -msgid "" -"<b>Alt</b>: click to select under; scroll mouse-wheel to cycle-select; drag " -"to move selected or select by touch" -msgstr "<b>Alt</b>: выделять под выделенным; перетаскиванием двигать выделение" +#: ../src/ui/dialog/spellcheck.cpp:126 +msgid "Ignore this word in this session" +msgstr "Проигнорировать это слово для текущего сеанса" -#: ../src/ui/tools/select-tool.cpp:1142 -msgid "Selected object is not a group. Cannot enter." -msgstr "Выделенный объект не является группой. В неё нельзя войти." +#: ../src/ui/dialog/spellcheck.cpp:127 +msgid "Add this word to the chosen dictionary" +msgstr "Добавить это слово в выбранный словарь" -#: ../src/ui/tools/spiral-tool.cpp:259 -msgid "<b>Ctrl</b>: snap angle" -msgstr "<b>Ctrl</b>: ограничить угол" +#: ../src/ui/dialog/spellcheck.cpp:141 +msgid "Stop the check" +msgstr "Остановить проверку орфографии" -#: ../src/ui/tools/spiral-tool.cpp:261 -msgid "<b>Alt</b>: lock spiral radius" -msgstr "<b>Alt</b>: зафиксировать радиус спирали" +#: ../src/ui/dialog/spellcheck.cpp:142 +msgid "Start the check" +msgstr "Начать проверку" -#: ../src/ui/tools/spiral-tool.cpp:400 +#: ../src/ui/dialog/spellcheck.cpp:460 #, c-format -msgid "" -"<b>Spiral</b>: radius %s, angle %5g°; with <b>Ctrl</b> to snap angle" -msgstr "" -"<b>Спираль</b>: радиус %s, угол %5g°; <b>Ctrl</b> ограничивает угол" +msgid "<b>Finished</b>, <b>%d</b> words added to dictionary" +msgstr "Проверка <b>завершена</b>, добавленных в словарь слов: <b>%d</b>" -#: ../src/ui/tools/spiral-tool.cpp:421 -msgid "Create spiral" -msgstr "Создание спирали" +#: ../src/ui/dialog/spellcheck.cpp:462 +msgid "<b>Finished</b>, nothing suspicious found" +msgstr "Проверка <b>завершена</b>, ошибок не найдено" -#: ../src/ui/tools/spray-tool.cpp:192 ../src/ui/tools/tweak-tool.cpp:167 +#: ../src/ui/dialog/spellcheck.cpp:578 #, c-format -msgid "<b>%i</b> object selected" -msgid_plural "<b>%i</b> objects selected" -msgstr[0] "<b>%i</b> объект выделен" -msgstr[1] "<b>%i</b> объекта выделено" -msgstr[2] "<b>%i</b> объектов выделено" +msgid "Not in dictionary (%s): <b>%s</b>" +msgstr "Нет в словаре (%s): <b>%s</b>" -#: ../src/ui/tools/spray-tool.cpp:194 ../src/ui/tools/tweak-tool.cpp:169 -msgid "<b>Nothing</b> selected" -msgstr "<b>Ничего</b> не выделено" +#: ../src/ui/dialog/spellcheck.cpp:727 +msgid "<i>Checking...</i>" +msgstr "<i>Выполняется проверка...</i>" -#: ../src/ui/tools/spray-tool.cpp:199 -#, fuzzy, c-format -msgid "" -"%s. Drag, click or click and scroll to spray <b>copies</b> of the initial " -"selection." -msgstr "" -"%s. Потащите, щёлкните или прокрутите для распыления <b>копий</b> исходного " -"выделения" +#: ../src/ui/dialog/spellcheck.cpp:796 +msgid "Fix spelling" +msgstr "Исправить орфографию" -#: ../src/ui/tools/spray-tool.cpp:202 -#, fuzzy, c-format -msgid "" -"%s. Drag, click or click and scroll to spray <b>clones</b> of the initial " -"selection." -msgstr "" -"%s. Потащите, щёлкните или прокрутите для распыления <b>клонов</b> исходного " -"выделения" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:138 +msgid "Set SVG Font attribute" +msgstr "Установить атрибут SVG Font" -#: ../src/ui/tools/spray-tool.cpp:205 -#, fuzzy, c-format -msgid "" -"%s. Drag, click or click and scroll to spray in a <b>single path</b> of the " -"initial selection." -msgstr "" -"%s. Потащите, щёлкните или прокрутите для распыления исходного выделения в " -"<b>единый контур</b>" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:196 +msgid "Adjust kerning value" +msgstr "Изменить значение кернинга" -#: ../src/ui/tools/spray-tool.cpp:656 -msgid "<b>Nothing selected!</b> Select objects to spray." -msgstr "<b>Ничего не выделено!</b> Выделите объекты, которые хотите распылить." +#: ../src/ui/dialog/svg-fonts-dialog.cpp:386 +msgid "Family Name:" +msgstr "Гарнитура:" -#: ../src/ui/tools/spray-tool.cpp:731 ../src/widgets/spray-toolbar.cpp:166 -msgid "Spray with copies" -msgstr "Распылять копии" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:396 +msgid "Set width:" +msgstr "Ширина:" -#: ../src/ui/tools/spray-tool.cpp:735 ../src/widgets/spray-toolbar.cpp:173 -msgid "Spray with clones" -msgstr "Распылять клоны" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:455 +msgid "glyph" +msgstr "глиф" -#: ../src/ui/tools/spray-tool.cpp:739 -msgid "Spray in single path" -msgstr "Распылять по одиночному контуру" +#. SPGlyph* glyph = +#: ../src/ui/dialog/svg-fonts-dialog.cpp:487 +msgid "Add glyph" +msgstr "Добавка глифа" -#: ../src/ui/tools/star-tool.cpp:271 -msgid "<b>Ctrl</b>: snap angle; keep rays radial" -msgstr "<b>Ctrl</b>: ограничивать угол; лучи по радиусу без перекоса" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:521 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:563 +msgid "Select a <b>path</b> to define the curves of a glyph" +msgstr "Выберите <b>контур</b> для определения кривых глифа" -#: ../src/ui/tools/star-tool.cpp:417 -#, c-format -msgid "" -"<b>Polygon</b>: radius %s, angle %5g°; with <b>Ctrl</b> to snap angle" -msgstr "" -"<b>Многоугольник</b>: радиус %s, угол %5g°; <b>Ctrl</b> ограничивает " -"угол" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:529 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:571 +msgid "The selected object does not have a <b>path</b> description." +msgstr "Выделенный объект не содержит описание <b>контура</b>." -#: ../src/ui/tools/star-tool.cpp:418 -#, c-format -msgid "<b>Star</b>: radius %s, angle %5g°; with <b>Ctrl</b> to snap angle" -msgstr "" -"<b>Звезда</b>: радиус %s, угол %5g°; <b>Ctrl</b> ограничивает угол" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:536 +msgid "No glyph selected in the SVGFonts dialog." +msgstr "Ни один глиф не выбран в диалоге «Шрифты SVG»" -#: ../src/ui/tools/star-tool.cpp:446 -msgid "Create star" -msgstr "Создание звезды" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:547 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:586 +msgid "Set glyph curves" +msgstr "Установка кривых глифа" -#: ../src/ui/tools/text-tool.cpp:379 -msgid "<b>Click</b> to edit the text, <b>drag</b> to select part of the text." -msgstr "<b>Щелчок</b> ставит курсор, <b>перетаскивание</b> выделяет текст." +#: ../src/ui/dialog/svg-fonts-dialog.cpp:606 +msgid "Reset missing-glyph" +msgstr "Сбросить отсутствующий глиф" -#: ../src/ui/tools/text-tool.cpp:381 -msgid "" -"<b>Click</b> to edit the flowed text, <b>drag</b> to select part of the text." -msgstr "<b>Щелчок</b> ставит курсор, <b>перетаскивание</b> выделяет текст." +#: ../src/ui/dialog/svg-fonts-dialog.cpp:622 +msgid "Edit glyph name" +msgstr "Изменить название глифа" -#: ../src/ui/tools/text-tool.cpp:435 -msgid "Create text" -msgstr "Создание текстового объекта" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:636 +msgid "Set glyph unicode" +msgstr "Задание значения Unicode" -#: ../src/ui/tools/text-tool.cpp:460 -msgid "Non-printable character" -msgstr "Непечатаемый символ" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:648 +msgid "Remove font" +msgstr "Удалить шрифт" -#: ../src/ui/tools/text-tool.cpp:475 -msgid "Insert Unicode character" -msgstr "Вставить юникодный символ" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:665 +msgid "Remove glyph" +msgstr "Удалить глиф" -#: ../src/ui/tools/text-tool.cpp:510 -#, c-format -msgid "Unicode (<b>Enter</b> to finish): %s: %s" -msgstr "Юникод (нажмите <b>Ввод</b> для завершения): %s: %s" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:682 +msgid "Remove kerning pair" +msgstr "Удалить кернинговую пару" -#: ../src/ui/tools/text-tool.cpp:512 ../src/ui/tools/text-tool.cpp:817 -msgid "Unicode (<b>Enter</b> to finish): " -msgstr "Юникод (нажмите <b>Ввод</b> для завершения): " +#: ../src/ui/dialog/svg-fonts-dialog.cpp:692 +msgid "Missing Glyph:" +msgstr "Отсутствующий глиф:" -#: ../src/ui/tools/text-tool.cpp:595 -#, c-format -msgid "<b>Flowed text frame</b>: %s × %s" -msgstr "<b>Рамка для текста</b>: %s × %s" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:696 +msgid "From selection..." +msgstr "Взять из выделения" -#: ../src/ui/tools/text-tool.cpp:653 -msgid "Type text; <b>Enter</b> to start new line." -msgstr "Вводите текст; <b>Enter</b> начинает новый абзац." +#: ../src/ui/dialog/svg-fonts-dialog.cpp:709 +msgid "Glyph name" +msgstr "Название глифа" -#: ../src/ui/tools/text-tool.cpp:664 -msgid "Flowed text is created." -msgstr "Завёрстывание текста в блок" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:710 +msgid "Matching string" +msgstr "Соответствующая строка" -#: ../src/ui/tools/text-tool.cpp:665 -msgid "Create flowed text" -msgstr "Создание текстового блока" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:713 +msgid "Add Glyph" +msgstr "Добавить глиф" -#: ../src/ui/tools/text-tool.cpp:667 -msgid "" -"The frame is <b>too small</b> for the current font size. Flowed text not " -"created." -msgstr "" -"Рамка <b>слишком мала</b> для текущего размера шрифта. Невозможно создать " -"текст в рамке." +#: ../src/ui/dialog/svg-fonts-dialog.cpp:720 +msgid "Get curves from selection..." +msgstr "Получить кривые из выделения" -#: ../src/ui/tools/text-tool.cpp:803 -msgid "No-break space" -msgstr "Неразрывный пробел" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:769 +msgid "Add kerning pair" +msgstr "Добавить кернинговую пару" -#: ../src/ui/tools/text-tool.cpp:804 -msgid "Insert no-break space" -msgstr "Вставка неразрывного пробела" +#. Kerning Setup: +#: ../src/ui/dialog/svg-fonts-dialog.cpp:777 +msgid "Kerning Setup" +msgstr "Параметры кернинга:" -#: ../src/ui/tools/text-tool.cpp:840 -msgid "Make bold" -msgstr "Полужирное начертание" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:779 +msgid "1st Glyph:" +msgstr "Первый глиф:" -#: ../src/ui/tools/text-tool.cpp:857 -msgid "Make italic" -msgstr "Курсивное начертание" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:781 +msgid "2nd Glyph:" +msgstr "Второй глиф:" -#: ../src/ui/tools/text-tool.cpp:895 -msgid "New line" -msgstr "Новая строка" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:784 +msgid "Add pair" +msgstr "Добавить пару" -#: ../src/ui/tools/text-tool.cpp:936 -msgid "Backspace" -msgstr "Забой" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:796 +msgid "First Unicode range" +msgstr "Первый символ Unicode" -#: ../src/ui/tools/text-tool.cpp:990 -msgid "Kern to the left" -msgstr "Кернинг влево" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:797 +msgid "Second Unicode range" +msgstr "Второй символ Unicode" -#: ../src/ui/tools/text-tool.cpp:1014 -msgid "Kern to the right" -msgstr "Кернинг вправо" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:804 +msgid "Kerning value:" +msgstr "Значение кернинга:" -#: ../src/ui/tools/text-tool.cpp:1038 -msgid "Kern up" -msgstr "Кернинг вверх" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:862 +msgid "Set font family" +msgstr "Указать гарнитуру" -#: ../src/ui/tools/text-tool.cpp:1062 -msgid "Kern down" -msgstr "Кернинг вниз" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:871 +msgid "font" +msgstr "шрифт" -#: ../src/ui/tools/text-tool.cpp:1137 -msgid "Rotate counterclockwise" -msgstr "Поворот против часовой стрелки" +#. select_font(font); +#: ../src/ui/dialog/svg-fonts-dialog.cpp:886 +msgid "Add font" +msgstr "Добавить шрифт" -#: ../src/ui/tools/text-tool.cpp:1157 -msgid "Rotate clockwise" -msgstr "Поворот по часовой стрелке" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:912 ../src/ui/dialog/text-edit.cpp:69 +msgid "_Font" +msgstr "_Шрифт" -#: ../src/ui/tools/text-tool.cpp:1173 -msgid "Contract line spacing" -msgstr "Сокращение межстрочного интервала" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:920 +msgid "_Global Settings" +msgstr "О_бщие параметры" -#: ../src/ui/tools/text-tool.cpp:1179 -msgid "Contract letter spacing" -msgstr "Сокращение межбуквенного интервала" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:921 +msgid "_Glyphs" +msgstr "_Глифы" -#: ../src/ui/tools/text-tool.cpp:1196 -msgid "Expand line spacing" -msgstr "Увеличение межстрочного интервала" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:922 +msgid "_Kerning" +msgstr "_Кернинг" -#: ../src/ui/tools/text-tool.cpp:1202 -msgid "Expand letter spacing" -msgstr "Увеличение межбуквенного интервала" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:929 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:930 +msgid "Sample Text" +msgstr "Текст примера" -#: ../src/ui/tools/text-tool.cpp:1332 -msgid "Paste text" -msgstr "Вставка стиля" +#: ../src/ui/dialog/svg-fonts-dialog.cpp:934 +msgid "Preview Text:" +msgstr "Текст:" -#: ../src/ui/tools/text-tool.cpp:1583 -#, fuzzy, c-format -msgid "" -"Type or edit flowed text (%d character%s); <b>Enter</b> to start new " -"paragraph." -msgid_plural "" -"Type or edit flowed text (%d characters%s); <b>Enter</b> to start new " -"paragraph." -msgstr[0] "" -"Наберите или измените завёрстанный текст (%d символов%s); <b>Ввод</b> " -"начинает новый абзац." -msgstr[1] "" -"Наберите или измените завёрстанный текст (%d символов%s); <b>Ввод</b> " -"начинает новый абзац." -msgstr[2] "" -"Наберите или измените завёрстанный текст (%d символов%s); <b>Ввод</b> " -"начинает новый абзац." +#: ../src/ui/dialog/swatches.cpp:203 ../src/ui/tools/gradient-tool.cpp:367 +#: ../src/ui/tools/gradient-tool.cpp:465 +#: ../src/widgets/gradient-vector.cpp:814 +msgid "Add gradient stop" +msgstr "Добавка опорной точки в градиент" -#: ../src/ui/tools/text-tool.cpp:1585 -#, fuzzy, c-format -msgid "Type or edit text (%d character%s); <b>Enter</b> to start new line." -msgid_plural "" -"Type or edit text (%d characters%s); <b>Enter</b> to start new line." -msgstr[0] "" -"Наберите или измените текст (%d символов%s); <b>Ввод</b> начинает новый " -"абзац." -msgstr[1] "" -"Наберите или измените текст (%d символов%s); <b>Ввод</b> начинает новый " -"абзац." -msgstr[2] "" -"Наберите или измените текст (%d символов%s); <b>Ввод</b> начинает новый " -"абзац." +#. TRANSLATORS: An item in context menu on a colour in the swatches +#: ../src/ui/dialog/swatches.cpp:258 +msgid "Set fill" +msgstr "Установить заливку" -#: ../src/ui/tools/text-tool.cpp:1695 -msgid "Type text" -msgstr "Ввод текста" +#. TRANSLATORS: An item in context menu on a colour in the swatches +#: ../src/ui/dialog/swatches.cpp:266 +msgid "Set stroke" +msgstr "Установить обводку" -#: ../src/ui/tools/tool-base.cpp:703 -#, fuzzy -msgid "<b>Space+mouse move</b> to pan canvas" -msgstr "" -"<b>Нажмите пробел и перетащите курсор мыши</b> для перемещения по холсту" +#: ../src/ui/dialog/swatches.cpp:287 +msgid "Edit..." +msgstr "Изменить..." -#: ../src/ui/tools/tweak-tool.cpp:174 -#, c-format -msgid "%s. Drag to <b>move</b>." -msgstr "%s. Перетащите курсор для их <b>перемещения</b>." +#: ../src/ui/dialog/swatches.cpp:299 +msgid "Convert" +msgstr "Преобразовать" -#: ../src/ui/tools/tweak-tool.cpp:178 +#: ../src/ui/dialog/swatches.cpp:543 #, c-format -msgid "%s. Drag or click to <b>move in</b>; with Shift to <b>move out</b>." -msgstr "" -"%s. Перетащите курсор или щелкните для <b>притягивания</b>, с Shift — для " -"<b>отталкивания</b> объектов." +msgid "Palettes directory (%s) is unavailable." +msgstr "Каталог с палитрами (%s) недоступен." -#: ../src/ui/tools/tweak-tool.cpp:186 -#, c-format -msgid "%s. Drag or click to <b>move randomly</b>." -msgstr "" -"%s. Перетащите курсор или щелкните для <b>случайного перемещения</b> " -"объектов." +#. ******************* Symbol Sets ************************ +#: ../src/ui/dialog/symbols.cpp:127 +msgid "Symbol set: " +msgstr "Набор:" -#: ../src/ui/tools/tweak-tool.cpp:190 -#, c-format -msgid "%s. Drag or click to <b>scale down</b>; with Shift to <b>scale up</b>." -msgstr "" -"%s. Перетащите курсор или щелкните для <b>уменьшения</b>, с Shift — для " -"<b>увеличения</b> размера объектов." +#. Fill in later +#: ../src/ui/dialog/symbols.cpp:136 ../src/ui/dialog/symbols.cpp:137 +msgid "Current Document" +msgstr "Текущий документ" -#: ../src/ui/tools/tweak-tool.cpp:198 -#, c-format -msgid "" -"%s. Drag or click to <b>rotate clockwise</b>; with Shift, " -"<b>counterclockwise</b>." -msgstr "" -"%s. Перетащите курсор или щелкните для <b>вращения объектов по часовой " -"стрелке</b>, с Shift — <b>против часовой стрелки</b>." +#: ../src/ui/dialog/symbols.cpp:204 +msgid "Add Symbol from the current document." +msgstr "Добавить символ из активного документа" -#: ../src/ui/tools/tweak-tool.cpp:206 -#, c-format -msgid "%s. Drag or click to <b>duplicate</b>; with Shift, <b>delete</b>." -msgstr "" -"%s. Перетащите курсор или щелкните для <b>дублирования</b>, с Shift — для " -"<b>удаления</b> объектов." +#: ../src/ui/dialog/symbols.cpp:213 +msgid "Remove Symbol from the current document." +msgstr "Удалить символ из активного документа" -#: ../src/ui/tools/tweak-tool.cpp:214 -#, c-format -msgid "%s. Drag to <b>push paths</b>." -msgstr "%s. Перетащите курсор для <b>выталкивания контуров</b>." +#: ../src/ui/dialog/symbols.cpp:227 +msgid "Display more icons in row." +msgstr "Показывать больше миниатюр в ряду" + +#: ../src/ui/dialog/symbols.cpp:236 +msgid "Display fewer icons in row." +msgstr "Показывать меньше миниатюр в ряду" -#: ../src/ui/tools/tweak-tool.cpp:218 -#, c-format -msgid "%s. Drag or click to <b>inset paths</b>; with Shift to <b>outset</b>." +#: ../src/ui/dialog/symbols.cpp:246 +msgid "Toggle 'fit' symbols in icon space." msgstr "" -"%s. Перетащите курсор или щелкните для <b>втягивания</b>, с Shift — для " -"<b>растягивания</b> контуров." -#: ../src/ui/tools/tweak-tool.cpp:226 -#, c-format -msgid "%s. Drag or click to <b>attract paths</b>; with Shift to <b>repel</b>." -msgstr "" -"%s. Перетащите курсор или щелкните для <b>притягивания</b>, с Shift — для " -"<b>отталкивания</b> контуров." +#: ../src/ui/dialog/symbols.cpp:258 +msgid "Make symbols smaller by zooming out." +msgstr "Уменьшить символы уменьшением масштаба" -#: ../src/ui/tools/tweak-tool.cpp:234 -#, c-format -msgid "%s. Drag or click to <b>roughen paths</b>." -msgstr "%s. Перетащите курсор или щелкните для <b>огрубления контуров</b>." +#: ../src/ui/dialog/symbols.cpp:268 +msgid "Make symbols bigger by zooming in." +msgstr "Уменьшить символы увеличением масштаба" -#: ../src/ui/tools/tweak-tool.cpp:238 -#, c-format -msgid "%s. Drag or click to <b>paint objects</b> with color." -msgstr "%s. Перетащите курсор или щелкните для <b>раскрашивания объектов</b>." +#: ../src/ui/dialog/symbols.cpp:622 +msgid "Unnamed Symbols" +msgstr "Безымянные символы" -#: ../src/ui/tools/tweak-tool.cpp:242 -#, c-format -msgid "%s. Drag or click to <b>randomize colors</b>." -msgstr "" -"%s. Перетащите курсор или щелкните для <b>перебора цветов</b> заливки " -"объектов." +#: ../src/ui/dialog/template-widget.cpp:36 +msgid "More info" +msgstr "Подробности" -#: ../src/ui/tools/tweak-tool.cpp:246 -#, c-format -msgid "" -"%s. Drag or click to <b>increase blur</b>; with Shift to <b>decrease</b>." +#: ../src/ui/dialog/template-widget.cpp:38 +msgid "no template selected" +msgstr "Ни один шаблон не выбран" + +#: ../src/ui/dialog/template-widget.cpp:119 +msgid "Path: " msgstr "" -"%s. Перетащите курсор или щелкните для <b>увеличения размывания</b>, с Shift " -"— для <b>уменьшения</b>." -#: ../src/ui/tools/tweak-tool.cpp:1193 -msgid "<b>Nothing selected!</b> Select objects to tweak." -msgstr "<b>Ничего не выделено!</b> Выделите объект(ы) для коррекции." +#: ../src/ui/dialog/template-widget.cpp:122 +msgid "Description: " +msgstr "Описание: " -#: ../src/ui/tools/tweak-tool.cpp:1227 -msgid "Move tweak" -msgstr "Перемещение корректором" +#: ../src/ui/dialog/template-widget.cpp:124 +msgid "Keywords: " +msgstr "Ключевые слова: " -#: ../src/ui/tools/tweak-tool.cpp:1231 -msgid "Move in/out tweak" -msgstr "Притягивание/отталкивание объектов" +#: ../src/ui/dialog/template-widget.cpp:131 +msgid "By: " +msgstr "Автор: " -#: ../src/ui/tools/tweak-tool.cpp:1235 -msgid "Move jitter tweak" -msgstr "Случайное перемещение корректором" +#: ../src/ui/dialog/text-edit.cpp:72 +msgid "Set as _default" +msgstr "_Использовать по умолчанию" -#: ../src/ui/tools/tweak-tool.cpp:1239 -msgid "Scale tweak" -msgstr "Масштабирование корректором" +#: ../src/ui/dialog/text-edit.cpp:86 +msgid "AaBbCcIiPpQq12369$€¢?.;/()" +msgstr "АаБбВвГгЁёФфЩщЯя$€¢?.;/()" -#: ../src/ui/tools/tweak-tool.cpp:1243 -msgid "Rotate tweak" -msgstr "Вращение корректором" +#. Align buttons +#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1344 +#: ../src/widgets/text-toolbar.cpp:1345 +msgid "Align left" +msgstr "Выключка влево" -#: ../src/ui/tools/tweak-tool.cpp:1247 -msgid "Duplicate/delete tweak" -msgstr "Дубликация/удаление корректором" +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1352 +#: ../src/widgets/text-toolbar.cpp:1353 +msgid "Align center" +msgstr "Выключка по центру" -#: ../src/ui/tools/tweak-tool.cpp:1251 -msgid "Push path tweak" -msgstr "Толкание контуров корректором" +#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1360 +#: ../src/widgets/text-toolbar.cpp:1361 +msgid "Align right" +msgstr "Выключка вправо" -#: ../src/ui/tools/tweak-tool.cpp:1255 -msgid "Shrink/grow path tweak" -msgstr "Коррекция объема контуров" +#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1369 +msgid "Justify (only flowed text)" +msgstr "Выключка по ширине (только завёрстанный текст)" -#: ../src/ui/tools/tweak-tool.cpp:1259 -msgid "Attract/repel path tweak" -msgstr "Притяжение и отталкивание контуров" +#. Direction buttons +#: ../src/ui/dialog/text-edit.cpp:108 ../src/widgets/text-toolbar.cpp:1404 +msgid "Horizontal text" +msgstr "Горизонтальный текст" -#: ../src/ui/tools/tweak-tool.cpp:1263 -msgid "Roughen path tweak" -msgstr "Огрубление контуров корректором" +#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1411 +msgid "Vertical text" +msgstr "Вертикальный текст" -#: ../src/ui/tools/tweak-tool.cpp:1267 -msgid "Color paint tweak" -msgstr "Коррекция заливки цветом" +#: ../src/ui/dialog/text-edit.cpp:129 ../src/ui/dialog/text-edit.cpp:130 +msgid "Spacing between lines (percent of font size)" +msgstr "Межстрочный интервал (в % от кегля шрифта)" -#: ../src/ui/tools/tweak-tool.cpp:1271 -msgid "Color jitter tweak" -msgstr "Коррекция перебором цветов" +#: ../src/ui/dialog/text-edit.cpp:146 +msgid "Text path offset" +msgstr "Смещение текста от контура" -#: ../src/ui/tools/tweak-tool.cpp:1275 -msgid "Blur tweak" -msgstr "Коррекция размывания" +#: ../src/ui/dialog/text-edit.cpp:587 ../src/ui/dialog/text-edit.cpp:661 +#: ../src/ui/tools/text-tool.cpp:1455 +msgid "Set text style" +msgstr "Смена стиля текста" -#: ../src/ui/widget/filter-effect-chooser.cpp:27 -msgid "Blur (%)" -msgstr "Размывание (%)" +#: ../src/ui/dialog/tile.cpp:36 +msgctxt "Arrange dialog" +msgid "Rectangular grid" +msgstr "Прямоугольная сетка" -#: ../src/ui/widget/layer-selector.cpp:118 -msgid "Toggle current layer visibility" -msgstr "Скрыть или открыть текущий слой" +#: ../src/ui/dialog/tile.cpp:37 +msgctxt "Arrange dialog" +msgid "Polar Coordinates" +msgstr "Полярные координаты" -#: ../src/ui/widget/layer-selector.cpp:139 -msgid "Lock or unlock current layer" -msgstr "Заблокировать или разблокировать текущий слой" +#: ../src/ui/dialog/tile.cpp:40 +msgctxt "Arrange dialog" +msgid "_Arrange" +msgstr "_Расставить" -#: ../src/ui/widget/layer-selector.cpp:142 -msgid "Current layer" -msgstr "Текущий слой" +#: ../src/ui/dialog/tile.cpp:42 +msgid "Arrange selected objects" +msgstr "Расставить выделенные объекты" -#: ../src/ui/widget/layer-selector.cpp:583 -msgid "(root)" -msgstr "(корень)" +#. #### begin left panel +#. ### begin notebook +#. ## begin mode page +#. # begin single scan +#. brightness +#: ../src/ui/dialog/tracedialog.cpp:508 +msgid "_Brightness cutoff" +msgstr "Сокращение _яркости" -#: ../src/ui/widget/licensor.cpp:40 -msgid "Proprietary" -msgstr "Собственническая" +#: ../src/ui/dialog/tracedialog.cpp:512 +msgid "Trace by a given brightness level" +msgstr "Векторизовать по заданному уровню яркости" -#: ../src/ui/widget/licensor.cpp:43 -msgid "MetadataLicence|Other" -msgstr "Другая" +#: ../src/ui/dialog/tracedialog.cpp:519 +msgid "Brightness cutoff for black/white" +msgstr "Порог яркости для черно-белого" -#: ../src/ui/widget/object-composite-settings.cpp:67 -#: ../src/ui/widget/selected-style.cpp:1095 -#: ../src/ui/widget/selected-style.cpp:1096 -msgid "Opacity (%)" -msgstr "Непрозрачность (%)" +#: ../src/ui/dialog/tracedialog.cpp:529 +msgid "Single scan: creates a path" +msgstr "Одиночное сканирование: создаёт контур" -#: ../src/ui/widget/object-composite-settings.cpp:180 -msgid "Change blur" -msgstr "Смена размывания" +#. canny edge detection +#. TRANSLATORS: "Canny" is the name of the inventor of this edge detection method +#: ../src/ui/dialog/tracedialog.cpp:534 +msgid "_Edge detection" +msgstr "Опр_еделение краёв" -#: ../src/ui/widget/object-composite-settings.cpp:220 -#: ../src/ui/widget/selected-style.cpp:927 -#: ../src/ui/widget/selected-style.cpp:1221 -msgid "Change opacity" -msgstr "Смена непрозрачности" +#: ../src/ui/dialog/tracedialog.cpp:538 +msgid "Trace with optimal edge detection by J. Canny's algorithm" +msgstr "Векторизовать с оптимальным определением краев по алгоритму J. Canny" -#: ../src/ui/widget/page-sizer.cpp:235 -msgid "U_nits:" -msgstr "Едини_цы:" +#: ../src/ui/dialog/tracedialog.cpp:556 +msgid "Brightness cutoff for adjacent pixels (determines edge thickness)" +msgstr "Порог яркости для смежных пикселов (определяет толщину краев)" -#: ../src/ui/widget/page-sizer.cpp:236 -msgid "Width of paper" -msgstr "Ширина бумаги" +#: ../src/ui/dialog/tracedialog.cpp:559 +msgid "T_hreshold:" +msgstr "По_рог:" -#: ../src/ui/widget/page-sizer.cpp:237 -msgid "Height of paper" -msgstr "Высота бумаги" +#. quantization +#. TRANSLATORS: Color Quantization: the process of reducing the number +#. of colors in an image by selecting an optimized set of representative +#. colors and then re-applying this reduced set to the original image. +#: ../src/ui/dialog/tracedialog.cpp:571 +msgid "Color _quantization" +msgstr "_Квантование цветов" -#: ../src/ui/widget/page-sizer.cpp:238 -msgid "T_op margin:" -msgstr "Вер_хнее:" +#: ../src/ui/dialog/tracedialog.cpp:575 +msgid "Trace along the boundaries of reduced colors" +msgstr "Векторизовать вдоль границы сокращенных цветов" -#: ../src/ui/widget/page-sizer.cpp:238 -msgid "Top margin" -msgstr "Верхнее поле" +#: ../src/ui/dialog/tracedialog.cpp:583 +msgid "The number of reduced colors" +msgstr "Количество цветов после сокращения" -#: ../src/ui/widget/page-sizer.cpp:239 -msgid "L_eft:" -msgstr "_Левое:" +#: ../src/ui/dialog/tracedialog.cpp:586 +msgid "_Colors:" +msgstr "_Цветов:" -#: ../src/ui/widget/page-sizer.cpp:239 -msgid "Left margin" -msgstr "Левое поле" +#. swap black and white +#: ../src/ui/dialog/tracedialog.cpp:594 +msgid "_Invert image" +msgstr "_Инвертировать изображение" -#: ../src/ui/widget/page-sizer.cpp:240 -msgid "Ri_ght:" -msgstr "Пр_авое:" +#: ../src/ui/dialog/tracedialog.cpp:599 +msgid "Invert black and white regions" +msgstr "Поменять местами чёрные и белые области" -#: ../src/ui/widget/page-sizer.cpp:240 -msgid "Right margin" -msgstr "Правое поле" +#. # end single scan +#. # begin multiple scan +#: ../src/ui/dialog/tracedialog.cpp:609 +msgid "B_rightness steps" +msgstr "_Шаги яркости" -#: ../src/ui/widget/page-sizer.cpp:241 -msgid "Botto_m:" -msgstr "_Нижнее:" +#: ../src/ui/dialog/tracedialog.cpp:613 +msgid "Trace the given number of brightness levels" +msgstr "Трассировать указанное количество уровней яркости" -#: ../src/ui/widget/page-sizer.cpp:241 -msgid "Bottom margin" -msgstr "Нижнее поле" +#: ../src/ui/dialog/tracedialog.cpp:621 +msgid "Sc_ans:" +msgstr "Ска_нирований:" -#: ../src/ui/widget/page-sizer.cpp:296 -msgid "Orientation:" -msgstr "Ориентация:" +#: ../src/ui/dialog/tracedialog.cpp:625 +msgid "The desired number of scans" +msgstr "Желаемое количество сканирований" -#: ../src/ui/widget/page-sizer.cpp:299 -msgid "_Landscape" -msgstr "_Альбом" +#: ../src/ui/dialog/tracedialog.cpp:630 +msgid "Co_lors" +msgstr "Ц_вет" -#: ../src/ui/widget/page-sizer.cpp:304 -msgid "_Portrait" -msgstr "П_ортрет" +#: ../src/ui/dialog/tracedialog.cpp:634 +msgid "Trace the given number of reduced colors" +msgstr "Трассировать указанное количество цветов" -#. ## Set up custom size frame -#: ../src/ui/widget/page-sizer.cpp:322 -msgid "Custom size" -msgstr "Другой размер" +#: ../src/ui/dialog/tracedialog.cpp:639 +msgid "_Grays" +msgstr "Гр_адации серого" -#: ../src/ui/widget/page-sizer.cpp:367 -msgid "Resi_ze page to content..." -msgstr "_Подогнать размер страницы под содержимое" +#: ../src/ui/dialog/tracedialog.cpp:643 +msgid "Same as Colors, but the result is converted to grayscale" +msgstr "" +"То же, что и для «В цвете», но конечное\n" +"изображение будет в градациях серого" -#: ../src/ui/widget/page-sizer.cpp:419 -msgid "_Resize page to drawing or selection" -msgstr "По_догнать размер страницы под рисунок или выделение" +#. TRANSLATORS: "Smooth" is a verb here +#: ../src/ui/dialog/tracedialog.cpp:649 +msgid "S_mooth" +msgstr "Сгладит_ь" -#: ../src/ui/widget/page-sizer.cpp:420 +#: ../src/ui/dialog/tracedialog.cpp:653 +msgid "Apply Gaussian blur to the bitmap before tracing" +msgstr "Применить Гауссово размывание растра перед векторизацией" + +#. TRANSLATORS: "Stack" is a verb here +#: ../src/ui/dialog/tracedialog.cpp:657 +msgid "Stac_k scans" +msgstr "С_ложить стопкой" + +#: ../src/ui/dialog/tracedialog.cpp:661 msgid "" -"Resize the page to fit the current selection, or the entire drawing if there " -"is no selection" +"Stack scans on top of one another (no gaps) instead of tiling (usually with " +"gaps)" msgstr "" -"Изменить размер страницы до размеров текущего выделения или всего рисунка, " -"если выделения нет" +"Слои выкладываются стопкой один над другим (без щелей), а не встык (обычно " +"со щелями)" -#: ../src/ui/widget/page-sizer.cpp:488 -msgid "Set page size" -msgstr "Смена формата страницы" +#: ../src/ui/dialog/tracedialog.cpp:665 +msgid "Remo_ve background" +msgstr "Убрать _фон" -#: ../src/ui/widget/panel.cpp:116 -msgid "List" -msgstr "Список" +#. TRANSLATORS: "Layer" refers to one of the stacked paths in the multiscan +#: ../src/ui/dialog/tracedialog.cpp:670 +msgid "Remove bottom (background) layer when done" +msgstr "Удалить нижнюю стопку объектов по завершении" -#: ../src/ui/widget/panel.cpp:139 -msgctxt "Swatches" -msgid "Size" -msgstr "Размер" +#: ../src/ui/dialog/tracedialog.cpp:675 +msgid "Multiple scans: creates a group of paths" +msgstr "Множественное сканирование: создаёт группу контуров" -#: ../src/ui/widget/panel.cpp:143 -msgctxt "Swatches height" -msgid "Tiny" -msgstr "Крошечные" +#. # end multiple scan +#. ## end mode page +#: ../src/ui/dialog/tracedialog.cpp:684 +msgid "_Mode" +msgstr "Ре_жим" -#: ../src/ui/widget/panel.cpp:144 -msgctxt "Swatches height" -msgid "Small" -msgstr "Маленькие" +#. ## begin option page +#. # potrace parameters +#: ../src/ui/dialog/tracedialog.cpp:690 +msgid "Suppress _speckles" +msgstr "Убрать п_ятна" -#: ../src/ui/widget/panel.cpp:145 -msgctxt "Swatches height" -msgid "Medium" -msgstr "Средние" +#: ../src/ui/dialog/tracedialog.cpp:692 +msgid "Ignore small spots (speckles) in the bitmap" +msgstr "Проигнорировать мелкие точки (пятна) на изображении" -#: ../src/ui/widget/panel.cpp:146 -msgctxt "Swatches height" -msgid "Large" -msgstr "Большие" +#: ../src/ui/dialog/tracedialog.cpp:700 +msgid "Speckles of up to this many pixels will be suppressed" +msgstr "Пятна такого диаметра в пикселах будут подавлены" -#: ../src/ui/widget/panel.cpp:147 -msgctxt "Swatches height" -msgid "Huge" -msgstr "Огромные" +#: ../src/ui/dialog/tracedialog.cpp:703 +msgid "S_ize:" +msgstr "Ра_змер:" -#: ../src/ui/widget/panel.cpp:169 -msgctxt "Swatches" -msgid "Width" -msgstr "Ширина" +#: ../src/ui/dialog/tracedialog.cpp:708 +msgid "Smooth _corners" +msgstr "Сгладить _углы" -#: ../src/ui/widget/panel.cpp:173 -msgctxt "Swatches width" -msgid "Narrower" -msgstr "Ещё уже" +#: ../src/ui/dialog/tracedialog.cpp:710 +msgid "Smooth out sharp corners of the trace" +msgstr "Сгладить острые углы при векторизации" -#: ../src/ui/widget/panel.cpp:174 -msgctxt "Swatches width" -msgid "Narrow" -msgstr "Узкие" +#: ../src/ui/dialog/tracedialog.cpp:719 +msgid "Increase this to smooth corners more" +msgstr "Чем больше значение, тем глаже углы" -#: ../src/ui/widget/panel.cpp:175 -msgctxt "Swatches width" -msgid "Medium" -msgstr "Средние" +#: ../src/ui/dialog/tracedialog.cpp:726 +msgid "Optimize p_aths" +msgstr "Опти_мизировать контуры" -#: ../src/ui/widget/panel.cpp:176 -msgctxt "Swatches width" -msgid "Wide" -msgstr "Широкие" +#: ../src/ui/dialog/tracedialog.cpp:729 +msgid "Try to optimize paths by joining adjacent Bezier curve segments" +msgstr "" +"Попытаться оптимизировать контуры соединением соседних сегментов кривых Безье" -#: ../src/ui/widget/panel.cpp:177 -msgctxt "Swatches width" -msgid "Wider" -msgstr "Ещё шире" +#: ../src/ui/dialog/tracedialog.cpp:737 +msgid "" +"Increase this to reduce the number of nodes in the trace by more aggressive " +"optimization" +msgstr "Чем больше значение, тем меньше количество узлов" -#: ../src/ui/widget/panel.cpp:207 -msgctxt "Swatches" -msgid "Border" -msgstr "Край" +#: ../src/ui/dialog/tracedialog.cpp:739 +msgid "To_lerance:" +msgstr "Сг_лаживание:" -#: ../src/ui/widget/panel.cpp:211 -msgctxt "Swatches border" -msgid "None" -msgstr "Нет" +#. ## end option page +#: ../src/ui/dialog/tracedialog.cpp:753 +msgid "O_ptions" +msgstr "_Параметры" -#: ../src/ui/widget/panel.cpp:212 -#, fuzzy -msgctxt "Swatches border" -msgid "Solid" -msgstr "С заливкой" +#. ### credits +#: ../src/ui/dialog/tracedialog.cpp:757 +msgid "" +"Inkscape bitmap tracing\n" +"is based on Potrace,\n" +"created by Peter Selinger\n" +"\n" +"http://potrace.sourceforge.net" +msgstr "" +"Функция векторизации основана\n" +"на программе Potrace, написанной\n" +"Питером Селинджером\n" +"\n" +"http://potrace.sourceforge.net" -#: ../src/ui/widget/panel.cpp:213 -msgctxt "Swatches border" -msgid "Wide" -msgstr "Широкий" +#: ../src/ui/dialog/tracedialog.cpp:760 +msgid "Credits" +msgstr "Благодарности" -#. TRANSLATORS: "Wrap" indicates how colour swatches are displayed -#: ../src/ui/widget/panel.cpp:244 -#, fuzzy -msgctxt "Swatches" -msgid "Wrap" -msgstr "Крупнее" +#. #### begin right panel +#. ## SIOX +#: ../src/ui/dialog/tracedialog.cpp:774 +msgid "SIOX _foreground selection" +msgstr "В_ыделение переднего плана при помощи SIOX" -#: ../src/ui/widget/preferences-widget.cpp:802 -msgid "_Browse..." -msgstr "В_ыбрать..." +#: ../src/ui/dialog/tracedialog.cpp:777 +msgid "Cover the area you want to select as the foreground" +msgstr "Обведите область изображения, которая находится на переднем плане" -#: ../src/ui/widget/preferences-widget.cpp:888 -msgid "Select a bitmap editor" -msgstr "Выберите редактор растровых файлов" +#: ../src/ui/dialog/tracedialog.cpp:782 +msgid "Live Preview" +msgstr "Предпросмотр" -#: ../src/ui/widget/random.cpp:84 +#: ../src/ui/dialog/tracedialog.cpp:788 +msgid "_Update" +msgstr "О_бновить" + +#. I guess it's correct to call the "intermediate bitmap" a preview of the trace +#: ../src/ui/dialog/tracedialog.cpp:796 msgid "" -"Reseed the random number generator; this creates a different sequence of " -"random numbers." +"Preview the intermediate bitmap with the current settings, without actual " +"tracing" +msgstr "Просмотреть будущий результат перед собственно векторизацией" + +#: ../src/ui/dialog/tracedialog.cpp:800 +msgid "Preview" +msgstr "Предпросмотр" + +#: ../src/ui/dialog/transformation.cpp:76 +#: ../src/ui/dialog/transformation.cpp:86 +msgid "_Horizontal:" +msgstr "По _горизонтали:" + +#: ../src/ui/dialog/transformation.cpp:76 +msgid "Horizontal displacement (relative) or position (absolute)" msgstr "" -"Перезапустить генератор случайных чисел, чтобы создать иную " -"последовательность случайных чисел" +"Смещение (относительное) или позиционирование (абсолютное) по горизонтали" -#: ../src/ui/widget/rendering-options.cpp:33 -msgid "Backend" -msgstr "Внутренний механизм печати" +#: ../src/ui/dialog/transformation.cpp:78 +#: ../src/ui/dialog/transformation.cpp:88 +msgid "_Vertical:" +msgstr "По _вертикали:" -#: ../src/ui/widget/rendering-options.cpp:34 -msgid "Vector" -msgstr "Векторный" +#: ../src/ui/dialog/transformation.cpp:78 +msgid "Vertical displacement (relative) or position (absolute)" +msgstr "" +"Смещение (относительное) или позиционирование (абсолютное) по вертикали" -#: ../src/ui/widget/rendering-options.cpp:35 -msgid "Bitmap" -msgstr "Растровый" +#: ../src/ui/dialog/transformation.cpp:80 +msgid "Horizontal size (absolute or percentage of current)" +msgstr "Размер по горизонтали (абсолютный или в %)" -#: ../src/ui/widget/rendering-options.cpp:36 -msgid "Bitmap options" -msgstr "Параметры растровой печати" +#: ../src/ui/dialog/transformation.cpp:82 +msgid "Vertical size (absolute or percentage of current)" +msgstr "Размер по вертикали (абсолютный или в %)" -#: ../src/ui/widget/rendering-options.cpp:38 -msgid "Preferred resolution of rendering, in dots per inch." -msgstr "Предпочитаемое разрешение растра (в точках на дюйм)." +#: ../src/ui/dialog/transformation.cpp:84 +msgid "A_ngle:" +msgstr "_Угол:" -#: ../src/ui/widget/rendering-options.cpp:47 +#: ../src/ui/dialog/transformation.cpp:84 +#: ../src/ui/dialog/transformation.cpp:1104 +msgid "Rotation angle (positive = counterclockwise)" +msgstr "Угол поворота (больше 0 = против часовой стрелки)" + +#: ../src/ui/dialog/transformation.cpp:86 msgid "" -"Render using Cairo vector operations. The resulting image is usually " -"smaller in file size and can be arbitrarily scaled, but some filter effects " -"will not be correctly rendered." +"Horizontal skew angle (positive = counterclockwise), or absolute " +"displacement, or percentage displacement" msgstr "" -"Использовать векторные операторы Cairo. Итоговое изображение обычно имеет " -"меньший размер файла и свободно масштабируется, но некоторые фильтры " -"эффектов будут переданы некорректно." +"Угол наклона по горизонтали (больше 0 = против часовой стрелки), либо " +"абсолютное смещение, либо процентное смещение" -#: ../src/ui/widget/rendering-options.cpp:52 +#: ../src/ui/dialog/transformation.cpp:88 msgid "" -"Render everything as bitmap. The resulting image is usually larger in file " -"size and cannot be arbitrarily scaled without quality loss, but all objects " -"will be rendered exactly as displayed." +"Vertical skew angle (positive = counterclockwise), or absolute displacement, " +"or percentage displacement" msgstr "" -"Напечатать как растр. Как правило, файл будет большего размера, и полученное " -"изображение нельзя будет произвольно масштабировать без потери качества. " -"Однако все графические элементы будут напечатаны так, как они выглядят на " -"экране." +"Угол наклона по вертикали (больше 0 = против часовой стрелки), либо " +"абсолютное смещение, либо процентное смещение" -#: ../src/ui/widget/selected-style.cpp:130 -#: ../src/ui/widget/style-swatch.cpp:127 -msgid "Fill:" -msgstr "Заливка:" +#: ../src/ui/dialog/transformation.cpp:91 +msgid "Transformation matrix element A" +msgstr "Преобразование элемента матрицы A" -#: ../src/ui/widget/selected-style.cpp:132 -msgid "O:" -msgstr "Н:" +#: ../src/ui/dialog/transformation.cpp:92 +msgid "Transformation matrix element B" +msgstr "Преобразование элемента матрицы B" -#: ../src/ui/widget/selected-style.cpp:177 -msgid "N/A" -msgstr "Н/Д" +#: ../src/ui/dialog/transformation.cpp:93 +msgid "Transformation matrix element C" +msgstr "Преобразование элемента матрицы C" -#: ../src/ui/widget/selected-style.cpp:180 -#: ../src/ui/widget/selected-style.cpp:1088 -#: ../src/ui/widget/selected-style.cpp:1089 -#: ../src/widgets/gradient-toolbar.cpp:162 -msgid "Nothing selected" -msgstr "Ничего не выбрано" +#: ../src/ui/dialog/transformation.cpp:94 +msgid "Transformation matrix element D" +msgstr "Преобразование элемента матрицы D" -#: ../src/ui/widget/selected-style.cpp:182 -#: ../src/ui/widget/style-swatch.cpp:320 -#, fuzzy -msgctxt "Fill and stroke" -msgid "<i>None</i>" -msgstr "<i>Нет</i>" +#: ../src/ui/dialog/transformation.cpp:95 +msgid "Transformation matrix element E" +msgstr "Преобразование элемента матрицы E" -#: ../src/ui/widget/selected-style.cpp:185 -#: ../src/ui/widget/style-swatch.cpp:322 -#, fuzzy -msgctxt "Fill and stroke" -msgid "No fill" -msgstr "Без заливки" +#: ../src/ui/dialog/transformation.cpp:96 +msgid "Transformation matrix element F" +msgstr "Преобразование элемента матрицы F" -#: ../src/ui/widget/selected-style.cpp:185 -#: ../src/ui/widget/style-swatch.cpp:322 -#, fuzzy -msgctxt "Fill and stroke" -msgid "No stroke" -msgstr "Без обводки" +#: ../src/ui/dialog/transformation.cpp:101 +msgid "Rela_tive move" +msgstr "_Относительное смещение" -#: ../src/ui/widget/selected-style.cpp:187 -#: ../src/ui/widget/style-swatch.cpp:301 ../src/widgets/paint-selector.cpp:242 -msgid "Pattern" -msgstr "Текстура" +#: ../src/ui/dialog/transformation.cpp:101 +msgid "" +"Add the specified relative displacement to the current position; otherwise, " +"edit the current absolute position directly" +msgstr "" +"Добавить указанное относительное смещение к текущей позиции; в противном " +"случае изменить текущую абсолютную позицию напрямую" -#: ../src/ui/widget/selected-style.cpp:190 -#: ../src/ui/widget/style-swatch.cpp:303 -msgid "Pattern fill" -msgstr "Текстурная заливка" +#: ../src/ui/dialog/transformation.cpp:102 +msgid "_Scale proportionally" +msgstr "_Пропорциональное масштабирование" -#: ../src/ui/widget/selected-style.cpp:190 -#: ../src/ui/widget/style-swatch.cpp:303 -msgid "Pattern stroke" -msgstr "Текстурная обводка" +#: ../src/ui/dialog/transformation.cpp:102 +msgid "Preserve the width/height ratio of the scaled objects" +msgstr "Сохранять соотношение ширины и высоты масштабируемых объектов" -#: ../src/ui/widget/selected-style.cpp:192 -msgid "<b>L</b>" -msgstr "<b>Л:</b>" +#: ../src/ui/dialog/transformation.cpp:103 +msgid "Apply to each _object separately" +msgstr "Применить к _каждому объекту отдельно" -#: ../src/ui/widget/selected-style.cpp:195 -#: ../src/ui/widget/style-swatch.cpp:295 -msgid "Linear gradient fill" -msgstr "Линейная градиентная заливка" +#: ../src/ui/dialog/transformation.cpp:103 +msgid "" +"Apply the scale/rotate/skew to each selected object separately; otherwise, " +"transform the selection as a whole" +msgstr "" +"Применить масштабирование/вращение/наклон к каждому объекту отдельно; в " +"противном случае выделенное преобразовывается как один объект" -#: ../src/ui/widget/selected-style.cpp:195 -#: ../src/ui/widget/style-swatch.cpp:295 -msgid "Linear gradient stroke" -msgstr "Линейная градиентная обводка" +#: ../src/ui/dialog/transformation.cpp:104 +msgid "Edit c_urrent matrix" +msgstr "Изменить текущую _матрицу" -#: ../src/ui/widget/selected-style.cpp:202 -msgid "<b>R</b>" -msgstr "<b>Р</b>" +#: ../src/ui/dialog/transformation.cpp:104 +msgid "" +"Edit the current transform= matrix; otherwise, post-multiply transform= by " +"this matrix" +msgstr "" +"Изменить текущую матрицу transform=; в противном случае, послеумножить " +"transform= на эту матрицу" -#: ../src/ui/widget/selected-style.cpp:205 -#: ../src/ui/widget/style-swatch.cpp:299 -msgid "Radial gradient fill" -msgstr "Радиальная градиентная заливка" +#: ../src/ui/dialog/transformation.cpp:117 +msgid "_Scale" +msgstr "_Масштаб" -#: ../src/ui/widget/selected-style.cpp:205 -#: ../src/ui/widget/style-swatch.cpp:299 -msgid "Radial gradient stroke" -msgstr "Радиальная градиентная обводка" +#: ../src/ui/dialog/transformation.cpp:120 +msgid "_Rotate" +msgstr "_Вращение" -#: ../src/ui/widget/selected-style.cpp:212 -msgid "Different" -msgstr "Разные" +#: ../src/ui/dialog/transformation.cpp:123 +msgid "Ske_w" +msgstr "_Наклон" -#: ../src/ui/widget/selected-style.cpp:215 -msgid "Different fills" -msgstr "Разные заливки" +#: ../src/ui/dialog/transformation.cpp:126 +msgid "Matri_x" +msgstr "М_атрица" -#: ../src/ui/widget/selected-style.cpp:215 -msgid "Different strokes" -msgstr "Разные обводки" +#: ../src/ui/dialog/transformation.cpp:150 +msgid "Reset the values on the current tab to defaults" +msgstr "Сбросить значения в этой вкладке до исходных" -#: ../src/ui/widget/selected-style.cpp:217 -#: ../src/ui/widget/style-swatch.cpp:325 -msgid "<b>Unset</b>" -msgstr "<b>Снята</b>" +#: ../src/ui/dialog/transformation.cpp:157 +msgid "Apply transformation to selection" +msgstr "Применить эти изменения к выбранному" -#. TRANSLATORS COMMENT: unset is a verb here -#: ../src/ui/widget/selected-style.cpp:220 -#: ../src/ui/widget/selected-style.cpp:278 -#: ../src/ui/widget/selected-style.cpp:559 -#: ../src/ui/widget/style-swatch.cpp:327 ../src/widgets/fill-style.cpp:712 -msgid "Unset fill" -msgstr "Снять заливку" +#: ../src/ui/dialog/transformation.cpp:332 +#, fuzzy +msgid "Rotate in a counterclockwise direction" +msgstr "Поворот против часовой стрелки" -#: ../src/ui/widget/selected-style.cpp:220 -#: ../src/ui/widget/selected-style.cpp:278 -#: ../src/ui/widget/selected-style.cpp:575 -#: ../src/ui/widget/style-swatch.cpp:327 ../src/widgets/fill-style.cpp:712 -msgid "Unset stroke" -msgstr "Снять обводку" +#: ../src/ui/dialog/transformation.cpp:338 +#, fuzzy +msgid "Rotate in a clockwise direction" +msgstr "Поворот по часовой стрелке" -#: ../src/ui/widget/selected-style.cpp:223 -msgid "Flat color fill" -msgstr "Цвет сплошной заливки" +#: ../src/ui/dialog/transformation.cpp:908 +#: ../src/ui/dialog/transformation.cpp:919 +#: ../src/ui/dialog/transformation.cpp:933 +#: ../src/ui/dialog/transformation.cpp:952 +#: ../src/ui/dialog/transformation.cpp:963 +#: ../src/ui/dialog/transformation.cpp:973 +#: ../src/ui/dialog/transformation.cpp:997 +msgid "Transform matrix is singular, <b>not used</b>." +msgstr "" -#: ../src/ui/widget/selected-style.cpp:223 -msgid "Flat color stroke" -msgstr "Цвет сплошной обводки" +#: ../src/ui/dialog/transformation.cpp:1012 +msgid "Edit transformation matrix" +msgstr "Правка матрицы преобразования" -#. TRANSLATOR COMMENT: A means "Averaged" -#: ../src/ui/widget/selected-style.cpp:226 -msgid "<b>a</b>" -msgstr "<b>a</b>" +#: ../src/ui/dialog/transformation.cpp:1111 +#, fuzzy +msgid "Rotation angle (positive = clockwise)" +msgstr "Угол поворота (больше 0 = против часовой стрелки)" -#: ../src/ui/widget/selected-style.cpp:229 -msgid "Fill is averaged over selected objects" -msgstr "Заливка усреднена для выбранных объектов" +#: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:126 +msgid "New element node" +msgstr "Создать ветвь элемента" -#: ../src/ui/widget/selected-style.cpp:229 -msgid "Stroke is averaged over selected objects" -msgstr "Обводка усреднена для выбранных объектов" +#: ../src/ui/dialog/xml-tree.cpp:71 ../src/ui/dialog/xml-tree.cpp:132 +msgid "New text node" +msgstr "Создать ветвь с текстом" -#. TRANSLATOR COMMENT: M means "Multiple" -#: ../src/ui/widget/selected-style.cpp:232 -msgid "<b>m</b>" -msgstr "<b>m</b>" +#: ../src/ui/dialog/xml-tree.cpp:72 ../src/ui/dialog/xml-tree.cpp:146 +msgid "nodeAsInXMLdialogTooltip|Delete node" +msgstr "Удалить элемент дерева XML" -#: ../src/ui/widget/selected-style.cpp:235 -msgid "Multiple selected objects have the same fill" -msgstr "У нескольких выбранных объектов одинаковая заливка" +#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:138 +#: ../src/ui/dialog/xml-tree.cpp:977 +msgid "Duplicate node" +msgstr "Дублирование ветви" -#: ../src/ui/widget/selected-style.cpp:235 -msgid "Multiple selected objects have the same stroke" -msgstr "У нескольких выбранных объектов одинаковая обводка" +#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:191 +#: ../src/ui/dialog/xml-tree.cpp:1013 +msgid "Delete attribute" +msgstr "Удалить атрибут" -#: ../src/ui/widget/selected-style.cpp:237 -msgid "Edit fill..." -msgstr "Изменить заливку..." +#: ../src/ui/dialog/xml-tree.cpp:87 +msgid "Set" +msgstr "Установить" -#: ../src/ui/widget/selected-style.cpp:237 -msgid "Edit stroke..." -msgstr "Изменить обводку..." +#: ../src/ui/dialog/xml-tree.cpp:121 +msgid "Drag to reorder nodes" +msgstr "Используйте мышь для перетаскивания ветвей" -#: ../src/ui/widget/selected-style.cpp:241 -msgid "Last set color" -msgstr "Последним использованным цветом" +#: ../src/ui/dialog/xml-tree.cpp:152 ../src/ui/dialog/xml-tree.cpp:153 +#: ../src/ui/dialog/xml-tree.cpp:1135 +msgid "Unindent node" +msgstr "Переместить к корню" -#: ../src/ui/widget/selected-style.cpp:245 -msgid "Last selected color" -msgstr "Последним выбранным цветом" +#: ../src/ui/dialog/xml-tree.cpp:157 ../src/ui/dialog/xml-tree.cpp:158 +#: ../src/ui/dialog/xml-tree.cpp:1113 +msgid "Indent node" +msgstr "Переместить от корня" -#: ../src/ui/widget/selected-style.cpp:261 -msgid "Copy color" -msgstr "Скопировать цвет" +#: ../src/ui/dialog/xml-tree.cpp:162 ../src/ui/dialog/xml-tree.cpp:163 +#: ../src/ui/dialog/xml-tree.cpp:1064 +msgid "Raise node" +msgstr "Поднять ветвь" -#: ../src/ui/widget/selected-style.cpp:265 -msgid "Paste color" -msgstr "Вставить цвет" +#: ../src/ui/dialog/xml-tree.cpp:167 ../src/ui/dialog/xml-tree.cpp:168 +#: ../src/ui/dialog/xml-tree.cpp:1082 +msgid "Lower node" +msgstr "Опустить ветвь" -#: ../src/ui/widget/selected-style.cpp:269 -#: ../src/ui/widget/selected-style.cpp:852 -msgid "Swap fill and stroke" -msgstr "Поменять местами заливку и обводку" +#: ../src/ui/dialog/xml-tree.cpp:208 +msgid "Attribute name" +msgstr "Имя атрибута" -#: ../src/ui/widget/selected-style.cpp:273 -#: ../src/ui/widget/selected-style.cpp:584 -#: ../src/ui/widget/selected-style.cpp:593 -msgid "Make fill opaque" -msgstr "Сделать заливку непрозрачной" +#: ../src/ui/dialog/xml-tree.cpp:223 +msgid "Attribute value" +msgstr "Значение атрибута" -#: ../src/ui/widget/selected-style.cpp:273 -msgid "Make stroke opaque" -msgstr "Сделать обводку непрозрачной" +#: ../src/ui/dialog/xml-tree.cpp:311 +msgid "<b>Click</b> to select nodes, <b>drag</b> to rearrange." +msgstr "" +"<b>Щелчком</b> выделяется ветвь, <b>перетаскиванием</b> меняется порядок." -#: ../src/ui/widget/selected-style.cpp:282 -#: ../src/ui/widget/selected-style.cpp:541 ../src/widgets/fill-style.cpp:510 -msgid "Remove fill" -msgstr "Полностью удалить заливку" +#: ../src/ui/dialog/xml-tree.cpp:322 +msgid "<b>Click</b> attribute to edit." +msgstr "<b>Щелкните мышкой</b> по атрибуту для его правки." -#: ../src/ui/widget/selected-style.cpp:282 -#: ../src/ui/widget/selected-style.cpp:550 ../src/widgets/fill-style.cpp:510 -msgid "Remove stroke" -msgstr "Удалить обводку" +#: ../src/ui/dialog/xml-tree.cpp:326 +#, c-format +msgid "" +"Attribute <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to " +"commit changes." +msgstr "" +"Выбран атрибут <b>%s</b>. Нажмите <b>Ctrl+Enter</b>, когда закончите правку." -#: ../src/ui/widget/selected-style.cpp:605 -msgid "Apply last set color to fill" -msgstr "Заливка последним примененным цветом" +#: ../src/ui/dialog/xml-tree.cpp:566 +msgid "Drag XML subtree" +msgstr "Перетаскивание поддерева XML" -#: ../src/ui/widget/selected-style.cpp:617 -msgid "Apply last set color to stroke" -msgstr "Обводка последним примененным цветом" +#: ../src/ui/dialog/xml-tree.cpp:868 +msgid "New element node..." +msgstr "Создать ветвь элемента..." -#: ../src/ui/widget/selected-style.cpp:628 -msgid "Apply last selected color to fill" -msgstr "Заливка последним выбранным цветом" +#: ../src/ui/dialog/xml-tree.cpp:906 +msgid "Cancel" +msgstr "Отменить" -#: ../src/ui/widget/selected-style.cpp:639 -msgid "Apply last selected color to stroke" -msgstr "Обводка последним выбранным цветом" +#: ../src/ui/dialog/xml-tree.cpp:943 +msgid "Create new element node" +msgstr "Создание ветви элемента" -#: ../src/ui/widget/selected-style.cpp:665 -msgid "Invert fill" -msgstr "Инвертирование заливки" +#: ../src/ui/dialog/xml-tree.cpp:959 +msgid "Create new text node" +msgstr "Создание текстовой ветви" -#: ../src/ui/widget/selected-style.cpp:689 -msgid "Invert stroke" -msgstr "Инвертирование обводки" +#: ../src/ui/dialog/xml-tree.cpp:994 +msgid "nodeAsInXMLinHistoryDialog|Delete node" +msgstr "Удаление элемента XML" -#: ../src/ui/widget/selected-style.cpp:701 -msgid "White fill" -msgstr "Заливка белым цветом" +#: ../src/ui/dialog/xml-tree.cpp:1038 +msgid "Change attribute" +msgstr "Смена атрибута" -#: ../src/ui/widget/selected-style.cpp:713 -msgid "White stroke" -msgstr "Заливка обводки белым цветом" +#: ../src/ui/tool/curve-drag-point.cpp:100 +msgid "Drag curve" +msgstr "Перетаскивание кривой" -#: ../src/ui/widget/selected-style.cpp:725 -msgid "Black fill" -msgstr "Заливка черным цветом" +#: ../src/ui/tool/curve-drag-point.cpp:157 +msgid "Add node" +msgstr "Добавление узла" -#: ../src/ui/widget/selected-style.cpp:737 -msgid "Black stroke" -msgstr "Заливка обводки черным цветом" +#: ../src/ui/tool/curve-drag-point.cpp:167 +msgctxt "Path segment tip" +msgid "<b>Shift</b>: click to toggle segment selection" +msgstr "<b>Shift</b>: щелчок переключает выделение сегмента" -#: ../src/ui/widget/selected-style.cpp:780 -msgid "Paste fill" -msgstr "Вставка заливки" +#: ../src/ui/tool/curve-drag-point.cpp:171 +msgctxt "Path segment tip" +msgid "<b>Ctrl+Alt</b>: click to insert a node" +msgstr "<b>Ctrl+Alt</b>: щелчок вставляет узел" -#: ../src/ui/widget/selected-style.cpp:798 -msgid "Paste stroke" -msgstr "Вставка обводки" +#: ../src/ui/tool/curve-drag-point.cpp:175 +msgctxt "Path segment tip" +msgid "" +"<b>Linear segment</b>: drag to convert to a Bezier segment, doubleclick to " +"insert node, click to select (more: Shift, Ctrl+Alt)" +msgstr "" +"<b>Линейный сегмент</b>: перетаскивание превращает его в сегмент Безье, " +"двойной щелчок вставляет узел, щелчок выделяет (попробуйте Shift, Ctrl+Alt)" -#: ../src/ui/widget/selected-style.cpp:954 -msgid "Change stroke width" -msgstr "Смена толщины обводки" +#: ../src/ui/tool/curve-drag-point.cpp:179 +msgctxt "Path segment tip" +msgid "" +"<b>Bezier segment</b>: drag to shape the segment, doubleclick to insert " +"node, click to select (more: Shift, Ctrl+Alt)" +msgstr "" +"<b>Сегмент Безье</b>: перетаскивание меняет форму, двойной щелчок вставляет " +"узел, щелчок выделяет (попробуйте Shift, Ctrl+Alt)" -#: ../src/ui/widget/selected-style.cpp:1049 -msgid ", drag to adjust" -msgstr ", потащите мышкой, чтобы изменить его" +#: ../src/ui/tool/multi-path-manipulator.cpp:315 +#, fuzzy +msgid "Retract handles" +msgstr "Втяжка узла" -#: ../src/ui/widget/selected-style.cpp:1134 -#, c-format -msgid "Stroke width: %.5g%s%s" -msgstr "Толщина обводки: %.5g%s%s" +#: ../src/ui/tool/multi-path-manipulator.cpp:315 ../src/ui/tool/node.cpp:270 +msgid "Change node type" +msgstr "Смена типа узла" -#: ../src/ui/widget/selected-style.cpp:1138 -msgid " (averaged)" -msgstr "(усреднено)" +#: ../src/ui/tool/multi-path-manipulator.cpp:323 +msgid "Straighten segments" +msgstr "Выпрямить сегменты" -#: ../src/ui/widget/selected-style.cpp:1166 -msgid "0 (transparent)" -msgstr "0 (прозрачно)" +#: ../src/ui/tool/multi-path-manipulator.cpp:325 +msgid "Make segments curves" +msgstr "Сделать сегменты кривыми" -#: ../src/ui/widget/selected-style.cpp:1190 -msgid "100% (opaque)" -msgstr "100% (непрозрачно)" +#: ../src/ui/tool/multi-path-manipulator.cpp:333 +msgid "Add nodes" +msgstr "Добавление узлов" -#: ../src/ui/widget/selected-style.cpp:1362 +#: ../src/ui/tool/multi-path-manipulator.cpp:339 #, fuzzy -msgid "Adjust alpha" -msgstr "Коррекция тона" +msgid "Add extremum nodes" +msgstr "Добавление узлов" -#: ../src/ui/widget/selected-style.cpp:1364 -#, fuzzy, c-format -msgid "" -"Adjusting <b>alpha</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Ctrl</" -"b> to adjust lightness, with <b>Shift</b> to adjust saturation, without " -"modifiers to adjust hue" -msgstr "" -"Коррекция <b>яркости</b>: было %.3g, стало <b>%.3g</b> (разница %.3g); с " -"<b>Shift</b> для насыщенности, без модификаторов смены тона" +#: ../src/ui/tool/multi-path-manipulator.cpp:346 +#, fuzzy +msgid "Duplicate nodes" +msgstr "Дублирование ветви" -#: ../src/ui/widget/selected-style.cpp:1368 -msgid "Adjust saturation" -msgstr "Коррекция насыщенности" +#: ../src/ui/tool/multi-path-manipulator.cpp:409 +#: ../src/widgets/node-toolbar.cpp:408 +msgid "Join nodes" +msgstr "Соединение узлов" -#: ../src/ui/widget/selected-style.cpp:1370 -#, fuzzy, c-format -msgid "" -"Adjusting <b>saturation</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with " -"<b>Ctrl</b> to adjust lightness, with <b>Alt</b> to adjust alpha, without " -"modifiers to adjust hue" -msgstr "" -"Коррекция <b>насыщенности</b>: было %.3g, стало <b>%.3g</b> (разница %.3g); " -"с <b>Ctrl</b> для смены яркости, без модификаторов смены тона" +#: ../src/ui/tool/multi-path-manipulator.cpp:416 +#: ../src/widgets/node-toolbar.cpp:419 +msgid "Break nodes" +msgstr "Разбить узлы" -#: ../src/ui/widget/selected-style.cpp:1374 -msgid "Adjust lightness" -msgstr "Коррекция яркости" +#: ../src/ui/tool/multi-path-manipulator.cpp:423 +msgid "Delete nodes" +msgstr "Удаление узлов" -#: ../src/ui/widget/selected-style.cpp:1376 -#, fuzzy, c-format -msgid "" -"Adjusting <b>lightness</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with " -"<b>Shift</b> to adjust saturation, with <b>Alt</b> to adjust alpha, without " -"modifiers to adjust hue" -msgstr "" -"Коррекция <b>яркости</b>: было %.3g, стало <b>%.3g</b> (разница %.3g); с " -"<b>Shift</b> для насыщенности, без модификаторов смены тона" +#: ../src/ui/tool/multi-path-manipulator.cpp:757 +msgid "Move nodes" +msgstr "Смещение узлов" -#: ../src/ui/widget/selected-style.cpp:1380 -msgid "Adjust hue" -msgstr "Коррекция тона" +#: ../src/ui/tool/multi-path-manipulator.cpp:760 +msgid "Move nodes horizontally" +msgstr "Смещение узлов по горизонтали" + +#: ../src/ui/tool/multi-path-manipulator.cpp:764 +msgid "Move nodes vertically" +msgstr "Смещение узлов по вертикали" -#: ../src/ui/widget/selected-style.cpp:1382 -#, fuzzy, c-format -msgid "" -"Adjusting <b>hue</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Shift</" -"b> to adjust saturation, with <b>Alt</b> to adjust alpha, with <b>Ctrl</b> " -"to adjust lightness" -msgstr "" -"Коррекция <b>тона</b>: было %.3g, стало <b>%.3g</b> (разница %.3g); с " -"<b>Shift</b> для смены насыщенности, с <b>Ctrl</b> для смены яркости" +#: ../src/ui/tool/multi-path-manipulator.cpp:768 +#: ../src/ui/tool/multi-path-manipulator.cpp:771 +msgid "Rotate nodes" +msgstr "Вращение узлов" -#: ../src/ui/widget/selected-style.cpp:1500 -#: ../src/ui/widget/selected-style.cpp:1514 -msgid "Adjust stroke width" -msgstr "Изменить толщину обводки" +#: ../src/ui/tool/multi-path-manipulator.cpp:775 +#: ../src/ui/tool/multi-path-manipulator.cpp:781 +msgid "Scale nodes uniformly" +msgstr "Единообразное масштабирование узлов" -#: ../src/ui/widget/selected-style.cpp:1501 -#, c-format -msgid "Adjusting <b>stroke width</b>: was %.3g, now <b>%.3g</b> (diff %.3g)" -msgstr "" -"Меняется <b>толщина обводки</b>: была %.3g, стала <b>%.3g</b> (разница %.3g)" +#: ../src/ui/tool/multi-path-manipulator.cpp:778 +msgid "Scale nodes" +msgstr "Масштабирование узлов" -#. TRANSLATORS: "Link" means to _link_ two sliders together -#: ../src/ui/widget/spin-scale.cpp:138 ../src/ui/widget/spin-slider.cpp:156 -msgctxt "Sliders" -msgid "Link" -msgstr "Связь" +#: ../src/ui/tool/multi-path-manipulator.cpp:785 +msgid "Scale nodes horizontally" +msgstr "Горизонтальное масштабирование узлов" -#: ../src/ui/widget/style-swatch.cpp:293 -msgid "L Gradient" -msgstr "Лин. градиент" +#: ../src/ui/tool/multi-path-manipulator.cpp:789 +msgid "Scale nodes vertically" +msgstr "Вертикальное масштабирование узлов" -#: ../src/ui/widget/style-swatch.cpp:297 -msgid "R Gradient" -msgstr "Рад. градиент" +#: ../src/ui/tool/multi-path-manipulator.cpp:793 +#, fuzzy +msgid "Skew nodes horizontally" +msgstr "Горизонтальное масштабирование узлов" -#: ../src/ui/widget/style-swatch.cpp:313 -#, c-format -msgid "Fill: %06x/%.3g" -msgstr "Заливка: %06x/%.3g" +#: ../src/ui/tool/multi-path-manipulator.cpp:797 +#, fuzzy +msgid "Skew nodes vertically" +msgstr "Вертикальное масштабирование узлов" -#: ../src/ui/widget/style-swatch.cpp:315 -#, c-format -msgid "Stroke: %06x/%.3g" -msgstr "Обводка: %06x/%.3g" +#: ../src/ui/tool/multi-path-manipulator.cpp:801 +msgid "Flip nodes horizontally" +msgstr "Горизонтальное отражение узлов" -#: ../src/ui/widget/style-swatch.cpp:347 -#, c-format -msgid "Stroke width: %.5g%s" -msgstr "Толщина обводки: %.5g%s" +#: ../src/ui/tool/multi-path-manipulator.cpp:804 +msgid "Flip nodes vertically" +msgstr "Вертикальное отражение узлов" -#: ../src/ui/widget/style-swatch.cpp:363 -#, c-format -msgid "O: %2.0f" -msgstr "" +#: ../src/ui/tool/node.cpp:245 +msgid "Cusp node handle" +msgstr "Рычаг острого узла" -#: ../src/ui/widget/style-swatch.cpp:368 -#, c-format -msgid "Opacity: %2.1f %%" -msgstr "Непрозрачность: %2.1f %%" +#: ../src/ui/tool/node.cpp:246 +msgid "Smooth node handle" +msgstr "Рычаг сглаженного узла" -#: ../src/vanishing-point.cpp:132 -msgid "Split vanishing points" -msgstr "Разделение точек схода" +#: ../src/ui/tool/node.cpp:247 +msgid "Symmetric node handle" +msgstr "Рычаг симметричного узла" -#: ../src/vanishing-point.cpp:177 -msgid "Merge vanishing points" -msgstr "Объединение точек схода" +#: ../src/ui/tool/node.cpp:248 +msgid "Auto-smooth node handle" +msgstr "Рычаг автоматически сглаженного узла" -#: ../src/vanishing-point.cpp:243 -msgid "3D box: Move vanishing point" -msgstr "Параллелепипед: смещение точки схода" +#: ../src/ui/tool/node.cpp:432 +msgctxt "Path handle tip" +msgid "more: Shift, Ctrl, Alt" +msgstr "попробуйте Shift, Ctrl, Alt" -#: ../src/vanishing-point.cpp:327 -#, c-format -msgid "<b>Finite</b> vanishing point shared by <b>%d</b> box" -msgid_plural "" -"<b>Finite</b> vanishing point shared by <b>%d</b> boxes; drag with <b>Shift</" -"b> to separate selected box(es)" -msgstr[0] "<b>Конечная</b> точка схода разделяется <b>%d</b> параллелепипедом" -msgstr[1] "" -"<b>Конечная</b> точка схода разделяется <b>%d</b> параллелепипедами; " -"перетаскивание с <b>Shift</b> разделяет выбранные объекты" -msgstr[2] "" -"<b>Конечная</b> точка схода разделяется <b>%d</b> параллелепипедами; " -"перетаскивание с <b>Shift</b> разделяет выбранные объекты" +#: ../src/ui/tool/node.cpp:434 +msgctxt "Path handle tip" +msgid "more: Ctrl, Alt" +msgstr "попробуйте Ctrl, Alt" -#. This won't make sense any more when infinite VPs are not shown on the canvas, -#. but currently we update the status message anyway -#: ../src/vanishing-point.cpp:334 +#: ../src/ui/tool/node.cpp:440 #, c-format -msgid "<b>Infinite</b> vanishing point shared by <b>%d</b> box" -msgid_plural "" -"<b>Infinite</b> vanishing point shared by <b>%d</b> boxes; drag with " -"<b>Shift</b> to separate selected box(es)" -msgstr[0] "" -"<b>Неконечная</b> точка схода разделяется <b>%d</b> параллелепипедом" -msgstr[1] "" -"<b>Неконечная</b> точка схода разделяется <b>%d</b> параллелепипедами; " -"перетаскивание с <b>Shift</b> разделяет выбранные объекты" -msgstr[2] "" -"<b>Неконечная</b> точка схода разделяется <b>%d</b> параллелепипедами; " -"перетаскивание с <b>Shift</b> разделяет выбранные объекты" +msgctxt "Path handle tip" +msgid "" +"<b>Shift+Ctrl+Alt</b>: preserve length and snap rotation angle to %g° " +"increments while rotating both handles" +msgstr "" +"<b>Shift+Ctrl+Alt</b>: сохраняет длину и вращает оба рычага с шагом %g°" -#: ../src/vanishing-point.cpp:342 +#: ../src/ui/tool/node.cpp:445 #, c-format +msgctxt "Path handle tip" msgid "" -"shared by <b>%d</b> box; drag with <b>Shift</b> to separate selected box(es)" -msgid_plural "" -"shared by <b>%d</b> boxes; drag with <b>Shift</b> to separate selected box" -"(es)" -msgstr[0] "" -"разделяемых <b>%d</b> параллелепипедом; перетаскиванием с <b>Shift</b> " -"разделяются выбранные параллелепипеды" -msgstr[1] "" -"разделяемых <b>%d</b> параллелепипедами; перетаскиванием с <b>Shift</b> " -"разделяются выбранные параллелепипеды" -msgstr[2] "" -"разделяемых <b>%d</b> параллелепипедами; перетаскиванием с <b>Shift</b> " -"разделяются выбранные параллелепипеды" +"<b>Ctrl+Alt</b>: preserve length and snap rotation angle to %g° increments" +msgstr "<b>Ctrl+Alt</b>: сохраняет длину, с шагом вращения %g°" -#: ../src/verbs.cpp:137 -#, fuzzy -msgid "File" -msgstr "_Файл" +#: ../src/ui/tool/node.cpp:451 +msgctxt "Path handle tip" +msgid "<b>Shift+Alt</b>: preserve handle length and rotate both handles" +msgstr "<b>Shift+Alt</b>: сохраняет длину рычагов и вращает оба рычага" -#: ../src/verbs.cpp:232 -msgid "Context" -msgstr "Контекст" +#: ../src/ui/tool/node.cpp:454 +msgctxt "Path handle tip" +msgid "<b>Alt</b>: preserve handle length while dragging" +msgstr "<b>Alt</b>: сохраняет длину рычагов при перетаскивании" -#: ../src/verbs.cpp:251 ../src/verbs.cpp:2223 -#: ../share/extensions/jessyInk_view.inx.h:1 -#: ../share/extensions/polyhedron_3d.inx.h:26 -msgid "View" -msgstr "Вид" +#: ../src/ui/tool/node.cpp:461 +#, c-format +msgctxt "Path handle tip" +msgid "" +"<b>Shift+Ctrl</b>: snap rotation angle to %g° increments and rotate both " +"handles" +msgstr "<b>Shift+Ctrl</b>: вращает оба рычага с шагом по %g°" -#: ../src/verbs.cpp:271 -#, fuzzy -msgid "Dialog" -msgstr "Тагальский" +#: ../src/ui/tool/node.cpp:465 +#, c-format +msgctxt "Path handle tip" +msgid "<b>Ctrl</b>: snap rotation angle to %g° increments, click to retract" +msgstr "<b>Ctrl</b>: вращение шагами по %g°, щелчок втягивает" -#: ../src/verbs.cpp:1227 -msgid "Switch to next layer" -msgstr "Перейти на следующий слой" +#: ../src/ui/tool/node.cpp:470 +msgctxt "Path hande tip" +msgid "<b>Shift</b>: rotate both handles by the same angle" +msgstr "<b>Shift</b>: вращает оба рычага на одинаковый угол" -#: ../src/verbs.cpp:1228 -msgid "Switched to next layer." -msgstr "Переход на следующий слой." +#: ../src/ui/tool/node.cpp:477 +#, c-format +msgctxt "Path handle tip" +msgid "<b>Auto node handle</b>: drag to convert to smooth node (%s)" +msgstr "" +"<b>Автоматический рычаг узла</b>: перетаскивание делает узел сглаженным (%s)" -#: ../src/verbs.cpp:1230 -msgid "Cannot go past last layer." -msgstr "Невозможно перейти за последний слой." +#: ../src/ui/tool/node.cpp:480 +#, c-format +msgctxt "Path handle tip" +msgid "<b>%s</b>: drag to shape the segment (%s)" +msgstr "<b>%s</b>: перетаскивание меняет форму сегмента (%s)" -#: ../src/verbs.cpp:1239 -msgid "Switch to previous layer" -msgstr "Опускание на предыдущий слой" +#: ../src/ui/tool/node.cpp:500 +#, c-format +msgctxt "Path handle tip" +msgid "Move handle by %s, %s; angle %.2f°, length %s" +msgstr "Перемещение узла на %s, %s; угол %.2f°, длина %s" -#: ../src/verbs.cpp:1240 -msgid "Switched to previous layer." -msgstr "Перемещен на предыдущий слой" +#: ../src/ui/tool/node.cpp:1270 +msgctxt "Path node tip" +msgid "<b>Shift</b>: drag out a handle, click to toggle selection" +msgstr "<b>Shift</b>: вытаскивает рычаг, щелчок переключает выделение" -#: ../src/verbs.cpp:1242 -msgid "Cannot go before first layer." -msgstr "Невозможно перейти за первый слой." +#: ../src/ui/tool/node.cpp:1272 +msgctxt "Path node tip" +msgid "<b>Shift</b>: click to toggle selection" +msgstr "<b>Shift</b>: щелчок переключает выделение" -#: ../src/verbs.cpp:1263 ../src/verbs.cpp:1360 ../src/verbs.cpp:1396 -#: ../src/verbs.cpp:1402 ../src/verbs.cpp:1426 ../src/verbs.cpp:1441 -msgid "No current layer." -msgstr "Нет текущего слоя." +#: ../src/ui/tool/node.cpp:1277 +msgctxt "Path node tip" +msgid "<b>Ctrl+Alt</b>: move along handle lines, click to delete node" +msgstr "<b>Ctrl+Alt</b>: перемещает вдоль линий рычага, щелчок удаляет узел" -#: ../src/verbs.cpp:1292 ../src/verbs.cpp:1296 -#, c-format -msgid "Raised layer <b>%s</b>." -msgstr "Слой <b>%s</b> поднят." +#: ../src/ui/tool/node.cpp:1280 +msgctxt "Path node tip" +msgid "<b>Ctrl</b>: move along axes, click to change node type" +msgstr "<b>Ctrl</b>: перемещает вдоль осей, щелчок меняет тип узла" -#: ../src/verbs.cpp:1293 -msgid "Layer to top" -msgstr "Слой на передний план" +#: ../src/ui/tool/node.cpp:1284 +msgctxt "Path node tip" +msgid "<b>Alt</b>: sculpt nodes" +msgstr "<b>Alt</b>: лепка узлов" -#: ../src/verbs.cpp:1297 -msgid "Raise layer" -msgstr "Повышение слоя" +#: ../src/ui/tool/node.cpp:1292 +#, c-format +msgctxt "Path node tip" +msgid "<b>%s</b>: drag to shape the path (more: Shift, Ctrl, Alt)" +msgstr "" +"<b>%s</b>: перетаскивание меняет форму контура (попробуйте Shift, Ctrl, Alt)" -#: ../src/verbs.cpp:1300 ../src/verbs.cpp:1304 +#: ../src/ui/tool/node.cpp:1295 #, c-format -msgid "Lowered layer <b>%s</b>." -msgstr "Слой <b>%s</b> опущен" +msgctxt "Path node tip" +msgid "" +"<b>%s</b>: drag to shape the path, click to toggle scale/rotation handles " +"(more: Shift, Ctrl, Alt)" +msgstr "" +"<b>%s</b>: перетаскивание меняет форму контура, щелчок переключает рычаги " +"масштабирования/вращения (попробуйте Shift, Ctrl, Alt)" -#: ../src/verbs.cpp:1301 -msgid "Layer to bottom" -msgstr "Слой на задний план" +#: ../src/ui/tool/node.cpp:1298 +#, c-format +msgctxt "Path node tip" +msgid "" +"<b>%s</b>: drag to shape the path, click to select only this node (more: " +"Shift, Ctrl, Alt)" +msgstr "" +"<b>%s</b>: перетаскивание меняет форму контура, щелчок выделяет только этот " +"узел (попробуйте Shift, Ctrl, Alt)" -#: ../src/verbs.cpp:1305 -msgid "Lower layer" -msgstr "Опускание слоя" +#: ../src/ui/tool/node.cpp:1309 +#, c-format +msgctxt "Path node tip" +msgid "Move node by %s, %s" +msgstr "Перемещение узла на %s, %s" -#: ../src/verbs.cpp:1314 -msgid "Cannot move layer any further." -msgstr "Невозможно переместить слой дальше." +#: ../src/ui/tool/node.cpp:1320 +msgid "Symmetric node" +msgstr "Симметричный узел" -#: ../src/verbs.cpp:1328 ../src/verbs.cpp:1347 -#, c-format -msgid "%s copy" -msgstr "Копия слоя %s" +#: ../src/ui/tool/node.cpp:1321 +msgid "Auto-smooth node" +msgstr "Автоматически сглаженный узел" -#: ../src/verbs.cpp:1355 -msgid "Duplicate layer" -msgstr "Дубликация слоя" +#: ../src/ui/tool/path-manipulator.cpp:821 +msgid "Scale handle" +msgstr "Рычаг масштабирования" -#. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1358 -msgid "Duplicated layer." -msgstr "Слой продублирован." +#: ../src/ui/tool/path-manipulator.cpp:845 +msgid "Rotate handle" +msgstr "Рычаг вращения" -#: ../src/verbs.cpp:1391 -msgid "Delete layer" -msgstr "Слой удалён" +#. We need to call MPM's method because it could have been our last node +#: ../src/ui/tool/path-manipulator.cpp:1384 +#: ../src/widgets/node-toolbar.cpp:397 +msgid "Delete node" +msgstr "Удалить узел" -#. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1394 -msgid "Deleted layer." -msgstr "Слой удалён." +#: ../src/ui/tool/path-manipulator.cpp:1392 +msgid "Cycle node type" +msgstr "Циклически менять тип узла" -#: ../src/verbs.cpp:1411 -msgid "Show all layers" -msgstr "Просмотр всех слоёв" +#: ../src/ui/tool/path-manipulator.cpp:1407 +#, fuzzy +msgid "Drag handle" +msgstr "Нарисовать рычаги" -#: ../src/verbs.cpp:1416 -msgid "Hide all layers" -msgstr "Сокрытие всех слоёв" +#: ../src/ui/tool/path-manipulator.cpp:1416 +msgid "Retract handle" +msgstr "Втяжка узла" -#: ../src/verbs.cpp:1421 -msgid "Lock all layers" -msgstr "Блокировка всех слоёв" +#: ../src/ui/tool/transform-handle-set.cpp:195 +msgctxt "Transform handle tip" +msgid "<b>Shift+Ctrl</b>: scale uniformly about the rotation center" +msgstr "" +"<b>Shift+Ctrl</b>: масштабирование относительно точки вращения с сохранением " +"пропорций" -#: ../src/verbs.cpp:1435 -msgid "Unlock all layers" -msgstr "Разблокировка всех слоёв" +#: ../src/ui/tool/transform-handle-set.cpp:197 +msgctxt "Transform handle tip" +msgid "<b>Ctrl:</b> scale uniformly" +msgstr "<b>Shift+Ctrl</b>: масштабирование с сохранением пропорций" -#: ../src/verbs.cpp:1519 -msgid "Flip horizontally" -msgstr "Отразить горизонтально" +#: ../src/ui/tool/transform-handle-set.cpp:202 +msgctxt "Transform handle tip" +msgid "" +"<b>Shift+Alt</b>: scale using an integer ratio about the rotation center" +msgstr "" +"<b>Shift+Alt</b>: масштабирование относительно точки вращения с " +"коэффициентом соотношения сторон" -#: ../src/verbs.cpp:1524 -msgid "Flip vertically" -msgstr "Отразить вертикально" +#: ../src/ui/tool/transform-handle-set.cpp:204 +msgctxt "Transform handle tip" +msgid "<b>Shift</b>: scale from the rotation center" +msgstr "<b>Shift</b>: масштабирование относительно точки вращения" -#. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, -#. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language -#. code); otherwise leave as "tutorial-basic.svg". -#: ../src/verbs.cpp:2105 -msgid "tutorial-basic.svg" -msgstr "tutorial-basic.ru.svg" +#: ../src/ui/tool/transform-handle-set.cpp:207 +msgctxt "Transform handle tip" +msgid "<b>Alt</b>: scale using an integer ratio" +msgstr "<b>Alt</b>: масштабирование с коэффициентом соотношения сторон" -#. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2109 -msgid "tutorial-shapes.svg" -msgstr "tutorial-shapes.ru.svg" +#: ../src/ui/tool/transform-handle-set.cpp:209 +msgctxt "Transform handle tip" +msgid "<b>Scale handle</b>: drag to scale the selection" +msgstr "<b>Рычаг масштабирования</b>: перетаскивание масштабирует выделение" -#. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2113 -msgid "tutorial-advanced.svg" -msgstr "tutorial-advanced.ru.svg" +#: ../src/ui/tool/transform-handle-set.cpp:214 +#, c-format +msgctxt "Transform handle tip" +msgid "Scale by %.2f%% x %.2f%%" +msgstr "Масштабирование на %.2f%%×%.2f%%" -#. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2117 -msgid "tutorial-tracing.svg" -msgstr "tutorial-tracing.ru.svg" +#: ../src/ui/tool/transform-handle-set.cpp:438 +#, c-format +msgctxt "Transform handle tip" +msgid "" +"<b>Shift+Ctrl</b>: rotate around the opposite corner and snap angle to %f° " +"increments" +msgstr "" +"<b>Shift+Ctrl</b>: вращает относительно противоположного угла с шагом в %f°" -#: ../src/verbs.cpp:2120 -#, fuzzy -msgid "tutorial-tracing-pixelart.svg" -msgstr "tutorial-tracing.ru.svg" +#: ../src/ui/tool/transform-handle-set.cpp:441 +msgctxt "Transform handle tip" +msgid "<b>Shift</b>: rotate around the opposite corner" +msgstr "<b>Shift</b>: вращает относительно противоположного угла" -#. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2124 -msgid "tutorial-calligraphy.svg" -msgstr "tutorial-calligraphy.ru.svg" +#: ../src/ui/tool/transform-handle-set.cpp:445 +#, c-format +msgctxt "Transform handle tip" +msgid "<b>Ctrl</b>: snap angle to %f° increments" +msgstr "<b>Ctrl</b>: вращает с шагом %f°" -#. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2128 -#, fuzzy -msgid "tutorial-interpolate.svg" -msgstr "tutorial-interpolate.svg" +#: ../src/ui/tool/transform-handle-set.cpp:447 +msgctxt "Transform handle tip" +msgid "" +"<b>Rotation handle</b>: drag to rotate the selection around the rotation " +"center" +msgstr "" +"<b>Рычаг вращения</b>: перетаскивание вращает выделение относительно центра " +"вращения" -#. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2132 -msgid "tutorial-elements.svg" -msgstr "tutorial-elements.ru.svg" +#. event +#: ../src/ui/tool/transform-handle-set.cpp:452 +#, c-format +msgctxt "Transform handle tip" +msgid "Rotate by %.2f°" +msgstr "Вращение на %.2f°" -#. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2136 -msgid "tutorial-tips.svg" -msgstr "tutorial-tips.ru.svg" +#: ../src/ui/tool/transform-handle-set.cpp:578 +#, c-format +msgctxt "Transform handle tip" +msgid "" +"<b>Shift+Ctrl</b>: skew about the rotation center with snapping to %f° " +"increments" +msgstr "<b>Shift+Ctrl</b>: наклон относительно центра вращения шагами по %f°" -#: ../src/verbs.cpp:2322 ../src/verbs.cpp:2913 -msgid "Unlock all objects in the current layer" -msgstr "Разблокировка всех объектов в текущем слое" +#: ../src/ui/tool/transform-handle-set.cpp:581 +msgctxt "Transform handle tip" +msgid "<b>Shift</b>: skew about the rotation center" +msgstr "<b>Shift</b>: наклон относительно центра вращения" -#: ../src/verbs.cpp:2326 ../src/verbs.cpp:2915 -msgid "Unlock all objects in all layers" -msgstr "Разблокировка всех объектов во всех слоях" +#: ../src/ui/tool/transform-handle-set.cpp:585 +#, c-format +msgctxt "Transform handle tip" +msgid "<b>Ctrl</b>: snap skew angle to %f° increments" +msgstr "<b>Ctrl</b>: наклон шагами по %f°" -#: ../src/verbs.cpp:2330 ../src/verbs.cpp:2917 -msgid "Unhide all objects in the current layer" -msgstr "Раскрыть все объекты в текущем слое" +#: ../src/ui/tool/transform-handle-set.cpp:588 +msgctxt "Transform handle tip" +msgid "" +"<b>Skew handle</b>: drag to skew (shear) selection about the opposite handle" +msgstr "" +"<b>Рычаг наклона</b>: перетаскивание наклоняет выделение относительно " +"противоположного рычага" -#: ../src/verbs.cpp:2334 ../src/verbs.cpp:2919 -msgid "Unhide all objects in all layers" -msgstr "Раскрыть все объекты во всех слоях" +#: ../src/ui/tool/transform-handle-set.cpp:594 +#, c-format +msgctxt "Transform handle tip" +msgid "Skew horizontally by %.2f°" +msgstr "Наклонить по горизонтали на %.2f°" -#: ../src/verbs.cpp:2349 -msgid "Does nothing" -msgstr "Нет действий" +#: ../src/ui/tool/transform-handle-set.cpp:597 +#, c-format +msgctxt "Transform handle tip" +msgid "Skew vertically by %.2f°" +msgstr "Наклонить по вертикали на %.2f°" -#: ../src/verbs.cpp:2352 -msgid "Create new document from the default template" -msgstr "Создать новый документ из стандартного шаблона" +#: ../src/ui/tool/transform-handle-set.cpp:656 +msgctxt "Transform handle tip" +msgid "<b>Rotation center</b>: drag to change the origin of transforms" +msgstr "" +"<b>Центр вращения</b>: переместите для смены исходной точки трансформаций" -#: ../src/verbs.cpp:2354 -msgid "_Open..." -msgstr "_Открыть..." +#: ../src/ui/tools/arc-tool.cpp:252 +msgid "" +"<b>Ctrl</b>: make circle or integer-ratio ellipse, snap arc/segment angle" +msgstr "" +"<b>Ctrl</b>: создать круг или эллипс с целым отношением сторон, ограничить " +"угол дуги/сегмента" -#: ../src/verbs.cpp:2355 -msgid "Open an existing document" -msgstr "Открыть существующий документ" +#: ../src/ui/tools/arc-tool.cpp:253 ../src/ui/tools/rect-tool.cpp:289 +msgid "<b>Shift</b>: draw around the starting point" +msgstr "<b>Shift</b>: рисовать вокруг начальной точки" -#: ../src/verbs.cpp:2356 -msgid "Re_vert" -msgstr "_Восстановить" +#: ../src/ui/tools/arc-tool.cpp:422 +#, c-format +msgid "" +"<b>Ellipse</b>: %s × %s (constrained to ratio %d:%d); with <b>Shift</b> " +"to draw around the starting point" +msgstr "" +"<b>Эллипс</b>: %s × %s; (с соотношением сторон %d:%d); с <b>Shift</b> " +"рисует вокруг начальной точки" -#: ../src/verbs.cpp:2357 -msgid "Revert to the last saved version of document (changes will be lost)" +#: ../src/ui/tools/arc-tool.cpp:424 +#, c-format +msgid "" +"<b>Ellipse</b>: %s × %s; with <b>Ctrl</b> to make square or integer-" +"ratio ellipse; with <b>Shift</b> to draw around the starting point" msgstr "" -"Вернуться к последней сохраненной версии документа (изменения будут потеряны)" +"<b>Эллипс</b>: %s × %s; с <b>Ctrl</b> рисует круг или эллипс с целым " +"отношением сторон; с <b>Shift</b> рисует вокруг начальной точки" -#: ../src/verbs.cpp:2358 -msgid "Save document" -msgstr "Сохранить документ" +#: ../src/ui/tools/arc-tool.cpp:447 +msgid "Create ellipse" +msgstr "Создание эллипса" -#: ../src/verbs.cpp:2360 -msgid "Save _As..." -msgstr "Сохранить _как..." +#: ../src/ui/tools/box3d-tool.cpp:370 ../src/ui/tools/box3d-tool.cpp:377 +#: ../src/ui/tools/box3d-tool.cpp:384 ../src/ui/tools/box3d-tool.cpp:391 +#: ../src/ui/tools/box3d-tool.cpp:398 ../src/ui/tools/box3d-tool.cpp:405 +msgid "Change perspective (angle of PLs)" +msgstr "Менять перспективу (угол параллельных линий)" -#: ../src/verbs.cpp:2361 -msgid "Save document under a new name" -msgstr "Сохранить документ под другим именем" +#. status text +#: ../src/ui/tools/box3d-tool.cpp:583 +msgid "<b>3D Box</b>; with <b>Shift</b> to extrude along the Z axis" +msgstr "<b>Параллелепипед</b>; с <b>Shift</b> — для выдавливания вдоль оси Z" -#: ../src/verbs.cpp:2362 -msgid "Save a Cop_y..." -msgstr "Сохр_анить копию..." +#: ../src/ui/tools/box3d-tool.cpp:609 +msgid "Create 3D box" +msgstr "Создание паралеллепипеда" -#: ../src/verbs.cpp:2363 -msgid "Save a copy of the document under a new name" -msgstr "Сохранить копию документа под другим именем" +#: ../src/ui/tools/calligraphic-tool.cpp:536 +msgid "" +"<b>Guide path selected</b>; start drawing along the guide with <b>Ctrl</b>" +msgstr "" +"<b>Выбран направляющий контур</b>; начните рисовать вдоль него с нажатой " +"клавишой <b>Ctrl</b>" -#: ../src/verbs.cpp:2364 -msgid "_Print..." -msgstr "На_печатать..." +#: ../src/ui/tools/calligraphic-tool.cpp:538 +msgid "<b>Select a guide path</b> to track with <b>Ctrl</b>" +msgstr "<b>Выберите направляющий контур</b> с нажатой клавишой <b>Ctrl</b>" -#: ../src/verbs.cpp:2364 -msgid "Print document" -msgstr "Напечатать документ" +#: ../src/ui/tools/calligraphic-tool.cpp:673 +msgid "Tracking: <b>connection to guide path lost!</b>" +msgstr "Отслеживание: <b>соединение с направляющим контуром потеряно!</b>" -#. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2367 -msgid "Clean _up document" -msgstr "Под_чистить документ" +#: ../src/ui/tools/calligraphic-tool.cpp:673 +msgid "<b>Tracking</b> a guide path" +msgstr "<b>Отслеживание</b> направляющего контура" -#: ../src/verbs.cpp:2367 -msgid "" -"Remove unused definitions (such as gradients or clipping paths) from the <" -"defs> of the document" -msgstr "" -"Убрать ненужное (например, градиенты или обтравочные контуры) из <" -"defs> документа" +#: ../src/ui/tools/calligraphic-tool.cpp:676 +msgid "<b>Drawing</b> a calligraphic stroke" +msgstr "<b>Рисование</b> каллиграфическим пером" -#: ../src/verbs.cpp:2369 -msgid "_Import..." -msgstr "_Импортировать..." +#: ../src/ui/tools/calligraphic-tool.cpp:977 +msgid "Draw calligraphic stroke" +msgstr "Рисование каллиграфическим пером" -#: ../src/verbs.cpp:2370 -msgid "Import a bitmap or SVG image into this document" -msgstr "Импортировать растровое или SVG-изображение в документ" +#: ../src/ui/tools/connector-tool.cpp:499 +msgid "Creating new connector" +msgstr "Создается новая соединительная линия" -#. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), -#: ../src/verbs.cpp:2372 -msgid "Import Clip Art..." -msgstr "_Импортировать из Open Clip Art Library..." +#: ../src/ui/tools/connector-tool.cpp:740 +msgid "Connector endpoint drag cancelled." +msgstr "Перемещение конечных точек соединительной линии отменено." -# -#: ../src/verbs.cpp:2373 -msgid "Import clipart from Open Clip Art Library" -msgstr "Импортировать рисунки из Open Clip Art Library" +#: ../src/ui/tools/connector-tool.cpp:783 +msgid "Reroute connector" +msgstr "Объекты пересоединены" -#. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), -#: ../src/verbs.cpp:2375 -msgid "N_ext Window" -msgstr "Сл_едующее окно" +#: ../src/ui/tools/connector-tool.cpp:936 +msgid "Create connector" +msgstr "Создание соединительной линии" -#: ../src/verbs.cpp:2376 -msgid "Switch to the next document window" -msgstr "Переключиться в следующее окно документа" +#: ../src/ui/tools/connector-tool.cpp:953 +msgid "Finishing connector" +msgstr "Соединительная линия закрывается" -#: ../src/verbs.cpp:2377 -msgid "P_revious Window" -msgstr "_Предыдущее окно" +#: ../src/ui/tools/connector-tool.cpp:1191 +msgid "<b>Connector endpoint</b>: drag to reroute or connect to new shapes" +msgstr "" +"<b>Конечная соединительная точка</b>: перетащите для пересоединения или " +"соединения с новыми фигурами" -#: ../src/verbs.cpp:2378 -msgid "Switch to the previous document window" -msgstr "Переключиться в предыдущее окно документа" +#: ../src/ui/tools/connector-tool.cpp:1336 +msgid "Select <b>at least one non-connector object</b>." +msgstr "Выделите <b>как минимум один объект (не соединительную линию)</b>." -#: ../src/verbs.cpp:2379 -msgid "_Close" -msgstr "_Закрыть" +#: ../src/ui/tools/connector-tool.cpp:1341 +#: ../src/widgets/connector-toolbar.cpp:314 +msgid "Make connectors avoid selected objects" +msgstr "Линии обходят выделенные объекты" -#: ../src/verbs.cpp:2380 -msgid "Close this document window" -msgstr "Закрыть это окно документа" +#: ../src/ui/tools/connector-tool.cpp:1342 +#: ../src/widgets/connector-toolbar.cpp:324 +msgid "Make connectors ignore selected objects" +msgstr "Линии игнорируют выделенные объекты" -#: ../src/verbs.cpp:2381 -msgid "_Quit" -msgstr "В_ыход" +#. alpha of color under cursor, to show in the statusbar +#. locale-sensitive printf is OK, since this goes to the UI, not into SVG +#: ../src/ui/tools/dropper-tool.cpp:281 +#, c-format +msgid " alpha %.3g" +msgstr " альфа %.3g" -#: ../src/verbs.cpp:2381 -msgid "Quit Inkscape" -msgstr "Завершить работу с Inkscape" +#. where the color is picked, to show in the statusbar +#: ../src/ui/tools/dropper-tool.cpp:283 +#, c-format +msgid ", averaged with radius %d" +msgstr ", усредненный с радиусом %d" -#: ../src/verbs.cpp:2382 -#, fuzzy -msgid "_Templates..." -msgstr "Образцы _цветов..." +#: ../src/ui/tools/dropper-tool.cpp:283 +msgid " under cursor" +msgstr " под курсором" -#: ../src/verbs.cpp:2383 -#, fuzzy -msgid "Create new project from template" -msgstr "Создать новый документ из стандартного шаблона" +#. message, to show in the statusbar +#: ../src/ui/tools/dropper-tool.cpp:285 +msgid "<b>Release mouse</b> to set color." +msgstr "<b>Отпустите кнопку мыши</b> для установки цвета." -#: ../src/verbs.cpp:2386 -msgid "Undo last action" -msgstr "Отменить последнее действие" +#: ../src/ui/tools/dropper-tool.cpp:333 +msgid "Set picked color" +msgstr "Использование снятого пипеткой цвета" -#: ../src/verbs.cpp:2389 -msgid "Do again the last undone action" -msgstr "Повторить последнее отменённое действие" +#: ../src/ui/tools/eraser-tool.cpp:437 +msgid "<b>Drawing</b> an eraser stroke" +msgstr "<b>Рисуется</b> стирающий штрих ластика" -#: ../src/verbs.cpp:2390 -msgid "Cu_t" -msgstr "_Вырезать" +#: ../src/ui/tools/eraser-tool.cpp:770 +msgid "Draw eraser stroke" +msgstr "Стирание ластиком" -#: ../src/verbs.cpp:2391 -msgid "Cut selection to clipboard" -msgstr "Вырезать выделение в буфер обмена" +#: ../src/ui/tools/flood-tool.cpp:192 +msgid "Visible Colors" +msgstr "Видимые цвета" -#: ../src/verbs.cpp:2392 -msgid "_Copy" -msgstr "С_копировать" +#: ../src/ui/tools/flood-tool.cpp:210 +msgctxt "Flood autogap" +msgid "None" +msgstr "Нет" -#: ../src/verbs.cpp:2393 -msgid "Copy selection to clipboard" -msgstr "Скопировать выделение в буфер обмена" +#: ../src/ui/tools/flood-tool.cpp:211 +msgctxt "Flood autogap" +msgid "Small" +msgstr "Маленькие" -#: ../src/verbs.cpp:2394 -msgid "_Paste" -msgstr "Вст_авить" +#: ../src/ui/tools/flood-tool.cpp:212 +msgctxt "Flood autogap" +msgid "Medium" +msgstr "Средние" -#: ../src/verbs.cpp:2395 -msgid "Paste objects from clipboard to mouse point, or paste text" -msgstr "Вставить объект из буфера обмена под курсор, либо вставить текст" +#: ../src/ui/tools/flood-tool.cpp:213 +msgctxt "Flood autogap" +msgid "Large" +msgstr "Большие" -#: ../src/verbs.cpp:2396 -msgid "Paste _Style" -msgstr "Вставить _стиль" +#: ../src/ui/tools/flood-tool.cpp:435 +msgid "<b>Too much inset</b>, the result is empty." +msgstr "<b>Слишком сильная втяжка</b>, в результате ничего не осталось." -#: ../src/verbs.cpp:2397 -msgid "Apply the style of the copied object to selection" -msgstr "Применить стиль скопированного объекта к выделению" +#: ../src/ui/tools/flood-tool.cpp:476 +#, c-format +msgid "" +"Area filled, path with <b>%d</b> node created and unioned with selection." +msgid_plural "" +"Area filled, path with <b>%d</b> nodes created and unioned with selection." +msgstr[0] "" +"Область залита, контур с <b>%d</b> узлом создан и объединен с выделением." +msgstr[1] "" +"Область залита, контур с <b>%d</b> узлами создан и объединен с выделением." +msgstr[2] "" +"Область залита, контур с <b>%d</b> узлами создан и объединен с выделением." -#: ../src/verbs.cpp:2399 -msgid "Scale selection to match the size of the copied object" -msgstr "Отмасштабировать выделение до размеров скопированного объекта" +#: ../src/ui/tools/flood-tool.cpp:482 +#, c-format +msgid "Area filled, path with <b>%d</b> node created." +msgid_plural "Area filled, path with <b>%d</b> nodes created." +msgstr[0] "Область залита, создан контур с <b>%d</b> узлом." +msgstr[1] "Область залита, создан контур с <b>%d</b> узлами." +msgstr[2] "Область залита, создан контур с <b>%d</b> узлами." -#: ../src/verbs.cpp:2400 -msgid "Paste _Width" -msgstr "Вставить _ширину" +#: ../src/ui/tools/flood-tool.cpp:750 ../src/ui/tools/flood-tool.cpp:1060 +msgid "<b>Area is not bounded</b>, cannot fill." +msgstr "<b>Область не замкнута</b>, заливка невозможна" -#: ../src/verbs.cpp:2401 -msgid "Scale selection horizontally to match the width of the copied object" +#: ../src/ui/tools/flood-tool.cpp:1065 +msgid "" +"<b>Only the visible part of the bounded area was filled.</b> If you want to " +"fill all of the area, undo, zoom out, and fill again." msgstr "" -"Отмасштабировать выделение по горизонтали до высоты скопированного объекта" +"<b>Только видимая часть замнутой области была заполнена.</b> Если вы хотите " +"залить цветом всю область, отмените предыдущее действие, уменьшите масштаб " +"отображения и попробуйте снова." -#: ../src/verbs.cpp:2402 -msgid "Paste _Height" -msgstr "Вставить _высоту" +#: ../src/ui/tools/flood-tool.cpp:1083 ../src/ui/tools/flood-tool.cpp:1234 +msgid "Fill bounded area" +msgstr "Заливка замкнутой области" -#: ../src/verbs.cpp:2403 -msgid "Scale selection vertically to match the height of the copied object" +#: ../src/ui/tools/flood-tool.cpp:1099 +msgid "Set style on object" +msgstr "Установка стиля объекта" + +#: ../src/ui/tools/flood-tool.cpp:1159 +msgid "<b>Draw over</b> areas to add to fill, hold <b>Alt</b> for touch fill" msgstr "" -"Отмасштабировать выделение по вертикали до высоты скопированного объекта" +"<b>Проведите курсором мыши</b> по областям, добавляемым в заливку, нажмите " +"<b>Alt</b> для переключения на касательную заливку" -#: ../src/verbs.cpp:2404 -msgid "Paste Size Separately" -msgstr "Вставить размер раздельно" +#. We hit green anchor, closing Green-Blue-Red +#: ../src/ui/tools/freehand-base.cpp:517 +msgid "Path is closed." +msgstr "Контур закрыт." -#: ../src/verbs.cpp:2405 -msgid "Scale each selected object to match the size of the copied object" -msgstr "" -"Отмасштабировать каждый выбранный объект до совпадения с размерами " -"скопированного объекта" +#. We hit bot start and end of single curve, closing paths +#: ../src/ui/tools/freehand-base.cpp:532 +msgid "Closing path." +msgstr "Закрываем контур" -#: ../src/verbs.cpp:2406 -msgid "Paste Width Separately" -msgstr "Вставить ширину раздельно" +#: ../src/ui/tools/freehand-base.cpp:634 +msgid "Draw path" +msgstr "Создание контура" -#: ../src/verbs.cpp:2407 -msgid "" -"Scale each selected object horizontally to match the width of the copied " -"object" -msgstr "" -"Отмасштабировать каждый выбранный объект по горизонтали до ширины " -"скопированного объекта" +#: ../src/ui/tools/freehand-base.cpp:791 +msgid "Creating single dot" +msgstr "Рисуется точка" -#: ../src/verbs.cpp:2408 -msgid "Paste Height Separately" -msgstr "Вставить высоту раздельно" +#: ../src/ui/tools/freehand-base.cpp:792 +msgid "Create single dot" +msgstr "Рисование точки" -#: ../src/verbs.cpp:2409 -msgid "" -"Scale each selected object vertically to match the height of the copied " -"object" -msgstr "" -"Отмасштабировать каждый выбранный объект по вертикали до высоты " -"скопированного объекта" +#. TRANSLATORS: %s will be substituted with the point name (see previous messages); This is part of a compound message +#: ../src/ui/tools/gradient-tool.cpp:131 ../src/ui/tools/mesh-tool.cpp:130 +#, c-format +msgid "%s selected" +msgstr "%s выбран(а)" -#: ../src/verbs.cpp:2410 -msgid "Paste _In Place" -msgstr "Вставить на _место" +#. TRANSLATORS: Mind the space in front. This is part of a compound message +#: ../src/ui/tools/gradient-tool.cpp:133 ../src/ui/tools/gradient-tool.cpp:142 +#, c-format +msgid " out of %d gradient handle" +msgid_plural " out of %d gradient handles" +msgstr[0] " из %d опорной точки градиента" +msgstr[1] " из %d опорных точек градиента" +msgstr[2] " из %d опорных точек градиента" -#: ../src/verbs.cpp:2411 -msgid "Paste objects from clipboard to the original location" -msgstr "Вставить объекты из буфера обмена в их исходное местоположение" +#. TRANSLATORS: Mind the space in front. (Refers to gradient handles selected). This is part of a compound message +#: ../src/ui/tools/gradient-tool.cpp:134 ../src/ui/tools/gradient-tool.cpp:143 +#: ../src/ui/tools/gradient-tool.cpp:150 ../src/ui/tools/mesh-tool.cpp:133 +#: ../src/ui/tools/mesh-tool.cpp:144 ../src/ui/tools/mesh-tool.cpp:152 +#, c-format +msgid " on %d selected object" +msgid_plural " on %d selected objects" +msgstr[0] " в %d выбранном объекте" +msgstr[1] " в %d выбранных объектах" +msgstr[2] " в %d выбранных объектах" -#: ../src/verbs.cpp:2412 -msgid "Paste Path _Effect" -msgstr "_Вставить контурный эффект" +#. TRANSLATORS: This is a part of a compound message (out of two more indicating: grandint handle count & object count) +#: ../src/ui/tools/gradient-tool.cpp:140 ../src/ui/tools/mesh-tool.cpp:140 +#, c-format +msgid "" +"One handle merging %d stop (drag with <b>Shift</b> to separate) selected" +msgid_plural "" +"One handle merging %d stops (drag with <b>Shift</b> to separate) selected" +msgstr[0] "" +"Выделен один рычаг, объединяющий %d опорную точку (перетаскивание с " +"<b>Shift</b> разделит их)" +msgstr[1] "" +"Выделен один рычаг, объединяющий %d опорные точки (перетаскивание с " +"<b>Shift</b> разделит их)" +msgstr[2] "" +"Выделен один рычаг, объединяющий %d опорных точек (перетаскивание с " +"<b>Shift</b> разделит их)" -#: ../src/verbs.cpp:2413 -msgid "Apply the path effect of the copied object to selection" -msgstr "Применить контурный эффект скопированного объекта к выделению" +#. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count) +#: ../src/ui/tools/gradient-tool.cpp:148 +#, c-format +msgid "<b>%d</b> gradient handle selected out of %d" +msgid_plural "<b>%d</b> gradient handles selected out of %d" +msgstr[0] "<b>%d</b> опорная точка градиента выбрана из %d" +msgstr[1] "<b>%d</b> опорных точки градиента выбрано из %d" +msgstr[2] "<b>%d</b> опорных точек градиента выбрано из %d" -#: ../src/verbs.cpp:2414 -msgid "Remove Path _Effect" -msgstr "_Удалить контурный эффект" +#. TRANSLATORS: The plural refers to number of selected objects +#: ../src/ui/tools/gradient-tool.cpp:155 +#, c-format +msgid "<b>No</b> gradient handles selected out of %d on %d selected object" +msgid_plural "" +"<b>No</b> gradient handles selected out of %d on %d selected objects" +msgstr[0] "" +"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранном " +"объекте" +msgstr[1] "" +"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранных " +"объектах" +msgstr[2] "" +"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранных " +"объектах" -#: ../src/verbs.cpp:2415 -msgid "Remove any path effects from selected objects" -msgstr "Убрать все контурные эффекты из выделения" +#: ../src/ui/tools/gradient-tool.cpp:440 +msgid "Simplify gradient" +msgstr "Упростить градиент" -#: ../src/verbs.cpp:2416 -msgid "_Remove Filters" -msgstr "С_нять фильтры" +#: ../src/ui/tools/gradient-tool.cpp:516 +msgid "Create default gradient" +msgstr "Создание обычного градиента" -#: ../src/verbs.cpp:2417 -msgid "Remove any filters from selected objects" -msgstr "Снять все фильтры с выделения" +#: ../src/ui/tools/gradient-tool.cpp:575 ../src/ui/tools/mesh-tool.cpp:570 +msgid "<b>Draw around</b> handles to select them" +msgstr "<b>Обведите курсором мыши</b> рычаги, чтобы выделить их" -#: ../src/verbs.cpp:2418 -msgid "_Delete" -msgstr "У_далить" +#: ../src/ui/tools/gradient-tool.cpp:698 +msgid "<b>Ctrl</b>: snap gradient angle" +msgstr "<b>Ctrl</b>: ограничить угол" -#: ../src/verbs.cpp:2419 -msgid "Delete selection" -msgstr "Удалить выделение" +#: ../src/ui/tools/gradient-tool.cpp:699 +msgid "<b>Shift</b>: draw gradient around the starting point" +msgstr "<b>Shift</b>: рисовать градиент вокруг начальной точки" -#: ../src/verbs.cpp:2420 -msgid "Duplic_ate" -msgstr "Проду_блировать" +#: ../src/ui/tools/gradient-tool.cpp:953 ../src/ui/tools/mesh-tool.cpp:993 +#, c-format +msgid "<b>Gradient</b> for %d object; with <b>Ctrl</b> to snap angle" +msgid_plural "<b>Gradient</b> for %d objects; with <b>Ctrl</b> to snap angle" +msgstr[0] "<b>Градиент</b> для %d объекта; <b>Ctrl</b> ограничивает угол" +msgstr[1] "<b>Градиент</b> для %d объектов; <b>Ctrl</b> ограничивает угол" +msgstr[2] "<b>Градиент</b> для %d объектов; <b>Ctrl</b> ограничивает угол" -#: ../src/verbs.cpp:2421 -msgid "Duplicate selected objects" -msgstr "Продублировать выделенные объекты" +#: ../src/ui/tools/gradient-tool.cpp:957 ../src/ui/tools/mesh-tool.cpp:997 +msgid "Select <b>objects</b> on which to create gradient." +msgstr "Выделите <b>объекты</b>, к которым будет применен градиент." -#: ../src/verbs.cpp:2422 -msgid "Create Clo_ne" -msgstr "Создать _клон" +#: ../src/ui/tools/lpe-tool.cpp:207 +#, fuzzy +msgid "Choose a construction tool from the toolbar." +msgstr "Выберите режим инструмента из его контекстной панели" + +#. TRANSLATORS: Mind the space in front. This is part of a compound message +#: ../src/ui/tools/mesh-tool.cpp:132 ../src/ui/tools/mesh-tool.cpp:143 +#, fuzzy, c-format +msgid " out of %d mesh handle" +msgid_plural " out of %d mesh handles" +msgstr[0] " из %d опорной точки градиента" +msgstr[1] " из %d опорных точек градиента" +msgstr[2] " из %d опорных точек градиента" -#: ../src/verbs.cpp:2423 -msgid "Create a clone (a copy linked to the original) of selected object" -msgstr "Создать клон выделенного объекта (копию, связанную с оригиналом)" +#: ../src/ui/tools/mesh-tool.cpp:150 +#, fuzzy, c-format +msgid "<b>%d</b> mesh handle selected out of %d" +msgid_plural "<b>%d</b> mesh handles selected out of %d" +msgstr[0] "<b>%d</b> опорная точка градиента выбрана из %d" +msgstr[1] "<b>%d</b> опорных точки градиента выбрано из %d" +msgstr[2] "<b>%d</b> опорных точек градиента выбрано из %d" -#: ../src/verbs.cpp:2424 -msgid "Unlin_k Clone" -msgstr "О_тсоединить клон" +#. TRANSLATORS: The plural refers to number of selected objects +#: ../src/ui/tools/mesh-tool.cpp:157 +#, fuzzy, c-format +msgid "<b>No</b> mesh handles selected out of %d on %d selected object" +msgid_plural "<b>No</b> mesh handles selected out of %d on %d selected objects" +msgstr[0] "" +"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранном " +"объекте" +msgstr[1] "" +"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранных " +"объектах" +msgstr[2] "" +"<b>Ни одной</b> опорной точки градиента из %d не выбрано в %d выбранных " +"объектах" -#: ../src/verbs.cpp:2425 -msgid "" -"Cut the selected clones' links to the originals, turning them into " -"standalone objects" +#: ../src/ui/tools/mesh-tool.cpp:321 +msgid "Split mesh row/column" msgstr "" -"Убрать ссылки клонов на их оригиналы, превратив клоны в самостоятельные " -"объекты" - -#: ../src/verbs.cpp:2426 -msgid "Relink to Copied" -msgstr "Связать с объектом в буфере обмена" -#: ../src/verbs.cpp:2427 -msgid "Relink the selected clones to the object currently on the clipboard" -msgstr "Заново связать выбранные клоны с объектом в буфере обмена" +#: ../src/ui/tools/mesh-tool.cpp:407 +msgid "Toggled mesh path type." +msgstr "" -#: ../src/verbs.cpp:2428 -msgid "Select _Original" -msgstr "Выделить _оригинал" +#: ../src/ui/tools/mesh-tool.cpp:411 +msgid "Approximated arc for mesh side." +msgstr "" -#: ../src/verbs.cpp:2429 -msgid "Select the object to which the selected clone is linked" -msgstr "Выделить объект, с которым связан клон" +#: ../src/ui/tools/mesh-tool.cpp:415 +msgid "Toggled mesh tensors." +msgstr "" -#: ../src/verbs.cpp:2430 +#: ../src/ui/tools/mesh-tool.cpp:419 #, fuzzy -msgid "Clone original path (LPE)" -msgstr "Заменить текст" +msgid "Smoothed mesh corner color." +msgstr "Сгладить _углы" -#: ../src/verbs.cpp:2431 -msgid "" -"Creates a new path, applies the Clone original LPE, and refers it to the " -"selected path" -msgstr "" +#: ../src/ui/tools/mesh-tool.cpp:423 +#, fuzzy +msgid "Picked mesh corner color." +msgstr "Взять цветовой тон" -#: ../src/verbs.cpp:2432 -msgid "Objects to _Marker" -msgstr "Объекты в м_аркер" +#: ../src/ui/tools/mesh-tool.cpp:498 +#, fuzzy +msgid "Create default mesh" +msgstr "Создание обычного градиента" -#: ../src/verbs.cpp:2433 -msgid "Convert selection to a line marker" -msgstr "Превратить выделение в маркер линий" +#: ../src/ui/tools/mesh-tool.cpp:718 +#, fuzzy +msgid "FIXME<b>Ctrl</b>: snap mesh angle" +msgstr "<b>Ctrl</b>: ограничить угол" -#: ../src/verbs.cpp:2434 -msgid "Objects to Gu_ides" -msgstr "Объ_екты в направляющие" +#: ../src/ui/tools/mesh-tool.cpp:719 +#, fuzzy +msgid "FIXME<b>Shift</b>: draw mesh around the starting point" +msgstr "<b>Shift</b>: рисовать вокруг начальной точки" -#: ../src/verbs.cpp:2435 +#: ../src/ui/tools/node-tool.cpp:594 +msgctxt "Node tool tip" msgid "" -"Convert selected objects to a collection of guidelines aligned with their " -"edges" -msgstr "Превратить выбранные объекты в набор направляющих по краям объектов" - -#: ../src/verbs.cpp:2436 -msgid "Objects to Patter_n" -msgstr "_Объект(ы) в текстуру" +"<b>Shift</b>: drag to add nodes to the selection, click to toggle object " +"selection" +msgstr "" +"<b>Shift</b>: перетаскивание добавляет узлы в выделение, щелчок переключает " +"выделение" -#: ../src/verbs.cpp:2437 -msgid "Convert selection to a rectangle with tiled pattern fill" -msgstr "Преобразовать выделение в прямоугольник, заполненный текстурой" +#: ../src/ui/tools/node-tool.cpp:598 +msgctxt "Node tool tip" +msgid "<b>Shift</b>: drag to add nodes to the selection" +msgstr "<b>Shift</b>: перетаскивание добавляет узлы в выделение" -#: ../src/verbs.cpp:2438 -msgid "Pattern to _Objects" -msgstr "_Текстуру в объект(ы)" +#: ../src/ui/tools/node-tool.cpp:610 +#, fuzzy, c-format +msgid "<b>%u of %u</b> node selected." +msgid_plural "<b>%u of %u</b> nodes selected." +msgstr[0] "<b>%i</b> из <b>%i</b> узла выделен. %s." +msgstr[1] "<b>%i</b> из <b>%i</b> узлов выделено. %s." +msgstr[2] "<b>%i</b> из <b>%i</b> узлов выделено. %s." -#: ../src/verbs.cpp:2439 -msgid "Extract objects from a tiled pattern fill" -msgstr "Извлечь объекты из текстурной заливки" +#: ../src/ui/tools/node-tool.cpp:616 +#, fuzzy, c-format +msgctxt "Node tool tip" +msgid "%s Drag to select nodes, click to edit only this object (more: Shift)" +msgstr "" +"Перетаскивание выделяет узлы, щелчок включает изменение только этого объекта" -#: ../src/verbs.cpp:2440 -msgid "Group to Symbol" -msgstr "Группа в символ" +#: ../src/ui/tools/node-tool.cpp:622 +#, fuzzy, c-format +msgctxt "Node tool tip" +msgid "%s Drag to select nodes, click clear the selection" +msgstr "Перетаскивание выделяет узлы, щелчок снимает выделение" -#: ../src/verbs.cpp:2441 -#, fuzzy -msgid "Convert group to a symbol" -msgstr "Оконтуривание обводки" +#: ../src/ui/tools/node-tool.cpp:631 +msgctxt "Node tool tip" +msgid "Drag to select nodes, click to edit only this object" +msgstr "" +"Перетаскивание выделяет узлы, щелчок включает изменение только этого объекта" -#: ../src/verbs.cpp:2442 -msgid "Symbol to Group" -msgstr "Символ в группу" +#: ../src/ui/tools/node-tool.cpp:634 +msgctxt "Node tool tip" +msgid "Drag to select nodes, click to clear the selection" +msgstr "Перетаскивание выделяет узлы, щелчок снимает выделение" -#: ../src/verbs.cpp:2443 -msgid "Extract group from a symbol" +#: ../src/ui/tools/node-tool.cpp:639 +msgctxt "Node tool tip" +msgid "Drag to select objects to edit, click to edit this object (more: Shift)" msgstr "" +"Перетаскивание выделяет объекты для изменения, щелчок включает изменение " +"объекта (попробуйте Shift)" -#: ../src/verbs.cpp:2444 -msgid "Clea_r All" -msgstr "О_чистить все" - -#: ../src/verbs.cpp:2445 -msgid "Delete all objects from document" -msgstr "Удалить все объекты из документа" +#: ../src/ui/tools/node-tool.cpp:642 +msgctxt "Node tool tip" +msgid "Drag to select objects to edit" +msgstr "Перетаскивание выделяет объекты для изменения" -#: ../src/verbs.cpp:2446 -msgid "Select Al_l" -msgstr "Выделить _все" +#: ../src/ui/tools/pen-tool.cpp:186 ../src/ui/tools/pencil-tool.cpp:465 +msgid "Drawing cancelled" +msgstr "Отмена рисования" -#: ../src/verbs.cpp:2447 -msgid "Select all objects or all nodes" -msgstr "Выделить все объекты или все узлы" +#: ../src/ui/tools/pen-tool.cpp:407 ../src/ui/tools/pencil-tool.cpp:203 +msgid "Continuing selected path" +msgstr "Продолжение выделенного контура" -#: ../src/verbs.cpp:2448 -msgid "Select All in All La_yers" -msgstr "Выделить все во всех сло_ях" +#: ../src/ui/tools/pen-tool.cpp:417 ../src/ui/tools/pencil-tool.cpp:211 +msgid "Creating new path" +msgstr "Создание нового контура" -#: ../src/verbs.cpp:2449 -msgid "Select all objects in all visible and unlocked layers" -msgstr "Выделить все объекты во всех видимых и незаблокированных слоях" +#: ../src/ui/tools/pen-tool.cpp:419 ../src/ui/tools/pencil-tool.cpp:214 +msgid "Appending to selected path" +msgstr "Добавление к выделенному контуру" -#: ../src/verbs.cpp:2450 -#, fuzzy -msgid "Fill _and Stroke" -msgstr "_Заливка и обводка" +#: ../src/ui/tools/pen-tool.cpp:576 +msgid "<b>Click</b> or <b>click and drag</b> to close and finish the path." +msgstr "" +"<b>Щелчок</b> или <b>щелчок + перетаскивание</b> закрывают этот контур." -#: ../src/verbs.cpp:2451 -#, fuzzy +#: ../src/ui/tools/pen-tool.cpp:586 msgid "" -"Select all objects with the same fill and stroke as the selected objects" +"<b>Click</b> or <b>click and drag</b> to continue the path from this point." msgstr "" -"Выделите <b>объект с текстурной заливкой</b> для извлечения из него объектов." - -#: ../src/verbs.cpp:2452 -#, fuzzy -msgid "_Fill Color" -msgstr "Цвет заливки" +"<b>Щелчок</b> или <b>щелчок + перетаскивание</b> продолжает контур из этой " +"точки." -#: ../src/verbs.cpp:2453 -#, fuzzy -msgid "Select all objects with the same fill as the selected objects" +#: ../src/ui/tools/pen-tool.cpp:1211 +#, c-format +msgid "" +"<b>Curve segment</b>: angle %3.2f°, distance %s; with <b>Ctrl</b> to " +"snap angle, <b>Enter</b> to finish the path" msgstr "" -"Выделите <b>объект с текстурной заливкой</b> для извлечения из него объектов." - -#: ../src/verbs.cpp:2454 -#, fuzzy -msgid "_Stroke Color" -msgstr "Цвет обводки" +"<b>Сегмент кривой</b>: угол %3.2f°, расстояние %s; <b>Ctrl</b> " +"ограничивает угол, <b>Enter</b> завершает контур" -#: ../src/verbs.cpp:2455 -#, fuzzy -msgid "Select all objects with the same stroke as the selected objects" +#: ../src/ui/tools/pen-tool.cpp:1212 +#, c-format +msgid "" +"<b>Line segment</b>: angle %3.2f°, distance %s; with <b>Ctrl</b> to " +"snap angle, <b>Enter</b> to finish the path" msgstr "" -"Отмасштабировать каждый выбранный объект до совпадения с размерами " -"скопированного объекта" - -#: ../src/verbs.cpp:2456 -#, fuzzy -msgid "Stroke St_yle" -msgstr "_Стиль обводки" +"<b>Сегмент линии</b>: угол %3.2f°, расстояние %s; <b>Ctrl</b> " +"ограничивает угол, <b>Enter</b> завершает контур" -#: ../src/verbs.cpp:2457 -#, fuzzy +#: ../src/ui/tools/pen-tool.cpp:1228 +#, c-format msgid "" -"Select all objects with the same stroke style (width, dash, markers) as the " -"selected objects" +"<b>Curve handle</b>: angle %3.2f°, length %s; with <b>Ctrl</b> to snap " +"angle" msgstr "" -"Отмасштабировать каждый выбранный объект до совпадения с размерами " -"скопированного объекта" - -#: ../src/verbs.cpp:2458 -#, fuzzy -msgid "_Object Type" -msgstr "Тип объекта:" +"<b>Рычаг узла кривой</b>: угол %3.2f°, длина %s; <b>Ctrl</b> " +"ограничивает угол" -#: ../src/verbs.cpp:2459 -#, fuzzy +#: ../src/ui/tools/pen-tool.cpp:1250 +#, c-format msgid "" -"Select all objects with the same object type (rect, arc, text, path, bitmap " -"etc) as the selected objects" +"<b>Curve handle, symmetric</b>: angle %3.2f°, length %s; with <b>Ctrl</" +"b> to snap angle, with <b>Shift</b> to move this handle only" msgstr "" -"Отмасштабировать каждый выбранный объект до совпадения с размерами " -"скопированного объекта" - -#: ../src/verbs.cpp:2460 -msgid "In_vert Selection" -msgstr "Инвертировать выделение" +"<b>Рычаг узла, симметричный</b>: угол %3.2f°, длина %s; <b>Ctrl</b> " +"ограничивает угол; с <b>Shift</b> меняется только этот рычаг" -#: ../src/verbs.cpp:2461 -msgid "Invert selection (unselect what is selected and select everything else)" +#: ../src/ui/tools/pen-tool.cpp:1251 +#, c-format +msgid "" +"<b>Curve handle</b>: angle %3.2f°, length %s; with <b>Ctrl</b> to snap " +"angle, with <b>Shift</b> to move this handle only" msgstr "" -"Инвертировать выделение (выделить все кроме выделенного в настоящий момент)" - -#: ../src/verbs.cpp:2462 -msgid "Invert in All Layers" -msgstr "Инвертировать во всех слоях" - -#: ../src/verbs.cpp:2463 -msgid "Invert selection in all visible and unlocked layers" -msgstr "Инвертировать выделение во всех видимых и незаблокированных слоях" - -#: ../src/verbs.cpp:2464 -msgid "Select Next" -msgstr "Выбрать следующий" - -#: ../src/verbs.cpp:2465 -msgid "Select next object or node" -msgstr "Выбрать следующий объект или узел" +"<b>Рычаг узла</b>: угол %3.2f°, длина %s; <b>Ctrl</b> ограничивает угол; " +"<b>Shift</b> синхронно вращает противоположный рычаг" -#: ../src/verbs.cpp:2466 -msgid "Select Previous" -msgstr "Выбрать предыдущий" +#: ../src/ui/tools/pen-tool.cpp:1294 +msgid "Drawing finished" +msgstr "Рисование закончено" -#: ../src/verbs.cpp:2467 -msgid "Select previous object or node" -msgstr "Выбрать предыдущий объект или узел" +#: ../src/ui/tools/pencil-tool.cpp:315 +msgid "<b>Release</b> here to close and finish the path." +msgstr "<b>Отпустите</b> здесь для закрытия и завершения контура." -#: ../src/verbs.cpp:2468 -msgid "D_eselect" -msgstr "Сн_ять выделение" +#: ../src/ui/tools/pencil-tool.cpp:321 +msgid "Drawing a freehand path" +msgstr "Рисуется произвольный контур" -#: ../src/verbs.cpp:2469 -msgid "Deselect any selected objects or nodes" -msgstr "Снять выделение со всех объектов или узлов" +#: ../src/ui/tools/pencil-tool.cpp:326 +msgid "<b>Drag</b> to continue the path from this point." +msgstr "<b>Перетащите</b> для продолжения контура из этой точки." -#: ../src/verbs.cpp:2471 -#, fuzzy -msgid "Delete all the guides in the document" -msgstr "Удалить все объекты из документа" +#. Write curves to object +#: ../src/ui/tools/pencil-tool.cpp:411 +msgid "Finishing freehand" +msgstr "Завершается произвольный контур" -#: ../src/verbs.cpp:2472 -msgid "Create _Guides Around the Page" -msgstr "Создать на_правляющие вокруг страницы" +#: ../src/ui/tools/pencil-tool.cpp:514 +msgid "" +"<b>Sketch mode</b>: holding <b>Alt</b> interpolates between sketched paths. " +"Release <b>Alt</b> to finalize." +msgstr "" +"<b>Эскизный режим</b>: удерживайте нажатой <b>Alt</b> для интерполяции между " +"рисуемыми контурами, отпустите <b>Alt</b> для завершения." -#: ../src/verbs.cpp:2473 -msgid "Create four guides aligned with the page borders" -msgstr "Создать четыре направляющие по краям страницы" +#: ../src/ui/tools/pencil-tool.cpp:541 +msgid "Finishing freehand sketch" +msgstr "Завершается эскизный контур" -#: ../src/verbs.cpp:2474 -msgid "Next path effect parameter" -msgstr "Следующий параметр контурного эффекта" +#: ../src/ui/tools/rect-tool.cpp:288 +msgid "" +"<b>Ctrl</b>: make square or integer-ratio rect, lock a rounded corner " +"circular" +msgstr "" +"<b>Ctrl</b>: квадрат или прямоугольник с целым соотношением сторон, " +"закругленные углы" -#: ../src/verbs.cpp:2475 -msgid "Show next editable path effect parameter" -msgstr "Показать следующий параметр контурного эффекта" +#: ../src/ui/tools/rect-tool.cpp:449 +#, c-format +msgid "" +"<b>Rectangle</b>: %s × %s (constrained to ratio %d:%d); with <b>Shift</" +"b> to draw around the starting point" +msgstr "" +"<b>Прямоугольник</b>: %s × %s; (с соотношением сторон %d:%d); с " +"<b>Shift</b> рисует вокруг начальной точки" -#. Selection -#: ../src/verbs.cpp:2478 -msgid "Raise to _Top" -msgstr "Поднять на _передний план" +#: ../src/ui/tools/rect-tool.cpp:452 +#, c-format +msgid "" +"<b>Rectangle</b>: %s × %s (constrained to golden ratio 1.618 : 1); with " +"<b>Shift</b> to draw around the starting point" +msgstr "" +"<b>Прямоугольник</b>: %s × %s; (с «золотым» соотношением сторон 1.618 : " +"1); с <b>Shift</b> рисует вокруг начальной точки" -#: ../src/verbs.cpp:2479 -msgid "Raise selection to top" -msgstr "Поднять выделение на передний план" +#: ../src/ui/tools/rect-tool.cpp:454 +#, c-format +msgid "" +"<b>Rectangle</b>: %s × %s (constrained to golden ratio 1 : 1.618); with " +"<b>Shift</b> to draw around the starting point" +msgstr "" +"<b>Прямоугольник</b>: %s × %s; (с «золотым» соотношением сторон 1 : " +"1.618); с <b>Shift</b> рисует вокруг начальной точки" -#: ../src/verbs.cpp:2480 -msgid "Lower to _Bottom" -msgstr "Опустить на _задний план" +#: ../src/ui/tools/rect-tool.cpp:458 +#, c-format +msgid "" +"<b>Rectangle</b>: %s × %s; with <b>Ctrl</b> to make square or integer-" +"ratio rectangle; with <b>Shift</b> to draw around the starting point" +msgstr "" +"<b>Прямоугольник</b>: %s x %s; с <b>Ctrl</b>: квадрат или прямоугольник с " +"целым соотношением сторон, с <b>Shift</b> рисовать вокруг начальной точки" -#: ../src/verbs.cpp:2481 -msgid "Lower selection to bottom" -msgstr "Опустить выделение на задний план" +#: ../src/ui/tools/rect-tool.cpp:481 +msgid "Create rectangle" +msgstr "Создание прямоугольника" -#: ../src/verbs.cpp:2482 -msgid "_Raise" -msgstr "П_однять" +#: ../src/ui/tools/select-tool.cpp:169 +msgid "Click selection to toggle scale/rotation handles" +msgstr "Щелчок по объекту переключает стрелки масштабирования/вращения" -#: ../src/verbs.cpp:2483 -msgid "Raise selection one step" -msgstr "Поднять выделение на один уровень" +#: ../src/ui/tools/select-tool.cpp:170 +msgid "" +"No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, " +"or drag around objects to select." +msgstr "" +"Нет выделенных объектов. Используйте щелчок, Shift+щелчок, Alt+прокрутка " +"колесом мыши, либо обведите объекты рамкой." -#: ../src/verbs.cpp:2484 -msgid "_Lower" -msgstr "Опу_стить" +#: ../src/ui/tools/select-tool.cpp:223 +msgid "Move canceled." +msgstr "Перемещение отменено." -#: ../src/verbs.cpp:2485 -msgid "Lower selection one step" -msgstr "Опустить выделение на один уровень" +#: ../src/ui/tools/select-tool.cpp:231 +msgid "Selection canceled." +msgstr "Выделение отменено." -#: ../src/verbs.cpp:2487 -msgid "Group selected objects" -msgstr "Сгруппировать выделенные объекты" +#: ../src/ui/tools/select-tool.cpp:642 +msgid "" +"<b>Draw over</b> objects to select them; release <b>Alt</b> to switch to " +"rubberband selection" +msgstr "" +"<b>Проведите курсором мыши</b> по объектам, чтобы выделить их; отпустите " +"<b>Alt</b>, чтобы переключиться на обычное выделение" -#: ../src/verbs.cpp:2489 -msgid "Ungroup selected groups" -msgstr "Разгруппировать выделенные группы" +#: ../src/ui/tools/select-tool.cpp:644 +msgid "" +"<b>Drag around</b> objects to select them; press <b>Alt</b> to switch to " +"touch selection" +msgstr "" +"<b>Проведите курсором мыши</b> вокруг объектов, чтобы выделить их; нажмите " +"<b>Alt</b> для переключения на касательное выделение" -#: ../src/verbs.cpp:2491 -msgid "_Put on Path" -msgstr "_Разместить по контуру" +#: ../src/ui/tools/select-tool.cpp:932 +msgid "<b>Ctrl</b>: click to select in groups; drag to move hor/vert" +msgstr "" +"<b>Ctrl</b>: щелчок выделяет в группе; перетаскивание двигает по горизонтали/" +"вертикали" -#: ../src/verbs.cpp:2493 -msgid "_Remove from Path" -msgstr "_Снять с контура" +#: ../src/ui/tools/select-tool.cpp:933 +msgid "<b>Shift</b>: click to toggle select; drag for rubberband selection" +msgstr "" +"<b>Shift</b>: выделить/снять выделение; перетаскивание включает выделение " +"«липкой лентой»" -#: ../src/verbs.cpp:2495 -msgid "Remove Manual _Kerns" -msgstr "Убрать ручной _кернинг" +#: ../src/ui/tools/select-tool.cpp:934 +#, fuzzy +msgid "" +"<b>Alt</b>: click to select under; scroll mouse-wheel to cycle-select; drag " +"to move selected or select by touch" +msgstr "<b>Alt</b>: выделять под выделенным; перетаскиванием двигать выделение" -#. TRANSLATORS: "glyph": An image used in the visual representation of characters; -#. roughly speaking, how a character looks. A font is a set of glyphs. -#: ../src/verbs.cpp:2498 -msgid "Remove all manual kerns and glyph rotations from a text object" -msgstr "Удалить из текста все вертикальные и горизонтальные керны и вращения" +#: ../src/ui/tools/select-tool.cpp:1142 +msgid "Selected object is not a group. Cannot enter." +msgstr "Выделенный объект не является группой. В неё нельзя войти." -#: ../src/verbs.cpp:2500 -msgid "_Union" -msgstr "С_умма" +#: ../src/ui/tools/spiral-tool.cpp:259 +msgid "<b>Ctrl</b>: snap angle" +msgstr "<b>Ctrl</b>: ограничить угол" -#: ../src/verbs.cpp:2501 -msgid "Create union of selected paths" -msgstr "Создать один контур из всех выбранных" +#: ../src/ui/tools/spiral-tool.cpp:261 +msgid "<b>Alt</b>: lock spiral radius" +msgstr "<b>Alt</b>: зафиксировать радиус спирали" -#: ../src/verbs.cpp:2502 -msgid "_Intersection" -msgstr "_Пересечение" +#: ../src/ui/tools/spiral-tool.cpp:400 +#, c-format +msgid "" +"<b>Spiral</b>: radius %s, angle %5g°; with <b>Ctrl</b> to snap angle" +msgstr "" +"<b>Спираль</b>: радиус %s, угол %5g°; <b>Ctrl</b> ограничивает угол" -#: ../src/verbs.cpp:2503 -msgid "Create intersection of selected paths" -msgstr "Создать пересечение выделенных контуров" +#: ../src/ui/tools/spiral-tool.cpp:421 +msgid "Create spiral" +msgstr "Создание спирали" -#: ../src/verbs.cpp:2504 -msgid "_Difference" -msgstr "_Разность" +#: ../src/ui/tools/spray-tool.cpp:192 ../src/ui/tools/tweak-tool.cpp:167 +#, c-format +msgid "<b>%i</b> object selected" +msgid_plural "<b>%i</b> objects selected" +msgstr[0] "<b>%i</b> объект выделен" +msgstr[1] "<b>%i</b> объекта выделено" +msgstr[2] "<b>%i</b> объектов выделено" -#: ../src/verbs.cpp:2505 -msgid "Create difference of selected paths (bottom minus top)" -msgstr "Создать разность выделенных контуров (низ минус верх)" +#: ../src/ui/tools/spray-tool.cpp:194 ../src/ui/tools/tweak-tool.cpp:169 +msgid "<b>Nothing</b> selected" +msgstr "<b>Ничего</b> не выделено" -#: ../src/verbs.cpp:2506 -msgid "E_xclusion" -msgstr "_Исключающее ИЛИ" +#: ../src/ui/tools/spray-tool.cpp:199 +#, fuzzy, c-format +msgid "" +"%s. Drag, click or click and scroll to spray <b>copies</b> of the initial " +"selection." +msgstr "" +"%s. Потащите, щёлкните или прокрутите для распыления <b>копий</b> исходного " +"выделения" -#: ../src/verbs.cpp:2507 +#: ../src/ui/tools/spray-tool.cpp:202 +#, fuzzy, c-format msgid "" -"Create exclusive OR of selected paths (those parts that belong to only one " -"path)" +"%s. Drag, click or click and scroll to spray <b>clones</b> of the initial " +"selection." msgstr "" -"Создать Исключающее ИЛИ из выбранных контуров (части, принадлежащие только " -"одному контуру)" +"%s. Потащите, щёлкните или прокрутите для распыления <b>клонов</b> исходного " +"выделения" -#: ../src/verbs.cpp:2508 -msgid "Di_vision" -msgstr "Р_азделить" +#: ../src/ui/tools/spray-tool.cpp:205 +#, fuzzy, c-format +msgid "" +"%s. Drag, click or click and scroll to spray in a <b>single path</b> of the " +"initial selection." +msgstr "" +"%s. Потащите, щёлкните или прокрутите для распыления исходного выделения в " +"<b>единый контур</b>" -#: ../src/verbs.cpp:2509 -msgid "Cut the bottom path into pieces" -msgstr "Разделить нижний контур на части верхним" +#: ../src/ui/tools/spray-tool.cpp:656 +msgid "<b>Nothing selected!</b> Select objects to spray." +msgstr "<b>Ничего не выделено!</b> Выделите объекты, которые хотите распылить." -#. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the -#. Advanced tutorial for more info -#: ../src/verbs.cpp:2512 -msgid "Cut _Path" -msgstr "Разр_езать контур" +#: ../src/ui/tools/spray-tool.cpp:731 ../src/widgets/spray-toolbar.cpp:166 +msgid "Spray with copies" +msgstr "Распылять копии" -#: ../src/verbs.cpp:2513 -msgid "Cut the bottom path's stroke into pieces, removing fill" -msgstr "Разрезать контур нижнего контура на части с удалением заливки" +#: ../src/ui/tools/spray-tool.cpp:735 ../src/widgets/spray-toolbar.cpp:173 +msgid "Spray with clones" +msgstr "Распылять клоны" -#. TRANSLATORS: "outset": expand a shape by offsetting the object's path, -#. i.e. by displacing it perpendicular to the path in each point. -#. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2517 -msgid "Outs_et" -msgstr "Вы_тянуть" +#: ../src/ui/tools/spray-tool.cpp:739 +msgid "Spray in single path" +msgstr "Распылять по одиночному контуру" -#: ../src/verbs.cpp:2518 -msgid "Outset selected paths" -msgstr "Вытянуть выделенный контур" +#: ../src/ui/tools/star-tool.cpp:271 +msgid "<b>Ctrl</b>: snap angle; keep rays radial" +msgstr "<b>Ctrl</b>: ограничивать угол; лучи по радиусу без перекоса" -#: ../src/verbs.cpp:2520 -msgid "O_utset Path by 1 px" -msgstr "_Вытянуть контур на 1 px" +#: ../src/ui/tools/star-tool.cpp:417 +#, c-format +msgid "" +"<b>Polygon</b>: radius %s, angle %5g°; with <b>Ctrl</b> to snap angle" +msgstr "" +"<b>Многоугольник</b>: радиус %s, угол %5g°; <b>Ctrl</b> ограничивает " +"угол" -#: ../src/verbs.cpp:2521 -msgid "Outset selected paths by 1 px" -msgstr "Вытянуть выделенный контур на 1 px" +#: ../src/ui/tools/star-tool.cpp:418 +#, c-format +msgid "<b>Star</b>: radius %s, angle %5g°; with <b>Ctrl</b> to snap angle" +msgstr "" +"<b>Звезда</b>: радиус %s, угол %5g°; <b>Ctrl</b> ограничивает угол" -#: ../src/verbs.cpp:2523 -msgid "O_utset Path by 10 px" -msgstr "_Вытянуть контур на 10 px" +#: ../src/ui/tools/star-tool.cpp:446 +msgid "Create star" +msgstr "Создание звезды" -#: ../src/verbs.cpp:2524 -msgid "Outset selected paths by 10 px" -msgstr "Вытянуть выделенный контур на 10 px" +#: ../src/ui/tools/text-tool.cpp:379 +msgid "<b>Click</b> to edit the text, <b>drag</b> to select part of the text." +msgstr "<b>Щелчок</b> ставит курсор, <b>перетаскивание</b> выделяет текст." -#. TRANSLATORS: "inset": contract a shape by offsetting the object's path, -#. i.e. by displacing it perpendicular to the path in each point. -#. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2528 -msgid "I_nset" -msgstr "Втян_уть" +#: ../src/ui/tools/text-tool.cpp:381 +msgid "" +"<b>Click</b> to edit the flowed text, <b>drag</b> to select part of the text." +msgstr "<b>Щелчок</b> ставит курсор, <b>перетаскивание</b> выделяет текст." -#: ../src/verbs.cpp:2529 -msgid "Inset selected paths" -msgstr "Втянуть выделенный контур" +#: ../src/ui/tools/text-tool.cpp:435 +msgid "Create text" +msgstr "Создание текстового объекта" -#: ../src/verbs.cpp:2531 -msgid "I_nset Path by 1 px" -msgstr "Втян_уть контур на 1 px" +#: ../src/ui/tools/text-tool.cpp:460 +msgid "Non-printable character" +msgstr "Непечатаемый символ" -#: ../src/verbs.cpp:2532 -msgid "Inset selected paths by 1 px" -msgstr "Втянуть выделенный контур на 1 px" +#: ../src/ui/tools/text-tool.cpp:475 +msgid "Insert Unicode character" +msgstr "Вставить юникодный символ" -#: ../src/verbs.cpp:2534 -msgid "I_nset Path by 10 px" -msgstr "Втян_уть контур на 10 px" +#: ../src/ui/tools/text-tool.cpp:510 +#, c-format +msgid "Unicode (<b>Enter</b> to finish): %s: %s" +msgstr "Юникод (нажмите <b>Ввод</b> для завершения): %s: %s" -#: ../src/verbs.cpp:2535 -msgid "Inset selected paths by 10 px" -msgstr "Втянуть выделенный контур на 10 px" +#: ../src/ui/tools/text-tool.cpp:512 ../src/ui/tools/text-tool.cpp:817 +msgid "Unicode (<b>Enter</b> to finish): " +msgstr "Юникод (нажмите <b>Ввод</b> для завершения): " -#: ../src/verbs.cpp:2537 -msgid "D_ynamic Offset" -msgstr "_Динамическая втяжка" +#: ../src/ui/tools/text-tool.cpp:595 +#, c-format +msgid "<b>Flowed text frame</b>: %s × %s" +msgstr "<b>Рамка для текста</b>: %s × %s" -#: ../src/verbs.cpp:2537 -msgid "Create a dynamic offset object" -msgstr "Создать объект, втяжку/растяжку которого можно менять динамически" +#: ../src/ui/tools/text-tool.cpp:653 +msgid "Type text; <b>Enter</b> to start new line." +msgstr "Вводите текст; <b>Enter</b> начинает новый абзац." -#: ../src/verbs.cpp:2539 -msgid "_Linked Offset" -msgstr "С_вязанная втяжка" +#: ../src/ui/tools/text-tool.cpp:664 +msgid "Flowed text is created." +msgstr "Завёрстывание текста в блок" -#: ../src/verbs.cpp:2540 -msgid "Create a dynamic offset object linked to the original path" -msgstr "Создать втяжку/растяжку, динамически связанную с исходным контуром" +#: ../src/ui/tools/text-tool.cpp:665 +msgid "Create flowed text" +msgstr "Создание текстового блока" -#: ../src/verbs.cpp:2542 -msgid "_Stroke to Path" -msgstr "Оконтурить _обводку" +#: ../src/ui/tools/text-tool.cpp:667 +msgid "" +"The frame is <b>too small</b> for the current font size. Flowed text not " +"created." +msgstr "" +"Рамка <b>слишком мала</b> для текущего размера шрифта. Невозможно создать " +"текст в рамке." -#: ../src/verbs.cpp:2543 -msgid "Convert selected object's stroke to paths" -msgstr "Преобразовать обводки выбранных объектов в контуры" +#: ../src/ui/tools/text-tool.cpp:803 +msgid "No-break space" +msgstr "Неразрывный пробел" -#: ../src/verbs.cpp:2544 -msgid "Si_mplify" -msgstr "_Упростить" +#: ../src/ui/tools/text-tool.cpp:804 +msgid "Insert no-break space" +msgstr "Вставка неразрывного пробела" -#: ../src/verbs.cpp:2545 -msgid "Simplify selected paths (remove extra nodes)" -msgstr "Упростить выделенные контуры удалением лишних узлов" +#: ../src/ui/tools/text-tool.cpp:840 +msgid "Make bold" +msgstr "Полужирное начертание" -#: ../src/verbs.cpp:2546 -msgid "_Reverse" -msgstr "_Развернуть" +#: ../src/ui/tools/text-tool.cpp:857 +msgid "Make italic" +msgstr "Курсивное начертание" -#: ../src/verbs.cpp:2547 -msgid "Reverse the direction of selected paths (useful for flipping markers)" -msgstr "" -"Развернуть направление выделенных контуров; полезно для отражения маркеров" +#: ../src/ui/tools/text-tool.cpp:895 +msgid "New line" +msgstr "Новая строка" -#: ../src/verbs.cpp:2550 -msgid "Create one or more paths from a bitmap by tracing it" -msgstr "Создать один или более контуров из растра, векторизовав его" +#: ../src/ui/tools/text-tool.cpp:936 +msgid "Backspace" +msgstr "Забой" -#: ../src/verbs.cpp:2551 -#, fuzzy -msgid "Trace Pixel Art..." -msgstr "_Векторизовать растр..." +#: ../src/ui/tools/text-tool.cpp:990 +msgid "Kern to the left" +msgstr "Кернинг влево" -#: ../src/verbs.cpp:2552 -msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" -msgstr "" +#: ../src/ui/tools/text-tool.cpp:1014 +msgid "Kern to the right" +msgstr "Кернинг вправо" -#: ../src/verbs.cpp:2553 -msgid "Make a _Bitmap Copy" -msgstr "_Сделать растровую копию" +#: ../src/ui/tools/text-tool.cpp:1038 +msgid "Kern up" +msgstr "Кернинг вверх" -#: ../src/verbs.cpp:2554 -msgid "Export selection to a bitmap and insert it into document" -msgstr "Экспортировать выделение в растр и вставить его в документ" +#: ../src/ui/tools/text-tool.cpp:1062 +msgid "Kern down" +msgstr "Кернинг вниз" -#: ../src/verbs.cpp:2555 -msgid "_Combine" -msgstr "_Объединить" +#: ../src/ui/tools/text-tool.cpp:1137 +msgid "Rotate counterclockwise" +msgstr "Поворот против часовой стрелки" -#: ../src/verbs.cpp:2556 -msgid "Combine several paths into one" -msgstr "Объединить несколько контуров в один" +#: ../src/ui/tools/text-tool.cpp:1157 +msgid "Rotate clockwise" +msgstr "Поворот по часовой стрелке" -#. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the -#. Advanced tutorial for more info -#: ../src/verbs.cpp:2559 -msgid "Break _Apart" -msgstr "_Разбить" +#: ../src/ui/tools/text-tool.cpp:1173 +msgid "Contract line spacing" +msgstr "Сокращение межстрочного интервала" -#: ../src/verbs.cpp:2560 -msgid "Break selected paths into subpaths" -msgstr "Разбить выделенные контуры на части" +#: ../src/ui/tools/text-tool.cpp:1179 +msgid "Contract letter spacing" +msgstr "Сокращение межбуквенного интервала" -#: ../src/verbs.cpp:2561 -#, fuzzy -msgid "_Arrange..." -msgstr "_Расставить" +#: ../src/ui/tools/text-tool.cpp:1196 +msgid "Expand line spacing" +msgstr "Увеличение межстрочного интервала" -#: ../src/verbs.cpp:2562 -#, fuzzy -msgid "Arrange selected objects in a table or circle" -msgstr "Расставить выделенные объекты по сетке" +#: ../src/ui/tools/text-tool.cpp:1202 +msgid "Expand letter spacing" +msgstr "Увеличение межбуквенного интервала" -#. Layer -#: ../src/verbs.cpp:2564 -msgid "_Add Layer..." -msgstr "_Новый слой..." +#: ../src/ui/tools/text-tool.cpp:1332 +msgid "Paste text" +msgstr "Вставка стиля" -#: ../src/verbs.cpp:2565 -msgid "Create a new layer" -msgstr "Создать новый слой" +#: ../src/ui/tools/text-tool.cpp:1583 +#, fuzzy, c-format +msgid "" +"Type or edit flowed text (%d character%s); <b>Enter</b> to start new " +"paragraph." +msgid_plural "" +"Type or edit flowed text (%d characters%s); <b>Enter</b> to start new " +"paragraph." +msgstr[0] "" +"Наберите или измените завёрстанный текст (%d символов%s); <b>Ввод</b> " +"начинает новый абзац." +msgstr[1] "" +"Наберите или измените завёрстанный текст (%d символов%s); <b>Ввод</b> " +"начинает новый абзац." +msgstr[2] "" +"Наберите или измените завёрстанный текст (%d символов%s); <b>Ввод</b> " +"начинает новый абзац." -#: ../src/verbs.cpp:2566 -msgid "Re_name Layer..." -msgstr "_Переименовать слой..." +#: ../src/ui/tools/text-tool.cpp:1585 +#, fuzzy, c-format +msgid "Type or edit text (%d character%s); <b>Enter</b> to start new line." +msgid_plural "" +"Type or edit text (%d characters%s); <b>Enter</b> to start new line." +msgstr[0] "" +"Наберите или измените текст (%d символов%s); <b>Ввод</b> начинает новый " +"абзац." +msgstr[1] "" +"Наберите или измените текст (%d символов%s); <b>Ввод</b> начинает новый " +"абзац." +msgstr[2] "" +"Наберите или измените текст (%d символов%s); <b>Ввод</b> начинает новый " +"абзац." -#: ../src/verbs.cpp:2567 -msgid "Rename the current layer" -msgstr "Переименовать текущий слой" +#: ../src/ui/tools/text-tool.cpp:1695 +msgid "Type text" +msgstr "Ввод текста" -#: ../src/verbs.cpp:2568 -msgid "Switch to Layer Abov_e" -msgstr "Перейти на слой _выше" +#: ../src/ui/tools/tool-base.cpp:703 +#, fuzzy +msgid "<b>Space+mouse move</b> to pan canvas" +msgstr "" +"<b>Нажмите пробел и перетащите курсор мыши</b> для перемещения по холсту" -#: ../src/verbs.cpp:2569 -msgid "Switch to the layer above the current" -msgstr "Перейти на слой, находящийся выше текущего" +#: ../src/ui/tools/tweak-tool.cpp:174 +#, c-format +msgid "%s. Drag to <b>move</b>." +msgstr "%s. Перетащите курсор для их <b>перемещения</b>." -#: ../src/verbs.cpp:2570 -msgid "Switch to Layer Belo_w" -msgstr "Перейти на слой _ниже" +#: ../src/ui/tools/tweak-tool.cpp:178 +#, c-format +msgid "%s. Drag or click to <b>move in</b>; with Shift to <b>move out</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>притягивания</b>, с Shift — для " +"<b>отталкивания</b> объектов." -#: ../src/verbs.cpp:2571 -msgid "Switch to the layer below the current" -msgstr "Перейти на слой, находящийся под текущим" +#: ../src/ui/tools/tweak-tool.cpp:186 +#, c-format +msgid "%s. Drag or click to <b>move randomly</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>случайного перемещения</b> " +"объектов." -#: ../src/verbs.cpp:2572 -msgid "Move Selection to Layer Abo_ve" -msgstr "Перенести выделение в слой _выше" +#: ../src/ui/tools/tweak-tool.cpp:190 +#, c-format +msgid "%s. Drag or click to <b>scale down</b>; with Shift to <b>scale up</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>уменьшения</b>, с Shift — для " +"<b>увеличения</b> размера объектов." -#: ../src/verbs.cpp:2573 -msgid "Move selection to the layer above the current" -msgstr "Перенести выделение в слой над текущим слоем" +#: ../src/ui/tools/tweak-tool.cpp:198 +#, c-format +msgid "" +"%s. Drag or click to <b>rotate clockwise</b>; with Shift, " +"<b>counterclockwise</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>вращения объектов по часовой " +"стрелке</b>, с Shift — <b>против часовой стрелки</b>." -#: ../src/verbs.cpp:2574 -msgid "Move Selection to Layer Bel_ow" -msgstr "Перенести выделение в слой _ниже" +#: ../src/ui/tools/tweak-tool.cpp:206 +#, c-format +msgid "%s. Drag or click to <b>duplicate</b>; with Shift, <b>delete</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>дублирования</b>, с Shift — для " +"<b>удаления</b> объектов." -#: ../src/verbs.cpp:2575 -msgid "Move selection to the layer below the current" -msgstr "Перенести выделение в слой ниже текущего слоя" +#: ../src/ui/tools/tweak-tool.cpp:214 +#, c-format +msgid "%s. Drag to <b>push paths</b>." +msgstr "%s. Перетащите курсор для <b>выталкивания контуров</b>." -#: ../src/verbs.cpp:2576 -msgid "Move Selection to Layer..." -msgstr "Перенести выделение в слой..." +#: ../src/ui/tools/tweak-tool.cpp:218 +#, c-format +msgid "%s. Drag or click to <b>inset paths</b>; with Shift to <b>outset</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>втягивания</b>, с Shift — для " +"<b>растягивания</b> контуров." -#: ../src/verbs.cpp:2578 -msgid "Layer to _Top" -msgstr "Поднять до _верха" +#: ../src/ui/tools/tweak-tool.cpp:226 +#, c-format +msgid "%s. Drag or click to <b>attract paths</b>; with Shift to <b>repel</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>притягивания</b>, с Shift — для " +"<b>отталкивания</b> контуров." -#: ../src/verbs.cpp:2579 -msgid "Raise the current layer to the top" -msgstr "Поднять текущий слой на самый верх" +#: ../src/ui/tools/tweak-tool.cpp:234 +#, c-format +msgid "%s. Drag or click to <b>roughen paths</b>." +msgstr "%s. Перетащите курсор или щелкните для <b>огрубления контуров</b>." -#: ../src/verbs.cpp:2580 -msgid "Layer to _Bottom" -msgstr "Опустить до _низа" +#: ../src/ui/tools/tweak-tool.cpp:238 +#, c-format +msgid "%s. Drag or click to <b>paint objects</b> with color." +msgstr "%s. Перетащите курсор или щелкните для <b>раскрашивания объектов</b>." -#: ../src/verbs.cpp:2581 -msgid "Lower the current layer to the bottom" -msgstr "Опустить текущий слой на самый низ" +#: ../src/ui/tools/tweak-tool.cpp:242 +#, c-format +msgid "%s. Drag or click to <b>randomize colors</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>перебора цветов</b> заливки " +"объектов." -#: ../src/verbs.cpp:2582 -msgid "_Raise Layer" -msgstr "П_однять слой" +#: ../src/ui/tools/tweak-tool.cpp:246 +#, c-format +msgid "" +"%s. Drag or click to <b>increase blur</b>; with Shift to <b>decrease</b>." +msgstr "" +"%s. Перетащите курсор или щелкните для <b>увеличения размывания</b>, с Shift " +"— для <b>уменьшения</b>." -#: ../src/verbs.cpp:2583 -msgid "Raise the current layer" -msgstr "Поднять текущий слой" +#: ../src/ui/tools/tweak-tool.cpp:1193 +msgid "<b>Nothing selected!</b> Select objects to tweak." +msgstr "<b>Ничего не выделено!</b> Выделите объект(ы) для коррекции." -#: ../src/verbs.cpp:2584 -msgid "_Lower Layer" -msgstr "Опу_стить слой" +#: ../src/ui/tools/tweak-tool.cpp:1227 +msgid "Move tweak" +msgstr "Перемещение корректором" -#: ../src/verbs.cpp:2585 -msgid "Lower the current layer" -msgstr "Опустить текущий слой" +#: ../src/ui/tools/tweak-tool.cpp:1231 +msgid "Move in/out tweak" +msgstr "Притягивание/отталкивание объектов" -#: ../src/verbs.cpp:2586 -msgid "D_uplicate Current Layer" -msgstr "Создать _копию слоя" +#: ../src/ui/tools/tweak-tool.cpp:1235 +msgid "Move jitter tweak" +msgstr "Случайное перемещение корректором" -#: ../src/verbs.cpp:2587 -msgid "Duplicate an existing layer" -msgstr "Дубликация активного слоя" +#: ../src/ui/tools/tweak-tool.cpp:1239 +msgid "Scale tweak" +msgstr "Масштабирование корректором" -#: ../src/verbs.cpp:2588 -msgid "_Delete Current Layer" -msgstr "_Удалить текущий слой" +#: ../src/ui/tools/tweak-tool.cpp:1243 +msgid "Rotate tweak" +msgstr "Вращение корректором" -#: ../src/verbs.cpp:2589 -msgid "Delete the current layer" -msgstr "Удалить текущий слой" +#: ../src/ui/tools/tweak-tool.cpp:1247 +msgid "Duplicate/delete tweak" +msgstr "Дубликация/удаление корректором" -#: ../src/verbs.cpp:2590 -msgid "_Show/hide other layers" -msgstr "_Показать/скрыть остальные слои" +#: ../src/ui/tools/tweak-tool.cpp:1251 +msgid "Push path tweak" +msgstr "Толкание контуров корректором" -#: ../src/verbs.cpp:2591 -msgid "Solo the current layer" -msgstr "Отображение только активного слоя" +#: ../src/ui/tools/tweak-tool.cpp:1255 +msgid "Shrink/grow path tweak" +msgstr "Коррекция объема контуров" -#: ../src/verbs.cpp:2592 -msgid "_Show all layers" -msgstr "Показать _все слои" +#: ../src/ui/tools/tweak-tool.cpp:1259 +msgid "Attract/repel path tweak" +msgstr "Притяжение и отталкивание контуров" -#: ../src/verbs.cpp:2593 -msgid "Show all the layers" -msgstr "Просмотр всех слоёв" +#: ../src/ui/tools/tweak-tool.cpp:1263 +msgid "Roughen path tweak" +msgstr "Огрубление контуров корректором" -#: ../src/verbs.cpp:2594 -msgid "_Hide all layers" -msgstr "С_крыть все слои" +#: ../src/ui/tools/tweak-tool.cpp:1267 +msgid "Color paint tweak" +msgstr "Коррекция заливки цветом" -#: ../src/verbs.cpp:2595 -msgid "Hide all the layers" -msgstr "Сокрытие всех слоёв" +#: ../src/ui/tools/tweak-tool.cpp:1271 +msgid "Color jitter tweak" +msgstr "Коррекция перебором цветов" -#: ../src/verbs.cpp:2596 -msgid "_Lock all layers" -msgstr "За_блокировать все слои" +#: ../src/ui/tools/tweak-tool.cpp:1275 +msgid "Blur tweak" +msgstr "Коррекция размывания" -#: ../src/verbs.cpp:2597 -msgid "Lock all the layers" -msgstr "Блокировка всех слоёв" +#: ../src/ui/widget/filter-effect-chooser.cpp:27 +msgid "Blur (%)" +msgstr "Размывание (%)" -#: ../src/verbs.cpp:2598 -msgid "Lock/Unlock _other layers" -msgstr "Заблокировать/разблокировать _остальные слои" +#: ../src/ui/widget/layer-selector.cpp:118 +msgid "Toggle current layer visibility" +msgstr "Скрыть или открыть текущий слой" -#: ../src/verbs.cpp:2599 -msgid "Lock all the other layers" -msgstr "Блокировка всех остальных слоёв" +#: ../src/ui/widget/layer-selector.cpp:139 +msgid "Lock or unlock current layer" +msgstr "Заблокировать или разблокировать текущий слой" -#: ../src/verbs.cpp:2600 -msgid "_Unlock all layers" -msgstr "Разб_локировать все слои" +#: ../src/ui/widget/layer-selector.cpp:142 +msgid "Current layer" +msgstr "Текущий слой" -#: ../src/verbs.cpp:2601 -msgid "Unlock all the layers" -msgstr "Разблокировка всех слоёв" +#: ../src/ui/widget/layer-selector.cpp:583 +msgid "(root)" +msgstr "(корень)" -#: ../src/verbs.cpp:2602 -msgid "_Lock/Unlock Current Layer" -msgstr "_Заблокировать/разблокировать текущий слой" +#: ../src/ui/widget/licensor.cpp:40 +msgid "Proprietary" +msgstr "Собственническая" -#: ../src/verbs.cpp:2603 -#, fuzzy -msgid "Toggle lock on current layer" -msgstr "Отображение только активного слоя" +#: ../src/ui/widget/licensor.cpp:43 +msgid "MetadataLicence|Other" +msgstr "Другая" -#: ../src/verbs.cpp:2604 -msgid "_Show/hide Current Layer" -msgstr "Пока_зать/скрыть текущий слой" +#: ../src/ui/widget/object-composite-settings.cpp:67 +#: ../src/ui/widget/selected-style.cpp:1099 +#: ../src/ui/widget/selected-style.cpp:1100 +msgid "Opacity (%)" +msgstr "Непрозрачность (%)" -#: ../src/verbs.cpp:2605 -#, fuzzy -msgid "Toggle visibility of current layer" -msgstr "Отображение только активного слоя" +#: ../src/ui/widget/object-composite-settings.cpp:180 +msgid "Change blur" +msgstr "Смена размывания" -#. Object -#: ../src/verbs.cpp:2608 -#, fuzzy -msgid "Rotate _90° CW" -msgstr "Повернуть на _90° по часовой стрелке" +#: ../src/ui/widget/object-composite-settings.cpp:220 +#: ../src/ui/widget/selected-style.cpp:931 +#: ../src/ui/widget/selected-style.cpp:1225 +msgid "Change opacity" +msgstr "Смена непрозрачности" -#. This is shared between tooltips and statusbar, so they -#. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2611 -msgid "Rotate selection 90° clockwise" -msgstr "Повернуть выделение на 90° по часовой стрелке" +#: ../src/ui/widget/page-sizer.cpp:235 +msgid "U_nits:" +msgstr "Едини_цы:" -#: ../src/verbs.cpp:2612 -#, fuzzy -msgid "Rotate 9_0° CCW" -msgstr "Повернуть на 9_0° против часовой стрелки" +#: ../src/ui/widget/page-sizer.cpp:236 +msgid "Width of paper" +msgstr "Ширина бумаги" -#. This is shared between tooltips and statusbar, so they -#. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2615 -msgid "Rotate selection 90° counter-clockwise" -msgstr "Повернуть выделение на 90° против часовой стрелки" +#: ../src/ui/widget/page-sizer.cpp:237 +msgid "Height of paper" +msgstr "Высота бумаги" -#: ../src/verbs.cpp:2616 -msgid "Remove _Transformations" -msgstr "Убрать _трансформации" +#: ../src/ui/widget/page-sizer.cpp:238 +msgid "T_op margin:" +msgstr "Вер_хнее:" -#: ../src/verbs.cpp:2617 -msgid "Remove transformations from object" -msgstr "Убрать преобразования объекта" +#: ../src/ui/widget/page-sizer.cpp:238 +msgid "Top margin" +msgstr "Верхнее поле" -#: ../src/verbs.cpp:2618 -msgid "_Object to Path" -msgstr "_Оконтурить объект" +#: ../src/ui/widget/page-sizer.cpp:239 +msgid "L_eft:" +msgstr "_Левое:" -#: ../src/verbs.cpp:2619 -msgid "Convert selected object to path" -msgstr "Преобразовать выбранный объект в контур" +#: ../src/ui/widget/page-sizer.cpp:239 +msgid "Left margin" +msgstr "Левое поле" -#: ../src/verbs.cpp:2620 -msgid "_Flow into Frame" -msgstr "_Заверстать в блок" +#: ../src/ui/widget/page-sizer.cpp:240 +msgid "Ri_ght:" +msgstr "Пр_авое:" -#: ../src/verbs.cpp:2621 -msgid "" -"Put text into a frame (path or shape), creating a flowed text linked to the " -"frame object" -msgstr "" -"Заверстать текст в блок (контур или фигуру), создав перетекающий текст, " -"связанный с объектом блока" +#: ../src/ui/widget/page-sizer.cpp:240 +msgid "Right margin" +msgstr "Правое поле" -#: ../src/verbs.cpp:2622 -msgid "_Unflow" -msgstr "_Вынуть из блока" +#: ../src/ui/widget/page-sizer.cpp:241 +msgid "Botto_m:" +msgstr "_Нижнее:" -#: ../src/verbs.cpp:2623 -msgid "Remove text from frame (creates a single-line text object)" -msgstr "Вынуть текст из блока, создав обычный текстовый объект в одну строку" +#: ../src/ui/widget/page-sizer.cpp:241 +msgid "Bottom margin" +msgstr "Нижнее поле" -#: ../src/verbs.cpp:2624 -msgid "_Convert to Text" -msgstr "_Преобразовать в текст" +#: ../src/ui/widget/page-sizer.cpp:296 +msgid "Orientation:" +msgstr "Ориентация:" -#: ../src/verbs.cpp:2625 -msgid "Convert flowed text to regular text object (preserves appearance)" -msgstr "" -"Преобразовать текст, заверстанный в рамку, в обычный текст, сохранив " -"форматирование" +#: ../src/ui/widget/page-sizer.cpp:299 +msgid "_Landscape" +msgstr "_Альбом" -#: ../src/verbs.cpp:2627 -msgid "Flip _Horizontal" -msgstr "Отразить _горизонтально" +#: ../src/ui/widget/page-sizer.cpp:304 +msgid "_Portrait" +msgstr "П_ортрет" -#: ../src/verbs.cpp:2627 -msgid "Flip selected objects horizontally" -msgstr "Горизонтально отразить выбранные объекты" +#. ## Set up custom size frame +#: ../src/ui/widget/page-sizer.cpp:322 +msgid "Custom size" +msgstr "Другой размер" -#: ../src/verbs.cpp:2630 -msgid "Flip _Vertical" -msgstr "Отразить _вертикально" +#: ../src/ui/widget/page-sizer.cpp:367 +msgid "Resi_ze page to content..." +msgstr "_Подогнать размер страницы под содержимое" -#: ../src/verbs.cpp:2630 -msgid "Flip selected objects vertically" -msgstr "Вертикально отразить выбранные объекты" +#: ../src/ui/widget/page-sizer.cpp:419 +msgid "_Resize page to drawing or selection" +msgstr "По_догнать размер страницы под рисунок или выделение" -#: ../src/verbs.cpp:2633 -msgid "Apply mask to selection (using the topmost object as mask)" -msgstr "Применить самый верхний объект выделения к нему как маску" +#: ../src/ui/widget/page-sizer.cpp:420 +msgid "" +"Resize the page to fit the current selection, or the entire drawing if there " +"is no selection" +msgstr "" +"Изменить размер страницы до размеров текущего выделения или всего рисунка, " +"если выделения нет" -#: ../src/verbs.cpp:2635 -msgid "Edit mask" -msgstr "Изменить маску" +#: ../src/ui/widget/page-sizer.cpp:488 +msgid "Set page size" +msgstr "Смена формата страницы" -#: ../src/verbs.cpp:2636 ../src/verbs.cpp:2642 -msgid "_Release" -msgstr "_Снять" +#: ../src/ui/widget/panel.cpp:116 +msgid "List" +msgstr "Список" -#: ../src/verbs.cpp:2637 -msgid "Remove mask from selection" -msgstr "Убрать маску из выделения" +#: ../src/ui/widget/panel.cpp:139 +msgctxt "Swatches" +msgid "Size" +msgstr "Размер" -#: ../src/verbs.cpp:2639 -msgid "" -"Apply clipping path to selection (using the topmost object as clipping path)" -msgstr "Применить самый верхний объект выделения к нему как обтравочный контур" +#: ../src/ui/widget/panel.cpp:143 +msgctxt "Swatches height" +msgid "Tiny" +msgstr "Крошечные" -#: ../src/verbs.cpp:2641 -msgid "Edit clipping path" -msgstr "Изменить обтравочный контур" +#: ../src/ui/widget/panel.cpp:144 +msgctxt "Swatches height" +msgid "Small" +msgstr "Маленькие" -#: ../src/verbs.cpp:2643 -msgid "Remove clipping path from selection" -msgstr "Убрать обтравочный контур из выделения" +#: ../src/ui/widget/panel.cpp:145 +msgctxt "Swatches height" +msgid "Medium" +msgstr "Средние" -#. Tools -#: ../src/verbs.cpp:2646 -#, fuzzy -msgctxt "ContextVerb" -msgid "Select" -msgstr "Выделитель" +#: ../src/ui/widget/panel.cpp:146 +msgctxt "Swatches height" +msgid "Large" +msgstr "Большие" -#: ../src/verbs.cpp:2647 -msgid "Select and transform objects" -msgstr "Выделять и трансформировать объекты" +#: ../src/ui/widget/panel.cpp:147 +msgctxt "Swatches height" +msgid "Huge" +msgstr "Огромные" -#: ../src/verbs.cpp:2648 -msgctxt "ContextVerb" -msgid "Node Edit" -msgstr "Инструмент узлов" +#: ../src/ui/widget/panel.cpp:169 +msgctxt "Swatches" +msgid "Width" +msgstr "Ширина" -#: ../src/verbs.cpp:2649 -msgid "Edit paths by nodes" -msgstr "Редактировать узлы контура или рычаги узлов" +#: ../src/ui/widget/panel.cpp:173 +msgctxt "Swatches width" +msgid "Narrower" +msgstr "Ещё уже" -#: ../src/verbs.cpp:2650 -msgctxt "ContextVerb" -msgid "Tweak" -msgstr "Корректор" +#: ../src/ui/widget/panel.cpp:174 +msgctxt "Swatches width" +msgid "Narrow" +msgstr "Узкие" -#: ../src/verbs.cpp:2651 -msgid "Tweak objects by sculpting or painting" -msgstr "Корректировать объекты лепкой или раскрашиванием" +#: ../src/ui/widget/panel.cpp:175 +msgctxt "Swatches width" +msgid "Medium" +msgstr "Средние" -#: ../src/verbs.cpp:2652 -msgctxt "ContextVerb" -msgid "Spray" -msgstr "Распылитель" +#: ../src/ui/widget/panel.cpp:176 +msgctxt "Swatches width" +msgid "Wide" +msgstr "Широкие" -#: ../src/verbs.cpp:2653 -msgid "Spray objects by sculpting or painting" -msgstr "Распылять объекты лепкой или раскрашиванием" +#: ../src/ui/widget/panel.cpp:177 +msgctxt "Swatches width" +msgid "Wider" +msgstr "Ещё шире" -#: ../src/verbs.cpp:2654 -msgctxt "ContextVerb" -msgid "Rectangle" -msgstr "Прямоугольник" +#: ../src/ui/widget/panel.cpp:207 +msgctxt "Swatches" +msgid "Border" +msgstr "Край" -#: ../src/verbs.cpp:2655 -msgid "Create rectangles and squares" -msgstr "Рисовать прямоугольники и квадраты" +#: ../src/ui/widget/panel.cpp:211 +msgctxt "Swatches border" +msgid "None" +msgstr "Нет" -#: ../src/verbs.cpp:2656 +#: ../src/ui/widget/panel.cpp:212 #, fuzzy -msgctxt "ContextVerb" -msgid "3D Box" -msgstr "Паралеллепипед" +msgctxt "Swatches border" +msgid "Solid" +msgstr "С заливкой" -#: ../src/verbs.cpp:2657 -msgid "Create 3D boxes" -msgstr "Рисовать паралеллепипеды в 3D" +#: ../src/ui/widget/panel.cpp:213 +msgctxt "Swatches border" +msgid "Wide" +msgstr "Широкий" -#: ../src/verbs.cpp:2658 -msgctxt "ContextVerb" -msgid "Ellipse" -msgstr "Эллипс" +#. TRANSLATORS: "Wrap" indicates how colour swatches are displayed +#: ../src/ui/widget/panel.cpp:244 +#, fuzzy +msgctxt "Swatches" +msgid "Wrap" +msgstr "Крупнее" -#: ../src/verbs.cpp:2659 -msgid "Create circles, ellipses, and arcs" -msgstr "Рисовать круги, эллипсы и дуги" +#: ../src/ui/widget/preferences-widget.cpp:802 +msgid "_Browse..." +msgstr "В_ыбрать..." -#: ../src/verbs.cpp:2660 -msgctxt "ContextVerb" -msgid "Star" -msgstr "Звезда" +#: ../src/ui/widget/preferences-widget.cpp:888 +msgid "Select a bitmap editor" +msgstr "Выберите редактор растровых файлов" -#: ../src/verbs.cpp:2661 -msgid "Create stars and polygons" -msgstr "Рисовать звезды и многоугольники" +#: ../src/ui/widget/random.cpp:84 +msgid "" +"Reseed the random number generator; this creates a different sequence of " +"random numbers." +msgstr "" +"Перезапустить генератор случайных чисел, чтобы создать иную " +"последовательность случайных чисел" -#: ../src/verbs.cpp:2662 -msgctxt "ContextVerb" -msgid "Spiral" -msgstr "Спираль" +#: ../src/ui/widget/rendering-options.cpp:33 +msgid "Backend" +msgstr "Внутренний механизм печати" -#: ../src/verbs.cpp:2663 -msgid "Create spirals" -msgstr "Рисовать спирали" +#: ../src/ui/widget/rendering-options.cpp:34 +msgid "Vector" +msgstr "Векторный" -#: ../src/verbs.cpp:2664 -msgctxt "ContextVerb" -msgid "Pencil" -msgstr "Карандаш" +#: ../src/ui/widget/rendering-options.cpp:35 +msgid "Bitmap" +msgstr "Растровый" -#: ../src/verbs.cpp:2665 -msgid "Draw freehand lines" -msgstr "Рисовать произвольные контуры" +#: ../src/ui/widget/rendering-options.cpp:36 +msgid "Bitmap options" +msgstr "Параметры растровой печати" -#: ../src/verbs.cpp:2666 -msgctxt "ContextVerb" -msgid "Pen" -msgstr "Перо" +#: ../src/ui/widget/rendering-options.cpp:38 +msgid "Preferred resolution of rendering, in dots per inch." +msgstr "Предпочитаемое разрешение растра (в точках на дюйм)." -#: ../src/verbs.cpp:2667 -msgid "Draw Bezier curves and straight lines" -msgstr "Рисовать кривые Безье и прямые линии" +#: ../src/ui/widget/rendering-options.cpp:47 +msgid "" +"Render using Cairo vector operations. The resulting image is usually " +"smaller in file size and can be arbitrarily scaled, but some filter effects " +"will not be correctly rendered." +msgstr "" +"Использовать векторные операторы Cairo. Итоговое изображение обычно имеет " +"меньший размер файла и свободно масштабируется, но некоторые фильтры " +"эффектов будут переданы некорректно." -#: ../src/verbs.cpp:2668 -msgctxt "ContextVerb" -msgid "Calligraphy" -msgstr "Каллиграфическое перо" +#: ../src/ui/widget/rendering-options.cpp:52 +msgid "" +"Render everything as bitmap. The resulting image is usually larger in file " +"size and cannot be arbitrarily scaled without quality loss, but all objects " +"will be rendered exactly as displayed." +msgstr "" +"Напечатать как растр. Как правило, файл будет большего размера, и полученное " +"изображение нельзя будет произвольно масштабировать без потери качества. " +"Однако все графические элементы будут напечатаны так, как они выглядят на " +"экране." -#: ../src/verbs.cpp:2669 -msgid "Draw calligraphic or brush strokes" -msgstr "Рисовать каллиграфическим пером" +#: ../src/ui/widget/selected-style.cpp:130 +#: ../src/ui/widget/style-swatch.cpp:127 +msgid "Fill:" +msgstr "Заливка:" -#: ../src/verbs.cpp:2671 -msgid "Create and edit text objects" -msgstr "Создавать и править текстовые объекты" +#: ../src/ui/widget/selected-style.cpp:132 +msgid "O:" +msgstr "Н:" -#: ../src/verbs.cpp:2672 -msgctxt "ContextVerb" -msgid "Gradient" -msgstr "Градиентная заливка" +#: ../src/ui/widget/selected-style.cpp:177 +msgid "N/A" +msgstr "Н/Д" -#: ../src/verbs.cpp:2673 -msgid "Create and edit gradients" -msgstr "Создавать и править градиенты" +#: ../src/ui/widget/selected-style.cpp:180 +#: ../src/ui/widget/selected-style.cpp:1092 +#: ../src/ui/widget/selected-style.cpp:1093 +#: ../src/widgets/gradient-toolbar.cpp:162 +msgid "Nothing selected" +msgstr "Ничего не выбрано" -#: ../src/verbs.cpp:2674 -msgctxt "ContextVerb" -msgid "Mesh" -msgstr "" +#: ../src/ui/widget/selected-style.cpp:183 +#, fuzzy +msgctxt "Fill" +msgid "<i>None</i>" +msgstr "<i>Нет</i>" -#: ../src/verbs.cpp:2675 +#: ../src/ui/widget/selected-style.cpp:185 #, fuzzy -msgid "Create and edit meshes" -msgstr "Создавать и править градиенты" +msgctxt "Stroke" +msgid "<i>None</i>" +msgstr "<i>Нет</i>" -#: ../src/verbs.cpp:2676 -msgctxt "ContextVerb" -msgid "Zoom" -msgstr "Лупа" +#: ../src/ui/widget/selected-style.cpp:189 +#: ../src/ui/widget/style-swatch.cpp:322 +#, fuzzy +msgctxt "Fill and stroke" +msgid "No fill" +msgstr "Без заливки" + +#: ../src/ui/widget/selected-style.cpp:189 +#: ../src/ui/widget/style-swatch.cpp:322 +#, fuzzy +msgctxt "Fill and stroke" +msgid "No stroke" +msgstr "Без обводки" -#: ../src/verbs.cpp:2677 -msgid "Zoom in or out" -msgstr "Увеличивать или уменьшать отображение документа" +#: ../src/ui/widget/selected-style.cpp:191 +#: ../src/ui/widget/style-swatch.cpp:301 ../src/widgets/paint-selector.cpp:242 +msgid "Pattern" +msgstr "Текстура" -#: ../src/verbs.cpp:2679 -msgid "Measurement tool" -msgstr "Измеритель" +#: ../src/ui/widget/selected-style.cpp:194 +#: ../src/ui/widget/style-swatch.cpp:303 +msgid "Pattern fill" +msgstr "Текстурная заливка" -#: ../src/verbs.cpp:2680 -msgctxt "ContextVerb" -msgid "Dropper" -msgstr "Пипетка" +#: ../src/ui/widget/selected-style.cpp:194 +#: ../src/ui/widget/style-swatch.cpp:303 +msgid "Pattern stroke" +msgstr "Текстурная обводка" -#: ../src/verbs.cpp:2681 ../src/widgets/sp-color-notebook.cpp:411 -msgid "Pick colors from image" -msgstr "Брать усредненные цвета из изображений" +#: ../src/ui/widget/selected-style.cpp:196 +msgid "<b>L</b>" +msgstr "<b>Л:</b>" -#: ../src/verbs.cpp:2682 -msgctxt "ContextVerb" -msgid "Connector" -msgstr "Соединительные линии" +#: ../src/ui/widget/selected-style.cpp:199 +#: ../src/ui/widget/style-swatch.cpp:295 +msgid "Linear gradient fill" +msgstr "Линейная градиентная заливка" -#: ../src/verbs.cpp:2683 -msgid "Create diagram connectors" -msgstr "Создавать соединительные линии в диаграммах" +#: ../src/ui/widget/selected-style.cpp:199 +#: ../src/ui/widget/style-swatch.cpp:295 +msgid "Linear gradient stroke" +msgstr "Линейная градиентная обводка" -#: ../src/verbs.cpp:2684 -msgctxt "ContextVerb" -msgid "Paint Bucket" -msgstr "Сплошная заливка" +#: ../src/ui/widget/selected-style.cpp:206 +msgid "<b>R</b>" +msgstr "<b>Р</b>" -#: ../src/verbs.cpp:2685 -msgid "Fill bounded areas" -msgstr "Заливать замкнутые области" +#: ../src/ui/widget/selected-style.cpp:209 +#: ../src/ui/widget/style-swatch.cpp:299 +msgid "Radial gradient fill" +msgstr "Радиальная градиентная заливка" -#: ../src/verbs.cpp:2686 -#, fuzzy -msgctxt "ContextVerb" -msgid "LPE Edit" -msgstr "Геометрические конструкции" +#: ../src/ui/widget/selected-style.cpp:209 +#: ../src/ui/widget/style-swatch.cpp:299 +msgid "Radial gradient stroke" +msgstr "Радиальная градиентная обводка" -#: ../src/verbs.cpp:2687 -msgid "Edit Path Effect parameters" -msgstr "Редактирование параметров динамических контурных эффектов" +#: ../src/ui/widget/selected-style.cpp:216 +msgid "Different" +msgstr "Разные" -#: ../src/verbs.cpp:2688 -msgctxt "ContextVerb" -msgid "Eraser" -msgstr "Ластик" +#: ../src/ui/widget/selected-style.cpp:219 +msgid "Different fills" +msgstr "Разные заливки" -#: ../src/verbs.cpp:2689 -msgid "Erase existing paths" -msgstr "Удалять существующие объекты" +#: ../src/ui/widget/selected-style.cpp:219 +msgid "Different strokes" +msgstr "Разные обводки" -#: ../src/verbs.cpp:2690 -#, fuzzy -msgctxt "ContextVerb" -msgid "LPE Tool" -msgstr "Геометрические построения" +#: ../src/ui/widget/selected-style.cpp:221 +#: ../src/ui/widget/style-swatch.cpp:325 +msgid "<b>Unset</b>" +msgstr "<b>Снята</b>" -#: ../src/verbs.cpp:2691 -msgid "Do geometric constructions" -msgstr "Создавать геометрические построения" +#. TRANSLATORS COMMENT: unset is a verb here +#: ../src/ui/widget/selected-style.cpp:224 +#: ../src/ui/widget/selected-style.cpp:282 +#: ../src/ui/widget/selected-style.cpp:563 +#: ../src/ui/widget/style-swatch.cpp:327 ../src/widgets/fill-style.cpp:712 +msgid "Unset fill" +msgstr "Снять заливку" -#. Tool prefs -#: ../src/verbs.cpp:2693 -msgid "Selector Preferences" -msgstr "Параметры Выделителя" +#: ../src/ui/widget/selected-style.cpp:224 +#: ../src/ui/widget/selected-style.cpp:282 +#: ../src/ui/widget/selected-style.cpp:579 +#: ../src/ui/widget/style-swatch.cpp:327 ../src/widgets/fill-style.cpp:712 +msgid "Unset stroke" +msgstr "Снять обводку" -#: ../src/verbs.cpp:2694 -msgid "Open Preferences for the Selector tool" -msgstr "Открыть окно параметров Выделителя" +#: ../src/ui/widget/selected-style.cpp:227 +msgid "Flat color fill" +msgstr "Цвет сплошной заливки" -#: ../src/verbs.cpp:2695 -msgid "Node Tool Preferences" -msgstr "Параметры инструмента Узлы" +#: ../src/ui/widget/selected-style.cpp:227 +msgid "Flat color stroke" +msgstr "Цвет сплошной обводки" -#: ../src/verbs.cpp:2696 -msgid "Open Preferences for the Node tool" -msgstr "Открыть окно параметров инструмента Узлы" +#. TRANSLATOR COMMENT: A means "Averaged" +#: ../src/ui/widget/selected-style.cpp:230 +msgid "<b>a</b>" +msgstr "<b>a</b>" -#: ../src/verbs.cpp:2697 -msgid "Tweak Tool Preferences" -msgstr "Параметры Корректора" +#: ../src/ui/widget/selected-style.cpp:233 +msgid "Fill is averaged over selected objects" +msgstr "Заливка усреднена для выбранных объектов" -#: ../src/verbs.cpp:2698 -msgid "Open Preferences for the Tweak tool" -msgstr "Открыть окно параметров корректора" +#: ../src/ui/widget/selected-style.cpp:233 +msgid "Stroke is averaged over selected objects" +msgstr "Обводка усреднена для выбранных объектов" -#: ../src/verbs.cpp:2699 -msgid "Spray Tool Preferences" -msgstr "Параметры Распылителя" +#. TRANSLATOR COMMENT: M means "Multiple" +#: ../src/ui/widget/selected-style.cpp:236 +msgid "<b>m</b>" +msgstr "<b>m</b>" -#: ../src/verbs.cpp:2700 -msgid "Open Preferences for the Spray tool" -msgstr "Открыть окно параметров Распылителя" +#: ../src/ui/widget/selected-style.cpp:239 +msgid "Multiple selected objects have the same fill" +msgstr "У нескольких выбранных объектов одинаковая заливка" -#: ../src/verbs.cpp:2701 -msgid "Rectangle Preferences" -msgstr "Параметры Прямоугольника" +#: ../src/ui/widget/selected-style.cpp:239 +msgid "Multiple selected objects have the same stroke" +msgstr "У нескольких выбранных объектов одинаковая обводка" -#: ../src/verbs.cpp:2702 -msgid "Open Preferences for the Rectangle tool" -msgstr "Открыть окно параметров инструмента для рисования прямоугольников" +#: ../src/ui/widget/selected-style.cpp:241 +msgid "Edit fill..." +msgstr "Изменить заливку..." -#: ../src/verbs.cpp:2703 -msgid "3D Box Preferences" -msgstr "Параметры Паралеллепипеда" +#: ../src/ui/widget/selected-style.cpp:241 +msgid "Edit stroke..." +msgstr "Изменить обводку..." -#: ../src/verbs.cpp:2704 -msgid "Open Preferences for the 3D Box tool" -msgstr "Открыть окно параметров инструмента для рисования параллелепипедов" +#: ../src/ui/widget/selected-style.cpp:245 +msgid "Last set color" +msgstr "Последним использованным цветом" -#: ../src/verbs.cpp:2705 -msgid "Ellipse Preferences" -msgstr "Параметры Эллипса" +#: ../src/ui/widget/selected-style.cpp:249 +msgid "Last selected color" +msgstr "Последним выбранным цветом" -#: ../src/verbs.cpp:2706 -msgid "Open Preferences for the Ellipse tool" -msgstr "Открыть окно параметров инструмента для рисования эллипсов" +#: ../src/ui/widget/selected-style.cpp:265 +msgid "Copy color" +msgstr "Скопировать цвет" -#: ../src/verbs.cpp:2707 -msgid "Star Preferences" -msgstr "Параметры Звезды" +#: ../src/ui/widget/selected-style.cpp:269 +msgid "Paste color" +msgstr "Вставить цвет" -#: ../src/verbs.cpp:2708 -msgid "Open Preferences for the Star tool" -msgstr "Открыть окно параметров инструмента для рисования звёзд" +#: ../src/ui/widget/selected-style.cpp:273 +#: ../src/ui/widget/selected-style.cpp:856 +msgid "Swap fill and stroke" +msgstr "Поменять местами заливку и обводку" -#: ../src/verbs.cpp:2709 -msgid "Spiral Preferences" -msgstr "Параметры Спирали" +#: ../src/ui/widget/selected-style.cpp:277 +#: ../src/ui/widget/selected-style.cpp:588 +#: ../src/ui/widget/selected-style.cpp:597 +msgid "Make fill opaque" +msgstr "Сделать заливку непрозрачной" -#: ../src/verbs.cpp:2710 -msgid "Open Preferences for the Spiral tool" -msgstr "Открыть окно параметров инструмента для рисования спиралей" +#: ../src/ui/widget/selected-style.cpp:277 +msgid "Make stroke opaque" +msgstr "Сделать обводку непрозрачной" -#: ../src/verbs.cpp:2711 -msgid "Pencil Preferences" -msgstr "Параметры Карандаша" +#: ../src/ui/widget/selected-style.cpp:286 +#: ../src/ui/widget/selected-style.cpp:545 ../src/widgets/fill-style.cpp:510 +msgid "Remove fill" +msgstr "Полностью удалить заливку" -#: ../src/verbs.cpp:2712 -msgid "Open Preferences for the Pencil tool" -msgstr "Открыть окно параметров карандаша" +#: ../src/ui/widget/selected-style.cpp:286 +#: ../src/ui/widget/selected-style.cpp:554 ../src/widgets/fill-style.cpp:510 +msgid "Remove stroke" +msgstr "Удалить обводку" -#: ../src/verbs.cpp:2713 -msgid "Pen Preferences" -msgstr "Параметры Пера" +#: ../src/ui/widget/selected-style.cpp:609 +msgid "Apply last set color to fill" +msgstr "Заливка последним примененным цветом" -#: ../src/verbs.cpp:2714 -msgid "Open Preferences for the Pen tool" -msgstr "Открыть окно параметров пера" +#: ../src/ui/widget/selected-style.cpp:621 +msgid "Apply last set color to stroke" +msgstr "Обводка последним примененным цветом" -#: ../src/verbs.cpp:2715 -msgid "Calligraphic Preferences" -msgstr "Параметры Каллиграфического пера" +#: ../src/ui/widget/selected-style.cpp:632 +msgid "Apply last selected color to fill" +msgstr "Заливка последним выбранным цветом" -#: ../src/verbs.cpp:2716 -msgid "Open Preferences for the Calligraphy tool" -msgstr "Открыть окно параметров Каллиграфического пера" +#: ../src/ui/widget/selected-style.cpp:643 +msgid "Apply last selected color to stroke" +msgstr "Обводка последним выбранным цветом" -#: ../src/verbs.cpp:2717 -msgid "Text Preferences" -msgstr "Параметры Текста" +#: ../src/ui/widget/selected-style.cpp:669 +msgid "Invert fill" +msgstr "Инвертирование заливки" -#: ../src/verbs.cpp:2718 -msgid "Open Preferences for the Text tool" -msgstr "Открыть окно параметров инструмента для набора текста" +#: ../src/ui/widget/selected-style.cpp:693 +msgid "Invert stroke" +msgstr "Инвертирование обводки" -#: ../src/verbs.cpp:2719 -msgid "Gradient Preferences" -msgstr "Параметры Градиентной заливки" +#: ../src/ui/widget/selected-style.cpp:705 +msgid "White fill" +msgstr "Заливка белым цветом" -#: ../src/verbs.cpp:2720 -msgid "Open Preferences for the Gradient tool" -msgstr "Открыть окно параметров инструмента для градиентной заливки" +#: ../src/ui/widget/selected-style.cpp:717 +msgid "White stroke" +msgstr "Заливка обводки белым цветом" -#: ../src/verbs.cpp:2721 -#, fuzzy -msgid "Mesh Preferences" -msgstr "Параметры Ластика" +#: ../src/ui/widget/selected-style.cpp:729 +msgid "Black fill" +msgstr "Заливка черным цветом" -#: ../src/verbs.cpp:2722 -#, fuzzy -msgid "Open Preferences for the Mesh tool" -msgstr "Открыть окно параметров ластика" +#: ../src/ui/widget/selected-style.cpp:741 +msgid "Black stroke" +msgstr "Заливка обводки черным цветом" -#: ../src/verbs.cpp:2723 -msgid "Zoom Preferences" -msgstr "Параметры Лупы" +#: ../src/ui/widget/selected-style.cpp:784 +msgid "Paste fill" +msgstr "Вставка заливки" -#: ../src/verbs.cpp:2724 -msgid "Open Preferences for the Zoom tool" -msgstr "Открыть окно параметров лупы" +#: ../src/ui/widget/selected-style.cpp:802 +msgid "Paste stroke" +msgstr "Вставка обводки" -#: ../src/verbs.cpp:2725 -msgid "Measure Preferences" -msgstr "Параметры Измерителя" +#: ../src/ui/widget/selected-style.cpp:958 +msgid "Change stroke width" +msgstr "Смена толщины обводки" -#: ../src/verbs.cpp:2726 -#, fuzzy -msgid "Open Preferences for the Measure tool" -msgstr "Открыть окно параметров ластика" +#: ../src/ui/widget/selected-style.cpp:1053 +msgid ", drag to adjust" +msgstr ", потащите мышкой, чтобы изменить его" -#: ../src/verbs.cpp:2727 -msgid "Dropper Preferences" -msgstr "Параметры Пипетки" +#: ../src/ui/widget/selected-style.cpp:1138 +#, c-format +msgid "Stroke width: %.5g%s%s" +msgstr "Толщина обводки: %.5g%s%s" -#: ../src/verbs.cpp:2728 -msgid "Open Preferences for the Dropper tool" -msgstr "Открыть окно параметров пипетки" +#: ../src/ui/widget/selected-style.cpp:1142 +msgid " (averaged)" +msgstr "(усреднено)" -#: ../src/verbs.cpp:2729 -msgid "Connector Preferences" -msgstr "Параметры Соединительных линий" +#: ../src/ui/widget/selected-style.cpp:1170 +msgid "0 (transparent)" +msgstr "0 (прозрачно)" -#: ../src/verbs.cpp:2730 -msgid "Open Preferences for the Connector tool" -msgstr "Открыть окно параметров соединительных линий" +#: ../src/ui/widget/selected-style.cpp:1194 +msgid "100% (opaque)" +msgstr "100% (непрозрачно)" -#: ../src/verbs.cpp:2731 -msgid "Paint Bucket Preferences" -msgstr "Параметры инструмента Сплошной заливки" +#: ../src/ui/widget/selected-style.cpp:1366 +#, fuzzy +msgid "Adjust alpha" +msgstr "Коррекция тона" -#: ../src/verbs.cpp:2732 -msgid "Open Preferences for the Paint Bucket tool" -msgstr "Открыть окно параметров инструмента для сплошной заливки" +#: ../src/ui/widget/selected-style.cpp:1368 +#, fuzzy, c-format +msgid "" +"Adjusting <b>alpha</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Ctrl</" +"b> to adjust lightness, with <b>Shift</b> to adjust saturation, without " +"modifiers to adjust hue" +msgstr "" +"Коррекция <b>яркости</b>: было %.3g, стало <b>%.3g</b> (разница %.3g); с " +"<b>Shift</b> для насыщенности, без модификаторов смены тона" -#: ../src/verbs.cpp:2733 -msgid "Eraser Preferences" -msgstr "Параметры Ластика" +#: ../src/ui/widget/selected-style.cpp:1372 +msgid "Adjust saturation" +msgstr "Коррекция насыщенности" -#: ../src/verbs.cpp:2734 -msgid "Open Preferences for the Eraser tool" -msgstr "Открыть окно параметров ластика" +#: ../src/ui/widget/selected-style.cpp:1374 +#, fuzzy, c-format +msgid "" +"Adjusting <b>saturation</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with " +"<b>Ctrl</b> to adjust lightness, with <b>Alt</b> to adjust alpha, without " +"modifiers to adjust hue" +msgstr "" +"Коррекция <b>насыщенности</b>: было %.3g, стало <b>%.3g</b> (разница %.3g); " +"с <b>Ctrl</b> для смены яркости, без модификаторов смены тона" -#: ../src/verbs.cpp:2735 -msgid "LPE Tool Preferences" -msgstr "Параметры инструмента для создания Геометрических конструкций" +#: ../src/ui/widget/selected-style.cpp:1378 +msgid "Adjust lightness" +msgstr "Коррекция яркости" -#: ../src/verbs.cpp:2736 -msgid "Open Preferences for the LPETool tool" +#: ../src/ui/widget/selected-style.cpp:1380 +#, fuzzy, c-format +msgid "" +"Adjusting <b>lightness</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with " +"<b>Shift</b> to adjust saturation, with <b>Alt</b> to adjust alpha, without " +"modifiers to adjust hue" msgstr "" -"Открыть окно параметров Inkscape для инструмента геометрических конструкций" +"Коррекция <b>яркости</b>: было %.3g, стало <b>%.3g</b> (разница %.3g); с " +"<b>Shift</b> для насыщенности, без модификаторов смены тона" -#. Zoom/View -#: ../src/verbs.cpp:2738 -msgid "Zoom In" -msgstr "Увеличить" +#: ../src/ui/widget/selected-style.cpp:1384 +msgid "Adjust hue" +msgstr "Коррекция тона" -#: ../src/verbs.cpp:2738 -msgid "Zoom in" -msgstr "Увеличить" +#: ../src/ui/widget/selected-style.cpp:1386 +#, fuzzy, c-format +msgid "" +"Adjusting <b>hue</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Shift</" +"b> to adjust saturation, with <b>Alt</b> to adjust alpha, with <b>Ctrl</b> " +"to adjust lightness" +msgstr "" +"Коррекция <b>тона</b>: было %.3g, стало <b>%.3g</b> (разница %.3g); с " +"<b>Shift</b> для смены насыщенности, с <b>Ctrl</b> для смены яркости" -#: ../src/verbs.cpp:2739 -msgid "Zoom Out" -msgstr "Уменьшить" +#: ../src/ui/widget/selected-style.cpp:1504 +#: ../src/ui/widget/selected-style.cpp:1518 +msgid "Adjust stroke width" +msgstr "Изменить толщину обводки" -#: ../src/verbs.cpp:2739 -msgid "Zoom out" -msgstr "Уменьшить" +#: ../src/ui/widget/selected-style.cpp:1505 +#, c-format +msgid "Adjusting <b>stroke width</b>: was %.3g, now <b>%.3g</b> (diff %.3g)" +msgstr "" +"Меняется <b>толщина обводки</b>: была %.3g, стала <b>%.3g</b> (разница %.3g)" -#: ../src/verbs.cpp:2740 -msgid "_Rulers" -msgstr "_Линейки" +#. TRANSLATORS: "Link" means to _link_ two sliders together +#: ../src/ui/widget/spin-scale.cpp:138 ../src/ui/widget/spin-slider.cpp:156 +msgctxt "Sliders" +msgid "Link" +msgstr "Связь" -#: ../src/verbs.cpp:2740 -msgid "Show or hide the canvas rulers" -msgstr "Показать/скрыть линейки холста" +#: ../src/ui/widget/style-swatch.cpp:293 +msgid "L Gradient" +msgstr "Лин. градиент" -#: ../src/verbs.cpp:2741 -msgid "Scroll_bars" -msgstr "Полосы _прокрутки" +#: ../src/ui/widget/style-swatch.cpp:297 +msgid "R Gradient" +msgstr "Рад. градиент" -#: ../src/verbs.cpp:2741 -msgid "Show or hide the canvas scrollbars" -msgstr "Показать или скрыть полосы прокрутки холста" +#: ../src/ui/widget/style-swatch.cpp:313 +#, c-format +msgid "Fill: %06x/%.3g" +msgstr "Заливка: %06x/%.3g" -#: ../src/verbs.cpp:2742 -#, fuzzy -msgid "Page _Grid" -msgstr "_Ширина страницы" +#: ../src/ui/widget/style-swatch.cpp:315 +#, c-format +msgid "Stroke: %06x/%.3g" +msgstr "Обводка: %06x/%.3g" -#: ../src/verbs.cpp:2742 +#: ../src/ui/widget/style-swatch.cpp:320 #, fuzzy -msgid "Show or hide the page grid" -msgstr "Показать или скрыть сетку" +msgctxt "Fill and stroke" +msgid "<i>None</i>" +msgstr "<i>Нет</i>" -#: ../src/verbs.cpp:2743 -msgid "G_uides" -msgstr "_Направляющие" +#: ../src/ui/widget/style-swatch.cpp:347 +#, c-format +msgid "Stroke width: %.5g%s" +msgstr "Толщина обводки: %.5g%s" -#: ../src/verbs.cpp:2743 -msgid "Show or hide guides (drag from a ruler to create a guide)" +#: ../src/ui/widget/style-swatch.cpp:363 +#, c-format +msgid "O: %2.0f" msgstr "" -"Показать или скрыть направляющие (создаваемые перетаскиванием с линейки)" - -#: ../src/verbs.cpp:2744 -msgid "Enable snapping" -msgstr "Включить прилипание" - -#: ../src/verbs.cpp:2745 -msgid "_Commands Bar" -msgstr "Панель _команд" - -#: ../src/verbs.cpp:2745 -msgid "Show or hide the Commands bar (under the menu)" -msgstr "Показать или скрыть панель команд (под меню)" -#: ../src/verbs.cpp:2746 -msgid "Sn_ap Controls Bar" -msgstr "Панель параметров при_липания" +#: ../src/ui/widget/style-swatch.cpp:368 +#, c-format +msgid "Opacity: %2.1f %%" +msgstr "Непрозрачность: %2.1f %%" -#: ../src/verbs.cpp:2746 -msgid "Show or hide the snapping controls" -msgstr "Показать или скрыть панель с параметрами прилипания" +#: ../src/vanishing-point.cpp:132 +msgid "Split vanishing points" +msgstr "Разделение точек схода" -#: ../src/verbs.cpp:2747 -msgid "T_ool Controls Bar" -msgstr "Панель параметров _инструментов" +#: ../src/vanishing-point.cpp:177 +msgid "Merge vanishing points" +msgstr "Объединение точек схода" -#: ../src/verbs.cpp:2747 -msgid "Show or hide the Tool Controls bar" -msgstr "Показать или скрыть панель с параметрами инструментов" +#: ../src/vanishing-point.cpp:243 +msgid "3D box: Move vanishing point" +msgstr "Параллелепипед: смещение точки схода" -#: ../src/verbs.cpp:2748 -msgid "_Toolbox" -msgstr "_Панель инструментов" +#: ../src/vanishing-point.cpp:327 +#, c-format +msgid "<b>Finite</b> vanishing point shared by <b>%d</b> box" +msgid_plural "" +"<b>Finite</b> vanishing point shared by <b>%d</b> boxes; drag with <b>Shift</" +"b> to separate selected box(es)" +msgstr[0] "<b>Конечная</b> точка схода разделяется <b>%d</b> параллелепипедом" +msgstr[1] "" +"<b>Конечная</b> точка схода разделяется <b>%d</b> параллелепипедами; " +"перетаскивание с <b>Shift</b> разделяет выбранные объекты" +msgstr[2] "" +"<b>Конечная</b> точка схода разделяется <b>%d</b> параллелепипедами; " +"перетаскивание с <b>Shift</b> разделяет выбранные объекты" -#: ../src/verbs.cpp:2748 -msgid "Show or hide the main toolbox (on the left)" -msgstr "Показать или скрыть главную панель инструментов (слева)" +#. This won't make sense any more when infinite VPs are not shown on the canvas, +#. but currently we update the status message anyway +#: ../src/vanishing-point.cpp:334 +#, c-format +msgid "<b>Infinite</b> vanishing point shared by <b>%d</b> box" +msgid_plural "" +"<b>Infinite</b> vanishing point shared by <b>%d</b> boxes; drag with " +"<b>Shift</b> to separate selected box(es)" +msgstr[0] "" +"<b>Неконечная</b> точка схода разделяется <b>%d</b> параллелепипедом" +msgstr[1] "" +"<b>Неконечная</b> точка схода разделяется <b>%d</b> параллелепипедами; " +"перетаскивание с <b>Shift</b> разделяет выбранные объекты" +msgstr[2] "" +"<b>Неконечная</b> точка схода разделяется <b>%d</b> параллелепипедами; " +"перетаскивание с <b>Shift</b> разделяет выбранные объекты" -#: ../src/verbs.cpp:2749 -msgid "_Palette" -msgstr "О_бразцы цветов" +#: ../src/vanishing-point.cpp:342 +#, c-format +msgid "" +"shared by <b>%d</b> box; drag with <b>Shift</b> to separate selected box(es)" +msgid_plural "" +"shared by <b>%d</b> boxes; drag with <b>Shift</b> to separate selected " +"box(es)" +msgstr[0] "" +"разделяемых <b>%d</b> параллелепипедом; перетаскиванием с <b>Shift</b> " +"разделяются выбранные параллелепипеды" +msgstr[1] "" +"разделяемых <b>%d</b> параллелепипедами; перетаскиванием с <b>Shift</b> " +"разделяются выбранные параллелепипеды" +msgstr[2] "" +"разделяемых <b>%d</b> параллелепипедами; перетаскиванием с <b>Shift</b> " +"разделяются выбранные параллелепипеды" -#: ../src/verbs.cpp:2749 -msgid "Show or hide the color palette" -msgstr "Показать или скрыть панель с палитрой цветов" +#: ../src/verbs.cpp:137 +#, fuzzy +msgid "File" +msgstr "_Файл" -#: ../src/verbs.cpp:2750 -msgid "_Statusbar" -msgstr "_Строка состояния" +#: ../src/verbs.cpp:232 +msgid "Context" +msgstr "Контекст" -#: ../src/verbs.cpp:2750 -msgid "Show or hide the statusbar (at the bottom of the window)" -msgstr "Показать или скрыть строку состояния (внизу окна)" +#: ../src/verbs.cpp:251 ../src/verbs.cpp:2223 +#: ../share/extensions/jessyInk_view.inx.h:1 +#: ../share/extensions/polyhedron_3d.inx.h:26 +msgid "View" +msgstr "Вид" -#: ../src/verbs.cpp:2751 -msgid "Nex_t Zoom" -msgstr "С_ледующий масштаб" +#: ../src/verbs.cpp:271 +#, fuzzy +msgid "Dialog" +msgstr "Тагальский" -#: ../src/verbs.cpp:2751 -msgid "Next zoom (from the history of zooms)" -msgstr "Следующий масштаб (из истории масштабирования)" +#: ../src/verbs.cpp:1227 +msgid "Switch to next layer" +msgstr "Перейти на следующий слой" -#: ../src/verbs.cpp:2753 -msgid "Pre_vious Zoom" -msgstr "_Предыдущий масштаб" +#: ../src/verbs.cpp:1228 +msgid "Switched to next layer." +msgstr "Переход на следующий слой." -#: ../src/verbs.cpp:2753 -msgid "Previous zoom (from the history of zooms)" -msgstr "Предыдущий масштаб (из истории масштабирования)" +#: ../src/verbs.cpp:1230 +msgid "Cannot go past last layer." +msgstr "Невозможно перейти за последний слой." -#: ../src/verbs.cpp:2755 -msgid "Zoom 1:_1" -msgstr "Масштаб 1:_1" +#: ../src/verbs.cpp:1239 +msgid "Switch to previous layer" +msgstr "Опускание на предыдущий слой" -#: ../src/verbs.cpp:2755 -msgid "Zoom to 1:1" -msgstr "Масштаб 1:1" +#: ../src/verbs.cpp:1240 +msgid "Switched to previous layer." +msgstr "Перемещен на предыдущий слой" -#: ../src/verbs.cpp:2757 -msgid "Zoom 1:_2" -msgstr "Масштаб 1:_2" +#: ../src/verbs.cpp:1242 +msgid "Cannot go before first layer." +msgstr "Невозможно перейти за первый слой." -#: ../src/verbs.cpp:2757 -msgid "Zoom to 1:2" -msgstr "Масштаб 1:2" +#: ../src/verbs.cpp:1263 ../src/verbs.cpp:1360 ../src/verbs.cpp:1396 +#: ../src/verbs.cpp:1402 ../src/verbs.cpp:1426 ../src/verbs.cpp:1441 +msgid "No current layer." +msgstr "Нет текущего слоя." -#: ../src/verbs.cpp:2759 -msgid "_Zoom 2:1" -msgstr "_Масштаб 2:1" +#: ../src/verbs.cpp:1292 ../src/verbs.cpp:1296 +#, c-format +msgid "Raised layer <b>%s</b>." +msgstr "Слой <b>%s</b> поднят." -#: ../src/verbs.cpp:2759 -msgid "Zoom to 2:1" -msgstr "Масштаб 2:1" +#: ../src/verbs.cpp:1293 +msgid "Layer to top" +msgstr "Слой на передний план" -#: ../src/verbs.cpp:2762 -msgid "_Fullscreen" -msgstr "Во весь _экран" +#: ../src/verbs.cpp:1297 +msgid "Raise layer" +msgstr "Повышение слоя" -#: ../src/verbs.cpp:2762 ../src/verbs.cpp:2764 -msgid "Stretch this document window to full screen" -msgstr "Развернуть окно документа на весь экран" +#: ../src/verbs.cpp:1300 ../src/verbs.cpp:1304 +#, c-format +msgid "Lowered layer <b>%s</b>." +msgstr "Слой <b>%s</b> опущен" -#: ../src/verbs.cpp:2764 -#, fuzzy -msgid "Fullscreen & Focus Mode" -msgstr "Переключить режим _фокуса" +#: ../src/verbs.cpp:1301 +msgid "Layer to bottom" +msgstr "Слой на задний план" -#: ../src/verbs.cpp:2767 -msgid "Toggle _Focus Mode" -msgstr "Переключить режим _фокуса" +#: ../src/verbs.cpp:1305 +msgid "Lower layer" +msgstr "Опускание слоя" -#: ../src/verbs.cpp:2767 -msgid "Remove excess toolbars to focus on drawing" -msgstr "" -"Убрать избыточные панели инструментов, чтобы сконцентрироваться на рисунке" +#: ../src/verbs.cpp:1314 +msgid "Cannot move layer any further." +msgstr "Невозможно переместить слой дальше." -#: ../src/verbs.cpp:2769 -msgid "Duplic_ate Window" -msgstr "Пов_торить окно" +#: ../src/verbs.cpp:1328 ../src/verbs.cpp:1347 +#, c-format +msgid "%s copy" +msgstr "Копия слоя %s" -#: ../src/verbs.cpp:2769 -msgid "Open a new window with the same document" -msgstr "Открыть новое окно с этим же документом" +#: ../src/verbs.cpp:1355 +msgid "Duplicate layer" +msgstr "Дубликация слоя" -#: ../src/verbs.cpp:2771 -msgid "_New View Preview" -msgstr "_Создать предварительный просмотр" +#. TRANSLATORS: this means "The layer has been duplicated." +#: ../src/verbs.cpp:1358 +msgid "Duplicated layer." +msgstr "Слой продублирован." -#: ../src/verbs.cpp:2772 -msgid "New View Preview" -msgstr "Создать новое окно предварительного просмотра" +#: ../src/verbs.cpp:1391 +msgid "Delete layer" +msgstr "Слой удалён" -#. "view_new_preview" -#: ../src/verbs.cpp:2774 ../src/verbs.cpp:2782 -msgid "_Normal" -msgstr "Об_ычная" +#. TRANSLATORS: this means "The layer has been deleted." +#: ../src/verbs.cpp:1394 +msgid "Deleted layer." +msgstr "Слой удалён." -#: ../src/verbs.cpp:2775 -msgid "Switch to normal display mode" -msgstr "Переключиться на обычное отображение" +#: ../src/verbs.cpp:1411 +msgid "Show all layers" +msgstr "Просмотр всех слоёв" -#: ../src/verbs.cpp:2776 -msgid "No _Filters" -msgstr "Б_ез фильтров" +#: ../src/verbs.cpp:1416 +msgid "Hide all layers" +msgstr "Сокрытие всех слоёв" -#: ../src/verbs.cpp:2777 -msgid "Switch to normal display without filters" -msgstr "Переключиться на обычное отображение без фильтров" +#: ../src/verbs.cpp:1421 +msgid "Lock all layers" +msgstr "Блокировка всех слоёв" -#: ../src/verbs.cpp:2778 -msgid "_Outline" -msgstr "К_аркас" +#: ../src/verbs.cpp:1435 +msgid "Unlock all layers" +msgstr "Разблокировка всех слоёв" -#: ../src/verbs.cpp:2779 -msgid "Switch to outline (wireframe) display mode" -msgstr "Переключиться на отображение каркаса объектов" +#: ../src/verbs.cpp:1519 +msgid "Flip horizontally" +msgstr "Отразить горизонтально" -#. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), -#. N_("Switch to print colors preview mode"), NULL), -#: ../src/verbs.cpp:2780 ../src/verbs.cpp:2788 -msgid "_Toggle" -msgstr "_Переключиться" +#: ../src/verbs.cpp:1524 +msgid "Flip vertically" +msgstr "Отразить вертикально" -#: ../src/verbs.cpp:2781 -msgid "Toggle between normal and outline display modes" -msgstr "Переключиться между нормальным и каркасным режимами отображения" +#. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, +#. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language +#. code); otherwise leave as "tutorial-basic.svg". +#: ../src/verbs.cpp:2105 +msgid "tutorial-basic.svg" +msgstr "tutorial-basic.ru.svg" -#: ../src/verbs.cpp:2783 -#, fuzzy -msgid "Switch to normal color display mode" -msgstr "Переключиться на обычное отображение" +#. TRANSLATORS: See "tutorial-basic.svg" comment. +#: ../src/verbs.cpp:2109 +msgid "tutorial-shapes.svg" +msgstr "tutorial-shapes.ru.svg" -#: ../src/verbs.cpp:2784 -msgid "_Grayscale" -msgstr "_Градации серого" +#. TRANSLATORS: See "tutorial-basic.svg" comment. +#: ../src/verbs.cpp:2113 +msgid "tutorial-advanced.svg" +msgstr "tutorial-advanced.ru.svg" -#: ../src/verbs.cpp:2785 -#, fuzzy -msgid "Switch to grayscale display mode" -msgstr "Переключиться на обычное отображение" +#. TRANSLATORS: See "tutorial-basic.svg" comment. +#: ../src/verbs.cpp:2117 +msgid "tutorial-tracing.svg" +msgstr "tutorial-tracing.ru.svg" -#: ../src/verbs.cpp:2789 +#: ../src/verbs.cpp:2120 #, fuzzy -msgid "Toggle between normal and grayscale color display modes" -msgstr "Переключиться между нормальным и каркасным режимами отображения" - -#: ../src/verbs.cpp:2791 -msgid "Color-managed view" -msgstr "Цветоуправляемое отображение" +msgid "tutorial-tracing-pixelart.svg" +msgstr "tutorial-tracing.ru.svg" -#: ../src/verbs.cpp:2792 -msgid "Toggle color-managed display for this document window" -msgstr "Включить или выключить управление цветом для этого окна с документом" +#. TRANSLATORS: See "tutorial-basic.svg" comment. +#: ../src/verbs.cpp:2124 +msgid "tutorial-calligraphy.svg" +msgstr "tutorial-calligraphy.ru.svg" -#: ../src/verbs.cpp:2794 -msgid "Ico_n Preview..." -msgstr "Просмотреть как _значок" +#. TRANSLATORS: See "tutorial-basic.svg" comment. +#: ../src/verbs.cpp:2128 +#, fuzzy +msgid "tutorial-interpolate.svg" +msgstr "tutorial-interpolate.svg" -#: ../src/verbs.cpp:2795 -msgid "Open a window to preview objects at different icon resolutions" -msgstr "Просмотреть выделение как значок разных размеров" +#. TRANSLATORS: See "tutorial-basic.svg" comment. +#: ../src/verbs.cpp:2132 +msgid "tutorial-elements.svg" +msgstr "tutorial-elements.ru.svg" -#: ../src/verbs.cpp:2797 -msgid "Zoom to fit page in window" -msgstr "Масштабировать так, чтобы целиком уместить страницу в окне" +#. TRANSLATORS: See "tutorial-basic.svg" comment. +#: ../src/verbs.cpp:2136 +msgid "tutorial-tips.svg" +msgstr "tutorial-tips.ru.svg" -#: ../src/verbs.cpp:2798 -msgid "Page _Width" -msgstr "_Ширина страницы" +#: ../src/verbs.cpp:2322 ../src/verbs.cpp:2913 +msgid "Unlock all objects in the current layer" +msgstr "Разблокировка всех объектов в текущем слое" -#: ../src/verbs.cpp:2799 -msgid "Zoom to fit page width in window" -msgstr "Масштабировать так, чтобы уместить в окне страницу по ширине" +#: ../src/verbs.cpp:2326 ../src/verbs.cpp:2915 +msgid "Unlock all objects in all layers" +msgstr "Разблокировка всех объектов во всех слоях" -#: ../src/verbs.cpp:2801 -msgid "Zoom to fit drawing in window" -msgstr "Масштабировать так, чтобы целиком уместить рисунок в окне" +#: ../src/verbs.cpp:2330 ../src/verbs.cpp:2917 +msgid "Unhide all objects in the current layer" +msgstr "Раскрыть все объекты в текущем слое" -#: ../src/verbs.cpp:2803 -msgid "Zoom to fit selection in window" -msgstr "Масштабировать так, чтобы уместить в окне выделенную область" +#: ../src/verbs.cpp:2334 ../src/verbs.cpp:2919 +msgid "Unhide all objects in all layers" +msgstr "Раскрыть все объекты во всех слоях" -#. Dialogs -#: ../src/verbs.cpp:2806 -msgid "P_references..." -msgstr "_Параметры..." +#: ../src/verbs.cpp:2349 +#, fuzzy +msgctxt "Verb" +msgid "None" +msgstr "Нет" -#: ../src/verbs.cpp:2807 -msgid "Edit global Inkscape preferences" -msgstr "Изменить общие настройки Inkscape" +#: ../src/verbs.cpp:2349 +msgid "Does nothing" +msgstr "Нет действий" -#: ../src/verbs.cpp:2808 -msgid "_Document Properties..." -msgstr "Свойства _документа..." +#: ../src/verbs.cpp:2352 +msgid "Create new document from the default template" +msgstr "Создать новый документ из стандартного шаблона" -#: ../src/verbs.cpp:2809 -msgid "Edit properties of this document (to be saved with the document)" -msgstr "Изменить параметры этого документа, сохраняемые вместе с ним" +#: ../src/verbs.cpp:2354 +msgid "_Open..." +msgstr "_Открыть..." -#: ../src/verbs.cpp:2810 -msgid "Document _Metadata..." -msgstr "_Метаданные документа..." +#: ../src/verbs.cpp:2355 +msgid "Open an existing document" +msgstr "Открыть существующий документ" -#: ../src/verbs.cpp:2811 -msgid "Edit document metadata (to be saved with the document)" -msgstr "Изменить сведения о документе, сохраняемые вместе с ним" +#: ../src/verbs.cpp:2356 +msgid "Re_vert" +msgstr "_Восстановить" -#: ../src/verbs.cpp:2813 -msgid "" -"Edit objects' colors, gradients, arrowheads, and other fill and stroke " -"properties..." +#: ../src/verbs.cpp:2357 +msgid "Revert to the last saved version of document (changes will be lost)" msgstr "" -"Изменить заливку объекта, параметры обводки, маркеры и штриховку стрелок..." - -#. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon -#: ../src/verbs.cpp:2815 -msgid "Gl_yphs..." -msgstr "_Глифы..." - -#: ../src/verbs.cpp:2816 -msgid "Select characters from a glyphs palette" -msgstr "Выбрать символы из палитры глифов" - -#. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon -#. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2819 -msgid "S_watches..." -msgstr "Образцы _цветов..." - -#: ../src/verbs.cpp:2820 -msgid "Select colors from a swatches palette" -msgstr "Выбрать цвет из палитры образцов" - -#: ../src/verbs.cpp:2821 -msgid "S_ymbols..." -msgstr "С_имволы..." - -#: ../src/verbs.cpp:2822 -#, fuzzy -msgid "Select symbol from a symbols palette" -msgstr "Выбрать цвет из палитры образцов" - -#: ../src/verbs.cpp:2823 -msgid "Transfor_m..." -msgstr "Транс_формировать..." +"Вернуться к последней сохраненной версии документа (изменения будут потеряны)" -#: ../src/verbs.cpp:2824 -msgid "Precisely control objects' transformations" -msgstr "Точно изменить текущий объект" +#: ../src/verbs.cpp:2358 +msgid "Save document" +msgstr "Сохранить документ" -#: ../src/verbs.cpp:2825 -msgid "_Align and Distribute..." -msgstr "_Выровнять и расставить..." +#: ../src/verbs.cpp:2360 +msgid "Save _As..." +msgstr "Сохранить _как..." -#: ../src/verbs.cpp:2826 -msgid "Align and distribute objects" -msgstr "Выровнять и расставить объекты" +#: ../src/verbs.cpp:2361 +msgid "Save document under a new name" +msgstr "Сохранить документ под другим именем" -#: ../src/verbs.cpp:2827 -msgid "_Spray options..." -msgstr "П_араметры распылителя..." +#: ../src/verbs.cpp:2362 +msgid "Save a Cop_y..." +msgstr "Сохр_анить копию..." -#: ../src/verbs.cpp:2828 -msgid "Some options for the spray" -msgstr "Параметры распылителя" +#: ../src/verbs.cpp:2363 +msgid "Save a copy of the document under a new name" +msgstr "Сохранить копию документа под другим именем" -#: ../src/verbs.cpp:2829 -msgid "Undo _History..." -msgstr "_История действий..." +#: ../src/verbs.cpp:2364 +msgid "_Print..." +msgstr "На_печатать..." -#: ../src/verbs.cpp:2830 -msgid "Undo History" -msgstr "История действий" +#: ../src/verbs.cpp:2364 +msgid "Print document" +msgstr "Напечатать документ" -#: ../src/verbs.cpp:2832 -msgid "View and select font family, font size and other text properties" -msgstr "Просмотреть и выбрать гарнитуру, кегль и прочие характеристики текста" +#. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) +#: ../src/verbs.cpp:2367 +msgid "Clean _up document" +msgstr "Под_чистить документ" -#: ../src/verbs.cpp:2833 -msgid "_XML Editor..." -msgstr "Редактор _XML..." +#: ../src/verbs.cpp:2367 +msgid "" +"Remove unused definitions (such as gradients or clipping paths) from the <" +"defs> of the document" +msgstr "" +"Убрать ненужное (например, градиенты или обтравочные контуры) из <" +"defs> документа" -#: ../src/verbs.cpp:2834 -msgid "View and edit the XML tree of the document" -msgstr "Просмотреть и изменить XML-дерево документа" +#: ../src/verbs.cpp:2369 +msgid "_Import..." +msgstr "_Импортировать..." -#: ../src/verbs.cpp:2835 -msgid "_Find/Replace..." -msgstr "_Найти/заменить..." +#: ../src/verbs.cpp:2370 +msgid "Import a bitmap or SVG image into this document" +msgstr "Импортировать растровое или SVG-изображение в документ" -#: ../src/verbs.cpp:2836 -msgid "Find objects in document" -msgstr "Найти объекты в документе" +#. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), +#: ../src/verbs.cpp:2372 +msgid "Import Clip Art..." +msgstr "_Импортировать из Open Clip Art Library..." -#: ../src/verbs.cpp:2837 -msgid "Find and _Replace Text..." -msgstr "_Найти и заменить текст..." +# +#: ../src/verbs.cpp:2373 +msgid "Import clipart from Open Clip Art Library" +msgstr "Импортировать рисунки из Open Clip Art Library" -#: ../src/verbs.cpp:2838 -msgid "Find and replace text in document" -msgstr "Найти и заменить текст в документе" +#. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), +#: ../src/verbs.cpp:2375 +msgid "N_ext Window" +msgstr "Сл_едующее окно" -#: ../src/verbs.cpp:2840 -msgid "Check spelling of text in document" -msgstr "Проверить правописание текста в документе" +#: ../src/verbs.cpp:2376 +msgid "Switch to the next document window" +msgstr "Переключиться в следующее окно документа" -#: ../src/verbs.cpp:2841 -msgid "_Messages..." -msgstr "_Сообщения..." +#: ../src/verbs.cpp:2377 +msgid "P_revious Window" +msgstr "_Предыдущее окно" -#: ../src/verbs.cpp:2842 -msgid "View debug messages" -msgstr "Просмотреть отладочные сообщения" +#: ../src/verbs.cpp:2378 +msgid "Switch to the previous document window" +msgstr "Переключиться в предыдущее окно документа" -#: ../src/verbs.cpp:2843 -msgid "Show/Hide D_ialogs" -msgstr "Показать или скр_ыть диалоги" +#: ../src/verbs.cpp:2379 +msgid "_Close" +msgstr "_Закрыть" -#: ../src/verbs.cpp:2844 -msgid "Show or hide all open dialogs" -msgstr "Показать или скрыть все открытые диалоги" +#: ../src/verbs.cpp:2380 +msgid "Close this document window" +msgstr "Закрыть это окно документа" -#: ../src/verbs.cpp:2845 -msgid "Create Tiled Clones..." -msgstr "_Создать узор из клонов..." +#: ../src/verbs.cpp:2381 +msgid "_Quit" +msgstr "В_ыход" -#: ../src/verbs.cpp:2846 -msgid "" -"Create multiple clones of selected object, arranging them into a pattern or " -"scattering" -msgstr "" -"Создать несколько клонов выделенного объекта, расставив их в текстуру или " -"разбросав" +#: ../src/verbs.cpp:2381 +msgid "Quit Inkscape" +msgstr "Завершить работу с Inkscape" -#: ../src/verbs.cpp:2847 +#: ../src/verbs.cpp:2382 #, fuzzy -msgid "_Object attributes..." -msgstr "_Свойства объекта..." +msgid "_Templates..." +msgstr "Образцы _цветов..." -#: ../src/verbs.cpp:2848 +#: ../src/verbs.cpp:2383 #, fuzzy -msgid "Edit the object attributes..." -msgstr "Установить атрибут" +msgid "Create new project from template" +msgstr "Создать новый документ из стандартного шаблона" -#: ../src/verbs.cpp:2850 -msgid "Edit the ID, locked and visible status, and other object properties" -msgstr "" -"Изменить ID, статус заблокированности и видимости, иные свойства объекта" +#: ../src/verbs.cpp:2386 +msgid "Undo last action" +msgstr "Отменить последнее действие" -#: ../src/verbs.cpp:2851 -msgid "_Input Devices..." -msgstr "_Устройства ввода..." +#: ../src/verbs.cpp:2389 +msgid "Do again the last undone action" +msgstr "Повторить последнее отменённое действие" -#: ../src/verbs.cpp:2852 -msgid "Configure extended input devices, such as a graphics tablet" -msgstr "Настройка расширенных устройств ввода, таких как графический планшет" +#: ../src/verbs.cpp:2390 +msgid "Cu_t" +msgstr "_Вырезать" -#: ../src/verbs.cpp:2853 -msgid "_Extensions..." -msgstr "_Расширения..." +#: ../src/verbs.cpp:2391 +msgid "Cut selection to clipboard" +msgstr "Вырезать выделение в буфер обмена" -#: ../src/verbs.cpp:2854 -msgid "Query information about extensions" -msgstr "Запросить информацию о расширениях" +#: ../src/verbs.cpp:2392 +msgid "_Copy" +msgstr "С_копировать" -#: ../src/verbs.cpp:2855 -msgid "Layer_s..." -msgstr "Сл_ои..." +#: ../src/verbs.cpp:2393 +msgid "Copy selection to clipboard" +msgstr "Скопировать выделение в буфер обмена" -#: ../src/verbs.cpp:2856 -msgid "View Layers" -msgstr "Открыть палитру слоёв" +#: ../src/verbs.cpp:2394 +msgid "_Paste" +msgstr "Вст_авить" -#: ../src/verbs.cpp:2857 -msgid "Path E_ffects ..." -msgstr "_Контурные эффекты..." +#: ../src/verbs.cpp:2395 +msgid "Paste objects from clipboard to mouse point, or paste text" +msgstr "Вставить объект из буфера обмена под курсор, либо вставить текст" -#: ../src/verbs.cpp:2858 -msgid "Manage, edit, and apply path effects" -msgstr "Управление, редактирование и применение контурных эффектов" +#: ../src/verbs.cpp:2396 +msgid "Paste _Style" +msgstr "Вставить _стиль" -#: ../src/verbs.cpp:2859 -msgid "Filter _Editor..." -msgstr "Редактор _фильтров..." +#: ../src/verbs.cpp:2397 +msgid "Apply the style of the copied object to selection" +msgstr "Применить стиль скопированного объекта к выделению" -#: ../src/verbs.cpp:2860 -msgid "Manage, edit, and apply SVG filters" -msgstr "Управление, редактирование и применение фильтров SVG" +#: ../src/verbs.cpp:2399 +msgid "Scale selection to match the size of the copied object" +msgstr "Отмасштабировать выделение до размеров скопированного объекта" -#: ../src/verbs.cpp:2861 -msgid "SVG Font Editor..." -msgstr "Редактор шрифтов SVG..." +#: ../src/verbs.cpp:2400 +msgid "Paste _Width" +msgstr "Вставить _ширину" -#: ../src/verbs.cpp:2862 -msgid "Edit SVG fonts" -msgstr "Редактирование шрифтов SVG" +#: ../src/verbs.cpp:2401 +msgid "Scale selection horizontally to match the width of the copied object" +msgstr "" +"Отмасштабировать выделение по горизонтали до высоты скопированного объекта" -#: ../src/verbs.cpp:2863 -msgid "Print Colors..." -msgstr "Печатаемые плашки..." +#: ../src/verbs.cpp:2402 +msgid "Paste _Height" +msgstr "Вставить _высоту" -#: ../src/verbs.cpp:2864 +#: ../src/verbs.cpp:2403 +msgid "Scale selection vertically to match the height of the copied object" +msgstr "" +"Отмасштабировать выделение по вертикали до высоты скопированного объекта" + +#: ../src/verbs.cpp:2404 +msgid "Paste Size Separately" +msgstr "Вставить размер раздельно" + +#: ../src/verbs.cpp:2405 +msgid "Scale each selected object to match the size of the copied object" +msgstr "" +"Отмасштабировать каждый выбранный объект до совпадения с размерами " +"скопированного объекта" + +#: ../src/verbs.cpp:2406 +msgid "Paste Width Separately" +msgstr "Вставить ширину раздельно" + +#: ../src/verbs.cpp:2407 msgid "" -"Select which color separations to render in Print Colors Preview rendermode" +"Scale each selected object horizontally to match the width of the copied " +"object" msgstr "" +"Отмасштабировать каждый выбранный объект по горизонтали до ширины " +"скопированного объекта" -#: ../src/verbs.cpp:2865 -msgid "_Export PNG Image..." -msgstr "_Экспортировать в PNG..." +#: ../src/verbs.cpp:2408 +msgid "Paste Height Separately" +msgstr "Вставить высоту раздельно" -#: ../src/verbs.cpp:2866 -#, fuzzy -msgid "Export this document or a selection as a PNG image" -msgstr "Экспортировать документ или выделенное в PNG" +#: ../src/verbs.cpp:2409 +msgid "" +"Scale each selected object vertically to match the height of the copied " +"object" +msgstr "" +"Отмасштабировать каждый выбранный объект по вертикали до высоты " +"скопированного объекта" -#. Help -#: ../src/verbs.cpp:2868 -msgid "About E_xtensions" -msgstr "О р_асширениях" +#: ../src/verbs.cpp:2410 +msgid "Paste _In Place" +msgstr "Вставить на _место" -#: ../src/verbs.cpp:2869 -msgid "Information on Inkscape extensions" -msgstr "Информация о расширениях Inkscape" +#: ../src/verbs.cpp:2411 +msgid "Paste objects from clipboard to the original location" +msgstr "Вставить объекты из буфера обмена в их исходное местоположение" -#: ../src/verbs.cpp:2870 -msgid "About _Memory" -msgstr "Об используемой _памяти" +#: ../src/verbs.cpp:2412 +msgid "Paste Path _Effect" +msgstr "_Вставить контурный эффект" -#: ../src/verbs.cpp:2871 -msgid "Memory usage information" -msgstr "Информация об используемой памяти" +#: ../src/verbs.cpp:2413 +msgid "Apply the path effect of the copied object to selection" +msgstr "Применить контурный эффект скопированного объекта к выделению" -#: ../src/verbs.cpp:2872 -msgid "_About Inkscape" -msgstr "_О программе" +#: ../src/verbs.cpp:2414 +msgid "Remove Path _Effect" +msgstr "_Удалить контурный эффект" -#: ../src/verbs.cpp:2873 -msgid "Inkscape version, authors, license" -msgstr "Версия Inkscape, авторы, лицензия" +#: ../src/verbs.cpp:2415 +msgid "Remove any path effects from selected objects" +msgstr "Убрать все контурные эффекты из выделения" -#. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), -#. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), -#. Tutorials -#: ../src/verbs.cpp:2878 -msgid "Inkscape: _Basic" -msgstr "Inkscape: _Основы" +#: ../src/verbs.cpp:2416 +msgid "_Remove Filters" +msgstr "С_нять фильтры" -#: ../src/verbs.cpp:2879 -msgid "Getting started with Inkscape" -msgstr "Начинаем работу с Inkscape" +#: ../src/verbs.cpp:2417 +msgid "Remove any filters from selected objects" +msgstr "Снять все фильтры с выделения" -#. "tutorial_basic" -#: ../src/verbs.cpp:2880 -msgid "Inkscape: _Shapes" -msgstr "Inkscape: _Фигуры" +#: ../src/verbs.cpp:2418 +msgid "_Delete" +msgstr "У_далить" -#: ../src/verbs.cpp:2881 -msgid "Using shape tools to create and edit shapes" -msgstr "Использование инструментов рисования и редактирования фигур" +#: ../src/verbs.cpp:2419 +msgid "Delete selection" +msgstr "Удалить выделение" -#: ../src/verbs.cpp:2882 -msgid "Inkscape: _Advanced" -msgstr "Inkscape: _Продвинутый курс" +#: ../src/verbs.cpp:2420 +msgid "Duplic_ate" +msgstr "Проду_блировать" -#: ../src/verbs.cpp:2883 -msgid "Advanced Inkscape topics" -msgstr "Дополнительные темы по Inkscape" +#: ../src/verbs.cpp:2421 +msgid "Duplicate selected objects" +msgstr "Продублировать выделенные объекты" -#. "tutorial_advanced" -#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2885 -msgid "Inkscape: T_racing" -msgstr "Inkscape: _Векторизация" +#: ../src/verbs.cpp:2422 +msgid "Create Clo_ne" +msgstr "Создать _клон" -#: ../src/verbs.cpp:2886 -msgid "Using bitmap tracing" -msgstr "Использование векторизации" +#: ../src/verbs.cpp:2423 +msgid "Create a clone (a copy linked to the original) of selected object" +msgstr "Создать клон выделенного объекта (копию, связанную с оригиналом)" -#. "tutorial_tracing" -#: ../src/verbs.cpp:2887 -#, fuzzy -msgid "Inkscape: Tracing Pixel Art" -msgstr "Inkscape: _Векторизация" +#: ../src/verbs.cpp:2424 +msgid "Unlin_k Clone" +msgstr "О_тсоединить клон" -#: ../src/verbs.cpp:2888 -msgid "Using Trace Pixel Art dialog" +#: ../src/verbs.cpp:2425 +msgid "" +"Cut the selected clones' links to the originals, turning them into " +"standalone objects" msgstr "" +"Убрать ссылки клонов на их оригиналы, превратив клоны в самостоятельные " +"объекты" -#: ../src/verbs.cpp:2889 -msgid "Inkscape: _Calligraphy" -msgstr "Inkscape: _Каллиграфия" +#: ../src/verbs.cpp:2426 +msgid "Relink to Copied" +msgstr "Связать с объектом в буфере обмена" -#: ../src/verbs.cpp:2890 -msgid "Using the Calligraphy pen tool" -msgstr "Использование каллиграфического пера" +#: ../src/verbs.cpp:2427 +msgid "Relink the selected clones to the object currently on the clipboard" +msgstr "Заново связать выбранные клоны с объектом в буфере обмена" -#: ../src/verbs.cpp:2891 -msgid "Inkscape: _Interpolate" -msgstr "Inkscape: _Интерполяция" +#: ../src/verbs.cpp:2428 +msgid "Select _Original" +msgstr "Выделить _оригинал" -#: ../src/verbs.cpp:2892 -msgid "Using the interpolate extension" -msgstr "Использование расширения для интерполяции" +#: ../src/verbs.cpp:2429 +msgid "Select the object to which the selected clone is linked" +msgstr "Выделить объект, с которым связан клон" -#. "tutorial_interpolate" -#: ../src/verbs.cpp:2893 -msgid "_Elements of Design" -msgstr "Основы _дизайна" +#: ../src/verbs.cpp:2430 +#, fuzzy +msgid "Clone original path (LPE)" +msgstr "Заменить текст" -#: ../src/verbs.cpp:2894 -msgid "Principles of design in the tutorial form" -msgstr "Самоучитель по элементам дизайна в виде урока" +#: ../src/verbs.cpp:2431 +msgid "" +"Creates a new path, applies the Clone original LPE, and refers it to the " +"selected path" +msgstr "" -#. "tutorial_design" -#: ../src/verbs.cpp:2895 -msgid "_Tips and Tricks" -msgstr "Inkscape: _Советы и хитрости" +#: ../src/verbs.cpp:2432 +msgid "Objects to _Marker" +msgstr "Объекты в м_аркер" -#: ../src/verbs.cpp:2896 -msgid "Miscellaneous tips and tricks" -msgstr "Различные советы по использованию программы" +#: ../src/verbs.cpp:2433 +msgid "Convert selection to a line marker" +msgstr "Превратить выделение в маркер линий" -#. "tutorial_tips" -#. Effect -- renamed Extension -#: ../src/verbs.cpp:2899 -msgid "Previous Exte_nsion" -msgstr "Повторить _выполнение" +#: ../src/verbs.cpp:2434 +msgid "Objects to Gu_ides" +msgstr "Объ_екты в направляющие" -#: ../src/verbs.cpp:2900 -msgid "Repeat the last extension with the same settings" -msgstr "Повторно выполнить последнее расширение с теми же параметрами" +#: ../src/verbs.cpp:2435 +msgid "" +"Convert selected objects to a collection of guidelines aligned with their " +"edges" +msgstr "Превратить выбранные объекты в набор направляющих по краям объектов" -#: ../src/verbs.cpp:2901 -msgid "_Previous Extension Settings..." -msgstr "Повторить с _изменениями..." +#: ../src/verbs.cpp:2436 +msgid "Objects to Patter_n" +msgstr "_Объект(ы) в текстуру" -#: ../src/verbs.cpp:2902 -msgid "Repeat the last extension with new settings" -msgstr "Повторно выполнить последнее расширение с новыми параметрами" +#: ../src/verbs.cpp:2437 +msgid "Convert selection to a rectangle with tiled pattern fill" +msgstr "Преобразовать выделение в прямоугольник, заполненный текстурой" -#: ../src/verbs.cpp:2906 -msgid "Fit the page to the current selection" -msgstr "Откадрировать холст до текущего выделения" +#: ../src/verbs.cpp:2438 +msgid "Pattern to _Objects" +msgstr "_Текстуру в объект(ы)" -#: ../src/verbs.cpp:2908 -msgid "Fit the page to the drawing" -msgstr "Откадрировать холст до рисунка" +#: ../src/verbs.cpp:2439 +msgid "Extract objects from a tiled pattern fill" +msgstr "Извлечь объекты из текстурной заливки" -#: ../src/verbs.cpp:2910 -msgid "" -"Fit the page to the current selection or the drawing if there is no selection" +#: ../src/verbs.cpp:2440 +msgid "Group to Symbol" +msgstr "Группа в символ" + +#: ../src/verbs.cpp:2441 +#, fuzzy +msgid "Convert group to a symbol" +msgstr "Оконтуривание обводки" + +#: ../src/verbs.cpp:2442 +msgid "Symbol to Group" +msgstr "Символ в группу" + +#: ../src/verbs.cpp:2443 +msgid "Extract group from a symbol" msgstr "" -"Откадрировать холст до текущего выделения или рисунка, если ничего не " -"выделено" -#. LockAndHide -#: ../src/verbs.cpp:2912 -msgid "Unlock All" -msgstr "Разблокировка всего" +#: ../src/verbs.cpp:2444 +msgid "Clea_r All" +msgstr "О_чистить все" -#: ../src/verbs.cpp:2914 -msgid "Unlock All in All Layers" -msgstr "Разблокировать все во всех слоях" +#: ../src/verbs.cpp:2445 +msgid "Delete all objects from document" +msgstr "Удалить все объекты из документа" -#: ../src/verbs.cpp:2916 -msgid "Unhide All" -msgstr "Раскрыть все" +#: ../src/verbs.cpp:2446 +msgid "Select Al_l" +msgstr "Выделить _все" -#: ../src/verbs.cpp:2918 -msgid "Unhide All in All Layers" -msgstr "Раскрыть все во всех слоях" +#: ../src/verbs.cpp:2447 +msgid "Select all objects or all nodes" +msgstr "Выделить все объекты или все узлы" -#: ../src/verbs.cpp:2922 -msgid "Link an ICC color profile" -msgstr "Связать с цветовым профилем ICC" +#: ../src/verbs.cpp:2448 +msgid "Select All in All La_yers" +msgstr "Выделить все во всех сло_ях" -#: ../src/verbs.cpp:2923 -msgid "Remove Color Profile" -msgstr "Удалить цветовой профиль" +#: ../src/verbs.cpp:2449 +msgid "Select all objects in all visible and unlocked layers" +msgstr "Выделить все объекты во всех видимых и незаблокированных слоях" -#: ../src/verbs.cpp:2924 -msgid "Remove a linked ICC color profile" -msgstr "Удалить связанный цветовой профиль ICC" +#: ../src/verbs.cpp:2450 +msgid "Fill _and Stroke" +msgstr "_Заливка и обводка" -#: ../src/verbs.cpp:2927 +#: ../src/verbs.cpp:2451 #, fuzzy -msgid "Add External Script" -msgstr "Добавить внешний сценарий" +msgid "" +"Select all objects with the same fill and stroke as the selected objects" +msgstr "" +"Выделите <b>объект с текстурной заливкой</b> для извлечения из него объектов." -#: ../src/verbs.cpp:2927 -#, fuzzy -msgid "Add an external script" -msgstr "Добавить внешний сценарий" +#: ../src/verbs.cpp:2452 +msgid "_Fill Color" +msgstr "_Цвет заливки" -#: ../src/verbs.cpp:2929 +#: ../src/verbs.cpp:2453 #, fuzzy -msgid "Add Embedded Script" -msgstr "Добавить внешний сценарий" +msgid "Select all objects with the same fill as the selected objects" +msgstr "" +"Выделите <b>объект с текстурной заливкой</b> для извлечения из него объектов." -#: ../src/verbs.cpp:2929 -#, fuzzy -msgid "Add an embedded script" -msgstr "Добавить внешний сценарий" +#: ../src/verbs.cpp:2454 +msgid "_Stroke Color" +msgstr "Ц_вет обводки" -#: ../src/verbs.cpp:2931 +#: ../src/verbs.cpp:2455 #, fuzzy -msgid "Edit Embedded Script" -msgstr "Удалить сценарий" +msgid "Select all objects with the same stroke as the selected objects" +msgstr "" +"Отмасштабировать каждый выбранный объект до совпадения с размерами " +"скопированного объекта" -#: ../src/verbs.cpp:2931 -#, fuzzy -msgid "Edit an embedded script" -msgstr "Удалить сценарий" +#: ../src/verbs.cpp:2456 +msgid "Stroke St_yle" +msgstr "_Стиль обводки" -#: ../src/verbs.cpp:2933 +#: ../src/verbs.cpp:2457 #, fuzzy -msgid "Remove External Script" -msgstr "Удалить внешний сценарий" +msgid "" +"Select all objects with the same stroke style (width, dash, markers) as the " +"selected objects" +msgstr "" +"Отмасштабировать каждый выбранный объект до совпадения с размерами " +"скопированного объекта" -#: ../src/verbs.cpp:2933 -#, fuzzy -msgid "Remove an external script" -msgstr "Удалить внешний сценарий" +#: ../src/verbs.cpp:2458 +msgid "_Object Type" +msgstr "_Тип объекта" -#: ../src/verbs.cpp:2935 +#: ../src/verbs.cpp:2459 #, fuzzy -msgid "Remove Embedded Script" -msgstr "Удалить сценарий" +msgid "" +"Select all objects with the same object type (rect, arc, text, path, bitmap " +"etc) as the selected objects" +msgstr "" +"Отмасштабировать каждый выбранный объект до совпадения с размерами " +"скопированного объекта" -#: ../src/verbs.cpp:2935 -#, fuzzy -msgid "Remove an embedded script" -msgstr "Удалить сценарий" +#: ../src/verbs.cpp:2460 +msgid "In_vert Selection" +msgstr "Инвертировать выделение" -#: ../src/verbs.cpp:2957 ../src/verbs.cpp:2958 -#, fuzzy -msgid "Center on horizontal and vertical axis" -msgstr "Центрировать на горизонтальной оси" +#: ../src/verbs.cpp:2461 +msgid "Invert selection (unselect what is selected and select everything else)" +msgstr "" +"Инвертировать выделение (выделить все кроме выделенного в настоящий момент)" -#: ../src/widgets/arc-toolbar.cpp:131 -msgid "Arc: Change start/end" -msgstr "Дуга: изменить начало/конец" +#: ../src/verbs.cpp:2462 +msgid "Invert in All Layers" +msgstr "Инвертировать во всех слоях" + +#: ../src/verbs.cpp:2463 +msgid "Invert selection in all visible and unlocked layers" +msgstr "Инвертировать выделение во всех видимых и незаблокированных слоях" + +#: ../src/verbs.cpp:2464 +msgid "Select Next" +msgstr "Выбрать следующий" + +#: ../src/verbs.cpp:2465 +msgid "Select next object or node" +msgstr "Выбрать следующий объект или узел" + +#: ../src/verbs.cpp:2466 +msgid "Select Previous" +msgstr "Выбрать предыдущий" + +#: ../src/verbs.cpp:2467 +msgid "Select previous object or node" +msgstr "Выбрать предыдущий объект или узел" + +#: ../src/verbs.cpp:2468 +msgid "D_eselect" +msgstr "Сн_ять выделение" -#: ../src/widgets/arc-toolbar.cpp:197 -msgid "Arc: Change open/closed" -msgstr "Дуга: Изменить открытость/закрытость" +#: ../src/verbs.cpp:2469 +msgid "Deselect any selected objects or nodes" +msgstr "Снять выделение со всех объектов или узлов" -#: ../src/widgets/arc-toolbar.cpp:288 ../src/widgets/arc-toolbar.cpp:317 -#: ../src/widgets/rect-toolbar.cpp:258 ../src/widgets/rect-toolbar.cpp:296 -#: ../src/widgets/spiral-toolbar.cpp:214 ../src/widgets/spiral-toolbar.cpp:238 -#: ../src/widgets/star-toolbar.cpp:383 ../src/widgets/star-toolbar.cpp:444 -msgid "<b>New:</b>" -msgstr "<b>Новый:</b>" +#: ../src/verbs.cpp:2471 +#, fuzzy +msgid "Delete all the guides in the document" +msgstr "Удалить все объекты из документа" -#. FIXME: implement averaging of all parameters for multiple selected -#. gtk_label_set_markup(GTK_LABEL(l), _("<b>Average:</b>")); -#: ../src/widgets/arc-toolbar.cpp:291 ../src/widgets/arc-toolbar.cpp:302 -#: ../src/widgets/rect-toolbar.cpp:266 ../src/widgets/rect-toolbar.cpp:284 -#: ../src/widgets/spiral-toolbar.cpp:216 ../src/widgets/spiral-toolbar.cpp:227 -#: ../src/widgets/star-toolbar.cpp:385 -msgid "<b>Change:</b>" -msgstr "<b>Менять:</b>" +#: ../src/verbs.cpp:2472 +msgid "Create _Guides Around the Page" +msgstr "Создать на_правляющие вокруг страницы" -#: ../src/widgets/arc-toolbar.cpp:326 -msgid "Start:" -msgstr "Начало:" +#: ../src/verbs.cpp:2473 +msgid "Create four guides aligned with the page borders" +msgstr "Создать четыре направляющие по краям страницы" -#: ../src/widgets/arc-toolbar.cpp:327 -msgid "The angle (in degrees) from the horizontal to the arc's start point" -msgstr "Угол (в градусах) от горизонтали до начальной точки дуги" +#: ../src/verbs.cpp:2474 +msgid "Next path effect parameter" +msgstr "Следующий параметр контурного эффекта" -#: ../src/widgets/arc-toolbar.cpp:339 -msgid "End:" -msgstr "Конец:" +#: ../src/verbs.cpp:2475 +msgid "Show next editable path effect parameter" +msgstr "Показать следующий параметр контурного эффекта" -#: ../src/widgets/arc-toolbar.cpp:340 -msgid "The angle (in degrees) from the horizontal to the arc's end point" -msgstr "Угол (в градусах) от горизонтали до конечной точки дуги" +#. Selection +#: ../src/verbs.cpp:2478 +msgid "Raise to _Top" +msgstr "Поднять на _передний план" -#: ../src/widgets/arc-toolbar.cpp:356 -msgid "Closed arc" -msgstr "Закрытая дуга" +#: ../src/verbs.cpp:2479 +msgid "Raise selection to top" +msgstr "Поднять выделение на передний план" -#: ../src/widgets/arc-toolbar.cpp:357 -msgid "Switch to segment (closed shape with two radii)" -msgstr "Переключиться на сегмент (закрытый эллипс с двумя радиусами)" +#: ../src/verbs.cpp:2480 +msgid "Lower to _Bottom" +msgstr "Опустить на _задний план" -#: ../src/widgets/arc-toolbar.cpp:363 -msgid "Open Arc" -msgstr "Открытая дуга" +#: ../src/verbs.cpp:2481 +msgid "Lower selection to bottom" +msgstr "Опустить выделение на задний план" -#: ../src/widgets/arc-toolbar.cpp:364 -msgid "Switch to arc (unclosed shape)" -msgstr "Переключиться на дугу (незакрытый эллипс)" +#: ../src/verbs.cpp:2482 +msgid "_Raise" +msgstr "П_однять" -#: ../src/widgets/arc-toolbar.cpp:387 -msgid "Make whole" -msgstr "Сделать целым" +#: ../src/verbs.cpp:2483 +msgid "Raise selection one step" +msgstr "Поднять выделение на один уровень" -#: ../src/widgets/arc-toolbar.cpp:388 -msgid "Make the shape a whole ellipse, not arc or segment" -msgstr "Сделать фигуру целым эллипсом, а не дугой или сегментом" +#: ../src/verbs.cpp:2484 +msgid "_Lower" +msgstr "Опу_стить" -#. TODO: use the correct axis here, too -#: ../src/widgets/box3d-toolbar.cpp:232 -msgid "3D Box: Change perspective (angle of infinite axis)" -msgstr "Паралеллепипед: смена перспективы" +#: ../src/verbs.cpp:2485 +msgid "Lower selection one step" +msgstr "Опустить выделение на один уровень" -#: ../src/widgets/box3d-toolbar.cpp:299 -msgid "Angle in X direction" -msgstr "Угол в направлении X" +#: ../src/verbs.cpp:2487 +msgid "Group selected objects" +msgstr "Сгруппировать выделенные объекты" -#. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:301 -msgid "Angle of PLs in X direction" -msgstr "Угол ПЛ в направлении X" +#: ../src/verbs.cpp:2489 +msgid "Ungroup selected groups" +msgstr "Разгруппировать выделенные группы" -#. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:323 -msgid "State of VP in X direction" -msgstr "Состояние точек схода в направлении X" +#: ../src/verbs.cpp:2491 +msgid "_Put on Path" +msgstr "_Разместить по контуру" -#: ../src/widgets/box3d-toolbar.cpp:324 -msgid "Toggle VP in X direction between 'finite' and 'infinite' (=parallel)" -msgstr "" -"Переключить точку схода в направлении X между «конечной» и " -"«бесконечной» (=параллельной)" +#: ../src/verbs.cpp:2493 +msgid "_Remove from Path" +msgstr "_Снять с контура" -#: ../src/widgets/box3d-toolbar.cpp:339 -msgid "Angle in Y direction" -msgstr "Угол в направлении Y" +#: ../src/verbs.cpp:2495 +msgid "Remove Manual _Kerns" +msgstr "Убрать ручной _кернинг" -#: ../src/widgets/box3d-toolbar.cpp:339 -msgid "Angle Y:" -msgstr "Угол Y:" +#. TRANSLATORS: "glyph": An image used in the visual representation of characters; +#. roughly speaking, how a character looks. A font is a set of glyphs. +#: ../src/verbs.cpp:2498 +msgid "Remove all manual kerns and glyph rotations from a text object" +msgstr "Удалить из текста все вертикальные и горизонтальные керны и вращения" -#. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:341 -msgid "Angle of PLs in Y direction" -msgstr "Угол ПЛ в направлении Y" +#: ../src/verbs.cpp:2500 +msgid "_Union" +msgstr "С_умма" -#. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:362 -msgid "State of VP in Y direction" -msgstr "Состояние точек схода в направлении Y" +#: ../src/verbs.cpp:2501 +msgid "Create union of selected paths" +msgstr "Создать один контур из всех выбранных" -#: ../src/widgets/box3d-toolbar.cpp:363 -msgid "Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)" -msgstr "" -"Переключить точку схода в направлении Y между «конечной» и " -"«бесконечной» (=параллельной)" +#: ../src/verbs.cpp:2502 +msgid "_Intersection" +msgstr "_Пересечение" -#: ../src/widgets/box3d-toolbar.cpp:378 -msgid "Angle in Z direction" -msgstr "Угол в направлении Z" +#: ../src/verbs.cpp:2503 +msgid "Create intersection of selected paths" +msgstr "Создать пересечение выделенных контуров" -#. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:380 -msgid "Angle of PLs in Z direction" -msgstr "Угол ПЛ в направлении Z" +#: ../src/verbs.cpp:2504 +msgid "_Difference" +msgstr "_Разность" -#. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:401 -msgid "State of VP in Z direction" -msgstr "Состояние точек схода в направлении Z" +#: ../src/verbs.cpp:2505 +msgid "Create difference of selected paths (bottom minus top)" +msgstr "Создать разность выделенных контуров (низ минус верх)" -#: ../src/widgets/box3d-toolbar.cpp:402 -msgid "Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)" +#: ../src/verbs.cpp:2506 +msgid "E_xclusion" +msgstr "_Исключающее ИЛИ" + +#: ../src/verbs.cpp:2507 +msgid "" +"Create exclusive OR of selected paths (those parts that belong to only one " +"path)" msgstr "" -"Переключить точку схода в направлении Z между «конечной» и " -"«бесконечной» (=параллельной)" +"Создать Исключающее ИЛИ из выбранных контуров (части, принадлежащие только " +"одному контуру)" -#. gint preset_index = ege_select_one_action_get_active( sel ); -#: ../src/widgets/calligraphy-toolbar.cpp:218 -#: ../src/widgets/calligraphy-toolbar.cpp:262 -#: ../src/widgets/calligraphy-toolbar.cpp:267 -msgid "No preset" -msgstr "Не выбрана" +#: ../src/verbs.cpp:2508 +msgid "Di_vision" +msgstr "Р_азделить" -#. Width -#: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 -msgid "(hairline)" -msgstr "(волосок)" +#: ../src/verbs.cpp:2509 +msgid "Cut the bottom path into pieces" +msgstr "Разделить нижний контур на части верхним" -#. Mean -#. Rotation -#. Scale -#: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/calligraphy-toolbar.cpp:460 -#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:269 -#: ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129 -#: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205 -#: ../src/widgets/spray-toolbar.cpp:235 ../src/widgets/spray-toolbar.cpp:253 -#: ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142 -#: ../src/widgets/tweak-toolbar.cpp:350 -msgid "(default)" -msgstr "(по умолчанию)" +#. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the +#. Advanced tutorial for more info +#: ../src/verbs.cpp:2512 +msgid "Cut _Path" +msgstr "Разр_езать контур" -#: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 -msgid "(broad stroke)" -msgstr "(широкий штрих)" +#: ../src/verbs.cpp:2513 +msgid "Cut the bottom path's stroke into pieces, removing fill" +msgstr "Разрезать контур нижнего контура на части с удалением заливки" -#: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 -msgid "Pen Width" -msgstr "Толщина пера" +#. TRANSLATORS: "outset": expand a shape by offsetting the object's path, +#. i.e. by displacing it perpendicular to the path in each point. +#. See also the Advanced Tutorial for explanation. +#: ../src/verbs.cpp:2517 +msgid "Outs_et" +msgstr "Вы_тянуть" -#: ../src/widgets/calligraphy-toolbar.cpp:431 -msgid "The width of the calligraphic pen (relative to the visible canvas area)" -msgstr "Ширина каллиграфического пера (относительно видимой области холста)" +#: ../src/verbs.cpp:2518 +msgid "Outset selected paths" +msgstr "Вытянуть выделенный контур" -#. Thinning -#: ../src/widgets/calligraphy-toolbar.cpp:444 -msgid "(speed blows up stroke)" -msgstr "(скорость утолщает штрих)" +#: ../src/verbs.cpp:2520 +msgid "O_utset Path by 1 px" +msgstr "_Вытянуть контур на 1 px" -#: ../src/widgets/calligraphy-toolbar.cpp:444 -msgid "(slight widening)" -msgstr "(легкое утолщение)" +#: ../src/verbs.cpp:2521 +msgid "Outset selected paths by 1 px" +msgstr "Вытянуть выделенный контур на 1 px" -#: ../src/widgets/calligraphy-toolbar.cpp:444 -msgid "(constant width)" -msgstr "(постоянная ширина)" +#: ../src/verbs.cpp:2523 +msgid "O_utset Path by 10 px" +msgstr "_Вытянуть контур на 10 px" -#: ../src/widgets/calligraphy-toolbar.cpp:444 -msgid "(slight thinning, default)" -msgstr "(легкое утоньшение, по умолчанию)" +#: ../src/verbs.cpp:2524 +msgid "Outset selected paths by 10 px" +msgstr "Вытянуть выделенный контур на 10 px" -#: ../src/widgets/calligraphy-toolbar.cpp:444 -msgid "(speed deflates stroke)" -msgstr "(скорость обнуляет штрих)" +#. TRANSLATORS: "inset": contract a shape by offsetting the object's path, +#. i.e. by displacing it perpendicular to the path in each point. +#. See also the Advanced Tutorial for explanation. +#: ../src/verbs.cpp:2528 +msgid "I_nset" +msgstr "Втян_уть" -#: ../src/widgets/calligraphy-toolbar.cpp:447 -msgid "Stroke Thinning" -msgstr "Утоньшение штриха" +#: ../src/verbs.cpp:2529 +msgid "Inset selected paths" +msgstr "Втянуть выделенный контур" -#: ../src/widgets/calligraphy-toolbar.cpp:447 -msgid "Thinning:" -msgstr "Сужение:" +#: ../src/verbs.cpp:2531 +msgid "I_nset Path by 1 px" +msgstr "Втян_уть контур на 1 px" -#: ../src/widgets/calligraphy-toolbar.cpp:448 -msgid "" -"How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 " -"makes them broader, 0 makes width independent of velocity)" -msgstr "" -"Как сильно скорость сужает штрих (> 0: быстрые штрихи уже, < 0: быстрые " -"штрихи шире; при 0 ширина штриха не зависит от скорости)" +#: ../src/verbs.cpp:2532 +msgid "Inset selected paths by 1 px" +msgstr "Втянуть выделенный контур на 1 px" -#. Angle -#: ../src/widgets/calligraphy-toolbar.cpp:460 -msgid "(left edge up)" -msgstr "(левый угол вверху)" +#: ../src/verbs.cpp:2534 +msgid "I_nset Path by 10 px" +msgstr "Втян_уть контур на 10 px" -#: ../src/widgets/calligraphy-toolbar.cpp:460 -msgid "(horizontal)" -msgstr "(перо горизонтально)" +#: ../src/verbs.cpp:2535 +msgid "Inset selected paths by 10 px" +msgstr "Втянуть выделенный контур на 10 px" -#: ../src/widgets/calligraphy-toolbar.cpp:460 -msgid "(right edge up)" -msgstr "(правый угол вверху)" +#: ../src/verbs.cpp:2537 +msgid "D_ynamic Offset" +msgstr "_Динамическая втяжка" -#: ../src/widgets/calligraphy-toolbar.cpp:463 -msgid "Pen Angle" -msgstr "Угол пера" +#: ../src/verbs.cpp:2537 +msgid "Create a dynamic offset object" +msgstr "Создать объект, втяжку/растяжку которого можно менять динамически" -#: ../src/widgets/calligraphy-toolbar.cpp:463 -#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:10 -msgid "Angle:" -msgstr "Угол:" +#: ../src/verbs.cpp:2539 +msgid "_Linked Offset" +msgstr "С_вязанная втяжка" -#: ../src/widgets/calligraphy-toolbar.cpp:464 -msgid "" -"The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if " -"fixation = 0)" -msgstr "" -"Угол пера (в градусах; 0 = горизонтально; при нулевой фиксации значения не " -"имеет)" +#: ../src/verbs.cpp:2540 +msgid "Create a dynamic offset object linked to the original path" +msgstr "Создать втяжку/растяжку, динамически связанную с исходным контуром" -#. Fixation -#: ../src/widgets/calligraphy-toolbar.cpp:478 -msgid "(perpendicular to stroke, \"brush\")" -msgstr "(перпендикулярно штриху)" +#: ../src/verbs.cpp:2542 +msgid "_Stroke to Path" +msgstr "Оконтурить _обводку" -#: ../src/widgets/calligraphy-toolbar.cpp:478 -msgid "(almost fixed, default)" -msgstr "(почти полная, значение по умолчанию)" +#: ../src/verbs.cpp:2543 +msgid "Convert selected object's stroke to paths" +msgstr "Преобразовать обводки выбранных объектов в контуры" -#: ../src/widgets/calligraphy-toolbar.cpp:478 -msgid "(fixed by Angle, \"pen\")" -msgstr "(угол зафиксирован)" +#: ../src/verbs.cpp:2544 +msgid "Si_mplify" +msgstr "_Упростить" -#: ../src/widgets/calligraphy-toolbar.cpp:481 -msgid "Fixation" -msgstr "Фиксация" +#: ../src/verbs.cpp:2545 +msgid "Simplify selected paths (remove extra nodes)" +msgstr "Упростить выделенные контуры удалением лишних узлов" -#: ../src/widgets/calligraphy-toolbar.cpp:481 -msgid "Fixation:" -msgstr "Фиксация:" +#: ../src/verbs.cpp:2546 +msgid "_Reverse" +msgstr "_Развернуть" -#: ../src/widgets/calligraphy-toolbar.cpp:482 -msgid "" -"Angle behavior (0 = nib always perpendicular to stroke direction, 100 = " -"fixed angle)" +#: ../src/verbs.cpp:2547 +msgid "Reverse the direction of selected paths (useful for flipping markers)" msgstr "" -"Фиксация угла (0 = перо всегда перпендикулярно направлению штриха, 100 = " -"угол не меняется)" +"Развернуть направление выделенных контуров; полезно для отражения маркеров" -#. Cap Rounding -#: ../src/widgets/calligraphy-toolbar.cpp:494 -msgid "(blunt caps, default)" -msgstr "(плоские концы, значение по умолчанию)" +#: ../src/verbs.cpp:2550 +msgid "Create one or more paths from a bitmap by tracing it" +msgstr "Создать один или более контуров из растра, векторизовав его" -#: ../src/widgets/calligraphy-toolbar.cpp:494 -msgid "(slightly bulging)" -msgstr "(слегка закругленные)" +#: ../src/verbs.cpp:2551 +msgid "Trace Pixel Art..." +msgstr "Векторизовать пиксельную графику..." -#: ../src/widgets/calligraphy-toolbar.cpp:494 -msgid "(approximately round)" -msgstr "(примерно круглые)" +#: ../src/verbs.cpp:2552 +msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" +msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:494 -msgid "(long protruding caps)" -msgstr "(округлые, далеко выдающиеся концы)" +#: ../src/verbs.cpp:2553 +msgid "Make a _Bitmap Copy" +msgstr "_Сделать растровую копию" -#: ../src/widgets/calligraphy-toolbar.cpp:498 -msgid "Cap rounding" -msgstr "Закругление концов" +#: ../src/verbs.cpp:2554 +msgid "Export selection to a bitmap and insert it into document" +msgstr "Экспортировать выделение в растр и вставить его в документ" -#: ../src/widgets/calligraphy-toolbar.cpp:498 -msgid "Caps:" -msgstr "Концы:" +#: ../src/verbs.cpp:2555 +msgid "_Combine" +msgstr "_Объединить" -#: ../src/widgets/calligraphy-toolbar.cpp:499 -msgid "" -"Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = " -"round caps)" -msgstr "" -"Увеличение значения дает далеко выдающиеся концы (0=без концов, 1=округлые " -"концы)" +#: ../src/verbs.cpp:2556 +msgid "Combine several paths into one" +msgstr "Объединить несколько контуров в один" -#. Tremor -#: ../src/widgets/calligraphy-toolbar.cpp:511 -msgid "(smooth line)" -msgstr "(гладкая линия)" +#. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the +#. Advanced tutorial for more info +#: ../src/verbs.cpp:2559 +msgid "Break _Apart" +msgstr "_Разбить" -#: ../src/widgets/calligraphy-toolbar.cpp:511 -msgid "(slight tremor)" -msgstr "(легкое дрожание)" +#: ../src/verbs.cpp:2560 +msgid "Break selected paths into subpaths" +msgstr "Разбить выделенные контуры на части" -#: ../src/widgets/calligraphy-toolbar.cpp:511 -msgid "(noticeable tremor)" -msgstr "(заметное дрожание)" +#: ../src/verbs.cpp:2561 +msgid "_Arrange..." +msgstr "_Расставить..." -#: ../src/widgets/calligraphy-toolbar.cpp:511 -msgid "(maximum tremor)" -msgstr "(максимальное дрожание)" +#: ../src/verbs.cpp:2562 +#, fuzzy +msgid "Arrange selected objects in a table or circle" +msgstr "Расставить выделенные объекты по сетке" -#: ../src/widgets/calligraphy-toolbar.cpp:514 -msgid "Stroke Tremor" -msgstr "Дрожание штриха" +#. Layer +#: ../src/verbs.cpp:2564 +msgid "_Add Layer..." +msgstr "_Новый слой..." -#: ../src/widgets/calligraphy-toolbar.cpp:514 -msgid "Tremor:" -msgstr "Дрожание:" +#: ../src/verbs.cpp:2565 +msgid "Create a new layer" +msgstr "Создать новый слой" -#: ../src/widgets/calligraphy-toolbar.cpp:515 -msgid "Increase to make strokes rugged and trembling" -msgstr "Увеличение значения делает штрихи дрожащими" +#: ../src/verbs.cpp:2566 +msgid "Re_name Layer..." +msgstr "_Переименовать слой..." -#. Wiggle -#: ../src/widgets/calligraphy-toolbar.cpp:529 -msgid "(no wiggle)" -msgstr "(без виляния)" +#: ../src/verbs.cpp:2567 +msgid "Rename the current layer" +msgstr "Переименовать текущий слой" -#: ../src/widgets/calligraphy-toolbar.cpp:529 -msgid "(slight deviation)" -msgstr "(легкое отклонение)" +#: ../src/verbs.cpp:2568 +msgid "Switch to Layer Abov_e" +msgstr "Перейти на слой _выше" -#: ../src/widgets/calligraphy-toolbar.cpp:529 -msgid "(wild waves and curls)" -msgstr "(сумасшедшее вихляние)" +#: ../src/verbs.cpp:2569 +msgid "Switch to the layer above the current" +msgstr "Перейти на слой, находящийся выше текущего" -#: ../src/widgets/calligraphy-toolbar.cpp:532 -msgid "Pen Wiggle" -msgstr "Виляние пером" +#: ../src/verbs.cpp:2570 +msgid "Switch to Layer Belo_w" +msgstr "Перейти на слой _ниже" -#: ../src/widgets/calligraphy-toolbar.cpp:532 -msgid "Wiggle:" -msgstr "Виляние:" +#: ../src/verbs.cpp:2571 +msgid "Switch to the layer below the current" +msgstr "Перейти на слой, находящийся под текущим" -#: ../src/widgets/calligraphy-toolbar.cpp:533 -msgid "Increase to make the pen waver and wiggle" -msgstr "Увеличение значения делает штрихи виляющими" +#: ../src/verbs.cpp:2572 +msgid "Move Selection to Layer Abo_ve" +msgstr "Перенести выделение в слой _выше" -#. Mass -#: ../src/widgets/calligraphy-toolbar.cpp:546 -msgid "(no inertia)" -msgstr "(без инерции)" +#: ../src/verbs.cpp:2573 +msgid "Move selection to the layer above the current" +msgstr "Перенести выделение в слой над текущим слоем" -#: ../src/widgets/calligraphy-toolbar.cpp:546 -msgid "(slight smoothing, default)" -msgstr "(легкое отставание, по умолчанию)" +#: ../src/verbs.cpp:2574 +msgid "Move Selection to Layer Bel_ow" +msgstr "Перенести выделение в слой _ниже" -#: ../src/widgets/calligraphy-toolbar.cpp:546 -msgid "(noticeable lagging)" -msgstr "(заметное отставание)" +#: ../src/verbs.cpp:2575 +msgid "Move selection to the layer below the current" +msgstr "Перенести выделение в слой ниже текущего слоя" -#: ../src/widgets/calligraphy-toolbar.cpp:546 -msgid "(maximum inertia)" -msgstr "(максимальная инерция)" +#: ../src/verbs.cpp:2576 +msgid "Move Selection to Layer..." +msgstr "Перенести выделение в слой..." -#: ../src/widgets/calligraphy-toolbar.cpp:549 -msgid "Pen Mass" -msgstr "Масса пера" +#: ../src/verbs.cpp:2578 +msgid "Layer to _Top" +msgstr "Поднять до _верха" -#: ../src/widgets/calligraphy-toolbar.cpp:549 -msgid "Mass:" -msgstr "Масса:" +#: ../src/verbs.cpp:2579 +msgid "Raise the current layer to the top" +msgstr "Поднять текущий слой на самый верх" -#: ../src/widgets/calligraphy-toolbar.cpp:550 -msgid "Increase to make the pen drag behind, as if slowed by inertia" -msgstr "Увеличение значения затормаживает перо, словно оно очень инертно" +#: ../src/verbs.cpp:2580 +msgid "Layer to _Bottom" +msgstr "Опустить до _низа" -#: ../src/widgets/calligraphy-toolbar.cpp:565 -msgid "Trace Background" -msgstr "Трассировать фон" +#: ../src/verbs.cpp:2581 +msgid "Lower the current layer to the bottom" +msgstr "Опустить текущий слой на самый низ" -#: ../src/widgets/calligraphy-toolbar.cpp:566 -msgid "" -"Trace the lightness of the background by the width of the pen (white - " -"minimum width, black - maximum width)" -msgstr "" -"Трассировать освещенность фона толщиной линии пера (белый — минимальная " -"толщина, черный — максимальная толщина)" +#: ../src/verbs.cpp:2582 +msgid "_Raise Layer" +msgstr "П_однять слой" -#: ../src/widgets/calligraphy-toolbar.cpp:579 -msgid "Use the pressure of the input device to alter the width of the pen" -msgstr "Нажим (pressure) устройства ввода изменяет ширину пера" +#: ../src/verbs.cpp:2583 +msgid "Raise the current layer" +msgstr "Поднять текущий слой" -#: ../src/widgets/calligraphy-toolbar.cpp:591 -msgid "Tilt" -msgstr "Наклон" +#: ../src/verbs.cpp:2584 +msgid "_Lower Layer" +msgstr "Опу_стить слой" -#: ../src/widgets/calligraphy-toolbar.cpp:592 -msgid "Use the tilt of the input device to alter the angle of the pen's nib" -msgstr "Наклон (tilt) устройства ввода изменяет угол пера" +#: ../src/verbs.cpp:2585 +msgid "Lower the current layer" +msgstr "Опустить текущий слой" -#: ../src/widgets/calligraphy-toolbar.cpp:607 -msgid "Choose a preset" -msgstr "Выберите предустановку" +#: ../src/verbs.cpp:2586 +msgid "D_uplicate Current Layer" +msgstr "Создать _копию слоя" -#: ../src/widgets/calligraphy-toolbar.cpp:622 -#, fuzzy -msgid "Add/Edit Profile" -msgstr "Связать с профилем" +#: ../src/verbs.cpp:2587 +msgid "Duplicate an existing layer" +msgstr "Дубликация активного слоя" -#: ../src/widgets/calligraphy-toolbar.cpp:623 -#, fuzzy -msgid "Add or edit calligraphic profile" -msgstr "Стиль новых каллиграфических штрихов" +#: ../src/verbs.cpp:2588 +msgid "_Delete Current Layer" +msgstr "_Удалить текущий слой" -#: ../src/widgets/connector-toolbar.cpp:120 -msgid "Set connector type: orthogonal" -msgstr "Соединительная линия: ортогональная" +#: ../src/verbs.cpp:2589 +msgid "Delete the current layer" +msgstr "Удалить текущий слой" -#: ../src/widgets/connector-toolbar.cpp:120 -msgid "Set connector type: polyline" -msgstr "Соединительная линия: ломаная" +#: ../src/verbs.cpp:2590 +msgid "_Show/hide other layers" +msgstr "_Показать/скрыть остальные слои" -#: ../src/widgets/connector-toolbar.cpp:169 -msgid "Change connector curvature" -msgstr "Изменить кривизну соединительной линии" +#: ../src/verbs.cpp:2591 +msgid "Solo the current layer" +msgstr "Отображение только активного слоя" -#: ../src/widgets/connector-toolbar.cpp:220 -msgid "Change connector spacing" -msgstr "Смена интервала соед. линии" +#: ../src/verbs.cpp:2592 +msgid "_Show all layers" +msgstr "Показать _все слои" -#: ../src/widgets/connector-toolbar.cpp:313 -msgid "Avoid" -msgstr "Избегать" +#: ../src/verbs.cpp:2593 +msgid "Show all the layers" +msgstr "Просмотр всех слоёв" -#: ../src/widgets/connector-toolbar.cpp:323 -msgid "Ignore" -msgstr "Игнорировать" +#: ../src/verbs.cpp:2594 +msgid "_Hide all layers" +msgstr "С_крыть все слои" -#: ../src/widgets/connector-toolbar.cpp:334 -msgid "Orthogonal" -msgstr "Ортогональная линия" +#: ../src/verbs.cpp:2595 +msgid "Hide all the layers" +msgstr "Сокрытие всех слоёв" -#: ../src/widgets/connector-toolbar.cpp:335 -msgid "Make connector orthogonal or polyline" -msgstr "Сделать соединительную линию ортогональной или ломаной" +#: ../src/verbs.cpp:2596 +msgid "_Lock all layers" +msgstr "За_блокировать все слои" -#: ../src/widgets/connector-toolbar.cpp:349 -msgid "Connector Curvature" -msgstr "Кривизна соединительных линий" +#: ../src/verbs.cpp:2597 +msgid "Lock all the layers" +msgstr "Блокировка всех слоёв" -#: ../src/widgets/connector-toolbar.cpp:349 -msgid "Curvature:" -msgstr "Кривизна:" +#: ../src/verbs.cpp:2598 +msgid "Lock/Unlock _other layers" +msgstr "Заблокировать/разблокировать _остальные слои" -#: ../src/widgets/connector-toolbar.cpp:350 -msgid "The amount of connectors curvature" -msgstr "Значение кривизны соединительных линий" +#: ../src/verbs.cpp:2599 +msgid "Lock all the other layers" +msgstr "Блокировка всех остальных слоёв" -#: ../src/widgets/connector-toolbar.cpp:360 -msgid "Connector Spacing" -msgstr "Интервал линии соединения" +#: ../src/verbs.cpp:2600 +msgid "_Unlock all layers" +msgstr "Разб_локировать все слои" -#: ../src/widgets/connector-toolbar.cpp:360 -msgid "Spacing:" -msgstr "Интервал:" +#: ../src/verbs.cpp:2601 +msgid "Unlock all the layers" +msgstr "Разблокировка всех слоёв" -#: ../src/widgets/connector-toolbar.cpp:361 -msgid "The amount of space left around objects by auto-routing connectors" -msgstr "Оставшееся пространство вокруг объектов при автосоединении" +#: ../src/verbs.cpp:2602 +msgid "_Lock/Unlock Current Layer" +msgstr "_Заблокировать/разблокировать текущий слой" -#: ../src/widgets/connector-toolbar.cpp:372 -msgid "Graph" -msgstr "Граф" +#: ../src/verbs.cpp:2603 +msgid "Toggle lock on current layer" +msgstr "Переключить заблокированность активного слоя" -#: ../src/widgets/connector-toolbar.cpp:382 -msgid "Connector Length" -msgstr "Длина линии соединения" +#: ../src/verbs.cpp:2604 +msgid "_Show/hide Current Layer" +msgstr "Пока_зать/скрыть текущий слой" -#: ../src/widgets/connector-toolbar.cpp:382 -msgid "Length:" -msgstr "Длина:" +#: ../src/verbs.cpp:2605 +msgid "Toggle visibility of current layer" +msgstr "Переключить видимость активного слоя" -#: ../src/widgets/connector-toolbar.cpp:383 -msgid "Ideal length for connectors when layout is applied" -msgstr "" -"Идеальная длина при использовании оптимизации внешнего вида линий соединения" +#. Object +#: ../src/verbs.cpp:2608 +msgid "Rotate _90° CW" +msgstr "Повернуть на _90° по часовой стрелке" -#: ../src/widgets/connector-toolbar.cpp:395 -msgid "Downwards" -msgstr "Вниз" +#. This is shared between tooltips and statusbar, so they +#. must use UTF-8, not HTML entities for special characters. +#: ../src/verbs.cpp:2611 +msgid "Rotate selection 90° clockwise" +msgstr "Повернуть выделение на 90° по часовой стрелке" -#: ../src/widgets/connector-toolbar.cpp:396 -msgid "Make connectors with end-markers (arrows) point downwards" -msgstr "Линии соединения со стрелками указывают вниз" +#: ../src/verbs.cpp:2612 +msgid "Rotate 9_0° CCW" +msgstr "Повернуть на 9_0° против часовой стрелки" -#: ../src/widgets/connector-toolbar.cpp:412 -msgid "Do not allow overlapping shapes" -msgstr "Не допускать перекрытия фигур" +#. This is shared between tooltips and statusbar, so they +#. must use UTF-8, not HTML entities for special characters. +#: ../src/verbs.cpp:2615 +msgid "Rotate selection 90° counter-clockwise" +msgstr "Повернуть выделение на 90° против часовой стрелки" -#: ../src/widgets/dash-selector.cpp:59 -msgid "Dash pattern" -msgstr "Пунктир" +#: ../src/verbs.cpp:2616 +msgid "Remove _Transformations" +msgstr "Убрать _трансформации" -#: ../src/widgets/dash-selector.cpp:76 -msgid "Pattern offset" -msgstr "Смещение пунктира" +#: ../src/verbs.cpp:2617 +msgid "Remove transformations from object" +msgstr "Убрать преобразования объекта" -#: ../src/widgets/desktop-widget.cpp:466 -msgid "Zoom drawing if window size changes" -msgstr "Изменять масштаб при изменении размеров окна" +#: ../src/verbs.cpp:2618 +msgid "_Object to Path" +msgstr "_Оконтурить объект" -#: ../src/widgets/desktop-widget.cpp:665 -msgid "Cursor coordinates" -msgstr "Координаты курсора" +#: ../src/verbs.cpp:2619 +msgid "Convert selected object to path" +msgstr "Преобразовать выбранный объект в контур" -#: ../src/widgets/desktop-widget.cpp:691 -msgid "Z:" -msgstr "Z:" +#: ../src/verbs.cpp:2620 +msgid "_Flow into Frame" +msgstr "_Заверстать в блок" -#. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:734 +#: ../src/verbs.cpp:2621 msgid "" -"<b>Welcome to Inkscape!</b> Use shape or freehand tools to create objects; " -"use selector (arrow) to move or transform them." +"Put text into a frame (path or shape), creating a flowed text linked to the " +"frame object" msgstr "" -"<b>Добро пожаловать в Inkscape!</b> Используйте инструменты фигур или " -"рисования для создания объектов; используйте Выделитель (стрелку) для их " -"перемещения и трансформации." - -#: ../src/widgets/desktop-widget.cpp:828 -#, fuzzy -msgid "grayscale" -msgstr ", в градациях серого" - -#: ../src/widgets/desktop-widget.cpp:829 -msgid ", grayscale" -msgstr ", в градациях серого" +"Заверстать текст в блок (контур или фигуру), создав перетекающий текст, " +"связанный с объектом блока" -#: ../src/widgets/desktop-widget.cpp:830 -#, fuzzy -msgid "print colors preview" -msgstr "П_редпросмотр цветоделений" +#: ../src/verbs.cpp:2622 +msgid "_Unflow" +msgstr "_Вынуть из блока" -#: ../src/widgets/desktop-widget.cpp:831 -#, fuzzy -msgid ", print colors preview" -msgstr "П_редпросмотр цветоделений" +#: ../src/verbs.cpp:2623 +msgid "Remove text from frame (creates a single-line text object)" +msgstr "Вынуть текст из блока, создав обычный текстовый объект в одну строку" -#: ../src/widgets/desktop-widget.cpp:832 -#, fuzzy -msgid "outline" -msgstr "Контур" +#: ../src/verbs.cpp:2624 +msgid "_Convert to Text" +msgstr "_Преобразовать в текст" -#: ../src/widgets/desktop-widget.cpp:833 -#, fuzzy -msgid "no filters" -msgstr "Б_ез фильтров" +#: ../src/verbs.cpp:2625 +msgid "Convert flowed text to regular text object (preserves appearance)" +msgstr "" +"Преобразовать текст, заверстанный в рамку, в обычный текст, сохранив " +"форматирование" -#: ../src/widgets/desktop-widget.cpp:860 -#, fuzzy, c-format -msgid "%s%s: %d (%s%s) - Inkscape" -msgstr "%s%s: %d %s- Inkscape" +#: ../src/verbs.cpp:2627 +msgid "Flip _Horizontal" +msgstr "Отразить _горизонтально" -#: ../src/widgets/desktop-widget.cpp:862 ../src/widgets/desktop-widget.cpp:866 -#, fuzzy, c-format -msgid "%s%s: %d (%s) - Inkscape" -msgstr "%s%s: %d %s- Inkscape" +#: ../src/verbs.cpp:2627 +msgid "Flip selected objects horizontally" +msgstr "Горизонтально отразить выбранные объекты" -#: ../src/widgets/desktop-widget.cpp:868 -#, fuzzy, c-format -msgid "%s%s: %d - Inkscape" -msgstr "%s%s: %d %s- Inkscape" +#: ../src/verbs.cpp:2630 +msgid "Flip _Vertical" +msgstr "Отразить _вертикально" -#: ../src/widgets/desktop-widget.cpp:874 -#, fuzzy, c-format -msgid "%s%s (%s%s) - Inkscape" -msgstr "%s%s %s- Inkscape" +#: ../src/verbs.cpp:2630 +msgid "Flip selected objects vertically" +msgstr "Вертикально отразить выбранные объекты" -#: ../src/widgets/desktop-widget.cpp:876 ../src/widgets/desktop-widget.cpp:880 -#, fuzzy, c-format -msgid "%s%s (%s) - Inkscape" -msgstr "%s%s %s- Inkscape" +#: ../src/verbs.cpp:2633 +msgid "Apply mask to selection (using the topmost object as mask)" +msgstr "Применить самый верхний объект выделения к нему как маску" -#: ../src/widgets/desktop-widget.cpp:882 -#, fuzzy, c-format -msgid "%s%s - Inkscape" -msgstr "%s%s %s- Inkscape" +#: ../src/verbs.cpp:2635 +msgid "Edit mask" +msgstr "Изменить маску" -#: ../src/widgets/desktop-widget.cpp:1051 -msgid "Color-managed display is <b>enabled</b> in this window" -msgstr "Управление цветом <b>включено</b> для этого окна" +#: ../src/verbs.cpp:2636 ../src/verbs.cpp:2642 +msgid "_Release" +msgstr "_Снять" -#: ../src/widgets/desktop-widget.cpp:1053 -msgid "Color-managed display is <b>disabled</b> in this window" -msgstr "Управление цветом <b>выключено</b> для этого окна" +#: ../src/verbs.cpp:2637 +msgid "Remove mask from selection" +msgstr "Убрать маску из выделения" -#: ../src/widgets/desktop-widget.cpp:1108 -#, c-format +#: ../src/verbs.cpp:2639 msgid "" -"<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before " -"closing?</span>\n" -"\n" -"If you close without saving, your changes will be discarded." -msgstr "" -"<span weight=\"bold\" size=\"larger\">Сохранить изменения в документе \"%s\" " -"перед закрытием?</span>\n" -"\n" -"Если вы закроете документ, не сохранив его, все изменения будут потеряны." +"Apply clipping path to selection (using the topmost object as clipping path)" +msgstr "Применить самый верхний объект выделения к нему как обтравочный контур" -#: ../src/widgets/desktop-widget.cpp:1118 -#: ../src/widgets/desktop-widget.cpp:1177 -msgid "Close _without saving" -msgstr "_Не сохранять" +#: ../src/verbs.cpp:2641 +msgid "Edit clipping path" +msgstr "Изменить обтравочный контур" -#: ../src/widgets/desktop-widget.cpp:1167 -#, fuzzy, c-format -msgid "" -"<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a " -"format that may cause data loss!</span>\n" -"\n" -"Do you want to save this file as Inkscape SVG?" -msgstr "" -"<span weight=\"bold\" size=\"larger\">Файл «%s» был сохранен в формате (%s), " -"что может привести к потере данных!</span>\n" -"\n" -"Сохранить документ в формате Inkscape SVG?" +#: ../src/verbs.cpp:2643 +msgid "Remove clipping path from selection" +msgstr "Убрать обтравочный контур из выделения" -#: ../src/widgets/desktop-widget.cpp:1179 +#. Tools +#: ../src/verbs.cpp:2646 #, fuzzy -msgid "_Save as Inkscape SVG" -msgstr "_Сохранить как SVG" +msgctxt "ContextVerb" +msgid "Select" +msgstr "Выделитель" -#: ../src/widgets/desktop-widget.cpp:1392 -msgid "Note:" -msgstr "" +#: ../src/verbs.cpp:2647 +msgid "Select and transform objects" +msgstr "Выделять и трансформировать объекты" -#: ../src/widgets/dropper-toolbar.cpp:90 -msgid "Pick opacity" -msgstr "Снять непрозрачность" +#: ../src/verbs.cpp:2648 +msgctxt "ContextVerb" +msgid "Node Edit" +msgstr "Инструмент узлов" -#: ../src/widgets/dropper-toolbar.cpp:91 -msgid "" -"Pick both the color and the alpha (transparency) under cursor; otherwise, " -"pick only the visible color premultiplied by alpha" -msgstr "" -"Снимать значение альфа-канала (полупрозрачности) под курсором; если " -"отключено, снимается только видимый цвет" +#: ../src/verbs.cpp:2649 +msgid "Edit paths by nodes" +msgstr "Редактировать узлы контура или рычаги узлов" -#: ../src/widgets/dropper-toolbar.cpp:94 -msgid "Pick" -msgstr "Снять" +#: ../src/verbs.cpp:2650 +msgctxt "ContextVerb" +msgid "Tweak" +msgstr "Корректор" -#: ../src/widgets/dropper-toolbar.cpp:103 -msgid "Assign opacity" -msgstr "Назначить непрозрачность" +#: ../src/verbs.cpp:2651 +msgid "Tweak objects by sculpting or painting" +msgstr "Корректировать объекты лепкой или раскрашиванием" -#: ../src/widgets/dropper-toolbar.cpp:104 -msgid "" -"If alpha was picked, assign it to selection as fill or stroke transparency" -msgstr "" -"Если полупрозрачность снята, назначать её заливке или обводке в выделении" +#: ../src/verbs.cpp:2652 +msgctxt "ContextVerb" +msgid "Spray" +msgstr "Распылитель" -#: ../src/widgets/dropper-toolbar.cpp:107 -msgid "Assign" -msgstr "Назначить" +#: ../src/verbs.cpp:2653 +msgid "Spray objects by sculpting or painting" +msgstr "Распылять объекты лепкой или раскрашиванием" -#: ../src/widgets/ege-paint-def.cpp:87 -msgid "remove" -msgstr "Удалить" +#: ../src/verbs.cpp:2654 +msgctxt "ContextVerb" +msgid "Rectangle" +msgstr "Прямоугольник" -#: ../src/widgets/eraser-toolbar.cpp:94 -msgid "Delete objects touched by the eraser" -msgstr "Удалять объекты, которых коснулся ластик" +#: ../src/verbs.cpp:2655 +msgid "Create rectangles and squares" +msgstr "Рисовать прямоугольники и квадраты" -#: ../src/widgets/eraser-toolbar.cpp:100 -msgid "Cut" -msgstr "Вырезать" +#: ../src/verbs.cpp:2656 +#, fuzzy +msgctxt "ContextVerb" +msgid "3D Box" +msgstr "Паралеллепипед" -#: ../src/widgets/eraser-toolbar.cpp:101 -msgid "Cut out from objects" -msgstr "Вырезать из объектов" +#: ../src/verbs.cpp:2657 +msgid "Create 3D boxes" +msgstr "Рисовать паралеллепипеды в 3D" -#: ../src/widgets/eraser-toolbar.cpp:129 -msgid "The width of the eraser pen (relative to the visible canvas area)" -msgstr "Толщина пера ластика (относительно видимой области холста)" +#: ../src/verbs.cpp:2658 +msgctxt "ContextVerb" +msgid "Ellipse" +msgstr "Эллипс" -#: ../src/widgets/fill-style.cpp:362 -msgid "Change fill rule" -msgstr "Сменить правило заливки" +#: ../src/verbs.cpp:2659 +msgid "Create circles, ellipses, and arcs" +msgstr "Рисовать круги, эллипсы и дуги" -#: ../src/widgets/fill-style.cpp:447 ../src/widgets/fill-style.cpp:526 -msgid "Set fill color" -msgstr "Установить цвет заливки" +#: ../src/verbs.cpp:2660 +msgctxt "ContextVerb" +msgid "Star" +msgstr "Звезда" + +#: ../src/verbs.cpp:2661 +msgid "Create stars and polygons" +msgstr "Рисовать звезды и многоугольники" -#: ../src/widgets/fill-style.cpp:447 ../src/widgets/fill-style.cpp:526 -msgid "Set stroke color" -msgstr "Установка цвета обводки" +#: ../src/verbs.cpp:2662 +msgctxt "ContextVerb" +msgid "Spiral" +msgstr "Спираль" -#: ../src/widgets/fill-style.cpp:625 -msgid "Set gradient on fill" -msgstr "Градиентная заливка" +#: ../src/verbs.cpp:2663 +msgid "Create spirals" +msgstr "Рисовать спирали" -#: ../src/widgets/fill-style.cpp:625 -msgid "Set gradient on stroke" -msgstr "Заливка обводки градиентом" +#: ../src/verbs.cpp:2664 +msgctxt "ContextVerb" +msgid "Pencil" +msgstr "Карандаш" -#: ../src/widgets/fill-style.cpp:685 -msgid "Set pattern on fill" -msgstr "Текстурная заливка" +#: ../src/verbs.cpp:2665 +msgid "Draw freehand lines" +msgstr "Рисовать произвольные контуры" -#: ../src/widgets/fill-style.cpp:686 -msgid "Set pattern on stroke" -msgstr "Заливка обводки текстурой" +#: ../src/verbs.cpp:2666 +msgctxt "ContextVerb" +msgid "Pen" +msgstr "Перо" -#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:956 -#: ../src/widgets/text-toolbar.cpp:1270 -msgid "Font size" -msgstr "Кегль шрифта" +#: ../src/verbs.cpp:2667 +msgid "Draw Bezier curves and straight lines" +msgstr "Рисовать кривые Безье и прямые линии" -#. Family frame -#: ../src/widgets/font-selector.cpp:148 -msgid "Font family" -msgstr "Гарнитура" +#: ../src/verbs.cpp:2668 +msgctxt "ContextVerb" +msgid "Calligraphy" +msgstr "Каллиграфическое перо" -#. Style frame -#: ../src/widgets/font-selector.cpp:192 -msgctxt "Font selector" -msgid "Style" -msgstr "Стиль" +#: ../src/verbs.cpp:2669 +msgid "Draw calligraphic or brush strokes" +msgstr "Рисовать каллиграфическим пером" -#: ../src/widgets/font-selector.cpp:224 -#, fuzzy -msgid "Face" -msgstr "Стороны" +#: ../src/verbs.cpp:2671 +msgid "Create and edit text objects" +msgstr "Создавать и править текстовые объекты" -#: ../src/widgets/font-selector.cpp:253 ../share/extensions/dots.inx.h:3 -msgid "Font size:" -msgstr "Кегль шрифта:" +#: ../src/verbs.cpp:2672 +msgctxt "ContextVerb" +msgid "Gradient" +msgstr "Градиентная заливка" -#: ../src/widgets/gradient-selector.cpp:214 -#, fuzzy -msgid "Create a duplicate gradient" +#: ../src/verbs.cpp:2673 +msgid "Create and edit gradients" msgstr "Создавать и править градиенты" -#: ../src/widgets/gradient-selector.cpp:230 +#: ../src/verbs.cpp:2674 +msgctxt "ContextVerb" +msgid "Mesh" +msgstr "" + +#: ../src/verbs.cpp:2675 #, fuzzy -msgid "Edit gradient" -msgstr "Радиальный градиент" +msgid "Create and edit meshes" +msgstr "Создавать и править градиенты" -#: ../src/widgets/gradient-selector.cpp:306 -#: ../src/widgets/paint-selector.cpp:244 -msgid "Swatch" -msgstr "Образец" +#: ../src/verbs.cpp:2676 +msgctxt "ContextVerb" +msgid "Zoom" +msgstr "Лупа" -#: ../src/widgets/gradient-selector.cpp:356 -#, fuzzy -msgid "Rename gradient" -msgstr "Линейный градиент" +#: ../src/verbs.cpp:2677 +msgid "Zoom in or out" +msgstr "Увеличивать или уменьшать отображение документа" -#: ../src/widgets/gradient-toolbar.cpp:156 -#: ../src/widgets/gradient-toolbar.cpp:169 -#: ../src/widgets/gradient-toolbar.cpp:756 -#: ../src/widgets/gradient-toolbar.cpp:1094 -msgid "No gradient" -msgstr "Градиентов нет" +#: ../src/verbs.cpp:2679 +msgid "Measurement tool" +msgstr "Измеритель" -#: ../src/widgets/gradient-toolbar.cpp:175 -#, fuzzy -msgid "Multiple gradients" -msgstr "Смещать градиенты" +#: ../src/verbs.cpp:2680 +msgctxt "ContextVerb" +msgid "Dropper" +msgstr "Пипетка" -#: ../src/widgets/gradient-toolbar.cpp:676 -#, fuzzy -msgid "Multiple stops" -msgstr "Множественные стили" +#: ../src/verbs.cpp:2681 ../src/widgets/sp-color-notebook.cpp:411 +msgid "Pick colors from image" +msgstr "Брать усредненные цвета из изображений" -#: ../src/widgets/gradient-toolbar.cpp:774 -#: ../src/widgets/gradient-vector.cpp:629 -msgid "No stops in gradient" -msgstr "В градиенте нет опорных точек" +#: ../src/verbs.cpp:2682 +msgctxt "ContextVerb" +msgid "Connector" +msgstr "Соединительные линии" -#: ../src/widgets/gradient-toolbar.cpp:927 -msgid "Assign gradient to object" -msgstr "Применить градиент к объекту" +#: ../src/verbs.cpp:2683 +msgid "Create diagram connectors" +msgstr "Создавать соединительные линии в диаграммах" -#: ../src/widgets/gradient-toolbar.cpp:949 -msgid "Set gradient repeat" -msgstr "Выбрать повтор градиента" +#: ../src/verbs.cpp:2684 +msgctxt "ContextVerb" +msgid "Paint Bucket" +msgstr "Сплошная заливка" -#: ../src/widgets/gradient-toolbar.cpp:987 -#: ../src/widgets/gradient-vector.cpp:740 -msgid "Change gradient stop offset" -msgstr "Правка смещения опорной точки градиента" +#: ../src/verbs.cpp:2685 +msgid "Fill bounded areas" +msgstr "Заливать замкнутые области" -#: ../src/widgets/gradient-toolbar.cpp:1034 +#: ../src/verbs.cpp:2686 #, fuzzy -msgid "linear" -msgstr "Линейная функция" - -#: ../src/widgets/gradient-toolbar.cpp:1034 -msgid "Create linear gradient" -msgstr "Создать линейный градиент" +msgctxt "ContextVerb" +msgid "LPE Edit" +msgstr "Геометрические конструкции" -#: ../src/widgets/gradient-toolbar.cpp:1038 -msgid "radial" -msgstr "" +#: ../src/verbs.cpp:2687 +msgid "Edit Path Effect parameters" +msgstr "Редактирование параметров динамических контурных эффектов" -#: ../src/widgets/gradient-toolbar.cpp:1038 -msgid "Create radial (elliptic or circular) gradient" -msgstr "Создать радиальный (эллиптический или круговой) градиент" +#: ../src/verbs.cpp:2688 +msgctxt "ContextVerb" +msgid "Eraser" +msgstr "Ластик" -#: ../src/widgets/gradient-toolbar.cpp:1041 -#: ../src/widgets/mesh-toolbar.cpp:211 -msgid "New:" -msgstr "Создать:" +#: ../src/verbs.cpp:2689 +msgid "Erase existing paths" +msgstr "Удалять существующие объекты" -#: ../src/widgets/gradient-toolbar.cpp:1064 -#: ../src/widgets/mesh-toolbar.cpp:234 +#: ../src/verbs.cpp:2690 #, fuzzy -msgid "fill" -msgstr "Без заливки" +msgctxt "ContextVerb" +msgid "LPE Tool" +msgstr "Геометрические построения" -#: ../src/widgets/gradient-toolbar.cpp:1064 -#: ../src/widgets/mesh-toolbar.cpp:234 -msgid "Create gradient in the fill" -msgstr "Создать градиент в заливке" +#: ../src/verbs.cpp:2691 +msgid "Do geometric constructions" +msgstr "Создавать геометрические построения" -#: ../src/widgets/gradient-toolbar.cpp:1068 -#: ../src/widgets/mesh-toolbar.cpp:238 -#, fuzzy -msgid "stroke" -msgstr "Обводка" +#. Tool prefs +#: ../src/verbs.cpp:2693 +msgid "Selector Preferences" +msgstr "Параметры Выделителя" -#: ../src/widgets/gradient-toolbar.cpp:1068 -#: ../src/widgets/mesh-toolbar.cpp:238 -msgid "Create gradient in the stroke" -msgstr "Создать градиент в обводке" +#: ../src/verbs.cpp:2694 +msgid "Open Preferences for the Selector tool" +msgstr "Открыть окно параметров Выделителя" -#: ../src/widgets/gradient-toolbar.cpp:1071 -#: ../src/widgets/mesh-toolbar.cpp:241 -msgid "on:" -msgstr "в:" +#: ../src/verbs.cpp:2695 +msgid "Node Tool Preferences" +msgstr "Параметры инструмента Узлы" -#: ../src/widgets/gradient-toolbar.cpp:1096 -msgid "Select" -msgstr "Выделитель" +#: ../src/verbs.cpp:2696 +msgid "Open Preferences for the Node tool" +msgstr "Открыть окно параметров инструмента Узлы" -#: ../src/widgets/gradient-toolbar.cpp:1096 -msgid "Choose a gradient" -msgstr "Выбрать градиент" +#: ../src/verbs.cpp:2697 +msgid "Tweak Tool Preferences" +msgstr "Параметры Корректора" -#: ../src/widgets/gradient-toolbar.cpp:1097 -msgid "Select:" -msgstr "Градиенты:" +#: ../src/verbs.cpp:2698 +msgid "Open Preferences for the Tweak tool" +msgstr "Открыть окно параметров корректора" -#: ../src/widgets/gradient-toolbar.cpp:1115 -msgid "Reflected" -msgstr "Отражённый" +#: ../src/verbs.cpp:2699 +msgid "Spray Tool Preferences" +msgstr "Параметры Распылителя" -#: ../src/widgets/gradient-toolbar.cpp:1118 -msgid "Direct" -msgstr "Прямой" +#: ../src/verbs.cpp:2700 +msgid "Open Preferences for the Spray tool" +msgstr "Открыть окно параметров Распылителя" -#: ../src/widgets/gradient-toolbar.cpp:1120 -msgid "Repeat" -msgstr "Повтор" +#: ../src/verbs.cpp:2701 +msgid "Rectangle Preferences" +msgstr "Параметры Прямоугольника" -#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute -#: ../src/widgets/gradient-toolbar.cpp:1122 -msgid "" -"Whether to fill with flat color beyond the ends of the gradient vector " -"(spreadMethod=\"pad\"), or repeat the gradient in the same direction " -"(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite " -"directions (spreadMethod=\"reflect\")" -msgstr "" -"За границами градиента: заполнять сплошным цветом, повторять исходный " -"градиент или повторять отражённый градиент" +#: ../src/verbs.cpp:2702 +msgid "Open Preferences for the Rectangle tool" +msgstr "Открыть окно параметров инструмента для рисования прямоугольников" -#: ../src/widgets/gradient-toolbar.cpp:1127 -msgid "Repeat:" -msgstr "Повтор:" +#: ../src/verbs.cpp:2703 +msgid "3D Box Preferences" +msgstr "Параметры Паралеллепипеда" -#: ../src/widgets/gradient-toolbar.cpp:1141 -#, fuzzy -msgid "No stops" -msgstr "Без обводки" +#: ../src/verbs.cpp:2704 +msgid "Open Preferences for the 3D Box tool" +msgstr "Открыть окно параметров инструмента для рисования параллелепипедов" -#: ../src/widgets/gradient-toolbar.cpp:1143 -msgid "Stops" -msgstr "Опорные точки" +#: ../src/verbs.cpp:2705 +msgid "Ellipse Preferences" +msgstr "Параметры Эллипса" -#: ../src/widgets/gradient-toolbar.cpp:1143 -msgid "Select a stop for the current gradient" -msgstr "Выбрать опорную точку градиента" +#: ../src/verbs.cpp:2706 +msgid "Open Preferences for the Ellipse tool" +msgstr "Открыть окно параметров инструмента для рисования эллипсов" -#: ../src/widgets/gradient-toolbar.cpp:1144 -msgid "Stops:" -msgstr "Точки:" +#: ../src/verbs.cpp:2707 +msgid "Star Preferences" +msgstr "Параметры Звезды" -#. Label -#: ../src/widgets/gradient-toolbar.cpp:1156 -#: ../src/widgets/gradient-vector.cpp:926 -#, fuzzy -msgctxt "Gradient" -msgid "Offset:" -msgstr "Смещение:" +#: ../src/verbs.cpp:2708 +msgid "Open Preferences for the Star tool" +msgstr "Открыть окно параметров инструмента для рисования звёзд" -#: ../src/widgets/gradient-toolbar.cpp:1156 -msgid "Offset of selected stop" -msgstr "Смещение выбранной опорной точки" +#: ../src/verbs.cpp:2709 +msgid "Spiral Preferences" +msgstr "Параметры Спирали" -#: ../src/widgets/gradient-toolbar.cpp:1174 -#: ../src/widgets/gradient-toolbar.cpp:1175 -msgid "Insert new stop" -msgstr "Вставить опорную точку" +#: ../src/verbs.cpp:2710 +msgid "Open Preferences for the Spiral tool" +msgstr "Открыть окно параметров инструмента для рисования спиралей" -#: ../src/widgets/gradient-toolbar.cpp:1188 -#: ../src/widgets/gradient-toolbar.cpp:1189 -#: ../src/widgets/gradient-vector.cpp:908 -msgid "Delete stop" -msgstr "Удалить опорную точку" +#: ../src/verbs.cpp:2711 +msgid "Pencil Preferences" +msgstr "Параметры Карандаша" -#: ../src/widgets/gradient-toolbar.cpp:1202 -msgid "Reverse" -msgstr "Развернуть" +#: ../src/verbs.cpp:2712 +msgid "Open Preferences for the Pencil tool" +msgstr "Открыть окно параметров карандаша" -#: ../src/widgets/gradient-toolbar.cpp:1203 -msgid "Reverse the direction of the gradient" -msgstr "Развернуть направление градиента" +#: ../src/verbs.cpp:2713 +msgid "Pen Preferences" +msgstr "Параметры Пера" -#: ../src/widgets/gradient-toolbar.cpp:1217 -msgid "Link gradients" -msgstr "Связать градиенты" +#: ../src/verbs.cpp:2714 +msgid "Open Preferences for the Pen tool" +msgstr "Открыть окно параметров пера" -#: ../src/widgets/gradient-toolbar.cpp:1218 -msgid "Link gradients to change all related gradients" -msgstr "" +#: ../src/verbs.cpp:2715 +msgid "Calligraphic Preferences" +msgstr "Параметры Каллиграфического пера" -#: ../src/widgets/gradient-vector.cpp:332 -#: ../src/widgets/paint-selector.cpp:922 -#: ../src/widgets/stroke-marker-selector.cpp:154 -msgid "No document selected" -msgstr "Документ не выбран" +#: ../src/verbs.cpp:2716 +msgid "Open Preferences for the Calligraphy tool" +msgstr "Открыть окно параметров Каллиграфического пера" -#: ../src/widgets/gradient-vector.cpp:336 -msgid "No gradients in document" -msgstr "Документ не содержит градиентов" +#: ../src/verbs.cpp:2717 +msgid "Text Preferences" +msgstr "Параметры Текста" -#: ../src/widgets/gradient-vector.cpp:340 -msgid "No gradient selected" -msgstr "Градиент не выделен" +#: ../src/verbs.cpp:2718 +msgid "Open Preferences for the Text tool" +msgstr "Открыть окно параметров инструмента для набора текста" -#. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:903 -msgid "Add stop" -msgstr "Добавить опорную точку" +#: ../src/verbs.cpp:2719 +msgid "Gradient Preferences" +msgstr "Параметры Градиентной заливки" -#: ../src/widgets/gradient-vector.cpp:906 -msgid "Add another control stop to gradient" -msgstr "Добавить еще одну опорную точку в градиент" +#: ../src/verbs.cpp:2720 +msgid "Open Preferences for the Gradient tool" +msgstr "Открыть окно параметров инструмента для градиентной заливки" -#: ../src/widgets/gradient-vector.cpp:911 -msgid "Delete current control stop from gradient" -msgstr "Удалить опорную точку градиента" +#: ../src/verbs.cpp:2721 +#, fuzzy +msgid "Mesh Preferences" +msgstr "Параметры Ластика" -#. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:979 -msgid "Stop Color" -msgstr "Цвет опорной точки" +#: ../src/verbs.cpp:2722 +#, fuzzy +msgid "Open Preferences for the Mesh tool" +msgstr "Открыть окно параметров ластика" -#: ../src/widgets/gradient-vector.cpp:1007 -msgid "Gradient editor" -msgstr "Редактор градиентов" +#: ../src/verbs.cpp:2723 +msgid "Zoom Preferences" +msgstr "Параметры Лупы" -#: ../src/widgets/gradient-vector.cpp:1307 -msgid "Change gradient stop color" -msgstr "Смена цвета опорной точки градиента" +#: ../src/verbs.cpp:2724 +msgid "Open Preferences for the Zoom tool" +msgstr "Открыть окно параметров лупы" -#: ../src/widgets/lpe-toolbar.cpp:233 -msgid "Closed" -msgstr "Закрытый" +#: ../src/verbs.cpp:2725 +msgid "Measure Preferences" +msgstr "Параметры Измерителя" -#: ../src/widgets/lpe-toolbar.cpp:235 -msgid "Open start" -msgstr "С открытым началом" +#: ../src/verbs.cpp:2726 +#, fuzzy +msgid "Open Preferences for the Measure tool" +msgstr "Открыть окно параметров ластика" -#: ../src/widgets/lpe-toolbar.cpp:237 -msgid "Open end" -msgstr "С открытым концом" +#: ../src/verbs.cpp:2727 +msgid "Dropper Preferences" +msgstr "Параметры Пипетки" -#: ../src/widgets/lpe-toolbar.cpp:239 -msgid "Open both" -msgstr "Открыт с обеих сторон" +#: ../src/verbs.cpp:2728 +msgid "Open Preferences for the Dropper tool" +msgstr "Открыть окно параметров пипетки" -#: ../src/widgets/lpe-toolbar.cpp:298 -msgid "All inactive" -msgstr "Все неактивны" +#: ../src/verbs.cpp:2729 +msgid "Connector Preferences" +msgstr "Параметры Соединительных линий" -#: ../src/widgets/lpe-toolbar.cpp:299 -msgid "No geometric tool is active" -msgstr "Ни один инструмент создания геометрических конструкций не выбран" +#: ../src/verbs.cpp:2730 +msgid "Open Preferences for the Connector tool" +msgstr "Открыть окно параметров соединительных линий" -#: ../src/widgets/lpe-toolbar.cpp:332 -msgid "Show limiting bounding box" -msgstr "Показывать ограничивающую площадку (BB)" +#: ../src/verbs.cpp:2731 +msgid "Paint Bucket Preferences" +msgstr "Параметры инструмента Сплошной заливки" -#: ../src/widgets/lpe-toolbar.cpp:333 -msgid "Show bounding box (used to cut infinite lines)" -msgstr "Показывать площадку (для обрезания бесконечных линий)" +#: ../src/verbs.cpp:2732 +msgid "Open Preferences for the Paint Bucket tool" +msgstr "Открыть окно параметров инструмента для сплошной заливки" -#: ../src/widgets/lpe-toolbar.cpp:344 -msgid "Get limiting bounding box from selection" -msgstr "Делать ограничивающую площадку (BB) из выделения" +#: ../src/verbs.cpp:2733 +msgid "Eraser Preferences" +msgstr "Параметры Ластика" -#: ../src/widgets/lpe-toolbar.cpp:345 -msgid "" -"Set limiting bounding box (used to cut infinite lines) to the bounding box " -"of current selection" +#: ../src/verbs.cpp:2734 +msgid "Open Preferences for the Eraser tool" +msgstr "Открыть окно параметров ластика" + +#: ../src/verbs.cpp:2735 +msgid "LPE Tool Preferences" +msgstr "Параметры инструмента для создания Геометрических конструкций" + +#: ../src/verbs.cpp:2736 +msgid "Open Preferences for the LPETool tool" msgstr "" -"Создание и редактирование масштабируемой векторной графики в формате SVG" +"Открыть окно параметров Inkscape для инструмента геометрических конструкций" -#: ../src/widgets/lpe-toolbar.cpp:357 -msgid "Choose a line segment type" -msgstr "Выберите тип сегмента линии" +#. Zoom/View +#: ../src/verbs.cpp:2738 +msgid "Zoom In" +msgstr "Увеличить" -#: ../src/widgets/lpe-toolbar.cpp:373 -msgid "Display measuring info" -msgstr "Показывать данные измерений" +#: ../src/verbs.cpp:2738 +msgid "Zoom in" +msgstr "Увеличить" + +#: ../src/verbs.cpp:2739 +msgid "Zoom Out" +msgstr "Уменьшить" + +#: ../src/verbs.cpp:2739 +msgid "Zoom out" +msgstr "Уменьшить" + +#: ../src/verbs.cpp:2740 +msgid "_Rulers" +msgstr "_Линейки" -#: ../src/widgets/lpe-toolbar.cpp:374 -msgid "Display measuring info for selected items" -msgstr "Показывать измерения выбранных объектов" +#: ../src/verbs.cpp:2740 +msgid "Show or hide the canvas rulers" +msgstr "Показать/скрыть линейки холста" -#. Add the units menu. -#: ../src/widgets/lpe-toolbar.cpp:384 ../src/widgets/node-toolbar.cpp:613 -#: ../src/widgets/paintbucket-toolbar.cpp:166 -#: ../src/widgets/rect-toolbar.cpp:375 ../src/widgets/select-toolbar.cpp:536 -msgid "Units" -msgstr "Единицы" +#: ../src/verbs.cpp:2741 +msgid "Scroll_bars" +msgstr "Полосы _прокрутки" -#: ../src/widgets/lpe-toolbar.cpp:394 -msgid "Open LPE dialog" -msgstr "Открыть диалог LPE" +#: ../src/verbs.cpp:2741 +msgid "Show or hide the canvas scrollbars" +msgstr "Показать или скрыть полосы прокрутки холста" -#: ../src/widgets/lpe-toolbar.cpp:395 -msgid "Open LPE dialog (to adapt parameters numerically)" -msgstr "" -"Открыть диалог динамических контурных эффектов для ручного ввода параметров" +#: ../src/verbs.cpp:2742 +msgid "Page _Grid" +msgstr "Сетка стран_ицы" -#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1273 -msgid "Font Size" -msgstr "Кегль шрифта" +#: ../src/verbs.cpp:2742 +msgid "Show or hide the page grid" +msgstr "Показать или скрыть сетку страницы" -#: ../src/widgets/measure-toolbar.cpp:86 -msgid "Font Size:" -msgstr "Кегль шрифта:" +#: ../src/verbs.cpp:2743 +msgid "G_uides" +msgstr "_Направляющие" -#: ../src/widgets/measure-toolbar.cpp:87 -msgid "The font size to be used in the measurement labels" -msgstr "Кегль шрифта в метках инструмента измерения" +#: ../src/verbs.cpp:2743 +msgid "Show or hide guides (drag from a ruler to create a guide)" +msgstr "" +"Показать или скрыть направляющие (создаваемые перетаскиванием с линейки)" -#: ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 -msgid "The units to be used for the measurements" -msgstr "В каких единицах производить измерения" +#: ../src/verbs.cpp:2744 +msgid "Enable snapping" +msgstr "Включить прилипание" -#: ../src/widgets/mesh-toolbar.cpp:204 -#, fuzzy -msgid "normal" -msgstr "Нормальный" +#: ../src/verbs.cpp:2745 +msgid "_Commands Bar" +msgstr "Панель _команд" -#: ../src/widgets/mesh-toolbar.cpp:204 -#, fuzzy -msgid "Create mesh gradient" -msgstr "Создать линейный градиент" +#: ../src/verbs.cpp:2745 +msgid "Show or hide the Commands bar (under the menu)" +msgstr "Показать или скрыть панель команд (под меню)" -#: ../src/widgets/mesh-toolbar.cpp:208 -msgid "conical" -msgstr "" +#: ../src/verbs.cpp:2746 +msgid "Sn_ap Controls Bar" +msgstr "Панель параметров при_липания" -#: ../src/widgets/mesh-toolbar.cpp:208 -#, fuzzy -msgid "Create conical gradient" -msgstr "Создать линейный градиент" +#: ../src/verbs.cpp:2746 +msgid "Show or hide the snapping controls" +msgstr "Показать или скрыть панель с параметрами прилипания" -#: ../src/widgets/mesh-toolbar.cpp:263 -msgid "Rows" -msgstr "Строк:" +#: ../src/verbs.cpp:2747 +msgid "T_ool Controls Bar" +msgstr "Панель параметров _инструментов" -#: ../src/widgets/mesh-toolbar.cpp:263 -#: ../share/extensions/guides_creator.inx.h:5 -#: ../share/extensions/layout_nup.inx.h:12 -msgid "Rows:" -msgstr "Строк:" +#: ../src/verbs.cpp:2747 +msgid "Show or hide the Tool Controls bar" +msgstr "Показать или скрыть панель с параметрами инструментов" -#: ../src/widgets/mesh-toolbar.cpp:263 -#, fuzzy -msgid "Number of rows in new mesh" -msgstr "Количество строк" +#: ../src/verbs.cpp:2748 +msgid "_Toolbox" +msgstr "_Панель инструментов" -#: ../src/widgets/mesh-toolbar.cpp:279 -#, fuzzy -msgid "Columns" -msgstr "С_толбцы:" +#: ../src/verbs.cpp:2748 +msgid "Show or hide the main toolbox (on the left)" +msgstr "Показать или скрыть главную панель инструментов (слева)" -#: ../src/widgets/mesh-toolbar.cpp:279 -#: ../share/extensions/guides_creator.inx.h:4 -#, fuzzy -msgid "Columns:" -msgstr "С_толбцы:" +#: ../src/verbs.cpp:2749 +msgid "_Palette" +msgstr "О_бразцы цветов" -#: ../src/widgets/mesh-toolbar.cpp:279 -#, fuzzy -msgid "Number of columns in new mesh" -msgstr "Сколько столбцов в таблице" +#: ../src/verbs.cpp:2749 +msgid "Show or hide the color palette" +msgstr "Показать или скрыть панель с палитрой цветов" -#: ../src/widgets/mesh-toolbar.cpp:293 -#, fuzzy -msgid "Edit Fill" -msgstr "Изменить заливку..." +#: ../src/verbs.cpp:2750 +msgid "_Statusbar" +msgstr "_Строка состояния" -#: ../src/widgets/mesh-toolbar.cpp:294 -#, fuzzy -msgid "Edit fill mesh" -msgstr "Изменить заливку..." +#: ../src/verbs.cpp:2750 +msgid "Show or hide the statusbar (at the bottom of the window)" +msgstr "Показать или скрыть строку состояния (внизу окна)" -#: ../src/widgets/mesh-toolbar.cpp:305 -#, fuzzy -msgid "Edit Stroke" -msgstr "Изменить обводку..." +#: ../src/verbs.cpp:2751 +msgid "Nex_t Zoom" +msgstr "С_ледующий масштаб" -#: ../src/widgets/mesh-toolbar.cpp:306 -#, fuzzy -msgid "Edit stroke mesh" -msgstr "Изменить обводку..." +#: ../src/verbs.cpp:2751 +msgid "Next zoom (from the history of zooms)" +msgstr "Следующий масштаб (из истории масштабирования)" -#: ../src/widgets/mesh-toolbar.cpp:317 ../src/widgets/node-toolbar.cpp:521 -msgid "Show Handles" -msgstr "Показывать рычаги" +#: ../src/verbs.cpp:2753 +msgid "Pre_vious Zoom" +msgstr "_Предыдущий масштаб" -#: ../src/widgets/mesh-toolbar.cpp:318 -#, fuzzy -msgid "Show side and tensor handles" -msgstr "Сохранение трансформации:" +#: ../src/verbs.cpp:2753 +msgid "Previous zoom (from the history of zooms)" +msgstr "Предыдущий масштаб (из истории масштабирования)" -#: ../src/widgets/node-toolbar.cpp:341 -msgid "Insert node" -msgstr "Вставка узла" +#: ../src/verbs.cpp:2755 +msgid "Zoom 1:_1" +msgstr "Масштаб 1:_1" -#: ../src/widgets/node-toolbar.cpp:342 -msgid "Insert new nodes into selected segments" -msgstr "Вставить новые узлы в выделенные сегменты" +#: ../src/verbs.cpp:2755 +msgid "Zoom to 1:1" +msgstr "Масштаб 1:1" -#: ../src/widgets/node-toolbar.cpp:345 -msgid "Insert" -msgstr "Вставить" +#: ../src/verbs.cpp:2757 +msgid "Zoom 1:_2" +msgstr "Масштаб 1:_2" -#: ../src/widgets/node-toolbar.cpp:356 -#, fuzzy -msgid "Insert node at min X" -msgstr "Вставка узла" +#: ../src/verbs.cpp:2757 +msgid "Zoom to 1:2" +msgstr "Масштаб 1:2" -#: ../src/widgets/node-toolbar.cpp:357 -#, fuzzy -msgid "Insert new nodes at min X into selected segments" -msgstr "Вставить новые узлы в выделенные сегменты" +#: ../src/verbs.cpp:2759 +msgid "_Zoom 2:1" +msgstr "_Масштаб 2:1" -#: ../src/widgets/node-toolbar.cpp:360 -#, fuzzy -msgid "Insert min X" -msgstr "Вставка узла" +#: ../src/verbs.cpp:2759 +msgid "Zoom to 2:1" +msgstr "Масштаб 2:1" -#: ../src/widgets/node-toolbar.cpp:366 -#, fuzzy -msgid "Insert node at max X" -msgstr "Вставка узла" +#: ../src/verbs.cpp:2762 +msgid "_Fullscreen" +msgstr "Во весь _экран" -#: ../src/widgets/node-toolbar.cpp:367 -#, fuzzy -msgid "Insert new nodes at max X into selected segments" -msgstr "Вставить новые узлы в выделенные сегменты" +#: ../src/verbs.cpp:2762 ../src/verbs.cpp:2764 +msgid "Stretch this document window to full screen" +msgstr "Развернуть окно документа на весь экран" -#: ../src/widgets/node-toolbar.cpp:370 +#: ../src/verbs.cpp:2764 #, fuzzy -msgid "Insert max X" -msgstr "Вставить" +msgid "Fullscreen & Focus Mode" +msgstr "Переключить режим _фокуса" -#: ../src/widgets/node-toolbar.cpp:376 -#, fuzzy -msgid "Insert node at min Y" -msgstr "Вставка узла" +#: ../src/verbs.cpp:2767 +msgid "Toggle _Focus Mode" +msgstr "Переключить режим _фокуса" -#: ../src/widgets/node-toolbar.cpp:377 -#, fuzzy -msgid "Insert new nodes at min Y into selected segments" -msgstr "Вставить новые узлы в выделенные сегменты" +#: ../src/verbs.cpp:2767 +msgid "Remove excess toolbars to focus on drawing" +msgstr "" +"Убрать избыточные панели инструментов, чтобы сконцентрироваться на рисунке" -#: ../src/widgets/node-toolbar.cpp:380 -#, fuzzy -msgid "Insert min Y" -msgstr "Вставка узла" +#: ../src/verbs.cpp:2769 +msgid "Duplic_ate Window" +msgstr "Пов_торить окно" -#: ../src/widgets/node-toolbar.cpp:386 -#, fuzzy -msgid "Insert node at max Y" -msgstr "Вставка узла" +#: ../src/verbs.cpp:2769 +msgid "Open a new window with the same document" +msgstr "Открыть новое окно с этим же документом" -#: ../src/widgets/node-toolbar.cpp:387 -#, fuzzy -msgid "Insert new nodes at max Y into selected segments" -msgstr "Вставить новые узлы в выделенные сегменты" +#: ../src/verbs.cpp:2771 +msgid "_New View Preview" +msgstr "_Создать предварительный просмотр" -#: ../src/widgets/node-toolbar.cpp:390 -#, fuzzy -msgid "Insert max Y" -msgstr "Вставить" +#: ../src/verbs.cpp:2772 +msgid "New View Preview" +msgstr "Создать новое окно предварительного просмотра" -#: ../src/widgets/node-toolbar.cpp:398 -msgid "Delete selected nodes" -msgstr "Удалить выделенные узлы" +#. "view_new_preview" +#: ../src/verbs.cpp:2774 ../src/verbs.cpp:2782 +msgid "_Normal" +msgstr "Об_ычная" -#: ../src/widgets/node-toolbar.cpp:409 -msgid "Join selected nodes" -msgstr "Соединить выделенные узлы" +#: ../src/verbs.cpp:2775 +msgid "Switch to normal display mode" +msgstr "Переключиться на обычное отображение" -#: ../src/widgets/node-toolbar.cpp:412 -msgid "Join" -msgstr "Соединение" +#: ../src/verbs.cpp:2776 +msgid "No _Filters" +msgstr "Б_ез фильтров" -#: ../src/widgets/node-toolbar.cpp:420 -msgid "Break path at selected nodes" -msgstr "Разорвать контур в выделенном узле" +#: ../src/verbs.cpp:2777 +msgid "Switch to normal display without filters" +msgstr "Переключиться на обычное отображение без фильтров" -#: ../src/widgets/node-toolbar.cpp:430 -msgid "Join with segment" -msgstr "Соединить узлы сегментом" +#: ../src/verbs.cpp:2778 +msgid "_Outline" +msgstr "К_аркас" -#: ../src/widgets/node-toolbar.cpp:431 -msgid "Join selected endnodes with a new segment" -msgstr "Соединить контуры по выделенным оконечным узлам новым сегментом" +#: ../src/verbs.cpp:2779 +msgid "Switch to outline (wireframe) display mode" +msgstr "Переключиться на отображение каркаса объектов" -#: ../src/widgets/node-toolbar.cpp:440 -msgid "Delete segment" -msgstr "Удаление сегмента" +#. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), +#. N_("Switch to print colors preview mode"), NULL), +#: ../src/verbs.cpp:2780 ../src/verbs.cpp:2788 +msgid "_Toggle" +msgstr "_Переключиться" -#: ../src/widgets/node-toolbar.cpp:441 -msgid "Delete segment between two non-endpoint nodes" -msgstr "Удалить сегмент между двумя неоконечными узлами" +#: ../src/verbs.cpp:2781 +msgid "Toggle between normal and outline display modes" +msgstr "Переключиться между нормальным и каркасным режимами отображения" -#: ../src/widgets/node-toolbar.cpp:450 -msgid "Node Cusp" -msgstr "Острые узлы" +#: ../src/verbs.cpp:2783 +#, fuzzy +msgid "Switch to normal color display mode" +msgstr "Переключиться на обычное отображение" -#: ../src/widgets/node-toolbar.cpp:451 -msgid "Make selected nodes corner" -msgstr "Сделать выделенные узлы острыми" +#: ../src/verbs.cpp:2784 +msgid "_Grayscale" +msgstr "_Градации серого" -#: ../src/widgets/node-toolbar.cpp:460 -msgid "Node Smooth" -msgstr "Гладкие узлы" +#: ../src/verbs.cpp:2785 +#, fuzzy +msgid "Switch to grayscale display mode" +msgstr "Переключиться на обычное отображение" -#: ../src/widgets/node-toolbar.cpp:461 -msgid "Make selected nodes smooth" -msgstr "Сделать выделенные узлы сглаженными" +#: ../src/verbs.cpp:2789 +#, fuzzy +msgid "Toggle between normal and grayscale color display modes" +msgstr "Переключиться между нормальным и каркасным режимами отображения" -#: ../src/widgets/node-toolbar.cpp:470 -msgid "Node Symmetric" -msgstr "Симметричные узлы" +#: ../src/verbs.cpp:2791 +msgid "Color-managed view" +msgstr "Цветоуправляемое отображение" -#: ../src/widgets/node-toolbar.cpp:471 -msgid "Make selected nodes symmetric" -msgstr "Сделать выделенные узлы симметричными" +#: ../src/verbs.cpp:2792 +msgid "Toggle color-managed display for this document window" +msgstr "Включить или выключить управление цветом для этого окна с документом" -#: ../src/widgets/node-toolbar.cpp:480 -msgid "Node Auto" -msgstr "Автоматический узел" +#: ../src/verbs.cpp:2794 +msgid "Ico_n Preview..." +msgstr "Просмотреть как _значок" -#: ../src/widgets/node-toolbar.cpp:481 -msgid "Make selected nodes auto-smooth" -msgstr "Сделать выделенные узлы автоматически сглаженными" +#: ../src/verbs.cpp:2795 +msgid "Open a window to preview objects at different icon resolutions" +msgstr "Просмотреть выделение как значок разных размеров" -#: ../src/widgets/node-toolbar.cpp:490 -msgid "Node Line" -msgstr "Линия по узлам" +#: ../src/verbs.cpp:2797 +msgid "Zoom to fit page in window" +msgstr "Масштабировать так, чтобы целиком уместить страницу в окне" -#: ../src/widgets/node-toolbar.cpp:491 -msgid "Make selected segments lines" -msgstr "Сделать выделенные сегменты прямыми" +#: ../src/verbs.cpp:2798 +msgid "Page _Width" +msgstr "_Ширина страницы" -#: ../src/widgets/node-toolbar.cpp:500 -msgid "Node Curve" -msgstr "Кривая по узлам" +#: ../src/verbs.cpp:2799 +msgid "Zoom to fit page width in window" +msgstr "Масштабировать так, чтобы уместить в окне страницу по ширине" -#: ../src/widgets/node-toolbar.cpp:501 -msgid "Make selected segments curves" -msgstr "Сделать выделенные сегменты кривыми" +#: ../src/verbs.cpp:2801 +msgid "Zoom to fit drawing in window" +msgstr "Масштабировать так, чтобы целиком уместить рисунок в окне" -#: ../src/widgets/node-toolbar.cpp:510 -msgid "Show Transform Handles" -msgstr "Показывать рычаги трансформации" +#: ../src/verbs.cpp:2803 +msgid "Zoom to fit selection in window" +msgstr "Масштабировать так, чтобы уместить в окне выделенную область" -#: ../src/widgets/node-toolbar.cpp:511 -msgid "Show transformation handles for selected nodes" -msgstr "Показывать рычаги трансформации выделенных узлов" +#. Dialogs +#: ../src/verbs.cpp:2806 +msgid "P_references..." +msgstr "_Параметры..." -#: ../src/widgets/node-toolbar.cpp:522 -msgid "Show Bezier handles of selected nodes" -msgstr "Показывать рычаги выбранных узлов" +#: ../src/verbs.cpp:2807 +msgid "Edit global Inkscape preferences" +msgstr "Изменить общие настройки Inkscape" -#: ../src/widgets/node-toolbar.cpp:532 -msgid "Show Outline" -msgstr "Показывать контур" +#: ../src/verbs.cpp:2808 +msgid "_Document Properties..." +msgstr "Свойства _документа..." -#: ../src/widgets/node-toolbar.cpp:533 -msgid "Show path outline (without path effects)" -msgstr "Показывать абрис контура (без контурных эффектов)" +#: ../src/verbs.cpp:2809 +msgid "Edit properties of this document (to be saved with the document)" +msgstr "Изменить параметры этого документа, сохраняемые вместе с ним" -#: ../src/widgets/node-toolbar.cpp:555 -msgid "Edit clipping paths" -msgstr "Изменить обтравочные контуры" +#: ../src/verbs.cpp:2810 +msgid "Document _Metadata..." +msgstr "_Метаданные документа..." -#: ../src/widgets/node-toolbar.cpp:556 -msgid "Show clipping path(s) of selected object(s)" -msgstr "Показать обтравочные контуры выделенных объектов" +#: ../src/verbs.cpp:2811 +msgid "Edit document metadata (to be saved with the document)" +msgstr "Изменить сведения о документе, сохраняемые вместе с ним" -#: ../src/widgets/node-toolbar.cpp:566 -msgid "Edit masks" -msgstr "Изменить маски" +#: ../src/verbs.cpp:2813 +msgid "" +"Edit objects' colors, gradients, arrowheads, and other fill and stroke " +"properties..." +msgstr "" +"Изменить заливку объекта, параметры обводки, маркеры и штриховку стрелок..." -#: ../src/widgets/node-toolbar.cpp:567 -msgid "Show mask(s) of selected object(s)" -msgstr "Показать маски выделенных объектов" +#. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon +#: ../src/verbs.cpp:2815 +msgid "Gl_yphs..." +msgstr "_Глифы..." -#: ../src/widgets/node-toolbar.cpp:581 -msgid "X coordinate:" -msgstr "Координата по X:" +#: ../src/verbs.cpp:2816 +msgid "Select characters from a glyphs palette" +msgstr "Выбрать символы из палитры глифов" -#: ../src/widgets/node-toolbar.cpp:581 -msgid "X coordinate of selected node(s)" -msgstr "Координата X выбранных узлов" +#. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon +#. TRANSLATORS: "Swatches" means: color samples +#: ../src/verbs.cpp:2819 +msgid "S_watches..." +msgstr "Образцы _цветов..." -#: ../src/widgets/node-toolbar.cpp:599 -msgid "Y coordinate:" -msgstr "Координата по Y:" +#: ../src/verbs.cpp:2820 +msgid "Select colors from a swatches palette" +msgstr "Выбрать цвет из палитры образцов" -#: ../src/widgets/node-toolbar.cpp:599 -msgid "Y coordinate of selected node(s)" -msgstr "Координата Y выбранных узлов" +#: ../src/verbs.cpp:2821 +msgid "S_ymbols..." +msgstr "С_имволы..." -#: ../src/widgets/paint-selector.cpp:234 -msgid "No paint" -msgstr "Нет заливки" +#: ../src/verbs.cpp:2822 +#, fuzzy +msgid "Select symbol from a symbols palette" +msgstr "Выбрать цвет из палитры образцов" -#: ../src/widgets/paint-selector.cpp:236 -msgid "Flat color" -msgstr "Сплошной цвет" +#: ../src/verbs.cpp:2823 +msgid "Transfor_m..." +msgstr "Транс_формировать..." -#: ../src/widgets/paint-selector.cpp:238 -msgid "Linear gradient" -msgstr "Линейный градиент" +#: ../src/verbs.cpp:2824 +msgid "Precisely control objects' transformations" +msgstr "Точно изменить текущий объект" -#: ../src/widgets/paint-selector.cpp:240 -msgid "Radial gradient" -msgstr "Радиальный градиент" +#: ../src/verbs.cpp:2825 +msgid "_Align and Distribute..." +msgstr "_Выровнять и расставить..." -#: ../src/widgets/paint-selector.cpp:246 -msgid "Unset paint (make it undefined so it can be inherited)" -msgstr "" -"Убрать заливку (сделать ее неопределенной, чтобы она могла наследоваться)" +#: ../src/verbs.cpp:2826 +msgid "Align and distribute objects" +msgstr "Выровнять и расставить объекты" + +#: ../src/verbs.cpp:2827 +msgid "_Spray options..." +msgstr "П_араметры распылителя..." -#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty -#: ../src/widgets/paint-selector.cpp:263 -msgid "" -"Any path self-intersections or subpaths create holes in the fill (fill-rule: " -"evenodd)" -msgstr "" -"Любые самопересечения или внутренние субконтуры образуют дыры в заливке " -"(fill-rule: evenodd)" +#: ../src/verbs.cpp:2828 +msgid "Some options for the spray" +msgstr "Параметры распылителя" -#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty -#: ../src/widgets/paint-selector.cpp:274 -msgid "" -"Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)" -msgstr "" -"Заливка имеет дыру, только если внутренний субконтур направлен в " -"противоположную сторону относительно внешнего (fill-rule: nonzero)" +#: ../src/verbs.cpp:2829 +msgid "Undo _History..." +msgstr "_История действий..." -#: ../src/widgets/paint-selector.cpp:590 -msgid "<b>No objects</b>" -msgstr "<b>Нет выбранных объектов</b>" +#: ../src/verbs.cpp:2830 +msgid "Undo History" +msgstr "История действий" -#: ../src/widgets/paint-selector.cpp:601 -msgid "<b>Multiple styles</b>" -msgstr "<b>Множественные стили</b>" +#: ../src/verbs.cpp:2832 +msgid "View and select font family, font size and other text properties" +msgstr "Просмотреть и выбрать гарнитуру, кегль и прочие характеристики текста" -#: ../src/widgets/paint-selector.cpp:612 -msgid "<b>Paint is undefined</b>" -msgstr "<b>Цвет не определен</b>" +#: ../src/verbs.cpp:2833 +msgid "_XML Editor..." +msgstr "Редактор _XML..." -#: ../src/widgets/paint-selector.cpp:623 -msgid "<b>No paint</b>" -msgstr "<b>Без заливки</b>" +#: ../src/verbs.cpp:2834 +msgid "View and edit the XML tree of the document" +msgstr "Просмотреть и изменить XML-дерево документа" -#: ../src/widgets/paint-selector.cpp:694 -msgid "<b>Flat color</b>" -msgstr "<b>Сплошной цвет</b>" +#: ../src/verbs.cpp:2835 +msgid "_Find/Replace..." +msgstr "_Найти/заменить..." -#. sp_gradient_selector_set_mode(SP_GRADIENT_SELECTOR(gsel), SP_GRADIENT_SELECTOR_MODE_LINEAR); -#: ../src/widgets/paint-selector.cpp:758 -msgid "<b>Linear gradient</b>" -msgstr "<b>Линейный градиент</b>" +#: ../src/verbs.cpp:2836 +msgid "Find objects in document" +msgstr "Найти объекты в документе" -#: ../src/widgets/paint-selector.cpp:761 -msgid "<b>Radial gradient</b>" -msgstr "<b>Радиальный градиент</b>" +#: ../src/verbs.cpp:2837 +msgid "Find and _Replace Text..." +msgstr "_Найти и заменить текст..." -#: ../src/widgets/paint-selector.cpp:1055 -msgid "" -"Use the <b>Node tool</b> to adjust position, scale, and rotation of the " -"pattern on canvas. Use <b>Object > Pattern > Objects to Pattern</b> to " -"create a new pattern from selection." -msgstr "" -"Используйте <b>Инструмент правки узлов</b> для коррекции позиции, масштаба и " -"вращения текстуры на холсте. Для создания новой текстуры из выделения " -"используйте команду <b>Объект > Текстура > Объект(ы) в текстуру</b>." +#: ../src/verbs.cpp:2838 +msgid "Find and replace text in document" +msgstr "Найти и заменить текст в документе" -#: ../src/widgets/paint-selector.cpp:1068 -msgid "<b>Pattern fill</b>" -msgstr "<b>Текстурная заливка</b>" +#: ../src/verbs.cpp:2840 +msgid "Check spelling of text in document" +msgstr "Проверить правописание текста в документе" -#: ../src/widgets/paint-selector.cpp:1162 -msgid "<b>Swatch fill</b>" -msgstr "<b>Заливка образцом</b>" +#: ../src/verbs.cpp:2841 +msgid "_Messages..." +msgstr "_Сообщения..." -#: ../src/widgets/paintbucket-toolbar.cpp:133 -msgid "Fill by" -msgstr "Канал" +#: ../src/verbs.cpp:2842 +msgid "View debug messages" +msgstr "Просмотреть отладочные сообщения" -#: ../src/widgets/paintbucket-toolbar.cpp:134 -msgid "Fill by:" -msgstr "Канал:" +#: ../src/verbs.cpp:2843 +msgid "Show/Hide D_ialogs" +msgstr "Показать или скр_ыть диалоги" -#: ../src/widgets/paintbucket-toolbar.cpp:146 -msgid "Fill Threshold" -msgstr "Порог заливки" +#: ../src/verbs.cpp:2844 +msgid "Show or hide all open dialogs" +msgstr "Показать или скрыть все открытые диалоги" -#: ../src/widgets/paintbucket-toolbar.cpp:147 +#: ../src/verbs.cpp:2845 +msgid "Create Tiled Clones..." +msgstr "_Создать узор из клонов..." + +#: ../src/verbs.cpp:2846 msgid "" -"The maximum allowed difference between the clicked pixel and the neighboring " -"pixels to be counted in the fill" +"Create multiple clones of selected object, arranging them into a pattern or " +"scattering" msgstr "" -"Максимально допустимая разница между щелкнутым пикселом и соседними " -"пикселами, попадающими в заливку" +"Создать несколько клонов выделенного объекта, расставив их в текстуру или " +"разбросав" -#: ../src/widgets/paintbucket-toolbar.cpp:174 -msgid "Grow/shrink by" -msgstr "Увеличить/уменьшить на" +#: ../src/verbs.cpp:2847 +#, fuzzy +msgid "_Object attributes..." +msgstr "_Свойства объекта..." -#: ../src/widgets/paintbucket-toolbar.cpp:174 -msgid "Grow/shrink by:" -msgstr "Увеличить/уменьшить на:" +#: ../src/verbs.cpp:2848 +#, fuzzy +msgid "Edit the object attributes..." +msgstr "Установить атрибут" -#: ../src/widgets/paintbucket-toolbar.cpp:175 -msgid "" -"The amount to grow (positive) or shrink (negative) the created fill path" +#: ../src/verbs.cpp:2850 +msgid "Edit the ID, locked and visible status, and other object properties" msgstr "" -"Насколько увеличить (положительное число) или уменьшить (отрицательное " -"число) создаваемый контур с заливкой" +"Изменить ID, статус заблокированности и видимости, иные свойства объекта" -#: ../src/widgets/paintbucket-toolbar.cpp:200 -msgid "Close gaps" -msgstr "Закрыть интервалы" +#: ../src/verbs.cpp:2851 +msgid "_Input Devices..." +msgstr "_Устройства ввода..." -#: ../src/widgets/paintbucket-toolbar.cpp:201 -msgid "Close gaps:" -msgstr "Закрыть интервалы:" +#: ../src/verbs.cpp:2852 +msgid "Configure extended input devices, such as a graphics tablet" +msgstr "Настройка расширенных устройств ввода, таких как графический планшет" -#: ../src/widgets/paintbucket-toolbar.cpp:212 -#: ../src/widgets/pencil-toolbar.cpp:293 ../src/widgets/spiral-toolbar.cpp:289 -#: ../src/widgets/star-toolbar.cpp:564 -msgid "Defaults" -msgstr "По умолчанию" +#: ../src/verbs.cpp:2853 +msgid "_Extensions..." +msgstr "_Расширения..." -#: ../src/widgets/paintbucket-toolbar.cpp:213 -msgid "" -"Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " -"to change defaults)" -msgstr "" -"Сбросить параметры заливки к значениям по умолчанию (параметры по умолчанию " -"можно изменить через диалог настройки Inkscape)" +#: ../src/verbs.cpp:2854 +msgid "Query information about extensions" +msgstr "Запросить информацию о расширениях" -#: ../src/widgets/pencil-toolbar.cpp:96 -msgid "Bezier" -msgstr "Кривые Безье" +#: ../src/verbs.cpp:2855 +msgid "Layer_s..." +msgstr "Сл_ои..." -#: ../src/widgets/pencil-toolbar.cpp:97 -msgid "Create regular Bezier path" -msgstr "Рисовать кривую Безье" +#: ../src/verbs.cpp:2856 +msgid "View Layers" +msgstr "Открыть палитру слоёв" -#: ../src/widgets/pencil-toolbar.cpp:104 -msgid "Create Spiro path" -msgstr "Рисовать кривую Спиро" +#: ../src/verbs.cpp:2857 +msgid "Path E_ffects ..." +msgstr "_Контурные эффекты..." -#: ../src/widgets/pencil-toolbar.cpp:111 -msgid "Zigzag" -msgstr "Зигзаги" +#: ../src/verbs.cpp:2858 +msgid "Manage, edit, and apply path effects" +msgstr "Управление, редактирование и применение контурных эффектов" -#: ../src/widgets/pencil-toolbar.cpp:112 -msgid "Create a sequence of straight line segments" -msgstr "Рисовать последовательность прямых отрезков" +#: ../src/verbs.cpp:2859 +msgid "Filter _Editor..." +msgstr "Редактор _фильтров..." -#: ../src/widgets/pencil-toolbar.cpp:118 -msgid "Paraxial" -msgstr "Параксиальный режим" +#: ../src/verbs.cpp:2860 +msgid "Manage, edit, and apply SVG filters" +msgstr "Управление, редактирование и применение фильтров SVG" -#: ../src/widgets/pencil-toolbar.cpp:119 -msgid "Create a sequence of paraxial line segments" -msgstr "Рисовать последовательность прямых отрезков" +#: ../src/verbs.cpp:2861 +msgid "SVG Font Editor..." +msgstr "Редактор шрифтов SVG..." -#: ../src/widgets/pencil-toolbar.cpp:127 -msgid "Mode of new lines drawn by this tool" -msgstr "Режим рисования новых контуров этим инструментом" +#: ../src/verbs.cpp:2862 +msgid "Edit SVG fonts" +msgstr "Редактирование шрифтов SVG" -#: ../src/widgets/pencil-toolbar.cpp:156 -msgid "Triangle in" -msgstr "Угасание" +#: ../src/verbs.cpp:2863 +msgid "Print Colors..." +msgstr "Печатаемые плашки..." -#: ../src/widgets/pencil-toolbar.cpp:157 -msgid "Triangle out" -msgstr "Нарастание" +#: ../src/verbs.cpp:2864 +msgid "" +"Select which color separations to render in Print Colors Preview rendermode" +msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:159 -msgid "From clipboard" -msgstr "Из буфера обмена" +#: ../src/verbs.cpp:2865 +msgid "_Export PNG Image..." +msgstr "_Экспортировать в PNG..." -#: ../src/widgets/pencil-toolbar.cpp:184 ../src/widgets/pencil-toolbar.cpp:185 -msgid "Shape:" -msgstr "Форма:" +#: ../src/verbs.cpp:2866 +#, fuzzy +msgid "Export this document or a selection as a PNG image" +msgstr "Экспортировать документ или выделенное в PNG" -#: ../src/widgets/pencil-toolbar.cpp:184 -msgid "Shape of new paths drawn by this tool" -msgstr "Форма новых контуров, рисуемых этим инструментом" +#. Help +#: ../src/verbs.cpp:2868 +msgid "About E_xtensions" +msgstr "О р_асширениях" -#: ../src/widgets/pencil-toolbar.cpp:269 -msgid "(many nodes, rough)" -msgstr "(много узлов, грубые линии)" +#: ../src/verbs.cpp:2869 +msgid "Information on Inkscape extensions" +msgstr "Информация о расширениях Inkscape" -#: ../src/widgets/pencil-toolbar.cpp:269 -msgid "(few nodes, smooth)" -msgstr "(мало узлов, плавные линии)" +#: ../src/verbs.cpp:2870 +msgid "About _Memory" +msgstr "Об используемой _памяти" -#: ../src/widgets/pencil-toolbar.cpp:272 -msgid "Smoothing:" -msgstr "Сглаживание:" +#: ../src/verbs.cpp:2871 +msgid "Memory usage information" +msgstr "Информация об используемой памяти" -#: ../src/widgets/pencil-toolbar.cpp:272 -msgid "Smoothing: " -msgstr "Сглаживание:" +#: ../src/verbs.cpp:2872 +msgid "_About Inkscape" +msgstr "_О программе" -#: ../src/widgets/pencil-toolbar.cpp:273 -msgid "How much smoothing (simplifying) is applied to the line" -msgstr "Как сильно сглаживается (упрощается) рисуемая от руки линия" +#: ../src/verbs.cpp:2873 +msgid "Inkscape version, authors, license" +msgstr "Версия Inkscape, авторы, лицензия" -#: ../src/widgets/pencil-toolbar.cpp:294 -msgid "" -"Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " -"change defaults)" -msgstr "" -"Сбросить параметры карандаша к значениям по умолчанию (параметры по " -"умолчанию можно изменить в диалоге настройки Inkscape)" +#. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), +#. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), +#. Tutorials +#: ../src/verbs.cpp:2878 +msgid "Inkscape: _Basic" +msgstr "Inkscape: _Основы" -#: ../src/widgets/rect-toolbar.cpp:122 -msgid "Change rectangle" -msgstr "Удаление закругления" +#: ../src/verbs.cpp:2879 +msgid "Getting started with Inkscape" +msgstr "Начинаем работу с Inkscape" -#: ../src/widgets/rect-toolbar.cpp:314 -msgid "W:" -msgstr "Ш:" +#. "tutorial_basic" +#: ../src/verbs.cpp:2880 +msgid "Inkscape: _Shapes" +msgstr "Inkscape: _Фигуры" -#: ../src/widgets/rect-toolbar.cpp:314 -msgid "Width of rectangle" -msgstr "Ширина прямоугольника" +#: ../src/verbs.cpp:2881 +msgid "Using shape tools to create and edit shapes" +msgstr "Использование инструментов рисования и редактирования фигур" -#: ../src/widgets/rect-toolbar.cpp:331 -msgid "H:" -msgstr "Г:" +#: ../src/verbs.cpp:2882 +msgid "Inkscape: _Advanced" +msgstr "Inkscape: _Продвинутый курс" -#: ../src/widgets/rect-toolbar.cpp:331 -msgid "Height of rectangle" -msgstr "Высота прямоугольника" +#: ../src/verbs.cpp:2883 +msgid "Advanced Inkscape topics" +msgstr "Дополнительные темы по Inkscape" -#: ../src/widgets/rect-toolbar.cpp:345 ../src/widgets/rect-toolbar.cpp:360 -msgid "not rounded" -msgstr "без закругления" +#. "tutorial_advanced" +#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) +#: ../src/verbs.cpp:2885 +msgid "Inkscape: T_racing" +msgstr "Inkscape: _Векторизация" -#: ../src/widgets/rect-toolbar.cpp:348 -msgid "Horizontal radius" -msgstr "Горизонтальный радиус" +#: ../src/verbs.cpp:2886 +msgid "Using bitmap tracing" +msgstr "Использование векторизации" -#: ../src/widgets/rect-toolbar.cpp:348 -msgid "Rx:" -msgstr "Гор. радиус:" +#. "tutorial_tracing" +#: ../src/verbs.cpp:2887 +#, fuzzy +msgid "Inkscape: Tracing Pixel Art" +msgstr "Inkscape: _Векторизация" -#: ../src/widgets/rect-toolbar.cpp:348 -msgid "Horizontal radius of rounded corners" -msgstr "Горизонтальный радиус закругленных углов" +#: ../src/verbs.cpp:2888 +msgid "Using Trace Pixel Art dialog" +msgstr "" -#: ../src/widgets/rect-toolbar.cpp:363 -msgid "Vertical radius" -msgstr "Вертикальный радиус" +#: ../src/verbs.cpp:2889 +msgid "Inkscape: _Calligraphy" +msgstr "Inkscape: _Каллиграфия" -#: ../src/widgets/rect-toolbar.cpp:363 -msgid "Ry:" -msgstr "Верт. радиус:" +#: ../src/verbs.cpp:2890 +msgid "Using the Calligraphy pen tool" +msgstr "Использование каллиграфического пера" -#: ../src/widgets/rect-toolbar.cpp:363 -msgid "Vertical radius of rounded corners" -msgstr "Вертикальный радиус закругленных углов" +#: ../src/verbs.cpp:2891 +msgid "Inkscape: _Interpolate" +msgstr "Inkscape: _Интерполяция" -#: ../src/widgets/rect-toolbar.cpp:382 -msgid "Not rounded" -msgstr "Не закруглён" +#: ../src/verbs.cpp:2892 +msgid "Using the interpolate extension" +msgstr "Использование расширения для интерполяции" -#: ../src/widgets/rect-toolbar.cpp:383 -msgid "Make corners sharp" -msgstr "Убрать закругление углов" +#. "tutorial_interpolate" +#: ../src/verbs.cpp:2893 +msgid "_Elements of Design" +msgstr "Основы _дизайна" -#: ../src/widgets/ruler.cpp:192 -#, fuzzy -msgid "The orientation of the ruler" -msgstr "Ориентация прикрепленной панели" +#: ../src/verbs.cpp:2894 +msgid "Principles of design in the tutorial form" +msgstr "Самоучитель по элементам дизайна в виде урока" -#: ../src/widgets/ruler.cpp:202 -#, fuzzy -msgid "Unit of the ruler" -msgstr "Ширина текстуры" +#. "tutorial_design" +#: ../src/verbs.cpp:2895 +msgid "_Tips and Tricks" +msgstr "Inkscape: _Советы и хитрости" -#: ../src/widgets/ruler.cpp:209 -msgid "Lower" -msgstr "Опустить" +#: ../src/verbs.cpp:2896 +msgid "Miscellaneous tips and tricks" +msgstr "Различные советы по использованию программы" -#: ../src/widgets/ruler.cpp:210 -#, fuzzy -msgid "Lower limit of ruler" -msgstr "Опускание на предыдущий слой" +#. "tutorial_tips" +#. Effect -- renamed Extension +#: ../src/verbs.cpp:2899 +msgid "Previous Exte_nsion" +msgstr "Повторить _выполнение" -#: ../src/widgets/ruler.cpp:219 -#, fuzzy -msgid "Upper" -msgstr "Пипетка" +#: ../src/verbs.cpp:2900 +msgid "Repeat the last extension with the same settings" +msgstr "Повторно выполнить последнее расширение с теми же параметрами" -#: ../src/widgets/ruler.cpp:220 -msgid "Upper limit of ruler" -msgstr "" +#: ../src/verbs.cpp:2901 +msgid "_Previous Extension Settings..." +msgstr "Повторить с _изменениями..." -#: ../src/widgets/ruler.cpp:230 -#, fuzzy -msgid "Position of mark on the ruler" -msgstr "Информация о расширениях Inkscape" +#: ../src/verbs.cpp:2902 +msgid "Repeat the last extension with new settings" +msgstr "Повторно выполнить последнее расширение с новыми параметрами" -#: ../src/widgets/ruler.cpp:239 -#, fuzzy -msgid "Max Size" -msgstr "Размер" +#: ../src/verbs.cpp:2906 +msgid "Fit the page to the current selection" +msgstr "Откадрировать холст до текущего выделения" -#: ../src/widgets/ruler.cpp:240 -msgid "Maximum size of the ruler" +#: ../src/verbs.cpp:2908 +msgid "Fit the page to the drawing" +msgstr "Откадрировать холст до рисунка" + +#: ../src/verbs.cpp:2910 +msgid "" +"Fit the page to the current selection or the drawing if there is no selection" msgstr "" +"Откадрировать холст до текущего выделения или рисунка, если ничего не " +"выделено" -#: ../src/widgets/select-toolbar.cpp:260 -msgid "Transform by toolbar" -msgstr "Смена ШВ/XY через панель" +#. LockAndHide +#: ../src/verbs.cpp:2912 +msgid "Unlock All" +msgstr "Разблокировка всего" -#: ../src/widgets/select-toolbar.cpp:339 -msgid "Now <b>stroke width</b> is <b>scaled</b> when objects are scaled." -msgstr "" -"Теперь <b>толщина обводки</b> <b>масштабируется</b> вместе с объектами." +#: ../src/verbs.cpp:2914 +msgid "Unlock All in All Layers" +msgstr "Разблокировать все во всех слоях" -#: ../src/widgets/select-toolbar.cpp:341 -msgid "Now <b>stroke width</b> is <b>not scaled</b> when objects are scaled." -msgstr "" -"Теперь <b>толщина обводки</b> <b>не масштабируется</b> вместе с объектами." +#: ../src/verbs.cpp:2916 +msgid "Unhide All" +msgstr "Раскрыть все" -#: ../src/widgets/select-toolbar.cpp:352 -msgid "" -"Now <b>rounded rectangle corners</b> are <b>scaled</b> when rectangles are " -"scaled." -msgstr "" -"Теперь <b>скруглённые углы прямоугольников</b> <b>масштабируются</b> вместе " -"с прямоугольниками." +#: ../src/verbs.cpp:2918 +msgid "Unhide All in All Layers" +msgstr "Раскрыть все во всех слоях" -#: ../src/widgets/select-toolbar.cpp:354 -msgid "" -"Now <b>rounded rectangle corners</b> are <b>not scaled</b> when rectangles " -"are scaled." -msgstr "" -"Теперь <b>скруглённые углы прямоугольников</b> <b>не масштабируются</b> " -"вместе с прямоугольниками." +#: ../src/verbs.cpp:2922 +msgid "Link an ICC color profile" +msgstr "Связать с цветовым профилем ICC" -#: ../src/widgets/select-toolbar.cpp:365 -msgid "" -"Now <b>gradients</b> are <b>transformed</b> along with their objects when " -"those are transformed (moved, scaled, rotated, or skewed)." -msgstr "" -"Теперь <b>градиенты</b> <b>трансформируются</b> вместе с объектами (при " -"перемещении, масштабировании, вращении или наклоне)." +#: ../src/verbs.cpp:2923 +msgid "Remove Color Profile" +msgstr "Удалить цветовой профиль" + +#: ../src/verbs.cpp:2924 +msgid "Remove a linked ICC color profile" +msgstr "Удалить связанный цветовой профиль ICC" + +#: ../src/verbs.cpp:2927 +#, fuzzy +msgid "Add External Script" +msgstr "Добавить внешний сценарий" -#: ../src/widgets/select-toolbar.cpp:367 -msgid "" -"Now <b>gradients</b> remain <b>fixed</b> when objects are transformed " -"(moved, scaled, rotated, or skewed)." -msgstr "" -"Теперь <b>градиенты</b> остаются <b>неизменными</b> при трансформации " -"объектов (перемещение, масштабирование, вращение или наклон)." +#: ../src/verbs.cpp:2927 +#, fuzzy +msgid "Add an external script" +msgstr "Добавить внешний сценарий" -#: ../src/widgets/select-toolbar.cpp:378 -msgid "" -"Now <b>patterns</b> are <b>transformed</b> along with their objects when " -"those are transformed (moved, scaled, rotated, or skewed)." -msgstr "" -"Теперь <b>текстуры</b> <b>трансформируются</b> вместе с объектами (при " -"перемещении, масштабировании, вращении или наклоне)." +#: ../src/verbs.cpp:2929 +#, fuzzy +msgid "Add Embedded Script" +msgstr "Добавить внешний сценарий" -#: ../src/widgets/select-toolbar.cpp:380 -msgid "" -"Now <b>patterns</b> remain <b>fixed</b> when objects are transformed (moved, " -"scaled, rotated, or skewed)." -msgstr "" -"Теперь <b>текстуры</b> остаются <b>неизменными</b> при трансформации " -"объектов (перемещение, масштабирование, вращение или наклон)." +#: ../src/verbs.cpp:2929 +#, fuzzy +msgid "Add an embedded script" +msgstr "Добавить внешний сценарий" -#. four spinbuttons -#: ../src/widgets/select-toolbar.cpp:498 -msgctxt "Select toolbar" -msgid "X position" -msgstr "Положение по X" +#: ../src/verbs.cpp:2931 +#, fuzzy +msgid "Edit Embedded Script" +msgstr "Удалить сценарий" -#: ../src/widgets/select-toolbar.cpp:498 -msgctxt "Select toolbar" -msgid "X:" -msgstr "X:" +#: ../src/verbs.cpp:2931 +#, fuzzy +msgid "Edit an embedded script" +msgstr "Удалить сценарий" -#: ../src/widgets/select-toolbar.cpp:500 -msgid "Horizontal coordinate of selection" -msgstr "Горизонтальная координата выделения" +#: ../src/verbs.cpp:2933 +#, fuzzy +msgid "Remove External Script" +msgstr "Удалить внешний сценарий" -#: ../src/widgets/select-toolbar.cpp:504 -msgctxt "Select toolbar" -msgid "Y position" -msgstr "Положение по Y" +#: ../src/verbs.cpp:2933 +#, fuzzy +msgid "Remove an external script" +msgstr "Удалить внешний сценарий" -#: ../src/widgets/select-toolbar.cpp:504 -msgctxt "Select toolbar" -msgid "Y:" -msgstr "Y:" +#: ../src/verbs.cpp:2935 +#, fuzzy +msgid "Remove Embedded Script" +msgstr "Удалить сценарий" -#: ../src/widgets/select-toolbar.cpp:506 -msgid "Vertical coordinate of selection" -msgstr "Вертикальная координата выделения" +#: ../src/verbs.cpp:2935 +#, fuzzy +msgid "Remove an embedded script" +msgstr "Удалить сценарий" -#: ../src/widgets/select-toolbar.cpp:510 -msgctxt "Select toolbar" -msgid "Width" -msgstr "Ширина" +#: ../src/verbs.cpp:2957 ../src/verbs.cpp:2958 +#, fuzzy +msgid "Center on horizontal and vertical axis" +msgstr "Центрировать на горизонтальной оси" -#: ../src/widgets/select-toolbar.cpp:510 -msgctxt "Select toolbar" -msgid "W:" -msgstr "Ш:" +#: ../src/widgets/arc-toolbar.cpp:131 +msgid "Arc: Change start/end" +msgstr "Дуга: изменить начало/конец" -#: ../src/widgets/select-toolbar.cpp:512 -msgid "Width of selection" -msgstr "Ширина выделения" +#: ../src/widgets/arc-toolbar.cpp:197 +msgid "Arc: Change open/closed" +msgstr "Дуга: Изменить открытость/закрытость" -#: ../src/widgets/select-toolbar.cpp:519 -msgid "Lock width and height" -msgstr "Заблокировать ширину и высоту" +#: ../src/widgets/arc-toolbar.cpp:288 ../src/widgets/arc-toolbar.cpp:317 +#: ../src/widgets/rect-toolbar.cpp:258 ../src/widgets/rect-toolbar.cpp:296 +#: ../src/widgets/spiral-toolbar.cpp:214 ../src/widgets/spiral-toolbar.cpp:238 +#: ../src/widgets/star-toolbar.cpp:383 ../src/widgets/star-toolbar.cpp:444 +msgid "<b>New:</b>" +msgstr "<b>Новый:</b>" -#: ../src/widgets/select-toolbar.cpp:520 -msgid "When locked, change both width and height by the same proportion" -msgstr "Если заблокировано, пропорционально изменять ширину и высоту" +#. FIXME: implement averaging of all parameters for multiple selected +#. gtk_label_set_markup(GTK_LABEL(l), _("<b>Average:</b>")); +#: ../src/widgets/arc-toolbar.cpp:291 ../src/widgets/arc-toolbar.cpp:302 +#: ../src/widgets/rect-toolbar.cpp:266 ../src/widgets/rect-toolbar.cpp:284 +#: ../src/widgets/spiral-toolbar.cpp:216 ../src/widgets/spiral-toolbar.cpp:227 +#: ../src/widgets/star-toolbar.cpp:385 +msgid "<b>Change:</b>" +msgstr "<b>Менять:</b>" -#: ../src/widgets/select-toolbar.cpp:529 -msgctxt "Select toolbar" -msgid "Height" -msgstr "Высота" +#: ../src/widgets/arc-toolbar.cpp:326 +msgid "Start:" +msgstr "Начало:" -#: ../src/widgets/select-toolbar.cpp:529 -msgctxt "Select toolbar" -msgid "H:" -msgstr "В:" +#: ../src/widgets/arc-toolbar.cpp:327 +msgid "The angle (in degrees) from the horizontal to the arc's start point" +msgstr "Угол (в градусах) от горизонтали до начальной точки дуги" -#: ../src/widgets/select-toolbar.cpp:531 -msgid "Height of selection" -msgstr "Высота выделения" +#: ../src/widgets/arc-toolbar.cpp:339 +msgid "End:" +msgstr "Конец:" -#: ../src/widgets/select-toolbar.cpp:581 -msgid "Scale rounded corners" -msgstr "Менять радиус закругленных углов" +#: ../src/widgets/arc-toolbar.cpp:340 +msgid "The angle (in degrees) from the horizontal to the arc's end point" +msgstr "Угол (в градусах) от горизонтали до конечной точки дуги" -#: ../src/widgets/select-toolbar.cpp:592 -msgid "Move gradients" -msgstr "Смещать градиенты" +#: ../src/widgets/arc-toolbar.cpp:356 +msgid "Closed arc" +msgstr "Закрытая дуга" -#: ../src/widgets/select-toolbar.cpp:603 -msgid "Move patterns" -msgstr "Смещать текстуры" +#: ../src/widgets/arc-toolbar.cpp:357 +msgid "Switch to segment (closed shape with two radii)" +msgstr "Переключиться на сегмент (закрытый эллипс с двумя радиусами)" -#: ../src/widgets/sp-attribute-widget.cpp:299 -msgid "Set attribute" -msgstr "Установить атрибут" +#: ../src/widgets/arc-toolbar.cpp:363 +msgid "Open Arc" +msgstr "Открытая дуга" -#: ../src/widgets/sp-color-icc-selector.cpp:257 -msgid "CMS" -msgstr "CMS" +#: ../src/widgets/arc-toolbar.cpp:364 +msgid "Switch to arc (unclosed shape)" +msgstr "Переключиться на дугу (незакрытый эллипс)" -#: ../src/widgets/sp-color-icc-selector.cpp:355 -#: ../src/widgets/sp-color-scales.cpp:428 -msgid "_R:" -msgstr "_R:" +#: ../src/widgets/arc-toolbar.cpp:387 +msgid "Make whole" +msgstr "Сделать целым" -#. TYPE_RGB_16 -#: ../src/widgets/sp-color-icc-selector.cpp:356 -#: ../src/widgets/sp-color-scales.cpp:431 -msgid "_G:" -msgstr "_G:" +#: ../src/widgets/arc-toolbar.cpp:388 +msgid "Make the shape a whole ellipse, not arc or segment" +msgstr "Сделать фигуру целым эллипсом, а не дугой или сегментом" -#: ../src/widgets/sp-color-icc-selector.cpp:357 -#: ../src/widgets/sp-color-scales.cpp:434 -msgid "_B:" -msgstr "_B:" +#. TODO: use the correct axis here, too +#: ../src/widgets/box3d-toolbar.cpp:232 +msgid "3D Box: Change perspective (angle of infinite axis)" +msgstr "Паралеллепипед: смена перспективы" -#: ../src/widgets/sp-color-icc-selector.cpp:359 -msgid "Gray" -msgstr "Серый" +#: ../src/widgets/box3d-toolbar.cpp:299 +msgid "Angle in X direction" +msgstr "Угол в направлении X" -#. TYPE_GRAY_16 -#: ../src/widgets/sp-color-icc-selector.cpp:361 -#: ../src/widgets/sp-color-icc-selector.cpp:365 -#: ../src/widgets/sp-color-scales.cpp:454 -msgid "_H:" -msgstr "_H:" +#. Translators: PL is short for 'perspective line' +#: ../src/widgets/box3d-toolbar.cpp:301 +msgid "Angle of PLs in X direction" +msgstr "Угол ПЛ в направлении X" -#. TYPE_HSV_16 -#: ../src/widgets/sp-color-icc-selector.cpp:362 -#: ../src/widgets/sp-color-icc-selector.cpp:367 -#: ../src/widgets/sp-color-scales.cpp:457 -msgid "_S:" -msgstr "_S:" +#. Translators: VP is short for 'vanishing point' +#: ../src/widgets/box3d-toolbar.cpp:323 +msgid "State of VP in X direction" +msgstr "Состояние точек схода в направлении X" -#. TYPE_HLS_16 -#: ../src/widgets/sp-color-icc-selector.cpp:366 -#: ../src/widgets/sp-color-scales.cpp:460 -msgid "_L:" -msgstr "_L:" +#: ../src/widgets/box3d-toolbar.cpp:324 +msgid "Toggle VP in X direction between 'finite' and 'infinite' (=parallel)" +msgstr "" +"Переключить точку схода в направлении X между «конечной» и " +"«бесконечной» (=параллельной)" -#: ../src/widgets/sp-color-icc-selector.cpp:369 -#: ../src/widgets/sp-color-icc-selector.cpp:374 -#: ../src/widgets/sp-color-scales.cpp:482 -msgid "_C:" -msgstr "_C:" +#: ../src/widgets/box3d-toolbar.cpp:339 +msgid "Angle in Y direction" +msgstr "Угол в направлении Y" -#. TYPE_CMYK_16 -#. TYPE_CMY_16 -#: ../src/widgets/sp-color-icc-selector.cpp:370 -#: ../src/widgets/sp-color-icc-selector.cpp:375 -#: ../src/widgets/sp-color-scales.cpp:485 -msgid "_M:" -msgstr "_M:" +#: ../src/widgets/box3d-toolbar.cpp:339 +msgid "Angle Y:" +msgstr "Угол Y:" -#: ../src/widgets/sp-color-icc-selector.cpp:371 -#: ../src/widgets/sp-color-icc-selector.cpp:376 -#: ../src/widgets/sp-color-scales.cpp:488 -msgid "_Y:" -msgstr "_Y:" +#. Translators: PL is short for 'perspective line' +#: ../src/widgets/box3d-toolbar.cpp:341 +msgid "Angle of PLs in Y direction" +msgstr "Угол ПЛ в направлении Y" -#: ../src/widgets/sp-color-icc-selector.cpp:372 -#: ../src/widgets/sp-color-scales.cpp:491 -msgid "_K:" -msgstr "_K:" +#. Translators: VP is short for 'vanishing point' +#: ../src/widgets/box3d-toolbar.cpp:362 +msgid "State of VP in Y direction" +msgstr "Состояние точек схода в направлении Y" -#: ../src/widgets/sp-color-icc-selector.cpp:455 -msgid "Fix" -msgstr "Исправить" +#: ../src/widgets/box3d-toolbar.cpp:363 +msgid "Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)" +msgstr "" +"Переключить точку схода в направлении Y между «конечной» и " +"«бесконечной» (=параллельной)" -#: ../src/widgets/sp-color-icc-selector.cpp:458 -msgid "Fix RGB fallback to match icc-color() value." -msgstr "Исправить откат на RGB до совпадения со значением icc-color()" +#: ../src/widgets/box3d-toolbar.cpp:378 +msgid "Angle in Z direction" +msgstr "Угол в направлении Z" -#. Label -#: ../src/widgets/sp-color-icc-selector.cpp:561 -#: ../src/widgets/sp-color-scales.cpp:437 -#: ../src/widgets/sp-color-scales.cpp:463 -#: ../src/widgets/sp-color-scales.cpp:494 -#: ../src/widgets/sp-color-wheel-selector.cpp:140 -msgid "_A:" -msgstr "_A:" +#. Translators: PL is short for 'perspective line' +#: ../src/widgets/box3d-toolbar.cpp:380 +msgid "Angle of PLs in Z direction" +msgstr "Угол ПЛ в направлении Z" -#: ../src/widgets/sp-color-icc-selector.cpp:572 -#: ../src/widgets/sp-color-icc-selector.cpp:585 -#: ../src/widgets/sp-color-scales.cpp:438 -#: ../src/widgets/sp-color-scales.cpp:439 -#: ../src/widgets/sp-color-scales.cpp:464 -#: ../src/widgets/sp-color-scales.cpp:465 -#: ../src/widgets/sp-color-scales.cpp:495 -#: ../src/widgets/sp-color-scales.cpp:496 -#: ../src/widgets/sp-color-wheel-selector.cpp:161 -#: ../src/widgets/sp-color-wheel-selector.cpp:185 -msgid "Alpha (opacity)" -msgstr "Альфа-канал (непрозрачность)" +#. Translators: VP is short for 'vanishing point' +#: ../src/widgets/box3d-toolbar.cpp:401 +msgid "State of VP in Z direction" +msgstr "Состояние точек схода в направлении Z" -#: ../src/widgets/sp-color-notebook.cpp:385 -msgid "Color Managed" -msgstr "С управлением цветом" +#: ../src/widgets/box3d-toolbar.cpp:402 +msgid "Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)" +msgstr "" +"Переключить точку схода в направлении Z между «конечной» и " +"«бесконечной» (=параллельной)" -#: ../src/widgets/sp-color-notebook.cpp:392 -msgid "Out of gamut!" -msgstr "Вне цветового охвата!" +#. gint preset_index = ege_select_one_action_get_active( sel ); +#: ../src/widgets/calligraphy-toolbar.cpp:218 +#: ../src/widgets/calligraphy-toolbar.cpp:262 +#: ../src/widgets/calligraphy-toolbar.cpp:267 +msgid "No preset" +msgstr "Не выбрана" -#: ../src/widgets/sp-color-notebook.cpp:399 -msgid "Too much ink!" -msgstr "Слишком много краски!" +#. Width +#: ../src/widgets/calligraphy-toolbar.cpp:427 +#: ../src/widgets/eraser-toolbar.cpp:125 +msgid "(hairline)" +msgstr "(волосок)" -#. Create RGBA entry and color preview -#: ../src/widgets/sp-color-notebook.cpp:416 -msgid "RGBA_:" -msgstr "RGBA_:" +#. Mean +#. Rotation +#. Scale +#: ../src/widgets/calligraphy-toolbar.cpp:427 +#: ../src/widgets/calligraphy-toolbar.cpp:460 +#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:269 +#: ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129 +#: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205 +#: ../src/widgets/spray-toolbar.cpp:235 ../src/widgets/spray-toolbar.cpp:253 +#: ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142 +#: ../src/widgets/tweak-toolbar.cpp:350 +msgid "(default)" +msgstr "(по умолчанию)" -#: ../src/widgets/sp-color-notebook.cpp:424 -msgid "Hexadecimal RGBA value of the color" -msgstr "Шестнадцатеричное значение RGBA" +#: ../src/widgets/calligraphy-toolbar.cpp:427 +#: ../src/widgets/eraser-toolbar.cpp:125 +msgid "(broad stroke)" +msgstr "(широкий штрих)" -#: ../src/widgets/sp-color-scales.cpp:80 -msgid "RGB" -msgstr "RGB" +#: ../src/widgets/calligraphy-toolbar.cpp:430 +#: ../src/widgets/eraser-toolbar.cpp:128 +msgid "Pen Width" +msgstr "Толщина пера" -#: ../src/widgets/sp-color-scales.cpp:80 -msgid "HSL" -msgstr "HSL" +#: ../src/widgets/calligraphy-toolbar.cpp:431 +msgid "The width of the calligraphic pen (relative to the visible canvas area)" +msgstr "Ширина каллиграфического пера (относительно видимой области холста)" -#: ../src/widgets/sp-color-scales.cpp:80 -msgid "CMYK" -msgstr "CMYK" +#. Thinning +#: ../src/widgets/calligraphy-toolbar.cpp:444 +msgid "(speed blows up stroke)" +msgstr "(скорость утолщает штрих)" -#: ../src/widgets/sp-color-selector.cpp:64 -msgid "Unnamed" -msgstr "Безымянный" +#: ../src/widgets/calligraphy-toolbar.cpp:444 +msgid "(slight widening)" +msgstr "(легкое утолщение)" -#: ../src/widgets/sp-xmlview-attr-list.cpp:64 -msgid "Value" -msgstr "Значение" +#: ../src/widgets/calligraphy-toolbar.cpp:444 +msgid "(constant width)" +msgstr "(постоянная ширина)" -#: ../src/widgets/sp-xmlview-content.cpp:179 -msgid "Type text in a text node" -msgstr "Ввод текста в текстовую ветвь" +#: ../src/widgets/calligraphy-toolbar.cpp:444 +msgid "(slight thinning, default)" +msgstr "(легкое утоньшение, по умолчанию)" -#: ../src/widgets/spiral-toolbar.cpp:100 -msgid "Change spiral" -msgstr "Сброс изменений спирали" +#: ../src/widgets/calligraphy-toolbar.cpp:444 +msgid "(speed deflates stroke)" +msgstr "(скорость обнуляет штрих)" -#: ../src/widgets/spiral-toolbar.cpp:246 -msgid "just a curve" -msgstr "просто кривая" +#: ../src/widgets/calligraphy-toolbar.cpp:447 +msgid "Stroke Thinning" +msgstr "Утоньшение штриха" -#: ../src/widgets/spiral-toolbar.cpp:246 -msgid "one full revolution" -msgstr "один полный оборот" +#: ../src/widgets/calligraphy-toolbar.cpp:447 +msgid "Thinning:" +msgstr "Сужение:" -#: ../src/widgets/spiral-toolbar.cpp:249 -msgid "Number of turns" -msgstr "Количество поворотов" +#: ../src/widgets/calligraphy-toolbar.cpp:448 +msgid "" +"How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 " +"makes them broader, 0 makes width independent of velocity)" +msgstr "" +"Как сильно скорость сужает штрих (> 0: быстрые штрихи уже, < 0: быстрые " +"штрихи шире; при 0 ширина штриха не зависит от скорости)" -#: ../src/widgets/spiral-toolbar.cpp:249 -msgid "Turns:" -msgstr "Витков:" +#. Angle +#: ../src/widgets/calligraphy-toolbar.cpp:460 +msgid "(left edge up)" +msgstr "(левый угол вверху)" -#: ../src/widgets/spiral-toolbar.cpp:249 -msgid "Number of revolutions" -msgstr "Количество витков" +#: ../src/widgets/calligraphy-toolbar.cpp:460 +msgid "(horizontal)" +msgstr "(перо горизонтально)" -#: ../src/widgets/spiral-toolbar.cpp:260 -msgid "circle" -msgstr "окружность" +#: ../src/widgets/calligraphy-toolbar.cpp:460 +msgid "(right edge up)" +msgstr "(правый угол вверху)" -#: ../src/widgets/spiral-toolbar.cpp:260 -msgid "edge is much denser" -msgstr "край намного плотнее" +#: ../src/widgets/calligraphy-toolbar.cpp:463 +msgid "Pen Angle" +msgstr "Угол пера" -#: ../src/widgets/spiral-toolbar.cpp:260 -msgid "edge is denser" -msgstr "центр плотнее" +#: ../src/widgets/calligraphy-toolbar.cpp:463 +#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:10 +msgid "Angle:" +msgstr "Угол:" -#: ../src/widgets/spiral-toolbar.cpp:260 -msgid "even" -msgstr "ровная спираль" +#: ../src/widgets/calligraphy-toolbar.cpp:464 +msgid "" +"The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if " +"fixation = 0)" +msgstr "" +"Угол пера (в градусах; 0 = горизонтально; при нулевой фиксации значения не " +"имеет)" -#: ../src/widgets/spiral-toolbar.cpp:260 -msgid "center is denser" -msgstr "центр плотнее" +#. Fixation +#: ../src/widgets/calligraphy-toolbar.cpp:478 +msgid "(perpendicular to stroke, \"brush\")" +msgstr "(перпендикулярно штриху)" -#: ../src/widgets/spiral-toolbar.cpp:260 -msgid "center is much denser" -msgstr "центр намного плотнее" +#: ../src/widgets/calligraphy-toolbar.cpp:478 +msgid "(almost fixed, default)" +msgstr "(почти полная, значение по умолчанию)" -#: ../src/widgets/spiral-toolbar.cpp:263 -msgid "Divergence" -msgstr "Отклонение" +#: ../src/widgets/calligraphy-toolbar.cpp:478 +msgid "(fixed by Angle, \"pen\")" +msgstr "(угол зафиксирован)" -#: ../src/widgets/spiral-toolbar.cpp:263 -msgid "Divergence:" -msgstr "Нелинейность:" +#: ../src/widgets/calligraphy-toolbar.cpp:481 +msgid "Fixation" +msgstr "Фиксация" -#: ../src/widgets/spiral-toolbar.cpp:263 -msgid "How much denser/sparser are outer revolutions; 1 = uniform" +#: ../src/widgets/calligraphy-toolbar.cpp:481 +msgid "Fixation:" +msgstr "Фиксация:" + +#: ../src/widgets/calligraphy-toolbar.cpp:482 +msgid "" +"Angle behavior (0 = nib always perpendicular to stroke direction, 100 = " +"fixed angle)" msgstr "" -"Насколько постепенно увеличивать или уменьшать расстояния между витками; 1 = " -"равномерно" +"Фиксация угла (0 = перо всегда перпендикулярно направлению штриха, 100 = " +"угол не меняется)" -#: ../src/widgets/spiral-toolbar.cpp:274 -msgid "starts from center" -msgstr "начинается из центра" +#. Cap Rounding +#: ../src/widgets/calligraphy-toolbar.cpp:494 +msgid "(blunt caps, default)" +msgstr "(плоские концы, значение по умолчанию)" -#: ../src/widgets/spiral-toolbar.cpp:274 -msgid "starts mid-way" -msgstr "начинается с середины" +#: ../src/widgets/calligraphy-toolbar.cpp:494 +msgid "(slightly bulging)" +msgstr "(слегка закругленные)" -#: ../src/widgets/spiral-toolbar.cpp:274 -msgid "starts near edge" -msgstr "начинается с края" +#: ../src/widgets/calligraphy-toolbar.cpp:494 +msgid "(approximately round)" +msgstr "(примерно круглые)" -#: ../src/widgets/spiral-toolbar.cpp:277 -msgid "Inner radius" -msgstr "Внутренний радиус" +#: ../src/widgets/calligraphy-toolbar.cpp:494 +msgid "(long protruding caps)" +msgstr "(округлые, далеко выдающиеся концы)" -#: ../src/widgets/spiral-toolbar.cpp:277 -msgid "Inner radius:" -msgstr "Внутренний радиус:" +#: ../src/widgets/calligraphy-toolbar.cpp:498 +msgid "Cap rounding" +msgstr "Закругление концов" -#: ../src/widgets/spiral-toolbar.cpp:277 -msgid "Radius of the innermost revolution (relative to the spiral size)" -msgstr "Радиус первого изнутри витка (относительно размера спирали)" +#: ../src/widgets/calligraphy-toolbar.cpp:498 +msgid "Caps:" +msgstr "Концы:" -#: ../src/widgets/spiral-toolbar.cpp:290 ../src/widgets/star-toolbar.cpp:565 +#: ../src/widgets/calligraphy-toolbar.cpp:499 msgid "" -"Reset shape parameters to defaults (use Inkscape Preferences > Tools to " -"change defaults)" +"Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = " +"round caps)" msgstr "" -"Сбросить параметры фигуры к значениям по умолчанию (параметры по умолчанию " -"можно изменить в настройках Inkscape)" +"Увеличение значения дает далеко выдающиеся концы (0=без концов, 1=округлые " +"концы)" -#. Width -#: ../src/widgets/spray-toolbar.cpp:113 -msgid "(narrow spray)" -msgstr "(узкое распыление)" +#. Tremor +#: ../src/widgets/calligraphy-toolbar.cpp:511 +msgid "(smooth line)" +msgstr "(гладкая линия)" -#: ../src/widgets/spray-toolbar.cpp:113 -msgid "(broad spray)" -msgstr "(широкое распыление)" +#: ../src/widgets/calligraphy-toolbar.cpp:511 +msgid "(slight tremor)" +msgstr "(легкое дрожание)" -#: ../src/widgets/spray-toolbar.cpp:116 -msgid "The width of the spray area (relative to the visible canvas area)" -msgstr "Ширина области распыления (относительно видимой области холста)" +#: ../src/widgets/calligraphy-toolbar.cpp:511 +msgid "(noticeable tremor)" +msgstr "(заметное дрожание)" -#: ../src/widgets/spray-toolbar.cpp:129 -msgid "(maximum mean)" -msgstr "(максимальный)" +#: ../src/widgets/calligraphy-toolbar.cpp:511 +msgid "(maximum tremor)" +msgstr "(максимальное дрожание)" -#: ../src/widgets/spray-toolbar.cpp:132 -msgid "Focus" -msgstr "Фокус" +#: ../src/widgets/calligraphy-toolbar.cpp:514 +msgid "Stroke Tremor" +msgstr "Дрожание штриха" -#: ../src/widgets/spray-toolbar.cpp:132 -msgid "Focus:" -msgstr "Фокус:" +#: ../src/widgets/calligraphy-toolbar.cpp:514 +msgid "Tremor:" +msgstr "Дрожание:" -#: ../src/widgets/spray-toolbar.cpp:132 -#, fuzzy -msgid "0 to spray a spot; increase to enlarge the ring radius" -msgstr "" -"При нулевом значении распыляет в точку, Увеличение значения повышает радиус " -"кольца рассеивания." +#: ../src/widgets/calligraphy-toolbar.cpp:515 +msgid "Increase to make strokes rugged and trembling" +msgstr "Увеличение значения делает штрихи дрожащими" -#. Standard_deviation -#: ../src/widgets/spray-toolbar.cpp:145 -msgid "(minimum scatter)" -msgstr "(минимальное рассеивание)" +#. Wiggle +#: ../src/widgets/calligraphy-toolbar.cpp:529 +msgid "(no wiggle)" +msgstr "(без виляния)" -#: ../src/widgets/spray-toolbar.cpp:145 -msgid "(maximum scatter)" -msgstr "(максимальное рассеивание)" +#: ../src/widgets/calligraphy-toolbar.cpp:529 +msgid "(slight deviation)" +msgstr "(легкое отклонение)" -#: ../src/widgets/spray-toolbar.cpp:148 -msgctxt "Spray tool" -msgid "Scatter" -msgstr "Рассеивание" +#: ../src/widgets/calligraphy-toolbar.cpp:529 +msgid "(wild waves and curls)" +msgstr "(сумасшедшее вихляние)" -#: ../src/widgets/spray-toolbar.cpp:148 -msgctxt "Spray tool" -msgid "Scatter:" -msgstr "Рассеивание:" +#: ../src/widgets/calligraphy-toolbar.cpp:532 +msgid "Pen Wiggle" +msgstr "Виляние пером" -#: ../src/widgets/spray-toolbar.cpp:148 -msgid "Increase to scatter sprayed objects" -msgstr "Увеличение значения приводит к рассеиванию распыляемых объектов" +#: ../src/widgets/calligraphy-toolbar.cpp:532 +msgid "Wiggle:" +msgstr "Виляние:" -#: ../src/widgets/spray-toolbar.cpp:167 -msgid "Spray copies of the initial selection" -msgstr "Распылять копии исходного выделения" +#: ../src/widgets/calligraphy-toolbar.cpp:533 +msgid "Increase to make the pen waver and wiggle" +msgstr "Увеличение значения делает штрихи виляющими" -#: ../src/widgets/spray-toolbar.cpp:174 -msgid "Spray clones of the initial selection" -msgstr "Распылять клоны исходного выделения" +#. Mass +#: ../src/widgets/calligraphy-toolbar.cpp:546 +msgid "(no inertia)" +msgstr "(без инерции)" -#: ../src/widgets/spray-toolbar.cpp:180 -msgid "Spray single path" -msgstr "Распылять в один контур" +#: ../src/widgets/calligraphy-toolbar.cpp:546 +msgid "(slight smoothing, default)" +msgstr "(легкое отставание, по умолчанию)" -#: ../src/widgets/spray-toolbar.cpp:181 -msgid "Spray objects in a single path" -msgstr "Распылять копии объекта, объединяя их в один контур" +#: ../src/widgets/calligraphy-toolbar.cpp:546 +msgid "(noticeable lagging)" +msgstr "(заметное отставание)" -#: ../src/widgets/spray-toolbar.cpp:185 ../src/widgets/tweak-toolbar.cpp:253 -msgid "Mode" -msgstr "Режим" +#: ../src/widgets/calligraphy-toolbar.cpp:546 +msgid "(maximum inertia)" +msgstr "(максимальная инерция)" -#. Population -#: ../src/widgets/spray-toolbar.cpp:205 -msgid "(low population)" -msgstr "(слабое заполнение)" +#: ../src/widgets/calligraphy-toolbar.cpp:549 +msgid "Pen Mass" +msgstr "Масса пера" -#: ../src/widgets/spray-toolbar.cpp:205 -msgid "(high population)" -msgstr "(обильное заполнение)" +#: ../src/widgets/calligraphy-toolbar.cpp:549 +msgid "Mass:" +msgstr "Масса:" -#: ../src/widgets/spray-toolbar.cpp:208 -msgid "Amount" -msgstr "Количество" +#: ../src/widgets/calligraphy-toolbar.cpp:550 +msgid "Increase to make the pen drag behind, as if slowed by inertia" +msgstr "Увеличение значения затормаживает перо, словно оно очень инертно" -#: ../src/widgets/spray-toolbar.cpp:209 -msgid "Adjusts the number of items sprayed per click" -msgstr "Число объектов, появляющихся по одному щелчку" +#: ../src/widgets/calligraphy-toolbar.cpp:565 +msgid "Trace Background" +msgstr "Трассировать фон" -#: ../src/widgets/spray-toolbar.cpp:225 +#: ../src/widgets/calligraphy-toolbar.cpp:566 msgid "" -"Use the pressure of the input device to alter the amount of sprayed objects" +"Trace the lightness of the background by the width of the pen (white - " +"minimum width, black - maximum width)" msgstr "" -"Менять число распыляемых объектов в зависимости от нажима устройством ввода" +"Трассировать освещенность фона толщиной линии пера (белый — минимальная " +"толщина, черный — максимальная толщина)" -#: ../src/widgets/spray-toolbar.cpp:235 -msgid "(high rotation variation)" -msgstr "(существенное варьирование вращения)" +#: ../src/widgets/calligraphy-toolbar.cpp:579 +msgid "Use the pressure of the input device to alter the width of the pen" +msgstr "Нажим (pressure) устройства ввода изменяет ширину пера" -#: ../src/widgets/spray-toolbar.cpp:238 -msgid "Rotation" -msgstr "Вращение" +#: ../src/widgets/calligraphy-toolbar.cpp:591 +msgid "Tilt" +msgstr "Наклон" -#: ../src/widgets/spray-toolbar.cpp:238 -msgid "Rotation:" -msgstr "Вращение:" +#: ../src/widgets/calligraphy-toolbar.cpp:592 +msgid "Use the tilt of the input device to alter the angle of the pen's nib" +msgstr "Наклон (tilt) устройства ввода изменяет угол пера" -#: ../src/widgets/spray-toolbar.cpp:240 -#, no-c-format -msgid "" -"Variation of the rotation of the sprayed objects; 0% for the same rotation " -"than the original object" -msgstr "" -"Варьирование вращения распыляемых объектов. 0% означает отсутствие вращения " -"исходного выделения." +#: ../src/widgets/calligraphy-toolbar.cpp:607 +msgid "Choose a preset" +msgstr "Выберите предустановку" -#: ../src/widgets/spray-toolbar.cpp:253 -msgid "(high scale variation)" -msgstr "(существенное варьирование масштаба)" +#: ../src/widgets/calligraphy-toolbar.cpp:622 +#, fuzzy +msgid "Add/Edit Profile" +msgstr "Связать с профилем" -#: ../src/widgets/spray-toolbar.cpp:256 -msgctxt "Spray tool" -msgid "Scale" -msgstr "Масштаб" +#: ../src/widgets/calligraphy-toolbar.cpp:623 +#, fuzzy +msgid "Add or edit calligraphic profile" +msgstr "Стиль новых каллиграфических штрихов" -#: ../src/widgets/spray-toolbar.cpp:256 -msgctxt "Spray tool" -msgid "Scale:" -msgstr "Масштаб:" +#: ../src/widgets/connector-toolbar.cpp:120 +msgid "Set connector type: orthogonal" +msgstr "Соединительная линия: ортогональная" -#: ../src/widgets/spray-toolbar.cpp:258 -#, no-c-format -msgid "" -"Variation in the scale of the sprayed objects; 0% for the same scale than " -"the original object" -msgstr "" -"Варьирование масштаба распыляемых объектов. 0% означает размер исходного " -"выделения." +#: ../src/widgets/connector-toolbar.cpp:120 +msgid "Set connector type: polyline" +msgstr "Соединительная линия: ломаная" -#: ../src/widgets/star-toolbar.cpp:102 -msgid "Star: Change number of corners" -msgstr "Смена количества лучей" +#: ../src/widgets/connector-toolbar.cpp:169 +msgid "Change connector curvature" +msgstr "Изменить кривизну соединительной линии" -#: ../src/widgets/star-toolbar.cpp:155 -msgid "Star: Change spoke ratio" -msgstr "Смена отношения радиусов" +#: ../src/widgets/connector-toolbar.cpp:220 +msgid "Change connector spacing" +msgstr "Смена интервала соед. линии" -#: ../src/widgets/star-toolbar.cpp:200 -msgid "Make polygon" -msgstr "Звезда → многоугольник" +#: ../src/widgets/connector-toolbar.cpp:313 +msgid "Avoid" +msgstr "Избегать" -#: ../src/widgets/star-toolbar.cpp:200 -msgid "Make star" -msgstr "Многоугольник → звезда" +#: ../src/widgets/connector-toolbar.cpp:323 +msgid "Ignore" +msgstr "Игнорировать" -#: ../src/widgets/star-toolbar.cpp:239 -msgid "Star: Change rounding" -msgstr "Смена закругления" +#: ../src/widgets/connector-toolbar.cpp:334 +msgid "Orthogonal" +msgstr "Ортогональная линия" -#: ../src/widgets/star-toolbar.cpp:279 -msgid "Star: Change randomization" -msgstr "Смена случайности искажения" +#: ../src/widgets/connector-toolbar.cpp:335 +msgid "Make connector orthogonal or polyline" +msgstr "Сделать соединительную линию ортогональной или ломаной" -#: ../src/widgets/star-toolbar.cpp:463 -msgid "Regular polygon (with one handle) instead of a star" -msgstr "Правильный многоугольник, а не звезда" +#: ../src/widgets/connector-toolbar.cpp:349 +msgid "Connector Curvature" +msgstr "Кривизна соединительных линий" -#: ../src/widgets/star-toolbar.cpp:470 -msgid "Star instead of a regular polygon (with one handle)" -msgstr "Звезда вместо обычного многоугольника (с одним рычагом)" +#: ../src/widgets/connector-toolbar.cpp:349 +msgid "Curvature:" +msgstr "Кривизна:" -#: ../src/widgets/star-toolbar.cpp:491 -msgid "triangle/tri-star" -msgstr "треугольник/звезда с 3 лучами" +#: ../src/widgets/connector-toolbar.cpp:350 +msgid "The amount of connectors curvature" +msgstr "Значение кривизны соединительных линий" -#: ../src/widgets/star-toolbar.cpp:491 -msgid "square/quad-star" -msgstr "квадрат/звезда с 4 лучами" +#: ../src/widgets/connector-toolbar.cpp:360 +msgid "Connector Spacing" +msgstr "Интервал линии соединения" -#: ../src/widgets/star-toolbar.cpp:491 -msgid "pentagon/five-pointed star" -msgstr "пятиугольник/звезда с 5 лучами" +#: ../src/widgets/connector-toolbar.cpp:360 +msgid "Spacing:" +msgstr "Интервал:" -#: ../src/widgets/star-toolbar.cpp:491 -msgid "hexagon/six-pointed star" -msgstr "шестиугольник/звезда с 6 лучами" +#: ../src/widgets/connector-toolbar.cpp:361 +msgid "The amount of space left around objects by auto-routing connectors" +msgstr "Оставшееся пространство вокруг объектов при автосоединении" -#: ../src/widgets/star-toolbar.cpp:494 -msgid "Corners" -msgstr "Углы" +#: ../src/widgets/connector-toolbar.cpp:372 +msgid "Graph" +msgstr "Граф" -#: ../src/widgets/star-toolbar.cpp:494 -msgid "Corners:" -msgstr "Углы:" +#: ../src/widgets/connector-toolbar.cpp:382 +msgid "Connector Length" +msgstr "Длина линии соединения" -#: ../src/widgets/star-toolbar.cpp:494 -msgid "Number of corners of a polygon or star" -msgstr "Количество вершин многоугольника или звезды" +#: ../src/widgets/connector-toolbar.cpp:382 +msgid "Length:" +msgstr "Длина:" -#: ../src/widgets/star-toolbar.cpp:507 -msgid "thin-ray star" -msgstr "звезда с тонкими лучами" +#: ../src/widgets/connector-toolbar.cpp:383 +msgid "Ideal length for connectors when layout is applied" +msgstr "" +"Идеальная длина при использовании оптимизации внешнего вида линий соединения" -#: ../src/widgets/star-toolbar.cpp:507 -msgid "pentagram" -msgstr "пентаграмма" +#: ../src/widgets/connector-toolbar.cpp:395 +msgid "Downwards" +msgstr "Вниз" -#: ../src/widgets/star-toolbar.cpp:507 -msgid "hexagram" -msgstr "гексаграмма" +#: ../src/widgets/connector-toolbar.cpp:396 +msgid "Make connectors with end-markers (arrows) point downwards" +msgstr "Линии соединения со стрелками указывают вниз" -#: ../src/widgets/star-toolbar.cpp:507 -msgid "heptagram" -msgstr "гептаграмма" +#: ../src/widgets/connector-toolbar.cpp:412 +msgid "Do not allow overlapping shapes" +msgstr "Не допускать перекрытия фигур" -#: ../src/widgets/star-toolbar.cpp:507 -msgid "octagram" -msgstr "октограмма" +#: ../src/widgets/dash-selector.cpp:59 +msgid "Dash pattern" +msgstr "Пунктир" -#: ../src/widgets/star-toolbar.cpp:507 -msgid "regular polygon" -msgstr "обычный многоугольник" +#: ../src/widgets/dash-selector.cpp:76 +msgid "Pattern offset" +msgstr "Смещение пунктира" -#: ../src/widgets/star-toolbar.cpp:510 -msgid "Spoke ratio" -msgstr "Отношение радиусов" +#: ../src/widgets/desktop-widget.cpp:466 +msgid "Zoom drawing if window size changes" +msgstr "Изменять масштаб при изменении размеров окна" -#: ../src/widgets/star-toolbar.cpp:510 -msgid "Spoke ratio:" -msgstr "Отношение радиусов:" +#: ../src/widgets/desktop-widget.cpp:665 +msgid "Cursor coordinates" +msgstr "Координаты курсора" -#. TRANSLATORS: Tip radius of a star is the distance from the center to the farthest handle. -#. Base radius is the same for the closest handle. -#: ../src/widgets/star-toolbar.cpp:513 -msgid "Base radius to tip radius ratio" -msgstr "Отношение радиусов основания и вершины луча" +#: ../src/widgets/desktop-widget.cpp:691 +msgid "Z:" +msgstr "Z:" -#: ../src/widgets/star-toolbar.cpp:531 -msgid "stretched" -msgstr "растянуто" +#. display the initial welcome message in the statusbar +#: ../src/widgets/desktop-widget.cpp:734 +msgid "" +"<b>Welcome to Inkscape!</b> Use shape or freehand tools to create objects; " +"use selector (arrow) to move or transform them." +msgstr "" +"<b>Добро пожаловать в Inkscape!</b> Используйте инструменты фигур или " +"рисования для создания объектов; используйте Выделитель (стрелку) для их " +"перемещения и трансформации." -#: ../src/widgets/star-toolbar.cpp:531 -msgid "twisted" -msgstr "извилисто" +#: ../src/widgets/desktop-widget.cpp:828 +#, fuzzy +msgid "grayscale" +msgstr ", в градациях серого" -#: ../src/widgets/star-toolbar.cpp:531 -msgid "slightly pinched" -msgstr "слегка прищемлено" +#: ../src/widgets/desktop-widget.cpp:829 +msgid ", grayscale" +msgstr ", в градациях серого" -#: ../src/widgets/star-toolbar.cpp:531 -msgid "NOT rounded" -msgstr "БЕЗ закругления" +#: ../src/widgets/desktop-widget.cpp:830 +#, fuzzy +msgid "print colors preview" +msgstr "П_редпросмотр цветоделений" -#: ../src/widgets/star-toolbar.cpp:531 -msgid "slightly rounded" -msgstr "небольшое закругление" +#: ../src/widgets/desktop-widget.cpp:831 +#, fuzzy +msgid ", print colors preview" +msgstr "П_редпросмотр цветоделений" -#: ../src/widgets/star-toolbar.cpp:531 -msgid "visibly rounded" -msgstr "заметное закругление" +#: ../src/widgets/desktop-widget.cpp:832 +#, fuzzy +msgid "outline" +msgstr "Контур" -#: ../src/widgets/star-toolbar.cpp:531 -msgid "well rounded" -msgstr "порядочное закругление" +#: ../src/widgets/desktop-widget.cpp:833 +#, fuzzy +msgid "no filters" +msgstr "Б_ез фильтров" -#: ../src/widgets/star-toolbar.cpp:531 -msgid "amply rounded" -msgstr "изрядное закругление" +#: ../src/widgets/desktop-widget.cpp:860 +#, fuzzy, c-format +msgid "%s%s: %d (%s%s) - Inkscape" +msgstr "%s%s: %d %s- Inkscape" -#: ../src/widgets/star-toolbar.cpp:531 ../src/widgets/star-toolbar.cpp:546 -msgid "blown up" -msgstr "безумное" +#: ../src/widgets/desktop-widget.cpp:862 ../src/widgets/desktop-widget.cpp:866 +#, fuzzy, c-format +msgid "%s%s: %d (%s) - Inkscape" +msgstr "%s%s: %d %s- Inkscape" -#: ../src/widgets/star-toolbar.cpp:534 -msgid "Rounded:" -msgstr "Закругление:" +#: ../src/widgets/desktop-widget.cpp:868 +#, fuzzy, c-format +msgid "%s%s: %d - Inkscape" +msgstr "%s%s: %d %s- Inkscape" -#: ../src/widgets/star-toolbar.cpp:534 -msgid "How much rounded are the corners (0 for sharp)" -msgstr "Насколько сглажены углы (0 — острые)" +#: ../src/widgets/desktop-widget.cpp:874 +#, fuzzy, c-format +msgid "%s%s (%s%s) - Inkscape" +msgstr "%s%s %s- Inkscape" -#: ../src/widgets/star-toolbar.cpp:546 -msgid "NOT randomized" -msgstr "без случайности" +#: ../src/widgets/desktop-widget.cpp:876 ../src/widgets/desktop-widget.cpp:880 +#, fuzzy, c-format +msgid "%s%s (%s) - Inkscape" +msgstr "%s%s %s- Inkscape" + +#: ../src/widgets/desktop-widget.cpp:882 +#, fuzzy, c-format +msgid "%s%s - Inkscape" +msgstr "%s%s %s- Inkscape" + +#: ../src/widgets/desktop-widget.cpp:1051 +msgid "Color-managed display is <b>enabled</b> in this window" +msgstr "Управление цветом <b>включено</b> для этого окна" + +#: ../src/widgets/desktop-widget.cpp:1053 +msgid "Color-managed display is <b>disabled</b> in this window" +msgstr "Управление цветом <b>выключено</b> для этого окна" + +#: ../src/widgets/desktop-widget.cpp:1108 +#, c-format +msgid "" +"<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before " +"closing?</span>\n" +"\n" +"If you close without saving, your changes will be discarded." +msgstr "" +"<span weight=\"bold\" size=\"larger\">Сохранить изменения в документе \"%s\" " +"перед закрытием?</span>\n" +"\n" +"Если вы закроете документ, не сохранив его, все изменения будут потеряны." + +#: ../src/widgets/desktop-widget.cpp:1118 +#: ../src/widgets/desktop-widget.cpp:1177 +msgid "Close _without saving" +msgstr "_Не сохранять" -#: ../src/widgets/star-toolbar.cpp:546 -msgid "slightly irregular" -msgstr "едва беспорядочно" +#: ../src/widgets/desktop-widget.cpp:1167 +#, fuzzy, c-format +msgid "" +"<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a " +"format that may cause data loss!</span>\n" +"\n" +"Do you want to save this file as Inkscape SVG?" +msgstr "" +"<span weight=\"bold\" size=\"larger\">Файл «%s» был сохранен в формате (%s), " +"что может привести к потере данных!</span>\n" +"\n" +"Сохранить документ в формате Inkscape SVG?" -#: ../src/widgets/star-toolbar.cpp:546 -msgid "visibly randomized" -msgstr "заметная случайность" +#: ../src/widgets/desktop-widget.cpp:1179 +#, fuzzy +msgid "_Save as Inkscape SVG" +msgstr "_Сохранить как SVG" -#: ../src/widgets/star-toolbar.cpp:546 -msgid "strongly randomized" -msgstr "изрядная случайность" +#: ../src/widgets/desktop-widget.cpp:1392 +msgid "Note:" +msgstr "" -#: ../src/widgets/star-toolbar.cpp:549 -msgid "Randomized" -msgstr "Случайность" +#: ../src/widgets/dropper-toolbar.cpp:90 +msgid "Pick opacity" +msgstr "Снять непрозрачность" -#: ../src/widgets/star-toolbar.cpp:549 -msgid "Randomized:" -msgstr "Искажение:" +#: ../src/widgets/dropper-toolbar.cpp:91 +msgid "" +"Pick both the color and the alpha (transparency) under cursor; otherwise, " +"pick only the visible color premultiplied by alpha" +msgstr "" +"Снимать значение альфа-канала (полупрозрачности) под курсором; если " +"отключено, снимается только видимый цвет" -#: ../src/widgets/star-toolbar.cpp:549 -msgid "Scatter randomly the corners and angles" -msgstr "Случайным образом смещать вершины и вращать углы" +#: ../src/widgets/dropper-toolbar.cpp:94 +msgid "Pick" +msgstr "Снять" -#: ../src/widgets/stroke-style.cpp:192 -msgid "Stroke width" -msgstr "Прибавить толщину обводки" +#: ../src/widgets/dropper-toolbar.cpp:103 +msgid "Assign opacity" +msgstr "Назначить непрозрачность" -#: ../src/widgets/stroke-style.cpp:194 -msgctxt "Stroke width" -msgid "_Width:" -msgstr "То_лщина:" +#: ../src/widgets/dropper-toolbar.cpp:104 +msgid "" +"If alpha was picked, assign it to selection as fill or stroke transparency" +msgstr "" +"Если полупрозрачность снята, назначать её заливке или обводке в выделении" -#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. -#. For an example, draw a triangle with a large stroke width and modify the -#. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:239 -msgid "Miter join" -msgstr "Острое" +#: ../src/widgets/dropper-toolbar.cpp:107 +msgid "Assign" +msgstr "Назначить" -#. TRANSLATORS: Round join: joining lines with a rounded corner. -#. For an example, draw a triangle with a large stroke width and modify the -#. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:247 -msgid "Round join" -msgstr "Скруглённое" +#: ../src/widgets/ege-paint-def.cpp:87 +msgid "remove" +msgstr "Удалить" -#. TRANSLATORS: Bevel join: joining lines with a blunted (flattened) corner. -#. For an example, draw a triangle with a large stroke width and modify the -#. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:255 -msgid "Bevel join" -msgstr "Фаска" +#: ../src/widgets/eraser-toolbar.cpp:94 +msgid "Delete objects touched by the eraser" +msgstr "Удалять объекты, которых коснулся ластик" -#: ../src/widgets/stroke-style.cpp:280 -msgid "Miter _limit:" -msgstr "Пред_ел острия:" +#: ../src/widgets/eraser-toolbar.cpp:100 +msgid "Cut" +msgstr "Вырезать" -#. Cap type -#. TRANSLATORS: cap type specifies the shape for the ends of lines -#. spw_label(t, _("_Cap:"), 0, i); -#: ../src/widgets/stroke-style.cpp:296 -msgid "Cap:" -msgstr "Концы:" +#: ../src/widgets/eraser-toolbar.cpp:101 +msgid "Cut out from objects" +msgstr "Вырезать из объектов" -#. TRANSLATORS: Butt cap: the line shape does not extend beyond the end point -#. of the line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:307 -msgid "Butt cap" -msgstr "Плоские" +#: ../src/widgets/eraser-toolbar.cpp:129 +msgid "The width of the eraser pen (relative to the visible canvas area)" +msgstr "Толщина пера ластика (относительно видимой области холста)" -#. TRANSLATORS: Round cap: the line shape extends beyond the end point of the -#. line; the ends of the line are rounded -#: ../src/widgets/stroke-style.cpp:314 -msgid "Round cap" -msgstr "Круглые" +#: ../src/widgets/fill-style.cpp:362 +msgid "Change fill rule" +msgstr "Сменить правило заливки" -#. TRANSLATORS: Square cap: the line shape extends beyond the end point of the -#. line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:321 -msgid "Square cap" -msgstr "Квадратные" +#: ../src/widgets/fill-style.cpp:447 ../src/widgets/fill-style.cpp:526 +msgid "Set fill color" +msgstr "Установить цвет заливки" -#. Dash -#: ../src/widgets/stroke-style.cpp:326 -msgid "Dashes:" -msgstr "Пунктир:" +#: ../src/widgets/fill-style.cpp:447 ../src/widgets/fill-style.cpp:526 +msgid "Set stroke color" +msgstr "Установка цвета обводки" -#. Drop down marker selectors -#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes -#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. -#: ../src/widgets/stroke-style.cpp:352 -#, fuzzy -msgid "Markers:" -msgstr "Маркеры" +#: ../src/widgets/fill-style.cpp:625 +msgid "Set gradient on fill" +msgstr "Градиентная заливка" -#: ../src/widgets/stroke-style.cpp:358 -msgid "Start Markers are drawn on the first node of a path or shape" -msgstr "Маркеры начала рисуются в первом узле контура или фигуры" +#: ../src/widgets/fill-style.cpp:625 +msgid "Set gradient on stroke" +msgstr "Заливка обводки градиентом" -#: ../src/widgets/stroke-style.cpp:367 -msgid "" -"Mid Markers are drawn on every node of a path or shape except the first and " -"last nodes" -msgstr "" -"Маркеры середины рисуются в каждом узле контура или фигуры кроме первого и " -"последнего" +#: ../src/widgets/fill-style.cpp:685 +msgid "Set pattern on fill" +msgstr "Текстурная заливка" -#: ../src/widgets/stroke-style.cpp:376 -msgid "End Markers are drawn on the last node of a path or shape" -msgstr "Маркеры конца рисуются в последнем узле контура или фигуры" +#: ../src/widgets/fill-style.cpp:686 +msgid "Set pattern on stroke" +msgstr "Заливка обводки текстурой" -#: ../src/widgets/stroke-style.cpp:494 -msgid "Set markers" -msgstr "Установка маркеров" +#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:956 +#: ../src/widgets/text-toolbar.cpp:1270 +msgid "Font size" +msgstr "Кегль шрифта" -#: ../src/widgets/stroke-style.cpp:1024 ../src/widgets/stroke-style.cpp:1109 -msgid "Set stroke style" -msgstr "Установка стиля обводки" +#. Family frame +#: ../src/widgets/font-selector.cpp:148 +msgid "Font family" +msgstr "Гарнитура" -#: ../src/widgets/stroke-style.cpp:1197 -#, fuzzy -msgid "Set marker color" -msgstr "Установка цвета обводки" +#. Style frame +#: ../src/widgets/font-selector.cpp:193 +msgctxt "Font selector" +msgid "Style" +msgstr "Стиль" -#: ../src/widgets/swatch-selector.cpp:137 +#: ../src/widgets/font-selector.cpp:225 #, fuzzy -msgid "Change swatch color" -msgstr "Смена цвета опорной точки градиента" +msgid "Face" +msgstr "Стороны" -#: ../src/widgets/text-toolbar.cpp:169 -msgid "Text: Change font family" -msgstr "Текст: изменение гарнитуры" +#: ../src/widgets/font-selector.cpp:254 ../share/extensions/dots.inx.h:3 +msgid "Font size:" +msgstr "Кегль шрифта:" -#: ../src/widgets/text-toolbar.cpp:233 -msgid "Text: Change font size" -msgstr "Текст: изменение кегля" +#: ../src/widgets/gradient-selector.cpp:214 +#, fuzzy +msgid "Create a duplicate gradient" +msgstr "Создавать и править градиенты" -#: ../src/widgets/text-toolbar.cpp:271 -msgid "Text: Change font style" -msgstr "Текст: изменение начертания" +#: ../src/widgets/gradient-selector.cpp:230 +#, fuzzy +msgid "Edit gradient" +msgstr "Радиальный градиент" -#: ../src/widgets/text-toolbar.cpp:349 -msgid "Text: Change superscript or subscript" -msgstr "Текст: переключение верхнего/нижнего индекса" +#: ../src/widgets/gradient-selector.cpp:306 +#: ../src/widgets/paint-selector.cpp:244 +msgid "Swatch" +msgstr "Образец" -#: ../src/widgets/text-toolbar.cpp:494 -msgid "Text: Change alignment" -msgstr "Текст: изменение выключки" +#: ../src/widgets/gradient-selector.cpp:356 +#, fuzzy +msgid "Rename gradient" +msgstr "Линейный градиент" -#: ../src/widgets/text-toolbar.cpp:537 -msgid "Text: Change line-height" -msgstr "Текст: изменение интерлиньяжа" +#: ../src/widgets/gradient-toolbar.cpp:156 +#: ../src/widgets/gradient-toolbar.cpp:169 +#: ../src/widgets/gradient-toolbar.cpp:756 +#: ../src/widgets/gradient-toolbar.cpp:1094 +msgid "No gradient" +msgstr "Градиентов нет" -#: ../src/widgets/text-toolbar.cpp:586 -msgid "Text: Change word-spacing" -msgstr "Текст: изменение трекинга" +#: ../src/widgets/gradient-toolbar.cpp:175 +#, fuzzy +msgid "Multiple gradients" +msgstr "Смещать градиенты" -#: ../src/widgets/text-toolbar.cpp:627 -msgid "Text: Change letter-spacing" -msgstr "Текст: изменение кернинга" +#: ../src/widgets/gradient-toolbar.cpp:676 +#, fuzzy +msgid "Multiple stops" +msgstr "Множественные стили" -#: ../src/widgets/text-toolbar.cpp:667 -msgid "Text: Change dx (kern)" -msgstr "Текст: изменение кернинга" +#: ../src/widgets/gradient-toolbar.cpp:774 +#: ../src/widgets/gradient-vector.cpp:629 +msgid "No stops in gradient" +msgstr "В градиенте нет опорных точек" -#: ../src/widgets/text-toolbar.cpp:701 -msgid "Text: Change dy" -msgstr "Текст: смещение от линии шрифта" +#: ../src/widgets/gradient-toolbar.cpp:927 +msgid "Assign gradient to object" +msgstr "Применить градиент к объекту" -#: ../src/widgets/text-toolbar.cpp:736 -msgid "Text: Change rotate" -msgstr "Текст: вращение" +#: ../src/widgets/gradient-toolbar.cpp:949 +msgid "Set gradient repeat" +msgstr "Выбрать повтор градиента" -#: ../src/widgets/text-toolbar.cpp:784 -msgid "Text: Change orientation" -msgstr "Текст: смена направления" +#: ../src/widgets/gradient-toolbar.cpp:987 +#: ../src/widgets/gradient-vector.cpp:740 +msgid "Change gradient stop offset" +msgstr "Правка смещения опорной точки градиента" -#: ../src/widgets/text-toolbar.cpp:1221 -msgid "Font Family" -msgstr "Гарнитура" +#: ../src/widgets/gradient-toolbar.cpp:1034 +#, fuzzy +msgid "linear" +msgstr "Линейная функция" -#: ../src/widgets/text-toolbar.cpp:1222 -msgid "Select Font Family (Alt-X to access)" -msgstr "Выбрать гарнитуру (Alt+X)" +#: ../src/widgets/gradient-toolbar.cpp:1034 +msgid "Create linear gradient" +msgstr "Создать линейный градиент" -#. Focus widget -#. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1232 -msgid "Select all text with this font-family" +#: ../src/widgets/gradient-toolbar.cpp:1038 +msgid "radial" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1236 -msgid "Font not found on system" -msgstr "Шрифт не найден в системе" - -#: ../src/widgets/text-toolbar.cpp:1295 -msgid "Font Style" -msgstr "Начертание" - -#: ../src/widgets/text-toolbar.cpp:1296 -msgid "Font style" -msgstr "Начертание" - -#. Name -#: ../src/widgets/text-toolbar.cpp:1313 -msgid "Toggle Superscript" -msgstr "Переключить верхний индекс" +#: ../src/widgets/gradient-toolbar.cpp:1038 +msgid "Create radial (elliptic or circular) gradient" +msgstr "Создать радиальный (эллиптический или круговой) градиент" -#. Label -#: ../src/widgets/text-toolbar.cpp:1314 -msgid "Toggle superscript" -msgstr "Переключить верхний индекс" +#: ../src/widgets/gradient-toolbar.cpp:1041 +#: ../src/widgets/mesh-toolbar.cpp:211 +msgid "New:" +msgstr "Создать:" -#. Name -#: ../src/widgets/text-toolbar.cpp:1326 -msgid "Toggle Subscript" -msgstr "Переключить нижний индекс" +#: ../src/widgets/gradient-toolbar.cpp:1064 +#: ../src/widgets/mesh-toolbar.cpp:234 +#, fuzzy +msgid "fill" +msgstr "Без заливки" -#. Label -#: ../src/widgets/text-toolbar.cpp:1327 -msgid "Toggle subscript" -msgstr "Переключить нижний индекс" +#: ../src/widgets/gradient-toolbar.cpp:1064 +#: ../src/widgets/mesh-toolbar.cpp:234 +msgid "Create gradient in the fill" +msgstr "Создать градиент в заливке" -#: ../src/widgets/text-toolbar.cpp:1368 -msgid "Justify" -msgstr "Выключка по ширине" +#: ../src/widgets/gradient-toolbar.cpp:1068 +#: ../src/widgets/mesh-toolbar.cpp:238 +#, fuzzy +msgid "stroke" +msgstr "Обводка" -#. Name -#: ../src/widgets/text-toolbar.cpp:1375 -msgid "Alignment" -msgstr "Выключка" +#: ../src/widgets/gradient-toolbar.cpp:1068 +#: ../src/widgets/mesh-toolbar.cpp:238 +msgid "Create gradient in the stroke" +msgstr "Создать градиент в обводке" -#. Label -#: ../src/widgets/text-toolbar.cpp:1376 -msgid "Text alignment" -msgstr "Выключка текста" +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:241 +msgid "on:" +msgstr "в:" -#: ../src/widgets/text-toolbar.cpp:1403 -msgid "Horizontal" -msgstr "По горизонтали" +#: ../src/widgets/gradient-toolbar.cpp:1096 +msgid "Select" +msgstr "Выделитель" -#: ../src/widgets/text-toolbar.cpp:1410 -msgid "Vertical" -msgstr "По вертикали" +#: ../src/widgets/gradient-toolbar.cpp:1096 +msgid "Choose a gradient" +msgstr "Выбрать градиент" -#. Label -#: ../src/widgets/text-toolbar.cpp:1417 -msgid "Text orientation" -msgstr "Направление текста" +#: ../src/widgets/gradient-toolbar.cpp:1097 +msgid "Select:" +msgstr "Градиенты:" -#. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1440 -msgid "Smaller spacing" -msgstr "Меньший интервал" +#: ../src/widgets/gradient-toolbar.cpp:1112 +#, fuzzy +msgctxt "Gradient repeat type" +msgid "None" +msgstr "Нет" -#: ../src/widgets/text-toolbar.cpp:1440 ../src/widgets/text-toolbar.cpp:1471 -#: ../src/widgets/text-toolbar.cpp:1502 -msgctxt "Text tool" -msgid "Normal" -msgstr "Обычный" +#: ../src/widgets/gradient-toolbar.cpp:1115 +msgid "Reflected" +msgstr "Отражённый" -#: ../src/widgets/text-toolbar.cpp:1440 -msgid "Larger spacing" -msgstr "Больший интервал" +#: ../src/widgets/gradient-toolbar.cpp:1118 +msgid "Direct" +msgstr "Прямой" -#. name -#: ../src/widgets/text-toolbar.cpp:1445 -msgid "Line Height" -msgstr "Высота строки" +#: ../src/widgets/gradient-toolbar.cpp:1120 +msgid "Repeat" +msgstr "Повтор" -#. label -#: ../src/widgets/text-toolbar.cpp:1446 -msgid "Line:" -msgstr "Интерлиньяж:" +#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute +#: ../src/widgets/gradient-toolbar.cpp:1122 +msgid "" +"Whether to fill with flat color beyond the ends of the gradient vector " +"(spreadMethod=\"pad\"), or repeat the gradient in the same direction " +"(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite " +"directions (spreadMethod=\"reflect\")" +msgstr "" +"За границами градиента: заполнять сплошным цветом, повторять исходный " +"градиент или повторять отражённый градиент" -#. short label -#: ../src/widgets/text-toolbar.cpp:1447 -msgid "Spacing between lines (times font size)" -msgstr "Межстрочный интервал (кратный кеглю шрифта)" +#: ../src/widgets/gradient-toolbar.cpp:1127 +msgid "Repeat:" +msgstr "Повтор:" -#. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502 -msgid "Negative spacing" -msgstr "Отрицательный интервал" +#: ../src/widgets/gradient-toolbar.cpp:1141 +#, fuzzy +msgid "No stops" +msgstr "Без обводки" -#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502 -msgid "Positive spacing" -msgstr "Положительный интервал" +#: ../src/widgets/gradient-toolbar.cpp:1143 +msgid "Stops" +msgstr "Опорные точки" -#. name -#: ../src/widgets/text-toolbar.cpp:1476 -msgid "Word spacing" -msgstr "Межсловный интервал" +#: ../src/widgets/gradient-toolbar.cpp:1143 +msgid "Select a stop for the current gradient" +msgstr "Выбрать опорную точку градиента" -#. label -#: ../src/widgets/text-toolbar.cpp:1477 -msgid "Word:" -msgstr "Трекинг:" +#: ../src/widgets/gradient-toolbar.cpp:1144 +msgid "Stops:" +msgstr "Точки:" -#. short label -#: ../src/widgets/text-toolbar.cpp:1478 -msgid "Spacing between words (px)" -msgstr "Межсловный интервал (px)" +#. Label +#: ../src/widgets/gradient-toolbar.cpp:1156 +#: ../src/widgets/gradient-vector.cpp:926 +#, fuzzy +msgctxt "Gradient" +msgid "Offset:" +msgstr "Смещение:" -#. name -#: ../src/widgets/text-toolbar.cpp:1507 -msgid "Letter spacing" -msgstr "Межбувенный интервал" +#: ../src/widgets/gradient-toolbar.cpp:1156 +msgid "Offset of selected stop" +msgstr "Смещение выбранной опорной точки" -#. label -#: ../src/widgets/text-toolbar.cpp:1508 -msgid "Letter:" -msgstr "Кернинг:" +#: ../src/widgets/gradient-toolbar.cpp:1174 +#: ../src/widgets/gradient-toolbar.cpp:1175 +msgid "Insert new stop" +msgstr "Вставить опорную точку" -#. short label -#: ../src/widgets/text-toolbar.cpp:1509 -msgid "Spacing between letters (px)" -msgstr "Межбуквенный интервал (px)" +#: ../src/widgets/gradient-toolbar.cpp:1188 +#: ../src/widgets/gradient-toolbar.cpp:1189 +#: ../src/widgets/gradient-vector.cpp:908 +msgid "Delete stop" +msgstr "Удалить опорную точку" -#. name -#: ../src/widgets/text-toolbar.cpp:1538 -msgid "Kerning" -msgstr "Кернинг" +#: ../src/widgets/gradient-toolbar.cpp:1202 +msgid "Reverse" +msgstr "Развернуть" -#. label -#: ../src/widgets/text-toolbar.cpp:1539 -msgid "Kern:" -msgstr "Керн.:" +#: ../src/widgets/gradient-toolbar.cpp:1203 +msgid "Reverse the direction of the gradient" +msgstr "Развернуть направление градиента" -#. short label -#: ../src/widgets/text-toolbar.cpp:1540 -msgid "Horizontal kerning (px)" -msgstr "Горизонтальный кернинг (px)" +#: ../src/widgets/gradient-toolbar.cpp:1217 +msgid "Link gradients" +msgstr "Связать градиенты" -#. name -#: ../src/widgets/text-toolbar.cpp:1569 -msgid "Vertical Shift" -msgstr "Смещение от линии шрифта" +#: ../src/widgets/gradient-toolbar.cpp:1218 +msgid "Link gradients to change all related gradients" +msgstr "" -#. label -#: ../src/widgets/text-toolbar.cpp:1570 -msgid "Vert:" -msgstr "Верт.:" +#: ../src/widgets/gradient-vector.cpp:332 +#: ../src/widgets/paint-selector.cpp:922 +#: ../src/widgets/stroke-marker-selector.cpp:154 +msgid "No document selected" +msgstr "Документ не выбран" -#. short label -#: ../src/widgets/text-toolbar.cpp:1571 -msgid "Vertical shift (px)" -msgstr "Смещение от линии шрифта (px)" +#: ../src/widgets/gradient-vector.cpp:336 +msgid "No gradients in document" +msgstr "Документ не содержит градиентов" -#. name -#: ../src/widgets/text-toolbar.cpp:1600 -msgid "Letter rotation" -msgstr "Вращение символов" +#: ../src/widgets/gradient-vector.cpp:340 +msgid "No gradient selected" +msgstr "Градиент не выделен" -#. label -#: ../src/widgets/text-toolbar.cpp:1601 -msgid "Rot:" -msgstr "Вращ.:" +#. TRANSLATORS: "Stop" means: a "phase" of a gradient +#: ../src/widgets/gradient-vector.cpp:903 +msgid "Add stop" +msgstr "Добавить опорную точку" -#. short label -#: ../src/widgets/text-toolbar.cpp:1602 -msgid "Character rotation (degrees)" -msgstr "Вращение символа (градусы)" +#: ../src/widgets/gradient-vector.cpp:906 +msgid "Add another control stop to gradient" +msgstr "Добавить еще одну опорную точку в градиент" -#: ../src/widgets/toolbox.cpp:182 -msgid "Color/opacity used for color tweaking" -msgstr "Цвет/непрозрачность, используемые для коррекции цвета" +#: ../src/widgets/gradient-vector.cpp:911 +msgid "Delete current control stop from gradient" +msgstr "Удалить опорную точку градиента" -#: ../src/widgets/toolbox.cpp:190 -msgid "Style of new stars" -msgstr "Стиль новых звёзд" +#. TRANSLATORS: "Stop" means: a "phase" of a gradient +#: ../src/widgets/gradient-vector.cpp:979 +msgid "Stop Color" +msgstr "Цвет опорной точки" -#: ../src/widgets/toolbox.cpp:192 -msgid "Style of new rectangles" -msgstr "Стиль новых прямоугольников" +#: ../src/widgets/gradient-vector.cpp:1007 +msgid "Gradient editor" +msgstr "Редактор градиентов" -#: ../src/widgets/toolbox.cpp:194 -msgid "Style of new 3D boxes" -msgstr "Стиль новых параллелепипедов" +#: ../src/widgets/gradient-vector.cpp:1307 +msgid "Change gradient stop color" +msgstr "Смена цвета опорной точки градиента" -#: ../src/widgets/toolbox.cpp:196 -msgid "Style of new ellipses" -msgstr "Стиль новых эллипсов" +#: ../src/widgets/lpe-toolbar.cpp:233 +msgid "Closed" +msgstr "Закрытый" -#: ../src/widgets/toolbox.cpp:198 -msgid "Style of new spirals" -msgstr "Стиль новых спиралей" +#: ../src/widgets/lpe-toolbar.cpp:235 +msgid "Open start" +msgstr "С открытым началом" -#: ../src/widgets/toolbox.cpp:200 -msgid "Style of new paths created by Pencil" -msgstr "Стиль новых контуров, созданных Карандашом" +#: ../src/widgets/lpe-toolbar.cpp:237 +msgid "Open end" +msgstr "С открытым концом" -#: ../src/widgets/toolbox.cpp:202 -msgid "Style of new paths created by Pen" -msgstr "Стиль новых контуров, созданных Пером" +#: ../src/widgets/lpe-toolbar.cpp:239 +msgid "Open both" +msgstr "Открыт с обеих сторон" -#: ../src/widgets/toolbox.cpp:204 -msgid "Style of new calligraphic strokes" -msgstr "Стиль новых каллиграфических штрихов" +#: ../src/widgets/lpe-toolbar.cpp:298 +msgid "All inactive" +msgstr "Все неактивны" -#: ../src/widgets/toolbox.cpp:206 ../src/widgets/toolbox.cpp:208 -msgid "TBD" -msgstr "k" +#: ../src/widgets/lpe-toolbar.cpp:299 +msgid "No geometric tool is active" +msgstr "Ни один инструмент создания геометрических конструкций не выбран" -#: ../src/widgets/toolbox.cpp:220 -msgid "Style of Paint Bucket fill objects" -msgstr "Стиль заливки новых объектов, созданных инструментом заливки" +#: ../src/widgets/lpe-toolbar.cpp:332 +msgid "Show limiting bounding box" +msgstr "Показывать ограничивающую площадку (BB)" -#: ../src/widgets/toolbox.cpp:1682 -msgid "Bounding box" -msgstr "Площадка (BB)" +#: ../src/widgets/lpe-toolbar.cpp:333 +msgid "Show bounding box (used to cut infinite lines)" +msgstr "Показывать площадку (для обрезания бесконечных линий)" -#: ../src/widgets/toolbox.cpp:1682 -msgid "Snap bounding boxes" -msgstr "Прилипать к углам площадок" +#: ../src/widgets/lpe-toolbar.cpp:344 +msgid "Get limiting bounding box from selection" +msgstr "Делать ограничивающую площадку (BB) из выделения" -#: ../src/widgets/toolbox.cpp:1691 -msgid "Bounding box edges" -msgstr "Края площадок" +#: ../src/widgets/lpe-toolbar.cpp:345 +msgid "" +"Set limiting bounding box (used to cut infinite lines) to the bounding box " +"of current selection" +msgstr "" +"Создание и редактирование масштабируемой векторной графики в формате SVG" -#: ../src/widgets/toolbox.cpp:1691 -msgid "Snap to edges of a bounding box" -msgstr "Прилипать к краям площадки" +#: ../src/widgets/lpe-toolbar.cpp:357 +msgid "Choose a line segment type" +msgstr "Выберите тип сегмента линии" -#: ../src/widgets/toolbox.cpp:1700 -msgid "Bounding box corners" -msgstr "Углы площадок (BB)" +#: ../src/widgets/lpe-toolbar.cpp:373 +msgid "Display measuring info" +msgstr "Показывать данные измерений" -#: ../src/widgets/toolbox.cpp:1700 -msgid "Snap bounding box corners" -msgstr "Прилипать к углам площадки" +#: ../src/widgets/lpe-toolbar.cpp:374 +msgid "Display measuring info for selected items" +msgstr "Показывать измерения выбранных объектов" -#: ../src/widgets/toolbox.cpp:1709 -msgid "BBox Edge Midpoints" -msgstr "Средние точки сторон площадок" +#. Add the units menu. +#: ../src/widgets/lpe-toolbar.cpp:384 ../src/widgets/node-toolbar.cpp:613 +#: ../src/widgets/paintbucket-toolbar.cpp:166 +#: ../src/widgets/rect-toolbar.cpp:375 ../src/widgets/select-toolbar.cpp:536 +msgid "Units" +msgstr "Единицы" -#: ../src/widgets/toolbox.cpp:1709 -msgid "Snap midpoints of bounding box edges" -msgstr "Прилипать центрами краёв площадки" +#: ../src/widgets/lpe-toolbar.cpp:394 +msgid "Open LPE dialog" +msgstr "Открыть диалог LPE" -#: ../src/widgets/toolbox.cpp:1719 -msgid "BBox Centers" -msgstr "Центры площадок" +#: ../src/widgets/lpe-toolbar.cpp:395 +msgid "Open LPE dialog (to adapt parameters numerically)" +msgstr "" +"Открыть диалог динамических контурных эффектов для ручного ввода параметров" -#: ../src/widgets/toolbox.cpp:1719 -msgid "Snapping centers of bounding boxes" -msgstr "Прилипать центрами площадок" +#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1273 +msgid "Font Size" +msgstr "Кегль шрифта" -#: ../src/widgets/toolbox.cpp:1728 -msgid "Snap nodes, paths, and handles" -msgstr "Прилипать к узлам, контурам и рычагами" +#: ../src/widgets/measure-toolbar.cpp:86 +msgid "Font Size:" +msgstr "Кегль шрифта:" -#: ../src/widgets/toolbox.cpp:1736 -msgid "Snap to paths" -msgstr "Прилипать к контурам" +#: ../src/widgets/measure-toolbar.cpp:87 +msgid "The font size to be used in the measurement labels" +msgstr "Кегль шрифта в метках инструмента измерения" -#: ../src/widgets/toolbox.cpp:1745 -msgid "Path intersections" -msgstr "Пересечения контуров" +#: ../src/widgets/measure-toolbar.cpp:99 +#: ../src/widgets/measure-toolbar.cpp:107 +msgid "The units to be used for the measurements" +msgstr "В каких единицах производить измерения" -#: ../src/widgets/toolbox.cpp:1745 -msgid "Snap to path intersections" -msgstr "Прилипать к пересечениям контуров" +#: ../src/widgets/mesh-toolbar.cpp:204 +#, fuzzy +msgid "normal" +msgstr "Нормальный" -#: ../src/widgets/toolbox.cpp:1754 -msgid "To nodes" -msgstr "К узлам" +#: ../src/widgets/mesh-toolbar.cpp:204 +#, fuzzy +msgid "Create mesh gradient" +msgstr "Создать линейный градиент" -#: ../src/widgets/toolbox.cpp:1754 -msgid "Snap cusp nodes, incl. rectangle corners" -msgstr "Прилипать острыми узлами, включая углы прямоугольников" +#: ../src/widgets/mesh-toolbar.cpp:208 +msgid "conical" +msgstr "" -#: ../src/widgets/toolbox.cpp:1763 -msgid "Smooth nodes" -msgstr "Сглаженные узлы" +#: ../src/widgets/mesh-toolbar.cpp:208 +#, fuzzy +msgid "Create conical gradient" +msgstr "Создать линейный градиент" -#: ../src/widgets/toolbox.cpp:1763 -msgid "Snap smooth nodes, incl. quadrant points of ellipses" -msgstr "Прилипать сглаженными узлами, включая точки квадрантов эллипсов" +#: ../src/widgets/mesh-toolbar.cpp:263 +msgid "Rows" +msgstr "Строк:" -#: ../src/widgets/toolbox.cpp:1772 -msgid "Line Midpoints" -msgstr "Средние точки линий" +#: ../src/widgets/mesh-toolbar.cpp:263 +#: ../share/extensions/guides_creator.inx.h:5 +#: ../share/extensions/layout_nup.inx.h:12 +msgid "Rows:" +msgstr "Строк:" -#: ../src/widgets/toolbox.cpp:1772 -msgid "Snap midpoints of line segments" -msgstr "Прилипать средними точками сегментов линий" +#: ../src/widgets/mesh-toolbar.cpp:263 +#, fuzzy +msgid "Number of rows in new mesh" +msgstr "Количество строк" -#: ../src/widgets/toolbox.cpp:1781 -msgid "Others" -msgstr "Прочее" +#: ../src/widgets/mesh-toolbar.cpp:279 +#, fuzzy +msgid "Columns" +msgstr "С_толбцы:" -#: ../src/widgets/toolbox.cpp:1781 -msgid "Snap other points (centers, guide origins, gradient handles, etc.)" -msgstr "" -"Прилипать остальными точками (центрами, нулевыми точками направляющих, " -"рычагами градиента и пр.)" +#: ../src/widgets/mesh-toolbar.cpp:279 +#: ../share/extensions/guides_creator.inx.h:4 +#, fuzzy +msgid "Columns:" +msgstr "С_толбцы:" -#: ../src/widgets/toolbox.cpp:1789 -msgid "Object Centers" -msgstr "Центры объектов" +#: ../src/widgets/mesh-toolbar.cpp:279 +#, fuzzy +msgid "Number of columns in new mesh" +msgstr "Сколько столбцов в таблице" -#: ../src/widgets/toolbox.cpp:1789 -msgid "Snap centers of objects" -msgstr "Прилипать центрами объектов" +#: ../src/widgets/mesh-toolbar.cpp:293 +#, fuzzy +msgid "Edit Fill" +msgstr "Изменить заливку..." -#: ../src/widgets/toolbox.cpp:1798 -msgid "Rotation Centers" -msgstr "Центры вращения" +#: ../src/widgets/mesh-toolbar.cpp:294 +#, fuzzy +msgid "Edit fill mesh" +msgstr "Изменить заливку..." -#: ../src/widgets/toolbox.cpp:1798 -msgid "Snap an item's rotation center" -msgstr "Прилипать центром вращения" +#: ../src/widgets/mesh-toolbar.cpp:305 +#, fuzzy +msgid "Edit Stroke" +msgstr "Изменить обводку..." -#: ../src/widgets/toolbox.cpp:1807 -msgid "Text baseline" -msgstr "Линия шрифта текста" +#: ../src/widgets/mesh-toolbar.cpp:306 +#, fuzzy +msgid "Edit stroke mesh" +msgstr "Изменить обводку..." -#: ../src/widgets/toolbox.cpp:1807 +#: ../src/widgets/mesh-toolbar.cpp:317 ../src/widgets/node-toolbar.cpp:521 +msgid "Show Handles" +msgstr "Показывать рычаги" + +#: ../src/widgets/mesh-toolbar.cpp:318 #, fuzzy -msgid "Snap text anchors and baselines" -msgstr "Выравнивание линий шрифта текста" +msgid "Show side and tensor handles" +msgstr "Сохранение трансформации:" -#: ../src/widgets/toolbox.cpp:1817 -msgid "Page border" -msgstr "Кайма холста" +#: ../src/widgets/node-toolbar.cpp:341 +msgid "Insert node" +msgstr "Вставка узла" -#: ../src/widgets/toolbox.cpp:1817 -msgid "Snap to the page border" -msgstr "Прилипать к краю страницы" +#: ../src/widgets/node-toolbar.cpp:342 +msgid "Insert new nodes into selected segments" +msgstr "Вставить новые узлы в выделенные сегменты" -#: ../src/widgets/toolbox.cpp:1826 -msgid "Snap to grids" -msgstr "Прилипать к сеткам" +#: ../src/widgets/node-toolbar.cpp:345 +msgid "Insert" +msgstr "Вставить" -#: ../src/widgets/toolbox.cpp:1835 -msgid "Snap guides" -msgstr "Прилипать направляющими" +#: ../src/widgets/node-toolbar.cpp:356 +#, fuzzy +msgid "Insert node at min X" +msgstr "Вставка узла" -#. Width -#: ../src/widgets/tweak-toolbar.cpp:125 -msgid "(pinch tweak)" -msgstr "(узкая кисть)" +#: ../src/widgets/node-toolbar.cpp:357 +#, fuzzy +msgid "Insert new nodes at min X into selected segments" +msgstr "Вставить новые узлы в выделенные сегменты" -#: ../src/widgets/tweak-toolbar.cpp:125 -msgid "(broad tweak)" -msgstr "(широкая кисть)" +#: ../src/widgets/node-toolbar.cpp:360 +#, fuzzy +msgid "Insert min X" +msgstr "Вставка узла" -#: ../src/widgets/tweak-toolbar.cpp:128 -msgid "The width of the tweak area (relative to the visible canvas area)" -msgstr "Ширина области коррекции (относительно видимой области холста)" +#: ../src/widgets/node-toolbar.cpp:366 +#, fuzzy +msgid "Insert node at max X" +msgstr "Вставка узла" -#. Force -#: ../src/widgets/tweak-toolbar.cpp:142 -msgid "(minimum force)" -msgstr "(минимальная)" +#: ../src/widgets/node-toolbar.cpp:367 +#, fuzzy +msgid "Insert new nodes at max X into selected segments" +msgstr "Вставить новые узлы в выделенные сегменты" -#: ../src/widgets/tweak-toolbar.cpp:142 -msgid "(maximum force)" -msgstr "(максимальная)" +#: ../src/widgets/node-toolbar.cpp:370 +#, fuzzy +msgid "Insert max X" +msgstr "Вставить" -#: ../src/widgets/tweak-toolbar.cpp:145 -msgid "Force" -msgstr "Сила" +#: ../src/widgets/node-toolbar.cpp:376 +#, fuzzy +msgid "Insert node at min Y" +msgstr "Вставка узла" -#: ../src/widgets/tweak-toolbar.cpp:145 -msgid "Force:" -msgstr "Сила:" +#: ../src/widgets/node-toolbar.cpp:377 +#, fuzzy +msgid "Insert new nodes at min Y into selected segments" +msgstr "Вставить новые узлы в выделенные сегменты" -#: ../src/widgets/tweak-toolbar.cpp:145 -msgid "The force of the tweak action" -msgstr "Сила действия инструмента коррекции" +#: ../src/widgets/node-toolbar.cpp:380 +#, fuzzy +msgid "Insert min Y" +msgstr "Вставка узла" -#: ../src/widgets/tweak-toolbar.cpp:163 -msgid "Move mode" -msgstr "Перемещение объектов" +#: ../src/widgets/node-toolbar.cpp:386 +#, fuzzy +msgid "Insert node at max Y" +msgstr "Вставка узла" -#: ../src/widgets/tweak-toolbar.cpp:164 -msgid "Move objects in any direction" -msgstr "Перемещать объекты в любом направлении" +#: ../src/widgets/node-toolbar.cpp:387 +#, fuzzy +msgid "Insert new nodes at max Y into selected segments" +msgstr "Вставить новые узлы в выделенные сегменты" -#: ../src/widgets/tweak-toolbar.cpp:170 -msgid "Move in/out mode" -msgstr "Приближение и отталкивание объектов" +#: ../src/widgets/node-toolbar.cpp:390 +#, fuzzy +msgid "Insert max Y" +msgstr "Вставить" -#: ../src/widgets/tweak-toolbar.cpp:171 -msgid "Move objects towards cursor; with Shift from cursor" -msgstr "" -"Перемещать объекты по направлению к курсору, с Shift — в направлении от " -"курсора" +#: ../src/widgets/node-toolbar.cpp:398 +msgid "Delete selected nodes" +msgstr "Удалить выделенные узлы" -#: ../src/widgets/tweak-toolbar.cpp:177 -msgid "Move jitter mode" -msgstr "Случайное перемещение объектов" +#: ../src/widgets/node-toolbar.cpp:409 +msgid "Join selected nodes" +msgstr "Соединить выделенные узлы" -#: ../src/widgets/tweak-toolbar.cpp:178 -msgid "Move objects in random directions" -msgstr "Перемещать объекты в случайных направлениях" +#: ../src/widgets/node-toolbar.cpp:412 +msgid "Join" +msgstr "Соединение" -#: ../src/widgets/tweak-toolbar.cpp:184 -msgid "Scale mode" -msgstr "Масштабирование объектов" +#: ../src/widgets/node-toolbar.cpp:420 +msgid "Break path at selected nodes" +msgstr "Разорвать контур в выделенном узле" -#: ../src/widgets/tweak-toolbar.cpp:185 -msgid "Shrink objects, with Shift enlarge" -msgstr "Уменьшать объекты, с Shift — увеличивать" +#: ../src/widgets/node-toolbar.cpp:430 +msgid "Join with segment" +msgstr "Соединить узлы сегментом" -#: ../src/widgets/tweak-toolbar.cpp:191 -msgid "Rotate mode" -msgstr "Вращение объектов" +#: ../src/widgets/node-toolbar.cpp:431 +msgid "Join selected endnodes with a new segment" +msgstr "Соединить контуры по выделенным оконечным узлам новым сегментом" -#: ../src/widgets/tweak-toolbar.cpp:192 -msgid "Rotate objects, with Shift counterclockwise" -msgstr "Вращать объекты, с Shift — против часовой стрелки" +#: ../src/widgets/node-toolbar.cpp:440 +msgid "Delete segment" +msgstr "Удаление сегмента" -#: ../src/widgets/tweak-toolbar.cpp:198 -msgid "Duplicate/delete mode" -msgstr "Дублирование и удаление объектов" +#: ../src/widgets/node-toolbar.cpp:441 +msgid "Delete segment between two non-endpoint nodes" +msgstr "Удалить сегмент между двумя неоконечными узлами" -#: ../src/widgets/tweak-toolbar.cpp:199 -msgid "Duplicate objects, with Shift delete" -msgstr "Дублировать объекты, с Shift — удалять" +#: ../src/widgets/node-toolbar.cpp:450 +msgid "Node Cusp" +msgstr "Острые узлы" -#: ../src/widgets/tweak-toolbar.cpp:205 -msgid "Push mode" -msgstr "Толкание контуров" +#: ../src/widgets/node-toolbar.cpp:451 +msgid "Make selected nodes corner" +msgstr "Сделать выделенные узлы острыми" -#: ../src/widgets/tweak-toolbar.cpp:206 -msgid "Push parts of paths in any direction" -msgstr "Выталкивать части контуров" +#: ../src/widgets/node-toolbar.cpp:460 +msgid "Node Smooth" +msgstr "Гладкие узлы" -#: ../src/widgets/tweak-toolbar.cpp:212 -msgid "Shrink/grow mode" -msgstr "Сокращение и наращивание объема контуров" +#: ../src/widgets/node-toolbar.cpp:461 +msgid "Make selected nodes smooth" +msgstr "Сделать выделенные узлы сглаженными" -#: ../src/widgets/tweak-toolbar.cpp:213 -msgid "Shrink (inset) parts of paths; with Shift grow (outset)" -msgstr "" -"Сокращать объем контуров (втягивать их), с Shift — наращивать его (раздувать " -"контуры)" +#: ../src/widgets/node-toolbar.cpp:470 +msgid "Node Symmetric" +msgstr "Симметричные узлы" -#: ../src/widgets/tweak-toolbar.cpp:219 -msgid "Attract/repel mode" -msgstr "Притяжение и отталкивание контуров" +#: ../src/widgets/node-toolbar.cpp:471 +msgid "Make selected nodes symmetric" +msgstr "Сделать выделенные узлы симметричными" + +#: ../src/widgets/node-toolbar.cpp:480 +msgid "Node Auto" +msgstr "Автоматический узел" + +#: ../src/widgets/node-toolbar.cpp:481 +msgid "Make selected nodes auto-smooth" +msgstr "Сделать выделенные узлы автоматически сглаженными" -#: ../src/widgets/tweak-toolbar.cpp:220 -msgid "Attract parts of paths towards cursor; with Shift from cursor" -msgstr "" -"Притягивать части контуров к курсору; с Shift — отталкивать их от курсора" +#: ../src/widgets/node-toolbar.cpp:490 +msgid "Node Line" +msgstr "Линия по узлам" -#: ../src/widgets/tweak-toolbar.cpp:226 -msgid "Roughen mode" -msgstr "Огрубление контуров" +#: ../src/widgets/node-toolbar.cpp:491 +msgid "Make selected segments lines" +msgstr "Сделать выделенные сегменты прямыми" -#: ../src/widgets/tweak-toolbar.cpp:227 -msgid "Roughen parts of paths" -msgstr "Огрублять части контуров, рисовать заусенцы" +#: ../src/widgets/node-toolbar.cpp:500 +msgid "Node Curve" +msgstr "Кривая по узлам" -#: ../src/widgets/tweak-toolbar.cpp:233 -msgid "Color paint mode" -msgstr "Раскрашивание объектов" +#: ../src/widgets/node-toolbar.cpp:501 +msgid "Make selected segments curves" +msgstr "Сделать выделенные сегменты кривыми" -#: ../src/widgets/tweak-toolbar.cpp:234 -msgid "Paint the tool's color upon selected objects" -msgstr "Рисовать цветом инструмента по выбранным объектам" +#: ../src/widgets/node-toolbar.cpp:510 +msgid "Show Transform Handles" +msgstr "Показывать рычаги трансформации" -#: ../src/widgets/tweak-toolbar.cpp:240 -msgid "Color jitter mode" -msgstr "Перебор цветов для объектов" +#: ../src/widgets/node-toolbar.cpp:511 +msgid "Show transformation handles for selected nodes" +msgstr "Показывать рычаги трансформации выделенных узлов" -#: ../src/widgets/tweak-toolbar.cpp:241 -msgid "Jitter the colors of selected objects" -msgstr "Перебирать цвета выделенных объектов" +#: ../src/widgets/node-toolbar.cpp:522 +msgid "Show Bezier handles of selected nodes" +msgstr "Показывать рычаги выбранных узлов" -#: ../src/widgets/tweak-toolbar.cpp:247 -msgid "Blur mode" -msgstr "Размывание" +#: ../src/widgets/node-toolbar.cpp:532 +msgid "Show Outline" +msgstr "Показывать контур" -#: ../src/widgets/tweak-toolbar.cpp:248 -msgid "Blur selected objects more; with Shift, blur less" -msgstr "Размывать объекты, с Shift — уменьшать размытость" +#: ../src/widgets/node-toolbar.cpp:533 +msgid "Show path outline (without path effects)" +msgstr "Показывать абрис контура (без контурных эффектов)" -#: ../src/widgets/tweak-toolbar.cpp:275 -msgid "Channels:" -msgstr "Каналы:" +#: ../src/widgets/node-toolbar.cpp:555 +msgid "Edit clipping paths" +msgstr "Изменить обтравочные контуры" -#: ../src/widgets/tweak-toolbar.cpp:287 -msgid "In color mode, act on objects' hue" -msgstr "В режиме изменения цвета влиять на тон объектов" +#: ../src/widgets/node-toolbar.cpp:556 +msgid "Show clipping path(s) of selected object(s)" +msgstr "Показать обтравочные контуры выделенных объектов" -#. TRANSLATORS: "H" here stands for hue -#: ../src/widgets/tweak-toolbar.cpp:291 -msgid "H" -msgstr "H" +#: ../src/widgets/node-toolbar.cpp:566 +msgid "Edit masks" +msgstr "Изменить маски" -#: ../src/widgets/tweak-toolbar.cpp:303 -msgid "In color mode, act on objects' saturation" -msgstr "В режиме изменения цвета влиять на насыщенность объектов" +#: ../src/widgets/node-toolbar.cpp:567 +msgid "Show mask(s) of selected object(s)" +msgstr "Показать маски выделенных объектов" -#. TRANSLATORS: "S" here stands for Saturation -#: ../src/widgets/tweak-toolbar.cpp:307 -msgid "S" -msgstr "S" +#: ../src/widgets/node-toolbar.cpp:581 +msgid "X coordinate:" +msgstr "Координата по X:" -#: ../src/widgets/tweak-toolbar.cpp:319 -msgid "In color mode, act on objects' lightness" -msgstr "В режиме изменения цвета влиять на яркость объектов" +#: ../src/widgets/node-toolbar.cpp:581 +msgid "X coordinate of selected node(s)" +msgstr "Координата X выбранных узлов" -#. TRANSLATORS: "L" here stands for Lightness -#: ../src/widgets/tweak-toolbar.cpp:323 -msgid "L" -msgstr "L" +#: ../src/widgets/node-toolbar.cpp:599 +msgid "Y coordinate:" +msgstr "Координата по Y:" -#: ../src/widgets/tweak-toolbar.cpp:335 -msgid "In color mode, act on objects' opacity" -msgstr "В режиме изменения цвета влиять на непрозрачность объектов" +#: ../src/widgets/node-toolbar.cpp:599 +msgid "Y coordinate of selected node(s)" +msgstr "Координата Y выбранных узлов" -#. TRANSLATORS: "O" here stands for Opacity -#: ../src/widgets/tweak-toolbar.cpp:339 -msgid "O" -msgstr "O" +#: ../src/widgets/paint-selector.cpp:234 +msgid "No paint" +msgstr "Нет заливки" -#. Fidelity -#: ../src/widgets/tweak-toolbar.cpp:350 -msgid "(rough, simplified)" -msgstr "(грубо, упрощённо)" +#: ../src/widgets/paint-selector.cpp:236 +msgid "Flat color" +msgstr "Сплошной цвет" -#: ../src/widgets/tweak-toolbar.cpp:350 -msgid "(fine, but many nodes)" -msgstr "(точно, но много узлов)" +#: ../src/widgets/paint-selector.cpp:238 +msgid "Linear gradient" +msgstr "Линейный градиент" -#: ../src/widgets/tweak-toolbar.cpp:353 -msgid "Fidelity" -msgstr "Точность" +#: ../src/widgets/paint-selector.cpp:240 +msgid "Radial gradient" +msgstr "Радиальный градиент" -#: ../src/widgets/tweak-toolbar.cpp:353 -msgid "Fidelity:" -msgstr "Точность:" +#: ../src/widgets/paint-selector.cpp:246 +msgid "Unset paint (make it undefined so it can be inherited)" +msgstr "" +"Убрать заливку (сделать ее неопределенной, чтобы она могла наследоваться)" -#: ../src/widgets/tweak-toolbar.cpp:354 +#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty +#: ../src/widgets/paint-selector.cpp:263 msgid "" -"Low fidelity simplifies paths; high fidelity preserves path features but may " -"generate a lot of new nodes" +"Any path self-intersections or subpaths create holes in the fill (fill-rule: " +"evenodd)" msgstr "" -"Низкая точность упрощает контуры; высокая точность сохраняет общую форму " -"неизменной части контура, но добавляет новые узлы" - -#: ../src/widgets/tweak-toolbar.cpp:373 -msgid "Use the pressure of the input device to alter the force of tweak action" -msgstr "Нажим устройства ввода изменяет силу корректирующего действия" +"Любые самопересечения или внутренние субконтуры образуют дыры в заливке " +"(fill-rule: evenodd)" -#: ../share/extensions/convert2dashes.py:93 -#, fuzzy +#. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty +#: ../src/widgets/paint-selector.cpp:274 msgid "" -"The selected object is not a path.\n" -"Try using the procedure Path->Object to Path." +"Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)" msgstr "" -"Первый выделенный объект не является контуром.\n" -"Попробуйте выполнить команду »Контур > Оконтурить объект»." +"Заливка имеет дыру, только если внутренний субконтур направлен в " +"противоположную сторону относительно внешнего (fill-rule: nonzero)" -#: ../share/extensions/dimension.py:109 -msgid "Please select an object." -msgstr "Выберите объект." +#: ../src/widgets/paint-selector.cpp:590 +msgid "<b>No objects</b>" +msgstr "<b>Нет выбранных объектов</b>" -#: ../share/extensions/dimension.py:134 -msgid "Unable to process this object. Try changing it into a path first." -msgstr "Невозможно обработать этот объект. Попробуйте сначала оконтурить его." +#: ../src/widgets/paint-selector.cpp:601 +msgid "<b>Multiple styles</b>" +msgstr "<b>Множественные стили</b>" -#. report to the Inkscape console using errormsg -#: ../share/extensions/draw_from_triangle.py:180 -#, fuzzy -msgid "Side Length 'a' (px): " -msgstr "Длина стороны a, в пикселах:" +#: ../src/widgets/paint-selector.cpp:612 +msgid "<b>Paint is undefined</b>" +msgstr "<b>Цвет не определен</b>" -#: ../share/extensions/draw_from_triangle.py:181 -#, fuzzy -msgid "Side Length 'b' (px): " -msgstr "Длина стороны b, в пикселах:" +#: ../src/widgets/paint-selector.cpp:623 +msgid "<b>No paint</b>" +msgstr "<b>Без заливки</b>" -#: ../share/extensions/draw_from_triangle.py:182 -#, fuzzy -msgid "Side Length 'c' (px): " -msgstr "Длина стороны c, в пикселах:" +#: ../src/widgets/paint-selector.cpp:694 +msgid "<b>Flat color</b>" +msgstr "<b>Сплошной цвет</b>" -#: ../share/extensions/draw_from_triangle.py:183 -#, fuzzy -msgid "Angle 'A' (radians): " -msgstr "Угол A в радианах:" +#. sp_gradient_selector_set_mode(SP_GRADIENT_SELECTOR(gsel), SP_GRADIENT_SELECTOR_MODE_LINEAR); +#: ../src/widgets/paint-selector.cpp:758 +msgid "<b>Linear gradient</b>" +msgstr "<b>Линейный градиент</b>" -#: ../share/extensions/draw_from_triangle.py:184 -#, fuzzy -msgid "Angle 'B' (radians): " -msgstr "Угол B в радианах:" +#: ../src/widgets/paint-selector.cpp:761 +msgid "<b>Radial gradient</b>" +msgstr "<b>Радиальный градиент</b>" -#: ../share/extensions/draw_from_triangle.py:185 -#, fuzzy -msgid "Angle 'C' (radians): " -msgstr "Угол С в радианах:" +#: ../src/widgets/paint-selector.cpp:1055 +msgid "" +"Use the <b>Node tool</b> to adjust position, scale, and rotation of the " +"pattern on canvas. Use <b>Object > Pattern > Objects to Pattern</b> to " +"create a new pattern from selection." +msgstr "" +"Используйте <b>Инструмент правки узлов</b> для коррекции позиции, масштаба и " +"вращения текстуры на холсте. Для создания новой текстуры из выделения " +"используйте команду <b>Объект > Текстура > Объект(ы) в текстуру</b>." -#: ../share/extensions/draw_from_triangle.py:186 -msgid "Semiperimeter (px): " -msgstr "Полупериметр (px):" +#: ../src/widgets/paint-selector.cpp:1068 +msgid "<b>Pattern fill</b>" +msgstr "<b>Текстурная заливка</b>" -#: ../share/extensions/draw_from_triangle.py:187 -msgid "Area (px^2): " -msgstr "Площадь (px^2):" +#: ../src/widgets/paint-selector.cpp:1162 +msgid "<b>Swatch fill</b>" +msgstr "<b>Заливка образцом</b>" -#: ../share/extensions/dxf_input.py:504 -#, python-format -msgid "" -"%d ENTITIES of type POLYLINE encountered and ignored. Please try to convert " -"to Release 13 format using QCad." -msgstr "" +#: ../src/widgets/paintbucket-toolbar.cpp:133 +msgid "Fill by" +msgstr "Канал" -#: ../share/extensions/dxf_outlines.py:49 -msgid "" -"Failed to import the numpy or numpy.linalg modules. These modules are " -"required by this extension. Please install them and try again." -msgstr "" -"Не удалось импортировать модуль numpy или numpy.linalg, необходимые для " -"этого расширения. Установите их и попробуйте еще раз." +#: ../src/widgets/paintbucket-toolbar.cpp:134 +msgid "Fill by:" +msgstr "Канал:" -#: ../share/extensions/dxf_outlines.py:300 +#: ../src/widgets/paintbucket-toolbar.cpp:146 +msgid "Fill Threshold" +msgstr "Порог заливки" + +#: ../src/widgets/paintbucket-toolbar.cpp:147 msgid "" -"Error: Field 'Layer match name' must be filled when using 'By name match' " -"option" +"The maximum allowed difference between the clicked pixel and the neighboring " +"pixels to be counted in the fill" msgstr "" +"Максимально допустимая разница между щелкнутым пикселом и соседними " +"пикселами, попадающими в заливку" -#: ../share/extensions/dxf_outlines.py:341 -#, fuzzy, python-format -msgid "Warning: Layer '%s' not found!" -msgstr "Слой на передний план" +#: ../src/widgets/paintbucket-toolbar.cpp:174 +msgid "Grow/shrink by" +msgstr "Увеличить/уменьшить на" -#: ../share/extensions/embedimage.py:84 +#: ../src/widgets/paintbucket-toolbar.cpp:174 +msgid "Grow/shrink by:" +msgstr "Увеличить/уменьшить на:" + +#: ../src/widgets/paintbucket-toolbar.cpp:175 msgid "" -"No xlink:href or sodipodi:absref attributes found, or they do not point to " -"an existing file! Unable to embed image." +"The amount to grow (positive) or shrink (negative) the created fill path" msgstr "" -"Атрибуты xlink:href и sodipodi:absref не найдены, либо указывают на " -"несуществующий файл! Внедрить изображение невозможно." +"Насколько увеличить (положительное число) или уменьшить (отрицательное " +"число) создаваемый контур с заливкой" -#: ../share/extensions/embedimage.py:86 -#, python-format -msgid "Sorry we could not locate %s" -msgstr "Извините, найти %s не удалось" +#: ../src/widgets/paintbucket-toolbar.cpp:200 +msgid "Close gaps" +msgstr "Закрыть интервалы" -#: ../share/extensions/embedimage.py:111 -#, python-format -msgid "" -"%s is not of type image/png, image/jpeg, image/bmp, image/gif, image/tiff, " -"or image/x-icon" -msgstr "" -"%s не является image/png, image/jpeg, image/bmp, image/gif, image/tiff или " -"image/x-icon" +#: ../src/widgets/paintbucket-toolbar.cpp:201 +msgid "Close gaps:" +msgstr "Закрыть интервалы:" -#: ../share/extensions/export_gimp_palette.py:16 +#: ../src/widgets/paintbucket-toolbar.cpp:212 +#: ../src/widgets/pencil-toolbar.cpp:293 ../src/widgets/spiral-toolbar.cpp:289 +#: ../src/widgets/star-toolbar.cpp:564 +msgid "Defaults" +msgstr "По умолчанию" + +#: ../src/widgets/paintbucket-toolbar.cpp:213 msgid "" -"The export_gpl.py module requires PyXML. Please download the latest version " -"from http://pyxml.sourceforge.net/." +"Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " +"to change defaults)" msgstr "" -"Расширению export_gpl.py нужен PyXML. Скачайте свежую версию с http://pyxml." -"sourceforge.net/." +"Сбросить параметры заливки к значениям по умолчанию (параметры по умолчанию " +"можно изменить через диалог настройки Inkscape)" -#: ../share/extensions/extractimage.py:68 -#, python-format -msgid "Image extracted to: %s" -msgstr "Изображение извлечено в: %s" +#: ../src/widgets/pencil-toolbar.cpp:96 +msgid "Bezier" +msgstr "Кривые Безье" -#: ../share/extensions/extractimage.py:75 -msgid "Unable to find image data." -msgstr "Не удалось найти растровые данные." +#: ../src/widgets/pencil-toolbar.cpp:97 +msgid "Create regular Bezier path" +msgstr "Рисовать кривую Безье" -#: ../share/extensions/extrude.py:43 -#, fuzzy -msgid "Need at least 2 paths selected" -msgstr "Ничего не выбрано" +#: ../src/widgets/pencil-toolbar.cpp:104 +msgid "Create Spiro path" +msgstr "Рисовать кривую Спиро" -#: ../share/extensions/funcplot.py:48 -msgid "x-interval cannot be zero. Please modify 'Start X' or 'End X'" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:111 +msgid "Zigzag" +msgstr "Зигзаги" -#: ../share/extensions/funcplot.py:60 -msgid "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:112 +msgid "Create a sequence of straight line segments" +msgstr "Рисовать последовательность прямых отрезков" -#: ../share/extensions/funcplot.py:315 -#, fuzzy -msgid "Please select a rectangle" -msgstr "Выберите объект." +#: ../src/widgets/pencil-toolbar.cpp:118 +msgid "Paraxial" +msgstr "Параксиальный режим" -#: ../share/extensions/gcodetools.py:3321 -#: ../share/extensions/gcodetools.py:4526 -#: ../share/extensions/gcodetools.py:4699 -#: ../share/extensions/gcodetools.py:6232 -#: ../share/extensions/gcodetools.py:6427 -msgid "No paths are selected! Trying to work on all available paths." -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:119 +msgid "Create a sequence of paraxial line segments" +msgstr "Рисовать последовательность прямых отрезков" -#: ../share/extensions/gcodetools.py:3324 -msgid "Noting is selected. Please select something." -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:127 +msgid "Mode of new lines drawn by this tool" +msgstr "Режим рисования новых контуров этим инструментом" -#: ../share/extensions/gcodetools.py:3864 +#: ../src/widgets/pencil-toolbar.cpp:155 #, fuzzy -msgid "" -"Directory does not exist! Please specify existing directory at Preferences " -"tab!" -msgstr "Каталог %s не существует, либо это не каталог.\n" +msgctxt "Freehand shape" +msgid "None" +msgstr "Нет" -#: ../share/extensions/gcodetools.py:3894 -#, python-format -msgid "" -"Can not write to specified file!\n" -"%s" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:156 +msgid "Triangle in" +msgstr "Угасание" -#: ../share/extensions/gcodetools.py:4040 -#, python-format -msgid "" -"Orientation points for '%s' layer have not been found! Please add " -"orientation points using Orientation tab!" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:157 +msgid "Triangle out" +msgstr "Нарастание" -#: ../share/extensions/gcodetools.py:4047 -#, python-format -msgid "There are more than one orientation point groups in '%s' layer" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:159 +msgid "From clipboard" +msgstr "Из буфера обмена" -#: ../share/extensions/gcodetools.py:4078 -#: ../share/extensions/gcodetools.py:4080 -msgid "" -"Orientation points are wrong! (if there are two orientation points they " -"should not be the same. If there are three orientation points they should " -"not be in a straight line.)" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:184 ../src/widgets/pencil-toolbar.cpp:185 +msgid "Shape:" +msgstr "Форма:" -#: ../share/extensions/gcodetools.py:4250 -#, python-format -msgid "" -"Warning! Found bad orientation points in '%s' layer. Resulting Gcode could " -"be corrupt!" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:184 +msgid "Shape of new paths drawn by this tool" +msgstr "Форма новых контуров, рисуемых этим инструментом" -#: ../share/extensions/gcodetools.py:4263 -#, python-format -msgid "" -"Warning! Found bad graffiti reference point in '%s' layer. Resulting Gcode " -"could be corrupt!" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:269 +msgid "(many nodes, rough)" +msgstr "(много узлов, грубые линии)" -#. xgettext:no-pango-format -#: ../share/extensions/gcodetools.py:4284 -msgid "" -"This extension works with Paths and Dynamic Offsets and groups of them only! " -"All other objects will be ignored!\n" -"Solution 1: press Path->Object to path or Shift+Ctrl+C.\n" -"Solution 2: Path->Dynamic offset or Ctrl+J.\n" -"Solution 3: export all contours to PostScript level 2 (File->Save As->.ps) " -"and File->Import this file." -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:269 +msgid "(few nodes, smooth)" +msgstr "(мало узлов, плавные линии)" -#: ../share/extensions/gcodetools.py:4290 -msgid "" -"Document has no layers! Add at least one layer using layers panel (Ctrl+Shift" -"+L)" -msgstr "" +#: ../src/widgets/pencil-toolbar.cpp:272 +msgid "Smoothing:" +msgstr "Сглаживание:" -#: ../share/extensions/gcodetools.py:4294 +#: ../src/widgets/pencil-toolbar.cpp:272 +msgid "Smoothing: " +msgstr "Сглаживание:" + +#: ../src/widgets/pencil-toolbar.cpp:273 +msgid "How much smoothing (simplifying) is applied to the line" +msgstr "Как сильно сглаживается (упрощается) рисуемая от руки линия" + +#: ../src/widgets/pencil-toolbar.cpp:294 msgid "" -"Warning! There are some paths in the root of the document, but not in any " -"layer! Using bottom-most layer for them." +"Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " +"change defaults)" msgstr "" +"Сбросить параметры карандаша к значениям по умолчанию (параметры по " +"умолчанию можно изменить в диалоге настройки Inkscape)" + +#: ../src/widgets/rect-toolbar.cpp:122 +msgid "Change rectangle" +msgstr "Удаление закругления" + +#: ../src/widgets/rect-toolbar.cpp:314 +msgid "W:" +msgstr "Ш:" + +#: ../src/widgets/rect-toolbar.cpp:314 +msgid "Width of rectangle" +msgstr "Ширина прямоугольника" + +#: ../src/widgets/rect-toolbar.cpp:331 +msgid "H:" +msgstr "Г:" + +#: ../src/widgets/rect-toolbar.cpp:331 +msgid "Height of rectangle" +msgstr "Высота прямоугольника" + +#: ../src/widgets/rect-toolbar.cpp:345 ../src/widgets/rect-toolbar.cpp:360 +msgid "not rounded" +msgstr "без закругления" + +#: ../src/widgets/rect-toolbar.cpp:348 +msgid "Horizontal radius" +msgstr "Горизонтальный радиус" + +#: ../src/widgets/rect-toolbar.cpp:348 +msgid "Rx:" +msgstr "Гор. радиус:" -#: ../share/extensions/gcodetools.py:4371 -#, python-format -msgid "" -"Warning! Tool's and default tool's parameter's (%s) types are not the same " -"( type('%s') != type('%s') )." -msgstr "" +#: ../src/widgets/rect-toolbar.cpp:348 +msgid "Horizontal radius of rounded corners" +msgstr "Горизонтальный радиус закругленных углов" -#: ../share/extensions/gcodetools.py:4374 -#, python-format -msgid "Warning! Tool has parameter that default tool has not ( '%s': '%s' )." -msgstr "" +#: ../src/widgets/rect-toolbar.cpp:363 +msgid "Vertical radius" +msgstr "Вертикальный радиус" -#: ../share/extensions/gcodetools.py:4388 -#, python-format -msgid "Layer '%s' contains more than one tool!" -msgstr "" +#: ../src/widgets/rect-toolbar.cpp:363 +msgid "Ry:" +msgstr "Верт. радиус:" -#: ../share/extensions/gcodetools.py:4391 -#, python-format -msgid "" -"Can not find tool for '%s' layer! Please add one with Tools library tab!" -msgstr "" +#: ../src/widgets/rect-toolbar.cpp:363 +msgid "Vertical radius of rounded corners" +msgstr "Вертикальный радиус закругленных углов" -#: ../share/extensions/gcodetools.py:4553 -#: ../share/extensions/gcodetools.py:4708 -msgid "" -"Warning: One or more paths do not have 'd' parameter, try to Ungroup (Ctrl" -"+Shift+G) and Object to Path (Ctrl+Shift+C)!" -msgstr "" +#: ../src/widgets/rect-toolbar.cpp:382 +msgid "Not rounded" +msgstr "Не закруглён" -#: ../share/extensions/gcodetools.py:4667 -msgid "" -"Noting is selected. Please select something to convert to drill point " -"(dxfpoint) or clear point sign." -msgstr "" +#: ../src/widgets/rect-toolbar.cpp:383 +msgid "Make corners sharp" +msgstr "Убрать закругление углов" -#: ../share/extensions/gcodetools.py:4750 -#: ../share/extensions/gcodetools.py:4996 +#: ../src/widgets/ruler.cpp:192 #, fuzzy -msgid "This extension requires at least one selected path." -msgstr "Этому расширению нужно два контура в выделении." +msgid "The orientation of the ruler" +msgstr "Ориентация прикрепленной панели" -#: ../share/extensions/gcodetools.py:4756 -#: ../share/extensions/gcodetools.py:5002 -#, python-format -msgid "Tool diameter must be > 0 but tool's diameter on '%s' layer is not!" -msgstr "" +#: ../src/widgets/ruler.cpp:202 +#, fuzzy +msgid "Unit of the ruler" +msgstr "Ширина текстуры" -#: ../share/extensions/gcodetools.py:4767 -#: ../share/extensions/gcodetools.py:4956 -#: ../share/extensions/gcodetools.py:5011 -msgid "Warning: omitting non-path" -msgstr "" +#: ../src/widgets/ruler.cpp:209 +msgid "Lower" +msgstr "Опустить" -#: ../share/extensions/gcodetools.py:5511 +#: ../src/widgets/ruler.cpp:210 #, fuzzy -msgid "Please select at least one path to engrave and run again." -msgstr "Для объединения нужно выбрать <b>не менее 1 контура</b>." +msgid "Lower limit of ruler" +msgstr "Опускание на предыдущий слой" -#: ../share/extensions/gcodetools.py:5519 -msgid "Unknown unit selected. mm assumed" -msgstr "" +#: ../src/widgets/ruler.cpp:219 +#, fuzzy +msgid "Upper" +msgstr "Пипетка" -#: ../share/extensions/gcodetools.py:5540 -#, python-format -msgid "Tool '%s' has no shape. 45 degree cone assumed!" +#: ../src/widgets/ruler.cpp:220 +msgid "Upper limit of ruler" msgstr "" -#: ../share/extensions/gcodetools.py:5611 -#: ../share/extensions/gcodetools.py:5616 -msgid "csp_normalised_normal error. See log." -msgstr "" +#: ../src/widgets/ruler.cpp:230 +#, fuzzy +msgid "Position of mark on the ruler" +msgstr "Информация о расширениях Inkscape" -#: ../share/extensions/gcodetools.py:5804 -msgid "No need to engrave sharp angles." -msgstr "" +#: ../src/widgets/ruler.cpp:239 +#, fuzzy +msgid "Max Size" +msgstr "Размер" -#: ../share/extensions/gcodetools.py:5848 -msgid "" -"Active layer already has orientation points! Remove them or select another " -"layer!" +#: ../src/widgets/ruler.cpp:240 +msgid "Maximum size of the ruler" msgstr "" -#: ../share/extensions/gcodetools.py:5893 -msgid "Active layer already has a tool! Remove it or select another layer!" -msgstr "" +#: ../src/widgets/select-toolbar.cpp:260 +msgid "Transform by toolbar" +msgstr "Смена ШВ/XY через панель" -#: ../share/extensions/gcodetools.py:6008 -msgid "Selection is empty! Will compute whole drawing." +#: ../src/widgets/select-toolbar.cpp:339 +msgid "Now <b>stroke width</b> is <b>scaled</b> when objects are scaled." msgstr "" +"Теперь <b>толщина обводки</b> <b>масштабируется</b> вместе с объектами." -#: ../share/extensions/gcodetools.py:6062 -msgid "" -"Tutorials, manuals and support can be found at\n" -"English support forum:\n" -"\thttp://www.cnc-club.ru/gcodetools\n" -"and Russian support forum:\n" -"\thttp://www.cnc-club.ru/gcodetoolsru" +#: ../src/widgets/select-toolbar.cpp:341 +msgid "Now <b>stroke width</b> is <b>not scaled</b> when objects are scaled." msgstr "" +"Теперь <b>толщина обводки</b> <b>не масштабируется</b> вместе с объектами." -#: ../share/extensions/gcodetools.py:6107 -msgid "Lathe X and Z axis remap should be 'X', 'Y' or 'Z'. Exiting..." +#: ../src/widgets/select-toolbar.cpp:352 +msgid "" +"Now <b>rounded rectangle corners</b> are <b>scaled</b> when rectangles are " +"scaled." msgstr "" +"Теперь <b>скруглённые углы прямоугольников</b> <b>масштабируются</b> вместе " +"с прямоугольниками." -#: ../share/extensions/gcodetools.py:6110 -msgid "Lathe X and Z axis remap should be the same. Exiting..." +#: ../src/widgets/select-toolbar.cpp:354 +msgid "" +"Now <b>rounded rectangle corners</b> are <b>not scaled</b> when rectangles " +"are scaled." msgstr "" +"Теперь <b>скруглённые углы прямоугольников</b> <b>не масштабируются</b> " +"вместе с прямоугольниками." -#: ../share/extensions/gcodetools.py:6662 -#, python-format +#: ../src/widgets/select-toolbar.cpp:365 msgid "" -"Select one of the action tabs - Path to Gcode, Area, Engraving, DXF points, " -"Orientation, Offset, Lathe or Tools library.\n" -" Current active tab id is %s" +"Now <b>gradients</b> are <b>transformed</b> along with their objects when " +"those are transformed (moved, scaled, rotated, or skewed)." msgstr "" +"Теперь <b>градиенты</b> <b>трансформируются</b> вместе с объектами (при " +"перемещении, масштабировании, вращении или наклоне)." -#: ../share/extensions/gcodetools.py:6668 +#: ../src/widgets/select-toolbar.cpp:367 msgid "" -"Orientation points have not been defined! A default set of orientation " -"points has been automatically added." +"Now <b>gradients</b> remain <b>fixed</b> when objects are transformed " +"(moved, scaled, rotated, or skewed)." msgstr "" +"Теперь <b>градиенты</b> остаются <b>неизменными</b> при трансформации " +"объектов (перемещение, масштабирование, вращение или наклон)." -#: ../share/extensions/gcodetools.py:6672 +#: ../src/widgets/select-toolbar.cpp:378 msgid "" -"Cutting tool has not been defined! A default tool has been automatically " -"added." +"Now <b>patterns</b> are <b>transformed</b> along with their objects when " +"those are transformed (moved, scaled, rotated, or skewed)." msgstr "" +"Теперь <b>текстуры</b> <b>трансформируются</b> вместе с объектами (при " +"перемещении, масштабировании, вращении или наклоне)." -#: ../share/extensions/generate_voronoi.py:35 +#: ../src/widgets/select-toolbar.cpp:380 msgid "" -"Failed to import the subprocess module. Please report this as a bug at: " -"https://bugs.launchpad.net/inkscape." +"Now <b>patterns</b> remain <b>fixed</b> when objects are transformed (moved, " +"scaled, rotated, or skewed)." msgstr "" +"Теперь <b>текстуры</b> остаются <b>неизменными</b> при трансформации " +"объектов (перемещение, масштабирование, вращение или наклон)." -#: ../share/extensions/generate_voronoi.py:36 -#, fuzzy -msgid "Python version is: " -msgstr "Преобразование в направляющие:" +#. four spinbuttons +#: ../src/widgets/select-toolbar.cpp:498 +msgctxt "Select toolbar" +msgid "X position" +msgstr "Положение по X" -#: ../share/extensions/generate_voronoi.py:94 -#, fuzzy -msgid "Please select an object" -msgstr "Выберите объект." +#: ../src/widgets/select-toolbar.cpp:498 +msgctxt "Select toolbar" +msgid "X:" +msgstr "X:" -#: ../share/extensions/gimp_xcf.py:39 -msgid "Gimp must be installed and set in your path variable." -msgstr "" +#: ../src/widgets/select-toolbar.cpp:500 +msgid "Horizontal coordinate of selection" +msgstr "Горизонтальная координата выделения" -#: ../share/extensions/gimp_xcf.py:43 -msgid "An error occurred while processing the XCF file." -msgstr "" +#: ../src/widgets/select-toolbar.cpp:504 +msgctxt "Select toolbar" +msgid "Y position" +msgstr "Положение по Y" -#: ../share/extensions/gimp_xcf.py:177 -#, fuzzy -msgid "This extension requires at least one non empty layer." -msgstr "Этому расширению нужно два контура в выделении." +#: ../src/widgets/select-toolbar.cpp:504 +msgctxt "Select toolbar" +msgid "Y:" +msgstr "Y:" -#: ../share/extensions/guillotine.py:250 -msgid "The sliced bitmaps have been saved as:" -msgstr "" +#: ../src/widgets/select-toolbar.cpp:506 +msgid "Vertical coordinate of selection" +msgstr "Вертикальная координата выделения" -#: ../share/extensions/hpgl_decoder.py:43 -#, fuzzy -msgid "Movements" -msgstr "Смещать градиенты" +#: ../src/widgets/select-toolbar.cpp:510 +msgctxt "Select toolbar" +msgid "Width" +msgstr "Ширина" -#: ../share/extensions/hpgl_decoder.py:44 -#, fuzzy -msgid "Pen #" -msgstr "Масса пера" +#: ../src/widgets/select-toolbar.cpp:510 +msgctxt "Select toolbar" +msgid "W:" +msgstr "Ш:" -#. issue error if no hpgl data found -#: ../share/extensions/hpgl_input.py:58 -#, fuzzy -msgid "No HPGL data found." -msgstr "Не закруглён" +#: ../src/widgets/select-toolbar.cpp:512 +msgid "Width of selection" +msgstr "Ширина выделения" -#: ../share/extensions/hpgl_input.py:66 -msgid "" -"The HPGL data contained unknown (unsupported) commands, there is a " -"possibility that the drawing is missing some content." -msgstr "" +#: ../src/widgets/select-toolbar.cpp:519 +msgid "Lock width and height" +msgstr "Заблокировать ширину и высоту" -#. issue error if no paths found -#: ../share/extensions/hpgl_output.py:58 -msgid "" -"No paths where found. Please convert all objects you want to save into paths." -msgstr "" +#: ../src/widgets/select-toolbar.cpp:520 +msgid "When locked, change both width and height by the same proportion" +msgstr "Если заблокировано, пропорционально изменять ширину и высоту" -#: ../share/extensions/inkex.py:109 -#, fuzzy, python-format -msgid "" -"The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " -"this extension. Please download and install the latest version from http://" -"cheeseshop.python.org/pypi/lxml/, or install it through your package manager " -"by a command like: sudo apt-get install python-lxml\n" -"\n" -"Technical details:\n" -"%s" -msgstr "" -"Потрясающая обертка lxml для libxml2 требуется для inkex.py, а значит и для " -"этого расширения. Скачайте и установить самую свежую версию с http://" -"cheeseshop.python.org/pypi/lxml/, либо установите ее через пакетный менеджер " -"командой наподобие: sudo apt-get install python-lxml" +#: ../src/widgets/select-toolbar.cpp:529 +msgctxt "Select toolbar" +msgid "Height" +msgstr "Высота" -#: ../share/extensions/inkex.py:162 -#, fuzzy, python-format -msgid "Unable to open specified file: %s" -msgstr "В указанном файле данные о гранях не обнаружены" +#: ../src/widgets/select-toolbar.cpp:529 +msgctxt "Select toolbar" +msgid "H:" +msgstr "В:" -#: ../share/extensions/inkex.py:171 -#, fuzzy, python-format -msgid "Unable to open object member file: %s" -msgstr "Не удалось найти маркер: %s" +#: ../src/widgets/select-toolbar.cpp:531 +msgid "Height of selection" +msgstr "Высота выделения" -#: ../share/extensions/inkex.py:276 -#, python-format -msgid "No matching node for expression: %s" -msgstr "Нет узла, подходящего условиям запроса: %s" +#: ../src/widgets/select-toolbar.cpp:581 +msgid "Scale rounded corners" +msgstr "Менять радиус закругленных углов" -#: ../share/extensions/interp_att_g.py:167 -msgid "There is no selection to interpolate" -msgstr "Нет интерполируемого выделения" +#: ../src/widgets/select-toolbar.cpp:592 +msgid "Move gradients" +msgstr "Смещать градиенты" -#: ../share/extensions/jessyInk_autoTexts.py:45 -#: ../share/extensions/jessyInk_effects.py:50 -#: ../share/extensions/jessyInk_export.py:96 -#: ../share/extensions/jessyInk_keyBindings.py:188 -#: ../share/extensions/jessyInk_masterSlide.py:46 -#: ../share/extensions/jessyInk_mouseHandler.py:48 -#: ../share/extensions/jessyInk_summary.py:64 -#: ../share/extensions/jessyInk_transitions.py:50 -#: ../share/extensions/jessyInk_video.py:49 -#: ../share/extensions/jessyInk_view.py:67 -msgid "" -"The JessyInk script is not installed in this SVG file or has a different " -"version than the JessyInk extensions. Please select \"install/update...\" " -"from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or " -"update the JessyInk script.\n" -"\n" -msgstr "" +#: ../src/widgets/select-toolbar.cpp:603 +msgid "Move patterns" +msgstr "Смещать текстуры" -#: ../share/extensions/jessyInk_autoTexts.py:48 -#, fuzzy -msgid "" -"To assign an effect, please select an object.\n" -"\n" -msgstr "Выберите объект." +#: ../src/widgets/sp-attribute-widget.cpp:299 +msgid "Set attribute" +msgstr "Установить атрибут" -#: ../share/extensions/jessyInk_autoTexts.py:54 -msgid "" -"Node with id '{0}' is not a suitable text node and was therefore ignored.\n" -"\n" -msgstr "" +#: ../src/widgets/sp-color-icc-selector.cpp:257 +msgid "CMS" +msgstr "CMS" -#: ../share/extensions/jessyInk_effects.py:53 -msgid "" -"No object selected. Please select the object you want to assign an effect to " -"and then press apply.\n" -msgstr "" +#: ../src/widgets/sp-color-icc-selector.cpp:355 +#: ../src/widgets/sp-color-scales.cpp:428 +msgid "_R:" +msgstr "_R:" -#: ../share/extensions/jessyInk_export.py:82 -msgid "Could not find Inkscape command.\n" -msgstr "" +#. TYPE_RGB_16 +#: ../src/widgets/sp-color-icc-selector.cpp:356 +#: ../src/widgets/sp-color-scales.cpp:431 +msgid "_G:" +msgstr "_G:" -#: ../share/extensions/jessyInk_masterSlide.py:56 -msgid "Layer not found. Removed current master slide selection.\n" -msgstr "" +#: ../src/widgets/sp-color-icc-selector.cpp:357 +#: ../src/widgets/sp-color-scales.cpp:434 +msgid "_B:" +msgstr "_B:" -#: ../share/extensions/jessyInk_masterSlide.py:58 -msgid "" -"More than one layer with this name found. Removed current master slide " -"selection.\n" -msgstr "" +#: ../src/widgets/sp-color-icc-selector.cpp:359 +msgid "Gray" +msgstr "Серый" -#: ../share/extensions/jessyInk_summary.py:69 -msgid "JessyInk script version {0} installed." -msgstr "" +#. TYPE_GRAY_16 +#: ../src/widgets/sp-color-icc-selector.cpp:361 +#: ../src/widgets/sp-color-icc-selector.cpp:365 +#: ../src/widgets/sp-color-scales.cpp:454 +msgid "_H:" +msgstr "_H:" -#: ../share/extensions/jessyInk_summary.py:71 -msgid "JessyInk script installed." -msgstr "" +#. TYPE_HSV_16 +#: ../src/widgets/sp-color-icc-selector.cpp:362 +#: ../src/widgets/sp-color-icc-selector.cpp:367 +#: ../src/widgets/sp-color-scales.cpp:457 +msgid "_S:" +msgstr "_S:" -#: ../share/extensions/jessyInk_summary.py:83 -#, fuzzy -msgid "" -"\n" -"Master slide:" -msgstr "Мастер-слайд" +#. TYPE_HLS_16 +#: ../src/widgets/sp-color-icc-selector.cpp:366 +#: ../src/widgets/sp-color-scales.cpp:460 +msgid "_L:" +msgstr "_L:" -#: ../share/extensions/jessyInk_summary.py:89 -msgid "" -"\n" -"Slide {0!s}:" -msgstr "" +#: ../src/widgets/sp-color-icc-selector.cpp:369 +#: ../src/widgets/sp-color-icc-selector.cpp:374 +#: ../src/widgets/sp-color-scales.cpp:482 +msgid "_C:" +msgstr "_C:" -#: ../share/extensions/jessyInk_summary.py:94 -#, fuzzy -msgid "{0}Layer name: {1}" -msgstr "Имя слоя:" +#. TYPE_CMYK_16 +#. TYPE_CMY_16 +#: ../src/widgets/sp-color-icc-selector.cpp:370 +#: ../src/widgets/sp-color-icc-selector.cpp:375 +#: ../src/widgets/sp-color-scales.cpp:485 +msgid "_M:" +msgstr "_M:" -#: ../share/extensions/jessyInk_summary.py:102 -msgid "{0}Transition in: {1} ({2!s} s)" -msgstr "" +#: ../src/widgets/sp-color-icc-selector.cpp:371 +#: ../src/widgets/sp-color-icc-selector.cpp:376 +#: ../src/widgets/sp-color-scales.cpp:488 +msgid "_Y:" +msgstr "_Y:" -#: ../share/extensions/jessyInk_summary.py:104 -#, fuzzy -msgid "{0}Transition in: {1}" -msgstr "Эффект перехода для появления" +#: ../src/widgets/sp-color-icc-selector.cpp:372 +#: ../src/widgets/sp-color-scales.cpp:491 +msgid "_K:" +msgstr "_K:" -#: ../share/extensions/jessyInk_summary.py:111 -msgid "{0}Transition out: {1} ({2!s} s)" -msgstr "" +#: ../src/widgets/sp-color-icc-selector.cpp:455 +msgid "Fix" +msgstr "Исправить" -#: ../share/extensions/jessyInk_summary.py:113 -#, fuzzy -msgid "{0}Transition out: {1}" -msgstr "Эффект перехода для исчезновения" +#: ../src/widgets/sp-color-icc-selector.cpp:458 +msgid "Fix RGB fallback to match icc-color() value." +msgstr "Исправить откат на RGB до совпадения со значением icc-color()" -#: ../share/extensions/jessyInk_summary.py:120 -#, fuzzy -msgid "" -"\n" -"{0}Auto-texts:" -msgstr "Автотекст" +#. Label +#: ../src/widgets/sp-color-icc-selector.cpp:561 +#: ../src/widgets/sp-color-scales.cpp:437 +#: ../src/widgets/sp-color-scales.cpp:463 +#: ../src/widgets/sp-color-scales.cpp:494 +#: ../src/widgets/sp-color-wheel-selector.cpp:140 +msgid "_A:" +msgstr "_A:" -#: ../share/extensions/jessyInk_summary.py:123 -msgid "{0}\t\"{1}\" (object id \"{2}\") will be replaced by \"{3}\"." -msgstr "" +#: ../src/widgets/sp-color-icc-selector.cpp:572 +#: ../src/widgets/sp-color-icc-selector.cpp:585 +#: ../src/widgets/sp-color-scales.cpp:438 +#: ../src/widgets/sp-color-scales.cpp:439 +#: ../src/widgets/sp-color-scales.cpp:464 +#: ../src/widgets/sp-color-scales.cpp:465 +#: ../src/widgets/sp-color-scales.cpp:495 +#: ../src/widgets/sp-color-scales.cpp:496 +#: ../src/widgets/sp-color-wheel-selector.cpp:161 +#: ../src/widgets/sp-color-wheel-selector.cpp:185 +msgid "Alpha (opacity)" +msgstr "Альфа-канал (непрозрачность)" + +#: ../src/widgets/sp-color-notebook.cpp:385 +msgid "Color Managed" +msgstr "С управлением цветом" + +#: ../src/widgets/sp-color-notebook.cpp:392 +msgid "Out of gamut!" +msgstr "Вне цветового охвата!" + +#: ../src/widgets/sp-color-notebook.cpp:399 +msgid "Too much ink!" +msgstr "Слишком много краски!" + +#. Create RGBA entry and color preview +#: ../src/widgets/sp-color-notebook.cpp:416 +msgid "RGBA_:" +msgstr "RGBA_:" + +#: ../src/widgets/sp-color-notebook.cpp:424 +msgid "Hexadecimal RGBA value of the color" +msgstr "Шестнадцатеричное значение RGBA" + +#: ../src/widgets/sp-color-scales.cpp:80 +msgid "RGB" +msgstr "RGB" -#: ../share/extensions/jessyInk_summary.py:168 -msgid "" -"\n" -"{0}Initial effect (order number {1}):" -msgstr "" +#: ../src/widgets/sp-color-scales.cpp:80 +msgid "HSL" +msgstr "HSL" -#: ../share/extensions/jessyInk_summary.py:170 -msgid "" -"\n" -"{0}Effect {1!s} (order number {2}):" -msgstr "" +#: ../src/widgets/sp-color-scales.cpp:80 +msgid "CMYK" +msgstr "CMYK" -#: ../share/extensions/jessyInk_summary.py:174 -msgid "{0}\tView will be set according to object \"{1}\"" -msgstr "" +#: ../src/widgets/sp-color-selector.cpp:64 +msgid "Unnamed" +msgstr "Безымянный" -#: ../share/extensions/jessyInk_summary.py:176 -msgid "{0}\tObject \"{1}\"" -msgstr "" +#: ../src/widgets/sp-xmlview-attr-list.cpp:64 +msgid "Value" +msgstr "Значение" -#: ../share/extensions/jessyInk_summary.py:179 -#, fuzzy -msgid " will appear" -msgstr "Заливка замкнутой области" +#: ../src/widgets/sp-xmlview-content.cpp:179 +msgid "Type text in a text node" +msgstr "Ввод текста в текстовую ветвь" -#: ../share/extensions/jessyInk_summary.py:181 -msgid " will disappear" -msgstr "" +#: ../src/widgets/spiral-toolbar.cpp:100 +msgid "Change spiral" +msgstr "Сброс изменений спирали" -#: ../share/extensions/jessyInk_summary.py:184 -msgid " using effect \"{0}\"" -msgstr "" +#: ../src/widgets/spiral-toolbar.cpp:246 +msgid "just a curve" +msgstr "просто кривая" -#: ../share/extensions/jessyInk_summary.py:187 -msgid " in {0!s} s" -msgstr "" +#: ../src/widgets/spiral-toolbar.cpp:246 +msgid "one full revolution" +msgstr "один полный оборот" -#: ../share/extensions/jessyInk_transitions.py:55 -#, fuzzy -msgid "Layer not found.\n" -msgstr "Слой на передний план" +#: ../src/widgets/spiral-toolbar.cpp:249 +msgid "Number of turns" +msgstr "Количество поворотов" -#: ../share/extensions/jessyInk_transitions.py:57 -msgid "More than one layer with this name found.\n" -msgstr "" +#: ../src/widgets/spiral-toolbar.cpp:249 +msgid "Turns:" +msgstr "Витков:" -#: ../share/extensions/jessyInk_transitions.py:70 -#, fuzzy -msgid "Please enter a layer name.\n" -msgstr "Вы забыли ввести имя файла" +#: ../src/widgets/spiral-toolbar.cpp:249 +msgid "Number of revolutions" +msgstr "Количество витков" -#: ../share/extensions/jessyInk_video.py:54 -#: ../share/extensions/jessyInk_video.py:59 -msgid "" -"Could not obtain the selected layer for inclusion of the video element.\n" -"\n" -msgstr "" +#: ../src/widgets/spiral-toolbar.cpp:260 +msgid "circle" +msgstr "окружность" -#: ../share/extensions/jessyInk_view.py:75 -#, fuzzy -msgid "More than one object selected. Please select only one object.\n" -msgstr "" -"<b>Выделено больше одного объекта.</b> Невозможно взять стиль от нескольких " -"объектов сразу." +#: ../src/widgets/spiral-toolbar.cpp:260 +msgid "edge is much denser" +msgstr "край намного плотнее" -#: ../share/extensions/jessyInk_view.py:79 -msgid "" -"No object selected. Please select the object you want to assign a view to " -"and then press apply.\n" -msgstr "" +#: ../src/widgets/spiral-toolbar.cpp:260 +msgid "edge is denser" +msgstr "центр плотнее" -#: ../share/extensions/markers_strokepaint.py:83 -#, python-format -msgid "No style attribute found for id: %s" -msgstr "Для ID %s не найден атрибут стиля" +#: ../src/widgets/spiral-toolbar.cpp:260 +msgid "even" +msgstr "ровная спираль" -#: ../share/extensions/markers_strokepaint.py:137 -#, python-format -msgid "unable to locate marker: %s" -msgstr "Не удалось найти маркер: %s" +#: ../src/widgets/spiral-toolbar.cpp:260 +msgid "center is denser" +msgstr "центр плотнее" -#: ../share/extensions/measure.py:50 -#, fuzzy -msgid "" -"Failed to import the numpy modules. These modules are required by this " -"extension. Please install them and try again. On a Debian-like system this " -"can be done with the command, sudo apt-get install python-numpy." -msgstr "" -"Не удалось импортировать модуль numpy или numpy.linalg. Эти модули " -"необходимо для работы вызванного расширения. Установите их и попробуйте " -"снова. На системах вроде Debian это делается командой sudo apt-get install " -"python-numpy." +#: ../src/widgets/spiral-toolbar.cpp:260 +msgid "center is much denser" +msgstr "центр намного плотнее" -#: ../share/extensions/measure.py:112 -msgid "Area is zero, cannot calculate Center of Mass" -msgstr "" +#: ../src/widgets/spiral-toolbar.cpp:263 +msgid "Divergence" +msgstr "Отклонение" -#: ../share/extensions/pathalongpath.py:208 -#: ../share/extensions/pathscatter.py:228 -#: ../share/extensions/perspective.py:53 -msgid "This extension requires two selected paths." -msgstr "Этому расширению нужно два контура в выделении." +#: ../src/widgets/spiral-toolbar.cpp:263 +msgid "Divergence:" +msgstr "Нелинейность:" -#: ../share/extensions/pathalongpath.py:234 -msgid "" -"The total length of the pattern is too small :\n" -"Please choose a larger object or set 'Space between copies' > 0" +#: ../src/widgets/spiral-toolbar.cpp:263 +msgid "How much denser/sparser are outer revolutions; 1 = uniform" msgstr "" +"Насколько постепенно увеличивать или уменьшать расстояния между витками; 1 = " +"равномерно" -#: ../share/extensions/pathalongpath.py:277 -msgid "" -"The 'stretch' option requires that the pattern must have non-zero width :\n" -"Please edit the pattern width." -msgstr "" +#: ../src/widgets/spiral-toolbar.cpp:274 +msgid "starts from center" +msgstr "начинается из центра" -#: ../share/extensions/pathmodifier.py:237 -#, python-format -msgid "Please first convert objects to paths! (Got [%s].)" -msgstr "Сначала преобразуйте объекты в контуры! (Получено [%s].)" +#: ../src/widgets/spiral-toolbar.cpp:274 +msgid "starts mid-way" +msgstr "начинается с середины" -#: ../share/extensions/perspective.py:45 -msgid "" -"Failed to import the numpy or numpy.linalg modules. These modules are " -"required by this extension. Please install them and try again. On a Debian-" -"like system this can be done with the command, sudo apt-get install python-" -"numpy." -msgstr "" -"Не удалось импортировать модуль numpy или numpy.linalg. Эти модули " -"необходимо для работы вызванного расширения. Установите их и попробуйте " -"снова. На системах вроде Debian это делается командой sudo apt-get install " -"python-numpy." +#: ../src/widgets/spiral-toolbar.cpp:274 +msgid "starts near edge" +msgstr "начинается с края" -#: ../share/extensions/perspective.py:61 -#: ../share/extensions/summersnight.py:52 -#, python-format -msgid "" -"The first selected object is of type '%s'.\n" -"Try using the procedure Path->Object to Path." -msgstr "" -"Первый выбранный объект относится к типу «%s».\n" -"Превратите его в контур командой «Контур > Оконтурить объект»." +#: ../src/widgets/spiral-toolbar.cpp:277 +msgid "Inner radius" +msgstr "Внутренний радиус" -#: ../share/extensions/perspective.py:68 -#: ../share/extensions/summersnight.py:60 -msgid "" -"This extension requires that the second selected path be four nodes long." -msgstr "Второй выбранный контур должен содержать четыре узла." +#: ../src/widgets/spiral-toolbar.cpp:277 +msgid "Inner radius:" +msgstr "Внутренний радиус:" -#: ../share/extensions/perspective.py:94 -#: ../share/extensions/summersnight.py:93 -msgid "" -"The second selected object is a group, not a path.\n" -"Try using the procedure Object->Ungroup." -msgstr "" -"Второй выделенный объект является группой, а не контуром.\n" -"Попробуйте выполнить команду »Объект > Разгруппировать»." +#: ../src/widgets/spiral-toolbar.cpp:277 +msgid "Radius of the innermost revolution (relative to the spiral size)" +msgstr "Радиус первого изнутри витка (относительно размера спирали)" -#: ../share/extensions/perspective.py:96 -#: ../share/extensions/summersnight.py:95 +#: ../src/widgets/spiral-toolbar.cpp:290 ../src/widgets/star-toolbar.cpp:565 msgid "" -"The second selected object is not a path.\n" -"Try using the procedure Path->Object to Path." +"Reset shape parameters to defaults (use Inkscape Preferences > Tools to " +"change defaults)" msgstr "" -"Второй выделенный объект не является контуром.\n" -"Попробуйте выполнить команду »Контур > Оконтурить объект»." +"Сбросить параметры фигуры к значениям по умолчанию (параметры по умолчанию " +"можно изменить в настройках Inkscape)" -#: ../share/extensions/perspective.py:99 -#: ../share/extensions/summersnight.py:98 -msgid "" -"The first selected object is not a path.\n" -"Try using the procedure Path->Object to Path." -msgstr "" -"Первый выделенный объект не является контуром.\n" -"Попробуйте выполнить команду »Контур > Оконтурить объект»." +#. Width +#: ../src/widgets/spray-toolbar.cpp:113 +msgid "(narrow spray)" +msgstr "(узкое распыление)" -#. issue error if no paths found -#: ../share/extensions/plotter.py:66 -msgid "" -"No paths where found. Please convert all objects you want to plot into paths." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:113 +msgid "(broad spray)" +msgstr "(широкое распыление)" -#: ../share/extensions/plotter.py:143 -msgid "pySerial is not installed." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:116 +msgid "The width of the spray area (relative to the visible canvas area)" +msgstr "Ширина области распыления (относительно видимой области холста)" -#: ../share/extensions/plotter.py:163 -msgid "" -"Could not open port. Please check that your plotter is running, connected " -"and the settings are correct." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:129 +msgid "(maximum mean)" +msgstr "(максимальный)" -#: ../share/extensions/polyhedron_3d.py:65 -msgid "" -"Failed to import the numpy module. This module is required by this " -"extension. Please install it and try again. On a Debian-like system this " -"can be done with the command 'sudo apt-get install python-numpy'." -msgstr "" -"Не удалось импортировать модуль numpy, необходимый для этого расширения. " -"Установите его и попробуйте еще раз. В системах вроде Debian это можно " -"сделать командой 'sudo apt-get install python-numpy'." +#: ../src/widgets/spray-toolbar.cpp:132 +msgid "Focus" +msgstr "Фокус" -#: ../share/extensions/polyhedron_3d.py:336 -msgid "No face data found in specified file." -msgstr "В указанном файле данные о гранях не обнаружены" +#: ../src/widgets/spray-toolbar.cpp:132 +msgid "Focus:" +msgstr "Фокус:" -#: ../share/extensions/polyhedron_3d.py:337 -msgid "Try selecting \"Edge Specified\" in the Model File tab.\n" +#: ../src/widgets/spray-toolbar.cpp:132 +#, fuzzy +msgid "0 to spray a spot; increase to enlarge the ring radius" msgstr "" -"Попробуйте выбрать определенный ребрами тип объекта на вкладке «Файл " -"модели».\n" +"При нулевом значении распыляет в точку, Увеличение значения повышает радиус " +"кольца рассеивания." -#: ../share/extensions/polyhedron_3d.py:343 -msgid "No edge data found in specified file." -msgstr "В указанном файле данные о ребрах не обнаружены" +#. Standard_deviation +#: ../src/widgets/spray-toolbar.cpp:145 +msgid "(minimum scatter)" +msgstr "(минимальное рассеивание)" -#: ../share/extensions/polyhedron_3d.py:344 -msgid "Try selecting \"Face Specified\" in the Model File tab.\n" -msgstr "" -"Попробуйте выбрать определенный гранями тип объекта на вкладке «Файл " -"модели».\n" +#: ../src/widgets/spray-toolbar.cpp:145 +msgid "(maximum scatter)" +msgstr "(максимальное рассеивание)" -#. we cannot generate a list of faces from the edges without a lot of computation -#: ../share/extensions/polyhedron_3d.py:522 -msgid "" -"Face Data Not Found. Ensure file contains face data, and check the file is " -"imported as \"Face-Specified\" under the \"Model File\" tab.\n" -msgstr "" -"Данные граней не найдены. Убедитесь в том, что файл содержит эти данные, и " -"что на вкладке «Файл модели» тип объекта указан как определённый гранями.\n" +#: ../src/widgets/spray-toolbar.cpp:148 +msgctxt "Spray tool" +msgid "Scatter" +msgstr "Рассеивание" -#: ../share/extensions/polyhedron_3d.py:524 -msgid "Internal Error. No view type selected\n" -msgstr "Внутренняя ошибка: не выбран тип вида\n" +#: ../src/widgets/spray-toolbar.cpp:148 +msgctxt "Spray tool" +msgid "Scatter:" +msgstr "Рассеивание:" -#: ../share/extensions/print_win32_vector.py:41 -msgid "sorry, this will run only on Windows, exiting..." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:148 +msgid "Increase to scatter sprayed objects" +msgstr "Увеличение значения приводит к рассеиванию распыляемых объектов" -#: ../share/extensions/print_win32_vector.py:179 -#, fuzzy -msgid "Failed to open default printer" -msgstr "Не удалось установить CairoRenderContext" +#: ../src/widgets/spray-toolbar.cpp:167 +msgid "Spray copies of the initial selection" +msgstr "Распылять копии исходного выделения" -#: ../share/extensions/render_barcode_datamatrix.py:202 -msgid "Unrecognised DataMatrix size" -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:174 +msgid "Spray clones of the initial selection" +msgstr "Распылять клоны исходного выделения" -#. we have an invalid bit value -#: ../share/extensions/render_barcode_datamatrix.py:643 -msgid "Invalid bit value, this is a bug!" -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:180 +msgid "Spray single path" +msgstr "Распылять в один контур" -#. abort if converting blank text -#: ../share/extensions/render_barcode_datamatrix.py:678 -msgid "Please enter an input string" -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:181 +msgid "Spray objects in a single path" +msgstr "Распылять копии объекта, объединяя их в один контур" -#. abort if converting blank text -#: ../share/extensions/render_barcode_qrcode.py:1054 -#, fuzzy -msgid "Please enter an input text" -msgstr "Вы забыли ввести имя файла" +#: ../src/widgets/spray-toolbar.cpp:185 ../src/widgets/tweak-toolbar.cpp:253 +msgid "Mode" +msgstr "Режим" -#: ../share/extensions/replace_font.py:133 -msgid "" -"Couldn't find anything using that font, please ensure the spelling and " -"spacing is correct." -msgstr "" +#. Population +#: ../src/widgets/spray-toolbar.cpp:205 +msgid "(low population)" +msgstr "(слабое заполнение)" -#: ../share/extensions/replace_font.py:140 -#: ../share/extensions/svg_and_media_zip_output.py:193 -msgid "Didn't find any fonts in this document/selection." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:205 +msgid "(high population)" +msgstr "(обильное заполнение)" -#: ../share/extensions/replace_font.py:143 -#: ../share/extensions/svg_and_media_zip_output.py:196 -#, python-format -msgid "Found the following font only: %s" -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:208 +msgid "Amount" +msgstr "Количество" -#: ../share/extensions/replace_font.py:145 -#: ../share/extensions/svg_and_media_zip_output.py:198 -#, python-format +#: ../src/widgets/spray-toolbar.cpp:209 +msgid "Adjusts the number of items sprayed per click" +msgstr "Число объектов, появляющихся по одному щелчку" + +#: ../src/widgets/spray-toolbar.cpp:225 msgid "" -"Found the following fonts:\n" -"%s" +"Use the pressure of the input device to alter the amount of sprayed objects" msgstr "" +"Менять число распыляемых объектов в зависимости от нажима устройством ввода" -#: ../share/extensions/replace_font.py:196 -#, fuzzy -msgid "There was nothing selected" -msgstr "Ничего не выбрано" - -#: ../share/extensions/replace_font.py:244 -msgid "Please enter a search string in the find box." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:235 +msgid "(high rotation variation)" +msgstr "(существенное варьирование вращения)" -#: ../share/extensions/replace_font.py:248 -msgid "Please enter a replacement font in the replace with box." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:238 +msgid "Rotation" +msgstr "Вращение" -#: ../share/extensions/replace_font.py:253 -msgid "Please enter a replacement font in the replace all box." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:238 +msgid "Rotation:" +msgstr "Вращение:" -#: ../share/extensions/summersnight.py:44 +#: ../src/widgets/spray-toolbar.cpp:240 +#, no-c-format msgid "" -"This extension requires two selected paths. \n" -"The second path must be exactly four nodes long." +"Variation of the rotation of the sprayed objects; 0% for the same rotation " +"than the original object" msgstr "" -"Этому расширению нужны два контура в выделении.\n" -"Второй выбранный контур должен содержать ровно четыре узла." - -#: ../share/extensions/svg_and_media_zip_output.py:128 -#, python-format -msgid "Could not locate file: %s" -msgstr "Не удалось найти файл: %s" - -#: ../share/extensions/svgcalendar.py:266 -#: ../share/extensions/svgcalendar.py:288 -#, fuzzy -msgid "You must select a correct system encoding." -msgstr "Необходимо выбрать не менее двух объектов" - -#: ../share/extensions/uniconv-ext.py:56 -#: ../share/extensions/uniconv_output.py:122 -msgid "You need to install the UniConvertor software.\n" -msgstr "Вам необходимо установить UniConvertor.\n" +"Варьирование вращения распыляемых объектов. 0% означает отсутствие вращения " +"исходного выделения." -#: ../share/extensions/voronoi2svg.py:215 -msgid "Please select objects!" -msgstr "Выделите объекты!" +#: ../src/widgets/spray-toolbar.cpp:253 +msgid "(high scale variation)" +msgstr "(существенное варьирование масштаба)" -#: ../share/extensions/web-set-att.py:58 -#: ../share/extensions/web-transmit-att.py:54 -msgid "You must select at least two elements." -msgstr "Необходимо выбрать не менее двух объектов" +#: ../src/widgets/spray-toolbar.cpp:256 +msgctxt "Spray tool" +msgid "Scale" +msgstr "Масштаб" -#: ../share/extensions/webslicer_create_group.py:57 -msgid "" -"You must create and select some \"Slicer rectangles\" before trying to group." -msgstr "" +#: ../src/widgets/spray-toolbar.cpp:256 +msgctxt "Spray tool" +msgid "Scale:" +msgstr "Масштаб:" -#: ../share/extensions/webslicer_create_group.py:72 +#: ../src/widgets/spray-toolbar.cpp:258 +#, no-c-format msgid "" -"You must to select some \"Slicer rectangles\" or other \"Layout groups\"." -msgstr "" - -#: ../share/extensions/webslicer_create_group.py:76 -#, python-format -msgid "Oops... The element \"%s\" is not in the Web Slicer layer" +"Variation in the scale of the sprayed objects; 0% for the same scale than " +"the original object" msgstr "" +"Варьирование масштаба распыляемых объектов. 0% означает размер исходного " +"выделения." -#: ../share/extensions/webslicer_export.py:57 -msgid "You must give a directory to export the slices." -msgstr "" +#: ../src/widgets/star-toolbar.cpp:102 +msgid "Star: Change number of corners" +msgstr "Смена количества лучей" -#: ../share/extensions/webslicer_export.py:69 -#, python-format -msgid "Can't create \"%s\"." -msgstr "Невозможно создать «%s»." +#: ../src/widgets/star-toolbar.cpp:155 +msgid "Star: Change spoke ratio" +msgstr "Смена отношения радиусов" -#: ../share/extensions/webslicer_export.py:70 -#, python-format -msgid "Error: %s" -msgstr "Ошибка: %s" +#: ../src/widgets/star-toolbar.cpp:200 +msgid "Make polygon" +msgstr "Звезда → многоугольник" -#: ../share/extensions/webslicer_export.py:73 -#, python-format -msgid "The directory \"%s\" does not exists." -msgstr "Каталог «%s» не существует." +#: ../src/widgets/star-toolbar.cpp:200 +msgid "Make star" +msgstr "Многоугольник → звезда" -#: ../share/extensions/webslicer_export.py:102 -#, python-format -msgid "You have more than one element with \"%s\" html-id." -msgstr "У вас больше одного элемента с with html-id «%s»." +#: ../src/widgets/star-toolbar.cpp:239 +msgid "Star: Change rounding" +msgstr "Смена закругления" -#: ../share/extensions/webslicer_export.py:332 -msgid "You must install the ImageMagick to get JPG and GIF." -msgstr "Необходимо установить ImageMagick для получения JPG и GIF." +#: ../src/widgets/star-toolbar.cpp:279 +msgid "Star: Change randomization" +msgstr "Смена случайности искажения" -#. PARAMETER PROCESSING -#. lines of longitude are odd : abort -#: ../share/extensions/wireframe_sphere.py:116 -msgid "Please enter an even number of lines of longitude." -msgstr "" +#: ../src/widgets/star-toolbar.cpp:463 +msgid "Regular polygon (with one handle) instead of a star" +msgstr "Правильный многоугольник, а не звезда" -#. vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 -#: ../share/extensions/addnodes.inx.h:1 -msgid "Add Nodes" -msgstr "Добавить узлы" +#: ../src/widgets/star-toolbar.cpp:470 +msgid "Star instead of a regular polygon (with one handle)" +msgstr "Звезда вместо обычного многоугольника (с одним рычагом)" -#: ../share/extensions/addnodes.inx.h:2 -msgid "Division method:" -msgstr "Способ деления:" +#: ../src/widgets/star-toolbar.cpp:491 +msgid "triangle/tri-star" +msgstr "треугольник/звезда с 3 лучами" -#: ../share/extensions/addnodes.inx.h:3 -msgid "By max. segment length" -msgstr "По максимальной длине сегмента" +#: ../src/widgets/star-toolbar.cpp:491 +msgid "square/quad-star" +msgstr "квадрат/звезда с 4 лучами" -#: ../share/extensions/addnodes.inx.h:4 -msgid "By number of segments" -msgstr "По числу сегментов" +#: ../src/widgets/star-toolbar.cpp:491 +msgid "pentagon/five-pointed star" +msgstr "пятиугольник/звезда с 5 лучами" -#: ../share/extensions/addnodes.inx.h:5 -msgid "Maximum segment length (px):" -msgstr "Максимальная длина сегмента (px):" +#: ../src/widgets/star-toolbar.cpp:491 +msgid "hexagon/six-pointed star" +msgstr "шестиугольник/звезда с 6 лучами" -#: ../share/extensions/addnodes.inx.h:6 -msgid "Number of segments:" -msgstr "Количество сегментов:" +#: ../src/widgets/star-toolbar.cpp:494 +msgid "Corners" +msgstr "Углы" -#: ../share/extensions/addnodes.inx.h:7 -#: ../share/extensions/convert2dashes.inx.h:2 -#: ../share/extensions/edge3d.inx.h:9 ../share/extensions/flatten.inx.h:3 -#: ../share/extensions/fractalize.inx.h:4 -#: ../share/extensions/interp_att_g.inx.h:29 -#: ../share/extensions/markers_strokepaint.inx.h:13 -#: ../share/extensions/perspective.inx.h:2 -#: ../share/extensions/pixelsnap.inx.h:3 -#: ../share/extensions/radiusrand.inx.h:10 -#: ../share/extensions/rubberstretch.inx.h:6 -#: ../share/extensions/straightseg.inx.h:4 -#: ../share/extensions/summersnight.inx.h:2 ../share/extensions/whirl.inx.h:4 -msgid "Modify Path" -msgstr "Изменение контура" +#: ../src/widgets/star-toolbar.cpp:494 +msgid "Corners:" +msgstr "Углы:" -#: ../share/extensions/ai_input.inx.h:1 -msgid "AI 8.0 Input" -msgstr "Импорт файлов AI 8.0" +#: ../src/widgets/star-toolbar.cpp:494 +msgid "Number of corners of a polygon or star" +msgstr "Количество вершин многоугольника или звезды" -#: ../share/extensions/ai_input.inx.h:2 -msgid "Adobe Illustrator 8.0 and below (*.ai)" -msgstr "Adobe Illustrator 8.0 и ниже (*.ai)" +#: ../src/widgets/star-toolbar.cpp:507 +msgid "thin-ray star" +msgstr "звезда с тонкими лучами" -#: ../share/extensions/ai_input.inx.h:3 -msgid "Open files saved with Adobe Illustrator 8.0 or older" -msgstr "Открыть файлы, сохранённые в Adobe Illustrator 8.0 и ранее" +#: ../src/widgets/star-toolbar.cpp:507 +msgid "pentagram" +msgstr "пентаграмма" -#: ../share/extensions/aisvg.inx.h:1 -msgid "AI SVG Input" -msgstr "Импорт AI SVG" +#: ../src/widgets/star-toolbar.cpp:507 +msgid "hexagram" +msgstr "гексаграмма" -#: ../share/extensions/aisvg.inx.h:2 -msgid "Adobe Illustrator SVG (*.ai.svg)" -msgstr "Файлы SVG из Adobe Illustrator (*.ai.svg)" +#: ../src/widgets/star-toolbar.cpp:507 +msgid "heptagram" +msgstr "гептаграмма" -#: ../share/extensions/aisvg.inx.h:3 -msgid "Cleans the cruft out of Adobe Illustrator SVGs before opening" -msgstr "Перед импортом чистит код файлов SVG, созданных в Adobe Illustrator" +#: ../src/widgets/star-toolbar.cpp:507 +msgid "octagram" +msgstr "октограмма" -#: ../share/extensions/ccx_input.inx.h:1 -#, fuzzy -msgid "Corel DRAW Compressed Exchange files input (UC)" -msgstr "Импорт файлов Corel DRAW Compressed Exchange" +#: ../src/widgets/star-toolbar.cpp:507 +msgid "regular polygon" +msgstr "обычный многоугольник" -#: ../share/extensions/ccx_input.inx.h:2 -#, fuzzy -msgid "Corel DRAW Compressed Exchange files (UC) (*.ccx)" -msgstr "Файлы Corel DRAW Compressed Exchange (.ccx)" +#: ../src/widgets/star-toolbar.cpp:510 +msgid "Spoke ratio" +msgstr "Отношение радиусов" -#: ../share/extensions/ccx_input.inx.h:3 -#, fuzzy -msgid "Open compressed exchange files saved in Corel DRAW (UC)" -msgstr "Открыть сжатые файлы для обмена, созданные в Corel DRAW" +#: ../src/widgets/star-toolbar.cpp:510 +msgid "Spoke ratio:" +msgstr "Отношение радиусов:" -#: ../share/extensions/cdr_input.inx.h:1 -#, fuzzy -msgid "Corel DRAW Input (UC)" -msgstr "Импорт Corel DRAW" +#. TRANSLATORS: Tip radius of a star is the distance from the center to the farthest handle. +#. Base radius is the same for the closest handle. +#: ../src/widgets/star-toolbar.cpp:513 +msgid "Base radius to tip radius ratio" +msgstr "Отношение радиусов основания и вершины луча" -#: ../share/extensions/cdr_input.inx.h:2 -#, fuzzy -msgid "Corel DRAW 7-X4 files (UC) (*.cdr)" -msgstr "Файлы Corel DRAW 7-X4 (*.cdr)" +#: ../src/widgets/star-toolbar.cpp:531 +msgid "stretched" +msgstr "растянуто" -#: ../share/extensions/cdr_input.inx.h:3 -#, fuzzy -msgid "Open files saved in Corel DRAW 7-X4 (UC)" -msgstr "Открыть файлы, сохраненные в Corel DRAW 7-X4" +#: ../src/widgets/star-toolbar.cpp:531 +msgid "twisted" +msgstr "извилисто" -#: ../share/extensions/cdt_input.inx.h:1 -#, fuzzy -msgid "Corel DRAW templates input (UC)" -msgstr "Импорт шаблонов Corel DRAW" +#: ../src/widgets/star-toolbar.cpp:531 +msgid "slightly pinched" +msgstr "слегка прищемлено" -#: ../share/extensions/cdt_input.inx.h:2 -#, fuzzy -msgid "Corel DRAW 7-13 template files (UC) (*.cdt)" -msgstr "Шаблоны Corel DRAW 7-13 (.cdt)" +#: ../src/widgets/star-toolbar.cpp:531 +msgid "NOT rounded" +msgstr "БЕЗ закругления" -#: ../share/extensions/cdt_input.inx.h:3 -#, fuzzy -msgid "Open files saved in Corel DRAW 7-13 (UC)" -msgstr "Открыть файлы, сохранённые в Corel DRAW 7-13" +#: ../src/widgets/star-toolbar.cpp:531 +msgid "slightly rounded" +msgstr "небольшое закругление" -#: ../share/extensions/cgm_input.inx.h:1 -msgid "Computer Graphics Metafile files input" -msgstr "Импорт файлов Computer Graphics Metafile" +#: ../src/widgets/star-toolbar.cpp:531 +msgid "visibly rounded" +msgstr "заметное закругление" -#: ../share/extensions/cgm_input.inx.h:2 -#, fuzzy -msgid "Computer Graphics Metafile files (*.cgm)" -msgstr "Файлы Computer Graphics Metafile (.cgm)" +#: ../src/widgets/star-toolbar.cpp:531 +msgid "well rounded" +msgstr "порядочное закругление" -#: ../share/extensions/cgm_input.inx.h:3 -msgid "Open Computer Graphics Metafile files" -msgstr "Открыть файлы Open Computer Graphics Metafile" +#: ../src/widgets/star-toolbar.cpp:531 +msgid "amply rounded" +msgstr "изрядное закругление" -#: ../share/extensions/cmx_input.inx.h:1 -#, fuzzy -msgid "Corel DRAW Presentation Exchange files input (UC)" -msgstr "Импорт файлов Corel DRAW Presentation Exchange" +#: ../src/widgets/star-toolbar.cpp:531 ../src/widgets/star-toolbar.cpp:546 +msgid "blown up" +msgstr "безумное" -#: ../share/extensions/cmx_input.inx.h:2 -#, fuzzy -msgid "Corel DRAW Presentation Exchange files (UC) (*.cmx)" -msgstr "Файлы Corel DRAW Presentation Exchange (.cmx)" +#: ../src/widgets/star-toolbar.cpp:534 +msgid "Rounded:" +msgstr "Закругление:" -#: ../share/extensions/cmx_input.inx.h:3 -#, fuzzy -msgid "Open presentation exchange files saved in Corel DRAW (UC)" -msgstr "Открыть файлы, сохраненные Corel DRAW для обмена данными" +#: ../src/widgets/star-toolbar.cpp:534 +msgid "How much rounded are the corners (0 for sharp)" +msgstr "Насколько сглажены углы (0 — острые)" -#: ../share/extensions/color_HSL_adjust.inx.h:1 -#, fuzzy -msgid "HSL Adjust" -msgstr "Коррекция в HSB" +#: ../src/widgets/star-toolbar.cpp:546 +msgid "NOT randomized" +msgstr "без случайности" -#: ../share/extensions/color_HSL_adjust.inx.h:3 -#, fuzzy -msgid "Hue (°)" -msgstr "Вращение тона:" +#: ../src/widgets/star-toolbar.cpp:546 +msgid "slightly irregular" +msgstr "едва беспорядочно" -#: ../share/extensions/color_HSL_adjust.inx.h:4 -#, fuzzy -msgid "Random hue" -msgstr "Случайное дерево" +#: ../src/widgets/star-toolbar.cpp:546 +msgid "visibly randomized" +msgstr "заметная случайность" -#: ../share/extensions/color_HSL_adjust.inx.h:6 -#, fuzzy, no-c-format -msgid "Saturation (%)" -msgstr "Насыщенность" +#: ../src/widgets/star-toolbar.cpp:546 +msgid "strongly randomized" +msgstr "изрядная случайность" -#: ../share/extensions/color_HSL_adjust.inx.h:7 -#, fuzzy -msgid "Random saturation" -msgstr "Коррекция насыщенности" +#: ../src/widgets/star-toolbar.cpp:549 +msgid "Randomized" +msgstr "Случайность" -#: ../share/extensions/color_HSL_adjust.inx.h:9 -#, fuzzy, no-c-format -msgid "Lightness (%)" -msgstr "Светлота:" +#: ../src/widgets/star-toolbar.cpp:549 +msgid "Randomized:" +msgstr "Искажение:" -#: ../share/extensions/color_HSL_adjust.inx.h:10 -#, fuzzy -msgid "Random lightness" -msgstr "Яркость" +#: ../src/widgets/star-toolbar.cpp:549 +msgid "Scatter randomly the corners and angles" +msgstr "Случайным образом смещать вершины и вращать углы" -#: ../share/extensions/color_HSL_adjust.inx.h:13 -#, no-c-format -msgid "" -"Adjusts hue, saturation and lightness in the HSL representation of the " -"selected objects's color.\n" -"Options:\n" -" * Hue: rotate by degrees (wraps around).\n" -" * Saturation: add/subtract % (min=-100, max=100).\n" -" * Lightness: add/subtract % (min=-100, max=100).\n" -" * Random Hue/Saturation/Lightness: randomize the parameter's value.\n" -" " -msgstr "" +#: ../src/widgets/stroke-marker-selector.cpp:388 +#, fuzzy +msgctxt "Marker" +msgid "None" +msgstr "Нет" -#: ../share/extensions/color_blackandwhite.inx.h:1 -msgid "Black and White" -msgstr "Только чёрный и белый" +#: ../src/widgets/stroke-style.cpp:192 +msgid "Stroke width" +msgstr "Прибавить толщину обводки" -#: ../share/extensions/color_blackandwhite.inx.h:2 -msgid "Threshold Color (1-255):" -msgstr "" +#: ../src/widgets/stroke-style.cpp:194 +msgctxt "Stroke width" +msgid "_Width:" +msgstr "То_лщина:" -#: ../share/extensions/color_brighter.inx.h:1 -msgid "Brighter" -msgstr "Ярче" +#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. +#. For an example, draw a triangle with a large stroke width and modify the +#. "Join" option (in the Fill and Stroke dialog). +#: ../src/widgets/stroke-style.cpp:239 +msgid "Miter join" +msgstr "Острое" -#: ../share/extensions/color_custom.inx.h:1 -#, fuzzy -msgctxt "Custom color extension" -msgid "Custom" -msgstr "Другой" +#. TRANSLATORS: Round join: joining lines with a rounded corner. +#. For an example, draw a triangle with a large stroke width and modify the +#. "Join" option (in the Fill and Stroke dialog). +#: ../src/widgets/stroke-style.cpp:247 +msgid "Round join" +msgstr "Скруглённое" -#: ../share/extensions/color_custom.inx.h:3 -msgid "Red Function:" -msgstr "Функция красного:" +#. TRANSLATORS: Bevel join: joining lines with a blunted (flattened) corner. +#. For an example, draw a triangle with a large stroke width and modify the +#. "Join" option (in the Fill and Stroke dialog). +#: ../src/widgets/stroke-style.cpp:255 +msgid "Bevel join" +msgstr "Фаска" -#: ../share/extensions/color_custom.inx.h:4 -msgid "Green Function:" -msgstr "Функция зелёного:" +#: ../src/widgets/stroke-style.cpp:280 +msgid "Miter _limit:" +msgstr "Пред_ел острия:" -#: ../share/extensions/color_custom.inx.h:5 -msgid "Blue Function:" -msgstr "Функция синего:" +#. Cap type +#. TRANSLATORS: cap type specifies the shape for the ends of lines +#. spw_label(t, _("_Cap:"), 0, i); +#: ../src/widgets/stroke-style.cpp:296 +msgid "Cap:" +msgstr "Концы:" -#: ../share/extensions/color_custom.inx.h:6 -msgid "Input (r,g,b) Color Range:" -msgstr "" +#. TRANSLATORS: Butt cap: the line shape does not extend beyond the end point +#. of the line; the ends of the line are square +#: ../src/widgets/stroke-style.cpp:307 +msgid "Butt cap" +msgstr "Плоские" -#: ../share/extensions/color_custom.inx.h:8 -msgid "" -"Allows you to evaluate different functions for each channel.\n" -"r, g and b are the normalized values of the red, green and blue channels. " -"The resulting RGB values are automatically clamped.\n" -" \n" -"Example (half the red, swap green and blue):\n" -" Red Function: r*0.5 \n" -" Green Function: b \n" -" Blue Function: g" -msgstr "" +#. TRANSLATORS: Round cap: the line shape extends beyond the end point of the +#. line; the ends of the line are rounded +#: ../src/widgets/stroke-style.cpp:314 +msgid "Round cap" +msgstr "Круглые" -#: ../share/extensions/color_darker.inx.h:1 -msgid "Darker" -msgstr "Темнее" +#. TRANSLATORS: Square cap: the line shape extends beyond the end point of the +#. line; the ends of the line are square +#: ../src/widgets/stroke-style.cpp:321 +msgid "Square cap" +msgstr "Квадратные" -#: ../share/extensions/color_desaturate.inx.h:1 -msgid "Desaturate" -msgstr "Обесцветить" +#. Dash +#: ../src/widgets/stroke-style.cpp:326 +msgid "Dashes:" +msgstr "Пунктир:" -#: ../share/extensions/color_grayscale.inx.h:1 -#: ../share/extensions/webslicer_create_rect.inx.h:15 -msgid "Grayscale" -msgstr "Градации серого" +#. Drop down marker selectors +#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes +#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. +#: ../src/widgets/stroke-style.cpp:352 +#, fuzzy +msgid "Markers:" +msgstr "Маркеры" -#: ../share/extensions/color_lesshue.inx.h:1 -msgid "Less Hue" -msgstr "Меньше тона" +#: ../src/widgets/stroke-style.cpp:358 +msgid "Start Markers are drawn on the first node of a path or shape" +msgstr "Маркеры начала рисуются в первом узле контура или фигуры" -#: ../share/extensions/color_lesslight.inx.h:1 -msgid "Less Light" -msgstr "Меньше яркости" +#: ../src/widgets/stroke-style.cpp:367 +msgid "" +"Mid Markers are drawn on every node of a path or shape except the first and " +"last nodes" +msgstr "" +"Маркеры середины рисуются в каждом узле контура или фигуры кроме первого и " +"последнего" -#: ../share/extensions/color_lesssaturation.inx.h:1 -msgid "Less Saturation" -msgstr "Меньше насыщенности" +#: ../src/widgets/stroke-style.cpp:376 +msgid "End Markers are drawn on the last node of a path or shape" +msgstr "Маркеры конца рисуются в последнем узле контура или фигуры" -#: ../share/extensions/color_morehue.inx.h:1 -msgid "More Hue" -msgstr "Больше тона" +#: ../src/widgets/stroke-style.cpp:494 +msgid "Set markers" +msgstr "Установка маркеров" -#: ../share/extensions/color_morelight.inx.h:1 -msgid "More Light" -msgstr "Больше яркости" +#: ../src/widgets/stroke-style.cpp:1024 ../src/widgets/stroke-style.cpp:1109 +msgid "Set stroke style" +msgstr "Установка стиля обводки" -#: ../share/extensions/color_moresaturation.inx.h:1 -msgid "More Saturation" -msgstr "Больше насыщенности" +#: ../src/widgets/stroke-style.cpp:1197 +#, fuzzy +msgid "Set marker color" +msgstr "Установка цвета обводки" -#: ../share/extensions/color_negative.inx.h:1 -msgid "Negative" -msgstr "Негатив" +#: ../src/widgets/swatch-selector.cpp:137 +#, fuzzy +msgid "Change swatch color" +msgstr "Смена цвета опорной точки градиента" -#: ../share/extensions/color_randomize.inx.h:1 -#: ../share/extensions/render_alphabetsoup.inx.h:4 -msgid "Randomize" -msgstr "Случайные значения" +#: ../src/widgets/text-toolbar.cpp:169 +msgid "Text: Change font family" +msgstr "Текст: изменение гарнитуры" -#: ../share/extensions/color_randomize.inx.h:7 -msgid "" -"Converts to HSL, randomizes hue and/or saturation and/or lightness and " -"converts it back to RGB." -msgstr "" +#: ../src/widgets/text-toolbar.cpp:233 +msgid "Text: Change font size" +msgstr "Текст: изменение кегля" -#: ../share/extensions/color_removeblue.inx.h:1 -msgid "Remove Blue" -msgstr "Удалить синий компонент" +#: ../src/widgets/text-toolbar.cpp:271 +msgid "Text: Change font style" +msgstr "Текст: изменение начертания" -#: ../share/extensions/color_removegreen.inx.h:1 -msgid "Remove Green" -msgstr "Удалить зелёный компонент" +#: ../src/widgets/text-toolbar.cpp:349 +msgid "Text: Change superscript or subscript" +msgstr "Текст: переключение верхнего/нижнего индекса" -#: ../share/extensions/color_removered.inx.h:1 -msgid "Remove Red" -msgstr "Удалить красный компонент" +#: ../src/widgets/text-toolbar.cpp:494 +msgid "Text: Change alignment" +msgstr "Текст: изменение выключки" -#: ../share/extensions/color_replace.inx.h:1 -msgid "Replace color" -msgstr "Замена цвета" +#: ../src/widgets/text-toolbar.cpp:537 +msgid "Text: Change line-height" +msgstr "Текст: изменение интерлиньяжа" -#: ../share/extensions/color_replace.inx.h:2 -msgid "Replace color (RRGGBB hex):" -msgstr "Заменить цвет (RRGGBB hex):" +#: ../src/widgets/text-toolbar.cpp:586 +msgid "Text: Change word-spacing" +msgstr "Текст: изменение трекинга" -#: ../share/extensions/color_replace.inx.h:3 -msgid "Color to replace" -msgstr "Заменяемый цвет" +#: ../src/widgets/text-toolbar.cpp:627 +msgid "Text: Change letter-spacing" +msgstr "Текст: изменение кернинга" -#: ../share/extensions/color_replace.inx.h:4 -msgid "By color (RRGGBB hex):" -msgstr "На цвет (RRGGBB hex):" +#: ../src/widgets/text-toolbar.cpp:667 +msgid "Text: Change dx (kern)" +msgstr "Текст: изменение кернинга" -#: ../share/extensions/color_replace.inx.h:5 -msgid "New color" -msgstr "Новый цвет" +#: ../src/widgets/text-toolbar.cpp:701 +msgid "Text: Change dy" +msgstr "Текст: смещение от линии шрифта" -#: ../share/extensions/color_rgbbarrel.inx.h:1 -msgid "RGB Barrel" -msgstr "«Бочка» RGB (RGB->BGR->GRB->...)" +#: ../src/widgets/text-toolbar.cpp:736 +msgid "Text: Change rotate" +msgstr "Текст: вращение" -#: ../share/extensions/convert2dashes.inx.h:1 -msgid "Convert to Dashes" -msgstr "Преобразовать в пунктир" +#: ../src/widgets/text-toolbar.cpp:784 +msgid "Text: Change orientation" +msgstr "Текст: смена направления" -#: ../share/extensions/dhw_input.inx.h:1 -#, fuzzy -msgid "DHW file input" -msgstr "Импорт файлов Windows Metafile" +#: ../src/widgets/text-toolbar.cpp:1221 +msgid "Font Family" +msgstr "Гарнитура" -#: ../share/extensions/dhw_input.inx.h:2 -msgid "ACECAD Digimemo File (*.dhw)" -msgstr "" +#: ../src/widgets/text-toolbar.cpp:1222 +msgid "Select Font Family (Alt-X to access)" +msgstr "Выбрать гарнитуру (Alt+X)" -#: ../share/extensions/dhw_input.inx.h:3 -msgid "Open files from ACECAD Digimemo" +#. Focus widget +#. Enable entry completion +#: ../src/widgets/text-toolbar.cpp:1232 +msgid "Select all text with this font-family" msgstr "" -#: ../share/extensions/dia.inx.h:1 -msgid "Dia Input" -msgstr "Импорт файлов Dia" +#: ../src/widgets/text-toolbar.cpp:1236 +msgid "Font not found on system" +msgstr "Шрифт не найден в системе" -#: ../share/extensions/dia.inx.h:2 -msgid "" -"The dia2svg.sh script should be installed with your Inkscape distribution. " -"If you do not have it, there is likely to be something wrong with your " -"Inkscape installation." -msgstr "" -"Сценарий dia2svg.sh должен быть установлен вместе с Inkscape. Если его у вас " -"нет, значит что-то не так с вашей сборкой Inkscape." +#: ../src/widgets/text-toolbar.cpp:1295 +msgid "Font Style" +msgstr "Начертание" -#: ../share/extensions/dia.inx.h:3 -msgid "" -"In order to import Dia files, Dia itself must be installed. You can get Dia " -"at http://live.gnome.org/Dia" -msgstr "" -"Для импорта файлов Dia должна быть установлена сама программа Dia. Её можно " -"получить по адресу http://live.gnome.org/Dia" +#: ../src/widgets/text-toolbar.cpp:1296 +msgid "Font style" +msgstr "Начертание" -#: ../share/extensions/dia.inx.h:4 -msgid "Dia Diagram (*.dia)" -msgstr "Схемы Dia (*.dia)" +#. Name +#: ../src/widgets/text-toolbar.cpp:1313 +msgid "Toggle Superscript" +msgstr "Переключить верхний индекс" -#: ../share/extensions/dia.inx.h:5 -msgid "A diagram created with the program Dia" -msgstr "Схема, созданная в программе Dia" +#. Label +#: ../src/widgets/text-toolbar.cpp:1314 +msgid "Toggle superscript" +msgstr "Переключить верхний индекс" -#: ../share/extensions/dimension.inx.h:1 -msgid "Dimensions" -msgstr "Размеры" +#. Name +#: ../src/widgets/text-toolbar.cpp:1326 +msgid "Toggle Subscript" +msgstr "Переключить нижний индекс" -#: ../share/extensions/dimension.inx.h:2 -#, fuzzy -msgid "X Offset:" -msgstr "Смещение по X" +#. Label +#: ../src/widgets/text-toolbar.cpp:1327 +msgid "Toggle subscript" +msgstr "Переключить нижний индекс" -#: ../share/extensions/dimension.inx.h:3 -#, fuzzy -msgid "Y Offset:" -msgstr "Смещение по Y" +#: ../src/widgets/text-toolbar.cpp:1368 +msgid "Justify" +msgstr "Выключка по ширине" -#: ../share/extensions/dimension.inx.h:4 -#, fuzzy -msgid "Bounding box type :" -msgstr "Используемая площадка (BB):" +#. Name +#: ../src/widgets/text-toolbar.cpp:1375 +msgid "Alignment" +msgstr "Выключка" -#: ../share/extensions/dimension.inx.h:5 -#, fuzzy -msgid "Geometric" -msgstr "Геометрические фигуры" +#. Label +#: ../src/widgets/text-toolbar.cpp:1376 +msgid "Text alignment" +msgstr "Выключка текста" -#: ../share/extensions/dimension.inx.h:6 -#, fuzzy -msgid "Visual" -msgstr "Визуализация контура" +#: ../src/widgets/text-toolbar.cpp:1403 +msgid "Horizontal" +msgstr "По горизонтали" -#: ../share/extensions/dimension.inx.h:7 ../share/extensions/dots.inx.h:13 -#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:25 -msgid "Visualize Path" -msgstr "Визуализация контура" +#: ../src/widgets/text-toolbar.cpp:1410 +msgid "Vertical" +msgstr "По вертикали" -#: ../share/extensions/dots.inx.h:1 -msgid "Number Nodes" -msgstr "Нумерация узлов" +#. Label +#: ../src/widgets/text-toolbar.cpp:1417 +msgid "Text orientation" +msgstr "Направление текста" -#: ../share/extensions/dots.inx.h:4 -#, fuzzy -msgid "Dot size:" -msgstr "Размер точек" +#. Drop down menu +#: ../src/widgets/text-toolbar.cpp:1440 +msgid "Smaller spacing" +msgstr "Меньший интервал" -#: ../share/extensions/dots.inx.h:5 -#, fuzzy -msgid "Starting dot number:" -msgstr "Номер слайда" +#: ../src/widgets/text-toolbar.cpp:1440 ../src/widgets/text-toolbar.cpp:1471 +#: ../src/widgets/text-toolbar.cpp:1502 +msgctxt "Text tool" +msgid "Normal" +msgstr "Обычный" -#: ../share/extensions/dots.inx.h:6 -#, fuzzy -msgid "Step:" -msgstr "Шаги" +#: ../src/widgets/text-toolbar.cpp:1440 +msgid "Larger spacing" +msgstr "Больший интервал" -#: ../share/extensions/dots.inx.h:8 -msgid "" -"This extension replaces the selection's nodes with numbered dots according " -"to the following options:\n" -" * Font size: size of the node number labels (20px, 12pt...).\n" -" * Dot size: diameter of the dots placed at path nodes (10px, 2mm...).\n" -" * Starting dot number: first number in the sequence, assigned to the " -"first node of the path.\n" -" * Step: numbering step between two nodes." -msgstr "" +#. name +#: ../src/widgets/text-toolbar.cpp:1445 +msgid "Line Height" +msgstr "Высота строки" -#: ../share/extensions/draw_from_triangle.inx.h:1 -msgid "Draw From Triangle" -msgstr "Геометрия треугольника" +#. label +#: ../src/widgets/text-toolbar.cpp:1446 +msgid "Line:" +msgstr "Интерлиньяж:" -#: ../share/extensions/draw_from_triangle.inx.h:2 -msgid "Common Objects" -msgstr "Обычные объекты" +#. short label +#: ../src/widgets/text-toolbar.cpp:1447 +msgid "Spacing between lines (times font size)" +msgstr "Межстрочный интервал (кратный кеглю шрифта)" -#: ../share/extensions/draw_from_triangle.inx.h:3 -msgid "Circumcircle" -msgstr "Описанная окружность" +#. Drop down menu +#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502 +msgid "Negative spacing" +msgstr "Отрицательный интервал" -#: ../share/extensions/draw_from_triangle.inx.h:4 -msgid "Circumcentre" -msgstr "Центр описанной окружности" +#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502 +msgid "Positive spacing" +msgstr "Положительный интервал" -#: ../share/extensions/draw_from_triangle.inx.h:5 -msgid "Incircle" -msgstr "Вписанная окружность" +#. name +#: ../src/widgets/text-toolbar.cpp:1476 +msgid "Word spacing" +msgstr "Межсловный интервал" -#: ../share/extensions/draw_from_triangle.inx.h:6 -msgid "Incentre" -msgstr "Центр вписанной окружности" +#. label +#: ../src/widgets/text-toolbar.cpp:1477 +msgid "Word:" +msgstr "Трекинг:" -#: ../share/extensions/draw_from_triangle.inx.h:7 -msgid "Contact Triangle" -msgstr "Вписанный треугольник" +#. short label +#: ../src/widgets/text-toolbar.cpp:1478 +msgid "Spacing between words (px)" +msgstr "Межсловный интервал (px)" -#: ../share/extensions/draw_from_triangle.inx.h:8 -msgid "Excircles" -msgstr "Вневписанные окружности" +#. name +#: ../src/widgets/text-toolbar.cpp:1507 +msgid "Letter spacing" +msgstr "Межбувенный интервал" -#: ../share/extensions/draw_from_triangle.inx.h:9 -msgid "Excentres" -msgstr "Центры вневписанных окружностей" +#. label +#: ../src/widgets/text-toolbar.cpp:1508 +msgid "Letter:" +msgstr "Кернинг:" -#: ../share/extensions/draw_from_triangle.inx.h:10 -msgid "Extouch Triangle" -msgstr "Экскасательный треугольник" +#. short label +#: ../src/widgets/text-toolbar.cpp:1509 +msgid "Spacing between letters (px)" +msgstr "Межбуквенный интервал (px)" -#: ../share/extensions/draw_from_triangle.inx.h:11 -msgid "Excentral Triangle" -msgstr "Эксцентрический треугольник" +#. name +#: ../src/widgets/text-toolbar.cpp:1538 +msgid "Kerning" +msgstr "Кернинг" -#: ../share/extensions/draw_from_triangle.inx.h:12 -msgid "Orthocentre" -msgstr "Ортоцентр" +#. label +#: ../src/widgets/text-toolbar.cpp:1539 +msgid "Kern:" +msgstr "Керн.:" -#: ../share/extensions/draw_from_triangle.inx.h:13 -msgid "Orthic Triangle" -msgstr "Ортоцентрический треугольник" +#. short label +#: ../src/widgets/text-toolbar.cpp:1540 +msgid "Horizontal kerning (px)" +msgstr "Горизонтальный кернинг (px)" -#: ../share/extensions/draw_from_triangle.inx.h:14 -msgid "Altitudes" -msgstr "Угловые возвышения" +#. name +#: ../src/widgets/text-toolbar.cpp:1569 +msgid "Vertical Shift" +msgstr "Смещение от линии шрифта" -#: ../share/extensions/draw_from_triangle.inx.h:15 -msgid "Angle Bisectors" -msgstr "Угловые биссектрисы" +#. label +#: ../src/widgets/text-toolbar.cpp:1570 +msgid "Vert:" +msgstr "Верт.:" -#: ../share/extensions/draw_from_triangle.inx.h:16 -msgid "Centroid" -msgstr "Центроид" +#. short label +#: ../src/widgets/text-toolbar.cpp:1571 +msgid "Vertical shift (px)" +msgstr "Смещение от линии шрифта (px)" -#: ../share/extensions/draw_from_triangle.inx.h:17 -msgid "Nine-Point Centre" -msgstr "Центр окружности девяти точек" +#. name +#: ../src/widgets/text-toolbar.cpp:1600 +msgid "Letter rotation" +msgstr "Вращение символов" -#: ../share/extensions/draw_from_triangle.inx.h:18 -msgid "Nine-Point Circle" -msgstr "Окружность девяти точек" +#. label +#: ../src/widgets/text-toolbar.cpp:1601 +msgid "Rot:" +msgstr "Вращ.:" -#: ../share/extensions/draw_from_triangle.inx.h:19 -msgid "Symmedians" -msgstr "Симмедианы" +#. short label +#: ../src/widgets/text-toolbar.cpp:1602 +msgid "Character rotation (degrees)" +msgstr "Вращение символа (градусы)" -#: ../share/extensions/draw_from_triangle.inx.h:20 -msgid "Symmedian Point" -msgstr "Точка симмедианы" +#: ../src/widgets/toolbox.cpp:182 +msgid "Color/opacity used for color tweaking" +msgstr "Цвет/непрозрачность, используемые для коррекции цвета" -#: ../share/extensions/draw_from_triangle.inx.h:21 -msgid "Symmedial Triangle" -msgstr "Симмедиальный треугольник" +#: ../src/widgets/toolbox.cpp:190 +msgid "Style of new stars" +msgstr "Стиль новых звёзд" -#: ../share/extensions/draw_from_triangle.inx.h:22 -msgid "Gergonne Point" -msgstr "Точка Жергонна" +#: ../src/widgets/toolbox.cpp:192 +msgid "Style of new rectangles" +msgstr "Стиль новых прямоугольников" -#: ../share/extensions/draw_from_triangle.inx.h:23 -msgid "Nagel Point" -msgstr "Точка Нагеля" +#: ../src/widgets/toolbox.cpp:194 +msgid "Style of new 3D boxes" +msgstr "Стиль новых параллелепипедов" -#: ../share/extensions/draw_from_triangle.inx.h:24 -msgid "Custom Points and Options" -msgstr "Заказные точки и параметры" +#: ../src/widgets/toolbox.cpp:196 +msgid "Style of new ellipses" +msgstr "Стиль новых эллипсов" -#: ../share/extensions/draw_from_triangle.inx.h:25 -msgid "Custom Point Specified By:" -msgstr "Заказные точки, определённые:" +#: ../src/widgets/toolbox.cpp:198 +msgid "Style of new spirals" +msgstr "Стиль новых спиралей" -#: ../share/extensions/draw_from_triangle.inx.h:26 -#, fuzzy -msgid "Point At:" -msgstr "Указывает на:" +#: ../src/widgets/toolbox.cpp:200 +msgid "Style of new paths created by Pencil" +msgstr "Стиль новых контуров, созданных Карандашом" -#: ../share/extensions/draw_from_triangle.inx.h:27 -msgid "Draw Marker At This Point" -msgstr "Нарисовать маркер в этой точке" +#: ../src/widgets/toolbox.cpp:202 +msgid "Style of new paths created by Pen" +msgstr "Стиль новых контуров, созданных Пером" -#: ../share/extensions/draw_from_triangle.inx.h:28 -msgid "Draw Circle Around This Point" -msgstr "Нарисовать окружность вокруг этой точки" +#: ../src/widgets/toolbox.cpp:204 +msgid "Style of new calligraphic strokes" +msgstr "Стиль новых каллиграфических штрихов" -#: ../share/extensions/draw_from_triangle.inx.h:29 -#: ../share/extensions/wireframe_sphere.inx.h:6 -msgid "Radius (px):" -msgstr "Радиус (px):" +#: ../src/widgets/toolbox.cpp:206 ../src/widgets/toolbox.cpp:208 +msgid "TBD" +msgstr "k" -#: ../share/extensions/draw_from_triangle.inx.h:30 -msgid "Draw Isogonal Conjugate" -msgstr "Нарисовать изогональную сопряженную" +#: ../src/widgets/toolbox.cpp:220 +msgid "Style of Paint Bucket fill objects" +msgstr "Стиль заливки новых объектов, созданных инструментом заливки" -#: ../share/extensions/draw_from_triangle.inx.h:31 -msgid "Draw Isotomic Conjugate" -msgstr "Нарисовать изотомическую сопряженную" +#: ../src/widgets/toolbox.cpp:1682 +msgid "Bounding box" +msgstr "Площадка (BB)" -#: ../share/extensions/draw_from_triangle.inx.h:32 -msgid "Report this triangle's properties" -msgstr "Вывести свойства этого треугольника" +#: ../src/widgets/toolbox.cpp:1682 +msgid "Snap bounding boxes" +msgstr "Прилипать к углам площадок" -#: ../share/extensions/draw_from_triangle.inx.h:33 -msgid "Trilinear Coordinates" -msgstr "трилинейными координатами" +#: ../src/widgets/toolbox.cpp:1691 +msgid "Bounding box edges" +msgstr "Края площадок" -#: ../share/extensions/draw_from_triangle.inx.h:34 -msgid "Triangle Function" -msgstr "функцией треугольника" +#: ../src/widgets/toolbox.cpp:1691 +msgid "Snap to edges of a bounding box" +msgstr "Прилипать к краям площадки" -#: ../share/extensions/draw_from_triangle.inx.h:36 -msgid "" -"This extension draws constructions about a triangle defined by the first 3 " -"nodes of a selected path. You may select one of preset objects or create " -"your own ones.\n" -" \n" -"All units are the Inkscape's pixel unit. Angles are all in radians.\n" -"You can specify a point by trilinear coordinates or by a triangle centre " -"function.\n" -"Enter as functions of the side length or angles.\n" -"Trilinear elements should be separated by a colon: ':'.\n" -"Side lengths are represented as 's_a', 's_b' and 's_c'.\n" -"Angles corresponding to these are 'a_a', 'a_b', and 'a_c'.\n" -"You can also use the semi-perimeter and area of the triangle as constants. " -"Write 'area' or 'semiperim' for these.\n" -"\n" -"You can use any standard Python math function:\n" -"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" -"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" -"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" -"cos(x); sin(x); tan(x); degrees(x); radians(x); \n" -"cosh(x); sinh(x); tanh(x)\n" -"\n" -"Also available are the inverse trigonometric functions:\n" -"sec(x); csc(x); cot(x)\n" -"\n" -"You can specify the radius of a circle around a custom point using a " -"formula, which may also contain the side lengths, angles, etc. You can also " -"plot the isogonal and isotomic conjugate of the point. Be aware that this " -"may cause a divide-by-zero error for certain points.\n" -" " -msgstr "" -"Это расширение создаёт геометрические конструкции относительно треугольника, " -"определённого первыми тремя узлами выбранного контура. Вы можете выбрать " -"нужные из готовых конструкций или создать собственные.\n" -"\n" -"Единица измерения — пикселы Inkscape. Углы задаются в радианах.\n" -"\n" -"Вы можете указать точку при помощи трилинейных координат или функции центра " -"треугольника. В качестве функции указывайте длины сторон или углы.\n" -"Трилинейные элементы отделены двоеточием.\n" -"Длины сторон представлены как 's_a', 's_b' и 's_c'.\n" -"Соответствующие им углы — 'a_a', 'a_b' и 'a_c'.\n" -"В качестве констант вы можете использовать полупериметр и площадь " -"треугольника. Для этого напишите 'area' или 'semiperim'.\n" -"\n" -"Вы можете использовать стандартные математические функции Python:\n" -"\n" -"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" -"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" -"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" -"cos(x); sin(x); tan(x); degrees(x); radians(x); \n" -"cosh(x); sinh(x); tanh(x)\n" -"\n" -"Кроме того, доступны обратные тригонометрические функции: sec(x); csc(x); cot" -"(x)\n" -"\n" -"Вы можете указывать радиус окружности вокруг заказной точки при помощи " -"формулы, которая также может содержать длины сторон, углы и т.д. Вы также " -"можете строить изогональную и изотомическую сопряжённые точки. Помните о " -"том, что в случае с некоторыми точками это может привести к ошибке деления " -"на ноль.\n" -" " +#: ../src/widgets/toolbox.cpp:1700 +msgid "Bounding box corners" +msgstr "Углы площадок (BB)" -#: ../share/extensions/dxf_input.inx.h:1 -msgid "DXF Input" -msgstr "Импорт DXF" +#: ../src/widgets/toolbox.cpp:1700 +msgid "Snap bounding box corners" +msgstr "Прилипать к углам площадки" -#: ../share/extensions/dxf_input.inx.h:3 -msgid "Use automatic scaling to size A4" -msgstr "Автоматически масштабировать в A4" +#: ../src/widgets/toolbox.cpp:1709 +msgid "BBox Edge Midpoints" +msgstr "Средние точки сторон площадок" -#: ../share/extensions/dxf_input.inx.h:4 -#, fuzzy -msgid "Or, use manual scale factor:" -msgstr "Свой коэфф. масштабирования:" +#: ../src/widgets/toolbox.cpp:1709 +msgid "Snap midpoints of bounding box edges" +msgstr "Прилипать центрами краёв площадки" -#: ../share/extensions/dxf_input.inx.h:5 -msgid "Manual x-axis origin (mm):" -msgstr "" +#: ../src/widgets/toolbox.cpp:1719 +msgid "BBox Centers" +msgstr "Центры площадок" -#: ../share/extensions/dxf_input.inx.h:6 -msgid "Manual y-axis origin (mm):" -msgstr "" +#: ../src/widgets/toolbox.cpp:1719 +msgid "Snapping centers of bounding boxes" +msgstr "Прилипать центрами площадок" -#: ../share/extensions/dxf_input.inx.h:7 -msgid "Gcodetools compatible point import" -msgstr "" +#: ../src/widgets/toolbox.cpp:1728 +msgid "Snap nodes, paths, and handles" +msgstr "Прилипать к узлам, контурам и рычагами" -#: ../share/extensions/dxf_input.inx.h:8 -#: ../share/extensions/render_barcode_qrcode.inx.h:16 -#, fuzzy -msgid "Character encoding:" -msgstr "Кодировка символов:" +#: ../src/widgets/toolbox.cpp:1736 +msgid "Snap to paths" +msgstr "Прилипать к контурам" -#: ../share/extensions/dxf_input.inx.h:9 -#, fuzzy -msgid "Text Font:" -msgstr "Импорт текстовых файлов" +#: ../src/widgets/toolbox.cpp:1745 +msgid "Path intersections" +msgstr "Пересечения контуров" -#: ../share/extensions/dxf_input.inx.h:11 -#, fuzzy -msgid "" -"- AutoCAD Release 13 and newer.\n" -"- assume dxf drawing is in mm.\n" -"- assume svg drawing is in pixels, at 90 dpi.\n" -"- scale factor and origin apply only to manual scaling.\n" -"- layers are preserved only on File->Open, not Import.\n" -"- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed." -msgstr "" -"• поддерживаются файлы AutoCAD R3 и новее\n" -"• предполагается, что единица измерения — мм\n" -"• предполагается, что рисунок SVG — в пикселах с разрешением 90 dpi\n" -"• слои сохраняются только при открытии, а не импорте\n" -"• ограниченная поддержка BLOCKS, при необходимости используйте AutoCAD " -"Explode Blocks." +#: ../src/widgets/toolbox.cpp:1745 +msgid "Snap to path intersections" +msgstr "Прилипать к пересечениям контуров" + +#: ../src/widgets/toolbox.cpp:1754 +msgid "To nodes" +msgstr "К узлам" -#: ../share/extensions/dxf_input.inx.h:17 -msgid "AutoCAD DXF R13 (*.dxf)" -msgstr "AutoCAD DXF R13 (*.dxf)" +#: ../src/widgets/toolbox.cpp:1754 +msgid "Snap cusp nodes, incl. rectangle corners" +msgstr "Прилипать острыми узлами, включая углы прямоугольников" -#: ../share/extensions/dxf_input.inx.h:18 -msgid "Import AutoCAD's Document Exchange Format" -msgstr "Импорт файлов формата AutoCAD's Document Exchange Format" +#: ../src/widgets/toolbox.cpp:1763 +msgid "Smooth nodes" +msgstr "Сглаженные узлы" -#: ../share/extensions/dxf_outlines.inx.h:1 -msgid "Desktop Cutting Plotter" -msgstr "Настольный плоттер" +#: ../src/widgets/toolbox.cpp:1763 +msgid "Snap smooth nodes, incl. quadrant points of ellipses" +msgstr "Прилипать сглаженными узлами, включая точки квадрантов эллипсов" -#: ../share/extensions/dxf_outlines.inx.h:3 -msgid "use ROBO-Master type of spline output" -msgstr "Использовать тип кривой ROBO-Master на выводе" +#: ../src/widgets/toolbox.cpp:1772 +msgid "Line Midpoints" +msgstr "Средние точки линий" -#: ../share/extensions/dxf_outlines.inx.h:4 -msgid "use LWPOLYLINE type of line output" -msgstr "Использовать тип линии LWPOLYLINE на выводе" +#: ../src/widgets/toolbox.cpp:1772 +msgid "Snap midpoints of line segments" +msgstr "Прилипать средними точками сегментов линий" -#: ../share/extensions/dxf_outlines.inx.h:5 -msgid "Base unit" +#: ../src/widgets/toolbox.cpp:1781 +msgid "Others" +msgstr "Прочее" + +#: ../src/widgets/toolbox.cpp:1781 +msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "" +"Прилипать остальными точками (центрами, нулевыми точками направляющих, " +"рычагами градиента и пр.)" -#: ../share/extensions/dxf_outlines.inx.h:6 -msgid "Character Encoding" -msgstr "Кодировка символов:" +#: ../src/widgets/toolbox.cpp:1789 +msgid "Object Centers" +msgstr "Центры объектов" -#: ../share/extensions/dxf_outlines.inx.h:7 -#, fuzzy -msgid "Layer export selection" -msgstr "Удалить выделение" +#: ../src/widgets/toolbox.cpp:1789 +msgid "Snap centers of objects" +msgstr "Прилипать центрами объектов" -#: ../share/extensions/dxf_outlines.inx.h:8 -#, fuzzy -msgid "Layer match name" -msgstr "Имя слоя:" +#: ../src/widgets/toolbox.cpp:1798 +msgid "Rotation Centers" +msgstr "Центры вращения" -#: ../share/extensions/dxf_outlines.inx.h:9 -msgid "pt" -msgstr "pt" +#: ../src/widgets/toolbox.cpp:1798 +msgid "Snap an item's rotation center" +msgstr "Прилипать центром вращения" -#: ../share/extensions/dxf_outlines.inx.h:10 -msgid "pc" -msgstr "pc" +#: ../src/widgets/toolbox.cpp:1807 +msgid "Text baseline" +msgstr "Линия шрифта текста" -#: ../share/extensions/dxf_outlines.inx.h:11 -#: ../share/extensions/render_gears.inx.h:7 -msgid "px" -msgstr "px" +#: ../src/widgets/toolbox.cpp:1807 +#, fuzzy +msgid "Snap text anchors and baselines" +msgstr "Выравнивание линий шрифта текста" -#: ../share/extensions/dxf_outlines.inx.h:12 -#: ../share/extensions/gcodetools_area.inx.h:46 -#: ../share/extensions/gcodetools_dxf_points.inx.h:18 -#: ../share/extensions/gcodetools_engraving.inx.h:24 -#: ../share/extensions/gcodetools_graffiti.inx.h:18 -#: ../share/extensions/gcodetools_lathe.inx.h:39 -#: ../share/extensions/gcodetools_orientation_points.inx.h:11 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:28 -#: ../share/extensions/render_gears.inx.h:9 -msgid "mm" -msgstr "mm" +#: ../src/widgets/toolbox.cpp:1817 +msgid "Page border" +msgstr "Кайма холста" -#: ../share/extensions/dxf_outlines.inx.h:13 -msgid "cm" -msgstr "cm" +#: ../src/widgets/toolbox.cpp:1817 +msgid "Snap to the page border" +msgstr "Прилипать к краю страницы" -#: ../share/extensions/dxf_outlines.inx.h:14 -msgid "m" -msgstr "m" +#: ../src/widgets/toolbox.cpp:1826 +msgid "Snap to grids" +msgstr "Прилипать к сеткам" -#: ../share/extensions/dxf_outlines.inx.h:15 -#: ../share/extensions/gcodetools_area.inx.h:47 -#: ../share/extensions/gcodetools_dxf_points.inx.h:19 -#: ../share/extensions/gcodetools_engraving.inx.h:25 -#: ../share/extensions/gcodetools_graffiti.inx.h:19 -#: ../share/extensions/gcodetools_lathe.inx.h:40 -#: ../share/extensions/gcodetools_orientation_points.inx.h:12 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:29 -#: ../share/extensions/render_gears.inx.h:8 -msgid "in" -msgstr "in" +#: ../src/widgets/toolbox.cpp:1835 +msgid "Snap guides" +msgstr "Прилипать направляющими" -#: ../share/extensions/dxf_outlines.inx.h:16 -msgid "ft" -msgstr "ft" +#. Width +#: ../src/widgets/tweak-toolbar.cpp:125 +msgid "(pinch tweak)" +msgstr "(узкая кисть)" -#: ../share/extensions/dxf_outlines.inx.h:17 -#, fuzzy -msgid "Latin 1" -msgstr "Латиница" +#: ../src/widgets/tweak-toolbar.cpp:125 +msgid "(broad tweak)" +msgstr "(широкая кисть)" -#: ../share/extensions/dxf_outlines.inx.h:18 -msgid "CP 1250" -msgstr "" +#: ../src/widgets/tweak-toolbar.cpp:128 +msgid "The width of the tweak area (relative to the visible canvas area)" +msgstr "Ширина области коррекции (относительно видимой области холста)" -#: ../share/extensions/dxf_outlines.inx.h:19 -msgid "CP 1252" -msgstr "" +#. Force +#: ../src/widgets/tweak-toolbar.cpp:142 +msgid "(minimum force)" +msgstr "(минимальная)" -#: ../share/extensions/dxf_outlines.inx.h:20 -msgid "UTF 8" -msgstr "" +#: ../src/widgets/tweak-toolbar.cpp:142 +msgid "(maximum force)" +msgstr "(максимальная)" -#: ../share/extensions/dxf_outlines.inx.h:21 -#, fuzzy -msgid "All (default)" -msgstr "(по умолчанию)" +#: ../src/widgets/tweak-toolbar.cpp:145 +msgid "Force" +msgstr "Сила" -#: ../share/extensions/dxf_outlines.inx.h:22 -#, fuzzy -msgid "Visible only" -msgstr "Видимые цвета" +#: ../src/widgets/tweak-toolbar.cpp:145 +msgid "Force:" +msgstr "Сила:" -#: ../share/extensions/dxf_outlines.inx.h:23 -msgid "By name match" -msgstr "" +#: ../src/widgets/tweak-toolbar.cpp:145 +msgid "The force of the tweak action" +msgstr "Сила действия инструмента коррекции" -#: ../share/extensions/dxf_outlines.inx.h:25 -#, fuzzy -msgid "" -"- AutoCAD Release 14 DXF format.\n" -"- The base unit parameter specifies in what unit the coordinates are output " -"(90 px = 1 in).\n" -"- Supported element types\n" -" - paths (lines and splines)\n" -" - rectangles\n" -" - clones (the crossreference to the original is lost)\n" -"- ROBO-Master spline output is a specialized spline readable only by ROBO-" -"Master and AutoDesk viewers, not Inkscape.\n" -"- LWPOLYLINE output is a multiply-connected polyline, disable it to use a " -"legacy version of the LINE output.\n" -"- You can choose to export all layers, only visible ones or by name match " -"(case insensitive and use comma ',' as separator)" -msgstr "" -"• поддерживается формат AutoCAD Release 13\n" -"• считается, что рисунок SVG в пикселах, 90dpi\n" -"• считается, что рисунок DXF в миллиметрах\n" -"• поддерживаются только линии и кривые\n" -"• на выводе для ROBO-Master создаётся кривая,\n" -" читаемая только просмотрщиками ROBO-Master\n" -" и AutoDesk, но не Inkscape.\n" -"• вывод LWPOLYLINE создаёт полилинию, отключите,\n" -" чтобы использовать устаревший тип линии." +#: ../src/widgets/tweak-toolbar.cpp:163 +msgid "Move mode" +msgstr "Перемещение объектов" -#: ../share/extensions/dxf_outlines.inx.h:34 -#, fuzzy -msgid "Desktop Cutting Plotter (AutoCAD DXF R14) (*.dxf)" -msgstr "Файлы для настольных плоттеров (R13) (*.dxf)" +#: ../src/widgets/tweak-toolbar.cpp:164 +msgid "Move objects in any direction" +msgstr "Перемещать объекты в любом направлении" -#: ../share/extensions/dxf_output.inx.h:1 -msgid "DXF Output" -msgstr "Экспорт в DXF" +#: ../src/widgets/tweak-toolbar.cpp:170 +msgid "Move in/out mode" +msgstr "Приближение и отталкивание объектов" -#: ../share/extensions/dxf_output.inx.h:2 -msgid "pstoedit must be installed to run; see http://www.pstoedit.net/pstoedit" +#: ../src/widgets/tweak-toolbar.cpp:171 +msgid "Move objects towards cursor; with Shift from cursor" msgstr "" -"Должна быть установлена программа pstoedit, см. http://www.pstoedit.net/" -"pstoedit" - -#: ../share/extensions/dxf_output.inx.h:3 -msgid "AutoCAD DXF R12 (*.dxf)" -msgstr "AutoCAD DXF R12 (*.dxf)" - -#: ../share/extensions/dxf_output.inx.h:4 -msgid "DXF file written by pstoedit" -msgstr "Файлы DXF можно сохранить при помощи pstoedit" +"Перемещать объекты по направлению к курсору, с Shift — в направлении от " +"курсора" -#: ../share/extensions/edge3d.inx.h:1 -msgid "Edge 3D" -msgstr "Объёмные края" +#: ../src/widgets/tweak-toolbar.cpp:177 +msgid "Move jitter mode" +msgstr "Случайное перемещение объектов" -#: ../share/extensions/edge3d.inx.h:2 -#, fuzzy -msgid "Illumination Angle:" -msgstr "Угол освещения" +#: ../src/widgets/tweak-toolbar.cpp:178 +msgid "Move objects in random directions" +msgstr "Перемещать объекты в случайных направлениях" -#: ../share/extensions/edge3d.inx.h:3 -#, fuzzy -msgid "Shades:" -msgstr "Тени" +#: ../src/widgets/tweak-toolbar.cpp:184 +msgid "Scale mode" +msgstr "Масштабирование объектов" -#: ../share/extensions/edge3d.inx.h:4 -#, fuzzy -msgid "Only black and white:" -msgstr "Только ч/б" +#: ../src/widgets/tweak-toolbar.cpp:185 +msgid "Shrink objects, with Shift enlarge" +msgstr "Уменьшать объекты, с Shift — увеличивать" -#: ../share/extensions/edge3d.inx.h:5 -#, fuzzy -msgid "Stroke width:" -msgstr "Прибавить толщину обводки" +#: ../src/widgets/tweak-toolbar.cpp:191 +msgid "Rotate mode" +msgstr "Вращение объектов" -#: ../share/extensions/edge3d.inx.h:6 -#, fuzzy -msgid "Blur stdDeviation:" -msgstr "Стд. отклонение размывания" +#: ../src/widgets/tweak-toolbar.cpp:192 +msgid "Rotate objects, with Shift counterclockwise" +msgstr "Вращать объекты, с Shift — против часовой стрелки" -#: ../share/extensions/edge3d.inx.h:7 -#, fuzzy -msgid "Blur width:" -msgstr "Ширина размывания" +#: ../src/widgets/tweak-toolbar.cpp:198 +msgid "Duplicate/delete mode" +msgstr "Дублирование и удаление объектов" -#: ../share/extensions/edge3d.inx.h:8 -#, fuzzy -msgid "Blur height:" -msgstr "Высота размывания:" +#: ../src/widgets/tweak-toolbar.cpp:199 +msgid "Duplicate objects, with Shift delete" +msgstr "Дублировать объекты, с Shift — удалять" -#: ../share/extensions/embedimage.inx.h:1 -msgid "Embed Images" -msgstr "Встроить все растровые изображения" +#: ../src/widgets/tweak-toolbar.cpp:205 +msgid "Push mode" +msgstr "Толкание контуров" -#: ../share/extensions/embedimage.inx.h:2 -#: ../share/extensions/embedselectedimages.inx.h:2 -msgid "Embed only selected images" -msgstr "Встроить только выбранные растровые файлы" +#: ../src/widgets/tweak-toolbar.cpp:206 +msgid "Push parts of paths in any direction" +msgstr "Выталкивать части контуров" -#: ../share/extensions/embedselectedimages.inx.h:1 -#, fuzzy -msgid "Embed Selected Images" -msgstr "Встроить только выбранные растровые файлы" +#: ../src/widgets/tweak-toolbar.cpp:212 +msgid "Shrink/grow mode" +msgstr "Сокращение и наращивание объема контуров" -#: ../share/extensions/empty_page.inx.h:1 -msgid "Empty Page" +#: ../src/widgets/tweak-toolbar.cpp:213 +msgid "Shrink (inset) parts of paths; with Shift grow (outset)" msgstr "" +"Сокращать объем контуров (втягивать их), с Shift — наращивать его (раздувать " +"контуры)" -#: ../share/extensions/empty_page.inx.h:2 -#, fuzzy -msgid "Page size:" -msgstr "_Размер:" +#: ../src/widgets/tweak-toolbar.cpp:219 +msgid "Attract/repel mode" +msgstr "Притяжение и отталкивание контуров" -#: ../share/extensions/empty_page.inx.h:3 -msgid "Page orientation:" -msgstr "Ориентация холста:" +#: ../src/widgets/tweak-toolbar.cpp:220 +msgid "Attract parts of paths towards cursor; with Shift from cursor" +msgstr "" +"Притягивать части контуров к курсору; с Shift — отталкивать их от курсора" -#: ../share/extensions/eps_input.inx.h:1 -msgid "EPS Input" -msgstr "Импорт файлов EPS" +#: ../src/widgets/tweak-toolbar.cpp:226 +msgid "Roughen mode" +msgstr "Огрубление контуров" -#: ../share/extensions/eqtexsvg.inx.h:1 -#, fuzzy -msgid "LaTeX" -msgstr "Печать в LaTeX" +#: ../src/widgets/tweak-toolbar.cpp:227 +msgid "Roughen parts of paths" +msgstr "Огрублять части контуров, рисовать заусенцы" -#: ../share/extensions/eqtexsvg.inx.h:2 -#, fuzzy -msgid "LaTeX input: " -msgstr "Печать в LaTeX" +#: ../src/widgets/tweak-toolbar.cpp:233 +msgid "Color paint mode" +msgstr "Раскрашивание объектов" -#: ../share/extensions/eqtexsvg.inx.h:3 -msgid "Additional packages (comma-separated): " -msgstr "Дополнительные пакеты (через запятую): " +#: ../src/widgets/tweak-toolbar.cpp:234 +msgid "Paint the tool's color upon selected objects" +msgstr "Рисовать цветом инструмента по выбранным объектам" -#: ../share/extensions/export_gimp_palette.inx.h:1 -msgid "Export as GIMP Palette" -msgstr "Экспортировать как палитру GIMP" +#: ../src/widgets/tweak-toolbar.cpp:240 +msgid "Color jitter mode" +msgstr "Перебор цветов для объектов" -#: ../share/extensions/export_gimp_palette.inx.h:2 -msgid "GIMP Palette (*.gpl)" -msgstr "Палитры GIMP (*.gpl)" +#: ../src/widgets/tweak-toolbar.cpp:241 +msgid "Jitter the colors of selected objects" +msgstr "Перебирать цвета выделенных объектов" -#: ../share/extensions/export_gimp_palette.inx.h:3 -msgid "Exports the colors of this document as GIMP Palette" -msgstr "Экспортировать цвета документа как файл палитры GIMP" +#: ../src/widgets/tweak-toolbar.cpp:247 +msgid "Blur mode" +msgstr "Размывание" -#: ../share/extensions/extractimage.inx.h:1 -msgid "Extract Image" -msgstr "Извлечь растровое изображение" +#: ../src/widgets/tweak-toolbar.cpp:248 +msgid "Blur selected objects more; with Shift, blur less" +msgstr "Размывать объекты, с Shift — уменьшать размытость" -#: ../share/extensions/extractimage.inx.h:2 -msgid "Path to save image:" -msgstr "Путь для сохраняемого изображения:" +#: ../src/widgets/tweak-toolbar.cpp:275 +msgid "Channels:" +msgstr "Каналы:" -#: ../share/extensions/extractimage.inx.h:3 -msgid "" -"* Don't type the file extension, it is appended automatically.\n" -"* A relative path (or a filename without path) is relative to the user's " -"home directory." -msgstr "" -"· не указывайте расширение сами, оно будет автоматически подставлено\n" -"· относительный путь считается от корня пользовательского каталога" +#: ../src/widgets/tweak-toolbar.cpp:287 +msgid "In color mode, act on objects' hue" +msgstr "В режиме изменения цвета влиять на тон объектов" -#: ../share/extensions/extrude.inx.h:3 -msgid "Lines" -msgstr "Линии" +#. TRANSLATORS: "H" here stands for hue +#: ../src/widgets/tweak-toolbar.cpp:291 +msgid "H" +msgstr "H" -#: ../share/extensions/extrude.inx.h:4 -msgid "Polygons" -msgstr "Многоугольники" +#: ../src/widgets/tweak-toolbar.cpp:303 +msgid "In color mode, act on objects' saturation" +msgstr "В режиме изменения цвета влиять на насыщенность объектов" -#: ../share/extensions/fig_input.inx.h:1 -msgid "XFIG Input" -msgstr "Импорт XFIG" +#. TRANSLATORS: "S" here stands for Saturation +#: ../src/widgets/tweak-toolbar.cpp:307 +msgid "S" +msgstr "S" -#: ../share/extensions/fig_input.inx.h:2 -msgid "XFIG Graphics File (*.fig)" -msgstr "Файл XFIG (*.fig)" +#: ../src/widgets/tweak-toolbar.cpp:319 +msgid "In color mode, act on objects' lightness" +msgstr "В режиме изменения цвета влиять на яркость объектов" -#: ../share/extensions/fig_input.inx.h:3 -msgid "Open files saved with XFIG" -msgstr "Открыть файлы, сохранённые в XFIG" +#. TRANSLATORS: "L" here stands for Lightness +#: ../src/widgets/tweak-toolbar.cpp:323 +msgid "L" +msgstr "L" -#: ../share/extensions/flatten.inx.h:1 -msgid "Flatten Beziers" -msgstr "Сглаживание кривой Безье" +#: ../src/widgets/tweak-toolbar.cpp:335 +msgid "In color mode, act on objects' opacity" +msgstr "В режиме изменения цвета влиять на непрозрачность объектов" -#: ../share/extensions/flatten.inx.h:2 -#, fuzzy -msgid "Flatness:" -msgstr "Гладкость" +#. TRANSLATORS: "O" here stands for Opacity +#: ../src/widgets/tweak-toolbar.cpp:339 +msgid "O" +msgstr "O" -#: ../share/extensions/foldablebox.inx.h:1 -msgid "Foldable Box" -msgstr "Макет коробки" +#. Fidelity +#: ../src/widgets/tweak-toolbar.cpp:350 +msgid "(rough, simplified)" +msgstr "(грубо, упрощённо)" -#: ../share/extensions/foldablebox.inx.h:4 -#, fuzzy -msgid "Depth:" -msgstr "Глубина:" +#: ../src/widgets/tweak-toolbar.cpp:350 +msgid "(fine, but many nodes)" +msgstr "(точно, но много узлов)" -#: ../share/extensions/foldablebox.inx.h:5 -#, fuzzy -msgid "Paper Thickness:" -msgstr "Толщина бумаги:" +#: ../src/widgets/tweak-toolbar.cpp:353 +msgid "Fidelity" +msgstr "Точность" -#: ../share/extensions/foldablebox.inx.h:6 -#, fuzzy -msgid "Tab Proportion:" -msgstr "Вкладка" +#: ../src/widgets/tweak-toolbar.cpp:353 +msgid "Fidelity:" +msgstr "Точность:" -#: ../share/extensions/foldablebox.inx.h:8 -msgid "Add Guide Lines" -msgstr "Добавить направляющие" +#: ../src/widgets/tweak-toolbar.cpp:354 +msgid "" +"Low fidelity simplifies paths; high fidelity preserves path features but may " +"generate a lot of new nodes" +msgstr "" +"Низкая точность упрощает контуры; высокая точность сохраняет общую форму " +"неизменной части контура, но добавляет новые узлы" -#: ../share/extensions/fractalize.inx.h:1 -msgid "Fractalize" -msgstr "Фрактализация" +#: ../src/widgets/tweak-toolbar.cpp:373 +msgid "Use the pressure of the input device to alter the force of tweak action" +msgstr "Нажим устройства ввода изменяет силу корректирующего действия" -#: ../share/extensions/fractalize.inx.h:2 +#: ../share/extensions/convert2dashes.py:93 #, fuzzy -msgid "Subdivisions:" -msgstr "Подразделений:" +msgid "" +"The selected object is not a path.\n" +"Try using the procedure Path->Object to Path." +msgstr "" +"Первый выделенный объект не является контуром.\n" +"Попробуйте выполнить команду »Контур > Оконтурить объект»." -#: ../share/extensions/funcplot.inx.h:1 -msgid "Function Plotter" -msgstr "Построитель графиков" +#: ../share/extensions/dimension.py:109 +msgid "Please select an object." +msgstr "Выберите объект." -#: ../share/extensions/funcplot.inx.h:2 -msgid "Range and sampling" -msgstr "Диапазон и выборка" +#: ../share/extensions/dimension.py:134 +msgid "Unable to process this object. Try changing it into a path first." +msgstr "Невозможно обработать этот объект. Попробуйте сначала оконтурить его." -#: ../share/extensions/funcplot.inx.h:3 +#. report to the Inkscape console using errormsg +#: ../share/extensions/draw_from_triangle.py:180 #, fuzzy -msgid "Start X value:" -msgstr "Начальное значение по оси X:" +msgid "Side Length 'a' (px): " +msgstr "Длина стороны a, в пикселах:" -#: ../share/extensions/funcplot.inx.h:4 +#: ../share/extensions/draw_from_triangle.py:181 #, fuzzy -msgid "End X value:" -msgstr "Конечное значение по оси X" +msgid "Side Length 'b' (px): " +msgstr "Длина стороны b, в пикселах:" -#: ../share/extensions/funcplot.inx.h:5 -msgid "Multiply X range by 2*pi" -msgstr "Умножить диапазон X на 2*pi" +#: ../share/extensions/draw_from_triangle.py:182 +#, fuzzy +msgid "Side Length 'c' (px): " +msgstr "Длина стороны c, в пикселах:" -#: ../share/extensions/funcplot.inx.h:6 +#: ../share/extensions/draw_from_triangle.py:183 #, fuzzy -msgid "Y value of rectangle's bottom:" -msgstr "Координата низа прямоугольника по оси Y:" +msgid "Angle 'A' (radians): " +msgstr "Угол A в радианах:" -#: ../share/extensions/funcplot.inx.h:7 +#: ../share/extensions/draw_from_triangle.py:184 #, fuzzy -msgid "Y value of rectangle's top:" -msgstr "Координата верха прямоугольника по оси Y:" +msgid "Angle 'B' (radians): " +msgstr "Угол B в радианах:" -#: ../share/extensions/funcplot.inx.h:8 +#: ../share/extensions/draw_from_triangle.py:185 #, fuzzy -msgid "Number of samples:" -msgstr "Количество шагов:" +msgid "Angle 'C' (radians): " +msgstr "Угол С в радианах:" -#: ../share/extensions/funcplot.inx.h:9 -#: ../share/extensions/param_curves.inx.h:11 -msgid "Isotropic scaling" +#: ../share/extensions/draw_from_triangle.py:186 +msgid "Semiperimeter (px): " +msgstr "Полупериметр (px):" + +#: ../share/extensions/draw_from_triangle.py:187 +msgid "Area (px^2): " +msgstr "Площадь (px^2):" + +#: ../share/extensions/dxf_input.py:504 +#, python-format +msgid "" +"%d ENTITIES of type POLYLINE encountered and ignored. Please try to convert " +"to Release 13 format using QCad." msgstr "" -#: ../share/extensions/funcplot.inx.h:10 -msgid "Use polar coordinates" -msgstr "Использовать полярные координаты" +#: ../share/extensions/dxf_outlines.py:49 +msgid "" +"Failed to import the numpy or numpy.linalg modules. These modules are " +"required by this extension. Please install them and try again." +msgstr "" +"Не удалось импортировать модуль numpy или numpy.linalg, необходимые для " +"этого расширения. Установите их и попробуйте еще раз." -#: ../share/extensions/funcplot.inx.h:11 -#: ../share/extensions/param_curves.inx.h:12 -#, fuzzy +#: ../share/extensions/dxf_outlines.py:300 msgid "" -"When set, Isotropic scaling uses smallest of width/xrange or height/yrange" -msgstr "Изотропическое масштабирование" +"Error: Field 'Layer match name' must be filled when using 'By name match' " +"option" +msgstr "" -#: ../share/extensions/funcplot.inx.h:12 -#: ../share/extensions/param_curves.inx.h:13 -msgid "Use" -msgstr "Как использовать" +#: ../share/extensions/dxf_outlines.py:341 +#, fuzzy, python-format +msgid "Warning: Layer '%s' not found!" +msgstr "Слой на передний план" -#: ../share/extensions/funcplot.inx.h:13 -#, fuzzy +#: ../share/extensions/embedimage.py:84 msgid "" -"Select a rectangle before calling the extension,\n" -"it will determine X and Y scales. If you wish to fill the area, then add x-" -"axis endpoints.\n" -"\n" -"With polar coordinates:\n" -" Start and end X values define the angle range in radians.\n" -" X scale is set so that left and right edges of rectangle are at +/-1.\n" -" Isotropic scaling is disabled.\n" -" First derivative is always determined numerically." +"No xlink:href or sodipodi:absref attributes found, or they do not point to " +"an existing file! Unable to embed image." msgstr "" -"Перед вызовом эффекта выделите прямоугольник,\n" -"который определит масштаб по X и Y.\n" -"\n" -"С полярными координатами:\n" -" Значения по X для начала и конца определяют диапазон\n" -" угла в радианах. Масштаб X установлен так, что левые и\n" -" правые края прямоугольника находятся в +/-1.\n" -" Изотропное масштабирование отключено.\n" -" Первое производное всегда задается числами." +"Атрибуты xlink:href и sodipodi:absref не найдены, либо указывают на " +"несуществующий файл! Внедрить изображение невозможно." -#: ../share/extensions/funcplot.inx.h:21 -#: ../share/extensions/param_curves.inx.h:16 -msgid "Functions" -msgstr "Функции" +#: ../share/extensions/embedimage.py:86 +#, python-format +msgid "Sorry we could not locate %s" +msgstr "Извините, найти %s не удалось" -#: ../share/extensions/funcplot.inx.h:22 -#: ../share/extensions/param_curves.inx.h:17 +#: ../share/extensions/embedimage.py:111 +#, python-format msgid "" -"Standard Python math functions are available:\n" -"\n" -"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" -"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" -"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" -"cos(x); sin(x); tan(x); degrees(x); radians(x); \n" -"cosh(x); sinh(x); tanh(x).\n" -"\n" -"The constants pi and e are also available." +"%s is not of type image/png, image/jpeg, image/bmp, image/gif, image/tiff, " +"or image/x-icon" msgstr "" -"Возможно использование следующих типовых\n" -"математических функций Python:\n" -"\n" -"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" -"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" -"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" -"cos(x); sin(x); tan(x); degrees(x); radians(x); \n" -"cosh(x); sinh(x); tanh(x).\n" -"\n" -"Также возможно использование констант pi и e." +"%s не является image/png, image/jpeg, image/bmp, image/gif, image/tiff или " +"image/x-icon" -#: ../share/extensions/funcplot.inx.h:31 -#, fuzzy -msgid "Function:" -msgstr "Функция" +#: ../share/extensions/export_gimp_palette.py:16 +msgid "" +"The export_gpl.py module requires PyXML. Please download the latest version " +"from http://pyxml.sourceforge.net/." +msgstr "" +"Расширению export_gpl.py нужен PyXML. Скачайте свежую версию с http://pyxml." +"sourceforge.net/." -#: ../share/extensions/funcplot.inx.h:32 -msgid "Calculate first derivative numerically" -msgstr "Рассчитать первую производную в цифрах" +#: ../share/extensions/extractimage.py:68 +#, python-format +msgid "Image extracted to: %s" +msgstr "Изображение извлечено в: %s" -#: ../share/extensions/funcplot.inx.h:33 -#, fuzzy -msgid "First derivative:" -msgstr "Первая производная" +#: ../share/extensions/extractimage.py:75 +msgid "Unable to find image data." +msgstr "Не удалось найти растровые данные." -#: ../share/extensions/funcplot.inx.h:34 +#: ../share/extensions/extrude.py:43 #, fuzzy -msgid "Clip with rectangle" -msgstr "Ширина прямоугольника" +msgid "Need at least 2 paths selected" +msgstr "Ничего не выбрано" -#: ../share/extensions/funcplot.inx.h:35 -#: ../share/extensions/param_curves.inx.h:28 -msgid "Remove rectangle" -msgstr "Удалить прямоугольник" +#: ../share/extensions/funcplot.py:48 +msgid "x-interval cannot be zero. Please modify 'Start X' or 'End X'" +msgstr "" -#: ../share/extensions/funcplot.inx.h:36 -#: ../share/extensions/param_curves.inx.h:29 -msgid "Draw Axes" -msgstr "Нарисовать оси" +#: ../share/extensions/funcplot.py:60 +msgid "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'" +msgstr "" -#: ../share/extensions/funcplot.inx.h:37 -msgid "Add x-axis endpoints" +#: ../share/extensions/funcplot.py:315 +#, fuzzy +msgid "Please select a rectangle" +msgstr "Выберите объект." + +#: ../share/extensions/gcodetools.py:3321 +#: ../share/extensions/gcodetools.py:4526 +#: ../share/extensions/gcodetools.py:4699 +#: ../share/extensions/gcodetools.py:6232 +#: ../share/extensions/gcodetools.py:6427 +msgid "No paths are selected! Trying to work on all available paths." msgstr "" -#: ../share/extensions/gcodetools_about.inx.h:1 -msgid "About" +#: ../share/extensions/gcodetools.py:3324 +msgid "Noting is selected. Please select something." msgstr "" -#: ../share/extensions/gcodetools_about.inx.h:2 +#: ../share/extensions/gcodetools.py:3864 +#, fuzzy msgid "" -"Gcodetools was developed to make simple Gcode from Inkscape's paths. Gcode " -"is a special format which is used in most of CNC machines. So Gcodetools " -"allows you to use Inkscape as CAM program. It can be use with a lot of " -"machine types: Mills Lathes Laser and Plasma cutters and engravers Mill " -"engravers Plotters etc. To get more info visit developers page at http://www." -"cnc-club.ru/gcodetools" +"Directory does not exist! Please specify existing directory at Preferences " +"tab!" +msgstr "Каталог %s не существует, либо это не каталог.\n" + +#: ../share/extensions/gcodetools.py:3894 +#, python-format +msgid "" +"Can not write to specified file!\n" +"%s" msgstr "" -#: ../share/extensions/gcodetools_about.inx.h:4 -#: ../share/extensions/gcodetools_area.inx.h:54 -#: ../share/extensions/gcodetools_check_for_updates.inx.h:4 -#: ../share/extensions/gcodetools_dxf_points.inx.h:26 -#: ../share/extensions/gcodetools_engraving.inx.h:32 -#: ../share/extensions/gcodetools_graffiti.inx.h:43 -#: ../share/extensions/gcodetools_lathe.inx.h:47 -#: ../share/extensions/gcodetools_orientation_points.inx.h:15 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:36 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:18 -#: ../share/extensions/gcodetools_tools_library.inx.h:13 +#: ../share/extensions/gcodetools.py:4040 +#, python-format msgid "" -"Gcodetools plug-in: converts paths to Gcode (using circular interpolation), " -"makes offset paths and engraves sharp corners using cone cutters. This plug-" -"in calculates Gcode for paths using circular interpolation or linear motion " -"when needed. Tutorials, manuals and support can be found at English support " -"forum: http://www.cnc-club.ru/gcodetools and Russian support forum: http://" -"www.cnc-club.ru/gcodetoolsru Credits: Nick Drobchenko, Vladimir Kalyaev, " -"John Brooker, Henry Nicolas, Chris Lusby Taylor. Gcodetools ver. 1.7" +"Orientation points for '%s' layer have not been found! Please add " +"orientation points using Orientation tab!" msgstr "" -#: ../share/extensions/gcodetools_about.inx.h:5 -#: ../share/extensions/gcodetools_area.inx.h:55 -#: ../share/extensions/gcodetools_check_for_updates.inx.h:5 -#: ../share/extensions/gcodetools_dxf_points.inx.h:27 -#: ../share/extensions/gcodetools_engraving.inx.h:33 -#: ../share/extensions/gcodetools_graffiti.inx.h:44 -#: ../share/extensions/gcodetools_lathe.inx.h:48 -#: ../share/extensions/gcodetools_orientation_points.inx.h:16 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:37 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:19 -#: ../share/extensions/gcodetools_tools_library.inx.h:14 -msgid "Gcodetools" -msgstr "Инструменты Gcode" +#: ../share/extensions/gcodetools.py:4047 +#, python-format +msgid "There are more than one orientation point groups in '%s' layer" +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:1 -msgid "Area" -msgstr "Площадь" +#: ../share/extensions/gcodetools.py:4078 +#: ../share/extensions/gcodetools.py:4080 +msgid "" +"Orientation points are wrong! (if there are two orientation points they " +"should not be the same. If there are three orientation points they should " +"not be in a straight line.)" +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:2 -msgid "Maximum area cutting curves:" +#: ../share/extensions/gcodetools.py:4250 +#, python-format +msgid "" +"Warning! Found bad orientation points in '%s' layer. Resulting Gcode could " +"be corrupt!" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:3 -#, fuzzy -msgid "Area width:" -msgstr "Ширина:" +#: ../share/extensions/gcodetools.py:4263 +#, python-format +msgid "" +"Warning! Found bad graffiti reference point in '%s' layer. Resulting Gcode " +"could be corrupt!" +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:4 -msgid "Area tool overlap (0..0.9):" +#. xgettext:no-pango-format +#: ../share/extensions/gcodetools.py:4284 +msgid "" +"This extension works with Paths and Dynamic Offsets and groups of them only! " +"All other objects will be ignored!\n" +"Solution 1: press Path->Object to path or Shift+Ctrl+C.\n" +"Solution 2: Path->Dynamic offset or Ctrl+J.\n" +"Solution 3: export all contours to PostScript level 2 (File->Save As->.ps) " +"and File->Import this file." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:5 +#: ../share/extensions/gcodetools.py:4290 msgid "" -"\"Create area offset\": creates several Inkscape path offsets to fill " -"original path's area up to \"Area radius\" value. Outlines start from \"1/2 D" -"\" up to \"Area width\" total width with \"D\" steps where D is taken from " -"the nearest tool definition (\"Tool diameter\" value). Only one offset will " -"be created if the \"Area width\" is equal to \"1/2 D\"." +"Document has no layers! Add at least one layer using layers panel (Ctrl+Shift" +"+L)" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:6 -#, fuzzy -msgid "Fill area" -msgstr "Заливка замкнутой области" +#: ../share/extensions/gcodetools.py:4294 +msgid "" +"Warning! There are some paths in the root of the document, but not in any " +"layer! Using bottom-most layer for them." +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:7 -#, fuzzy -msgid "Area fill angle" -msgstr "Левый угол" +#: ../share/extensions/gcodetools.py:4371 +#, python-format +msgid "" +"Warning! Tool's and default tool's parameter's (%s) types are not the same " +"( type('%s') != type('%s') )." +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:8 -msgid "Area fill shift" +#: ../share/extensions/gcodetools.py:4374 +#, python-format +msgid "Warning! Tool has parameter that default tool has not ( '%s': '%s' )." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:9 -#, fuzzy -msgid "Filling method" -msgstr "Способ деления:" +#: ../share/extensions/gcodetools.py:4388 +#, python-format +msgid "Layer '%s' contains more than one tool!" +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:10 -msgid "Zig zag" +#: ../share/extensions/gcodetools.py:4391 +#, python-format +msgid "" +"Can not find tool for '%s' layer! Please add one with Tools library tab!" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:12 -msgid "Area artifacts" +#: ../share/extensions/gcodetools.py:4553 +#: ../share/extensions/gcodetools.py:4708 +msgid "" +"Warning: One or more paths do not have 'd' parameter, try to Ungroup (Ctrl" +"+Shift+G) and Object to Path (Ctrl+Shift+C)!" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:13 -msgid "Artifact diameter:" +#: ../share/extensions/gcodetools.py:4667 +msgid "" +"Noting is selected. Please select something to convert to drill point " +"(dxfpoint) or clear point sign." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:14 -msgid "Action:" -msgstr "Действие:" +#: ../share/extensions/gcodetools.py:4750 +#: ../share/extensions/gcodetools.py:4996 +#, fuzzy +msgid "This extension requires at least one selected path." +msgstr "Этому расширению нужно два контура в выделении." -#: ../share/extensions/gcodetools_area.inx.h:15 -msgid "mark with an arrow" +#: ../share/extensions/gcodetools.py:4756 +#: ../share/extensions/gcodetools.py:5002 +#, python-format +msgid "Tool diameter must be > 0 but tool's diameter on '%s' layer is not!" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:16 -#, fuzzy -msgid "mark with style" -msgstr "Стиль переключателя" +#: ../share/extensions/gcodetools.py:4767 +#: ../share/extensions/gcodetools.py:4956 +#: ../share/extensions/gcodetools.py:5011 +msgid "Warning: omitting non-path" +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:17 +#: ../share/extensions/gcodetools.py:5511 #, fuzzy -msgid "delete" -msgstr "Удаление" +msgid "Please select at least one path to engrave and run again." +msgstr "Для объединения нужно выбрать <b>не менее 1 контура</b>." -#: ../share/extensions/gcodetools_area.inx.h:18 -msgid "" -"Usage: 1. Select all Area Offsets (gray outlines) 2. Object/Ungroup (Shift" -"+Ctrl+G) 3. Press Apply Suspected small objects will be marked out by " -"colored arrows." +#: ../share/extensions/gcodetools.py:5519 +msgid "Unknown unit selected. mm assumed" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:19 -#: ../share/extensions/gcodetools_lathe.inx.h:12 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:1 -msgid "Path to Gcode" +#: ../share/extensions/gcodetools.py:5540 +#, python-format +msgid "Tool '%s' has no shape. 45 degree cone assumed!" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:20 -#: ../share/extensions/gcodetools_lathe.inx.h:13 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:2 -#, fuzzy -msgid "Biarc interpolation tolerance:" -msgstr "Шагов интерполяции" +#: ../share/extensions/gcodetools.py:5611 +#: ../share/extensions/gcodetools.py:5616 +msgid "csp_normalised_normal error. See log." +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:21 -#: ../share/extensions/gcodetools_lathe.inx.h:14 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:3 -#, fuzzy -msgid "Maximum splitting depth:" -msgstr "Упрощение контуров" +#: ../share/extensions/gcodetools.py:5804 +msgid "No need to engrave sharp angles." +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:22 -#: ../share/extensions/gcodetools_lathe.inx.h:15 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:4 -msgid "Cutting order:" +#: ../share/extensions/gcodetools.py:5848 +msgid "" +"Active layer already has orientation points! Remove them or select another " +"layer!" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:23 -#: ../share/extensions/gcodetools_lathe.inx.h:16 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:5 -#, fuzzy -msgid "Depth function:" -msgstr "Функция красного" +#: ../share/extensions/gcodetools.py:5893 +msgid "Active layer already has a tool! Remove it or select another layer!" +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:24 -#: ../share/extensions/gcodetools_lathe.inx.h:17 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:6 -msgid "Sort paths to reduse rapid distance" +#: ../share/extensions/gcodetools.py:6008 +msgid "Selection is empty! Will compute whole drawing." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:25 -#: ../share/extensions/gcodetools_lathe.inx.h:18 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:7 -msgid "Subpath by subpath" +#: ../share/extensions/gcodetools.py:6062 +msgid "" +"Tutorials, manuals and support can be found at\n" +"English support forum:\n" +"\thttp://www.cnc-club.ru/gcodetools\n" +"and Russian support forum:\n" +"\thttp://www.cnc-club.ru/gcodetoolsru" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:26 -#: ../share/extensions/gcodetools_lathe.inx.h:19 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:8 -#, fuzzy -msgid "Path by path" -msgstr "Вставить контур" +#: ../share/extensions/gcodetools.py:6107 +msgid "Lathe X and Z axis remap should be 'X', 'Y' or 'Z'. Exiting..." +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:27 -#: ../share/extensions/gcodetools_lathe.inx.h:20 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:9 -msgid "Pass by Pass" +#: ../share/extensions/gcodetools.py:6110 +msgid "Lathe X and Z axis remap should be the same. Exiting..." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:28 -#: ../share/extensions/gcodetools_lathe.inx.h:21 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:10 +#: ../share/extensions/gcodetools.py:6662 +#, python-format msgid "" -"Biarc interpolation tolerance is the maximum distance between path and its " -"approximation. The segment will be split into two segments if the distance " -"between path's segment and its approximation exceeds biarc interpolation " -"tolerance. For depth function c=color intensity from 0.0 (white) to 1.0 " -"(black), d is the depth defined by orientation points, s - surface defined " -"by orientation points." +"Select one of the action tabs - Path to Gcode, Area, Engraving, DXF points, " +"Orientation, Offset, Lathe or Tools library.\n" +" Current active tab id is %s" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:30 -#: ../share/extensions/gcodetools_engraving.inx.h:8 -#: ../share/extensions/gcodetools_graffiti.inx.h:22 -#: ../share/extensions/gcodetools_lathe.inx.h:23 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:12 +#: ../share/extensions/gcodetools.py:6668 +msgid "" +"Orientation points have not been defined! A default set of orientation " +"points has been automatically added." +msgstr "" + +#: ../share/extensions/gcodetools.py:6672 +msgid "" +"Cutting tool has not been defined! A default tool has been automatically " +"added." +msgstr "" + +#: ../share/extensions/generate_voronoi.py:35 +msgid "" +"Failed to import the subprocess module. Please report this as a bug at: " +"https://bugs.launchpad.net/inkscape." +msgstr "" + +#: ../share/extensions/generate_voronoi.py:36 #, fuzzy -msgid "Scale along Z axis:" -msgstr "Основная длина оси Z" +msgid "Python version is: " +msgstr "Преобразование в направляющие:" -#: ../share/extensions/gcodetools_area.inx.h:31 -#: ../share/extensions/gcodetools_engraving.inx.h:9 -#: ../share/extensions/gcodetools_graffiti.inx.h:23 -#: ../share/extensions/gcodetools_lathe.inx.h:24 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:13 -msgid "Offset along Z axis:" +#: ../share/extensions/generate_voronoi.py:94 +#, fuzzy +msgid "Please select an object" +msgstr "Выберите объект." + +#: ../share/extensions/gimp_xcf.py:39 +msgid "Gimp must be installed and set in your path variable." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:32 -#: ../share/extensions/gcodetools_engraving.inx.h:10 -#: ../share/extensions/gcodetools_graffiti.inx.h:24 -#: ../share/extensions/gcodetools_lathe.inx.h:25 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:14 -msgid "Select all paths if nothing is selected" +#: ../share/extensions/gimp_xcf.py:43 +msgid "An error occurred while processing the XCF file." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:33 -#: ../share/extensions/gcodetools_engraving.inx.h:11 -#: ../share/extensions/gcodetools_graffiti.inx.h:25 -#: ../share/extensions/gcodetools_lathe.inx.h:26 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:15 +#: ../share/extensions/gimp_xcf.py:177 #, fuzzy -msgid "Minimum arc radius:" -msgstr "Внутренний радиус:" +msgid "This extension requires at least one non empty layer." +msgstr "Этому расширению нужно два контура в выделении." -#: ../share/extensions/gcodetools_area.inx.h:34 -#: ../share/extensions/gcodetools_engraving.inx.h:12 -#: ../share/extensions/gcodetools_graffiti.inx.h:26 -#: ../share/extensions/gcodetools_lathe.inx.h:27 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:16 -msgid "Comment Gcode:" +#: ../share/extensions/guillotine.py:250 +msgid "The sliced bitmaps have been saved as:" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:35 -#: ../share/extensions/gcodetools_engraving.inx.h:13 -#: ../share/extensions/gcodetools_graffiti.inx.h:27 -#: ../share/extensions/gcodetools_lathe.inx.h:28 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:17 -msgid "Get additional comments from object's properties" -msgstr "" +#: ../share/extensions/hpgl_decoder.py:43 +#, fuzzy +msgid "Movements" +msgstr "Смещать градиенты" -#: ../share/extensions/gcodetools_area.inx.h:36 -#: ../share/extensions/gcodetools_dxf_points.inx.h:8 -#: ../share/extensions/gcodetools_engraving.inx.h:14 -#: ../share/extensions/gcodetools_graffiti.inx.h:28 -#: ../share/extensions/gcodetools_lathe.inx.h:29 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:18 -msgid "Preferences" -msgstr "Параметры" +#: ../share/extensions/hpgl_decoder.py:44 +#, fuzzy +msgid "Pen #" +msgstr "Масса пера" -#: ../share/extensions/gcodetools_area.inx.h:37 -#: ../share/extensions/gcodetools_dxf_points.inx.h:9 -#: ../share/extensions/gcodetools_engraving.inx.h:15 -#: ../share/extensions/gcodetools_graffiti.inx.h:29 -#: ../share/extensions/gcodetools_lathe.inx.h:30 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:19 +#. issue error if no hpgl data found +#: ../share/extensions/hpgl_input.py:58 #, fuzzy -msgid "File:" -msgstr "_Файл" +msgid "No HPGL data found." +msgstr "Не закруглён" -#: ../share/extensions/gcodetools_area.inx.h:38 -#: ../share/extensions/gcodetools_dxf_points.inx.h:10 -#: ../share/extensions/gcodetools_engraving.inx.h:16 -#: ../share/extensions/gcodetools_graffiti.inx.h:30 -#: ../share/extensions/gcodetools_lathe.inx.h:31 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:20 -msgid "Add numeric suffix to filename" +#: ../share/extensions/hpgl_input.py:66 +msgid "" +"The HPGL data contained unknown (unsupported) commands, there is a " +"possibility that the drawing is missing some content." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:39 -#: ../share/extensions/gcodetools_dxf_points.inx.h:11 -#: ../share/extensions/gcodetools_engraving.inx.h:17 -#: ../share/extensions/gcodetools_graffiti.inx.h:31 -#: ../share/extensions/gcodetools_lathe.inx.h:32 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:21 -#, fuzzy -msgid "Directory:" -msgstr "Направление" +#. issue error if no paths found +#: ../share/extensions/hpgl_output.py:58 +msgid "" +"No paths where found. Please convert all objects you want to save into paths." +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:40 -#: ../share/extensions/gcodetools_dxf_points.inx.h:12 -#: ../share/extensions/gcodetools_engraving.inx.h:18 -#: ../share/extensions/gcodetools_graffiti.inx.h:32 -#: ../share/extensions/gcodetools_lathe.inx.h:33 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:22 -msgid "Z safe height for G00 move over blank:" +#: ../share/extensions/inkex.py:109 +#, fuzzy, python-format +msgid "" +"The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " +"this extension. Please download and install the latest version from http://" +"cheeseshop.python.org/pypi/lxml/, or install it through your package manager " +"by a command like: sudo apt-get install python-lxml\n" +"\n" +"Technical details:\n" +"%s" msgstr "" +"Потрясающая обертка lxml для libxml2 требуется для inkex.py, а значит и для " +"этого расширения. Скачайте и установить самую свежую версию с http://" +"cheeseshop.python.org/pypi/lxml/, либо установите ее через пакетный менеджер " +"командой наподобие: sudo apt-get install python-lxml" -#: ../share/extensions/gcodetools_area.inx.h:41 -#: ../share/extensions/gcodetools_dxf_points.inx.h:13 -#: ../share/extensions/gcodetools_engraving.inx.h:19 -#: ../share/extensions/gcodetools_graffiti.inx.h:13 -#: ../share/extensions/gcodetools_lathe.inx.h:34 -#: ../share/extensions/gcodetools_orientation_points.inx.h:6 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:23 -msgid "Units (mm or in):" -msgstr "Единица (mm или in):" +#: ../share/extensions/inkex.py:162 +#, fuzzy, python-format +msgid "Unable to open specified file: %s" +msgstr "В указанном файле данные о гранях не обнаружены" -#: ../share/extensions/gcodetools_area.inx.h:42 -#: ../share/extensions/gcodetools_dxf_points.inx.h:14 -#: ../share/extensions/gcodetools_engraving.inx.h:20 -#: ../share/extensions/gcodetools_graffiti.inx.h:33 -#: ../share/extensions/gcodetools_lathe.inx.h:35 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:24 -msgid "Post-processor:" -msgstr "" +#: ../share/extensions/inkex.py:171 +#, fuzzy, python-format +msgid "Unable to open object member file: %s" +msgstr "Не удалось найти маркер: %s" -#: ../share/extensions/gcodetools_area.inx.h:43 -#: ../share/extensions/gcodetools_dxf_points.inx.h:15 -#: ../share/extensions/gcodetools_engraving.inx.h:21 -#: ../share/extensions/gcodetools_graffiti.inx.h:34 -#: ../share/extensions/gcodetools_lathe.inx.h:36 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:25 -msgid "Additional post-processor:" -msgstr "" +#: ../share/extensions/inkex.py:276 +#, python-format +msgid "No matching node for expression: %s" +msgstr "Нет узла, подходящего условиям запроса: %s" -#: ../share/extensions/gcodetools_area.inx.h:44 -#: ../share/extensions/gcodetools_dxf_points.inx.h:16 -#: ../share/extensions/gcodetools_engraving.inx.h:22 -#: ../share/extensions/gcodetools_graffiti.inx.h:35 -#: ../share/extensions/gcodetools_lathe.inx.h:37 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:26 -#, fuzzy -msgid "Generate log file" -msgstr "Создание из контура" +#: ../share/extensions/interp_att_g.py:167 +msgid "There is no selection to interpolate" +msgstr "Нет интерполируемого выделения" -#: ../share/extensions/gcodetools_area.inx.h:45 -#: ../share/extensions/gcodetools_dxf_points.inx.h:17 -#: ../share/extensions/gcodetools_engraving.inx.h:23 -#: ../share/extensions/gcodetools_graffiti.inx.h:36 -#: ../share/extensions/gcodetools_lathe.inx.h:38 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:27 -#, fuzzy -msgid "Full path to log file:" -msgstr "Цвет сплошной заливки" +#: ../share/extensions/jessyInk_autoTexts.py:45 +#: ../share/extensions/jessyInk_effects.py:50 +#: ../share/extensions/jessyInk_export.py:96 +#: ../share/extensions/jessyInk_keyBindings.py:188 +#: ../share/extensions/jessyInk_masterSlide.py:46 +#: ../share/extensions/jessyInk_mouseHandler.py:48 +#: ../share/extensions/jessyInk_summary.py:64 +#: ../share/extensions/jessyInk_transitions.py:50 +#: ../share/extensions/jessyInk_video.py:49 +#: ../share/extensions/jessyInk_view.py:67 +msgid "" +"The JessyInk script is not installed in this SVG file or has a different " +"version than the JessyInk extensions. Please select \"install/update...\" " +"from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or " +"update the JessyInk script.\n" +"\n" +msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:49 -#: ../share/extensions/gcodetools_dxf_points.inx.h:21 -#: ../share/extensions/gcodetools_engraving.inx.h:27 -#: ../share/extensions/gcodetools_graffiti.inx.h:38 -#: ../share/extensions/gcodetools_lathe.inx.h:42 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:31 +#: ../share/extensions/jessyInk_autoTexts.py:48 #, fuzzy -msgid "Parameterize Gcode" -msgstr "Параметры" +msgid "" +"To assign an effect, please select an object.\n" +"\n" +msgstr "Выберите объект." -#: ../share/extensions/gcodetools_area.inx.h:50 -#: ../share/extensions/gcodetools_dxf_points.inx.h:22 -#: ../share/extensions/gcodetools_engraving.inx.h:28 -#: ../share/extensions/gcodetools_graffiti.inx.h:39 -#: ../share/extensions/gcodetools_lathe.inx.h:43 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:32 -msgid "Flip y axis and parameterize Gcode" +#: ../share/extensions/jessyInk_autoTexts.py:54 +msgid "" +"Node with id '{0}' is not a suitable text node and was therefore ignored.\n" +"\n" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:51 -#: ../share/extensions/gcodetools_dxf_points.inx.h:23 -#: ../share/extensions/gcodetools_engraving.inx.h:29 -#: ../share/extensions/gcodetools_graffiti.inx.h:40 -#: ../share/extensions/gcodetools_lathe.inx.h:44 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:33 -msgid "Round all values to 4 digits" +#: ../share/extensions/jessyInk_effects.py:53 +msgid "" +"No object selected. Please select the object you want to assign an effect to " +"and then press apply.\n" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:52 -#: ../share/extensions/gcodetools_dxf_points.inx.h:24 -#: ../share/extensions/gcodetools_engraving.inx.h:30 -#: ../share/extensions/gcodetools_graffiti.inx.h:41 -#: ../share/extensions/gcodetools_lathe.inx.h:45 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:34 -msgid "Fast pre-penetrate" +#: ../share/extensions/jessyInk_export.py:82 +msgid "Could not find Inkscape command.\n" msgstr "" -#: ../share/extensions/gcodetools_check_for_updates.inx.h:1 -msgid "Check for updates" +#: ../share/extensions/jessyInk_masterSlide.py:56 +msgid "Layer not found. Removed current master slide selection.\n" msgstr "" -#: ../share/extensions/gcodetools_check_for_updates.inx.h:2 -msgid "Check for Gcodetools latest stable version and try to get the updates." +#: ../share/extensions/jessyInk_masterSlide.py:58 +msgid "" +"More than one layer with this name found. Removed current master slide " +"selection.\n" msgstr "" -#: ../share/extensions/gcodetools_dxf_points.inx.h:1 -#, fuzzy -msgid "DXF Points" -msgstr "Пункты" +#: ../share/extensions/jessyInk_summary.py:69 +msgid "JessyInk script version {0} installed." +msgstr "" -#: ../share/extensions/gcodetools_dxf_points.inx.h:2 -#, fuzzy -msgid "DXF points" -msgstr "Импорт DXF" +#: ../share/extensions/jessyInk_summary.py:71 +msgid "JessyInk script installed." +msgstr "" -#: ../share/extensions/gcodetools_dxf_points.inx.h:3 +#: ../share/extensions/jessyInk_summary.py:83 #, fuzzy -msgid "Convert selection:" -msgstr "Инвертировать выделение" - -#: ../share/extensions/gcodetools_dxf_points.inx.h:4 msgid "" -"Convert selected objects to drill points (as dxf_import plugin does). Also " -"you can save original shape. Only the start point of each curve will be " -"used. Also you can manually select object, open XML editor (Shift+Ctrl+X) " -"and add or remove XML tag 'dxfpoint' with any value." -msgstr "" +"\n" +"Master slide:" +msgstr "Мастер-слайд" -#: ../share/extensions/gcodetools_dxf_points.inx.h:5 -msgid "set as dxfpoint and save shape" +#: ../share/extensions/jessyInk_summary.py:89 +msgid "" +"\n" +"Slide {0!s}:" msgstr "" -#: ../share/extensions/gcodetools_dxf_points.inx.h:6 -msgid "set as dxfpoint and draw arrow" -msgstr "" +#: ../share/extensions/jessyInk_summary.py:94 +#, fuzzy +msgid "{0}Layer name: {1}" +msgstr "Имя слоя:" -#: ../share/extensions/gcodetools_dxf_points.inx.h:7 -msgid "clear dxfpoint sign" +#: ../share/extensions/jessyInk_summary.py:102 +msgid "{0}Transition in: {1} ({2!s} s)" msgstr "" -#: ../share/extensions/gcodetools_engraving.inx.h:1 +#: ../share/extensions/jessyInk_summary.py:104 #, fuzzy -msgid "Engraving" -msgstr "Альфа-гравировка №1" +msgid "{0}Transition in: {1}" +msgstr "Эффект перехода для появления" -#: ../share/extensions/gcodetools_engraving.inx.h:2 -msgid "Smooth convex corners between this value and 180 degrees:" +#: ../share/extensions/jessyInk_summary.py:111 +msgid "{0}Transition out: {1} ({2!s} s)" msgstr "" -#: ../share/extensions/gcodetools_engraving.inx.h:3 +#: ../share/extensions/jessyInk_summary.py:113 #, fuzzy -msgid "Maximum distance for engraving (mm/inch):" -msgstr "Максимальное смещение по X, px" +msgid "{0}Transition out: {1}" +msgstr "Эффект перехода для исчезновения" -#: ../share/extensions/gcodetools_engraving.inx.h:4 -msgid "Accuracy factor (2 low to 10 high):" +#: ../share/extensions/jessyInk_summary.py:120 +#, fuzzy +msgid "" +"\n" +"{0}Auto-texts:" +msgstr "Автотекст" + +#: ../share/extensions/jessyInk_summary.py:123 +msgid "{0}\t\"{1}\" (object id \"{2}\") will be replaced by \"{3}\"." msgstr "" -#: ../share/extensions/gcodetools_engraving.inx.h:5 -msgid "Draw additional graphics to see engraving path" +#: ../share/extensions/jessyInk_summary.py:168 +msgid "" +"\n" +"{0}Initial effect (order number {1}):" msgstr "" -#: ../share/extensions/gcodetools_engraving.inx.h:6 +#: ../share/extensions/jessyInk_summary.py:170 msgid "" -"This function creates path to engrave letters or any shape with sharp " -"angles. Cutter's depth as a function of radius is defined by the tool. Depth " -"may be any Python expression. For instance: cone....(45 " -"degrees)......................: w cone....(height/diameter=10/3)..: 10*w/3 " -"sphere..(radius r)...........................: math.sqrt(max(0,r**2-w**2)) " -"ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4" +"\n" +"{0}Effect {1!s} (order number {2}):" msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:1 -msgid "Graffiti" +#: ../share/extensions/jessyInk_summary.py:174 +msgid "{0}\tView will be set according to object \"{1}\"" msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:2 -#, fuzzy -msgid "Maximum segment length:" -msgstr "Макс. длина сегмента (px)" +#: ../share/extensions/jessyInk_summary.py:176 +msgid "{0}\tObject \"{1}\"" +msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:3 +#: ../share/extensions/jessyInk_summary.py:179 #, fuzzy -msgid "Minimal connector radius:" -msgstr "Внутренний радиус:" +msgid " will appear" +msgstr "Заливка замкнутой области" -#: ../share/extensions/gcodetools_graffiti.inx.h:4 -#, fuzzy -msgid "Start position (x;y):" -msgstr "Размещение макета:" +#: ../share/extensions/jessyInk_summary.py:181 +msgid " will disappear" +msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:5 -#, fuzzy -msgid "Create preview" -msgstr "Включить предпросмотр" +#: ../share/extensions/jessyInk_summary.py:184 +msgid " using effect \"{0}\"" +msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:6 -#, fuzzy -msgid "Create linearization preview" -msgstr "Создать линейный градиент" +#: ../share/extensions/jessyInk_summary.py:187 +msgid " in {0!s} s" +msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:7 +#: ../share/extensions/jessyInk_transitions.py:55 #, fuzzy -msgid "Preview's size (px):" -msgstr "Размер квадрата (px):" +msgid "Layer not found.\n" +msgstr "Слой на передний план" -#: ../share/extensions/gcodetools_graffiti.inx.h:8 -msgid "Preview's paint emmit (pts/s):" +#: ../share/extensions/jessyInk_transitions.py:57 +msgid "More than one layer with this name found.\n" msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:10 -#: ../share/extensions/gcodetools_orientation_points.inx.h:3 +#: ../share/extensions/jessyInk_transitions.py:70 #, fuzzy -msgid "Orientation type:" -msgstr "Ориентация:" +msgid "Please enter a layer name.\n" +msgstr "Вы забыли ввести имя файла" -#: ../share/extensions/gcodetools_graffiti.inx.h:11 -#: ../share/extensions/gcodetools_orientation_points.inx.h:4 -#, fuzzy -msgid "Z surface:" -msgstr "Критерий сортировки граней на оси Z:" +#: ../share/extensions/jessyInk_video.py:54 +#: ../share/extensions/jessyInk_video.py:59 +msgid "" +"Could not obtain the selected layer for inclusion of the video element.\n" +"\n" +msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:12 -#: ../share/extensions/gcodetools_orientation_points.inx.h:5 +#: ../share/extensions/jessyInk_view.py:75 #, fuzzy -msgid "Z depth:" -msgstr "Глубина:" - -#: ../share/extensions/gcodetools_graffiti.inx.h:14 -#: ../share/extensions/gcodetools_orientation_points.inx.h:7 -msgid "2-points mode (move and rotate, maintained aspect ratio X/Y)" +msgid "More than one object selected. Please select only one object.\n" msgstr "" +"<b>Выделено больше одного объекта.</b> Невозможно взять стиль от нескольких " +"объектов сразу." -#: ../share/extensions/gcodetools_graffiti.inx.h:15 -#: ../share/extensions/gcodetools_orientation_points.inx.h:8 -msgid "3-points mode (move, rotate and mirror, different X/Y scale)" +#: ../share/extensions/jessyInk_view.py:79 +msgid "" +"No object selected. Please select the object you want to assign a view to " +"and then press apply.\n" msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:16 -#: ../share/extensions/gcodetools_orientation_points.inx.h:9 -#, fuzzy -msgid "graffiti points" -msgstr "Ориентация" +#: ../share/extensions/markers_strokepaint.py:83 +#, python-format +msgid "No style attribute found for id: %s" +msgstr "Для ID %s не найден атрибут стиля" -#: ../share/extensions/gcodetools_graffiti.inx.h:17 -#: ../share/extensions/gcodetools_orientation_points.inx.h:10 +#: ../share/extensions/markers_strokepaint.py:137 +#, python-format +msgid "unable to locate marker: %s" +msgstr "Не удалось найти маркер: %s" + +#: ../share/extensions/measure.py:50 #, fuzzy -msgid "in-out reference point" -msgstr "Параметры Градиентной заливки" +msgid "" +"Failed to import the numpy modules. These modules are required by this " +"extension. Please install them and try again. On a Debian-like system this " +"can be done with the command, sudo apt-get install python-numpy." +msgstr "" +"Не удалось импортировать модуль numpy или numpy.linalg. Эти модули " +"необходимо для работы вызванного расширения. Установите их и попробуйте " +"снова. На системах вроде Debian это делается командой sudo apt-get install " +"python-numpy." -#: ../share/extensions/gcodetools_graffiti.inx.h:20 -#: ../share/extensions/gcodetools_orientation_points.inx.h:13 +#: ../share/extensions/measure.py:112 +msgid "Area is zero, cannot calculate Center of Mass" +msgstr "" + +#: ../share/extensions/pathalongpath.py:208 +#: ../share/extensions/pathscatter.py:228 +#: ../share/extensions/perspective.py:53 +msgid "This extension requires two selected paths." +msgstr "Этому расширению нужно два контура в выделении." + +#: ../share/extensions/pathalongpath.py:234 msgid "" -"Orientation points are used to calculate transformation (offset,scale,mirror," -"rotation in XY plane) of the path. 3-points mode only: do not put all three " -"into one line (use 2-points mode instead). You can modify Z surface, Z depth " -"values later using text tool (3rd coordinates). If there are no orientation " -"points inside current layer they are taken from the upper layer. Do not " -"ungroup orientation points! You can select them using double click to enter " -"the group or by Ctrl+Click. Now press apply to create control points " -"(independent set for each layer)." +"The total length of the pattern is too small :\n" +"Please choose a larger object or set 'Space between copies' > 0" msgstr "" -#: ../share/extensions/gcodetools_lathe.inx.h:1 -#, fuzzy -msgid "Lathe" -msgstr "Растушёвка" +#: ../share/extensions/pathalongpath.py:277 +msgid "" +"The 'stretch' option requires that the pattern must have non-zero width :\n" +"Please edit the pattern width." +msgstr "" -#: ../share/extensions/gcodetools_lathe.inx.h:2 -#, fuzzy -msgid "Lathe width:" -msgstr "Ширина:" +#: ../share/extensions/pathmodifier.py:237 +#, python-format +msgid "Please first convert objects to paths! (Got [%s].)" +msgstr "Сначала преобразуйте объекты в контуры! (Получено [%s].)" -#: ../share/extensions/gcodetools_lathe.inx.h:3 -#, fuzzy -msgid "Fine cut width:" -msgstr "Ширина:" +#: ../share/extensions/perspective.py:45 +msgid "" +"Failed to import the numpy or numpy.linalg modules. These modules are " +"required by this extension. Please install them and try again. On a Debian-" +"like system this can be done with the command, sudo apt-get install python-" +"numpy." +msgstr "" +"Не удалось импортировать модуль numpy или numpy.linalg. Эти модули " +"необходимо для работы вызванного расширения. Установите их и попробуйте " +"снова. На системах вроде Debian это делается командой sudo apt-get install " +"python-numpy." -#: ../share/extensions/gcodetools_lathe.inx.h:4 -#, fuzzy -msgid "Fine cut count:" -msgstr "Число кнопок:" +#: ../share/extensions/perspective.py:61 +#: ../share/extensions/summersnight.py:52 +#, python-format +msgid "" +"The first selected object is of type '%s'.\n" +"Try using the procedure Path->Object to Path." +msgstr "" +"Первый выбранный объект относится к типу «%s».\n" +"Превратите его в контур командой «Контур > Оконтурить объект»." + +#: ../share/extensions/perspective.py:68 +#: ../share/extensions/summersnight.py:60 +msgid "" +"This extension requires that the second selected path be four nodes long." +msgstr "Второй выбранный контур должен содержать четыре узла." -#: ../share/extensions/gcodetools_lathe.inx.h:5 -#, fuzzy -msgid "Create fine cut using:" -msgstr "Создавать новые объекты с:" +#: ../share/extensions/perspective.py:94 +#: ../share/extensions/summersnight.py:93 +msgid "" +"The second selected object is a group, not a path.\n" +"Try using the procedure Object->Ungroup." +msgstr "" +"Второй выделенный объект является группой, а не контуром.\n" +"Попробуйте выполнить команду »Объект > Разгруппировать»." -#: ../share/extensions/gcodetools_lathe.inx.h:6 -msgid "Lathe X axis remap:" +#: ../share/extensions/perspective.py:96 +#: ../share/extensions/summersnight.py:95 +msgid "" +"The second selected object is not a path.\n" +"Try using the procedure Path->Object to Path." msgstr "" +"Второй выделенный объект не является контуром.\n" +"Попробуйте выполнить команду »Контур > Оконтурить объект»." -#: ../share/extensions/gcodetools_lathe.inx.h:7 -msgid "Lathe Z axis remap:" +#: ../share/extensions/perspective.py:99 +#: ../share/extensions/summersnight.py:98 +msgid "" +"The first selected object is not a path.\n" +"Try using the procedure Path->Object to Path." msgstr "" +"Первый выделенный объект не является контуром.\n" +"Попробуйте выполнить команду »Контур > Оконтурить объект»." -#: ../share/extensions/gcodetools_lathe.inx.h:8 -#, fuzzy -msgid "Move path" -msgstr "Смещать текстуры" +#. issue error if no paths found +#: ../share/extensions/plotter.py:66 +msgid "" +"No paths where found. Please convert all objects you want to plot into paths." +msgstr "" -#: ../share/extensions/gcodetools_lathe.inx.h:9 -msgid "Offset path" -msgstr "Растянутый контур" +#: ../share/extensions/plotter.py:143 +msgid "pySerial is not installed." +msgstr "" -#: ../share/extensions/gcodetools_lathe.inx.h:10 -#, fuzzy -msgid "Lathe modify path" -msgstr "Изменение контура" +#: ../share/extensions/plotter.py:163 +msgid "" +"Could not open port. Please check that your plotter is running, connected " +"and the settings are correct." +msgstr "" -#: ../share/extensions/gcodetools_lathe.inx.h:11 +#: ../share/extensions/polyhedron_3d.py:65 msgid "" -"This function modifies path so it will be able to be cut with the " -"rectangular cutter." +"Failed to import the numpy module. This module is required by this " +"extension. Please install it and try again. On a Debian-like system this " +"can be done with the command 'sudo apt-get install python-numpy'." msgstr "" +"Не удалось импортировать модуль numpy, необходимый для этого расширения. " +"Установите его и попробуйте еще раз. В системах вроде Debian это можно " +"сделать командой 'sudo apt-get install python-numpy'." -#: ../share/extensions/gcodetools_orientation_points.inx.h:1 -#, fuzzy -msgid "Orientation points" -msgstr "Ориентация" +#: ../share/extensions/polyhedron_3d.py:336 +msgid "No face data found in specified file." +msgstr "В указанном файле данные о гранях не обнаружены" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:1 -msgid "Prepare path for plasma" +#: ../share/extensions/polyhedron_3d.py:337 +msgid "Try selecting \"Edge Specified\" in the Model File tab.\n" msgstr "" +"Попробуйте выбрать определенный ребрами тип объекта на вкладке «Файл " +"модели».\n" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:2 -msgid "Prepare path for plasma or laser cuters" +#: ../share/extensions/polyhedron_3d.py:343 +msgid "No edge data found in specified file." +msgstr "В указанном файле данные о ребрах не обнаружены" + +#: ../share/extensions/polyhedron_3d.py:344 +msgid "Try selecting \"Face Specified\" in the Model File tab.\n" msgstr "" +"Попробуйте выбрать определенный гранями тип объекта на вкладке «Файл " +"модели».\n" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:3 -#, fuzzy -msgid "Create in-out paths" -msgstr "Рисовать кривую Спиро" +#. we cannot generate a list of faces from the edges without a lot of computation +#: ../share/extensions/polyhedron_3d.py:522 +msgid "" +"Face Data Not Found. Ensure file contains face data, and check the file is " +"imported as \"Face-Specified\" under the \"Model File\" tab.\n" +msgstr "" +"Данные граней не найдены. Убедитесь в том, что файл содержит эти данные, и " +"что на вкладке «Файл модели» тип объекта указан как определённый гранями.\n" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:4 +#: ../share/extensions/polyhedron_3d.py:524 +msgid "Internal Error. No view type selected\n" +msgstr "Внутренняя ошибка: не выбран тип вида\n" + +#: ../share/extensions/print_win32_vector.py:41 +msgid "sorry, this will run only on Windows, exiting..." +msgstr "" + +#: ../share/extensions/print_win32_vector.py:179 #, fuzzy -msgid "In-out path length:" -msgstr "Длина контура" +msgid "Failed to open default printer" +msgstr "Не удалось установить CairoRenderContext" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:5 -msgid "In-out path max distance to reference point:" +#: ../share/extensions/render_barcode_datamatrix.py:202 +msgid "Unrecognised DataMatrix size" msgstr "" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:6 -msgid "In-out path type:" +#. we have an invalid bit value +#: ../share/extensions/render_barcode_datamatrix.py:643 +msgid "Invalid bit value, this is a bug!" msgstr "" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:7 -msgid "In-out path radius for round path:" +#. abort if converting blank text +#: ../share/extensions/render_barcode_datamatrix.py:678 +msgid "Please enter an input string" msgstr "" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:8 +#. abort if converting blank text +#: ../share/extensions/render_barcode_qrcode.py:1054 #, fuzzy -msgid "Replace original path" -msgstr "Заменить текст" +msgid "Please enter an input text" +msgstr "Вы забыли ввести имя файла" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:9 -msgid "Do not add in-out reference points" +#: ../share/extensions/replace_font.py:133 +msgid "" +"Couldn't find anything using that font, please ensure the spelling and " +"spacing is correct." msgstr "" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:10 -#, fuzzy -msgid "Prepare corners" -msgstr "углу страницы" +#: ../share/extensions/replace_font.py:140 +#: ../share/extensions/svg_and_media_zip_output.py:193 +msgid "Didn't find any fonts in this document/selection." +msgstr "" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:11 -#, fuzzy -msgid "Stepout distance for corners:" -msgstr "Прилипать к углам площадки" +#: ../share/extensions/replace_font.py:143 +#: ../share/extensions/svg_and_media_zip_output.py:196 +#, python-format +msgid "Found the following font only: %s" +msgstr "" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:12 -msgid "Maximum angle for corner (0-180 deg):" +#: ../share/extensions/replace_font.py:145 +#: ../share/extensions/svg_and_media_zip_output.py:198 +#, python-format +msgid "" +"Found the following fonts:\n" +"%s" msgstr "" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:14 +#: ../share/extensions/replace_font.py:196 #, fuzzy -msgid "Perpendicular" -msgstr "Перпендикулярная биссектриса" +msgid "There was nothing selected" +msgstr "Ничего не выбрано" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:15 -#, fuzzy -msgid "Tangent" -msgstr "Пурпурный" +#: ../share/extensions/replace_font.py:244 +msgid "Please enter a search string in the find box." +msgstr "" -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:16 -msgid "-------------------------------------------------" +#: ../share/extensions/replace_font.py:248 +msgid "Please enter a replacement font in the replace with box." msgstr "" -#: ../share/extensions/gcodetools_tools_library.inx.h:1 -msgid "Tools library" +#: ../share/extensions/replace_font.py:253 +msgid "Please enter a replacement font in the replace all box." msgstr "" -#: ../share/extensions/gcodetools_tools_library.inx.h:2 -#, fuzzy -msgid "Tools type:" -msgstr "Логические операции" +#: ../share/extensions/summersnight.py:44 +msgid "" +"This extension requires two selected paths. \n" +"The second path must be exactly four nodes long." +msgstr "" +"Этому расширению нужны два контура в выделении.\n" +"Второй выбранный контур должен содержать ровно четыре узла." -#: ../share/extensions/gcodetools_tools_library.inx.h:3 -#, fuzzy -msgid "default" -msgstr "(по умолчанию)" +#: ../share/extensions/svg_and_media_zip_output.py:128 +#, python-format +msgid "Could not locate file: %s" +msgstr "Не удалось найти файл: %s" -#: ../share/extensions/gcodetools_tools_library.inx.h:4 +#: ../share/extensions/svgcalendar.py:266 +#: ../share/extensions/svgcalendar.py:288 #, fuzzy -msgid "cylinder" -msgstr "Полилиния" +msgid "You must select a correct system encoding." +msgstr "Необходимо выбрать не менее двух объектов" -#: ../share/extensions/gcodetools_tools_library.inx.h:5 -#, fuzzy -msgid "cone" -msgstr "углу" +#: ../share/extensions/uniconv-ext.py:56 +#: ../share/extensions/uniconv_output.py:122 +msgid "You need to install the UniConvertor software.\n" +msgstr "Вам необходимо установить UniConvertor.\n" -#: ../share/extensions/gcodetools_tools_library.inx.h:6 -#, fuzzy -msgid "plasma" -msgstr "За_ставка" +#: ../share/extensions/voronoi2svg.py:215 +msgid "Please select objects!" +msgstr "Выделите объекты!" -#: ../share/extensions/gcodetools_tools_library.inx.h:7 -#, fuzzy -msgid "tangent knife" -msgstr "Смещение по касательной:" +#: ../share/extensions/web-set-att.py:58 +#: ../share/extensions/web-transmit-att.py:54 +msgid "You must select at least two elements." +msgstr "Необходимо выбрать не менее двух объектов" -#: ../share/extensions/gcodetools_tools_library.inx.h:8 -msgid "lathe cutter" +#: ../share/extensions/webslicer_create_group.py:57 +msgid "" +"You must create and select some \"Slicer rectangles\" before trying to group." msgstr "" -#: ../share/extensions/gcodetools_tools_library.inx.h:9 -msgid "graffiti" +#: ../share/extensions/webslicer_create_group.py:72 +msgid "" +"You must to select some \"Slicer rectangles\" or other \"Layout groups\"." msgstr "" -#: ../share/extensions/gcodetools_tools_library.inx.h:10 -msgid "Just check tools" +#: ../share/extensions/webslicer_create_group.py:76 +#, python-format +msgid "Oops... The element \"%s\" is not in the Web Slicer layer" msgstr "" -#: ../share/extensions/gcodetools_tools_library.inx.h:11 -msgid "" -"Selected tool type fills appropriate default values. You can change these " -"values using the Text tool later on. The topmost (z order) tool in the " -"active layer is used. If there is no tool inside the current layer it is " -"taken from the upper layer. Press Apply to create new tool." +#: ../share/extensions/webslicer_export.py:57 +msgid "You must give a directory to export the slices." msgstr "" -#: ../share/extensions/generate_voronoi.inx.h:1 -msgid "Voronoi Pattern" -msgstr "Мозаика Вороного" +#: ../share/extensions/webslicer_export.py:69 +#, python-format +msgid "Can't create \"%s\"." +msgstr "Невозможно создать «%s»." -#: ../share/extensions/generate_voronoi.inx.h:3 -#, fuzzy -msgid "Average size of cell (px):" -msgstr "Средний размер ячейки (px)" +#: ../share/extensions/webslicer_export.py:70 +#, python-format +msgid "Error: %s" +msgstr "Ошибка: %s" -#: ../share/extensions/generate_voronoi.inx.h:4 -#, fuzzy -msgid "Size of Border (px):" -msgstr "Толщина границы (px):" +#: ../share/extensions/webslicer_export.py:73 +#, python-format +msgid "The directory \"%s\" does not exists." +msgstr "Каталог «%s» не существует." -#: ../share/extensions/generate_voronoi.inx.h:6 -#, fuzzy -msgid "" -"Generate a random pattern of Voronoi cells. The pattern will be accessible " -"in the Fill and Stroke dialog. You must select an object or a group.\n" -"\n" -"If border is zero, the pattern will be discontinuous at the edges. Use a " -"positive border, preferably greater than the cell size, to produce a smooth " -"join of the pattern at the edges. Use a negative border to reduce the size " -"of the pattern and get an empty border." -msgstr "" -"Если граница равна нулю, мозаика на краях будет непрерывной. Чтобы получить " -"ровное соединение на краях мозаики, используйте положительное значение, по " -"возможности, больше размера ячейки. Для получения пустой границы используйте " -"отрицательное значение." +#: ../share/extensions/webslicer_export.py:102 +#, python-format +msgid "You have more than one element with \"%s\" html-id." +msgstr "У вас больше одного элемента с with html-id «%s»." -#: ../share/extensions/gimp_xcf.inx.h:1 -msgid "GIMP XCF" -msgstr "GIMP XCF" +#: ../share/extensions/webslicer_export.py:332 +msgid "You must install the ImageMagick to get JPG and GIF." +msgstr "Необходимо установить ImageMagick для получения JPG и GIF." -#: ../share/extensions/gimp_xcf.inx.h:3 -#, fuzzy -msgid "Save Guides" -msgstr "Сохранить направляющие:" +#. PARAMETER PROCESSING +#. lines of longitude are odd : abort +#: ../share/extensions/wireframe_sphere.py:116 +msgid "Please enter an even number of lines of longitude." +msgstr "" -#: ../share/extensions/gimp_xcf.inx.h:4 -#, fuzzy -msgid "Save Grid" -msgstr "Сохранить сетку:" +#. vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 +#: ../share/extensions/addnodes.inx.h:1 +msgid "Add Nodes" +msgstr "Добавить узлы" -#: ../share/extensions/gimp_xcf.inx.h:5 -#, fuzzy -msgid "Save Background" -msgstr "Трассировать фон" +#: ../share/extensions/addnodes.inx.h:2 +msgid "Division method:" +msgstr "Способ деления:" -#: ../share/extensions/gimp_xcf.inx.h:6 -#, fuzzy -msgid "File Resolution:" -msgstr "Разрешение:" +#: ../share/extensions/addnodes.inx.h:3 +msgid "By max. segment length" +msgstr "По максимальной длине сегмента" -#: ../share/extensions/gimp_xcf.inx.h:8 -msgid "" -"This extension exports the document to Gimp XCF format according to the " -"following options:\n" -" * Save Guides: convert all guides to Gimp guides.\n" -" * Save Grid: convert the first rectangular grid to a Gimp grid (note " -"that the default Inkscape grid is very narrow when shown in Gimp).\n" -" * Save Background: add the document background to each converted layer.\n" -" * File Resolution: XCF file resolution, in DPI.\n" -"\n" -"Each first level layer is converted to a Gimp layer. Sublayers are " -"concatenated and converted with their first level parent layer into a single " -"Gimp layer." -msgstr "" +#: ../share/extensions/addnodes.inx.h:4 +msgid "By number of segments" +msgstr "По числу сегментов" -#: ../share/extensions/gimp_xcf.inx.h:15 -msgid "GIMP XCF maintaining layers (*.xcf)" -msgstr "GIMP XCF со слоями (*.xcf)" +#: ../share/extensions/addnodes.inx.h:5 +msgid "Maximum segment length (px):" +msgstr "Максимальная длина сегмента (px):" -#: ../share/extensions/grid_cartesian.inx.h:1 -msgid "Cartesian Grid" -msgstr "Картезианская сетка" +#: ../share/extensions/addnodes.inx.h:6 +msgid "Number of segments:" +msgstr "Количество сегментов:" -#: ../share/extensions/grid_cartesian.inx.h:2 -#: ../share/extensions/grid_isometric.inx.h:10 -#, fuzzy -msgid "Border Thickness (px):" -msgstr "Толщина границы (px)" +#: ../share/extensions/addnodes.inx.h:7 +#: ../share/extensions/convert2dashes.inx.h:2 +#: ../share/extensions/edge3d.inx.h:9 ../share/extensions/flatten.inx.h:3 +#: ../share/extensions/fractalize.inx.h:4 +#: ../share/extensions/interp_att_g.inx.h:29 +#: ../share/extensions/markers_strokepaint.inx.h:13 +#: ../share/extensions/perspective.inx.h:2 +#: ../share/extensions/pixelsnap.inx.h:3 +#: ../share/extensions/radiusrand.inx.h:10 +#: ../share/extensions/rubberstretch.inx.h:6 +#: ../share/extensions/straightseg.inx.h:4 +#: ../share/extensions/summersnight.inx.h:2 ../share/extensions/whirl.inx.h:4 +msgid "Modify Path" +msgstr "Изменение контура" -#: ../share/extensions/grid_cartesian.inx.h:3 -#, fuzzy -msgid "X Axis" -msgstr "Ось X" +#: ../share/extensions/ai_input.inx.h:1 +msgid "AI 8.0 Input" +msgstr "Импорт файлов AI 8.0" -#: ../share/extensions/grid_cartesian.inx.h:4 -#, fuzzy -msgid "Major X Divisions:" -msgstr "Основных делений по X" +#: ../share/extensions/ai_input.inx.h:2 +msgid "Adobe Illustrator 8.0 and below (*.ai)" +msgstr "Adobe Illustrator 8.0 и ниже (*.ai)" -#: ../share/extensions/grid_cartesian.inx.h:5 -#, fuzzy -msgid "Major X Division Spacing (px):" -msgstr "Интервал между основными делениями по X [px]" +#: ../share/extensions/ai_input.inx.h:3 +msgid "Open files saved with Adobe Illustrator 8.0 or older" +msgstr "Открыть файлы, сохранённые в Adobe Illustrator 8.0 и ранее" -#: ../share/extensions/grid_cartesian.inx.h:6 -#, fuzzy -msgid "Subdivisions per Major X Division:" -msgstr "Делений в основном делении по X" +#: ../share/extensions/aisvg.inx.h:1 +msgid "AI SVG Input" +msgstr "Импорт AI SVG" -#: ../share/extensions/grid_cartesian.inx.h:7 -msgid "Logarithmic X Subdiv. (Base given by entry above)" -msgstr "Логарифмическое подразделение по X (основа задаётся выше)" +#: ../share/extensions/aisvg.inx.h:2 +msgid "Adobe Illustrator SVG (*.ai.svg)" +msgstr "Файлы SVG из Adobe Illustrator (*.ai.svg)" -#: ../share/extensions/grid_cartesian.inx.h:8 +#: ../share/extensions/aisvg.inx.h:3 +msgid "Cleans the cruft out of Adobe Illustrator SVGs before opening" +msgstr "Перед импортом чистит код файлов SVG, созданных в Adobe Illustrator" + +#: ../share/extensions/ccx_input.inx.h:1 #, fuzzy -msgid "Subsubdivs. per X Subdivision:" -msgstr "Делений в основном делении по X" +msgid "Corel DRAW Compressed Exchange files input (UC)" +msgstr "Импорт файлов Corel DRAW Compressed Exchange" -#: ../share/extensions/grid_cartesian.inx.h:9 +#: ../share/extensions/ccx_input.inx.h:2 #, fuzzy -msgid "Halve X Subsubdiv. Frequency after 'n' Subdivs. (log only):" -msgstr "" -"Половинное подразделение по X, Частота после 'n' подразделений (только " -"логарфим.)" +msgid "Corel DRAW Compressed Exchange files (UC) (*.ccx)" +msgstr "Файлы Corel DRAW Compressed Exchange (.ccx)" -#: ../share/extensions/grid_cartesian.inx.h:10 +#: ../share/extensions/ccx_input.inx.h:3 #, fuzzy -msgid "Major X Division Thickness (px):" -msgstr "Толщина основного деления по X (px)" +msgid "Open compressed exchange files saved in Corel DRAW (UC)" +msgstr "Открыть сжатые файлы для обмена, созданные в Corel DRAW" -#: ../share/extensions/grid_cartesian.inx.h:11 +#: ../share/extensions/cdr_input.inx.h:1 #, fuzzy -msgid "Minor X Division Thickness (px):" -msgstr "Толщина обычного деления по X (px)" +msgid "Corel DRAW Input (UC)" +msgstr "Импорт Corel DRAW" -#: ../share/extensions/grid_cartesian.inx.h:12 +#: ../share/extensions/cdr_input.inx.h:2 #, fuzzy -msgid "Subminor X Division Thickness (px):" -msgstr "Толщина обычного деления по X (px)" +msgid "Corel DRAW 7-X4 files (UC) (*.cdr)" +msgstr "Файлы Corel DRAW 7-X4 (*.cdr)" -#: ../share/extensions/grid_cartesian.inx.h:13 +#: ../share/extensions/cdr_input.inx.h:3 #, fuzzy -msgid "Y Axis" -msgstr "Ось Y" +msgid "Open files saved in Corel DRAW 7-X4 (UC)" +msgstr "Открыть файлы, сохраненные в Corel DRAW 7-X4" -#: ../share/extensions/grid_cartesian.inx.h:14 +#: ../share/extensions/cdt_input.inx.h:1 #, fuzzy -msgid "Major Y Divisions:" -msgstr "Основных делений по Y" +msgid "Corel DRAW templates input (UC)" +msgstr "Импорт шаблонов Corel DRAW" -#: ../share/extensions/grid_cartesian.inx.h:15 +#: ../share/extensions/cdt_input.inx.h:2 #, fuzzy -msgid "Major Y Division Spacing (px):" -msgstr "Интервал между основными делениями по Y [px]" +msgid "Corel DRAW 7-13 template files (UC) (*.cdt)" +msgstr "Шаблоны Corel DRAW 7-13 (.cdt)" -#: ../share/extensions/grid_cartesian.inx.h:16 +#: ../share/extensions/cdt_input.inx.h:3 #, fuzzy -msgid "Subdivisions per Major Y Division:" -msgstr "Делений в основном делении по Y" +msgid "Open files saved in Corel DRAW 7-13 (UC)" +msgstr "Открыть файлы, сохранённые в Corel DRAW 7-13" -#: ../share/extensions/grid_cartesian.inx.h:17 -msgid "Logarithmic Y Subdiv. (Base given by entry above)" -msgstr "Логарифмическое подразделение по Y (основа задаётся выше)" +#: ../share/extensions/cgm_input.inx.h:1 +msgid "Computer Graphics Metafile files input" +msgstr "Импорт файлов Computer Graphics Metafile" -#: ../share/extensions/grid_cartesian.inx.h:18 +#: ../share/extensions/cgm_input.inx.h:2 #, fuzzy -msgid "Subsubdivs. per Y Subdivision:" -msgstr "Делений в основном делении по Y" +msgid "Computer Graphics Metafile files (*.cgm)" +msgstr "Файлы Computer Graphics Metafile (.cgm)" -#: ../share/extensions/grid_cartesian.inx.h:19 +#: ../share/extensions/cgm_input.inx.h:3 +msgid "Open Computer Graphics Metafile files" +msgstr "Открыть файлы Open Computer Graphics Metafile" + +#: ../share/extensions/cmx_input.inx.h:1 #, fuzzy -msgid "Halve Y Subsubdiv. Frequency after 'n' Subdivs. (log only):" -msgstr "" -"Половинное подразделение по Y, Частота после 'n' подразделений (только " -"логарфим.)" +msgid "Corel DRAW Presentation Exchange files input (UC)" +msgstr "Импорт файлов Corel DRAW Presentation Exchange" -#: ../share/extensions/grid_cartesian.inx.h:20 +#: ../share/extensions/cmx_input.inx.h:2 #, fuzzy -msgid "Major Y Division Thickness (px):" -msgstr "Толщина основного деления по Y (px)" +msgid "Corel DRAW Presentation Exchange files (UC) (*.cmx)" +msgstr "Файлы Corel DRAW Presentation Exchange (.cmx)" -#: ../share/extensions/grid_cartesian.inx.h:21 +#: ../share/extensions/cmx_input.inx.h:3 #, fuzzy -msgid "Minor Y Division Thickness (px):" -msgstr "Толщина обычного деления по Y (px)" +msgid "Open presentation exchange files saved in Corel DRAW (UC)" +msgstr "Открыть файлы, сохраненные Corel DRAW для обмена данными" -#: ../share/extensions/grid_cartesian.inx.h:22 +#: ../share/extensions/color_HSL_adjust.inx.h:1 #, fuzzy -msgid "Subminor Y Division Thickness (px):" -msgstr "Толщина обычного деления по Y (px)" +msgid "HSL Adjust" +msgstr "Коррекция в HSB" -#: ../share/extensions/grid_isometric.inx.h:1 +#: ../share/extensions/color_HSL_adjust.inx.h:3 #, fuzzy -msgid "Isometric Grid" -msgstr "Аксонометрическая сетка" +msgid "Hue (°)" +msgstr "Вращение тона:" -#: ../share/extensions/grid_isometric.inx.h:2 +#: ../share/extensions/color_HSL_adjust.inx.h:4 #, fuzzy -msgid "X Divisions [x2]:" -msgstr "Основных делений по X" +msgid "Random hue" +msgstr "Случайное дерево" -#: ../share/extensions/grid_isometric.inx.h:3 -msgid "Y Divisions [x2] [> 1/2 X Div]:" -msgstr "" +#: ../share/extensions/color_HSL_adjust.inx.h:6 +#, fuzzy, no-c-format +msgid "Saturation (%)" +msgstr "Насыщенность" -#: ../share/extensions/grid_isometric.inx.h:4 +#: ../share/extensions/color_HSL_adjust.inx.h:7 #, fuzzy -msgid "Division Spacing (px):" -msgstr "Интервал между основными делениями по X [px]" +msgid "Random saturation" +msgstr "Коррекция насыщенности" -#: ../share/extensions/grid_isometric.inx.h:5 -#, fuzzy -msgid "Subdivisions per Major Division:" -msgstr "Делений в основном делении по X" +#: ../share/extensions/color_HSL_adjust.inx.h:9 +#, fuzzy, no-c-format +msgid "Lightness (%)" +msgstr "Светлота:" -#: ../share/extensions/grid_isometric.inx.h:6 +#: ../share/extensions/color_HSL_adjust.inx.h:10 #, fuzzy -msgid "Subsubdivs per Subdivision:" -msgstr "Делений в основном делении по X" +msgid "Random lightness" +msgstr "Яркость" -#: ../share/extensions/grid_isometric.inx.h:7 -#, fuzzy -msgid "Major Division Thickness (px):" -msgstr "Толщина основного деления по X (px)" +#: ../share/extensions/color_HSL_adjust.inx.h:13 +#, no-c-format +msgid "" +"Adjusts hue, saturation and lightness in the HSL representation of the " +"selected objects's color.\n" +"Options:\n" +" * Hue: rotate by degrees (wraps around).\n" +" * Saturation: add/subtract % (min=-100, max=100).\n" +" * Lightness: add/subtract % (min=-100, max=100).\n" +" * Random Hue/Saturation/Lightness: randomize the parameter's value.\n" +" " +msgstr "" -#: ../share/extensions/grid_isometric.inx.h:8 -#, fuzzy -msgid "Minor Division Thickness (px):" -msgstr "Толщина обычного деления по X (px)" +#: ../share/extensions/color_blackandwhite.inx.h:1 +msgid "Black and White" +msgstr "Только чёрный и белый" -#: ../share/extensions/grid_isometric.inx.h:9 -#, fuzzy -msgid "Subminor Division Thickness (px):" -msgstr "Толщина обычного деления по X (px)" +#: ../share/extensions/color_blackandwhite.inx.h:2 +msgid "Threshold Color (1-255):" +msgstr "" -#: ../share/extensions/grid_polar.inx.h:1 -msgid "Polar Grid" -msgstr "Полярная сетка" +#: ../share/extensions/color_brighter.inx.h:1 +msgid "Brighter" +msgstr "Ярче" -#: ../share/extensions/grid_polar.inx.h:2 +#: ../share/extensions/color_custom.inx.h:1 #, fuzzy -msgid "Centre Dot Diameter (px):" -msgstr "Диаметр центральной точки (px)" +msgctxt "Custom color extension" +msgid "Custom" +msgstr "Другой" -#: ../share/extensions/grid_polar.inx.h:3 -#, fuzzy -msgid "Circumferential Labels:" -msgstr "Периферические метки" +#: ../share/extensions/color_custom.inx.h:3 +msgid "Red Function:" +msgstr "Функция красного:" -#: ../share/extensions/grid_polar.inx.h:5 -#, fuzzy -msgid "Degrees" -msgstr "Градусов" +#: ../share/extensions/color_custom.inx.h:4 +msgid "Green Function:" +msgstr "Функция зелёного:" -#: ../share/extensions/grid_polar.inx.h:6 -#, fuzzy -msgid "Circumferential Label Size (px):" -msgstr "Кегль периферических меток (px)" +#: ../share/extensions/color_custom.inx.h:5 +msgid "Blue Function:" +msgstr "Функция синего:" -#: ../share/extensions/grid_polar.inx.h:7 -#, fuzzy -msgid "Circumferential Label Outset (px):" -msgstr "Отступ периферических меток (px)" +#: ../share/extensions/color_custom.inx.h:6 +msgid "Input (r,g,b) Color Range:" +msgstr "" -#: ../share/extensions/grid_polar.inx.h:8 -#, fuzzy -msgid "Circular Divisions" -msgstr "Основных круговых делений" +#: ../share/extensions/color_custom.inx.h:8 +msgid "" +"Allows you to evaluate different functions for each channel.\n" +"r, g and b are the normalized values of the red, green and blue channels. " +"The resulting RGB values are automatically clamped.\n" +" \n" +"Example (half the red, swap green and blue):\n" +" Red Function: r*0.5 \n" +" Green Function: b \n" +" Blue Function: g" +msgstr "" -#: ../share/extensions/grid_polar.inx.h:9 -#, fuzzy -msgid "Major Circular Divisions:" -msgstr "Основных круговых делений" +#: ../share/extensions/color_darker.inx.h:1 +msgid "Darker" +msgstr "Темнее" -#: ../share/extensions/grid_polar.inx.h:10 -#, fuzzy -msgid "Major Circular Division Spacing (px):" -msgstr "Интервал между основными круговыми делениями (px)" +#: ../share/extensions/color_desaturate.inx.h:1 +msgid "Desaturate" +msgstr "Обесцветить" -#: ../share/extensions/grid_polar.inx.h:11 -#, fuzzy -msgid "Subdivisions per Major Circular Division:" -msgstr "Малых круговых делений в большом" +#: ../share/extensions/color_grayscale.inx.h:1 +#: ../share/extensions/webslicer_create_rect.inx.h:15 +msgid "Grayscale" +msgstr "Градации серого" -#: ../share/extensions/grid_polar.inx.h:12 -msgid "Logarithmic Subdiv. (Base given by entry above)" -msgstr "Логарифмическое подразделение (основа задаётся выше)" +#: ../share/extensions/color_lesshue.inx.h:1 +msgid "Less Hue" +msgstr "Меньше тона" -#: ../share/extensions/grid_polar.inx.h:13 -#, fuzzy -msgid "Major Circular Division Thickness (px):" -msgstr "Толщина большого кругового деления (px)" +#: ../share/extensions/color_lesslight.inx.h:1 +msgid "Less Light" +msgstr "Меньше яркости" -#: ../share/extensions/grid_polar.inx.h:14 -#, fuzzy -msgid "Minor Circular Division Thickness (px):" -msgstr "Толщина малого кругового деления (px)" +#: ../share/extensions/color_lesssaturation.inx.h:1 +msgid "Less Saturation" +msgstr "Меньше насыщенности" -#: ../share/extensions/grid_polar.inx.h:15 -#, fuzzy -msgid "Angular Divisions" -msgstr "Угловых делений" +#: ../share/extensions/color_morehue.inx.h:1 +msgid "More Hue" +msgstr "Больше тона" -#: ../share/extensions/grid_polar.inx.h:16 -#, fuzzy -msgid "Angle Divisions:" -msgstr "Угловых делений" +#: ../share/extensions/color_morelight.inx.h:1 +msgid "More Light" +msgstr "Больше яркости" -#: ../share/extensions/grid_polar.inx.h:17 -#, fuzzy -msgid "Angle Divisions at Centre:" -msgstr "Угловых делений в центре" +#: ../share/extensions/color_moresaturation.inx.h:1 +msgid "More Saturation" +msgstr "Больше насыщенности" -#: ../share/extensions/grid_polar.inx.h:18 -#, fuzzy -msgid "Subdivisions per Major Angular Division:" -msgstr "Малых угловых делений в большом" +#: ../share/extensions/color_negative.inx.h:1 +msgid "Negative" +msgstr "Негатив" -#: ../share/extensions/grid_polar.inx.h:19 -#, fuzzy -msgid "Minor Angle Division End 'n' Divs. Before Centre:" -msgstr "Деление малого угла заканчивается за это число делений до центра" +#: ../share/extensions/color_randomize.inx.h:1 +#: ../share/extensions/render_alphabetsoup.inx.h:4 +msgid "Randomize" +msgstr "Случайные значения" -#: ../share/extensions/grid_polar.inx.h:20 -#, fuzzy -msgid "Major Angular Division Thickness (px):" -msgstr "Толщина большого углового деления (px)" +#: ../share/extensions/color_randomize.inx.h:7 +msgid "" +"Converts to HSL, randomizes hue and/or saturation and/or lightness and " +"converts it back to RGB." +msgstr "" -#: ../share/extensions/grid_polar.inx.h:21 -#, fuzzy -msgid "Minor Angular Division Thickness (px):" -msgstr "Толщина малого углового деления (px)" +#: ../share/extensions/color_removeblue.inx.h:1 +msgid "Remove Blue" +msgstr "Удалить синий компонент" -#: ../share/extensions/guides_creator.inx.h:1 -msgid "Guides creator" -msgstr "Создать направляющие" +#: ../share/extensions/color_removegreen.inx.h:1 +msgid "Remove Green" +msgstr "Удалить зелёный компонент" -#: ../share/extensions/guides_creator.inx.h:2 -#, fuzzy -msgid "Regular guides" -msgstr "Прямоугольная сетка" +#: ../share/extensions/color_removered.inx.h:1 +msgid "Remove Red" +msgstr "Удалить красный компонент" -#: ../share/extensions/guides_creator.inx.h:3 -#, fuzzy -msgid "Guides preset:" -msgstr "Создать направляющие" +#: ../share/extensions/color_replace.inx.h:1 +msgid "Replace color" +msgstr "Замена цвета" -#: ../share/extensions/guides_creator.inx.h:6 -msgid "Start from edges" -msgstr "Начать от краёв" +#: ../share/extensions/color_replace.inx.h:2 +msgid "Replace color (RRGGBB hex):" +msgstr "Заменить цвет (RRGGBB hex):" -#: ../share/extensions/guides_creator.inx.h:7 -msgid "Delete existing guides" -msgstr "Удалить существующие направляющие" +#: ../share/extensions/color_replace.inx.h:3 +msgid "Color to replace" +msgstr "Заменяемый цвет" -#: ../share/extensions/guides_creator.inx.h:8 -msgid "Custom..." -msgstr "Другой..." +#: ../share/extensions/color_replace.inx.h:4 +msgid "By color (RRGGBB hex):" +msgstr "На цвет (RRGGBB hex):" -#: ../share/extensions/guides_creator.inx.h:9 -msgid "Golden ratio" -msgstr "Золотое сечение" +#: ../share/extensions/color_replace.inx.h:5 +msgid "New color" +msgstr "Новый цвет" -#: ../share/extensions/guides_creator.inx.h:10 -msgid "Rule-of-third" -msgstr "Правило третей" +#: ../share/extensions/color_rgbbarrel.inx.h:1 +msgid "RGB Barrel" +msgstr "«Бочка» RGB (RGB->BGR->GRB->...)" -#: ../share/extensions/guides_creator.inx.h:11 -#, fuzzy -msgid "Diagonal guides" -msgstr "Прилипать направляющими" +#: ../share/extensions/convert2dashes.inx.h:1 +msgid "Convert to Dashes" +msgstr "Преобразовать в пунктир" -#: ../share/extensions/guides_creator.inx.h:12 +#: ../share/extensions/dhw_input.inx.h:1 #, fuzzy -msgid "Upper left corner" -msgstr "углу страницы" +msgid "DHW file input" +msgstr "Импорт файлов Windows Metafile" -#: ../share/extensions/guides_creator.inx.h:13 -#, fuzzy -msgid "Upper right corner" -msgstr "углу страницы" +#: ../share/extensions/dhw_input.inx.h:2 +msgid "ACECAD Digimemo File (*.dhw)" +msgstr "" -#: ../share/extensions/guides_creator.inx.h:14 -#, fuzzy -msgid "Lower left corner" -msgstr "Опустить текущий слой" +#: ../share/extensions/dhw_input.inx.h:3 +msgid "Open files from ACECAD Digimemo" +msgstr "" -#: ../share/extensions/guides_creator.inx.h:15 -#, fuzzy -msgid "Lower right corner" -msgstr "Опустить текущий слой" +#: ../share/extensions/dia.inx.h:1 +msgid "Dia Input" +msgstr "Импорт файлов Dia" -#: ../share/extensions/guides_creator.inx.h:16 -#, fuzzy -msgid "Margins" -msgstr "art box" +#: ../share/extensions/dia.inx.h:2 +msgid "" +"The dia2svg.sh script should be installed with your Inkscape distribution. " +"If you do not have it, there is likely to be something wrong with your " +"Inkscape installation." +msgstr "" +"Сценарий dia2svg.sh должен быть установлен вместе с Inkscape. Если его у вас " +"нет, значит что-то не так с вашей сборкой Inkscape." -#: ../share/extensions/guides_creator.inx.h:17 -msgid "Margins preset:" +#: ../share/extensions/dia.inx.h:3 +msgid "" +"In order to import Dia files, Dia itself must be installed. You can get Dia " +"at http://live.gnome.org/Dia" msgstr "" +"Для импорта файлов Dia должна быть установлена сама программа Dia. Её можно " +"получить по адресу http://live.gnome.org/Dia" -#: ../share/extensions/guides_creator.inx.h:18 -#, fuzzy -msgid "Header margin:" -msgstr "Левое поле" +#: ../share/extensions/dia.inx.h:4 +msgid "Dia Diagram (*.dia)" +msgstr "Схемы Dia (*.dia)" -#: ../share/extensions/guides_creator.inx.h:19 +#: ../share/extensions/dia.inx.h:5 +msgid "A diagram created with the program Dia" +msgstr "Схема, созданная в программе Dia" + +#: ../share/extensions/dimension.inx.h:1 +msgid "Dimensions" +msgstr "Размеры" + +#: ../share/extensions/dimension.inx.h:2 #, fuzzy -msgid "Footer margin:" -msgstr "Вер_хнее:" +msgid "X Offset:" +msgstr "Смещение по X" -#: ../share/extensions/guides_creator.inx.h:20 +#: ../share/extensions/dimension.inx.h:3 #, fuzzy -msgid "Left margin:" -msgstr "Левое поле" +msgid "Y Offset:" +msgstr "Смещение по Y" -#: ../share/extensions/guides_creator.inx.h:21 +#: ../share/extensions/dimension.inx.h:4 #, fuzzy -msgid "Right margin:" -msgstr "Правое поле" +msgid "Bounding box type :" +msgstr "Используемая площадка (BB):" -#: ../share/extensions/guides_creator.inx.h:22 +#: ../share/extensions/dimension.inx.h:5 #, fuzzy -msgid "Left book page" -msgstr "Левый угол" +msgid "Geometric" +msgstr "Геометрические фигуры" -#: ../share/extensions/guides_creator.inx.h:23 +#: ../share/extensions/dimension.inx.h:6 #, fuzzy -msgid "Right book page" -msgstr "Правый угол" +msgid "Visual" +msgstr "Визуализация контура" -#: ../share/extensions/guillotine.inx.h:1 -msgid "Guillotine" -msgstr "Гильотина" +#: ../share/extensions/dimension.inx.h:7 ../share/extensions/dots.inx.h:13 +#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:25 +msgid "Visualize Path" +msgstr "Визуализация контура" -#: ../share/extensions/guillotine.inx.h:2 -#, fuzzy -msgid "Directory to save images to:" -msgstr "Каталог для сохраняемого изображений:" +#: ../share/extensions/dots.inx.h:1 +msgid "Number Nodes" +msgstr "Нумерация узлов" -#: ../share/extensions/guillotine.inx.h:3 +#: ../share/extensions/dots.inx.h:4 #, fuzzy -msgid "Image name (without extension):" -msgstr "Основа имени файлов (без расширения):" +msgid "Dot size:" +msgstr "Размер точек" -#: ../share/extensions/guillotine.inx.h:4 +#: ../share/extensions/dots.inx.h:5 #, fuzzy -msgid "Ignore these settings and use export hints" -msgstr "Игнорировать первую и последнюю точки" +msgid "Starting dot number:" +msgstr "Номер слайда" -#: ../share/extensions/handles.inx.h:1 -msgid "Draw Handles" -msgstr "Нарисовать рычаги" +#: ../share/extensions/dots.inx.h:6 +#, fuzzy +msgid "Step:" +msgstr "Шаги" -#: ../share/extensions/hershey.inx.h:1 -msgid "Hershey Text" +#: ../share/extensions/dots.inx.h:8 +msgid "" +"This extension replaces the selection's nodes with numbered dots according " +"to the following options:\n" +" * Font size: size of the node number labels (20px, 12pt...).\n" +" * Dot size: diameter of the dots placed at path nodes (10px, 2mm...).\n" +" * Starting dot number: first number in the sequence, assigned to the " +"first node of the path.\n" +" * Step: numbering step between two nodes." msgstr "" -#: ../share/extensions/hershey.inx.h:2 -#, fuzzy -msgid "Render Text" -msgstr "Отрисовка" +#: ../share/extensions/draw_from_triangle.inx.h:1 +msgid "Draw From Triangle" +msgstr "Геометрия треугольника" -#: ../share/extensions/hershey.inx.h:3 -#: ../share/extensions/render_alphabetsoup.inx.h:2 -#: ../share/extensions/render_barcode_datamatrix.inx.h:2 -#: ../share/extensions/render_barcode_qrcode.inx.h:3 -msgid "Text:" -msgstr "Текст:" +#: ../share/extensions/draw_from_triangle.inx.h:2 +msgid "Common Objects" +msgstr "Обычные объекты" -#: ../share/extensions/hershey.inx.h:4 -#, fuzzy -msgid "Action: " -msgstr "Действие:" +#: ../share/extensions/draw_from_triangle.inx.h:3 +msgid "Circumcircle" +msgstr "Описанная окружность" -#: ../share/extensions/hershey.inx.h:5 -#, fuzzy -msgid "Font face: " -msgstr "Кегль шрифта:" +#: ../share/extensions/draw_from_triangle.inx.h:4 +msgid "Circumcentre" +msgstr "Центр описанной окружности" -#: ../share/extensions/hershey.inx.h:6 -#, fuzzy -msgid "Typeset that text" -msgstr "Ввод текста" +#: ../share/extensions/draw_from_triangle.inx.h:5 +msgid "Incircle" +msgstr "Вписанная окружность" -#: ../share/extensions/hershey.inx.h:7 -#, fuzzy -msgid "Write glyph table" -msgstr "Изменить название глифа" +#: ../share/extensions/draw_from_triangle.inx.h:6 +msgid "Incentre" +msgstr "Центр вписанной окружности" -#: ../share/extensions/hershey.inx.h:8 -#, fuzzy -msgid "Sans 1-stroke" -msgstr "Снять обводку" +#: ../share/extensions/draw_from_triangle.inx.h:7 +msgid "Contact Triangle" +msgstr "Вписанный треугольник" -#: ../share/extensions/hershey.inx.h:9 -#, fuzzy -msgid "Sans bold" -msgstr "Полужирное начертание" +#: ../share/extensions/draw_from_triangle.inx.h:8 +msgid "Excircles" +msgstr "Вневписанные окружности" -#: ../share/extensions/hershey.inx.h:10 -#, fuzzy -msgid "Serif medium" -msgstr "Средние" +#: ../share/extensions/draw_from_triangle.inx.h:9 +msgid "Excentres" +msgstr "Центры вневписанных окружностей" + +#: ../share/extensions/draw_from_triangle.inx.h:10 +msgid "Extouch Triangle" +msgstr "Экскасательный треугольник" + +#: ../share/extensions/draw_from_triangle.inx.h:11 +msgid "Excentral Triangle" +msgstr "Эксцентрический треугольник" + +#: ../share/extensions/draw_from_triangle.inx.h:12 +msgid "Orthocentre" +msgstr "Ортоцентр" + +#: ../share/extensions/draw_from_triangle.inx.h:13 +msgid "Orthic Triangle" +msgstr "Ортоцентрический треугольник" + +#: ../share/extensions/draw_from_triangle.inx.h:14 +msgid "Altitudes" +msgstr "Угловые возвышения" + +#: ../share/extensions/draw_from_triangle.inx.h:15 +msgid "Angle Bisectors" +msgstr "Угловые биссектрисы" + +#: ../share/extensions/draw_from_triangle.inx.h:16 +msgid "Centroid" +msgstr "Центроид" -#: ../share/extensions/hershey.inx.h:11 -msgid "Serif medium italic" -msgstr "" +#: ../share/extensions/draw_from_triangle.inx.h:17 +msgid "Nine-Point Centre" +msgstr "Центр окружности девяти точек" -#: ../share/extensions/hershey.inx.h:12 -msgid "Serif bold italic" -msgstr "" +#: ../share/extensions/draw_from_triangle.inx.h:18 +msgid "Nine-Point Circle" +msgstr "Окружность девяти точек" -#: ../share/extensions/hershey.inx.h:13 -#, fuzzy -msgid "Serif bold" -msgstr "Полужирное начертание" +#: ../share/extensions/draw_from_triangle.inx.h:19 +msgid "Symmedians" +msgstr "Симмедианы" -#: ../share/extensions/hershey.inx.h:14 -#, fuzzy -msgid "Script 1-stroke" -msgstr "Установить обводку" +#: ../share/extensions/draw_from_triangle.inx.h:20 +msgid "Symmedian Point" +msgstr "Точка симмедианы" -#: ../share/extensions/hershey.inx.h:15 -msgid "Script 1-stroke (alt)" -msgstr "" +#: ../share/extensions/draw_from_triangle.inx.h:21 +msgid "Symmedial Triangle" +msgstr "Симмедиальный треугольник" -#: ../share/extensions/hershey.inx.h:16 -#, fuzzy -msgid "Script medium" -msgstr "Письменность:" +#: ../share/extensions/draw_from_triangle.inx.h:22 +msgid "Gergonne Point" +msgstr "Точка Жергонна" -#: ../share/extensions/hershey.inx.h:17 -#, fuzzy -msgid "Gothic English" -msgstr "Готское письмо" +#: ../share/extensions/draw_from_triangle.inx.h:23 +msgid "Nagel Point" +msgstr "Точка Нагеля" -#: ../share/extensions/hershey.inx.h:18 -#, fuzzy -msgid "Gothic German" -msgstr "Готское письмо" +#: ../share/extensions/draw_from_triangle.inx.h:24 +msgid "Custom Points and Options" +msgstr "Заказные точки и параметры" -#: ../share/extensions/hershey.inx.h:19 -#, fuzzy -msgid "Gothic Italian" -msgstr "Готское письмо" +#: ../share/extensions/draw_from_triangle.inx.h:25 +msgid "Custom Point Specified By:" +msgstr "Заказные точки, определённые:" -#: ../share/extensions/hershey.inx.h:20 +#: ../share/extensions/draw_from_triangle.inx.h:26 #, fuzzy -msgid "Greek 1-stroke" -msgstr "Установить обводку" +msgid "Point At:" +msgstr "Указывает на:" -#: ../share/extensions/hershey.inx.h:21 -#, fuzzy -msgid "Greek medium" -msgstr "Средние" +#: ../share/extensions/draw_from_triangle.inx.h:27 +msgid "Draw Marker At This Point" +msgstr "Нарисовать маркер в этой точке" -#: ../share/extensions/hershey.inx.h:23 -#, fuzzy -msgid "Japanese" -msgstr "Яванский" +#: ../share/extensions/draw_from_triangle.inx.h:28 +msgid "Draw Circle Around This Point" +msgstr "Нарисовать окружность вокруг этой точки" -#: ../share/extensions/hershey.inx.h:24 -#, fuzzy -msgid "Astrology" -msgstr "Морфология" +#: ../share/extensions/draw_from_triangle.inx.h:29 +#: ../share/extensions/wireframe_sphere.inx.h:6 +msgid "Radius (px):" +msgstr "Радиус (px):" -#: ../share/extensions/hershey.inx.h:25 -msgid "Math (lower)" -msgstr "" +#: ../share/extensions/draw_from_triangle.inx.h:30 +msgid "Draw Isogonal Conjugate" +msgstr "Нарисовать изогональную сопряженную" -#: ../share/extensions/hershey.inx.h:26 -#, fuzzy -msgid "Math (upper)" -msgstr "Перпендикулярная биссектриса" +#: ../share/extensions/draw_from_triangle.inx.h:31 +msgid "Draw Isotomic Conjugate" +msgstr "Нарисовать изотомическую сопряженную" -#: ../share/extensions/hershey.inx.h:28 -#, fuzzy -msgid "Meteorology" -msgstr "Морфология" +#: ../share/extensions/draw_from_triangle.inx.h:32 +msgid "Report this triangle's properties" +msgstr "Вывести свойства этого треугольника" -#: ../share/extensions/hershey.inx.h:29 -msgid "Music" -msgstr "" +#: ../share/extensions/draw_from_triangle.inx.h:33 +msgid "Trilinear Coordinates" +msgstr "трилинейными координатами" -#: ../share/extensions/hershey.inx.h:30 -#, fuzzy -msgid "Symbolic" -msgstr "Симво_л" +#: ../share/extensions/draw_from_triangle.inx.h:34 +msgid "Triangle Function" +msgstr "функцией треугольника" -#: ../share/extensions/hershey.inx.h:31 +#: ../share/extensions/draw_from_triangle.inx.h:36 msgid "" -" \n" +"This extension draws constructions about a triangle defined by the first 3 " +"nodes of a selected path. You may select one of preset objects or create " +"your own ones.\n" +" \n" +"All units are the Inkscape's pixel unit. Angles are all in radians.\n" +"You can specify a point by trilinear coordinates or by a triangle centre " +"function.\n" +"Enter as functions of the side length or angles.\n" +"Trilinear elements should be separated by a colon: ':'.\n" +"Side lengths are represented as 's_a', 's_b' and 's_c'.\n" +"Angles corresponding to these are 'a_a', 'a_b', and 'a_c'.\n" +"You can also use the semi-perimeter and area of the triangle as constants. " +"Write 'area' or 'semiperim' for these.\n" "\n" +"You can use any standard Python math function:\n" +"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" +"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" +"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" +"cos(x); sin(x); tan(x); degrees(x); radians(x); \n" +"cosh(x); sinh(x); tanh(x)\n" "\n" +"Also available are the inverse trigonometric functions:\n" +"sec(x); csc(x); cot(x)\n" "\n" +"You can specify the radius of a circle around a custom point using a " +"formula, which may also contain the side lengths, angles, etc. You can also " +"plot the isogonal and isotomic conjugate of the point. Be aware that this " +"may cause a divide-by-zero error for certain points.\n" +" " msgstr "" - -#: ../share/extensions/hershey.inx.h:36 -msgid "About..." -msgstr "" - -#: ../share/extensions/hershey.inx.h:37 -msgid "" +"Это расширение создаёт геометрические конструкции относительно треугольника, " +"определённого первыми тремя узлами выбранного контура. Вы можете выбрать " +"нужные из готовых конструкций или создать собственные.\n" "\n" -"This extension renders a line of text using\n" -"\"Hershey\" fonts for plotters, derived from \n" -"NBS SP-424 1976-04, \"A contribution to \n" -"computer typesetting techniques: Tables of\n" -"Coordinates for Hershey's Repertory of\n" -"Occidental Type Fonts and Graphic Symbols.\"\n" +"Единица измерения — пикселы Inkscape. Углы задаются в радианах.\n" "\n" -"These are not traditional \"outline\" fonts, \n" -"but are instead \"single-stroke\" fonts, or\n" -"\"engraving\" fonts where the character is\n" -"formed by the stroke (and not the fill).\n" +"Вы можете указать точку при помощи трилинейных координат или функции центра " +"треугольника. В качестве функции указывайте длины сторон или углы.\n" +"Трилинейные элементы отделены двоеточием.\n" +"Длины сторон представлены как 's_a', 's_b' и 's_c'.\n" +"Соответствующие им углы — 'a_a', 'a_b' и 'a_c'.\n" +"В качестве констант вы можете использовать полупериметр и площадь " +"треугольника. Для этого напишите 'area' или 'semiperim'.\n" "\n" -"For additional information, please visit:\n" -" www.evilmadscientist.com/go/hershey" -msgstr "" - -#: ../share/extensions/hpgl_input.inx.h:1 -#, fuzzy -msgid "HPGL Input" -msgstr "Импорт WPG" - -#: ../share/extensions/hpgl_input.inx.h:2 -msgid "" -"Please note that you can only open HPGL files written by Inkscape, to open " -"other HPGL files please change their file extension to .plt, make sure you " -"have UniConverter installed and open them again." -msgstr "" +"Вы можете использовать стандартные математические функции Python:\n" +"\n" +"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" +"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" +"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" +"cos(x); sin(x); tan(x); degrees(x); radians(x); \n" +"cosh(x); sinh(x); tanh(x)\n" +"\n" +"Кроме того, доступны обратные тригонометрические функции: sec(x); csc(x); " +"cot(x)\n" +"\n" +"Вы можете указывать радиус окружности вокруг заказной точки при помощи " +"формулы, которая также может содержать длины сторон, углы и т.д. Вы также " +"можете строить изогональную и изотомическую сопряжённые точки. Помните о " +"том, что в случае с некоторыми точками это может привести к ошибке деления " +"на ноль.\n" +" " -#: ../share/extensions/hpgl_input.inx.h:3 -#: ../share/extensions/hpgl_output.inx.h:4 -#: ../share/extensions/plotter.inx.h:23 -#, fuzzy -msgid "Resolution X (dpi):" -msgstr "Разрешение (dpi)" +#: ../share/extensions/dxf_input.inx.h:1 +msgid "DXF Input" +msgstr "Импорт DXF" -#: ../share/extensions/hpgl_input.inx.h:4 -#: ../share/extensions/hpgl_output.inx.h:5 -#: ../share/extensions/plotter.inx.h:24 -msgid "" -"The amount of steps the plotter moves if it moves for 1 inch on the X axis " -"(Default: 1016.0)" -msgstr "" +#: ../share/extensions/dxf_input.inx.h:3 +msgid "Use automatic scaling to size A4" +msgstr "Автоматически масштабировать в A4" -#: ../share/extensions/hpgl_input.inx.h:5 -#: ../share/extensions/hpgl_output.inx.h:6 -#: ../share/extensions/plotter.inx.h:25 +#: ../share/extensions/dxf_input.inx.h:4 #, fuzzy -msgid "Resolution Y (dpi):" -msgstr "Разрешение (dpi)" +msgid "Or, use manual scale factor:" +msgstr "Свой коэфф. масштабирования:" -#: ../share/extensions/hpgl_input.inx.h:6 -#: ../share/extensions/hpgl_output.inx.h:7 -#: ../share/extensions/plotter.inx.h:26 -msgid "" -"The amount of steps the plotter moves if it moves for 1 inch on the Y axis " -"(Default: 1016.0)" +#: ../share/extensions/dxf_input.inx.h:5 +msgid "Manual x-axis origin (mm):" msgstr "" -#: ../share/extensions/hpgl_input.inx.h:7 -msgid "Show movements between paths" +#: ../share/extensions/dxf_input.inx.h:6 +msgid "Manual y-axis origin (mm):" msgstr "" -#: ../share/extensions/hpgl_input.inx.h:8 -msgid "Check this to show movements between paths (Default: Unchecked)" +#: ../share/extensions/dxf_input.inx.h:7 +msgid "Gcodetools compatible point import" msgstr "" -#: ../share/extensions/hpgl_input.inx.h:9 -#: ../share/extensions/hpgl_output.inx.h:34 -msgid "HP Graphics Language file (*.hpgl)" -msgstr "Файл HP Graphics Language (*.hpgl)" - -#: ../share/extensions/hpgl_input.inx.h:10 +#: ../share/extensions/dxf_input.inx.h:8 +#: ../share/extensions/render_barcode_qrcode.inx.h:16 #, fuzzy -msgid "Import an HP Graphics Language file" -msgstr "Экспортировать в файл HP Graphics Language" - -#: ../share/extensions/hpgl_output.inx.h:1 -msgid "HPGL Output" -msgstr "Экспорт в HPGL" - -#: ../share/extensions/hpgl_output.inx.h:2 -msgid "" -"Please make sure that all objects you want to save are converted to paths. " -"Please use the plotter extension (Extensions menu) to plot directly over a " -"serial connection." -msgstr "" +msgid "Character encoding:" +msgstr "Кодировка символов:" -#: ../share/extensions/hpgl_output.inx.h:3 -#: ../share/extensions/plotter.inx.h:22 -#, fuzzy -msgid "Plotter Settings " -msgstr "Параметры импорта PDF" +#: ../share/extensions/dxf_input.inx.h:9 +msgid "Text Font:" +msgstr "Шрифт текста:" -#: ../share/extensions/hpgl_output.inx.h:8 -#: ../share/extensions/plotter.inx.h:27 +#: ../share/extensions/dxf_input.inx.h:11 #, fuzzy -msgid "Pen number:" -msgstr "Номер цвета" - -#: ../share/extensions/hpgl_output.inx.h:9 -#: ../share/extensions/plotter.inx.h:28 -msgid "The number of the pen (tool) to use (Standard: '1')" -msgstr "" - -#: ../share/extensions/hpgl_output.inx.h:10 -#: ../share/extensions/plotter.inx.h:29 -msgid "Pen force (g):" -msgstr "" - -#: ../share/extensions/hpgl_output.inx.h:11 -#: ../share/extensions/plotter.inx.h:30 msgid "" -"The amount of force pushing down the pen in grams, set to 0 to omit command; " -"most plotters ignore this command (Default: 0)" +"- AutoCAD Release 13 and newer.\n" +"- assume dxf drawing is in mm.\n" +"- assume svg drawing is in pixels, at 90 dpi.\n" +"- scale factor and origin apply only to manual scaling.\n" +"- layers are preserved only on File->Open, not Import.\n" +"- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed." msgstr "" +"• поддерживаются файлы AutoCAD R3 и новее\n" +"• предполагается, что единица измерения — мм\n" +"• предполагается, что рисунок SVG — в пикселах с разрешением 90 dpi\n" +"• слои сохраняются только при открытии, а не импорте\n" +"• ограниченная поддержка BLOCKS, при необходимости используйте AutoCAD " +"Explode Blocks." -#: ../share/extensions/hpgl_output.inx.h:12 -#: ../share/extensions/plotter.inx.h:31 -msgid "Pen speed (cm/s or mm/s):" -msgstr "" +#: ../share/extensions/dxf_input.inx.h:17 +msgid "AutoCAD DXF R13 (*.dxf)" +msgstr "AutoCAD DXF R13 (*.dxf)" -#: ../share/extensions/hpgl_output.inx.h:13 -msgid "" -"The speed the pen will move with in centimeters or millimeters per second " -"(depending on your plotter model), set to 0 to omit command; most plotters " -"ignore this command (Default: 0)" -msgstr "" +#: ../share/extensions/dxf_input.inx.h:18 +msgid "Import AutoCAD's Document Exchange Format" +msgstr "Импорт файлов формата AutoCAD's Document Exchange Format" -#: ../share/extensions/hpgl_output.inx.h:14 -#, fuzzy -msgid "Rotation (°, Clockwise):" -msgstr "Поворот по часовой стрелке" +#: ../share/extensions/dxf_outlines.inx.h:1 +msgid "Desktop Cutting Plotter" +msgstr "Настольный плоттер" -#: ../share/extensions/hpgl_output.inx.h:15 -#: ../share/extensions/plotter.inx.h:34 -msgid "Rotation of the drawing (Default: 0°)" -msgstr "" +#: ../share/extensions/dxf_outlines.inx.h:3 +msgid "use ROBO-Master type of spline output" +msgstr "Использовать тип кривой ROBO-Master на выводе" -#: ../share/extensions/hpgl_output.inx.h:16 -#: ../share/extensions/plotter.inx.h:35 -#, fuzzy -msgid "Mirror X axis" -msgstr "Отразить по оси Y" +#: ../share/extensions/dxf_outlines.inx.h:4 +msgid "use LWPOLYLINE type of line output" +msgstr "Использовать тип линии LWPOLYLINE на выводе" -#: ../share/extensions/hpgl_output.inx.h:17 -#: ../share/extensions/plotter.inx.h:36 -msgid "Check this to mirror the X axis (Default: Unchecked)" +#: ../share/extensions/dxf_outlines.inx.h:5 +msgid "Base unit" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:18 -#: ../share/extensions/plotter.inx.h:37 -#, fuzzy -msgid "Mirror Y axis" -msgstr "Отразить по оси Y" +#: ../share/extensions/dxf_outlines.inx.h:6 +msgid "Character Encoding" +msgstr "Кодировка символов:" -#: ../share/extensions/hpgl_output.inx.h:19 -#: ../share/extensions/plotter.inx.h:38 -msgid "Check this to mirror the Y axis (Default: Unchecked)" -msgstr "" +#: ../share/extensions/dxf_outlines.inx.h:7 +#, fuzzy +msgid "Layer export selection" +msgstr "Удалить выделение" -#: ../share/extensions/hpgl_output.inx.h:20 -#: ../share/extensions/plotter.inx.h:39 +#: ../share/extensions/dxf_outlines.inx.h:8 #, fuzzy -msgid "Center zero point" -msgstr "Центрировать строки" +msgid "Layer match name" +msgstr "Имя слоя:" -#: ../share/extensions/hpgl_output.inx.h:21 -#: ../share/extensions/plotter.inx.h:40 -msgid "" -"Check this if your plotter uses a centered zero point (Default: Unchecked)" -msgstr "" +#: ../share/extensions/dxf_outlines.inx.h:9 +msgid "pt" +msgstr "pt" -#: ../share/extensions/hpgl_output.inx.h:22 -#: ../share/extensions/plotter.inx.h:41 -#, fuzzy -msgid "Plot Features " -msgstr "Растушёвка" +#: ../share/extensions/dxf_outlines.inx.h:10 +msgid "pc" +msgstr "pc" -#: ../share/extensions/hpgl_output.inx.h:23 -#: ../share/extensions/plotter.inx.h:42 -msgid "Overcut (mm):" -msgstr "" +#: ../share/extensions/dxf_outlines.inx.h:11 +#: ../share/extensions/render_gears.inx.h:7 +msgid "px" +msgstr "px" -#: ../share/extensions/hpgl_output.inx.h:24 -#: ../share/extensions/plotter.inx.h:43 -msgid "" -"The distance in mm that will be cut over the starting point of the path to " -"prevent open paths, set to 0.0 to omit command (Default: 1.00)" -msgstr "" +#: ../share/extensions/dxf_outlines.inx.h:12 +#: ../share/extensions/gcodetools_area.inx.h:46 +#: ../share/extensions/gcodetools_dxf_points.inx.h:18 +#: ../share/extensions/gcodetools_engraving.inx.h:24 +#: ../share/extensions/gcodetools_graffiti.inx.h:18 +#: ../share/extensions/gcodetools_lathe.inx.h:39 +#: ../share/extensions/gcodetools_orientation_points.inx.h:11 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:28 +#: ../share/extensions/render_gears.inx.h:9 +msgid "mm" +msgstr "mm" -#: ../share/extensions/hpgl_output.inx.h:25 -#: ../share/extensions/plotter.inx.h:44 -#, fuzzy -msgid "Tool offset (mm):" -msgstr "Сдвиг по горизонтали, px" +#: ../share/extensions/dxf_outlines.inx.h:13 +msgid "cm" +msgstr "cm" -#: ../share/extensions/hpgl_output.inx.h:26 -#: ../share/extensions/plotter.inx.h:45 -msgid "" -"The offset from the tool tip to the tool axis in mm, set to 0.0 to omit " -"command (Default: 0.25)" -msgstr "" +#: ../share/extensions/dxf_outlines.inx.h:14 +msgid "m" +msgstr "m" -#: ../share/extensions/hpgl_output.inx.h:27 -#: ../share/extensions/plotter.inx.h:46 -#, fuzzy -msgid "Use precut" -msgstr "Используемый системой" +#: ../share/extensions/dxf_outlines.inx.h:15 +#: ../share/extensions/gcodetools_area.inx.h:47 +#: ../share/extensions/gcodetools_dxf_points.inx.h:19 +#: ../share/extensions/gcodetools_engraving.inx.h:25 +#: ../share/extensions/gcodetools_graffiti.inx.h:19 +#: ../share/extensions/gcodetools_lathe.inx.h:40 +#: ../share/extensions/gcodetools_orientation_points.inx.h:12 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:29 +#: ../share/extensions/render_gears.inx.h:8 +msgid "in" +msgstr "in" -#: ../share/extensions/hpgl_output.inx.h:28 -#: ../share/extensions/plotter.inx.h:47 -msgid "" -"Check this to cut a small line before the real drawing starts to correctly " -"align the tool orientation. (Default: Checked)" -msgstr "" +#: ../share/extensions/dxf_outlines.inx.h:16 +msgid "ft" +msgstr "ft" -#: ../share/extensions/hpgl_output.inx.h:29 -#: ../share/extensions/plotter.inx.h:48 -#, fuzzy -msgid "Curve flatness:" -msgstr "Гладкость" +#: ../share/extensions/dxf_outlines.inx.h:17 +msgid "Latin 1" +msgstr "Латиница" -#: ../share/extensions/hpgl_output.inx.h:30 -#: ../share/extensions/plotter.inx.h:49 -msgid "" -"Curves are divided into lines, this number controls how fine the curves will " -"be reproduced, the smaller the finer (Default: '1.2')" +#: ../share/extensions/dxf_outlines.inx.h:18 +msgid "CP 1250" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:31 -#: ../share/extensions/plotter.inx.h:50 -#, fuzzy -msgid "Auto align" -msgstr "Выровнять" - -#: ../share/extensions/hpgl_output.inx.h:32 -#: ../share/extensions/plotter.inx.h:51 -msgid "" -"Check this to auto align the drawing to the zero point (Plus the tool offset " -"if used). If unchecked you have to make sure that all parts of your drawing " -"are within the document border! (Default: Checked)" +#: ../share/extensions/dxf_outlines.inx.h:19 +msgid "CP 1252" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:33 -#: ../share/extensions/plotter.inx.h:54 -msgid "" -"All these settings depend on the plotter you use, for more information " -"please consult the manual or homepage for your plotter." +#: ../share/extensions/dxf_outlines.inx.h:20 +msgid "UTF 8" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:35 +#: ../share/extensions/dxf_outlines.inx.h:21 #, fuzzy -msgid "Export an HP Graphics Language file" -msgstr "Экспортировать в файл HP Graphics Language" +msgid "All (default)" +msgstr "(по умолчанию)" -#: ../share/extensions/ink2canvas.inx.h:1 -#, fuzzy -msgid "Convert to html5 canvas" -msgstr "Преобразовать в пунктир" +#: ../share/extensions/dxf_outlines.inx.h:22 +#, fuzzy +msgid "Visible only" +msgstr "Видимые цвета" -#: ../share/extensions/ink2canvas.inx.h:2 -msgid "HTML 5 canvas (*.html)" +#: ../share/extensions/dxf_outlines.inx.h:23 +msgid "By name match" msgstr "" -#: ../share/extensions/ink2canvas.inx.h:3 -msgid "HTML 5 canvas code" +#: ../share/extensions/dxf_outlines.inx.h:25 +#, fuzzy +msgid "" +"- AutoCAD Release 14 DXF format.\n" +"- The base unit parameter specifies in what unit the coordinates are output " +"(90 px = 1 in).\n" +"- Supported element types\n" +" - paths (lines and splines)\n" +" - rectangles\n" +" - clones (the crossreference to the original is lost)\n" +"- ROBO-Master spline output is a specialized spline readable only by ROBO-" +"Master and AutoDesk viewers, not Inkscape.\n" +"- LWPOLYLINE output is a multiply-connected polyline, disable it to use a " +"legacy version of the LINE output.\n" +"- You can choose to export all layers, only visible ones or by name match " +"(case insensitive and use comma ',' as separator)" msgstr "" +"• поддерживается формат AutoCAD Release 13\n" +"• считается, что рисунок SVG в пикселах, 90dpi\n" +"• считается, что рисунок DXF в миллиметрах\n" +"• поддерживаются только линии и кривые\n" +"• на выводе для ROBO-Master создаётся кривая,\n" +" читаемая только просмотрщиками ROBO-Master\n" +" и AutoDesk, но не Inkscape.\n" +"• вывод LWPOLYLINE создаёт полилинию, отключите,\n" +" чтобы использовать устаревший тип линии." -#: ../share/extensions/inkscape_follow_link.inx.h:1 +#: ../share/extensions/dxf_outlines.inx.h:34 #, fuzzy -msgid "Follow Link" -msgstr "Перейти по ссылке" - -#: ../share/extensions/inkscape_help_askaquestion.inx.h:1 -msgid "Ask Us a Question" -msgstr "Задать авторам вопрос" +msgid "Desktop Cutting Plotter (AutoCAD DXF R14) (*.dxf)" +msgstr "Файлы для настольных плоттеров (R13) (*.dxf)" -#: ../share/extensions/inkscape_help_commandline.inx.h:1 -msgid "Command Line Options" -msgstr "Справка по командной строке" +#: ../share/extensions/dxf_output.inx.h:1 +msgid "DXF Output" +msgstr "Экспорт в DXF" -#. i18n. Please don't translate it unless a page exists in your language -#: ../share/extensions/inkscape_help_commandline.inx.h:3 -msgid "http://inkscape.org/doc/inkscape-man.html" +#: ../share/extensions/dxf_output.inx.h:2 +msgid "pstoedit must be installed to run; see http://www.pstoedit.net/pstoedit" msgstr "" +"Должна быть установлена программа pstoedit, см. http://www.pstoedit.net/" +"pstoedit" -#: ../share/extensions/inkscape_help_faq.inx.h:1 -msgid "FAQ" -msgstr "Часто задаваемые вопросы" - -#. i18n. Please don't translate it unless a page exists in your language -#: ../share/extensions/inkscape_help_faq.inx.h:3 -msgid "http://wiki.inkscape.org/wiki/index.php/FAQ" -msgstr "" +#: ../share/extensions/dxf_output.inx.h:3 +msgid "AutoCAD DXF R12 (*.dxf)" +msgstr "AutoCAD DXF R12 (*.dxf)" -#: ../share/extensions/inkscape_help_keys.inx.h:1 -msgid "Keys and Mouse Reference" -msgstr "Использование клавиатуры и мыши" +#: ../share/extensions/dxf_output.inx.h:4 +msgid "DXF file written by pstoedit" +msgstr "Файлы DXF можно сохранить при помощи pstoedit" -#. i18n. Please don't translate it unless a page exists in your language -#: ../share/extensions/inkscape_help_keys.inx.h:3 -msgid "http://inkscape.org/doc/keys048.html" -msgstr "" +#: ../share/extensions/edge3d.inx.h:1 +msgid "Edge 3D" +msgstr "Объёмные края" -#: ../share/extensions/inkscape_help_manual.inx.h:1 -msgid "Inkscape Manual" -msgstr "Руководство по Inkscape" +#: ../share/extensions/edge3d.inx.h:2 +msgid "Illumination Angle:" +msgstr "Угол освещения:" -#. i18n. Please don't translate it unless a page exists in your language -#: ../share/extensions/inkscape_help_manual.inx.h:3 -msgid "http://tavmjong.free.fr/INKSCAPE/MANUAL/html/index.php" -msgstr "" +#: ../share/extensions/edge3d.inx.h:3 +#, fuzzy +msgid "Shades:" +msgstr "Тени" -#: ../share/extensions/inkscape_help_relnotes.inx.h:1 -msgid "New in This Version" -msgstr "Новшества этой версии" +#: ../share/extensions/edge3d.inx.h:4 +#, fuzzy +msgid "Only black and white:" +msgstr "Только ч/б" -#. i18n. Please don't translate it unless a page exists in your language -#: ../share/extensions/inkscape_help_relnotes.inx.h:3 -msgid "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91" -msgstr "" +#: ../share/extensions/edge3d.inx.h:5 +msgid "Stroke width:" +msgstr "Толщина обводки:" -#: ../share/extensions/inkscape_help_reportabug.inx.h:1 -msgid "Report a Bug" -msgstr "Сообщить авторам об ошибке" +#: ../share/extensions/edge3d.inx.h:6 +msgid "Blur stdDeviation:" +msgstr "Стд. отклонение размывания:" -#: ../share/extensions/inkscape_help_svgspec.inx.h:1 -msgid "SVG 1.1 Specification" -msgstr "Спецификация на SVG 1.1" +#: ../share/extensions/edge3d.inx.h:7 +msgid "Blur width:" +msgstr "Ширина размывания:" -#: ../share/extensions/interp.inx.h:1 -msgid "Interpolate" -msgstr "Интерполяция" +#: ../share/extensions/edge3d.inx.h:8 +msgid "Blur height:" +msgstr "Высота размывания:" -#: ../share/extensions/interp.inx.h:3 -msgid "Interpolation steps:" -msgstr "Шагов интерполяции:" +#: ../share/extensions/embedimage.inx.h:1 +msgid "Embed Images" +msgstr "Встроить все растровые изображения" -#: ../share/extensions/interp.inx.h:4 -msgid "Interpolation method:" -msgstr "Способ интерполяции:" +#: ../share/extensions/embedimage.inx.h:2 +#: ../share/extensions/embedselectedimages.inx.h:2 +msgid "Embed only selected images" +msgstr "Встроить только выбранные растровые файлы" -#: ../share/extensions/interp.inx.h:5 -msgid "Duplicate endpaths" -msgstr "Продублировать оконечные контуры" +#: ../share/extensions/embedselectedimages.inx.h:1 +msgid "Embed Selected Images" +msgstr "Встроить выбранные изображения" -#: ../share/extensions/interp.inx.h:6 -msgid "Interpolate style" -msgstr "Интерполировать стиль" +#: ../share/extensions/empty_page.inx.h:1 +msgid "Empty Page" +msgstr "Чистая страница" -#: ../share/extensions/interp_att_g.inx.h:1 -msgid "Interpolate Attribute in a group" -msgstr "Интерполировать атрибут в группе" +#: ../share/extensions/empty_page.inx.h:2 +msgid "Page size:" +msgstr "Размер страницы:" -#: ../share/extensions/interp_att_g.inx.h:3 -msgid "Attribute to Interpolate:" -msgstr "Интерполируемый атрибут:" +#: ../share/extensions/empty_page.inx.h:3 +msgid "Page orientation:" +msgstr "Ориентация холста:" -#: ../share/extensions/interp_att_g.inx.h:4 -msgid "Other Attribute:" -msgstr "Другой атрибут:" +#: ../share/extensions/eps_input.inx.h:1 +msgid "EPS Input" +msgstr "Импорт файлов EPS" -#: ../share/extensions/interp_att_g.inx.h:5 -msgid "Other Attribute type:" -msgstr "Другой тип атрибута:" +#: ../share/extensions/eqtexsvg.inx.h:1 +msgid "LaTeX" +msgstr "Печать в LaTeX" -#: ../share/extensions/interp_att_g.inx.h:6 +#: ../share/extensions/eqtexsvg.inx.h:2 #, fuzzy -msgid "Apply to:" -msgstr "Видение" +msgid "LaTeX input: " +msgstr "Печать в LaTeX" -#: ../share/extensions/interp_att_g.inx.h:7 -msgid "Start Value:" -msgstr "Начальное значение:" +#: ../share/extensions/eqtexsvg.inx.h:3 +msgid "Additional packages (comma-separated): " +msgstr "Дополнительные пакеты (через запятую): " -#: ../share/extensions/interp_att_g.inx.h:8 -msgid "End Value:" -msgstr "Конечное значение:" +#: ../share/extensions/export_gimp_palette.inx.h:1 +msgid "Export as GIMP Palette" +msgstr "Экспортировать как палитру GIMP" -#: ../share/extensions/interp_att_g.inx.h:13 -msgid "Translate X" -msgstr "Перемещение по X" +#: ../share/extensions/export_gimp_palette.inx.h:2 +msgid "GIMP Palette (*.gpl)" +msgstr "Палитры GIMP (*.gpl)" -#: ../share/extensions/interp_att_g.inx.h:14 -msgid "Translate Y" -msgstr "Перемещение по Y" +#: ../share/extensions/export_gimp_palette.inx.h:3 +msgid "Exports the colors of this document as GIMP Palette" +msgstr "Экспортировать цвета документа как файл палитры GIMP" -#: ../share/extensions/interp_att_g.inx.h:15 -#: ../share/extensions/markers_strokepaint.inx.h:9 -msgid "Fill" -msgstr "Заливка" +#: ../share/extensions/extractimage.inx.h:1 +msgid "Extract Image" +msgstr "Извлечь растровое изображение" -#: ../share/extensions/interp_att_g.inx.h:17 -msgid "Other" -msgstr "Другой" +#: ../share/extensions/extractimage.inx.h:2 +msgid "Path to save image:" +msgstr "Путь для сохраняемого изображения:" -#: ../share/extensions/interp_att_g.inx.h:18 -#, fuzzy +#: ../share/extensions/extractimage.inx.h:3 msgid "" -"If you select \"Other\", you must know the SVG attributes to identify here " -"this \"other\"." +"* Don't type the file extension, it is appended automatically.\n" +"* A relative path (or a filename without path) is relative to the user's " +"home directory." msgstr "" -"Если выбран «другой» интерполируемый атрибут, вы должны знать, какой именно " -"другой:" - -#: ../share/extensions/interp_att_g.inx.h:20 -msgid "Integer Number" -msgstr "Переменная" +"· не указывайте расширение сами, оно будет автоматически подставлено\n" +"· относительный путь считается от корня пользовательского каталога" -#: ../share/extensions/interp_att_g.inx.h:21 -msgid "Float Number" -msgstr "Число с плавающей точкой" +#: ../share/extensions/extrude.inx.h:3 +msgid "Lines" +msgstr "Линии" -#: ../share/extensions/interp_att_g.inx.h:22 -msgid "Tag" -msgstr "Тэг" +#: ../share/extensions/extrude.inx.h:4 +msgid "Polygons" +msgstr "Многоугольники" -#: ../share/extensions/interp_att_g.inx.h:23 -#: ../share/extensions/polyhedron_3d.inx.h:33 -msgid "Style" -msgstr "Стиль" +#: ../share/extensions/fig_input.inx.h:1 +msgid "XFIG Input" +msgstr "Импорт XFIG" -#: ../share/extensions/interp_att_g.inx.h:24 -msgid "Transformation" -msgstr "Преобразование" +#: ../share/extensions/fig_input.inx.h:2 +msgid "XFIG Graphics File (*.fig)" +msgstr "Файл XFIG (*.fig)" -#: ../share/extensions/interp_att_g.inx.h:25 -msgid "••••••••••••••••••••••••••••••••••••••••••••••••" -msgstr "••••••••••••••••••••••••••••••••••••••••••••••••" +#: ../share/extensions/fig_input.inx.h:3 +msgid "Open files saved with XFIG" +msgstr "Открыть файлы, сохранённые в XFIG" -#: ../share/extensions/interp_att_g.inx.h:26 -msgid "No Unit" -msgstr "Нет" +#: ../share/extensions/flatten.inx.h:1 +msgid "Flatten Beziers" +msgstr "Сглаживание кривой Безье" -#: ../share/extensions/interp_att_g.inx.h:28 +#: ../share/extensions/flatten.inx.h:2 #, fuzzy -msgid "" -"This effect applies a value for any interpolatable attribute for all " -"elements inside the selected group or for all elements in a multiple " -"selection." -msgstr "" -"Этот эффект задает новое значение для любого интерполируемого атрибута всех " -"объектов группы или выделения." +msgid "Flatness:" +msgstr "Гладкость" -#: ../share/extensions/jessyInk_autoTexts.inx.h:1 -msgid "Auto-texts" -msgstr "Автотекст" +#: ../share/extensions/foldablebox.inx.h:1 +msgid "Foldable Box" +msgstr "Макет коробки" -#: ../share/extensions/jessyInk_autoTexts.inx.h:2 -#: ../share/extensions/jessyInk_effects.inx.h:2 -#: ../share/extensions/jessyInk_export.inx.h:2 -#: ../share/extensions/jessyInk_masterSlide.inx.h:2 -#: ../share/extensions/jessyInk_transitions.inx.h:2 -#: ../share/extensions/jessyInk_view.inx.h:2 -msgid "Settings" -msgstr "Параметры" +#: ../share/extensions/foldablebox.inx.h:4 +#, fuzzy +msgid "Depth:" +msgstr "Глубина:" -#: ../share/extensions/jessyInk_autoTexts.inx.h:3 -msgid "Auto-Text:" -msgstr "Автотекст:" +#: ../share/extensions/foldablebox.inx.h:5 +#, fuzzy +msgid "Paper Thickness:" +msgstr "Толщина бумаги:" -#: ../share/extensions/jessyInk_autoTexts.inx.h:4 -msgid "None (remove)" -msgstr "Нет (удалить)" +#: ../share/extensions/foldablebox.inx.h:6 +#, fuzzy +msgid "Tab Proportion:" +msgstr "Вкладка" -#: ../share/extensions/jessyInk_autoTexts.inx.h:5 -msgid "Slide title" -msgstr "Название слайда" +#: ../share/extensions/foldablebox.inx.h:8 +msgid "Add Guide Lines" +msgstr "Добавить направляющие" -#: ../share/extensions/jessyInk_autoTexts.inx.h:6 -msgid "Slide number" -msgstr "Номер слайда" +#: ../share/extensions/fractalize.inx.h:1 +msgid "Fractalize" +msgstr "Фрактализация" -#: ../share/extensions/jessyInk_autoTexts.inx.h:7 -msgid "Number of slides" -msgstr "Количество слайдов" +#: ../share/extensions/fractalize.inx.h:2 +#, fuzzy +msgid "Subdivisions:" +msgstr "Подразделений:" -#: ../share/extensions/jessyInk_autoTexts.inx.h:9 -msgid "" -"This extension allows you to install, update and remove auto-texts for a " -"JessyInk presentation. Please see code.google.com/p/jessyink for more " -"details." -msgstr "" -"Это расширение предназначено для вставки, обновления и удаления автотекста " -"из презентаций JessyInk. Подробности вы найдёте на сайте code.google.com/p/" -"jessyink." +#: ../share/extensions/funcplot.inx.h:1 +msgid "Function Plotter" +msgstr "Построитель графиков" -#: ../share/extensions/jessyInk_autoTexts.inx.h:10 -#: ../share/extensions/jessyInk_effects.inx.h:15 -#: ../share/extensions/jessyInk_install.inx.h:4 -#: ../share/extensions/jessyInk_keyBindings.inx.h:46 -#: ../share/extensions/jessyInk_masterSlide.inx.h:7 -#: ../share/extensions/jessyInk_mouseHandler.inx.h:8 -#: ../share/extensions/jessyInk_summary.inx.h:4 -#: ../share/extensions/jessyInk_transitions.inx.h:14 -#: ../share/extensions/jessyInk_uninstall.inx.h:12 -#: ../share/extensions/jessyInk_video.inx.h:4 -#: ../share/extensions/jessyInk_view.inx.h:9 -msgid "JessyInk" -msgstr "Создание презентации" +#: ../share/extensions/funcplot.inx.h:2 +msgid "Range and sampling" +msgstr "Диапазон и выборка" -#: ../share/extensions/jessyInk_effects.inx.h:1 -msgid "Effects" -msgstr "Эффекты" +#: ../share/extensions/funcplot.inx.h:3 +#, fuzzy +msgid "Start X value:" +msgstr "Начальное значение по оси X:" -#: ../share/extensions/jessyInk_effects.inx.h:4 -#: ../share/extensions/jessyInk_transitions.inx.h:4 -#: ../share/extensions/jessyInk_view.inx.h:4 -msgid "Duration in seconds:" -msgstr "Длительность в секундах:" +#: ../share/extensions/funcplot.inx.h:4 +#, fuzzy +msgid "End X value:" +msgstr "Конечное значение по оси X" -#: ../share/extensions/jessyInk_effects.inx.h:6 -msgid "Build-in effect" -msgstr "Эффект входа" +#: ../share/extensions/funcplot.inx.h:5 +msgid "Multiply X range by 2*pi" +msgstr "Умножить диапазон X на 2*pi" -#: ../share/extensions/jessyInk_effects.inx.h:7 -msgid "None (default)" -msgstr "Нет (по умолчанию)" +#: ../share/extensions/funcplot.inx.h:6 +#, fuzzy +msgid "Y value of rectangle's bottom:" +msgstr "Координата низа прямоугольника по оси Y:" -#: ../share/extensions/jessyInk_effects.inx.h:8 -#: ../share/extensions/jessyInk_transitions.inx.h:8 -msgid "Appear" -msgstr "Появление" +#: ../share/extensions/funcplot.inx.h:7 +#, fuzzy +msgid "Y value of rectangle's top:" +msgstr "Координата верха прямоугольника по оси Y:" -#: ../share/extensions/jessyInk_effects.inx.h:9 +#: ../share/extensions/funcplot.inx.h:8 #, fuzzy -msgid "Fade in" -msgstr "Угасание" +msgid "Number of samples:" +msgstr "Количество шагов:" -#: ../share/extensions/jessyInk_effects.inx.h:10 -#: ../share/extensions/jessyInk_transitions.inx.h:10 -msgid "Pop" -msgstr "Выскакивание" +#: ../share/extensions/funcplot.inx.h:9 +#: ../share/extensions/param_curves.inx.h:11 +msgid "Isotropic scaling" +msgstr "" -#: ../share/extensions/jessyInk_effects.inx.h:11 -msgid "Build-out effect" -msgstr "Эффект выхода" +#: ../share/extensions/funcplot.inx.h:10 +msgid "Use polar coordinates" +msgstr "Использовать полярные координаты" -#: ../share/extensions/jessyInk_effects.inx.h:12 +#: ../share/extensions/funcplot.inx.h:11 +#: ../share/extensions/param_curves.inx.h:12 #, fuzzy -msgid "Fade out" -msgstr "Угасание" +msgid "" +"When set, Isotropic scaling uses smallest of width/xrange or height/yrange" +msgstr "Изотропическое масштабирование" -#: ../share/extensions/jessyInk_effects.inx.h:14 +#: ../share/extensions/funcplot.inx.h:12 +#: ../share/extensions/param_curves.inx.h:13 +msgid "Use" +msgstr "Как использовать" + +#: ../share/extensions/funcplot.inx.h:13 +#, fuzzy msgid "" -"This extension allows you to install, update and remove object effects for a " -"JessyInk presentation. Please see code.google.com/p/jessyink for more " -"details." +"Select a rectangle before calling the extension,\n" +"it will determine X and Y scales. If you wish to fill the area, then add x-" +"axis endpoints.\n" +"\n" +"With polar coordinates:\n" +" Start and end X values define the angle range in radians.\n" +" X scale is set so that left and right edges of rectangle are at +/-1.\n" +" Isotropic scaling is disabled.\n" +" First derivative is always determined numerically." msgstr "" -"Это расширение предназначено для вставки, обновления и удаления эффектов " -"объектов из презентаций JessyInk. Подробности вы найдёте на сайте code." -"google.com/p/jessyink." +"Перед вызовом эффекта выделите прямоугольник,\n" +"который определит масштаб по X и Y.\n" +"\n" +"С полярными координатами:\n" +" Значения по X для начала и конца определяют диапазон\n" +" угла в радианах. Масштаб X установлен так, что левые и\n" +" правые края прямоугольника находятся в +/-1.\n" +" Изотропное масштабирование отключено.\n" +" Первое производное всегда задается числами." -#: ../share/extensions/jessyInk_export.inx.h:1 -msgid "JessyInk zipped pdf or png output" -msgstr "Вывод презентации JessyInk в PDF или PNG" +#: ../share/extensions/funcplot.inx.h:21 +#: ../share/extensions/param_curves.inx.h:16 +msgid "Functions" +msgstr "Функции" -#: ../share/extensions/jessyInk_export.inx.h:4 -msgid "Resolution:" -msgstr "Разрешение:" +#: ../share/extensions/funcplot.inx.h:22 +#: ../share/extensions/param_curves.inx.h:17 +msgid "" +"Standard Python math functions are available:\n" +"\n" +"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" +"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" +"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" +"cos(x); sin(x); tan(x); degrees(x); radians(x); \n" +"cosh(x); sinh(x); tanh(x).\n" +"\n" +"The constants pi and e are also available." +msgstr "" +"Возможно использование следующих типовых\n" +"математических функций Python:\n" +"\n" +"ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" +"modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" +"acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" +"cos(x); sin(x); tan(x); degrees(x); radians(x); \n" +"cosh(x); sinh(x); tanh(x).\n" +"\n" +"Также возможно использование констант pi и e." -#: ../share/extensions/jessyInk_export.inx.h:5 -msgid "PDF" -msgstr "PDF" +#: ../share/extensions/funcplot.inx.h:31 +msgid "Function:" +msgstr "Функция" -#: ../share/extensions/jessyInk_export.inx.h:6 -msgid "PNG" -msgstr "PNG" +#: ../share/extensions/funcplot.inx.h:32 +msgid "Calculate first derivative numerically" +msgstr "Рассчитать первую производную в цифрах" + +#: ../share/extensions/funcplot.inx.h:33 +#, fuzzy +msgid "First derivative:" +msgstr "Первая производная" + +#: ../share/extensions/funcplot.inx.h:34 +#, fuzzy +msgid "Clip with rectangle" +msgstr "Ширина прямоугольника" + +#: ../share/extensions/funcplot.inx.h:35 +#: ../share/extensions/param_curves.inx.h:28 +msgid "Remove rectangle" +msgstr "Удалить прямоугольник" -#: ../share/extensions/jessyInk_export.inx.h:8 -msgid "" -"This extension allows you to export a JessyInk presentation once you created " -"an export layer in your browser. Please see code.google.com/p/jessyink for " -"more details." +#: ../share/extensions/funcplot.inx.h:36 +#: ../share/extensions/param_curves.inx.h:29 +msgid "Draw Axes" +msgstr "Нарисовать оси" + +#: ../share/extensions/funcplot.inx.h:37 +msgid "Add x-axis endpoints" msgstr "" -"Это расширение предназначено для экспорта презентации JessyInk после " -"создания слоя экспорта. Подробности вы найдёте на сайте code.google.com/p/" -"jessyink." -#: ../share/extensions/jessyInk_export.inx.h:9 -msgid "JessyInk zipped pdf or png output (*.zip)" -msgstr "Вывод презентации JessyInk в PDF или PNG (*.png)" +#: ../share/extensions/gcodetools_about.inx.h:1 +msgid "About" +msgstr "" -#: ../share/extensions/jessyInk_export.inx.h:10 +#: ../share/extensions/gcodetools_about.inx.h:2 msgid "" -"Creates a zip file containing pdfs or pngs of all slides of a JessyInk " -"presentation." +"Gcodetools was developed to make simple Gcode from Inkscape's paths. Gcode " +"is a special format which is used in most of CNC machines. So Gcodetools " +"allows you to use Inkscape as CAM program. It can be use with a lot of " +"machine types: Mills Lathes Laser and Plasma cutters and engravers Mill " +"engravers Plotters etc. To get more info visit developers page at http://www." +"cnc-club.ru/gcodetools" msgstr "" -"Создать архив ZIP с выводом всех слайдов презентации JessyInk в PDF или PNG" -#: ../share/extensions/jessyInk_install.inx.h:1 -msgid "Install/update" -msgstr "Установить/обновить" - -#: ../share/extensions/jessyInk_install.inx.h:3 +#: ../share/extensions/gcodetools_about.inx.h:4 +#: ../share/extensions/gcodetools_area.inx.h:54 +#: ../share/extensions/gcodetools_check_for_updates.inx.h:4 +#: ../share/extensions/gcodetools_dxf_points.inx.h:26 +#: ../share/extensions/gcodetools_engraving.inx.h:32 +#: ../share/extensions/gcodetools_graffiti.inx.h:43 +#: ../share/extensions/gcodetools_lathe.inx.h:47 +#: ../share/extensions/gcodetools_orientation_points.inx.h:15 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:36 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:18 +#: ../share/extensions/gcodetools_tools_library.inx.h:13 msgid "" -"This extension allows you to install or update the JessyInk script in order " -"to turn your SVG file into a presentation. Please see code.google.com/p/" -"jessyink for more details." +"Gcodetools plug-in: converts paths to Gcode (using circular interpolation), " +"makes offset paths and engraves sharp corners using cone cutters. This plug-" +"in calculates Gcode for paths using circular interpolation or linear motion " +"when needed. Tutorials, manuals and support can be found at English support " +"forum: http://www.cnc-club.ru/gcodetools and Russian support forum: http://" +"www.cnc-club.ru/gcodetoolsru Credits: Nick Drobchenko, Vladimir Kalyaev, " +"John Brooker, Henry Nicolas, Chris Lusby Taylor. Gcodetools ver. 1.7" msgstr "" -"Это расширение предназначено для установки или обновления сценария JessyInk " -"для превращения документа SVG в презентацию. Подробности вы найдёте на сайте " -"code.google.com/p/jessyink." -#: ../share/extensions/jessyInk_keyBindings.inx.h:1 -msgid "Key bindings" -msgstr "Клавиатурные комбинации" +#: ../share/extensions/gcodetools_about.inx.h:5 +#: ../share/extensions/gcodetools_area.inx.h:55 +#: ../share/extensions/gcodetools_check_for_updates.inx.h:5 +#: ../share/extensions/gcodetools_dxf_points.inx.h:27 +#: ../share/extensions/gcodetools_engraving.inx.h:33 +#: ../share/extensions/gcodetools_graffiti.inx.h:44 +#: ../share/extensions/gcodetools_lathe.inx.h:48 +#: ../share/extensions/gcodetools_orientation_points.inx.h:16 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:37 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:19 +#: ../share/extensions/gcodetools_tools_library.inx.h:14 +msgid "Gcodetools" +msgstr "Инструменты Gcode" -#: ../share/extensions/jessyInk_keyBindings.inx.h:2 -msgid "Slide mode" -msgstr "Режим слайдов" +#: ../share/extensions/gcodetools_area.inx.h:1 +msgid "Area" +msgstr "Площадь" -#: ../share/extensions/jessyInk_keyBindings.inx.h:3 -msgid "Back (with effects):" -msgstr "Назад (с эффектами):" +#: ../share/extensions/gcodetools_area.inx.h:2 +msgid "Maximum area cutting curves:" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:4 -msgid "Next (with effects):" -msgstr "Вперёд (с эффектами):" +#: ../share/extensions/gcodetools_area.inx.h:3 +#, fuzzy +msgid "Area width:" +msgstr "Ширина:" -#: ../share/extensions/jessyInk_keyBindings.inx.h:5 -msgid "Back (without effects):" -msgstr "Назад (без эффектов):" +#: ../share/extensions/gcodetools_area.inx.h:4 +msgid "Area tool overlap (0..0.9):" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:6 -msgid "Next (without effects):" -msgstr "Вперёд (без эффектов):" +#: ../share/extensions/gcodetools_area.inx.h:5 +msgid "" +"\"Create area offset\": creates several Inkscape path offsets to fill " +"original path's area up to \"Area radius\" value. Outlines start from \"1/2 D" +"\" up to \"Area width\" total width with \"D\" steps where D is taken from " +"the nearest tool definition (\"Tool diameter\" value). Only one offset will " +"be created if the \"Area width\" is equal to \"1/2 D\"." +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:7 -msgid "First slide:" -msgstr "Первый слайд:" +#: ../share/extensions/gcodetools_area.inx.h:6 +#, fuzzy +msgid "Fill area" +msgstr "Заливка замкнутой области" -#: ../share/extensions/jessyInk_keyBindings.inx.h:8 -msgid "Last slide:" -msgstr "Последний слайд:" +#: ../share/extensions/gcodetools_area.inx.h:7 +#, fuzzy +msgid "Area fill angle" +msgstr "Левый угол" -#: ../share/extensions/jessyInk_keyBindings.inx.h:9 -msgid "Switch to index mode:" -msgstr "Переключиться на режим содержания" +#: ../share/extensions/gcodetools_area.inx.h:8 +msgid "Area fill shift" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:10 -msgid "Switch to drawing mode:" -msgstr "Переключиться на режим рисования" +#: ../share/extensions/gcodetools_area.inx.h:9 +#, fuzzy +msgid "Filling method" +msgstr "Способ деления:" -#: ../share/extensions/jessyInk_keyBindings.inx.h:11 -msgid "Set duration:" -msgstr "Установить длительность:" +#: ../share/extensions/gcodetools_area.inx.h:10 +msgid "Zig zag" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:12 -msgid "Add slide:" -msgstr "Добавить слайд:" +#: ../share/extensions/gcodetools_area.inx.h:12 +msgid "Area artifacts" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:13 -msgid "Toggle progress bar:" -msgstr "Переключить индикатор хода презентации:" +#: ../share/extensions/gcodetools_area.inx.h:13 +msgid "Artifact diameter:" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:14 -msgid "Reset timer:" -msgstr "Сбросить таймер:" +#: ../share/extensions/gcodetools_area.inx.h:14 +msgid "Action:" +msgstr "Действие:" -#: ../share/extensions/jessyInk_keyBindings.inx.h:15 +#: ../share/extensions/gcodetools_area.inx.h:15 +msgid "mark with an arrow" +msgstr "" + +#: ../share/extensions/gcodetools_area.inx.h:16 #, fuzzy -msgid "Export presentation:" -msgstr "Направление текста" +msgid "mark with style" +msgstr "Стиль переключателя" -#: ../share/extensions/jessyInk_keyBindings.inx.h:17 -msgid "Switch to slide mode:" -msgstr "Переключиться на режим слайдов" +#: ../share/extensions/gcodetools_area.inx.h:17 +#, fuzzy +msgid "delete" +msgstr "Удаление" -#: ../share/extensions/jessyInk_keyBindings.inx.h:18 -msgid "Set path width to default:" -msgstr "Вернуться к исходной толщине контура:" +#: ../share/extensions/gcodetools_area.inx.h:18 +msgid "" +"Usage: 1. Select all Area Offsets (gray outlines) 2. Object/Ungroup (Shift" +"+Ctrl+G) 3. Press Apply Suspected small objects will be marked out by " +"colored arrows." +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:19 -msgid "Set path width to 1:" -msgstr "Сделать толщину контура равной 1:" +#: ../share/extensions/gcodetools_area.inx.h:19 +#: ../share/extensions/gcodetools_lathe.inx.h:12 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:1 +msgid "Path to Gcode" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:20 -msgid "Set path width to 3:" -msgstr "Сделать толщину контура равной 3:" +#: ../share/extensions/gcodetools_area.inx.h:20 +#: ../share/extensions/gcodetools_lathe.inx.h:13 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:2 +#, fuzzy +msgid "Biarc interpolation tolerance:" +msgstr "Шагов интерполяции" -#: ../share/extensions/jessyInk_keyBindings.inx.h:21 -msgid "Set path width to 5:" -msgstr "Сделать толщину контура равной 5:" +#: ../share/extensions/gcodetools_area.inx.h:21 +#: ../share/extensions/gcodetools_lathe.inx.h:14 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:3 +#, fuzzy +msgid "Maximum splitting depth:" +msgstr "Упрощение контуров" -#: ../share/extensions/jessyInk_keyBindings.inx.h:22 -msgid "Set path width to 7:" -msgstr "Сделать толщину контура равной 7:" +#: ../share/extensions/gcodetools_area.inx.h:22 +#: ../share/extensions/gcodetools_lathe.inx.h:15 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:4 +msgid "Cutting order:" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:23 -msgid "Set path width to 9:" -msgstr "Сделать толщину контура равной 9:" +#: ../share/extensions/gcodetools_area.inx.h:23 +#: ../share/extensions/gcodetools_lathe.inx.h:16 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:5 +#, fuzzy +msgid "Depth function:" +msgstr "Функция красного" -#: ../share/extensions/jessyInk_keyBindings.inx.h:24 -msgid "Set path color to blue:" -msgstr "Сделать цвет контура синим:" +#: ../share/extensions/gcodetools_area.inx.h:24 +#: ../share/extensions/gcodetools_lathe.inx.h:17 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:6 +msgid "Sort paths to reduse rapid distance" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:25 -msgid "Set path color to cyan:" -msgstr "Сделать цвет контура циановым:" +#: ../share/extensions/gcodetools_area.inx.h:25 +#: ../share/extensions/gcodetools_lathe.inx.h:18 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:7 +msgid "Subpath by subpath" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:26 -msgid "Set path color to green:" -msgstr "Сделать цвет контура зелёным:" +#: ../share/extensions/gcodetools_area.inx.h:26 +#: ../share/extensions/gcodetools_lathe.inx.h:19 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:8 +#, fuzzy +msgid "Path by path" +msgstr "Вставить контур" -#: ../share/extensions/jessyInk_keyBindings.inx.h:27 -msgid "Set path color to black:" -msgstr "Сделать цвет контура чёрным:" +#: ../share/extensions/gcodetools_area.inx.h:27 +#: ../share/extensions/gcodetools_lathe.inx.h:20 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:9 +msgid "Pass by Pass" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:28 -msgid "Set path color to magenta:" -msgstr "Сделать цвет контура пурпурным:" +#: ../share/extensions/gcodetools_area.inx.h:28 +#: ../share/extensions/gcodetools_lathe.inx.h:21 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:10 +msgid "" +"Biarc interpolation tolerance is the maximum distance between path and its " +"approximation. The segment will be split into two segments if the distance " +"between path's segment and its approximation exceeds biarc interpolation " +"tolerance. For depth function c=color intensity from 0.0 (white) to 1.0 " +"(black), d is the depth defined by orientation points, s - surface defined " +"by orientation points." +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:29 -msgid "Set path color to orange:" -msgstr "Сделать цвет контура оранжевым:" +#: ../share/extensions/gcodetools_area.inx.h:30 +#: ../share/extensions/gcodetools_engraving.inx.h:8 +#: ../share/extensions/gcodetools_graffiti.inx.h:22 +#: ../share/extensions/gcodetools_lathe.inx.h:23 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:12 +#, fuzzy +msgid "Scale along Z axis:" +msgstr "Основная длина оси Z" -#: ../share/extensions/jessyInk_keyBindings.inx.h:30 -msgid "Set path color to red:" -msgstr "Сделать цвет контура красным:" +#: ../share/extensions/gcodetools_area.inx.h:31 +#: ../share/extensions/gcodetools_engraving.inx.h:9 +#: ../share/extensions/gcodetools_graffiti.inx.h:23 +#: ../share/extensions/gcodetools_lathe.inx.h:24 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:13 +msgid "Offset along Z axis:" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:31 -msgid "Set path color to white:" -msgstr "Сделать цвет контура белым:" +#: ../share/extensions/gcodetools_area.inx.h:32 +#: ../share/extensions/gcodetools_engraving.inx.h:10 +#: ../share/extensions/gcodetools_graffiti.inx.h:24 +#: ../share/extensions/gcodetools_lathe.inx.h:25 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:14 +msgid "Select all paths if nothing is selected" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:32 -msgid "Set path color to yellow:" -msgstr "Сделать цвет контура жёлтым:" +#: ../share/extensions/gcodetools_area.inx.h:33 +#: ../share/extensions/gcodetools_engraving.inx.h:11 +#: ../share/extensions/gcodetools_graffiti.inx.h:25 +#: ../share/extensions/gcodetools_lathe.inx.h:26 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:15 +#, fuzzy +msgid "Minimum arc radius:" +msgstr "Внутренний радиус:" -#: ../share/extensions/jessyInk_keyBindings.inx.h:33 -msgid "Undo last path segment:" -msgstr "Отменить последний сегмент контура:" +#: ../share/extensions/gcodetools_area.inx.h:34 +#: ../share/extensions/gcodetools_engraving.inx.h:12 +#: ../share/extensions/gcodetools_graffiti.inx.h:26 +#: ../share/extensions/gcodetools_lathe.inx.h:27 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:16 +msgid "Comment Gcode:" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:34 -msgid "Index mode" -msgstr "Режим содержания" +#: ../share/extensions/gcodetools_area.inx.h:35 +#: ../share/extensions/gcodetools_engraving.inx.h:13 +#: ../share/extensions/gcodetools_graffiti.inx.h:27 +#: ../share/extensions/gcodetools_lathe.inx.h:28 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:17 +msgid "Get additional comments from object's properties" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:35 -msgid "Select the slide to the left:" -msgstr "Выбрать слайд слева:" +#: ../share/extensions/gcodetools_area.inx.h:36 +#: ../share/extensions/gcodetools_dxf_points.inx.h:8 +#: ../share/extensions/gcodetools_engraving.inx.h:14 +#: ../share/extensions/gcodetools_graffiti.inx.h:28 +#: ../share/extensions/gcodetools_lathe.inx.h:29 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:18 +msgid "Preferences" +msgstr "Параметры" -#: ../share/extensions/jessyInk_keyBindings.inx.h:36 -msgid "Select the slide to the right:" -msgstr "Выбрать слайд справа:" +#: ../share/extensions/gcodetools_area.inx.h:37 +#: ../share/extensions/gcodetools_dxf_points.inx.h:9 +#: ../share/extensions/gcodetools_engraving.inx.h:15 +#: ../share/extensions/gcodetools_graffiti.inx.h:29 +#: ../share/extensions/gcodetools_lathe.inx.h:30 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:19 +msgid "File:" +msgstr "Файл:" -#: ../share/extensions/jessyInk_keyBindings.inx.h:37 -msgid "Select the slide above:" -msgstr "Выбрать слайд выше:" +#: ../share/extensions/gcodetools_area.inx.h:38 +#: ../share/extensions/gcodetools_dxf_points.inx.h:10 +#: ../share/extensions/gcodetools_engraving.inx.h:16 +#: ../share/extensions/gcodetools_graffiti.inx.h:30 +#: ../share/extensions/gcodetools_lathe.inx.h:31 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:20 +msgid "Add numeric suffix to filename" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:38 -msgid "Select the slide below:" -msgstr "Выбрать слайд ниже:" +#: ../share/extensions/gcodetools_area.inx.h:39 +#: ../share/extensions/gcodetools_dxf_points.inx.h:11 +#: ../share/extensions/gcodetools_engraving.inx.h:17 +#: ../share/extensions/gcodetools_graffiti.inx.h:31 +#: ../share/extensions/gcodetools_lathe.inx.h:32 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:21 +msgid "Directory:" +msgstr "Каталог:" -#: ../share/extensions/jessyInk_keyBindings.inx.h:39 -msgid "Previous page:" -msgstr "Предыдущая страница:" +#: ../share/extensions/gcodetools_area.inx.h:40 +#: ../share/extensions/gcodetools_dxf_points.inx.h:12 +#: ../share/extensions/gcodetools_engraving.inx.h:18 +#: ../share/extensions/gcodetools_graffiti.inx.h:32 +#: ../share/extensions/gcodetools_lathe.inx.h:33 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:22 +msgid "Z safe height for G00 move over blank:" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:40 -msgid "Next page:" -msgstr "Следующая страница:" +#: ../share/extensions/gcodetools_area.inx.h:41 +#: ../share/extensions/gcodetools_dxf_points.inx.h:13 +#: ../share/extensions/gcodetools_engraving.inx.h:19 +#: ../share/extensions/gcodetools_graffiti.inx.h:13 +#: ../share/extensions/gcodetools_lathe.inx.h:34 +#: ../share/extensions/gcodetools_orientation_points.inx.h:6 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:23 +msgid "Units (mm or in):" +msgstr "Единица (mm или in):" -#: ../share/extensions/jessyInk_keyBindings.inx.h:41 -msgid "Decrease number of columns:" -msgstr "Уменьшить число столбцов:" +#: ../share/extensions/gcodetools_area.inx.h:42 +#: ../share/extensions/gcodetools_dxf_points.inx.h:14 +#: ../share/extensions/gcodetools_engraving.inx.h:20 +#: ../share/extensions/gcodetools_graffiti.inx.h:33 +#: ../share/extensions/gcodetools_lathe.inx.h:35 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:24 +msgid "Post-processor:" +msgstr "Послеобработчик:" -#: ../share/extensions/jessyInk_keyBindings.inx.h:42 -msgid "Increase number of columns:" -msgstr "Увеличить число столбцов:" +#: ../share/extensions/gcodetools_area.inx.h:43 +#: ../share/extensions/gcodetools_dxf_points.inx.h:15 +#: ../share/extensions/gcodetools_engraving.inx.h:21 +#: ../share/extensions/gcodetools_graffiti.inx.h:34 +#: ../share/extensions/gcodetools_lathe.inx.h:36 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:25 +msgid "Additional post-processor:" +msgstr "" -#: ../share/extensions/jessyInk_keyBindings.inx.h:43 -msgid "Set number of columns to default:" -msgstr "Вернуться к исходному числу столбцов:" +#: ../share/extensions/gcodetools_area.inx.h:44 +#: ../share/extensions/gcodetools_dxf_points.inx.h:16 +#: ../share/extensions/gcodetools_engraving.inx.h:22 +#: ../share/extensions/gcodetools_graffiti.inx.h:35 +#: ../share/extensions/gcodetools_lathe.inx.h:37 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:26 +msgid "Generate log file" +msgstr "Создать файл журнала" -#: ../share/extensions/jessyInk_keyBindings.inx.h:45 -msgid "" -"This extension allows you customise the key bindings JessyInk uses. Please " -"see code.google.com/p/jessyink for more details." -msgstr "" -"Это расширение предназначено настройки клавиатурных комбинаций, используемых " -"в презентации JessyInk. Подробности вы найдёте на сайте code.google.com/p/" -"jessyink." +#: ../share/extensions/gcodetools_area.inx.h:45 +#: ../share/extensions/gcodetools_dxf_points.inx.h:17 +#: ../share/extensions/gcodetools_engraving.inx.h:23 +#: ../share/extensions/gcodetools_graffiti.inx.h:36 +#: ../share/extensions/gcodetools_lathe.inx.h:38 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:27 +#, fuzzy +msgid "Full path to log file:" +msgstr "Цвет сплошной заливки" -#: ../share/extensions/jessyInk_masterSlide.inx.h:1 -msgid "Master slide" -msgstr "Мастер-слайд" +#: ../share/extensions/gcodetools_area.inx.h:48 +#: ../share/extensions/gcodetools_dxf_points.inx.h:20 +#: ../share/extensions/gcodetools_engraving.inx.h:26 +#: ../share/extensions/gcodetools_graffiti.inx.h:37 +#: ../share/extensions/gcodetools_lathe.inx.h:41 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:30 +#, fuzzy +msgctxt "GCode postprocessor" +msgid "None" +msgstr "Нет" -#: ../share/extensions/jessyInk_masterSlide.inx.h:3 -#: ../share/extensions/jessyInk_transitions.inx.h:3 -msgid "Name of layer:" -msgstr "Имя слоя:" +#: ../share/extensions/gcodetools_area.inx.h:49 +#: ../share/extensions/gcodetools_dxf_points.inx.h:21 +#: ../share/extensions/gcodetools_engraving.inx.h:27 +#: ../share/extensions/gcodetools_graffiti.inx.h:38 +#: ../share/extensions/gcodetools_lathe.inx.h:42 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:31 +#, fuzzy +msgid "Parameterize Gcode" +msgstr "Параметры" -#: ../share/extensions/jessyInk_masterSlide.inx.h:4 -msgid "If no layer name is supplied, the master slide is unset." -msgstr "Если имя слайда не указано, определение мастер-слайда снимается" +#: ../share/extensions/gcodetools_area.inx.h:50 +#: ../share/extensions/gcodetools_dxf_points.inx.h:22 +#: ../share/extensions/gcodetools_engraving.inx.h:28 +#: ../share/extensions/gcodetools_graffiti.inx.h:39 +#: ../share/extensions/gcodetools_lathe.inx.h:43 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:32 +msgid "Flip y axis and parameterize Gcode" +msgstr "" -#: ../share/extensions/jessyInk_masterSlide.inx.h:6 -msgid "" -"This extension allows you to change the master slide JessyInk uses. Please " -"see code.google.com/p/jessyink for more details." +#: ../share/extensions/gcodetools_area.inx.h:51 +#: ../share/extensions/gcodetools_dxf_points.inx.h:23 +#: ../share/extensions/gcodetools_engraving.inx.h:29 +#: ../share/extensions/gcodetools_graffiti.inx.h:40 +#: ../share/extensions/gcodetools_lathe.inx.h:44 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:33 +msgid "Round all values to 4 digits" +msgstr "" + +#: ../share/extensions/gcodetools_area.inx.h:52 +#: ../share/extensions/gcodetools_dxf_points.inx.h:24 +#: ../share/extensions/gcodetools_engraving.inx.h:30 +#: ../share/extensions/gcodetools_graffiti.inx.h:41 +#: ../share/extensions/gcodetools_lathe.inx.h:45 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:34 +msgid "Fast pre-penetrate" +msgstr "" + +#: ../share/extensions/gcodetools_check_for_updates.inx.h:1 +msgid "Check for updates" msgstr "" -"Это расширение предназначено для смены используемого JessyInk мастер-слайда. " -"Подробности вы найдёте на сайте code.google.com/p/jessyink." -#: ../share/extensions/jessyInk_mouseHandler.inx.h:1 -msgid "Mouse handler" -msgstr "Обработка действий мышью" +#: ../share/extensions/gcodetools_check_for_updates.inx.h:2 +msgid "Check for Gcodetools latest stable version and try to get the updates." +msgstr "" -#: ../share/extensions/jessyInk_mouseHandler.inx.h:2 -msgid "Mouse settings:" -msgstr "Параметры мыши:" +#: ../share/extensions/gcodetools_dxf_points.inx.h:1 +#, fuzzy +msgid "DXF Points" +msgstr "Пункты" -#: ../share/extensions/jessyInk_mouseHandler.inx.h:4 -msgid "No-click" -msgstr "Без щелчков" +#: ../share/extensions/gcodetools_dxf_points.inx.h:2 +#, fuzzy +msgid "DXF points" +msgstr "Импорт DXF" -#: ../share/extensions/jessyInk_mouseHandler.inx.h:5 -msgid "Dragging/zoom" -msgstr "Перетаскивание/масштабирование" +#: ../share/extensions/gcodetools_dxf_points.inx.h:3 +#, fuzzy +msgid "Convert selection:" +msgstr "Инвертировать выделение" -#: ../share/extensions/jessyInk_mouseHandler.inx.h:7 +#: ../share/extensions/gcodetools_dxf_points.inx.h:4 msgid "" -"This extension allows you customise the mouse handler JessyInk uses. Please " -"see code.google.com/p/jessyink for more details." +"Convert selected objects to drill points (as dxf_import plugin does). Also " +"you can save original shape. Only the start point of each curve will be " +"used. Also you can manually select object, open XML editor (Shift+Ctrl+X) " +"and add or remove XML tag 'dxfpoint' with any value." msgstr "" -"Это расширение предназначено для настройки обработки действий мышью. " -"Подробности вы найдёте на сайте code.google.com/p/jessyink." -#: ../share/extensions/jessyInk_summary.inx.h:1 -msgid "Summary" -msgstr "Сводка" +#: ../share/extensions/gcodetools_dxf_points.inx.h:5 +msgid "set as dxfpoint and save shape" +msgstr "" -#: ../share/extensions/jessyInk_summary.inx.h:3 -msgid "" -"This extension allows you to obtain information about the JessyInk script, " -"effects and transitions contained in this SVG file. Please see code.google." -"com/p/jessyink for more details." +#: ../share/extensions/gcodetools_dxf_points.inx.h:6 +msgid "set as dxfpoint and draw arrow" msgstr "" -"Это расширение предназначено для получения информации о сценарии JessyInk, " -"эффектах и переходах, содержащихся в текущем документе SVG. Подробности вы " -"найдёте на сайте code.google.com/p/jessyink." -#: ../share/extensions/jessyInk_transitions.inx.h:1 -msgid "Transitions" -msgstr "Переходы" +#: ../share/extensions/gcodetools_dxf_points.inx.h:7 +msgid "clear dxfpoint sign" +msgstr "" -#: ../share/extensions/jessyInk_transitions.inx.h:6 -msgid "Transition in effect" -msgstr "Эффект перехода для появления" +#: ../share/extensions/gcodetools_engraving.inx.h:1 +#, fuzzy +msgid "Engraving" +msgstr "Альфа-гравировка №1" -#: ../share/extensions/jessyInk_transitions.inx.h:9 -msgid "Fade" -msgstr "Угасание" +#: ../share/extensions/gcodetools_engraving.inx.h:2 +msgid "Smooth convex corners between this value and 180 degrees:" +msgstr "" -#: ../share/extensions/jessyInk_transitions.inx.h:11 -msgid "Transition out effect" -msgstr "Эффект перехода для исчезновения" +#: ../share/extensions/gcodetools_engraving.inx.h:3 +#, fuzzy +msgid "Maximum distance for engraving (mm/inch):" +msgstr "Максимальное смещение по X, px" -#: ../share/extensions/jessyInk_transitions.inx.h:13 -msgid "" -"This extension allows you to change the transition JessyInk uses for the " -"selected layer. Please see code.google.com/p/jessyink for more details." +#: ../share/extensions/gcodetools_engraving.inx.h:4 +msgid "Accuracy factor (2 low to 10 high):" msgstr "" -"Это расширение предназначено для изменения перехода, используемого JessyInk " -"для текущего слоя. Подробности вы найдёте на сайте code.google.com/p/" -"jessyink." -#: ../share/extensions/jessyInk_uninstall.inx.h:1 -msgid "Uninstall/remove" -msgstr "Удалить сценарий презентации" +#: ../share/extensions/gcodetools_engraving.inx.h:5 +msgid "Draw additional graphics to see engraving path" +msgstr "" -#: ../share/extensions/jessyInk_uninstall.inx.h:3 -msgid "Remove script" -msgstr "Удалить сценарий" +#: ../share/extensions/gcodetools_engraving.inx.h:6 +msgid "" +"This function creates path to engrave letters or any shape with sharp " +"angles. Cutter's depth as a function of radius is defined by the tool. Depth " +"may be any Python expression. For instance: cone....(45 " +"degrees)......................: w cone....(height/diameter=10/3)..: 10*w/3 " +"sphere..(radius r)...........................: math.sqrt(max(0,r**2-w**2)) " +"ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4" +msgstr "" -#: ../share/extensions/jessyInk_uninstall.inx.h:4 -msgid "Remove effects" -msgstr "Удалить эффекты" +#: ../share/extensions/gcodetools_graffiti.inx.h:1 +msgid "Graffiti" +msgstr "Граффити" -#: ../share/extensions/jessyInk_uninstall.inx.h:5 -msgid "Remove master slide assignment" -msgstr "Удалить определение мастер-слайда" +#: ../share/extensions/gcodetools_graffiti.inx.h:2 +#, fuzzy +msgid "Maximum segment length:" +msgstr "Макс. длина сегмента (px)" -#: ../share/extensions/jessyInk_uninstall.inx.h:6 -msgid "Remove transitions" -msgstr "Удалить переходы" +#: ../share/extensions/gcodetools_graffiti.inx.h:3 +#, fuzzy +msgid "Minimal connector radius:" +msgstr "Внутренний радиус:" -#: ../share/extensions/jessyInk_uninstall.inx.h:7 -msgid "Remove auto-texts" -msgstr "Удалить весь автотекст" +#: ../share/extensions/gcodetools_graffiti.inx.h:4 +#, fuzzy +msgid "Start position (x;y):" +msgstr "Размещение макета:" -#: ../share/extensions/jessyInk_uninstall.inx.h:8 -msgid "Remove views" -msgstr "Удалить виды" +#: ../share/extensions/gcodetools_graffiti.inx.h:5 +msgid "Create preview" +msgstr "Создать предпросмотр" -#: ../share/extensions/jessyInk_uninstall.inx.h:9 -msgid "Please select the parts of JessyInk you want to uninstall/remove." -msgstr "Выберите, какие части JessyInk вы хотите удалить." +#: ../share/extensions/gcodetools_graffiti.inx.h:6 +#, fuzzy +msgid "Create linearization preview" +msgstr "Создать линейный градиент" -#: ../share/extensions/jessyInk_uninstall.inx.h:11 -msgid "" -"This extension allows you to uninstall the JessyInk script. Please see code." -"google.com/p/jessyink for more details." +#: ../share/extensions/gcodetools_graffiti.inx.h:7 +#, fuzzy +msgid "Preview's size (px):" +msgstr "Размер квадрата (px):" + +#: ../share/extensions/gcodetools_graffiti.inx.h:8 +msgid "Preview's paint emmit (pts/s):" msgstr "" -"Это расширение предназначено для удаления сценария презентации JessyInk из " -"документа SVG. Подробности вы найдёте на сайте code.google.com/p/jessyink." -#: ../share/extensions/jessyInk_video.inx.h:1 -msgid "Video" -msgstr "Видео" +#: ../share/extensions/gcodetools_graffiti.inx.h:10 +#: ../share/extensions/gcodetools_orientation_points.inx.h:3 +msgid "Orientation type:" +msgstr "Ориентация:" -#: ../share/extensions/jessyInk_video.inx.h:3 -msgid "" -"This extension puts a JessyInk video element on the current slide (layer). " -"This element allows you to integrate a video into your JessyInk " -"presentation. Please see code.google.com/p/jessyink for more details." -msgstr "" -"Это расширение предназначено для вставки видеоэлемента в текущий слайд " -"(слой) презентации JessyInk. Подробности вы найдёте на сайте code.google.com/" -"p/jessyink." +#: ../share/extensions/gcodetools_graffiti.inx.h:11 +#: ../share/extensions/gcodetools_orientation_points.inx.h:4 +#, fuzzy +msgid "Z surface:" +msgstr "Критерий сортировки граней на оси Z:" -#: ../share/extensions/jessyInk_view.inx.h:5 -msgid "Remove view" -msgstr "Удалить вид" +#: ../share/extensions/gcodetools_graffiti.inx.h:12 +#: ../share/extensions/gcodetools_orientation_points.inx.h:5 +#, fuzzy +msgid "Z depth:" +msgstr "Глубина:" -#: ../share/extensions/jessyInk_view.inx.h:6 -msgid "Choose order number 0 to set the initial view of a slide." -msgstr "Выберите ноль номером порядка, чтобы установить исходный вид слайда." +#: ../share/extensions/gcodetools_graffiti.inx.h:14 +#: ../share/extensions/gcodetools_orientation_points.inx.h:7 +msgid "2-points mode (move and rotate, maintained aspect ratio X/Y)" +msgstr "" -#: ../share/extensions/jessyInk_view.inx.h:8 -msgid "" -"This extension allows you to set, update and remove views for a JessyInk " -"presentation. Please see code.google.com/p/jessyink for more details." +#: ../share/extensions/gcodetools_graffiti.inx.h:15 +#: ../share/extensions/gcodetools_orientation_points.inx.h:8 +msgid "3-points mode (move, rotate and mirror, different X/Y scale)" msgstr "" -"Это расширение предназначено установки, обновления и удаления видов " -"презентации JessyInk. Подробности вы найдёте на сайте code.google.com/p/" -"jessyink." -#: ../share/extensions/layers2svgfont.inx.h:1 -msgid "3 - Convert Glyph Layers to SVG Font" -msgstr "3. Сконвертировать слои глифов в шрифт SVG" +#: ../share/extensions/gcodetools_graffiti.inx.h:16 +#: ../share/extensions/gcodetools_orientation_points.inx.h:9 +#, fuzzy +msgid "graffiti points" +msgstr "Ориентация" -#: ../share/extensions/layers2svgfont.inx.h:2 -#: ../share/extensions/new_glyph_layer.inx.h:3 -#: ../share/extensions/next_glyph_layer.inx.h:2 -#: ../share/extensions/previous_glyph_layer.inx.h:2 -#: ../share/extensions/setup_typography_canvas.inx.h:7 -#: ../share/extensions/svgfont2layers.inx.h:3 -msgid "Typography" -msgstr "Шрифтовый дизайн" +#: ../share/extensions/gcodetools_graffiti.inx.h:17 +#: ../share/extensions/gcodetools_orientation_points.inx.h:10 +#, fuzzy +msgid "in-out reference point" +msgstr "Параметры Градиентной заливки" -#: ../share/extensions/layout_nup.inx.h:1 -msgid "N-up layout" +#: ../share/extensions/gcodetools_graffiti.inx.h:20 +#: ../share/extensions/gcodetools_orientation_points.inx.h:13 +msgid "" +"Orientation points are used to calculate transformation (offset,scale,mirror," +"rotation in XY plane) of the path. 3-points mode only: do not put all three " +"into one line (use 2-points mode instead). You can modify Z surface, Z depth " +"values later using text tool (3rd coordinates). If there are no orientation " +"points inside current layer they are taken from the upper layer. Do not " +"ungroup orientation points! You can select them using double click to enter " +"the group or by Ctrl+Click. Now press apply to create control points " +"(independent set for each layer)." msgstr "" -#: ../share/extensions/layout_nup.inx.h:2 +#: ../share/extensions/gcodetools_lathe.inx.h:1 #, fuzzy -msgid "Page dimensions" -msgstr "Размеры" +msgid "Lathe" +msgstr "Растушёвка" -#: ../share/extensions/layout_nup.inx.h:4 +#: ../share/extensions/gcodetools_lathe.inx.h:2 #, fuzzy -msgid "Size X:" -msgstr "Ячеек по X:" +msgid "Lathe width:" +msgstr "Ширина:" -#: ../share/extensions/layout_nup.inx.h:5 +#: ../share/extensions/gcodetools_lathe.inx.h:3 #, fuzzy -msgid "Size Y:" -msgstr "Ячеек по Y:" +msgid "Fine cut width:" +msgstr "Ширина:" -#: ../share/extensions/layout_nup.inx.h:6 -#: ../share/extensions/printing_marks.inx.h:13 -msgid "Top:" -msgstr "Верхнее:" +#: ../share/extensions/gcodetools_lathe.inx.h:4 +#, fuzzy +msgid "Fine cut count:" +msgstr "Число кнопок:" -#: ../share/extensions/layout_nup.inx.h:7 -#: ../share/extensions/printing_marks.inx.h:14 -msgid "Bottom:" -msgstr "Нижнее:" +#: ../share/extensions/gcodetools_lathe.inx.h:5 +#, fuzzy +msgid "Create fine cut using:" +msgstr "Создавать новые объекты с:" -#: ../share/extensions/layout_nup.inx.h:8 -#: ../share/extensions/printing_marks.inx.h:15 -msgid "Left:" -msgstr "Левое:" +#: ../share/extensions/gcodetools_lathe.inx.h:6 +msgid "Lathe X axis remap:" +msgstr "" -#: ../share/extensions/layout_nup.inx.h:9 -#: ../share/extensions/printing_marks.inx.h:16 -msgid "Right:" -msgstr "Правое:" +#: ../share/extensions/gcodetools_lathe.inx.h:7 +msgid "Lathe Z axis remap:" +msgstr "" -#: ../share/extensions/layout_nup.inx.h:10 +#: ../share/extensions/gcodetools_lathe.inx.h:8 #, fuzzy -msgid "Page margins" -msgstr "Левое поле" +msgid "Move path" +msgstr "Смещать текстуры" -#: ../share/extensions/layout_nup.inx.h:11 -#, fuzzy -msgid "Layout dimensions" -msgstr "Размещение макета:" +#: ../share/extensions/gcodetools_lathe.inx.h:9 +msgid "Offset path" +msgstr "Растянутый контур" -#: ../share/extensions/layout_nup.inx.h:13 +#: ../share/extensions/gcodetools_lathe.inx.h:10 #, fuzzy -msgid "Cols:" -msgstr "Столбцов:" +msgid "Lathe modify path" +msgstr "Изменение контура" -#: ../share/extensions/layout_nup.inx.h:14 -msgid "Auto calculate layout size" +#: ../share/extensions/gcodetools_lathe.inx.h:11 +msgid "" +"This function modifies path so it will be able to be cut with the " +"rectangular cutter." msgstr "" -#: ../share/extensions/layout_nup.inx.h:15 +#: ../share/extensions/gcodetools_orientation_points.inx.h:1 #, fuzzy -msgid "Layout padding" -msgstr "Размещение макета:" +msgid "Orientation points" +msgstr "Ориентация" -#: ../share/extensions/layout_nup.inx.h:16 -#, fuzzy -msgid "Layout margins" -msgstr "Левое поле" +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:1 +msgid "Prepare path for plasma" +msgstr "" -#: ../share/extensions/layout_nup.inx.h:17 -#: ../share/extensions/printing_marks.inx.h:2 -msgid "Marks" -msgstr "Метки" +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:2 +msgid "Prepare path for plasma or laser cuters" +msgstr "" -#: ../share/extensions/layout_nup.inx.h:18 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:3 #, fuzzy -msgid "Place holder" -msgstr "Черная дыра" +msgid "Create in-out paths" +msgstr "Рисовать кривую Спиро" -#: ../share/extensions/layout_nup.inx.h:19 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:4 #, fuzzy -msgid "Cutting marks" -msgstr "Метки для печати" +msgid "In-out path length:" +msgstr "Длина контура" -#: ../share/extensions/layout_nup.inx.h:20 -msgid "Padding guide" +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:5 +msgid "In-out path max distance to reference point:" msgstr "" -#: ../share/extensions/layout_nup.inx.h:21 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:6 +msgid "In-out path type:" +msgstr "" + +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:7 +msgid "In-out path radius for round path:" +msgstr "" + +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:8 #, fuzzy -msgid "Margin guide" -msgstr "Перемещение направляющей" +msgid "Replace original path" +msgstr "Заменить текст" -#: ../share/extensions/layout_nup.inx.h:22 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:9 +msgid "Do not add in-out reference points" +msgstr "" + +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:10 #, fuzzy -msgid "Padding box" -msgstr "Площадка (BB)" +msgid "Prepare corners" +msgstr "углу страницы" -#: ../share/extensions/layout_nup.inx.h:23 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:11 #, fuzzy -msgid "Margin box" -msgstr "art box" +msgid "Stepout distance for corners:" +msgstr "Прилипать к углам площадки" -#: ../share/extensions/layout_nup.inx.h:25 -msgid "" -"\n" -"Parameters:\n" -" * Page size: width and height.\n" -" * Page margins: extra space around each page.\n" -" * Layout rows and cols.\n" -" * Layout size: width and height, auto calculated if one is 0.\n" -" * Auto calculate layout size: don't use the layout size values.\n" -" * Layout margins: white space around each part of the layout.\n" -" * Layout padding: inner padding for each part of the layout.\n" -" " +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:12 +msgid "Maximum angle for corner (0-180 deg):" msgstr "" -#: ../share/extensions/layout_nup.inx.h:36 -#: ../share/extensions/perfectboundcover.inx.h:20 -#: ../share/extensions/printing_marks.inx.h:21 -#: ../share/extensions/svgcalendar.inx.h:13 -msgid "Layout" -msgstr "Размещение" +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:14 +#, fuzzy +msgid "Perpendicular" +msgstr "Перпендикулярная биссектриса" -#: ../share/extensions/lindenmayer.inx.h:1 -msgid "L-system" -msgstr "Система Линденмайера" +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:15 +#, fuzzy +msgid "Tangent" +msgstr "Пурпурный" -#: ../share/extensions/lindenmayer.inx.h:2 -msgid "Axiom and rules" -msgstr "Аксиома и правила" +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:16 +msgid "-------------------------------------------------" +msgstr "" -#: ../share/extensions/lindenmayer.inx.h:3 -#, fuzzy -msgid "Axiom:" -msgstr "Аксиома" +#: ../share/extensions/gcodetools_tools_library.inx.h:1 +msgid "Tools library" +msgstr "" -#: ../share/extensions/lindenmayer.inx.h:4 -msgid "Rules:" -msgstr "Правила:" +#: ../share/extensions/gcodetools_tools_library.inx.h:2 +#, fuzzy +msgid "Tools type:" +msgstr "Логические операции" -#: ../share/extensions/lindenmayer.inx.h:6 +#: ../share/extensions/gcodetools_tools_library.inx.h:3 #, fuzzy -msgid "Step length (px):" -msgstr "Длина шага (px)" +msgid "default" +msgstr "(по умолчанию)" -#: ../share/extensions/lindenmayer.inx.h:8 -#, fuzzy, no-c-format -msgid "Randomize step (%):" -msgstr "Случайный шаг (%)" +#: ../share/extensions/gcodetools_tools_library.inx.h:4 +#, fuzzy +msgid "cylinder" +msgstr "Полилиния" -#: ../share/extensions/lindenmayer.inx.h:9 +#: ../share/extensions/gcodetools_tools_library.inx.h:5 #, fuzzy -msgid "Left angle:" -msgstr "Левый угол" +msgid "cone" +msgstr "углу" -#: ../share/extensions/lindenmayer.inx.h:10 +#: ../share/extensions/gcodetools_tools_library.inx.h:6 #, fuzzy -msgid "Right angle:" -msgstr "Правый угол" +msgid "plasma" +msgstr "За_ставка" -#: ../share/extensions/lindenmayer.inx.h:12 -#, fuzzy, no-c-format -msgid "Randomize angle (%):" -msgstr "Случайный угол (%)" +#: ../share/extensions/gcodetools_tools_library.inx.h:7 +#, fuzzy +msgid "tangent knife" +msgstr "Смещение по касательной:" -#: ../share/extensions/lindenmayer.inx.h:14 -msgid "" -"\n" -"The path is generated by applying the \n" -"substitutions of Rules to the Axiom, \n" -"Order times. The following commands are \n" -"recognized in Axiom and Rules:\n" -"\n" -"Any of A,B,C,D,E,F: draw forward \n" -"\n" -"Any of G,H,I,J,K,L: move forward \n" -"\n" -"+: turn left\n" -"\n" -"-: turn right\n" -"\n" -"|: turn 180 degrees\n" -"\n" -"[: remember point\n" -"\n" -"]: return to remembered point\n" +#: ../share/extensions/gcodetools_tools_library.inx.h:8 +msgid "lathe cutter" +msgstr "" + +#: ../share/extensions/gcodetools_tools_library.inx.h:9 +msgid "graffiti" msgstr "" -"\n" -"Контур создаётся подстановкой\n" -"правил к аксиоме столько раз, \n" -"сколько порядков указано.\n" -"Следующие команды могут быть\n" -"использованы в аксиоме и правилах:\n" -"\n" -"A, B, C, D, E или F: рисовать вперёд \n" -"\n" -"G, H, I, J, K или L: двигаться вперёд \n" -"\n" -"+: повернуть влево\n" -"\n" -"-: повернуть вправо\n" -"\n" -"|: повернуть на 180 градусов\n" -"\n" -"[: запомнить точку\n" -"\n" -"]: вернуться к запомненной точке\n" -#: ../share/extensions/lorem_ipsum.inx.h:1 -msgid "Lorem ipsum" -msgstr "Шаблонный текст" +#: ../share/extensions/gcodetools_tools_library.inx.h:10 +msgid "Just check tools" +msgstr "" -#: ../share/extensions/lorem_ipsum.inx.h:3 -msgid "Number of paragraphs:" -msgstr "Количество абзацев:" +#: ../share/extensions/gcodetools_tools_library.inx.h:11 +msgid "" +"Selected tool type fills appropriate default values. You can change these " +"values using the Text tool later on. The topmost (z order) tool in the " +"active layer is used. If there is no tool inside the current layer it is " +"taken from the upper layer. Press Apply to create new tool." +msgstr "" -#: ../share/extensions/lorem_ipsum.inx.h:4 -msgid "Sentences per paragraph:" -msgstr "Предложений в абзаце:" +#: ../share/extensions/generate_voronoi.inx.h:1 +msgid "Voronoi Pattern" +msgstr "Мозаика Вороного" -#: ../share/extensions/lorem_ipsum.inx.h:5 +#: ../share/extensions/generate_voronoi.inx.h:3 #, fuzzy -msgid "Paragraph length fluctuation (sentences):" -msgstr "Вариативность длины абзацев (в предложениях)" +msgid "Average size of cell (px):" +msgstr "Средний размер ячейки (px)" -#: ../share/extensions/lorem_ipsum.inx.h:7 +#: ../share/extensions/generate_voronoi.inx.h:4 +#, fuzzy +msgid "Size of Border (px):" +msgstr "Толщина границы (px):" + +#: ../share/extensions/generate_voronoi.inx.h:6 +#, fuzzy msgid "" -"This effect creates the standard \"Lorem Ipsum\" pseudolatin placeholder " -"text. If a flowed text is selected, Lorem Ipsum is added to it; otherwise a " -"new flowed text object, the size of the page, is created in a new layer." +"Generate a random pattern of Voronoi cells. The pattern will be accessible " +"in the Fill and Stroke dialog. You must select an object or a group.\n" +"\n" +"If border is zero, the pattern will be discontinuous at the edges. Use a " +"positive border, preferably greater than the cell size, to produce a smooth " +"join of the pattern at the edges. Use a negative border to reduce the size " +"of the pattern and get an empty border." msgstr "" -"Этот эффект создает стандартный шаблонный текст \"Lorem Ipsum\". Если эффект " -"применяется к блоку с заверстанным текстом, этот текст заливается в блок, " -"если нет — в новый блок заверстанного текста размером со страницу, в новом " -"слое." - -#: ../share/extensions/markers_strokepaint.inx.h:1 -msgid "Color Markers" -msgstr "Раскрасить маркеры…" +"Если граница равна нулю, мозаика на краях будет непрерывной. Чтобы получить " +"ровное соединение на краях мозаики, используйте положительное значение, по " +"возможности, больше размера ячейки. Для получения пустой границы используйте " +"отрицательное значение." -#: ../share/extensions/markers_strokepaint.inx.h:2 -msgid "From object" -msgstr "Из объекта" +#: ../share/extensions/gimp_xcf.inx.h:1 +msgid "GIMP XCF" +msgstr "GIMP XCF" -#: ../share/extensions/markers_strokepaint.inx.h:3 -msgid "Marker type:" -msgstr "Тип маркера:" +#: ../share/extensions/gimp_xcf.inx.h:3 +msgid "Save Guides" +msgstr "Сохранить направляющие" -#: ../share/extensions/markers_strokepaint.inx.h:4 -msgid "Invert fill and stroke colors" -msgstr "Инвертировать цвета заливки и обводки" +#: ../share/extensions/gimp_xcf.inx.h:4 +msgid "Save Grid" +msgstr "Сохранить сетку" -#: ../share/extensions/markers_strokepaint.inx.h:5 -msgid "Assign alpha" -msgstr "Назначить альфа-канал" +#: ../share/extensions/gimp_xcf.inx.h:5 +msgid "Save Background" +msgstr "Сохранить фон" -#: ../share/extensions/markers_strokepaint.inx.h:6 -msgid "solid" -msgstr "С заливкой" +#: ../share/extensions/gimp_xcf.inx.h:6 +msgid "File Resolution:" +msgstr "Разрешение файла:" -#: ../share/extensions/markers_strokepaint.inx.h:7 -msgid "filled" -msgstr "Без заливки" +#: ../share/extensions/gimp_xcf.inx.h:8 +msgid "" +"This extension exports the document to Gimp XCF format according to the " +"following options:\n" +" * Save Guides: convert all guides to Gimp guides.\n" +" * Save Grid: convert the first rectangular grid to a Gimp grid (note " +"that the default Inkscape grid is very narrow when shown in Gimp).\n" +" * Save Background: add the document background to each converted layer.\n" +" * File Resolution: XCF file resolution, in DPI.\n" +"\n" +"Each first level layer is converted to a Gimp layer. Sublayers are " +"concatenated and converted with their first level parent layer into a single " +"Gimp layer." +msgstr "" -#: ../share/extensions/markers_strokepaint.inx.h:10 -msgid "Assign fill color" -msgstr "Установить цвет заливки" +#: ../share/extensions/gimp_xcf.inx.h:15 +msgid "GIMP XCF maintaining layers (*.xcf)" +msgstr "GIMP XCF со слоями (*.xcf)" -#: ../share/extensions/markers_strokepaint.inx.h:11 -msgid "Stroke" -msgstr "Обводка" +#: ../share/extensions/grid_cartesian.inx.h:1 +msgid "Cartesian Grid" +msgstr "Картезианская сетка" -#: ../share/extensions/markers_strokepaint.inx.h:12 -msgid "Assign stroke color" -msgstr "Установить цвет обводки" +#: ../share/extensions/grid_cartesian.inx.h:2 +#: ../share/extensions/grid_isometric.inx.h:10 +#, fuzzy +msgid "Border Thickness (px):" +msgstr "Толщина границы (px)" -#: ../share/extensions/measure.inx.h:1 -msgid "Measure Path" -msgstr "Измерить контур" +#: ../share/extensions/grid_cartesian.inx.h:3 +#, fuzzy +msgid "X Axis" +msgstr "Ось X" -#: ../share/extensions/measure.inx.h:2 -msgid "Measure" -msgstr "Измерить контур" +#: ../share/extensions/grid_cartesian.inx.h:4 +#, fuzzy +msgid "Major X Divisions:" +msgstr "Основных делений по X" -#: ../share/extensions/measure.inx.h:3 -msgid "Measurement Type: " -msgstr "Что измерить:" +#: ../share/extensions/grid_cartesian.inx.h:5 +#, fuzzy +msgid "Major X Division Spacing (px):" +msgstr "Интервал между основными делениями по X [px]" -#: ../share/extensions/measure.inx.h:4 +#: ../share/extensions/grid_cartesian.inx.h:6 #, fuzzy -msgid "Text Orientation: " -msgstr "Направление текста" +msgid "Subdivisions per Major X Division:" +msgstr "Делений в основном делении по X" -#: ../share/extensions/measure.inx.h:5 -msgid "Angle [with Fixed Angle option only] (°):" -msgstr "" +#: ../share/extensions/grid_cartesian.inx.h:7 +msgid "Logarithmic X Subdiv. (Base given by entry above)" +msgstr "Логарифмическое подразделение по X (основа задаётся выше)" -#: ../share/extensions/measure.inx.h:6 -msgid "Font size (px):" -msgstr "Кегль шрифта (px):" +#: ../share/extensions/grid_cartesian.inx.h:8 +#, fuzzy +msgid "Subsubdivs. per X Subdivision:" +msgstr "Делений в основном делении по X" -#: ../share/extensions/measure.inx.h:7 -msgid "Offset (px):" -msgstr "Смещение текстовой метки (px):" +#: ../share/extensions/grid_cartesian.inx.h:9 +#, fuzzy +msgid "Halve X Subsubdiv. Frequency after 'n' Subdivs. (log only):" +msgstr "" +"Половинное подразделение по X, Частота после 'n' подразделений (только " +"логарфим.)" -#: ../share/extensions/measure.inx.h:8 -msgid "Precision:" -msgstr "Точность:" +#: ../share/extensions/grid_cartesian.inx.h:10 +#, fuzzy +msgid "Major X Division Thickness (px):" +msgstr "Толщина основного деления по X (px)" -#: ../share/extensions/measure.inx.h:9 -msgid "Scale Factor (Drawing:Real Length) = 1:" -msgstr "Масштаб (Рисунок:Реальная длина) = 1:" +#: ../share/extensions/grid_cartesian.inx.h:11 +#, fuzzy +msgid "Minor X Division Thickness (px):" +msgstr "Толщина обычного деления по X (px)" -#: ../share/extensions/measure.inx.h:10 -msgid "Length Unit:" -msgstr "Единица длины:" +#: ../share/extensions/grid_cartesian.inx.h:12 +#, fuzzy +msgid "Subminor X Division Thickness (px):" +msgstr "Толщина обычного деления по X (px)" -#: ../share/extensions/measure.inx.h:12 -msgctxt "measure extension" -msgid "Area" -msgstr "Площадь" +#: ../share/extensions/grid_cartesian.inx.h:13 +#, fuzzy +msgid "Y Axis" +msgstr "Ось Y" -#: ../share/extensions/measure.inx.h:13 +#: ../share/extensions/grid_cartesian.inx.h:14 #, fuzzy -msgctxt "measure extension" -msgid "Center of Mass" -msgstr "Масса пера" +msgid "Major Y Divisions:" +msgstr "Основных делений по Y" -#: ../share/extensions/measure.inx.h:14 +#: ../share/extensions/grid_cartesian.inx.h:15 #, fuzzy -msgctxt "measure extension" -msgid "Text On Path" -msgstr "_Разместить по контуру" +msgid "Major Y Division Spacing (px):" +msgstr "Интервал между основными делениями по Y [px]" -#: ../share/extensions/measure.inx.h:15 +#: ../share/extensions/grid_cartesian.inx.h:16 #, fuzzy -msgctxt "measure extension" -msgid "Fixed Angle" -msgstr "Угол пера" +msgid "Subdivisions per Major Y Division:" +msgstr "Делений в основном делении по Y" -#: ../share/extensions/measure.inx.h:18 -#, fuzzy, no-c-format -msgid "" -"This effect measures the length, area, or center-of-mass of the selected " -"paths. Length and area are added as a text object with the selected units. " -"Center-of-mass is shown as a cross symbol.\n" -"\n" -" * Text display format can be either Text-On-Path, or stand-alone text at a " -"specified angle.\n" -" * The number of significant digits can be controlled by the Precision " -"field.\n" -" * The Offset field controls the distance from the text to the path.\n" -" * The Scale factor can be used to make measurements in scaled drawings. " -"For example, if 1 cm in the drawing equals 2.5 m in the real world, Scale " -"must be set to 250.\n" -" * When calculating area, the result should be precise for polygons and " -"Bezier curves. If a circle is used, the area may be too high by as much as " -"0.03%." -msgstr "" -"При помощи этого эффекта можно измерить длину выбранного контура и " -"прикрепить к этому контуру вычисленный результат в виде текста.\n" -"\n" -"· Число значимых цифр контролируется параметром «Точность».\n" -"· Параметр «Смещение» задает расстояние между текстом и контуром.\n" -"· Параметр «Масштаб» позволяет измерять предметы с известным масштабом. К " -"примеру, если на рисунке 1 см равен 2,5 м, необходимо указать 250.\n" -"· При расчёте площади результат точен для многоугольников и кривых Безье. " -"Для окружностей рассчитанная площадь может быть больше реальной на 0,03%." +#: ../share/extensions/grid_cartesian.inx.h:17 +msgid "Logarithmic Y Subdiv. (Base given by entry above)" +msgstr "Логарифмическое подразделение по Y (основа задаётся выше)" -#: ../share/extensions/merge_styles.inx.h:1 -msgid "Merge Styles into CSS" -msgstr "" +#: ../share/extensions/grid_cartesian.inx.h:18 +#, fuzzy +msgid "Subsubdivs. per Y Subdivision:" +msgstr "Делений в основном делении по Y" -#: ../share/extensions/merge_styles.inx.h:2 -msgid "" -"All selected nodes will be grouped together and their common style " -"attributes will create a new class, this class will replace the existing " -"inline style attributes. Please use a name which best describes the kinds of " -"objects and their common context for best effect." +#: ../share/extensions/grid_cartesian.inx.h:19 +#, fuzzy +msgid "Halve Y Subsubdiv. Frequency after 'n' Subdivs. (log only):" msgstr "" +"Половинное подразделение по Y, Частота после 'n' подразделений (только " +"логарфим.)" -#: ../share/extensions/merge_styles.inx.h:3 -msgid "New Class Name:" -msgstr "" +#: ../share/extensions/grid_cartesian.inx.h:20 +#, fuzzy +msgid "Major Y Division Thickness (px):" +msgstr "Толщина основного деления по Y (px)" -#: ../share/extensions/merge_styles.inx.h:4 +#: ../share/extensions/grid_cartesian.inx.h:21 #, fuzzy -msgid "Stylesheet" -msgstr "Стиль" +msgid "Minor Y Division Thickness (px):" +msgstr "Толщина обычного деления по Y (px)" -#: ../share/extensions/motion.inx.h:1 -msgid "Motion" -msgstr "Движение" +#: ../share/extensions/grid_cartesian.inx.h:22 +#, fuzzy +msgid "Subminor Y Division Thickness (px):" +msgstr "Толщина обычного деления по Y (px)" -#: ../share/extensions/motion.inx.h:2 +#: ../share/extensions/grid_isometric.inx.h:1 #, fuzzy -msgid "Magnitude:" -msgstr "Величина" +msgid "Isometric Grid" +msgstr "Аксонометрическая сетка" -#: ../share/extensions/new_glyph_layer.inx.h:1 -msgid "2 - Add Glyph Layer" -msgstr "2. Добавить слой глифа" +#: ../share/extensions/grid_isometric.inx.h:2 +#, fuzzy +msgid "X Divisions [x2]:" +msgstr "Основных делений по X" -#: ../share/extensions/new_glyph_layer.inx.h:2 -msgid "Unicode character:" -msgstr "Символ >никода:" +#: ../share/extensions/grid_isometric.inx.h:3 +msgid "Y Divisions [x2] [> 1/2 X Div]:" +msgstr "" -#: ../share/extensions/next_glyph_layer.inx.h:1 -msgid "View Next Glyph" -msgstr "Просмотреть следующий глиф" +#: ../share/extensions/grid_isometric.inx.h:4 +#, fuzzy +msgid "Division Spacing (px):" +msgstr "Интервал между основными делениями по X [px]" -#: ../share/extensions/param_curves.inx.h:1 -msgid "Parametric Curves" -msgstr "Параметрические кривые" +#: ../share/extensions/grid_isometric.inx.h:5 +#, fuzzy +msgid "Subdivisions per Major Division:" +msgstr "Делений в основном делении по X" -#: ../share/extensions/param_curves.inx.h:2 -msgid "Range and Sampling" -msgstr "Диапазон и выборка" +#: ../share/extensions/grid_isometric.inx.h:6 +#, fuzzy +msgid "Subsubdivs per Subdivision:" +msgstr "Делений в основном делении по X" -#: ../share/extensions/param_curves.inx.h:3 +#: ../share/extensions/grid_isometric.inx.h:7 #, fuzzy -msgid "Start t-value:" -msgstr "Начальное значение t:" +msgid "Major Division Thickness (px):" +msgstr "Толщина основного деления по X (px)" -#: ../share/extensions/param_curves.inx.h:4 +#: ../share/extensions/grid_isometric.inx.h:8 #, fuzzy -msgid "End t-value:" -msgstr "Конечное значение t:" +msgid "Minor Division Thickness (px):" +msgstr "Толщина обычного деления по X (px)" -#: ../share/extensions/param_curves.inx.h:5 +#: ../share/extensions/grid_isometric.inx.h:9 #, fuzzy -msgid "Multiply t-range by 2*pi" -msgstr "Умножить диапазон t на 2*pi" +msgid "Subminor Division Thickness (px):" +msgstr "Толщина обычного деления по X (px)" -#: ../share/extensions/param_curves.inx.h:6 +#: ../share/extensions/grid_polar.inx.h:1 +msgid "Polar Grid" +msgstr "Полярная сетка" + +#: ../share/extensions/grid_polar.inx.h:2 #, fuzzy -msgid "X-value of rectangle's left:" -msgstr "Координата левой стороны прямоугольника по оси X:" +msgid "Centre Dot Diameter (px):" +msgstr "Диаметр центральной точки (px)" -#: ../share/extensions/param_curves.inx.h:7 +#: ../share/extensions/grid_polar.inx.h:3 #, fuzzy -msgid "X-value of rectangle's right:" -msgstr "Координата правой стороны прямоугольника по оси X:" +msgid "Circumferential Labels:" +msgstr "Периферические метки" -#: ../share/extensions/param_curves.inx.h:8 +#: ../share/extensions/grid_polar.inx.h:5 #, fuzzy -msgid "Y-value of rectangle's bottom:" -msgstr "Координата низа прямоугольника по оси Y:" +msgid "Degrees" +msgstr "Градусов" -#: ../share/extensions/param_curves.inx.h:9 +#: ../share/extensions/grid_polar.inx.h:6 #, fuzzy -msgid "Y-value of rectangle's top:" -msgstr "Координата верха прямоугольника по оси Y:" +msgid "Circumferential Label Size (px):" +msgstr "Кегль периферических меток (px)" -#: ../share/extensions/param_curves.inx.h:10 +#: ../share/extensions/grid_polar.inx.h:7 #, fuzzy -msgid "Samples:" -msgstr "Число выборок:" +msgid "Circumferential Label Outset (px):" +msgstr "Отступ периферических меток (px)" -#: ../share/extensions/param_curves.inx.h:14 +#: ../share/extensions/grid_polar.inx.h:8 #, fuzzy -msgid "" -"Select a rectangle before calling the extension, it will determine X and Y " -"scales.\n" -"First derivatives are always determined numerically." -msgstr "" -"Перед вызовом расширения выделите прямоугольник,\n" -"который задаст масштабы X и Y.\n" -"\n" -"Первые производные функции всегда определяются числами." +msgid "Circular Divisions" +msgstr "Основных круговых делений" -#: ../share/extensions/param_curves.inx.h:26 +#: ../share/extensions/grid_polar.inx.h:9 #, fuzzy -msgid "X-Function:" -msgstr "Функция по оси X:" +msgid "Major Circular Divisions:" +msgstr "Основных круговых делений" -#: ../share/extensions/param_curves.inx.h:27 +#: ../share/extensions/grid_polar.inx.h:10 #, fuzzy -msgid "Y-Function:" -msgstr "Функция по оси X:" +msgid "Major Circular Division Spacing (px):" +msgstr "Интервал между основными круговыми делениями (px)" -#: ../share/extensions/pathalongpath.inx.h:1 -msgid "Pattern along Path" -msgstr "Текстура по контуру" +#: ../share/extensions/grid_polar.inx.h:11 +#, fuzzy +msgid "Subdivisions per Major Circular Division:" +msgstr "Малых круговых делений в большом" -#: ../share/extensions/pathalongpath.inx.h:3 -msgid "Copies of the pattern:" -msgstr "Копий текстуры:" +#: ../share/extensions/grid_polar.inx.h:12 +msgid "Logarithmic Subdiv. (Base given by entry above)" +msgstr "Логарифмическое подразделение (основа задаётся выше)" -#: ../share/extensions/pathalongpath.inx.h:4 -msgid "Deformation type:" -msgstr "Тип деформации:" +#: ../share/extensions/grid_polar.inx.h:13 +#, fuzzy +msgid "Major Circular Division Thickness (px):" +msgstr "Толщина большого кругового деления (px)" -#: ../share/extensions/pathalongpath.inx.h:5 -#: ../share/extensions/pathscatter.inx.h:5 -msgid "Space between copies:" -msgstr "Интервал между копиями:" +#: ../share/extensions/grid_polar.inx.h:14 +#, fuzzy +msgid "Minor Circular Division Thickness (px):" +msgstr "Толщина малого кругового деления (px)" -#: ../share/extensions/pathalongpath.inx.h:6 -#: ../share/extensions/pathscatter.inx.h:6 -msgid "Normal offset:" -msgstr "Обычное смещение:" +#: ../share/extensions/grid_polar.inx.h:15 +#, fuzzy +msgid "Angular Divisions" +msgstr "Угловых делений" -#: ../share/extensions/pathalongpath.inx.h:7 -#: ../share/extensions/pathscatter.inx.h:7 -msgid "Tangential offset:" -msgstr "Смещение по касательной:" +#: ../share/extensions/grid_polar.inx.h:16 +#, fuzzy +msgid "Angle Divisions:" +msgstr "Угловых делений" -#: ../share/extensions/pathalongpath.inx.h:8 -#: ../share/extensions/pathscatter.inx.h:8 -msgid "Pattern is vertical" -msgstr "Текстура вертикальна" +#: ../share/extensions/grid_polar.inx.h:17 +#, fuzzy +msgid "Angle Divisions at Centre:" +msgstr "Угловых делений в центре" -#: ../share/extensions/pathalongpath.inx.h:9 -#: ../share/extensions/pathscatter.inx.h:10 -msgid "Duplicate the pattern before deformation" -msgstr "Продублировать текстуру перед деформацией" +#: ../share/extensions/grid_polar.inx.h:18 +#, fuzzy +msgid "Subdivisions per Major Angular Division:" +msgstr "Малых угловых делений в большом" -#: ../share/extensions/pathalongpath.inx.h:14 -msgid "Snake" -msgstr "Змейка" +#: ../share/extensions/grid_polar.inx.h:19 +#, fuzzy +msgid "Minor Angle Division End 'n' Divs. Before Centre:" +msgstr "Деление малого угла заканчивается за это число делений до центра" -#: ../share/extensions/pathalongpath.inx.h:15 -msgid "Ribbon" -msgstr "Лента" +#: ../share/extensions/grid_polar.inx.h:20 +#, fuzzy +msgid "Major Angular Division Thickness (px):" +msgstr "Толщина большого углового деления (px)" -#: ../share/extensions/pathalongpath.inx.h:17 +#: ../share/extensions/grid_polar.inx.h:21 #, fuzzy -msgid "" -"This effect scatters or bends a pattern along arbitrary \"skeleton\" paths. " -"The pattern is the topmost object in the selection. Groups of paths, shapes " -"or clones are allowed." -msgstr "" -"Этот эффект рассеивает текстурный объект по произвольному скелетному " -"контуру. Текстура является верхним объектом в выделении. Допустимы группы из " -"контуров, фигур и клонов." +msgid "Minor Angular Division Thickness (px):" +msgstr "Толщина малого углового деления (px)" -#: ../share/extensions/pathscatter.inx.h:1 -msgid "Scatter" -msgstr "Рассеивание" +#: ../share/extensions/guides_creator.inx.h:1 +msgid "Guides creator" +msgstr "Создать направляющие" + +#: ../share/extensions/guides_creator.inx.h:2 +#, fuzzy +msgid "Regular guides" +msgstr "Прямоугольная сетка" + +#: ../share/extensions/guides_creator.inx.h:3 +#, fuzzy +msgid "Guides preset:" +msgstr "Создать направляющие" + +#: ../share/extensions/guides_creator.inx.h:6 +msgid "Start from edges" +msgstr "Начать от краёв" -#: ../share/extensions/pathscatter.inx.h:3 -msgid "Follow path orientation" -msgstr "Следовать ориентации контура" +#: ../share/extensions/guides_creator.inx.h:7 +msgid "Delete existing guides" +msgstr "Удалить существующие направляющие" -#: ../share/extensions/pathscatter.inx.h:4 -msgid "Stretch spaces to fit skeleton length" -msgstr "Растянуть промежутки до заполнения длины контура" +#: ../share/extensions/guides_creator.inx.h:8 +msgid "Custom..." +msgstr "Другой..." -#: ../share/extensions/pathscatter.inx.h:9 -msgid "Original pattern will be:" -msgstr "Исходная текстура будет:" +#: ../share/extensions/guides_creator.inx.h:9 +msgid "Golden ratio" +msgstr "Золотое сечение" -#: ../share/extensions/pathscatter.inx.h:11 -msgid "If pattern is a group, pick group members" -msgstr "" +#: ../share/extensions/guides_creator.inx.h:10 +msgid "Rule-of-third" +msgstr "Правило третей" -#: ../share/extensions/pathscatter.inx.h:12 -msgid "Pick group members:" -msgstr "" +#: ../share/extensions/guides_creator.inx.h:11 +#, fuzzy +msgid "Diagonal guides" +msgstr "Прилипать направляющими" -#: ../share/extensions/pathscatter.inx.h:13 -msgid "Moved" -msgstr "Перемещена" +#: ../share/extensions/guides_creator.inx.h:12 +#, fuzzy +msgid "Upper left corner" +msgstr "углу страницы" -#: ../share/extensions/pathscatter.inx.h:14 -msgid "Copied" -msgstr "Скопирована" +#: ../share/extensions/guides_creator.inx.h:13 +#, fuzzy +msgid "Upper right corner" +msgstr "углу страницы" -#: ../share/extensions/pathscatter.inx.h:15 -msgid "Cloned" -msgstr "Склонирована" +#: ../share/extensions/guides_creator.inx.h:14 +#, fuzzy +msgid "Lower left corner" +msgstr "Опустить текущий слой" -#: ../share/extensions/pathscatter.inx.h:16 +#: ../share/extensions/guides_creator.inx.h:15 #, fuzzy -msgid "Randomly" -msgstr "Случайные значения" +msgid "Lower right corner" +msgstr "Опустить текущий слой" -#: ../share/extensions/pathscatter.inx.h:17 +#: ../share/extensions/guides_creator.inx.h:16 #, fuzzy -msgid "Sequentially" -msgstr "Установить заливку" +msgid "Margins" +msgstr "art box" -#: ../share/extensions/pathscatter.inx.h:19 -msgid "" -"This effect scatters a pattern along arbitrary \"skeleton\" paths. The " -"pattern must be the topmost object in the selection. Groups of paths, " -"shapes, clones are allowed." +#: ../share/extensions/guides_creator.inx.h:17 +msgid "Margins preset:" msgstr "" -"Этот эффект рассеивает текстурный объект по произвольному скелетному " -"контуру. Текстура является верхним объектом в выделении. Допустимы группы из " -"контуров, фигур и клонов." -#: ../share/extensions/perfectboundcover.inx.h:1 -msgid "Perfect-Bound Cover Template" -msgstr "Идеально сшитая обложка" +#: ../share/extensions/guides_creator.inx.h:18 +#, fuzzy +msgid "Header margin:" +msgstr "Левое поле" -#: ../share/extensions/perfectboundcover.inx.h:2 -msgid "Book Properties" -msgstr "Параметры книги" +#: ../share/extensions/guides_creator.inx.h:19 +#, fuzzy +msgid "Footer margin:" +msgstr "Вер_хнее:" -#: ../share/extensions/perfectboundcover.inx.h:3 -msgid "Book Width (inches):" -msgstr "Ширина книги (дюймы):" +#: ../share/extensions/guides_creator.inx.h:20 +#, fuzzy +msgid "Left margin:" +msgstr "Левое поле" -#: ../share/extensions/perfectboundcover.inx.h:4 -msgid "Book Height (inches):" -msgstr "Высота книги (дюймы):" +#: ../share/extensions/guides_creator.inx.h:21 +#, fuzzy +msgid "Right margin:" +msgstr "Правое поле" -#: ../share/extensions/perfectboundcover.inx.h:5 -msgid "Number of Pages:" -msgstr "Число страниц:" +#: ../share/extensions/guides_creator.inx.h:22 +#, fuzzy +msgid "Left book page" +msgstr "Левый угол" -#: ../share/extensions/perfectboundcover.inx.h:6 -msgid "Remove existing guides" -msgstr "Удалить существующие направляющие" +#: ../share/extensions/guides_creator.inx.h:23 +#, fuzzy +msgid "Right book page" +msgstr "Правый угол" -#: ../share/extensions/perfectboundcover.inx.h:7 -msgid "Interior Pages" -msgstr "Внутренние страницы" +#: ../share/extensions/guides_creator.inx.h:24 +#, fuzzy +msgctxt "Margin" +msgid "None" +msgstr "Нет" -#: ../share/extensions/perfectboundcover.inx.h:8 -msgid "Paper Thickness Measurement:" -msgstr "Единица толщины бумаги:" +#: ../share/extensions/guillotine.inx.h:1 +msgid "Guillotine" +msgstr "Гильотина" -#: ../share/extensions/perfectboundcover.inx.h:9 -msgid "Pages Per Inch (PPI)" -msgstr "Страниц на дюйм (ppi)" +#: ../share/extensions/guillotine.inx.h:2 +#, fuzzy +msgid "Directory to save images to:" +msgstr "Каталог для сохраняемого изображений:" -#: ../share/extensions/perfectboundcover.inx.h:10 -msgid "Caliper (inches)" -msgstr "Толщина листа (дюймы)" +#: ../share/extensions/guillotine.inx.h:3 +#, fuzzy +msgid "Image name (without extension):" +msgstr "Основа имени файлов (без расширения):" -#: ../share/extensions/perfectboundcover.inx.h:11 -msgid "Points" -msgstr "Пункты" +#: ../share/extensions/guillotine.inx.h:4 +#, fuzzy +msgid "Ignore these settings and use export hints" +msgstr "Игнорировать первую и последнюю точки" -#: ../share/extensions/perfectboundcover.inx.h:12 -msgid "Bond Weight #" -msgstr "Вес бумаги" +#: ../share/extensions/handles.inx.h:1 +msgid "Draw Handles" +msgstr "Нарисовать рычаги" -#: ../share/extensions/perfectboundcover.inx.h:13 -msgid "Specify Width" -msgstr "Укажите ширину:" +#: ../share/extensions/hershey.inx.h:1 +msgid "Hershey Text" +msgstr "" -#: ../share/extensions/perfectboundcover.inx.h:14 -msgid "Value:" -msgstr "Значение:" +#: ../share/extensions/hershey.inx.h:2 +#, fuzzy +msgid "Render Text" +msgstr "Отрисовка" -#: ../share/extensions/perfectboundcover.inx.h:15 -msgid "Cover" -msgstr "Обложка" +#: ../share/extensions/hershey.inx.h:3 +#: ../share/extensions/render_alphabetsoup.inx.h:2 +#: ../share/extensions/render_barcode_datamatrix.inx.h:2 +#: ../share/extensions/render_barcode_qrcode.inx.h:3 +msgid "Text:" +msgstr "Текст:" -#: ../share/extensions/perfectboundcover.inx.h:16 -msgid "Cover Thickness Measurement:" -msgstr "Единица толщины обложки:" +#: ../share/extensions/hershey.inx.h:4 +#, fuzzy +msgid "Action: " +msgstr "Действие:" -#: ../share/extensions/perfectboundcover.inx.h:17 -msgid "Bleed (in):" -msgstr "Выпуск под обрез (дюймы)" +#: ../share/extensions/hershey.inx.h:5 +#, fuzzy +msgid "Font face: " +msgstr "Кегль шрифта:" -#: ../share/extensions/perfectboundcover.inx.h:18 -msgid "Note: Bond Weight # calculations are a best-guess estimate." -msgstr "Примечание: оценка по весу бумаги работает лучше всего" +#: ../share/extensions/hershey.inx.h:6 +#, fuzzy +msgid "Typeset that text" +msgstr "Ввод текста" -#: ../share/extensions/perspective.inx.h:1 -msgid "Perspective" -msgstr "Перспектива" +#: ../share/extensions/hershey.inx.h:7 +#, fuzzy +msgid "Write glyph table" +msgstr "Изменить название глифа" -#: ../share/extensions/pixelsnap.inx.h:1 -msgid "PixelSnap" -msgstr "Выровнять по пиксельной сетке" +#: ../share/extensions/hershey.inx.h:8 +#, fuzzy +msgid "Sans 1-stroke" +msgstr "Снять обводку" -#: ../share/extensions/pixelsnap.inx.h:2 +#: ../share/extensions/hershey.inx.h:9 #, fuzzy -msgid "" -"Snap all paths in selection to pixels. Snaps borders to half-points and " -"fills to full points." -msgstr "" -"Выравнивает все контуры в выделении по пиксельной сетке, делая изображение " -"чётким" +msgid "Sans bold" +msgstr "Полужирное начертание" -#: ../share/extensions/plotter.inx.h:1 -msgid "Plot" +#: ../share/extensions/hershey.inx.h:10 +#, fuzzy +msgid "Serif medium" +msgstr "Средние" + +#: ../share/extensions/hershey.inx.h:11 +msgid "Serif medium italic" msgstr "" -#: ../share/extensions/plotter.inx.h:2 -msgid "" -"Please make sure that all objects you want to plot are converted to paths." +#: ../share/extensions/hershey.inx.h:12 +msgid "Serif bold italic" msgstr "" -#: ../share/extensions/plotter.inx.h:3 +#: ../share/extensions/hershey.inx.h:13 #, fuzzy -msgid "Connection Settings " -msgstr "Cоединения" +msgid "Serif bold" +msgstr "Полужирное начертание" -#: ../share/extensions/plotter.inx.h:4 +#: ../share/extensions/hershey.inx.h:14 #, fuzzy -msgid "Serial port:" -msgstr "Вертикальная точка:" +msgid "Script 1-stroke" +msgstr "Установить обводку" -#: ../share/extensions/plotter.inx.h:5 -msgid "" -"The port of your serial connection, on Windows something like 'COM1', on " -"Linux something like: '/dev/ttyUSB0' (Default: COM1)" +#: ../share/extensions/hershey.inx.h:15 +msgid "Script 1-stroke (alt)" msgstr "" -#: ../share/extensions/plotter.inx.h:6 +#: ../share/extensions/hershey.inx.h:16 #, fuzzy -msgid "Serial baud rate:" -msgstr "Размывание по вертикали:" +msgid "Script medium" +msgstr "Письменность:" -#: ../share/extensions/plotter.inx.h:7 -msgid "The Baud rate of your serial connection (Default: 9600)" -msgstr "" +#: ../share/extensions/hershey.inx.h:17 +#, fuzzy +msgid "Gothic English" +msgstr "Готское письмо" -#: ../share/extensions/plotter.inx.h:8 -msgid "Flow control:" -msgstr "" +#: ../share/extensions/hershey.inx.h:18 +#, fuzzy +msgid "Gothic German" +msgstr "Готское письмо" -#: ../share/extensions/plotter.inx.h:9 -msgid "" -"The Software / Hardware flow control of your serial connection (Default: " -"Software)" -msgstr "" +#: ../share/extensions/hershey.inx.h:19 +#, fuzzy +msgid "Gothic Italian" +msgstr "Готское письмо" -#: ../share/extensions/plotter.inx.h:10 +#: ../share/extensions/hershey.inx.h:20 #, fuzzy -msgid "Command language:" -msgstr "Второй язык:" +msgid "Greek 1-stroke" +msgstr "Установить обводку" -#: ../share/extensions/plotter.inx.h:11 -msgid "The command language to use (Default: HPGL)" -msgstr "" +#: ../share/extensions/hershey.inx.h:21 +#, fuzzy +msgid "Greek medium" +msgstr "Средние" -#: ../share/extensions/plotter.inx.h:12 -msgid "Software (XON/XOFF)" -msgstr "" +#: ../share/extensions/hershey.inx.h:23 +#, fuzzy +msgid "Japanese" +msgstr "Яванский" -#: ../share/extensions/plotter.inx.h:13 +#: ../share/extensions/hershey.inx.h:24 #, fuzzy -msgid "Hardware (RTS/CTS)" -msgstr "Устройства" +msgid "Astrology" +msgstr "Морфология" -#: ../share/extensions/plotter.inx.h:14 -msgid "Hardware (DSR/DTR + RTS/CTS)" +#: ../share/extensions/hershey.inx.h:25 +msgid "Math (lower)" msgstr "" -#: ../share/extensions/plotter.inx.h:16 -msgid "HPGL" -msgstr "" +#: ../share/extensions/hershey.inx.h:26 +#, fuzzy +msgid "Math (upper)" +msgstr "Перпендикулярная биссектриса" -#: ../share/extensions/plotter.inx.h:17 -msgid "DMPL" -msgstr "" +#: ../share/extensions/hershey.inx.h:28 +#, fuzzy +msgid "Meteorology" +msgstr "Морфология" -#: ../share/extensions/plotter.inx.h:18 -msgid "KNK Zing (HPGL variant)" +#: ../share/extensions/hershey.inx.h:29 +msgid "Music" msgstr "" -#: ../share/extensions/plotter.inx.h:19 -msgid "" -"Using wrong settings can under certain circumstances cause Inkscape to " -"freeze. Always save your work before plotting!" -msgstr "" +#: ../share/extensions/hershey.inx.h:30 +#, fuzzy +msgid "Symbolic" +msgstr "Симво_л" -#: ../share/extensions/plotter.inx.h:20 +#: ../share/extensions/hershey.inx.h:31 msgid "" -"This can be a physical serial connection or a USB-to-Serial bridge. Ask your " -"plotter manufacturer for drivers if needed." +" \n" +"\n" +"\n" +"\n" msgstr "" -#: ../share/extensions/plotter.inx.h:21 -msgid "Parallel (LPT) connections are not supported." +#: ../share/extensions/hershey.inx.h:36 +msgid "About..." msgstr "" -#: ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/hershey.inx.h:37 msgid "" -"The speed the pen will move with in centimeters or millimeters per second " -"(depending on your plotter model), set to 0 to omit command. Most plotters " -"ignore this command. (Default: 0)" +"\n" +"This extension renders a line of text using\n" +"\"Hershey\" fonts for plotters, derived from \n" +"NBS SP-424 1976-04, \"A contribution to \n" +"computer typesetting techniques: Tables of\n" +"Coordinates for Hershey's Repertory of\n" +"Occidental Type Fonts and Graphic Symbols.\"\n" +"\n" +"These are not traditional \"outline\" fonts, \n" +"but are instead \"single-stroke\" fonts, or\n" +"\"engraving\" fonts where the character is\n" +"formed by the stroke (and not the fill).\n" +"\n" +"For additional information, please visit:\n" +" www.evilmadscientist.com/go/hershey" msgstr "" -#: ../share/extensions/plotter.inx.h:33 -#, fuzzy -msgid "Rotation (°, clockwise):" -msgstr "Поворот по часовой стрелке" - -#: ../share/extensions/plotter.inx.h:52 +#: ../share/extensions/hpgl_input.inx.h:1 #, fuzzy -msgid "Show debug information" -msgstr "Информация об используемой памяти" +msgid "HPGL Input" +msgstr "Импорт WPG" -#: ../share/extensions/plotter.inx.h:53 +#: ../share/extensions/hpgl_input.inx.h:2 msgid "" -"Check this to get verbose information about the plot without actually " -"sending something to the plotter (A.k.a. data dump) (Default: Unchecked)" +"Please note that you can only open HPGL files written by Inkscape, to open " +"other HPGL files please change their file extension to .plt, make sure you " +"have UniConverter installed and open them again." msgstr "" -#: ../share/extensions/plt_input.inx.h:1 -msgid "AutoCAD Plot Input" -msgstr "Импорт файлов AutoCAD Plot (PLT)" - -#: ../share/extensions/plt_input.inx.h:2 -#: ../share/extensions/plt_output.inx.h:2 -msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)" -msgstr "Файл HP Graphics Language [AutoCAD] (*.plt)" - -#: ../share/extensions/plt_input.inx.h:3 -msgid "Open HPGL plotter files" -msgstr "Открыть файлы плоттеров HPGL" - -#: ../share/extensions/plt_output.inx.h:1 -msgid "AutoCAD Plot Output" -msgstr "Экспорт файлов AutoCAD Plot (PLT)" - -#: ../share/extensions/plt_output.inx.h:3 -msgid "Save a file for plotters" -msgstr "Сохранить файл для плоттеров" - -#: ../share/extensions/polyhedron_3d.inx.h:1 -msgid "3D Polyhedron" -msgstr "Трехмерный многогранник" - -#: ../share/extensions/polyhedron_3d.inx.h:2 -msgid "Model file" -msgstr "Файл модели" - -#: ../share/extensions/polyhedron_3d.inx.h:3 -msgid "Object:" -msgstr "Объект:" - -#: ../share/extensions/polyhedron_3d.inx.h:4 -msgid "Filename:" -msgstr "Имя файла:" +#: ../share/extensions/hpgl_input.inx.h:3 +#: ../share/extensions/hpgl_output.inx.h:4 +#: ../share/extensions/plotter.inx.h:23 +#, fuzzy +msgid "Resolution X (dpi):" +msgstr "Разрешение (dpi)" -#: ../share/extensions/polyhedron_3d.inx.h:5 -msgid "Object Type:" -msgstr "Тип объекта:" +#: ../share/extensions/hpgl_input.inx.h:4 +#: ../share/extensions/hpgl_output.inx.h:5 +#: ../share/extensions/plotter.inx.h:24 +msgid "" +"The amount of steps the plotter moves if it moves for 1 inch on the X axis " +"(Default: 1016.0)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:6 -msgid "Clockwise wound object" -msgstr "Объект повёрнут по часовой стрелке" +#: ../share/extensions/hpgl_input.inx.h:5 +#: ../share/extensions/hpgl_output.inx.h:6 +#: ../share/extensions/plotter.inx.h:25 +#, fuzzy +msgid "Resolution Y (dpi):" +msgstr "Разрешение (dpi)" -#: ../share/extensions/polyhedron_3d.inx.h:7 -msgid "Cube" -msgstr "Куб" +#: ../share/extensions/hpgl_input.inx.h:6 +#: ../share/extensions/hpgl_output.inx.h:7 +#: ../share/extensions/plotter.inx.h:26 +msgid "" +"The amount of steps the plotter moves if it moves for 1 inch on the Y axis " +"(Default: 1016.0)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:8 -msgid "Truncated Cube" -msgstr "Усеченный куб" +#: ../share/extensions/hpgl_input.inx.h:7 +msgid "Show movements between paths" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:9 -msgid "Snub Cube" -msgstr "Усечённый куб" +#: ../share/extensions/hpgl_input.inx.h:8 +msgid "Check this to show movements between paths (Default: Unchecked)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:10 -msgid "Cuboctahedron" -msgstr "Кубоктаэдр" +#: ../share/extensions/hpgl_input.inx.h:9 +#: ../share/extensions/hpgl_output.inx.h:34 +msgid "HP Graphics Language file (*.hpgl)" +msgstr "Файл HP Graphics Language (*.hpgl)" -#: ../share/extensions/polyhedron_3d.inx.h:11 -msgid "Tetrahedron" -msgstr "Тетраэдр" +#: ../share/extensions/hpgl_input.inx.h:10 +#, fuzzy +msgid "Import an HP Graphics Language file" +msgstr "Экспортировать в файл HP Graphics Language" -#: ../share/extensions/polyhedron_3d.inx.h:12 -msgid "Truncated Tetrahedron" -msgstr "Усеченный тетраэдр" +#: ../share/extensions/hpgl_output.inx.h:1 +msgid "HPGL Output" +msgstr "Экспорт в HPGL" -#: ../share/extensions/polyhedron_3d.inx.h:13 -msgid "Octahedron" -msgstr "Октаэдр" +#: ../share/extensions/hpgl_output.inx.h:2 +msgid "" +"Please make sure that all objects you want to save are converted to paths. " +"Please use the plotter extension (Extensions menu) to plot directly over a " +"serial connection." +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:14 -msgid "Truncated Octahedron" -msgstr "Усеченный октаэдр" +#: ../share/extensions/hpgl_output.inx.h:3 +#: ../share/extensions/plotter.inx.h:22 +#, fuzzy +msgid "Plotter Settings " +msgstr "Параметры импорта PDF" -#: ../share/extensions/polyhedron_3d.inx.h:15 -msgid "Icosahedron" -msgstr "Икосаэдр" +#: ../share/extensions/hpgl_output.inx.h:8 +#: ../share/extensions/plotter.inx.h:27 +#, fuzzy +msgid "Pen number:" +msgstr "Номер цвета" -#: ../share/extensions/polyhedron_3d.inx.h:16 -msgid "Truncated Icosahedron" -msgstr "Усеченный икосаэдр" +#: ../share/extensions/hpgl_output.inx.h:9 +#: ../share/extensions/plotter.inx.h:28 +msgid "The number of the pen (tool) to use (Standard: '1')" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:17 -msgid "Small Triambic Icosahedron" -msgstr "Малый звёздчатый икосаэдр" +#: ../share/extensions/hpgl_output.inx.h:10 +#: ../share/extensions/plotter.inx.h:29 +msgid "Pen force (g):" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:18 -msgid "Dodecahedron" -msgstr "Додекаэдр" +#: ../share/extensions/hpgl_output.inx.h:11 +#: ../share/extensions/plotter.inx.h:30 +msgid "" +"The amount of force pushing down the pen in grams, set to 0 to omit command; " +"most plotters ignore this command (Default: 0)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:19 -msgid "Truncated Dodecahedron" -msgstr "Усеченный додекаэдр" +#: ../share/extensions/hpgl_output.inx.h:12 +#: ../share/extensions/plotter.inx.h:31 +msgid "Pen speed (cm/s or mm/s):" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:20 -msgid "Snub Dodecahedron" -msgstr "Плосконосый додекаэдр" +#: ../share/extensions/hpgl_output.inx.h:13 +msgid "" +"The speed the pen will move with in centimeters or millimeters per second " +"(depending on your plotter model), set to 0 to omit command; most plotters " +"ignore this command (Default: 0)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:21 -msgid "Great Dodecahedron" -msgstr "Большой додекаэдр" +#: ../share/extensions/hpgl_output.inx.h:14 +#, fuzzy +msgid "Rotation (°, Clockwise):" +msgstr "Поворот по часовой стрелке" -#: ../share/extensions/polyhedron_3d.inx.h:22 -msgid "Great Stellated Dodecahedron" -msgstr "Большой звездчатый додекаэдр" +#: ../share/extensions/hpgl_output.inx.h:15 +#: ../share/extensions/plotter.inx.h:34 +msgid "Rotation of the drawing (Default: 0°)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:23 -msgid "Load from file" -msgstr "Загрузить из файла" +#: ../share/extensions/hpgl_output.inx.h:16 +#: ../share/extensions/plotter.inx.h:35 +#, fuzzy +msgid "Mirror X axis" +msgstr "Отразить по оси Y" -#: ../share/extensions/polyhedron_3d.inx.h:24 -msgid "Face-Specified" -msgstr "Определенный гранями" +#: ../share/extensions/hpgl_output.inx.h:17 +#: ../share/extensions/plotter.inx.h:36 +msgid "Check this to mirror the X axis (Default: Unchecked)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:25 -msgid "Edge-Specified" -msgstr "Определенный ребрами" +#: ../share/extensions/hpgl_output.inx.h:18 +#: ../share/extensions/plotter.inx.h:37 +#, fuzzy +msgid "Mirror Y axis" +msgstr "Отразить по оси Y" -#: ../share/extensions/polyhedron_3d.inx.h:27 -msgid "Rotate around:" -msgstr "Повернуть вокруг:" +#: ../share/extensions/hpgl_output.inx.h:19 +#: ../share/extensions/plotter.inx.h:38 +msgid "Check this to mirror the Y axis (Default: Unchecked)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:28 -#: ../share/extensions/spirograph.inx.h:8 -#: ../share/extensions/wireframe_sphere.inx.h:5 -msgid "Rotation (deg):" -msgstr "Вращение (°)" +#: ../share/extensions/hpgl_output.inx.h:20 +#: ../share/extensions/plotter.inx.h:39 +#, fuzzy +msgid "Center zero point" +msgstr "Центрировать строки" -#: ../share/extensions/polyhedron_3d.inx.h:29 -msgid "Then rotate around:" -msgstr "Затем повернуть вокруг:" +#: ../share/extensions/hpgl_output.inx.h:21 +#: ../share/extensions/plotter.inx.h:40 +msgid "" +"Check this if your plotter uses a centered zero point (Default: Unchecked)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:30 -msgid "X-Axis" -msgstr "Ось X" +#: ../share/extensions/hpgl_output.inx.h:22 +#: ../share/extensions/plotter.inx.h:41 +#, fuzzy +msgid "Plot Features " +msgstr "Растушёвка" -#: ../share/extensions/polyhedron_3d.inx.h:31 -msgid "Y-Axis" -msgstr "Ось Y" +#: ../share/extensions/hpgl_output.inx.h:23 +#: ../share/extensions/plotter.inx.h:42 +msgid "Overcut (mm):" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:32 -msgid "Z-Axis" -msgstr "Ось Z" +#: ../share/extensions/hpgl_output.inx.h:24 +#: ../share/extensions/plotter.inx.h:43 +msgid "" +"The distance in mm that will be cut over the starting point of the path to " +"prevent open paths, set to 0.0 to omit command (Default: 1.00)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:34 +#: ../share/extensions/hpgl_output.inx.h:25 +#: ../share/extensions/plotter.inx.h:44 #, fuzzy -msgid "Scaling factor:" -msgstr "Коэффициент масштаба" +msgid "Tool offset (mm):" +msgstr "Сдвиг по горизонтали, px" -#: ../share/extensions/polyhedron_3d.inx.h:35 -msgid "Fill color, Red:" -msgstr "Цвет заливки, красный канал:" +#: ../share/extensions/hpgl_output.inx.h:26 +#: ../share/extensions/plotter.inx.h:45 +msgid "" +"The offset from the tool tip to the tool axis in mm, set to 0.0 to omit " +"command (Default: 0.25)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:36 -msgid "Fill color, Green:" -msgstr "Цвет заливки, зеленый канал:" +#: ../share/extensions/hpgl_output.inx.h:27 +#: ../share/extensions/plotter.inx.h:46 +#, fuzzy +msgid "Use precut" +msgstr "Используемый системой" -#: ../share/extensions/polyhedron_3d.inx.h:37 -msgid "Fill color, Blue:" -msgstr "Цвет заливки, синий канал:" +#: ../share/extensions/hpgl_output.inx.h:28 +#: ../share/extensions/plotter.inx.h:47 +msgid "" +"Check this to cut a small line before the real drawing starts to correctly " +"align the tool orientation. (Default: Checked)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:39 -#, no-c-format -msgid "Fill opacity (%):" -msgstr "Непрозрачность заливки, %:" +#: ../share/extensions/hpgl_output.inx.h:29 +#: ../share/extensions/plotter.inx.h:48 +#, fuzzy +msgid "Curve flatness:" +msgstr "Гладкость" -#: ../share/extensions/polyhedron_3d.inx.h:41 -#, no-c-format -msgid "Stroke opacity (%):" -msgstr "Непрозрачность обводки (%s):" +#: ../share/extensions/hpgl_output.inx.h:30 +#: ../share/extensions/plotter.inx.h:49 +msgid "" +"Curves are divided into lines, this number controls how fine the curves will " +"be reproduced, the smaller the finer (Default: '1.2')" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:42 -msgid "Stroke width (px):" -msgstr "Толщина обводки (px)" +#: ../share/extensions/hpgl_output.inx.h:31 +#: ../share/extensions/plotter.inx.h:50 +#, fuzzy +msgid "Auto align" +msgstr "Выровнять" -#: ../share/extensions/polyhedron_3d.inx.h:43 -msgid "Shading" -msgstr "Затенение" +#: ../share/extensions/hpgl_output.inx.h:32 +#: ../share/extensions/plotter.inx.h:51 +msgid "" +"Check this to auto align the drawing to the zero point (Plus the tool offset " +"if used). If unchecked you have to make sure that all parts of your drawing " +"are within the document border! (Default: Checked)" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:44 +#: ../share/extensions/hpgl_output.inx.h:33 +#: ../share/extensions/plotter.inx.h:54 +msgid "" +"All these settings depend on the plotter you use, for more information " +"please consult the manual or homepage for your plotter." +msgstr "" + +#: ../share/extensions/hpgl_output.inx.h:35 #, fuzzy -msgid "Light X:" -msgstr "Свет по X" +msgid "Export an HP Graphics Language file" +msgstr "Экспортировать в файл HP Graphics Language" -#: ../share/extensions/polyhedron_3d.inx.h:45 +#: ../share/extensions/ink2canvas.inx.h:1 #, fuzzy -msgid "Light Y:" -msgstr "Свет по Y" +msgid "Convert to html5 canvas" +msgstr "Преобразовать в пунктир" -#: ../share/extensions/polyhedron_3d.inx.h:46 +#: ../share/extensions/ink2canvas.inx.h:2 +msgid "HTML 5 canvas (*.html)" +msgstr "" + +#: ../share/extensions/ink2canvas.inx.h:3 +msgid "HTML 5 canvas code" +msgstr "" + +#: ../share/extensions/inkscape_follow_link.inx.h:1 #, fuzzy -msgid "Light Z:" -msgstr "Свет по Y" +msgid "Follow Link" +msgstr "Перейти по ссылке" -#: ../share/extensions/polyhedron_3d.inx.h:48 -msgid "Draw back-facing polygons" -msgstr "Рисовать многоугольники с обратной стороны" +#: ../share/extensions/inkscape_help_askaquestion.inx.h:1 +msgid "Ask Us a Question" +msgstr "Задать авторам вопрос" -#: ../share/extensions/polyhedron_3d.inx.h:49 -msgid "Z-sort faces by:" -msgstr "Критерий сортировки граней на оси Z:" +#: ../share/extensions/inkscape_help_commandline.inx.h:1 +msgid "Command Line Options" +msgstr "Справка по командной строке" -#: ../share/extensions/polyhedron_3d.inx.h:50 -msgid "Faces" -msgstr "Стороны" +#. i18n. Please don't translate it unless a page exists in your language +#: ../share/extensions/inkscape_help_commandline.inx.h:3 +msgid "http://inkscape.org/doc/inkscape-man.html" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:51 -msgid "Edges" -msgstr "Грани" +#: ../share/extensions/inkscape_help_faq.inx.h:1 +msgid "FAQ" +msgstr "Часто задаваемые вопросы" -#: ../share/extensions/polyhedron_3d.inx.h:52 -msgid "Vertices" -msgstr "Вершины" +#. i18n. Please don't translate it unless a page exists in your language +#: ../share/extensions/inkscape_help_faq.inx.h:3 +msgid "http://wiki.inkscape.org/wiki/index.php/FAQ" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:53 -msgid "Maximum" -msgstr "Максимум" +#: ../share/extensions/inkscape_help_keys.inx.h:1 +msgid "Keys and Mouse Reference" +msgstr "Использование клавиатуры и мыши" -#: ../share/extensions/polyhedron_3d.inx.h:54 -msgid "Minimum" -msgstr "Минимум" +#. i18n. Please don't translate it unless a page exists in your language +#: ../share/extensions/inkscape_help_keys.inx.h:3 +msgid "http://inkscape.org/doc/keys048.html" +msgstr "" -#: ../share/extensions/polyhedron_3d.inx.h:55 -msgid "Mean" -msgstr "Средняя величина" +#: ../share/extensions/inkscape_help_manual.inx.h:1 +msgid "Inkscape Manual" +msgstr "Руководство по Inkscape" -#: ../share/extensions/previous_glyph_layer.inx.h:1 -msgid "View Previous Glyph" -msgstr "Просмотреть предыдущий глиф" +#. i18n. Please don't translate it unless a page exists in your language +#: ../share/extensions/inkscape_help_manual.inx.h:3 +msgid "http://tavmjong.free.fr/INKSCAPE/MANUAL/html/index.php" +msgstr "" -#: ../share/extensions/print_win32_vector.inx.h:1 -#, fuzzy -msgid "Win32 Vector Print" -msgstr "Печать в Windows 32-bit" +#: ../share/extensions/inkscape_help_relnotes.inx.h:1 +msgid "New in This Version" +msgstr "Новшества этой версии" -#: ../share/extensions/printing_marks.inx.h:1 -msgid "Printing Marks" -msgstr "Метки для печати" +#. i18n. Please don't translate it unless a page exists in your language +#: ../share/extensions/inkscape_help_relnotes.inx.h:3 +msgid "http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91" +msgstr "" -#: ../share/extensions/printing_marks.inx.h:3 -msgid "Crop Marks" -msgstr "Обрезные метки" +#: ../share/extensions/inkscape_help_reportabug.inx.h:1 +msgid "Report a Bug" +msgstr "Сообщить авторам об ошибке" -#: ../share/extensions/printing_marks.inx.h:4 -msgid "Bleed Marks" -msgstr "Метки для выпуска под обрез" +#: ../share/extensions/inkscape_help_svgspec.inx.h:1 +msgid "SVG 1.1 Specification" +msgstr "Спецификация на SVG 1.1" -#: ../share/extensions/printing_marks.inx.h:5 -msgid "Registration Marks" -msgstr "Метки совмещения" +#: ../share/extensions/interp.inx.h:1 +msgid "Interpolate" +msgstr "Интерполяция" -#: ../share/extensions/printing_marks.inx.h:6 -msgid "Star Target" -msgstr "Контрольный маркер давления" +#: ../share/extensions/interp.inx.h:3 +msgid "Interpolation steps:" +msgstr "Шагов интерполяции:" -#: ../share/extensions/printing_marks.inx.h:7 -msgid "Color Bars" -msgstr "Контрольные цветовые полосы" +#: ../share/extensions/interp.inx.h:4 +msgid "Interpolation method:" +msgstr "Способ интерполяции:" -#: ../share/extensions/printing_marks.inx.h:8 -msgid "Page Information" -msgstr "Информация о странице" +#: ../share/extensions/interp.inx.h:5 +msgid "Duplicate endpaths" +msgstr "Продублировать оконечные контуры" -#: ../share/extensions/printing_marks.inx.h:9 -msgid "Positioning" -msgstr "Размещение" +#: ../share/extensions/interp.inx.h:6 +msgid "Interpolate style" +msgstr "Интерполировать стиль" -#: ../share/extensions/printing_marks.inx.h:10 -#, fuzzy -msgid "Set crop marks to:" -msgstr "Ориентир для обрезных меток:" +#: ../share/extensions/interp_att_g.inx.h:1 +msgid "Interpolate Attribute in a group" +msgstr "Интерполировать атрибут в группе" -#: ../share/extensions/printing_marks.inx.h:17 -msgid "Canvas" -msgstr "Холст" +#: ../share/extensions/interp_att_g.inx.h:3 +msgid "Attribute to Interpolate:" +msgstr "Интерполируемый атрибут:" -#: ../share/extensions/printing_marks.inx.h:19 -msgid "Bleed Margin" -msgstr "Поля выпуска под обрез" +#: ../share/extensions/interp_att_g.inx.h:4 +msgid "Other Attribute:" +msgstr "Другой атрибут:" -#: ../share/extensions/ps_input.inx.h:1 -msgid "PostScript Input" -msgstr "Импорт файлов Postscript" +#: ../share/extensions/interp_att_g.inx.h:5 +msgid "Other Attribute type:" +msgstr "Другой тип атрибута:" -#: ../share/extensions/radiusrand.inx.h:1 -msgid "Jitter nodes" -msgstr "Дрожание узлов" +#: ../share/extensions/interp_att_g.inx.h:6 +#, fuzzy +msgid "Apply to:" +msgstr "Видение" -#: ../share/extensions/radiusrand.inx.h:3 -msgid "Maximum displacement in X (px):" -msgstr "Максимальное смещение по X (px):" +#: ../share/extensions/interp_att_g.inx.h:7 +msgid "Start Value:" +msgstr "Начальное значение:" -#: ../share/extensions/radiusrand.inx.h:4 -msgid "Maximum displacement in Y (px):" -msgstr "Максимальное смещение по Y (px):" +#: ../share/extensions/interp_att_g.inx.h:8 +msgid "End Value:" +msgstr "Конечное значение:" -#: ../share/extensions/radiusrand.inx.h:5 -msgid "Shift nodes" -msgstr "Смещение узлов" +#: ../share/extensions/interp_att_g.inx.h:13 +msgid "Translate X" +msgstr "Перемещение по X" -#: ../share/extensions/radiusrand.inx.h:6 -msgid "Shift node handles" -msgstr "Смещение рычагов узла" +#: ../share/extensions/interp_att_g.inx.h:14 +msgid "Translate Y" +msgstr "Перемещение по Y" -#: ../share/extensions/radiusrand.inx.h:7 -msgid "Use normal distribution" -msgstr "Использовать обычное распределение" +#: ../share/extensions/interp_att_g.inx.h:15 +#: ../share/extensions/markers_strokepaint.inx.h:9 +msgid "Fill" +msgstr "Заливка" -#: ../share/extensions/radiusrand.inx.h:9 +#: ../share/extensions/interp_att_g.inx.h:17 +msgid "Other" +msgstr "Другой" + +#: ../share/extensions/interp_att_g.inx.h:18 +#, fuzzy msgid "" -"This effect randomly shifts the nodes (and optionally node handles) of the " -"selected path." +"If you select \"Other\", you must know the SVG attributes to identify here " +"this \"other\"." msgstr "" -"Случайным образом сместить узлы (по выбору, также рычаги узлов) выбранного " -"контура" +"Если выбран «другой» интерполируемый атрибут, вы должны знать, какой именно " +"другой:" -#: ../share/extensions/render_alphabetsoup.inx.h:1 -msgid "Alphabet Soup" -msgstr "Алфавитный суп" +#: ../share/extensions/interp_att_g.inx.h:20 +msgid "Integer Number" +msgstr "Переменная" -#: ../share/extensions/render_barcode.inx.h:1 -msgid "Classic" -msgstr "Классический штрих-код" +#: ../share/extensions/interp_att_g.inx.h:21 +msgid "Float Number" +msgstr "Число с плавающей точкой" -#: ../share/extensions/render_barcode.inx.h:2 -msgid "Barcode Type:" -msgstr "Тип штрих-кода:" +#: ../share/extensions/interp_att_g.inx.h:22 +msgid "Tag" +msgstr "Тэг" -#: ../share/extensions/render_barcode.inx.h:3 -msgid "Barcode Data:" -msgstr "Данные штрих-кода:" +#: ../share/extensions/interp_att_g.inx.h:23 +#: ../share/extensions/polyhedron_3d.inx.h:33 +msgid "Style" +msgstr "Стиль" -#: ../share/extensions/render_barcode.inx.h:4 -msgid "Bar Height:" -msgstr "Высота штрих-кода:" +#: ../share/extensions/interp_att_g.inx.h:24 +msgid "Transformation" +msgstr "Преобразование" -#: ../share/extensions/render_barcode.inx.h:6 -#: ../share/extensions/render_barcode_datamatrix.inx.h:6 -#: ../share/extensions/render_barcode_qrcode.inx.h:19 -msgid "Barcode" -msgstr "Штрих-код" +#: ../share/extensions/interp_att_g.inx.h:25 +msgid "••••••••••••••••••••••••••••••••••••••••••••••••" +msgstr "••••••••••••••••••••••••••••••••••••••••••••••••" -#: ../share/extensions/render_barcode_datamatrix.inx.h:1 -msgid "Datamatrix" -msgstr "Матричный штрих-код" +#: ../share/extensions/interp_att_g.inx.h:26 +msgid "No Unit" +msgstr "Нет" -#: ../share/extensions/render_barcode_datamatrix.inx.h:3 -#: ../share/extensions/render_barcode_qrcode.inx.h:4 -msgid "Size, in unit squares:" -msgstr "Размер, в квадратах единиц:" +#: ../share/extensions/interp_att_g.inx.h:28 +#, fuzzy +msgid "" +"This effect applies a value for any interpolatable attribute for all " +"elements inside the selected group or for all elements in a multiple " +"selection." +msgstr "" +"Этот эффект задает новое значение для любого интерполируемого атрибута всех " +"объектов группы или выделения." -#: ../share/extensions/render_barcode_datamatrix.inx.h:4 -msgid "Square Size (px):" -msgstr "Размер квадрата (px):" +#: ../share/extensions/jessyInk_autoTexts.inx.h:1 +msgid "Auto-texts" +msgstr "Автотекст" -#: ../share/extensions/render_barcode_qrcode.inx.h:1 -msgid "QR Code" -msgstr "Код QR" +#: ../share/extensions/jessyInk_autoTexts.inx.h:2 +#: ../share/extensions/jessyInk_effects.inx.h:2 +#: ../share/extensions/jessyInk_export.inx.h:2 +#: ../share/extensions/jessyInk_masterSlide.inx.h:2 +#: ../share/extensions/jessyInk_transitions.inx.h:2 +#: ../share/extensions/jessyInk_view.inx.h:2 +msgid "Settings" +msgstr "Параметры" + +#: ../share/extensions/jessyInk_autoTexts.inx.h:3 +msgid "Auto-Text:" +msgstr "Автотекст:" + +#: ../share/extensions/jessyInk_autoTexts.inx.h:4 +msgid "None (remove)" +msgstr "Нет (удалить)" + +#: ../share/extensions/jessyInk_autoTexts.inx.h:5 +msgid "Slide title" +msgstr "Название слайда" -#: ../share/extensions/render_barcode_qrcode.inx.h:2 -msgid "See http://www.denso-wave.com/qrcode/index-e.html for details" -msgstr "" -"Подробности см. по адресу See http://www.denso-wave.com/qrcode/index-e.html" +#: ../share/extensions/jessyInk_autoTexts.inx.h:6 +msgid "Slide number" +msgstr "Номер слайда" -#: ../share/extensions/render_barcode_qrcode.inx.h:5 -msgid "Auto" -msgstr "Автоматически" +#: ../share/extensions/jessyInk_autoTexts.inx.h:7 +msgid "Number of slides" +msgstr "Количество слайдов" -#: ../share/extensions/render_barcode_qrcode.inx.h:6 +#: ../share/extensions/jessyInk_autoTexts.inx.h:9 msgid "" -"With \"Auto\", the size of the barcode depends on the length of the text and " -"the error correction level" +"This extension allows you to install, update and remove auto-texts for a " +"JessyInk presentation. Please see code.google.com/p/jessyink for more " +"details." msgstr "" +"Это расширение предназначено для вставки, обновления и удаления автотекста " +"из презентаций JessyInk. Подробности вы найдёте на сайте code.google.com/p/" +"jessyink." -#: ../share/extensions/render_barcode_qrcode.inx.h:7 -msgid "Error correction level:" -msgstr "Уровень корреции ошибки:" +#: ../share/extensions/jessyInk_autoTexts.inx.h:10 +#: ../share/extensions/jessyInk_effects.inx.h:15 +#: ../share/extensions/jessyInk_install.inx.h:4 +#: ../share/extensions/jessyInk_keyBindings.inx.h:46 +#: ../share/extensions/jessyInk_masterSlide.inx.h:7 +#: ../share/extensions/jessyInk_mouseHandler.inx.h:8 +#: ../share/extensions/jessyInk_summary.inx.h:4 +#: ../share/extensions/jessyInk_transitions.inx.h:14 +#: ../share/extensions/jessyInk_uninstall.inx.h:12 +#: ../share/extensions/jessyInk_video.inx.h:4 +#: ../share/extensions/jessyInk_view.inx.h:9 +msgid "JessyInk" +msgstr "Создание презентации" -#: ../share/extensions/render_barcode_qrcode.inx.h:9 -#, no-c-format -msgid "L (Approx. 7%)" -msgstr "L (примерно 7%)" +#: ../share/extensions/jessyInk_effects.inx.h:1 +msgid "Effects" +msgstr "Эффекты" -#: ../share/extensions/render_barcode_qrcode.inx.h:11 -#, no-c-format -msgid "M (Approx. 15%)" -msgstr "M (примерно 15%)" +#: ../share/extensions/jessyInk_effects.inx.h:4 +#: ../share/extensions/jessyInk_transitions.inx.h:4 +#: ../share/extensions/jessyInk_view.inx.h:4 +msgid "Duration in seconds:" +msgstr "Длительность в секундах:" -#: ../share/extensions/render_barcode_qrcode.inx.h:13 -#, no-c-format -msgid "Q (Approx. 25%)" -msgstr "Q (примерно 25%)" +#: ../share/extensions/jessyInk_effects.inx.h:6 +msgid "Build-in effect" +msgstr "Эффект входа" -#: ../share/extensions/render_barcode_qrcode.inx.h:15 -#, no-c-format -msgid "H (Approx. 30%)" -msgstr "H (примерно 30%)" +#: ../share/extensions/jessyInk_effects.inx.h:7 +msgid "None (default)" +msgstr "Нет (по умолчанию)" -#: ../share/extensions/render_barcode_qrcode.inx.h:17 -msgid "Square size (px):" -msgstr "Размер квадрата (px):" +#: ../share/extensions/jessyInk_effects.inx.h:8 +#: ../share/extensions/jessyInk_transitions.inx.h:8 +msgid "Appear" +msgstr "Появление" -#: ../share/extensions/render_gear_rack.inx.h:1 +#: ../share/extensions/jessyInk_effects.inx.h:9 #, fuzzy -msgid "Rack Gear" -msgstr "Зубчатое колесо" +msgid "Fade in" +msgstr "Угасание" -#: ../share/extensions/render_gear_rack.inx.h:2 -#, fuzzy -msgid "Rack Length:" -msgstr "Длина:" +#: ../share/extensions/jessyInk_effects.inx.h:10 +#: ../share/extensions/jessyInk_transitions.inx.h:10 +msgid "Pop" +msgstr "Выскакивание" -#: ../share/extensions/render_gear_rack.inx.h:3 -#, fuzzy -msgid "Tooth Spacing:" -msgstr "Интервал по горизонтали" +#: ../share/extensions/jessyInk_effects.inx.h:11 +msgid "Build-out effect" +msgstr "Эффект выхода" -#: ../share/extensions/render_gear_rack.inx.h:4 +#: ../share/extensions/jessyInk_effects.inx.h:12 #, fuzzy -msgid "Contact Angle:" -msgstr "Вписанный треугольник" +msgid "Fade out" +msgstr "Угасание" -#: ../share/extensions/render_gear_rack.inx.h:6 -#: ../share/extensions/render_gears.inx.h:1 -msgid "Gear" -msgstr "Зубчатое колесо" +#: ../share/extensions/jessyInk_effects.inx.h:14 +msgid "" +"This extension allows you to install, update and remove object effects for a " +"JessyInk presentation. Please see code.google.com/p/jessyink for more " +"details." +msgstr "" +"Это расширение предназначено для вставки, обновления и удаления эффектов " +"объектов из презентаций JessyInk. Подробности вы найдёте на сайте code." +"google.com/p/jessyink." -#: ../share/extensions/render_gears.inx.h:2 -#, fuzzy -msgid "Number of teeth:" -msgstr "Количество зубцов" +#: ../share/extensions/jessyInk_export.inx.h:1 +msgid "JessyInk zipped pdf or png output" +msgstr "Вывод презентации JessyInk в PDF или PNG" -#: ../share/extensions/render_gears.inx.h:3 -#, fuzzy -msgid "Circular pitch (tooth size):" -msgstr "Шаг колеса, px" +#: ../share/extensions/jessyInk_export.inx.h:4 +msgid "Resolution:" +msgstr "Разрешение:" -#: ../share/extensions/render_gears.inx.h:4 -#, fuzzy -msgid "Pressure angle (degrees):" -msgstr "Угол зацепления" +#: ../share/extensions/jessyInk_export.inx.h:5 +msgid "PDF" +msgstr "PDF" -#: ../share/extensions/render_gears.inx.h:5 -msgid "Diameter of center hole (0 for none):" +#: ../share/extensions/jessyInk_export.inx.h:6 +msgid "PNG" +msgstr "PNG" + +#: ../share/extensions/jessyInk_export.inx.h:8 +msgid "" +"This extension allows you to export a JessyInk presentation once you created " +"an export layer in your browser. Please see code.google.com/p/jessyink for " +"more details." msgstr "" +"Это расширение предназначено для экспорта презентации JessyInk после " +"создания слоя экспорта. Подробности вы найдёте на сайте code.google.com/p/" +"jessyink." -#: ../share/extensions/render_gears.inx.h:10 -msgid "Unit of measurement for both circular pitch and center diameter." +#: ../share/extensions/jessyInk_export.inx.h:9 +msgid "JessyInk zipped pdf or png output (*.zip)" +msgstr "Вывод презентации JessyInk в PDF или PNG (*.png)" + +#: ../share/extensions/jessyInk_export.inx.h:10 +msgid "" +"Creates a zip file containing pdfs or pngs of all slides of a JessyInk " +"presentation." msgstr "" +"Создать архив ZIP с выводом всех слайдов презентации JessyInk в PDF или PNG" -#: ../share/extensions/replace_font.inx.h:1 -msgid "Replace font" -msgstr "Заменить шрифт" +#: ../share/extensions/jessyInk_install.inx.h:1 +msgid "Install/update" +msgstr "Установить/обновить" -#: ../share/extensions/replace_font.inx.h:2 -msgid "Find and Replace font" -msgstr "_Найти и заменить шрифт" +#: ../share/extensions/jessyInk_install.inx.h:3 +msgid "" +"This extension allows you to install or update the JessyInk script in order " +"to turn your SVG file into a presentation. Please see code.google.com/p/" +"jessyink for more details." +msgstr "" +"Это расширение предназначено для установки или обновления сценария JessyInk " +"для превращения документа SVG в презентацию. Подробности вы найдёте на сайте " +"code.google.com/p/jessyink." -#: ../share/extensions/replace_font.inx.h:3 -#, fuzzy -msgid "Find font: " -msgstr "Найти шрифт:" +#: ../share/extensions/jessyInk_keyBindings.inx.h:1 +msgid "Key bindings" +msgstr "Клавиатурные комбинации" -#: ../share/extensions/replace_font.inx.h:4 -#, fuzzy -msgid "Replace with: " -msgstr "Заменить на:" +#: ../share/extensions/jessyInk_keyBindings.inx.h:2 +msgid "Slide mode" +msgstr "Режим слайдов" -#: ../share/extensions/replace_font.inx.h:5 -msgid "Replace all fonts with: " -msgstr "Заменить все шрифты на:" +#: ../share/extensions/jessyInk_keyBindings.inx.h:3 +msgid "Back (with effects):" +msgstr "Назад (с эффектами):" -#: ../share/extensions/replace_font.inx.h:6 -msgid "List all fonts" -msgstr "Перечень шрифтов" +#: ../share/extensions/jessyInk_keyBindings.inx.h:4 +msgid "Next (with effects):" +msgstr "Вперёд (с эффектами):" -#: ../share/extensions/replace_font.inx.h:7 -msgid "" -"Choose this tab if you would like to see a list of the fonts used/found." -msgstr "" +#: ../share/extensions/jessyInk_keyBindings.inx.h:5 +msgid "Back (without effects):" +msgstr "Назад (без эффектов):" -#: ../share/extensions/replace_font.inx.h:8 -msgid "Work on:" -msgstr "Обработать:" +#: ../share/extensions/jessyInk_keyBindings.inx.h:6 +msgid "Next (without effects):" +msgstr "Вперёд (без эффектов):" -#: ../share/extensions/replace_font.inx.h:9 -msgid "Entire drawing" -msgstr "Весь рисунок" +#: ../share/extensions/jessyInk_keyBindings.inx.h:7 +msgid "First slide:" +msgstr "Первый слайд:" -#: ../share/extensions/replace_font.inx.h:10 -msgid "Selected objects only" -msgstr "Только выделенные объекты" +#: ../share/extensions/jessyInk_keyBindings.inx.h:8 +msgid "Last slide:" +msgstr "Последний слайд:" -#: ../share/extensions/restack.inx.h:1 -msgid "Restack" -msgstr "Поменять вертикальный порядок" +#: ../share/extensions/jessyInk_keyBindings.inx.h:9 +msgid "Switch to index mode:" +msgstr "Переключиться на режим содержания" -#: ../share/extensions/restack.inx.h:2 -msgid "Restack Direction:" -msgstr "Направление перестановки:" +#: ../share/extensions/jessyInk_keyBindings.inx.h:10 +msgid "Switch to drawing mode:" +msgstr "Переключиться на режим рисования" -#: ../share/extensions/restack.inx.h:3 -msgid "Left to Right (0)" -msgstr "Слева направо (0)" +#: ../share/extensions/jessyInk_keyBindings.inx.h:11 +msgid "Set duration:" +msgstr "Установить длительность:" -#: ../share/extensions/restack.inx.h:4 -msgid "Bottom to Top (90)" -msgstr "Снизу вверх (90)" +#: ../share/extensions/jessyInk_keyBindings.inx.h:12 +msgid "Add slide:" +msgstr "Добавить слайд:" -#: ../share/extensions/restack.inx.h:5 -msgid "Right to Left (180)" -msgstr "Справа налево (180)" +#: ../share/extensions/jessyInk_keyBindings.inx.h:13 +msgid "Toggle progress bar:" +msgstr "Переключить индикатор хода презентации:" -#: ../share/extensions/restack.inx.h:6 -msgid "Top to Bottom (270)" -msgstr "Сверху вниз (270°)" +#: ../share/extensions/jessyInk_keyBindings.inx.h:14 +msgid "Reset timer:" +msgstr "Сбросить таймер:" -#: ../share/extensions/restack.inx.h:7 -msgid "Radial Outward" -msgstr "Радиально наружу" +#: ../share/extensions/jessyInk_keyBindings.inx.h:15 +#, fuzzy +msgid "Export presentation:" +msgstr "Направление текста" -#: ../share/extensions/restack.inx.h:8 -msgid "Radial Inward" -msgstr "Радиально вовнутрь" +#: ../share/extensions/jessyInk_keyBindings.inx.h:17 +msgid "Switch to slide mode:" +msgstr "Переключиться на режим слайдов" -#: ../share/extensions/restack.inx.h:9 -msgid "Arbitrary Angle" -msgstr "Произвольный угол" +#: ../share/extensions/jessyInk_keyBindings.inx.h:18 +msgid "Set path width to default:" +msgstr "Вернуться к исходной толщине контура:" -#: ../share/extensions/restack.inx.h:11 -msgid "Horizontal Point:" -msgstr "Горизонтальная точка:" +#: ../share/extensions/jessyInk_keyBindings.inx.h:19 +msgid "Set path width to 1:" +msgstr "Сделать толщину контура равной 1:" -#: ../share/extensions/restack.inx.h:13 -#: ../share/extensions/text_extract.inx.h:9 -#: ../share/extensions/text_merge.inx.h:9 -msgid "Middle" -msgstr "Середина" +#: ../share/extensions/jessyInk_keyBindings.inx.h:20 +msgid "Set path width to 3:" +msgstr "Сделать толщину контура равной 3:" -#: ../share/extensions/restack.inx.h:15 -msgid "Vertical Point:" -msgstr "Вертикальная точка:" +#: ../share/extensions/jessyInk_keyBindings.inx.h:21 +msgid "Set path width to 5:" +msgstr "Сделать толщину контура равной 5:" -#: ../share/extensions/restack.inx.h:16 -#: ../share/extensions/text_extract.inx.h:12 -#: ../share/extensions/text_merge.inx.h:12 -msgid "Top" -msgstr "Верх" +#: ../share/extensions/jessyInk_keyBindings.inx.h:22 +msgid "Set path width to 7:" +msgstr "Сделать толщину контура равной 7:" -#: ../share/extensions/restack.inx.h:17 -#: ../share/extensions/text_extract.inx.h:13 -#: ../share/extensions/text_merge.inx.h:13 -msgid "Bottom" -msgstr "Низ" +#: ../share/extensions/jessyInk_keyBindings.inx.h:23 +msgid "Set path width to 9:" +msgstr "Сделать толщину контура равной 9:" -#: ../share/extensions/restack.inx.h:18 -msgid "Arrange" -msgstr "Расстановка" +#: ../share/extensions/jessyInk_keyBindings.inx.h:24 +msgid "Set path color to blue:" +msgstr "Сделать цвет контура синим:" -#: ../share/extensions/rtree.inx.h:1 -msgid "Random Tree" -msgstr "Случайное дерево" +#: ../share/extensions/jessyInk_keyBindings.inx.h:25 +msgid "Set path color to cyan:" +msgstr "Сделать цвет контура циановым:" -#: ../share/extensions/rtree.inx.h:2 -#, fuzzy -msgid "Initial size:" -msgstr "Исходный размер" +#: ../share/extensions/jessyInk_keyBindings.inx.h:26 +msgid "Set path color to green:" +msgstr "Сделать цвет контура зелёным:" -#: ../share/extensions/rtree.inx.h:3 -#, fuzzy -msgid "Minimum size:" -msgstr "Минимальный размер" +#: ../share/extensions/jessyInk_keyBindings.inx.h:27 +msgid "Set path color to black:" +msgstr "Сделать цвет контура чёрным:" -#: ../share/extensions/rubberstretch.inx.h:1 -msgid "Rubber Stretch" -msgstr "Резиновое растягивание" +#: ../share/extensions/jessyInk_keyBindings.inx.h:28 +msgid "Set path color to magenta:" +msgstr "Сделать цвет контура пурпурным:" -#: ../share/extensions/rubberstretch.inx.h:3 -#, no-c-format -msgid "Strength (%):" -msgstr "Сила (%):" +#: ../share/extensions/jessyInk_keyBindings.inx.h:29 +msgid "Set path color to orange:" +msgstr "Сделать цвет контура оранжевым:" -#: ../share/extensions/rubberstretch.inx.h:5 -#, no-c-format -msgid "Curve (%):" -msgstr "Кривая (%):" +#: ../share/extensions/jessyInk_keyBindings.inx.h:30 +msgid "Set path color to red:" +msgstr "Сделать цвет контура красным:" -#: ../share/extensions/scour.inx.h:1 -msgid "Optimized SVG Output" -msgstr "Экспорт в оптимизированный по размеру файла SVG" +#: ../share/extensions/jessyInk_keyBindings.inx.h:31 +msgid "Set path color to white:" +msgstr "Сделать цвет контура белым:" -#: ../share/extensions/scour.inx.h:3 -#, fuzzy -msgid "Shorten color values" -msgstr "Мягкие цвета" +#: ../share/extensions/jessyInk_keyBindings.inx.h:32 +msgid "Set path color to yellow:" +msgstr "Сделать цвет контура жёлтым:" -#: ../share/extensions/scour.inx.h:4 -msgid "Convert CSS attributes to XML attributes" -msgstr "" +#: ../share/extensions/jessyInk_keyBindings.inx.h:33 +msgid "Undo last path segment:" +msgstr "Отменить последний сегмент контура:" -#: ../share/extensions/scour.inx.h:5 -msgid "Group collapsing" -msgstr "Свести группы" +#: ../share/extensions/jessyInk_keyBindings.inx.h:34 +msgid "Index mode" +msgstr "Режим содержания" -#: ../share/extensions/scour.inx.h:6 -msgid "Create groups for similar attributes" -msgstr "" +#: ../share/extensions/jessyInk_keyBindings.inx.h:35 +msgid "Select the slide to the left:" +msgstr "Выбрать слайд слева:" -#: ../share/extensions/scour.inx.h:7 -msgid "Embed rasters" -msgstr "Встроить все растровые изображения" +#: ../share/extensions/jessyInk_keyBindings.inx.h:36 +msgid "Select the slide to the right:" +msgstr "Выбрать слайд справа:" -#: ../share/extensions/scour.inx.h:8 -msgid "Keep editor data" -msgstr "Сохранить данные редактора" +#: ../share/extensions/jessyInk_keyBindings.inx.h:37 +msgid "Select the slide above:" +msgstr "Выбрать слайд выше:" -#: ../share/extensions/scour.inx.h:9 -#, fuzzy -msgid "Remove metadata" -msgstr "Удалить красный компонент" +#: ../share/extensions/jessyInk_keyBindings.inx.h:38 +msgid "Select the slide below:" +msgstr "Выбрать слайд ниже:" -#: ../share/extensions/scour.inx.h:10 -#, fuzzy -msgid "Remove comments" -msgstr "Удалить шрифт" +#: ../share/extensions/jessyInk_keyBindings.inx.h:39 +msgid "Previous page:" +msgstr "Предыдущая страница:" -#: ../share/extensions/scour.inx.h:11 -msgid "Work around renderer bugs" -msgstr "" +#: ../share/extensions/jessyInk_keyBindings.inx.h:40 +msgid "Next page:" +msgstr "Следующая страница:" -#: ../share/extensions/scour.inx.h:12 -msgid "Enable viewboxing" -msgstr "Включить viewbox" +#: ../share/extensions/jessyInk_keyBindings.inx.h:41 +msgid "Decrease number of columns:" +msgstr "Уменьшить число столбцов:" -#: ../share/extensions/scour.inx.h:13 -#, fuzzy -msgid "Remove the xml declaration" -msgstr "Удалить переходы" +#: ../share/extensions/jessyInk_keyBindings.inx.h:42 +msgid "Increase number of columns:" +msgstr "Увеличить число столбцов:" -#: ../share/extensions/scour.inx.h:14 -msgid "Number of significant digits for coords:" -msgstr "" +#: ../share/extensions/jessyInk_keyBindings.inx.h:43 +msgid "Set number of columns to default:" +msgstr "Вернуться к исходному числу столбцов:" -#: ../share/extensions/scour.inx.h:15 -msgid "XML indentation (pretty-printing):" +#: ../share/extensions/jessyInk_keyBindings.inx.h:45 +msgid "" +"This extension allows you customise the key bindings JessyInk uses. Please " +"see code.google.com/p/jessyink for more details." msgstr "" +"Это расширение предназначено настройки клавиатурных комбинаций, используемых " +"в презентации JessyInk. Подробности вы найдёте на сайте code.google.com/p/" +"jessyink." -#: ../share/extensions/scour.inx.h:16 -msgid "Space" -msgstr "Пробел" +#: ../share/extensions/jessyInk_masterSlide.inx.h:1 +msgid "Master slide" +msgstr "Мастер-слайд" -#: ../share/extensions/scour.inx.h:17 -msgid "Tab" -msgstr "Табулятор" +#: ../share/extensions/jessyInk_masterSlide.inx.h:3 +#: ../share/extensions/jessyInk_transitions.inx.h:3 +msgid "Name of layer:" +msgstr "Имя слоя:" -#: ../share/extensions/scour.inx.h:19 -#, fuzzy -msgid "Ids" -msgstr "_ID" +#: ../share/extensions/jessyInk_masterSlide.inx.h:4 +msgid "If no layer name is supplied, the master slide is unset." +msgstr "Если имя слайда не указано, определение мастер-слайда снимается" -#: ../share/extensions/scour.inx.h:20 -msgid "Remove unused ID names for elements" +#: ../share/extensions/jessyInk_masterSlide.inx.h:6 +msgid "" +"This extension allows you to change the master slide JessyInk uses. Please " +"see code.google.com/p/jessyink for more details." msgstr "" +"Это расширение предназначено для смены используемого JessyInk мастер-слайда. " +"Подробности вы найдёте на сайте code.google.com/p/jessyink." -#: ../share/extensions/scour.inx.h:21 -msgid "Shorten IDs" -msgstr "" +#: ../share/extensions/jessyInk_mouseHandler.inx.h:1 +msgid "Mouse handler" +msgstr "Обработка действий мышью" -#: ../share/extensions/scour.inx.h:22 -msgid "Preserve manually created ID names not ending with digits" -msgstr "" +#: ../share/extensions/jessyInk_mouseHandler.inx.h:2 +msgid "Mouse settings:" +msgstr "Параметры мыши:" -#: ../share/extensions/scour.inx.h:23 -msgid "Preserve these ID names, comma-separated:" -msgstr "" +#: ../share/extensions/jessyInk_mouseHandler.inx.h:4 +msgid "No-click" +msgstr "Без щелчков" + +#: ../share/extensions/jessyInk_mouseHandler.inx.h:5 +msgid "Dragging/zoom" +msgstr "Перетаскивание/масштабирование" -#: ../share/extensions/scour.inx.h:24 -msgid "Preserve ID names starting with:" +#: ../share/extensions/jessyInk_mouseHandler.inx.h:7 +msgid "" +"This extension allows you customise the mouse handler JessyInk uses. Please " +"see code.google.com/p/jessyink for more details." msgstr "" +"Это расширение предназначено для настройки обработки действий мышью. " +"Подробности вы найдёте на сайте code.google.com/p/jessyink." -#: ../share/extensions/scour.inx.h:25 -#, fuzzy -msgid "Help (Options)" -msgstr "Параметры" +#: ../share/extensions/jessyInk_summary.inx.h:1 +msgid "Summary" +msgstr "Сводка" -#: ../share/extensions/scour.inx.h:27 -#, no-c-format +#: ../share/extensions/jessyInk_summary.inx.h:3 msgid "" -"This extension optimizes the SVG file according to the following options:\n" -" * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" -" * Convert CSS attributes to XML attributes: convert styles from style " -"tags and inline style=\"\" declarations into XML attributes.\n" -" * Group collapsing: removes useless g elements, promoting their contents " -"up one level. Requires \"Remove unused ID names for elements\" to be set.\n" -" * Create groups for similar attributes: create g elements for runs of " -"elements having at least one attribute in common (e.g. fill color, stroke " -"opacity, ...).\n" -" * Embed rasters: embed raster images as base64-encoded data URLs.\n" -" * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator " -"elements and attributes.\n" -" * Remove metadata: remove metadata tags along with all the information " -"in them, which may include license metadata, alternate versions for non-SVG-" -"enabled browsers, etc.\n" -" * Remove comments: remove comment tags.\n" -" * Work around renderer bugs: emits slightly larger SVG data, but works " -"around a bug in librsvg's renderer, which is used in Eye of GNOME and other " -"various applications.\n" -" * Enable viewboxing: size image to 100%/100% and introduce a viewBox.\n" -" * Number of significant digits for coords: all coordinates are output " -"with that number of significant digits. For example, if 3 is specified, the " -"coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as " -"472.\n" -" * XML indentation (pretty-printing): either None for no indentation, " -"Space to use one space per nesting level, or Tab to use one tab per nesting " -"level." +"This extension allows you to obtain information about the JessyInk script, " +"effects and transitions contained in this SVG file. Please see code.google." +"com/p/jessyink for more details." msgstr "" +"Это расширение предназначено для получения информации о сценарии JessyInk, " +"эффектах и переходах, содержащихся в текущем документе SVG. Подробности вы " +"найдёте на сайте code.google.com/p/jessyink." -#: ../share/extensions/scour.inx.h:40 -msgid "Help (Ids)" -msgstr "" +#: ../share/extensions/jessyInk_transitions.inx.h:1 +msgid "Transitions" +msgstr "Переходы" -#: ../share/extensions/scour.inx.h:41 +#: ../share/extensions/jessyInk_transitions.inx.h:6 +msgid "Transition in effect" +msgstr "Эффект перехода для появления" + +#: ../share/extensions/jessyInk_transitions.inx.h:9 +msgid "Fade" +msgstr "Угасание" + +#: ../share/extensions/jessyInk_transitions.inx.h:11 +msgid "Transition out effect" +msgstr "Эффект перехода для исчезновения" + +#: ../share/extensions/jessyInk_transitions.inx.h:13 msgid "" -"Ids specific options:\n" -" * Remove unused ID names for elements: remove all unreferenced ID " -"attributes.\n" -" * Shorten IDs: reduce the length of all ID attributes, assigning the " -"shortest to the most-referenced elements. For instance, #linearGradient5621, " -"referenced 100 times, can become #a.\n" -" * Preserve manually created ID names not ending with digits: usually, " -"optimised SVG output removes these, but if they're needed for referencing (e." -"g. #middledot), you may use this option.\n" -" * Preserve these ID names, comma-separated: you can use this in " -"conjunction with the other preserve options if you wish to preserve some " -"more specific ID names.\n" -" * Preserve ID names starting with: usually, optimised SVG output removes " -"all unused ID names, but if all of your preserved ID names start with the " -"same prefix (e.g. #flag-mx, #flag-pt), you may use this option." +"This extension allows you to change the transition JessyInk uses for the " +"selected layer. Please see code.google.com/p/jessyink for more details." msgstr "" +"Это расширение предназначено для изменения перехода, используемого JessyInk " +"для текущего слоя. Подробности вы найдёте на сайте code.google.com/p/" +"jessyink." -#: ../share/extensions/scour.inx.h:47 -msgid "Optimized SVG (*.svg)" -msgstr "Оптимизированный SVG (*.svg)" - -#: ../share/extensions/scour.inx.h:48 -msgid "Scalable Vector Graphics" -msgstr "Scalable Vector Graphics" +#: ../share/extensions/jessyInk_uninstall.inx.h:1 +msgid "Uninstall/remove" +msgstr "Удалить сценарий презентации" -#: ../share/extensions/setup_typography_canvas.inx.h:1 -msgid "1 - Setup Typography Canvas" -msgstr "1 Настроить холст" +#: ../share/extensions/jessyInk_uninstall.inx.h:3 +msgid "Remove script" +msgstr "Удалить сценарий" -#: ../share/extensions/setup_typography_canvas.inx.h:2 -msgid "Em-size:" -msgstr "Размер em:" +#: ../share/extensions/jessyInk_uninstall.inx.h:4 +msgid "Remove effects" +msgstr "Удалить эффекты" -#: ../share/extensions/setup_typography_canvas.inx.h:3 -msgid "Ascender:" -msgstr "Верхние выносные:" +#: ../share/extensions/jessyInk_uninstall.inx.h:5 +msgid "Remove master slide assignment" +msgstr "Удалить определение мастер-слайда" -#: ../share/extensions/setup_typography_canvas.inx.h:4 -msgid "Caps Height:" -msgstr "Высота прописных:" +#: ../share/extensions/jessyInk_uninstall.inx.h:6 +msgid "Remove transitions" +msgstr "Удалить переходы" -#: ../share/extensions/setup_typography_canvas.inx.h:5 -msgid "X-Height:" -msgstr "Высота строчных:" +#: ../share/extensions/jessyInk_uninstall.inx.h:7 +msgid "Remove auto-texts" +msgstr "Удалить весь автотекст" -#: ../share/extensions/setup_typography_canvas.inx.h:6 -msgid "Descender:" -msgstr "Нижние выносные:" +#: ../share/extensions/jessyInk_uninstall.inx.h:8 +msgid "Remove views" +msgstr "Удалить виды" -#: ../share/extensions/sk1_input.inx.h:1 -msgid "sK1 vector graphics files input" -msgstr "Импорт документов sK1" +#: ../share/extensions/jessyInk_uninstall.inx.h:9 +msgid "Please select the parts of JessyInk you want to uninstall/remove." +msgstr "Выберите, какие части JessyInk вы хотите удалить." -#: ../share/extensions/sk1_input.inx.h:2 -#: ../share/extensions/sk1_output.inx.h:2 -#, fuzzy -msgid "sK1 vector graphics files (*.sk1)" -msgstr "Файлы редактора векторной графики sK1 (.sk1)" +#: ../share/extensions/jessyInk_uninstall.inx.h:11 +msgid "" +"This extension allows you to uninstall the JessyInk script. Please see code." +"google.com/p/jessyink for more details." +msgstr "" +"Это расширение предназначено для удаления сценария презентации JessyInk из " +"документа SVG. Подробности вы найдёте на сайте code.google.com/p/jessyink." -#: ../share/extensions/sk1_input.inx.h:3 -msgid "Open files saved in sK1 vector graphics editor" -msgstr "Открыть файлы формате редактора векторной графики sK1" +#: ../share/extensions/jessyInk_video.inx.h:1 +msgid "Video" +msgstr "Видео" -#: ../share/extensions/sk1_output.inx.h:1 -msgid "sK1 vector graphics files output" -msgstr "Экспорт в документы sK1" +#: ../share/extensions/jessyInk_video.inx.h:3 +msgid "" +"This extension puts a JessyInk video element on the current slide (layer). " +"This element allows you to integrate a video into your JessyInk " +"presentation. Please see code.google.com/p/jessyink for more details." +msgstr "" +"Это расширение предназначено для вставки видеоэлемента в текущий слайд " +"(слой) презентации JessyInk. Подробности вы найдёте на сайте code.google.com/" +"p/jessyink." -#: ../share/extensions/sk1_output.inx.h:3 -msgid "File format for use in sK1 vector graphics editor" -msgstr "Формат файлов редактора векторной графики sK1" +#: ../share/extensions/jessyInk_view.inx.h:5 +msgid "Remove view" +msgstr "Удалить вид" -#: ../share/extensions/sk_input.inx.h:1 -msgid "Sketch Input" -msgstr "Импорт файлов Sketch" +#: ../share/extensions/jessyInk_view.inx.h:6 +msgid "Choose order number 0 to set the initial view of a slide." +msgstr "Выберите ноль номером порядка, чтобы установить исходный вид слайда." -#: ../share/extensions/sk_input.inx.h:2 -msgid "Sketch Diagram (*.sk)" -msgstr "Рисунок Sketch (*.sk)" +#: ../share/extensions/jessyInk_view.inx.h:8 +msgid "" +"This extension allows you to set, update and remove views for a JessyInk " +"presentation. Please see code.google.com/p/jessyink for more details." +msgstr "" +"Это расширение предназначено установки, обновления и удаления видов " +"презентации JessyInk. Подробности вы найдёте на сайте code.google.com/p/" +"jessyink." -#: ../share/extensions/sk_input.inx.h:3 -msgid "A diagram created with the program Sketch" -msgstr "Рисунок, созданный в программе Sketch" +#: ../share/extensions/layers2svgfont.inx.h:1 +msgid "3 - Convert Glyph Layers to SVG Font" +msgstr "3. Сконвертировать слои глифов в шрифт SVG" -#: ../share/extensions/spirograph.inx.h:1 -msgid "Spirograph" -msgstr "Спирограф" +#: ../share/extensions/layers2svgfont.inx.h:2 +#: ../share/extensions/new_glyph_layer.inx.h:3 +#: ../share/extensions/next_glyph_layer.inx.h:2 +#: ../share/extensions/previous_glyph_layer.inx.h:2 +#: ../share/extensions/setup_typography_canvas.inx.h:7 +#: ../share/extensions/svgfont2layers.inx.h:3 +msgid "Typography" +msgstr "Шрифтовый дизайн" -#: ../share/extensions/spirograph.inx.h:2 -#, fuzzy -msgid "R - Ring Radius (px):" -msgstr "R - радиус кольца (px)" +#: ../share/extensions/layout_nup.inx.h:1 +msgid "N-up layout" +msgstr "" -#: ../share/extensions/spirograph.inx.h:3 +#: ../share/extensions/layout_nup.inx.h:2 #, fuzzy -msgid "r - Gear Radius (px):" -msgstr "r — радиус шестерёнки (px)" +msgid "Page dimensions" +msgstr "Размеры" -#: ../share/extensions/spirograph.inx.h:4 +#: ../share/extensions/layout_nup.inx.h:4 #, fuzzy -msgid "d - Pen Radius (px):" -msgstr "d — радиус пера (px)" +msgid "Size X:" +msgstr "Ячеек по X:" -#: ../share/extensions/spirograph.inx.h:5 +#: ../share/extensions/layout_nup.inx.h:5 #, fuzzy -msgid "Gear Placement:" -msgstr "Размещение шестерёнки" - -#: ../share/extensions/spirograph.inx.h:6 -msgid "Inside (Hypotrochoid)" -msgstr "Внутри (гипотрохоида)" - -#: ../share/extensions/spirograph.inx.h:7 -msgid "Outside (Epitrochoid)" -msgstr "Снаружи (эпитрохоида)" +msgid "Size Y:" +msgstr "Ячеек по Y:" -#: ../share/extensions/spirograph.inx.h:9 -#, fuzzy -msgid "Quality (Default = 16):" -msgstr "Качество (по умолчанию = 16)" +#: ../share/extensions/layout_nup.inx.h:6 +#: ../share/extensions/printing_marks.inx.h:13 +msgid "Top:" +msgstr "Верхнее:" -#: ../share/extensions/split.inx.h:1 -msgid "Split text" -msgstr "Разделить текст" +#: ../share/extensions/layout_nup.inx.h:7 +#: ../share/extensions/printing_marks.inx.h:14 +msgid "Bottom:" +msgstr "Нижнее:" -#: ../share/extensions/split.inx.h:3 -msgid "Split:" -msgstr "Разделить:" +#: ../share/extensions/layout_nup.inx.h:8 +#: ../share/extensions/printing_marks.inx.h:15 +msgid "Left:" +msgstr "Левое:" -#: ../share/extensions/split.inx.h:4 -#, fuzzy -msgid "Preserve original text" -msgstr "Сохранить исходный текст" +#: ../share/extensions/layout_nup.inx.h:9 +#: ../share/extensions/printing_marks.inx.h:16 +msgid "Right:" +msgstr "Правое:" -#: ../share/extensions/split.inx.h:5 +#: ../share/extensions/layout_nup.inx.h:10 #, fuzzy -msgctxt "split" -msgid "Lines" -msgstr "Линии" +msgid "Page margins" +msgstr "Левое поле" -#: ../share/extensions/split.inx.h:6 +#: ../share/extensions/layout_nup.inx.h:11 #, fuzzy -msgctxt "split" -msgid "Words" -msgstr "Слова" +msgid "Layout dimensions" +msgstr "Размещение макета:" -#: ../share/extensions/split.inx.h:7 +#: ../share/extensions/layout_nup.inx.h:13 #, fuzzy -msgctxt "split" -msgid "Letters" -msgstr "Буквы" +msgid "Cols:" +msgstr "Столбцов:" -#: ../share/extensions/split.inx.h:9 -#, fuzzy -msgid "This effect splits texts into different lines, words or letters." +#: ../share/extensions/layout_nup.inx.h:14 +msgid "Auto calculate layout size" msgstr "" -"Этот эффект разделяет текстовый блок построчно, пословно или побуквенно. " -"Выберите предпочитаемый способ." -#: ../share/extensions/straightseg.inx.h:1 -msgid "Straighten Segments" -msgstr "Выпрямить сегменты" - -#: ../share/extensions/straightseg.inx.h:2 +#: ../share/extensions/layout_nup.inx.h:15 #, fuzzy -msgid "Percent:" -msgstr "Процент" +msgid "Layout padding" +msgstr "Размещение макета:" -#: ../share/extensions/straightseg.inx.h:3 +#: ../share/extensions/layout_nup.inx.h:16 #, fuzzy -msgid "Behavior:" -msgstr "Поведение" +msgid "Layout margins" +msgstr "Левое поле" -#: ../share/extensions/summersnight.inx.h:1 -msgid "Envelope" -msgstr "Перспектива" +#: ../share/extensions/layout_nup.inx.h:17 +#: ../share/extensions/printing_marks.inx.h:2 +msgid "Marks" +msgstr "Метки" -#: ../share/extensions/svg2fxg.inx.h:1 +#: ../share/extensions/layout_nup.inx.h:18 #, fuzzy -msgid "FXG Output" -msgstr "Экспорт в DXF" +msgid "Place holder" +msgstr "Черная дыра" -#: ../share/extensions/svg2fxg.inx.h:2 +#: ../share/extensions/layout_nup.inx.h:19 #, fuzzy -msgid "Flash XML Graphics (*.fxg)" -msgstr "Файл XFIG (*.fig)" - -#: ../share/extensions/svg2fxg.inx.h:3 -msgid "Adobe's XML Graphics file format" -msgstr "" - -#: ../share/extensions/svg2xaml.inx.h:1 -msgid "XAML Output" -msgstr "Экспорт в XAML" +msgid "Cutting marks" +msgstr "Метки для печати" -#: ../share/extensions/svg2xaml.inx.h:2 -msgid "Silverlight compatible XAML" +#: ../share/extensions/layout_nup.inx.h:20 +msgid "Padding guide" msgstr "" -#: ../share/extensions/svg2xaml.inx.h:3 ../share/extensions/xaml2svg.inx.h:2 -msgid "Microsoft XAML (*.xaml)" -msgstr "Microsoft XAML (*.xaml)" - -#: ../share/extensions/svg2xaml.inx.h:4 ../share/extensions/xaml2svg.inx.h:3 -msgid "Microsoft's GUI definition format" -msgstr "Формат Microsoft для описания GUI" - -#: ../share/extensions/svg_and_media_zip_output.inx.h:1 +#: ../share/extensions/layout_nup.inx.h:21 #, fuzzy -msgid "Compressed Inkscape SVG with media export" -msgstr "Сжатые файлы Inkscape SVG со связанными данными (*.zip)" +msgid "Margin guide" +msgstr "Перемещение направляющей" -#: ../share/extensions/svg_and_media_zip_output.inx.h:2 +#: ../share/extensions/layout_nup.inx.h:22 #, fuzzy -msgid "Image zip directory:" -msgstr "Некорректный рабочий каталог: %s" +msgid "Padding box" +msgstr "Площадка (BB)" -#: ../share/extensions/svg_and_media_zip_output.inx.h:3 +#: ../share/extensions/layout_nup.inx.h:23 #, fuzzy -msgid "Add font list" -msgstr "Добавить шрифт" - -#: ../share/extensions/svg_and_media_zip_output.inx.h:4 -msgid "Compressed Inkscape SVG with media (*.zip)" -msgstr "Сжатые файлы Inkscape SVG со связанными данными (*.zip)" +msgid "Margin box" +msgstr "art box" -#: ../share/extensions/svg_and_media_zip_output.inx.h:5 +#: ../share/extensions/layout_nup.inx.h:25 msgid "" -"Inkscape's native file format compressed with Zip and including all media " -"files" +"\n" +"Parameters:\n" +" * Page size: width and height.\n" +" * Page margins: extra space around each page.\n" +" * Layout rows and cols.\n" +" * Layout size: width and height, auto calculated if one is 0.\n" +" * Auto calculate layout size: don't use the layout size values.\n" +" * Layout margins: white space around each part of the layout.\n" +" * Layout padding: inner padding for each part of the layout.\n" +" " msgstr "" -"Файлы в формате Inkscape, сжатые Zip и включающие все связанные с документом " -"файлы" - -#: ../share/extensions/svgcalendar.inx.h:1 -msgid "Calendar" -msgstr "Календарь" -#: ../share/extensions/svgcalendar.inx.h:3 -msgid "Year (4 digits):" -msgstr "Год (четыре цифры):" +#: ../share/extensions/layout_nup.inx.h:36 +#: ../share/extensions/perfectboundcover.inx.h:20 +#: ../share/extensions/printing_marks.inx.h:21 +#: ../share/extensions/svgcalendar.inx.h:13 +msgid "Layout" +msgstr "Размещение" -#: ../share/extensions/svgcalendar.inx.h:4 -msgid "Month (0 for all):" -msgstr "Месяц (0 — все)" +#: ../share/extensions/lindenmayer.inx.h:1 +msgid "L-system" +msgstr "Система Линденмайера" -#: ../share/extensions/svgcalendar.inx.h:5 -msgid "Fill empty day boxes with next month's days" -msgstr "Вставлять дни следующего месяца в пустые клетки" +#: ../share/extensions/lindenmayer.inx.h:2 +msgid "Axiom and rules" +msgstr "Аксиома и правила" -#: ../share/extensions/svgcalendar.inx.h:6 +#: ../share/extensions/lindenmayer.inx.h:3 #, fuzzy -msgid "Show week number" -msgstr "Номер слайда" +msgid "Axiom:" +msgstr "Аксиома" -#: ../share/extensions/svgcalendar.inx.h:7 +#: ../share/extensions/lindenmayer.inx.h:4 +msgid "Rules:" +msgstr "Правила:" + +#: ../share/extensions/lindenmayer.inx.h:6 #, fuzzy -msgid "Week start day:" -msgstr "Первый день недели" +msgid "Step length (px):" +msgstr "Длина шага (px)" -#: ../share/extensions/svgcalendar.inx.h:8 -msgid "Weekend:" -msgstr "Выходные:" +#: ../share/extensions/lindenmayer.inx.h:8 +#, fuzzy, no-c-format +msgid "Randomize step (%):" +msgstr "Случайный шаг (%)" -#: ../share/extensions/svgcalendar.inx.h:9 -msgid "Sunday" -msgstr "Воскресенье" +#: ../share/extensions/lindenmayer.inx.h:9 +#, fuzzy +msgid "Left angle:" +msgstr "Левый угол" -#: ../share/extensions/svgcalendar.inx.h:10 -msgid "Monday" -msgstr "Понедельник" +#: ../share/extensions/lindenmayer.inx.h:10 +#, fuzzy +msgid "Right angle:" +msgstr "Правый угол" -#: ../share/extensions/svgcalendar.inx.h:11 -msgid "Saturday and Sunday" -msgstr "Суббота и воскресенье" +#: ../share/extensions/lindenmayer.inx.h:12 +#, fuzzy, no-c-format +msgid "Randomize angle (%):" +msgstr "Случайный угол (%)" -#: ../share/extensions/svgcalendar.inx.h:12 -msgid "Saturday" -msgstr "Суббота" +#: ../share/extensions/lindenmayer.inx.h:14 +msgid "" +"\n" +"The path is generated by applying the \n" +"substitutions of Rules to the Axiom, \n" +"Order times. The following commands are \n" +"recognized in Axiom and Rules:\n" +"\n" +"Any of A,B,C,D,E,F: draw forward \n" +"\n" +"Any of G,H,I,J,K,L: move forward \n" +"\n" +"+: turn left\n" +"\n" +"-: turn right\n" +"\n" +"|: turn 180 degrees\n" +"\n" +"[: remember point\n" +"\n" +"]: return to remembered point\n" +msgstr "" +"\n" +"Контур создаётся подстановкой\n" +"правил к аксиоме столько раз, \n" +"сколько порядков указано.\n" +"Следующие команды могут быть\n" +"использованы в аксиоме и правилах:\n" +"\n" +"A, B, C, D, E или F: рисовать вперёд \n" +"\n" +"G, H, I, J, K или L: двигаться вперёд \n" +"\n" +"+: повернуть влево\n" +"\n" +"-: повернуть вправо\n" +"\n" +"|: повернуть на 180 градусов\n" +"\n" +"[: запомнить точку\n" +"\n" +"]: вернуться к запомненной точке\n" + +#: ../share/extensions/lorem_ipsum.inx.h:1 +msgid "Lorem ipsum" +msgstr "Шаблонный текст" -#: ../share/extensions/svgcalendar.inx.h:14 -msgid "Automatically set size and position" -msgstr "Автоматически установить размер и положение" +#: ../share/extensions/lorem_ipsum.inx.h:3 +msgid "Number of paragraphs:" +msgstr "Количество абзацев:" -#: ../share/extensions/svgcalendar.inx.h:15 -msgid "Months per line:" -msgstr "Месяцев на строку:" +#: ../share/extensions/lorem_ipsum.inx.h:4 +msgid "Sentences per paragraph:" +msgstr "Предложений в абзаце:" -#: ../share/extensions/svgcalendar.inx.h:16 -msgid "Month Width:" -msgstr "Ширина блока месяца:" +#: ../share/extensions/lorem_ipsum.inx.h:5 +#, fuzzy +msgid "Paragraph length fluctuation (sentences):" +msgstr "Вариативность длины абзацев (в предложениях)" -#: ../share/extensions/svgcalendar.inx.h:17 -msgid "Month Margin:" -msgstr "Поле вокруг месяца:" +#: ../share/extensions/lorem_ipsum.inx.h:7 +msgid "" +"This effect creates the standard \"Lorem Ipsum\" pseudolatin placeholder " +"text. If a flowed text is selected, Lorem Ipsum is added to it; otherwise a " +"new flowed text object, the size of the page, is created in a new layer." +msgstr "" +"Этот эффект создает стандартный шаблонный текст \"Lorem Ipsum\". Если эффект " +"применяется к блоку с заверстанным текстом, этот текст заливается в блок, " +"если нет — в новый блок заверстанного текста размером со страницу, в новом " +"слое." -#: ../share/extensions/svgcalendar.inx.h:18 -msgid "The options below have no influence when the above is checked." -msgstr "Параметры ниже не работают, если включена функция выше." +#: ../share/extensions/markers_strokepaint.inx.h:1 +msgid "Color Markers" +msgstr "Раскрасить маркеры…" -#: ../share/extensions/svgcalendar.inx.h:20 -msgid "Year color:" -msgstr "Цвет года:" +#: ../share/extensions/markers_strokepaint.inx.h:2 +msgid "From object" +msgstr "Из объекта" -#: ../share/extensions/svgcalendar.inx.h:21 -msgid "Month color:" -msgstr "Цвет месяца:" +#: ../share/extensions/markers_strokepaint.inx.h:3 +msgid "Marker type:" +msgstr "Тип маркера:" -#: ../share/extensions/svgcalendar.inx.h:22 -msgid "Weekday name color:" -msgstr "Цвет названия рабочего дня:" +#: ../share/extensions/markers_strokepaint.inx.h:4 +msgid "Invert fill and stroke colors" +msgstr "Инвертировать цвета заливки и обводки" -#: ../share/extensions/svgcalendar.inx.h:23 -msgid "Day color:" -msgstr "Цвет дня:" +#: ../share/extensions/markers_strokepaint.inx.h:5 +msgid "Assign alpha" +msgstr "Назначить альфа-канал" -#: ../share/extensions/svgcalendar.inx.h:24 -msgid "Weekend day color:" -msgstr "Цвет названия выходного дня:" +#: ../share/extensions/markers_strokepaint.inx.h:6 +msgid "solid" +msgstr "С заливкой" -#: ../share/extensions/svgcalendar.inx.h:25 -msgid "Next month day color:" -msgstr "Цвет дней следующего месяца:" +#: ../share/extensions/markers_strokepaint.inx.h:7 +msgid "filled" +msgstr "Без заливки" -#: ../share/extensions/svgcalendar.inx.h:26 -#, fuzzy -msgid "Week number color:" -msgstr "Цвет названия рабочего дня:" +#: ../share/extensions/markers_strokepaint.inx.h:10 +msgid "Assign fill color" +msgstr "Установить цвет заливки" -#: ../share/extensions/svgcalendar.inx.h:27 -msgid "Localization" -msgstr "Локализация" +#: ../share/extensions/markers_strokepaint.inx.h:11 +msgid "Stroke" +msgstr "Обводка" -#: ../share/extensions/svgcalendar.inx.h:28 -msgid "Month names:" -msgstr "Названия месяцев:" +#: ../share/extensions/markers_strokepaint.inx.h:12 +msgid "Assign stroke color" +msgstr "Установить цвет обводки" -#: ../share/extensions/svgcalendar.inx.h:29 -msgid "Day names:" -msgstr "Названия дней:" +#: ../share/extensions/measure.inx.h:1 +msgid "Measure Path" +msgstr "Измерить контур" -#: ../share/extensions/svgcalendar.inx.h:30 -#, fuzzy -msgid "Week number column name:" -msgstr "Уменьшить число столбцов:" +#: ../share/extensions/measure.inx.h:2 +msgid "Measure" +msgstr "Измерить контур" -#: ../share/extensions/svgcalendar.inx.h:31 -msgid "Char Encoding:" -msgstr "Кодировка символов:" +#: ../share/extensions/measure.inx.h:3 +msgid "Measurement Type: " +msgstr "Что измерить:" -#: ../share/extensions/svgcalendar.inx.h:32 -msgid "You may change the names for other languages:" -msgstr "Вы можете вставить названия на своем языке:" +#: ../share/extensions/measure.inx.h:4 +#, fuzzy +msgid "Text Orientation: " +msgstr "Направление текста" -#: ../share/extensions/svgcalendar.inx.h:33 -msgid "" -"January February March April May June July August September October November " -"December" +#: ../share/extensions/measure.inx.h:5 +msgid "Angle [with Fixed Angle option only] (°):" msgstr "" -"Январь Февраль Март Апрель Май Июнь Июль Август Сентябрь Октябрь Ноябрь " -"Декабрь" -#: ../share/extensions/svgcalendar.inx.h:34 -msgid "Sun Mon Tue Wed Thu Fri Sat" -msgstr "ВС ПН ВТ СР ЧТ ПТ СБ" +#: ../share/extensions/measure.inx.h:6 +msgid "Font size (px):" +msgstr "Кегль шрифта (px):" -#: ../share/extensions/svgcalendar.inx.h:35 -#, fuzzy -msgid "The day names list must start from Sunday." -msgstr "(Названия должны начинаться с воскресенья)" +#: ../share/extensions/measure.inx.h:7 +msgid "Offset (px):" +msgstr "Смещение текстовой метки (px):" -#: ../share/extensions/svgcalendar.inx.h:36 -msgid "Wk" -msgstr "" +#: ../share/extensions/measure.inx.h:8 +msgid "Precision:" +msgstr "Точность:" -#: ../share/extensions/svgcalendar.inx.h:37 -#, fuzzy -msgid "" -"Select your system encoding. More information at http://docs.python.org/" -"library/codecs.html#standard-encodings." -msgstr "" -"(Выберите системную кодировку. Подробнее см. http://docs.python.org/library/" -"codecs.html#standard-encodings)" +#: ../share/extensions/measure.inx.h:9 +msgid "Scale Factor (Drawing:Real Length) = 1:" +msgstr "Масштаб (Рисунок:Реальная длина) = 1:" -#: ../share/extensions/svgfont2layers.inx.h:1 -msgid "Convert SVG Font to Glyph Layers" -msgstr "Сконвертировать шрифт SVG в слои глифов…" +#: ../share/extensions/measure.inx.h:10 +msgid "Length Unit:" +msgstr "Единица длины:" -#: ../share/extensions/svgfont2layers.inx.h:2 -msgid "Load only the first 30 glyphs (Recommended)" -msgstr "Загрузить только первые 30 глифов (рекомендуется)" +#: ../share/extensions/measure.inx.h:12 +msgctxt "measure extension" +msgid "Area" +msgstr "Площадь" -#: ../share/extensions/synfig_output.inx.h:1 -#, fuzzy -msgid "Synfig Output" -msgstr "Экспорт в SVG" +#: ../share/extensions/measure.inx.h:13 +msgctxt "measure extension" +msgid "Center of Mass" +msgstr "Центр массы" -#: ../share/extensions/synfig_output.inx.h:2 -msgid "Synfig Animation (*.sif)" -msgstr "" +#: ../share/extensions/measure.inx.h:14 +msgctxt "measure extension" +msgid "Text On Path" +msgstr "Текст по контуру" -#: ../share/extensions/synfig_output.inx.h:3 -msgid "Synfig Animation written using the sif-file exporter extension" -msgstr "" +#: ../share/extensions/measure.inx.h:15 +#, fuzzy +msgctxt "measure extension" +msgid "Fixed Angle" +msgstr "Угол пера" -#: ../share/extensions/tar_layers.inx.h:1 -msgid "Collection of SVG files One per root layer" +#: ../share/extensions/measure.inx.h:18 +#, fuzzy, no-c-format +msgid "" +"This effect measures the length, area, or center-of-mass of the selected " +"paths. Length and area are added as a text object with the selected units. " +"Center-of-mass is shown as a cross symbol.\n" +"\n" +" * Text display format can be either Text-On-Path, or stand-alone text at a " +"specified angle.\n" +" * The number of significant digits can be controlled by the Precision " +"field.\n" +" * The Offset field controls the distance from the text to the path.\n" +" * The Scale factor can be used to make measurements in scaled drawings. " +"For example, if 1 cm in the drawing equals 2.5 m in the real world, Scale " +"must be set to 250.\n" +" * When calculating area, the result should be precise for polygons and " +"Bezier curves. If a circle is used, the area may be too high by as much as " +"0.03%." msgstr "" +"При помощи этого эффекта можно измерить длину выбранного контура и " +"прикрепить к этому контуру вычисленный результат в виде текста.\n" +"\n" +"· Число значимых цифр контролируется параметром «Точность».\n" +"· Параметр «Смещение» задает расстояние между текстом и контуром.\n" +"· Параметр «Масштаб» позволяет измерять предметы с известным масштабом. К " +"примеру, если на рисунке 1 см равен 2,5 м, необходимо указать 250.\n" +"· При расчёте площади результат точен для многоугольников и кривых Безье. " +"Для окружностей рассчитанная площадь может быть больше реальной на 0,03%." -#: ../share/extensions/tar_layers.inx.h:2 -msgid "Layers as Separate SVG (*.tar)" -msgstr "" +#: ../share/extensions/merge_styles.inx.h:1 +msgid "Merge Styles into CSS" +msgstr "Встроить стили в CSS" -#: ../share/extensions/tar_layers.inx.h:3 +#: ../share/extensions/merge_styles.inx.h:2 msgid "" -"Each layer split into it's own svg file and collected as a tape archive (tar " -"file)" +"All selected nodes will be grouped together and their common style " +"attributes will create a new class, this class will replace the existing " +"inline style attributes. Please use a name which best describes the kinds of " +"objects and their common context for best effect." msgstr "" -#: ../share/extensions/text_braille.inx.h:1 -msgid "Convert to Braille" -msgstr "Преобразовать в брайлев текст" +#: ../share/extensions/merge_styles.inx.h:3 +msgid "New Class Name:" +msgstr "Имя нового класса:" -#: ../share/extensions/text_extract.inx.h:1 -msgid "Extract" -msgstr "Извлечь" +#: ../share/extensions/merge_styles.inx.h:4 +msgid "Stylesheet" +msgstr "Каскадный стиль" -#: ../share/extensions/text_extract.inx.h:2 -#: ../share/extensions/text_merge.inx.h:2 -msgid "Text direction:" -msgstr "Направление текста:" +#: ../share/extensions/motion.inx.h:1 +msgid "Motion" +msgstr "Движение" -#: ../share/extensions/text_extract.inx.h:3 -#: ../share/extensions/text_merge.inx.h:3 -msgid "Left to right" -msgstr "Слева направо" +#: ../share/extensions/motion.inx.h:2 +#, fuzzy +msgid "Magnitude:" +msgstr "Величина" -#: ../share/extensions/text_extract.inx.h:4 -#: ../share/extensions/text_merge.inx.h:4 -msgid "Bottom to top" -msgstr "Снизу вверх" +#: ../share/extensions/new_glyph_layer.inx.h:1 +msgid "2 - Add Glyph Layer" +msgstr "2. Добавить слой глифа" -#: ../share/extensions/text_extract.inx.h:5 -#: ../share/extensions/text_merge.inx.h:5 -msgid "Right to left" -msgstr "Справа налево" +#: ../share/extensions/new_glyph_layer.inx.h:2 +msgid "Unicode character:" +msgstr "Символ >никода:" -#: ../share/extensions/text_extract.inx.h:6 -#: ../share/extensions/text_merge.inx.h:6 -msgid "Top to bottom" -msgstr "Сверху вниз" +#: ../share/extensions/next_glyph_layer.inx.h:1 +msgid "View Next Glyph" +msgstr "Просмотреть следующий глиф" -#: ../share/extensions/text_extract.inx.h:7 -#: ../share/extensions/text_merge.inx.h:7 -msgid "Horizontal point:" -msgstr "Горизонтальная точка:" +#: ../share/extensions/param_curves.inx.h:1 +msgid "Parametric Curves" +msgstr "Параметрические кривые" -#: ../share/extensions/text_extract.inx.h:11 -#: ../share/extensions/text_merge.inx.h:11 -msgid "Vertical point:" -msgstr "Вертикальная точка:" +#: ../share/extensions/param_curves.inx.h:2 +msgid "Range and Sampling" +msgstr "Диапазон и выборка" -#: ../share/extensions/text_flipcase.inx.h:1 -msgid "fLIP cASE" -msgstr "иНВЕРТИРОВАТЬ РЕГИСТР" +#: ../share/extensions/param_curves.inx.h:3 +#, fuzzy +msgid "Start t-value:" +msgstr "Начальное значение t:" -#: ../share/extensions/text_flipcase.inx.h:3 -#: ../share/extensions/text_lowercase.inx.h:3 -#: ../share/extensions/text_randomcase.inx.h:3 -#: ../share/extensions/text_sentencecase.inx.h:3 -#: ../share/extensions/text_titlecase.inx.h:3 -#: ../share/extensions/text_uppercase.inx.h:3 -msgid "Change Case" -msgstr "Изменить регистр" +#: ../share/extensions/param_curves.inx.h:4 +#, fuzzy +msgid "End t-value:" +msgstr "Конечное значение t:" -#: ../share/extensions/text_lowercase.inx.h:1 -msgid "lowercase" -msgstr "все строчные" +#: ../share/extensions/param_curves.inx.h:5 +#, fuzzy +msgid "Multiply t-range by 2*pi" +msgstr "Умножить диапазон t на 2*pi" -#. <param name="flowtext" type="boolean" _gui-text="Flow text">false</param> -#: ../share/extensions/text_merge.inx.h:15 +#: ../share/extensions/param_curves.inx.h:6 #, fuzzy -msgid "Keep style" -msgstr "Смена стиля текста" +msgid "X-value of rectangle's left:" +msgstr "Координата левой стороны прямоугольника по оси X:" -#: ../share/extensions/text_randomcase.inx.h:1 -msgid "rANdOm CasE" -msgstr "сЛУчАЙнЫй РЕгИсТр" +#: ../share/extensions/param_curves.inx.h:7 +#, fuzzy +msgid "X-value of rectangle's right:" +msgstr "Координата правой стороны прямоугольника по оси X:" -#: ../share/extensions/text_sentencecase.inx.h:1 -msgid "Sentence case" -msgstr "Как в предложении" +#: ../share/extensions/param_curves.inx.h:8 +#, fuzzy +msgid "Y-value of rectangle's bottom:" +msgstr "Координата низа прямоугольника по оси Y:" -#: ../share/extensions/text_titlecase.inx.h:1 -msgid "Title Case" -msgstr "Титульный Регистр" +#: ../share/extensions/param_curves.inx.h:9 +#, fuzzy +msgid "Y-value of rectangle's top:" +msgstr "Координата верха прямоугольника по оси Y:" -#: ../share/extensions/text_uppercase.inx.h:1 -msgid "UPPERCASE" -msgstr "ВСЕ ПРОПИСНЫЕ" +#: ../share/extensions/param_curves.inx.h:10 +#, fuzzy +msgid "Samples:" +msgstr "Число выборок:" -#: ../share/extensions/triangle.inx.h:1 -msgid "Triangle" -msgstr "Треугольник" +#: ../share/extensions/param_curves.inx.h:14 +#, fuzzy +msgid "" +"Select a rectangle before calling the extension, it will determine X and Y " +"scales.\n" +"First derivatives are always determined numerically." +msgstr "" +"Перед вызовом расширения выделите прямоугольник,\n" +"который задаст масштабы X и Y.\n" +"\n" +"Первые производные функции всегда определяются числами." -#: ../share/extensions/triangle.inx.h:2 -msgid "Side Length a (px):" -msgstr "Длина стороны a (px):" +#: ../share/extensions/param_curves.inx.h:26 +#, fuzzy +msgid "X-Function:" +msgstr "Функция по оси X:" -#: ../share/extensions/triangle.inx.h:3 -msgid "Side Length b (px):" -msgstr "Длина стороны b (px):" +#: ../share/extensions/param_curves.inx.h:27 +#, fuzzy +msgid "Y-Function:" +msgstr "Функция по оси X:" -#: ../share/extensions/triangle.inx.h:4 -msgid "Side Length c (px):" -msgstr "Длина стороны c (px):" +#: ../share/extensions/pathalongpath.inx.h:1 +msgid "Pattern along Path" +msgstr "Текстура по контуру" -#: ../share/extensions/triangle.inx.h:5 -msgid "Angle a (deg):" -msgstr "Угол a (°):" +#: ../share/extensions/pathalongpath.inx.h:3 +msgid "Copies of the pattern:" +msgstr "Копий текстуры:" -#: ../share/extensions/triangle.inx.h:6 -msgid "Angle b (deg):" -msgstr "Угол b (°):" +#: ../share/extensions/pathalongpath.inx.h:4 +msgid "Deformation type:" +msgstr "Тип деформации:" -#: ../share/extensions/triangle.inx.h:7 -msgid "Angle c (deg):" -msgstr "Угол c (°):" +#: ../share/extensions/pathalongpath.inx.h:5 +#: ../share/extensions/pathscatter.inx.h:5 +msgid "Space between copies:" +msgstr "Интервал между копиями:" -#: ../share/extensions/triangle.inx.h:9 -msgid "From Three Sides" -msgstr "Из трех сторон" +#: ../share/extensions/pathalongpath.inx.h:6 +#: ../share/extensions/pathscatter.inx.h:6 +msgid "Normal offset:" +msgstr "Обычное смещение:" -#: ../share/extensions/triangle.inx.h:10 -msgid "From Sides a, b and Angle c" -msgstr "Из сторон a, b и угла c" +#: ../share/extensions/pathalongpath.inx.h:7 +#: ../share/extensions/pathscatter.inx.h:7 +msgid "Tangential offset:" +msgstr "Смещение по касательной:" -#: ../share/extensions/triangle.inx.h:11 -msgid "From Sides a, b and Angle a" -msgstr "Из сторон a, b и угла a" +#: ../share/extensions/pathalongpath.inx.h:8 +#: ../share/extensions/pathscatter.inx.h:8 +msgid "Pattern is vertical" +msgstr "Текстура вертикальна" -#: ../share/extensions/triangle.inx.h:12 -msgid "From Side a and Angles a, b" -msgstr "Из стороны a и углов a, b" +#: ../share/extensions/pathalongpath.inx.h:9 +#: ../share/extensions/pathscatter.inx.h:10 +msgid "Duplicate the pattern before deformation" +msgstr "Продублировать текстуру перед деформацией" -#: ../share/extensions/triangle.inx.h:13 -msgid "From Side c and Angles a, b" -msgstr "Из стороны c и углов a, b" +#: ../share/extensions/pathalongpath.inx.h:14 +msgid "Snake" +msgstr "Змейка" -#: ../share/extensions/voronoi2svg.inx.h:1 -#, fuzzy -msgid "Voronoi Diagram" -msgstr "Мозаика Вороного" +#: ../share/extensions/pathalongpath.inx.h:15 +msgid "Ribbon" +msgstr "Лента" -#: ../share/extensions/voronoi2svg.inx.h:3 -msgid "Type of diagram:" +#: ../share/extensions/pathalongpath.inx.h:17 +#, fuzzy +msgid "" +"This effect scatters or bends a pattern along arbitrary \"skeleton\" paths. " +"The pattern is the topmost object in the selection. Groups of paths, shapes " +"or clones are allowed." msgstr "" +"Этот эффект рассеивает текстурный объект по произвольному скелетному " +"контуру. Текстура является верхним объектом в выделении. Допустимы группы из " +"контуров, фигур и клонов." -#: ../share/extensions/voronoi2svg.inx.h:4 -#, fuzzy -msgid "Bounding box of the diagram:" -msgstr "Используемая площадка (BB):" +#: ../share/extensions/pathscatter.inx.h:3 +msgid "Follow path orientation" +msgstr "Следовать ориентации контура" -#: ../share/extensions/voronoi2svg.inx.h:5 -#, fuzzy -msgid "Show the bounding box" -msgstr "Показывать ограничивающую площадку (BB)" +#: ../share/extensions/pathscatter.inx.h:4 +msgid "Stretch spaces to fit skeleton length" +msgstr "Растянуть промежутки до заполнения длины контура" -#: ../share/extensions/voronoi2svg.inx.h:6 -#, fuzzy -msgid "Delaunay Triangulation" -msgstr "Ориентация" +#: ../share/extensions/pathscatter.inx.h:9 +msgid "Original pattern will be:" +msgstr "Исходная текстура будет:" -#: ../share/extensions/voronoi2svg.inx.h:7 -#, fuzzy -msgid "Voronoi and Delaunay" -msgstr "Мозаика Вороного" +#: ../share/extensions/pathscatter.inx.h:11 +msgid "If pattern is a group, pick group members" +msgstr "" -#: ../share/extensions/voronoi2svg.inx.h:8 -msgid "Options for Voronoi diagram" +#: ../share/extensions/pathscatter.inx.h:12 +msgid "Pick group members:" msgstr "" -#: ../share/extensions/voronoi2svg.inx.h:10 +#: ../share/extensions/pathscatter.inx.h:13 +msgid "Moved" +msgstr "Перемещена" + +#: ../share/extensions/pathscatter.inx.h:14 +msgid "Copied" +msgstr "Скопирована" + +#: ../share/extensions/pathscatter.inx.h:15 +msgid "Cloned" +msgstr "Склонирована" + +#: ../share/extensions/pathscatter.inx.h:16 +#, fuzzy +msgid "Randomly" +msgstr "Случайные значения" + +#: ../share/extensions/pathscatter.inx.h:17 #, fuzzy -msgid "Automatic from selected objects" -msgstr "Сгруппировать выделенные объекты" +msgid "Sequentially" +msgstr "Установить заливку" -#: ../share/extensions/voronoi2svg.inx.h:12 +#: ../share/extensions/pathscatter.inx.h:19 msgid "" -"Select a set of objects. Their centroids will be used as the sites of the " -"Voronoi diagram. Text objects are not handled." +"This effect scatters a pattern along arbitrary \"skeleton\" paths. The " +"pattern must be the topmost object in the selection. Groups of paths, " +"shapes, clones are allowed." msgstr "" +"Этот эффект рассеивает текстурный объект по произвольному скелетному " +"контуру. Текстура является верхним объектом в выделении. Допустимы группы из " +"контуров, фигур и клонов." -#: ../share/extensions/web-set-att.inx.h:1 -msgid "Set Attributes" -msgstr "Установить атрибуты" +#: ../share/extensions/perfectboundcover.inx.h:1 +msgid "Perfect-Bound Cover Template" +msgstr "Идеально сшитая обложка" -#: ../share/extensions/web-set-att.inx.h:3 -#, fuzzy -msgid "Attribute to set:" -msgstr "Устанавливаемые атрибуты" +#: ../share/extensions/perfectboundcover.inx.h:2 +msgid "Book Properties" +msgstr "Параметры книги" -#: ../share/extensions/web-set-att.inx.h:4 -#, fuzzy -msgid "When should the set be done:" -msgstr "Когда установить?" +#: ../share/extensions/perfectboundcover.inx.h:3 +msgid "Book Width (inches):" +msgstr "Ширина книги (дюймы):" -#: ../share/extensions/web-set-att.inx.h:5 -#, fuzzy -msgid "Value to set:" -msgstr "Устанавливаемое значение:" +#: ../share/extensions/perfectboundcover.inx.h:4 +msgid "Book Height (inches):" +msgstr "Высота книги (дюймы):" -#: ../share/extensions/web-set-att.inx.h:6 -#: ../share/extensions/web-transmit-att.inx.h:5 -#, fuzzy -msgid "Compatibility with previews code to this event:" -msgstr "Совместимость с кодом просмотра события:" +#: ../share/extensions/perfectboundcover.inx.h:5 +msgid "Number of Pages:" +msgstr "Число страниц:" -#: ../share/extensions/web-set-att.inx.h:7 -#, fuzzy -msgid "Source and destination of setting:" -msgstr "Источник и получатель установки:" +#: ../share/extensions/perfectboundcover.inx.h:6 +msgid "Remove existing guides" +msgstr "Удалить существующие направляющие" -#: ../share/extensions/web-set-att.inx.h:8 -#: ../share/extensions/web-transmit-att.inx.h:7 -msgid "on click" -msgstr "при щелчке" +#: ../share/extensions/perfectboundcover.inx.h:7 +msgid "Interior Pages" +msgstr "Внутренние страницы" -#: ../share/extensions/web-set-att.inx.h:9 -#: ../share/extensions/web-transmit-att.inx.h:8 -msgid "on focus" -msgstr "при получении фокуса" +#: ../share/extensions/perfectboundcover.inx.h:8 +msgid "Paper Thickness Measurement:" +msgstr "Единица толщины бумаги:" -#: ../share/extensions/web-set-att.inx.h:10 -#: ../share/extensions/web-transmit-att.inx.h:9 -msgid "on blur" -msgstr "при размывании" +#: ../share/extensions/perfectboundcover.inx.h:9 +msgid "Pages Per Inch (PPI)" +msgstr "Страниц на дюйм (ppi)" -#: ../share/extensions/web-set-att.inx.h:11 -#: ../share/extensions/web-transmit-att.inx.h:10 -msgid "on activate" -msgstr "при активации" +#: ../share/extensions/perfectboundcover.inx.h:10 +msgid "Caliper (inches)" +msgstr "Толщина листа (дюймы)" -#: ../share/extensions/web-set-att.inx.h:12 -#: ../share/extensions/web-transmit-att.inx.h:11 -msgid "on mouse down" -msgstr "при нажатии клавиши мыши" +#: ../share/extensions/perfectboundcover.inx.h:11 +msgid "Points" +msgstr "Пункты" -#: ../share/extensions/web-set-att.inx.h:13 -#: ../share/extensions/web-transmit-att.inx.h:12 -msgid "on mouse up" -msgstr "при отпускании клавиши мыши" +#: ../share/extensions/perfectboundcover.inx.h:12 +msgid "Bond Weight #" +msgstr "Вес бумаги" -#: ../share/extensions/web-set-att.inx.h:14 -#: ../share/extensions/web-transmit-att.inx.h:13 -msgid "on mouse over" -msgstr "при прохождении курсора мыши над" +#: ../share/extensions/perfectboundcover.inx.h:13 +msgid "Specify Width" +msgstr "Укажите ширину:" -#: ../share/extensions/web-set-att.inx.h:15 -#: ../share/extensions/web-transmit-att.inx.h:14 -msgid "on mouse move" -msgstr "при перемещении мыши" +#: ../share/extensions/perfectboundcover.inx.h:14 +msgid "Value:" +msgstr "Значение:" -#: ../share/extensions/web-set-att.inx.h:16 -#: ../share/extensions/web-transmit-att.inx.h:15 -msgid "on mouse out" -msgstr "при выходе курсора мыши за пределы" +#: ../share/extensions/perfectboundcover.inx.h:15 +msgid "Cover" +msgstr "Обложка" -#: ../share/extensions/web-set-att.inx.h:17 -#: ../share/extensions/web-transmit-att.inx.h:16 -msgid "on element loaded" -msgstr "при загрузке элемента" +#: ../share/extensions/perfectboundcover.inx.h:16 +msgid "Cover Thickness Measurement:" +msgstr "Единица толщины обложки:" -#: ../share/extensions/web-set-att.inx.h:18 -msgid "The list of values must have the same size as the attributes list." -msgstr "Количество значений должно равняться количеству атрибутов." +#: ../share/extensions/perfectboundcover.inx.h:17 +msgid "Bleed (in):" +msgstr "Выпуск под обрез (дюймы)" -#: ../share/extensions/web-set-att.inx.h:19 -#: ../share/extensions/web-transmit-att.inx.h:17 -msgid "Run it after" -msgstr "Запустить после" +#: ../share/extensions/perfectboundcover.inx.h:18 +msgid "Note: Bond Weight # calculations are a best-guess estimate." +msgstr "Примечание: оценка по весу бумаги работает лучше всего" -#: ../share/extensions/web-set-att.inx.h:20 -#: ../share/extensions/web-transmit-att.inx.h:18 -msgid "Run it before" -msgstr "Запустить до" +#: ../share/extensions/perspective.inx.h:1 +msgid "Perspective" +msgstr "Перспектива" -#: ../share/extensions/web-set-att.inx.h:22 -#: ../share/extensions/web-transmit-att.inx.h:20 -msgid "The next parameter is useful when you select more than two elements" -msgstr "Следующий параметр полезен, когда выбрано больше двух элементов" +#: ../share/extensions/pixelsnap.inx.h:1 +msgid "PixelSnap" +msgstr "Выровнять по пиксельной сетке" -#: ../share/extensions/web-set-att.inx.h:23 -msgid "All selected ones set an attribute in the last one" -msgstr "Все выбранные устанавливают атрибут последнему" +#: ../share/extensions/pixelsnap.inx.h:2 +#, fuzzy +msgid "" +"Snap all paths in selection to pixels. Snaps borders to half-points and " +"fills to full points." +msgstr "" +"Выравнивает все контуры в выделении по пиксельной сетке, делая изображение " +"чётким" -#: ../share/extensions/web-set-att.inx.h:24 -msgid "The first selected sets an attribute in all others" -msgstr "Первый выбранный передает атрибут остальным" +#: ../share/extensions/plotter.inx.h:1 +msgid "Plot" +msgstr "" -#: ../share/extensions/web-set-att.inx.h:26 -#: ../share/extensions/web-transmit-att.inx.h:24 +#: ../share/extensions/plotter.inx.h:2 msgid "" -"This effect adds a feature visible (or usable) only on a SVG enabled web " -"browser (like Firefox)." +"Please make sure that all objects you want to plot are converted to paths." msgstr "" -"Этот эффект добавляет функцию, видимую (и используемую) только в браузере с " -"поддержкой SVG (вроде Firefox)" -#: ../share/extensions/web-set-att.inx.h:27 +#: ../share/extensions/plotter.inx.h:3 +msgid "Connection Settings " +msgstr "Параметры соединения" + +#: ../share/extensions/plotter.inx.h:4 +msgid "Serial port:" +msgstr "Последовательный порт:" + +#: ../share/extensions/plotter.inx.h:5 msgid "" -"This effect sets one or more attributes in the second selected element, when " -"a defined event occurs on the first selected element." +"The port of your serial connection, on Windows something like 'COM1', on " +"Linux something like: '/dev/ttyUSB0' (Default: COM1)" msgstr "" -"Этот эффект устанавливает один или более атрибутов второго выделенного " -"объекта, когда указанное событие происходит с первым выделенным объектом." -#: ../share/extensions/web-set-att.inx.h:28 +#: ../share/extensions/plotter.inx.h:6 +msgid "Serial baud rate:" +msgstr "" + +#: ../share/extensions/plotter.inx.h:7 +msgid "The Baud rate of your serial connection (Default: 9600)" +msgstr "" + +#: ../share/extensions/plotter.inx.h:8 +msgid "Flow control:" +msgstr "" + +#: ../share/extensions/plotter.inx.h:9 msgid "" -"If you want to set more than one attribute, you must separate this with a " -"space, and only with a space." +"The Software / Hardware flow control of your serial connection (Default: " +"Software)" msgstr "" -"Если вы хотите установить более чем один атрибут, необходимо разделить их " -"пробелом." -#: ../share/extensions/web-set-att.inx.h:29 -#: ../share/extensions/web-transmit-att.inx.h:27 -#: ../share/extensions/webslicer_create_group.inx.h:13 -#: ../share/extensions/webslicer_create_rect.inx.h:41 -#: ../share/extensions/webslicer_export.inx.h:8 -msgid "Web" -msgstr "Веб" +#: ../share/extensions/plotter.inx.h:10 +msgid "Command language:" +msgstr "Язык управления:" -#: ../share/extensions/web-transmit-att.inx.h:1 -msgid "Transmit Attributes" -msgstr "Передать атрибуты" +#: ../share/extensions/plotter.inx.h:11 +msgid "The command language to use (Default: HPGL)" +msgstr "" -#: ../share/extensions/web-transmit-att.inx.h:3 +#: ../share/extensions/plotter.inx.h:12 +msgid "Software (XON/XOFF)" +msgstr "" + +#: ../share/extensions/plotter.inx.h:13 #, fuzzy -msgid "Attribute to transmit:" -msgstr "Передаваемые атрибуты" +msgid "Hardware (RTS/CTS)" +msgstr "Устройства" -#: ../share/extensions/web-transmit-att.inx.h:4 -msgid "When to transmit:" -msgstr "Когда передать:" +#: ../share/extensions/plotter.inx.h:14 +msgid "Hardware (DSR/DTR + RTS/CTS)" +msgstr "" -#: ../share/extensions/web-transmit-att.inx.h:6 -#, fuzzy -msgid "Source and destination of transmitting:" -msgstr "Источник и получатель передачи:" +#: ../share/extensions/plotter.inx.h:15 +msgctxt "Flow control" +msgid "None" +msgstr "Нет" -#: ../share/extensions/web-transmit-att.inx.h:21 -msgid "All selected ones transmit to the last one" -msgstr "Все выбранные передают последнему" +#: ../share/extensions/plotter.inx.h:16 +msgid "HPGL" +msgstr "HPGL" -#: ../share/extensions/web-transmit-att.inx.h:22 -msgid "The first selected transmits to all others" -msgstr "Первый выбранный передает всем остальным" +#: ../share/extensions/plotter.inx.h:17 +msgid "DMPL" +msgstr "DMPL" -#: ../share/extensions/web-transmit-att.inx.h:25 +#: ../share/extensions/plotter.inx.h:18 +msgid "KNK Zing (HPGL variant)" +msgstr "KNK Zing (вариант HPGL)" + +#: ../share/extensions/plotter.inx.h:19 msgid "" -"This effect transmits one or more attributes from the first selected element " -"to the second when an event occurs." +"Using wrong settings can under certain circumstances cause Inkscape to " +"freeze. Always save your work before plotting!" msgstr "" -"Этот эффект передаёт один или более атрибутов первого выделенного объекта " -"второму при заданном событии." -#: ../share/extensions/web-transmit-att.inx.h:26 +#: ../share/extensions/plotter.inx.h:20 msgid "" -"If you want to transmit more than one attribute, you should separate this " -"with a space, and only with a space." +"This can be a physical serial connection or a USB-to-Serial bridge. Ask your " +"plotter manufacturer for drivers if needed." msgstr "" -"Если вы хотите передать более чем один атрибут, необходимо разделить их " -"пробелом." -#: ../share/extensions/webslicer_create_group.inx.h:1 -msgid "Set a layout group" -msgstr "Установить группу макета" +#: ../share/extensions/plotter.inx.h:21 +msgid "Parallel (LPT) connections are not supported." +msgstr "" -#: ../share/extensions/webslicer_create_group.inx.h:3 -#: ../share/extensions/webslicer_create_rect.inx.h:18 -msgid "HTML id attribute:" -msgstr "Атрибут id в HTML:" +#: ../share/extensions/plotter.inx.h:32 +msgid "" +"The speed the pen will move with in centimeters or millimeters per second " +"(depending on your plotter model), set to 0 to omit command. Most plotters " +"ignore this command. (Default: 0)" +msgstr "" -#: ../share/extensions/webslicer_create_group.inx.h:4 -#: ../share/extensions/webslicer_create_rect.inx.h:19 -msgid "HTML class attribute:" -msgstr "Атрибут класса HTML:" +#: ../share/extensions/plotter.inx.h:33 +msgid "Rotation (°, clockwise):" +msgstr "Вращение (°, по часовой стрелке):" -#: ../share/extensions/webslicer_create_group.inx.h:5 -msgid "Width unit:" -msgstr "Единица ширины:" +#: ../share/extensions/plotter.inx.h:52 +#, fuzzy +msgid "Show debug information" +msgstr "Информация об используемой памяти" -#: ../share/extensions/webslicer_create_group.inx.h:6 -msgid "Height unit:" -msgstr "Единица высоты:" +#: ../share/extensions/plotter.inx.h:53 +msgid "" +"Check this to get verbose information about the plot without actually " +"sending something to the plotter (A.k.a. data dump) (Default: Unchecked)" +msgstr "" -#: ../share/extensions/webslicer_create_group.inx.h:7 -#: ../share/extensions/webslicer_create_rect.inx.h:9 -msgid "Background color:" -msgstr "Цвет фона:" +#: ../share/extensions/plt_input.inx.h:1 +msgid "AutoCAD Plot Input" +msgstr "Импорт файлов AutoCAD Plot (PLT)" -#: ../share/extensions/webslicer_create_group.inx.h:8 -msgid "Pixel (fixed)" -msgstr "Пиксел (фиксированная)" +#: ../share/extensions/plt_input.inx.h:2 +#: ../share/extensions/plt_output.inx.h:2 +msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)" +msgstr "Файл HP Graphics Language [AutoCAD] (*.plt)" -#: ../share/extensions/webslicer_create_group.inx.h:9 -msgid "Percent (relative to parent size)" -msgstr "Процент (относительная к размеру родительского элемента)" +#: ../share/extensions/plt_input.inx.h:3 +msgid "Open HPGL plotter files" +msgstr "Открыть файлы плоттеров HPGL" -#: ../share/extensions/webslicer_create_group.inx.h:10 -msgid "Undefined (relative to non-floating content size)" -msgstr "Неопределённая (относительная к размеру неплавающего содержимого)" +#: ../share/extensions/plt_output.inx.h:1 +msgid "AutoCAD Plot Output" +msgstr "Экспорт файлов AutoCAD Plot (PLT)" -#: ../share/extensions/webslicer_create_group.inx.h:12 -msgid "" -"Layout Group is only about to help a better code generation (if you need " -"it). To use this, you must to select some \"Slicer rectangles\" first." -msgstr "" -"Группа макета необходимо лишь для создания более правильного кода. Чтобы " -"работать с ней, сначала выделите несколько «прямоугольников нарезки»." +#: ../share/extensions/plt_output.inx.h:3 +msgid "Save a file for plotters" +msgstr "Сохранить файл для плоттеров" -#: ../share/extensions/webslicer_create_group.inx.h:14 -msgid "Slicer" -msgstr "Нарезка макета" +#: ../share/extensions/polyhedron_3d.inx.h:1 +msgid "3D Polyhedron" +msgstr "Трехмерный многогранник" -#: ../share/extensions/webslicer_create_rect.inx.h:1 -msgid "Create a slicer rectangle" -msgstr "Установить прямоугольник нарезки" +#: ../share/extensions/polyhedron_3d.inx.h:2 +msgid "Model file" +msgstr "Файл модели" -#: ../share/extensions/webslicer_create_rect.inx.h:4 -msgid "DPI:" -msgstr "dpi:" +#: ../share/extensions/polyhedron_3d.inx.h:3 +msgid "Object:" +msgstr "Объект:" -#: ../share/extensions/webslicer_create_rect.inx.h:5 -msgid "Force Dimension:" -msgstr "Принудительное разрешение:" +#: ../share/extensions/polyhedron_3d.inx.h:4 +msgid "Filename:" +msgstr "Имя файла:" -#. i18n. Description duplicated in a fake value attribute in order to make it translatable -#: ../share/extensions/webslicer_create_rect.inx.h:7 -msgid "Force Dimension must be set as <width>x<height>" -msgstr "Принудительное разрешение должно быть указано как <ширина>x<высота>." +#: ../share/extensions/polyhedron_3d.inx.h:5 +msgid "Object Type:" +msgstr "Тип объекта:" -#: ../share/extensions/webslicer_create_rect.inx.h:8 -msgid "If set, this will replace DPI." -msgstr "Если оно установлено, то заменит собой dpi." +#: ../share/extensions/polyhedron_3d.inx.h:6 +msgid "Clockwise wound object" +msgstr "Объект повёрнут по часовой стрелке" -#: ../share/extensions/webslicer_create_rect.inx.h:10 -msgid "JPG specific options" -msgstr "Специфичные для JPEG параметры" +#: ../share/extensions/polyhedron_3d.inx.h:7 +msgid "Cube" +msgstr "Куб" -#: ../share/extensions/webslicer_create_rect.inx.h:11 -msgid "Quality:" -msgstr "Качество:" +#: ../share/extensions/polyhedron_3d.inx.h:8 +msgid "Truncated Cube" +msgstr "Усеченный куб" -#: ../share/extensions/webslicer_create_rect.inx.h:12 -msgid "" -"0 is the lowest image quality and highest compression, and 100 is the best " -"quality but least effective compression" -msgstr "" -"0 — наихудшее качество изображения и наисильнейшее сжатие, 100 — наилучшее " -"качество и наименьшее сжатие" +#: ../share/extensions/polyhedron_3d.inx.h:9 +msgid "Snub Cube" +msgstr "Усечённый куб" -#: ../share/extensions/webslicer_create_rect.inx.h:13 -msgid "GIF specific options" -msgstr "Специфичные для GIF параметры" +#: ../share/extensions/polyhedron_3d.inx.h:10 +msgid "Cuboctahedron" +msgstr "Кубоктаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:16 -msgid "Palette" -msgstr "Палитра" +#: ../share/extensions/polyhedron_3d.inx.h:11 +msgid "Tetrahedron" +msgstr "Тетраэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:17 -msgid "Palette size:" -msgstr "Размер палитры:" +#: ../share/extensions/polyhedron_3d.inx.h:12 +msgid "Truncated Tetrahedron" +msgstr "Усеченный тетраэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:20 -msgid "Options for HTML export" -msgstr "Параметры экспорта в HTML" +#: ../share/extensions/polyhedron_3d.inx.h:13 +msgid "Octahedron" +msgstr "Октаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:21 -msgid "Layout disposition:" -msgstr "Размещение макета:" +#: ../share/extensions/polyhedron_3d.inx.h:14 +msgid "Truncated Octahedron" +msgstr "Усеченный октаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:22 -msgid "Positioned html block element with the image as Background" -msgstr "Размещённый текстовый блок HTML с изображением как фоном" +#: ../share/extensions/polyhedron_3d.inx.h:15 +msgid "Icosahedron" +msgstr "Икосаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:23 -msgid "Tiled Background (on parent group)" -msgstr "Мозаичный фон (в родительской группе)" +#: ../share/extensions/polyhedron_3d.inx.h:16 +msgid "Truncated Icosahedron" +msgstr "Усеченный икосаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:24 -msgid "Background — repeat horizontally (on parent group)" -msgstr "Фон — горизонтальный повтор (в родительской группе)" +#: ../share/extensions/polyhedron_3d.inx.h:17 +msgid "Small Triambic Icosahedron" +msgstr "Малый звёздчатый икосаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:25 -msgid "Background — repeat vertically (on parent group)" -msgstr "Фон — вертикальный повтор (в родительской группе)" +#: ../share/extensions/polyhedron_3d.inx.h:18 +msgid "Dodecahedron" +msgstr "Додекаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:26 -msgid "Background — no repeat (on parent group)" -msgstr "Фон — без повтора (в родительской группе)" +#: ../share/extensions/polyhedron_3d.inx.h:19 +msgid "Truncated Dodecahedron" +msgstr "Усеченный додекаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:27 -msgid "Positioned Image" -msgstr "Размещённое изображение" +#: ../share/extensions/polyhedron_3d.inx.h:20 +msgid "Snub Dodecahedron" +msgstr "Плосконосый додекаэдр" -#: ../share/extensions/webslicer_create_rect.inx.h:28 -msgid "Non Positioned Image" -msgstr "Неразмещённое изображение" +#: ../share/extensions/polyhedron_3d.inx.h:21 +msgid "Great Dodecahedron" +msgstr "Большой додекаэдр" + +#: ../share/extensions/polyhedron_3d.inx.h:22 +msgid "Great Stellated Dodecahedron" +msgstr "Большой звездчатый додекаэдр" + +#: ../share/extensions/polyhedron_3d.inx.h:23 +msgid "Load from file" +msgstr "Загрузить из файла" + +#: ../share/extensions/polyhedron_3d.inx.h:24 +msgid "Face-Specified" +msgstr "Определенный гранями" + +#: ../share/extensions/polyhedron_3d.inx.h:25 +msgid "Edge-Specified" +msgstr "Определенный ребрами" + +#: ../share/extensions/polyhedron_3d.inx.h:27 +msgid "Rotate around:" +msgstr "Повернуть вокруг:" + +#: ../share/extensions/polyhedron_3d.inx.h:28 +#: ../share/extensions/spirograph.inx.h:8 +#: ../share/extensions/wireframe_sphere.inx.h:5 +msgid "Rotation (deg):" +msgstr "Вращение (°)" + +#: ../share/extensions/polyhedron_3d.inx.h:29 +msgid "Then rotate around:" +msgstr "Затем повернуть вокруг:" -#: ../share/extensions/webslicer_create_rect.inx.h:29 -msgid "Left Floated Image" -msgstr "Плавающее слева изображение" +#: ../share/extensions/polyhedron_3d.inx.h:30 +msgid "X-Axis" +msgstr "Ось X" -#: ../share/extensions/webslicer_create_rect.inx.h:30 -msgid "Right Floated Image" -msgstr "Плавающее справа изображение" +#: ../share/extensions/polyhedron_3d.inx.h:31 +msgid "Y-Axis" +msgstr "Ось Y" -#: ../share/extensions/webslicer_create_rect.inx.h:31 -msgid "Position anchor:" -msgstr "Размещение якоря:" +#: ../share/extensions/polyhedron_3d.inx.h:32 +msgid "Z-Axis" +msgstr "Ось Z" -#: ../share/extensions/webslicer_create_rect.inx.h:32 -msgid "Top and Left" -msgstr "Вверху и слева" +#: ../share/extensions/polyhedron_3d.inx.h:34 +#, fuzzy +msgid "Scaling factor:" +msgstr "Коэффициент масштаба" -#: ../share/extensions/webslicer_create_rect.inx.h:33 -msgid "Top and Center" -msgstr "Вверху и по центру" +#: ../share/extensions/polyhedron_3d.inx.h:35 +msgid "Fill color, Red:" +msgstr "Цвет заливки, красный канал:" -#: ../share/extensions/webslicer_create_rect.inx.h:34 -msgid "Top and right" -msgstr "Вверху и справа" +#: ../share/extensions/polyhedron_3d.inx.h:36 +msgid "Fill color, Green:" +msgstr "Цвет заливки, зеленый канал:" -#: ../share/extensions/webslicer_create_rect.inx.h:35 -msgid "Middle and Left" -msgstr "Посередине и слева" +#: ../share/extensions/polyhedron_3d.inx.h:37 +msgid "Fill color, Blue:" +msgstr "Цвет заливки, синий канал:" -#: ../share/extensions/webslicer_create_rect.inx.h:36 -msgid "Middle and Center" -msgstr "Посередине и по центру" +#: ../share/extensions/polyhedron_3d.inx.h:39 +#, no-c-format +msgid "Fill opacity (%):" +msgstr "Непрозрачность заливки, %:" -#: ../share/extensions/webslicer_create_rect.inx.h:37 -msgid "Middle and Right" -msgstr "Посередине и справа" +#: ../share/extensions/polyhedron_3d.inx.h:41 +#, no-c-format +msgid "Stroke opacity (%):" +msgstr "Непрозрачность обводки (%s):" -#: ../share/extensions/webslicer_create_rect.inx.h:38 -msgid "Bottom and Left" -msgstr "Снизу и слева" +#: ../share/extensions/polyhedron_3d.inx.h:42 +msgid "Stroke width (px):" +msgstr "Толщина обводки (px)" -#: ../share/extensions/webslicer_create_rect.inx.h:39 -msgid "Bottom and Center" -msgstr "Снизу и по центру" +#: ../share/extensions/polyhedron_3d.inx.h:43 +msgid "Shading" +msgstr "Затенение" -#: ../share/extensions/webslicer_create_rect.inx.h:40 -msgid "Bottom and Right" -msgstr "Снизу и справа" +#: ../share/extensions/polyhedron_3d.inx.h:44 +#, fuzzy +msgid "Light X:" +msgstr "Свет по X" -#: ../share/extensions/webslicer_export.inx.h:1 -msgid "Export layout pieces and HTML+CSS code" -msgstr "Экспортировать части макета в код HTML и CSS" +#: ../share/extensions/polyhedron_3d.inx.h:45 +#, fuzzy +msgid "Light Y:" +msgstr "Свет по Y" -#: ../share/extensions/webslicer_export.inx.h:3 +#: ../share/extensions/polyhedron_3d.inx.h:46 #, fuzzy -msgid "Directory path to export:" -msgstr "Каталог для экспорта:" +msgid "Light Z:" +msgstr "Свет по Y" -#: ../share/extensions/webslicer_export.inx.h:4 -msgid "Create directory, if it does not exists" -msgstr "Создать каталог, если его ещё нет" +#: ../share/extensions/polyhedron_3d.inx.h:48 +msgid "Draw back-facing polygons" +msgstr "Рисовать многоугольники с обратной стороны" -#: ../share/extensions/webslicer_export.inx.h:5 -msgid "With HTML and CSS" -msgstr "С HTML и CSS" +#: ../share/extensions/polyhedron_3d.inx.h:49 +msgid "Z-sort faces by:" +msgstr "Критерий сортировки граней на оси Z:" -#: ../share/extensions/webslicer_export.inx.h:7 -#, fuzzy -msgid "" -"All sliced images, and optionally - code, will be generated as you had " -"configured and saved to one directory." -msgstr "" -"Все нарезанные изображения и, по выбору, код будут созданы по указанным вами " -"параметрам и сохранены в один каталог." +#: ../share/extensions/polyhedron_3d.inx.h:50 +msgid "Faces" +msgstr "Стороны" -#: ../share/extensions/whirl.inx.h:1 -msgid "Whirl" -msgstr "Завихрение" +#: ../share/extensions/polyhedron_3d.inx.h:51 +msgid "Edges" +msgstr "Грани" -#: ../share/extensions/whirl.inx.h:2 -msgid "Amount of whirl:" -msgstr "Величина завихрения:" +#: ../share/extensions/polyhedron_3d.inx.h:52 +msgid "Vertices" +msgstr "Вершины" -#: ../share/extensions/whirl.inx.h:3 -msgid "Rotation is clockwise" -msgstr "Поворот по часовой стрелке" +#: ../share/extensions/polyhedron_3d.inx.h:53 +msgid "Maximum" +msgstr "Максимум" -#: ../share/extensions/wireframe_sphere.inx.h:1 -msgid "Wireframe Sphere" -msgstr "Каркасная сфера" +#: ../share/extensions/polyhedron_3d.inx.h:54 +msgid "Minimum" +msgstr "Минимум" -#: ../share/extensions/wireframe_sphere.inx.h:2 -msgid "Lines of latitude:" -msgstr "Линии широты:" +#: ../share/extensions/polyhedron_3d.inx.h:55 +msgid "Mean" +msgstr "Средняя величина" -#: ../share/extensions/wireframe_sphere.inx.h:3 -msgid "Lines of longitude:" -msgstr "Линии долготы:" +#: ../share/extensions/previous_glyph_layer.inx.h:1 +msgid "View Previous Glyph" +msgstr "Просмотреть предыдущий глиф" -#: ../share/extensions/wireframe_sphere.inx.h:4 -msgid "Tilt (deg):" -msgstr "Наклон (°):" +#: ../share/extensions/print_win32_vector.inx.h:1 +#, fuzzy +msgid "Win32 Vector Print" +msgstr "Печать в Windows 32-bit" -#: ../share/extensions/wireframe_sphere.inx.h:7 -msgid "Hide lines behind the sphere" -msgstr "Скрыть линии позади сферы" +#: ../share/extensions/printing_marks.inx.h:1 +msgid "Printing Marks" +msgstr "Метки для печати" -#: ../share/extensions/wmf_input.inx.h:1 -#: ../share/extensions/wmf_output.inx.h:1 -msgid "Windows Metafile Input" -msgstr "Импорт файлов Windows Metafile" +#: ../share/extensions/printing_marks.inx.h:3 +msgid "Crop Marks" +msgstr "Обрезные метки" -#: ../share/extensions/wmf_input.inx.h:3 -#: ../share/extensions/wmf_output.inx.h:3 -msgid "A popular graphics file format for clipart" -msgstr "Популярный графический формат для клипарата" +#: ../share/extensions/printing_marks.inx.h:4 +msgid "Bleed Marks" +msgstr "Метки для выпуска под обрез" -#: ../share/extensions/xaml2svg.inx.h:1 -msgid "XAML Input" -msgstr "Импорт XAML" +#: ../share/extensions/printing_marks.inx.h:5 +msgid "Registration Marks" +msgstr "Метки совмещения" -#, fuzzy -#~ msgid "Smart Jelly" -#~ msgstr "Замысловатое желе" +#: ../share/extensions/printing_marks.inx.h:6 +msgid "Star Target" +msgstr "Контрольный маркер давления" -#~ msgid "Same as Matte jelly but with more controls" -#~ msgstr "" -#~ "То же, что и матовое желе, но с увеличенным количеством регуляторов." +#: ../share/extensions/printing_marks.inx.h:7 +msgid "Color Bars" +msgstr "Контрольные цветовые полосы" + +#: ../share/extensions/printing_marks.inx.h:8 +msgid "Page Information" +msgstr "Информация о странице" + +#: ../share/extensions/printing_marks.inx.h:9 +msgid "Positioning" +msgstr "Размещение" +#: ../share/extensions/printing_marks.inx.h:10 #, fuzzy -#~ msgid "Metal Casting" -#~ msgstr "Металлическое литьё" +msgid "Set crop marks to:" +msgstr "Ориентир для обрезных меток:" -#~ msgid "Smooth drop-like bevel with metallic finish" -#~ msgstr "Плавная каплевидная фаска с металлической полировкой" +#: ../share/extensions/printing_marks.inx.h:17 +msgid "Canvas" +msgstr "Холст" -#~ msgid "Apparition" -#~ msgstr "Видение" +#: ../share/extensions/printing_marks.inx.h:19 +msgid "Bleed Margin" +msgstr "Поля выпуска под обрез" -#~ msgid "Edges are partly feathered out" -#~ msgstr "Края частично растушёваны" +#: ../share/extensions/ps_input.inx.h:1 +msgid "PostScript Input" +msgstr "Импорт файлов Postscript" -#, fuzzy -#~ msgid "Jigsaw Piece" -#~ msgstr "Элемент паззла" +#: ../share/extensions/radiusrand.inx.h:1 +msgid "Jitter nodes" +msgstr "Дрожание узлов" -#~ msgid "Low, sharp bevel" -#~ msgstr "Низкая, резкая фаска" +#: ../share/extensions/radiusrand.inx.h:3 +msgid "Maximum displacement in X (px):" +msgstr "Максимальное смещение по X (px):" -#, fuzzy -#~ msgid "Rubber Stamp" -#~ msgstr "Штемпель" +#: ../share/extensions/radiusrand.inx.h:4 +msgid "Maximum displacement in Y (px):" +msgstr "Максимальное смещение по Y (px):" -#~ msgid "Random whiteouts inside" -#~ msgstr "Случайные белые пятна внутри" +#: ../share/extensions/radiusrand.inx.h:5 +msgid "Shift nodes" +msgstr "Смещение узлов" -#, fuzzy -#~ msgid "Ink Bleed" -#~ msgstr "Чернила протекли" +#: ../share/extensions/radiusrand.inx.h:6 +msgid "Shift node handles" +msgstr "Смещение рычагов узла" -#~ msgid "Protrusions" -#~ msgstr "Выступы" +#: ../share/extensions/radiusrand.inx.h:7 +msgid "Use normal distribution" +msgstr "Использовать обычное распределение" -#~ msgid "Inky splotches underneath the object" -#~ msgstr "Чернильные пятна под объектом" +#: ../share/extensions/radiusrand.inx.h:9 +msgid "" +"This effect randomly shifts the nodes (and optionally node handles) of the " +"selected path." +msgstr "" +"Случайным образом сместить узлы (по выбору, также рычаги узлов) выбранного " +"контура" -#~ msgid "Fire" -#~ msgstr "Огонь" +#: ../share/extensions/render_alphabetsoup.inx.h:1 +msgid "Alphabet Soup" +msgstr "Алфавитный суп" -#~ msgid "Edges of object are on fire" -#~ msgstr "Края объекта охвачены огнем" +#: ../share/extensions/render_barcode.inx.h:1 +msgid "Classic" +msgstr "Классический штрих-код" -#~ msgid "Bloom" -#~ msgstr "Расцвет" +#: ../share/extensions/render_barcode.inx.h:2 +msgid "Barcode Type:" +msgstr "Тип штрих-кода:" -#~ msgid "Soft, cushion-like bevel with matte highlights" -#~ msgstr "Фаска с плавным подушкообразным переходом и матовым бликом" +#: ../share/extensions/render_barcode.inx.h:3 +msgid "Barcode Data:" +msgstr "Данные штрих-кода:" -#, fuzzy -#~ msgid "Ridged Border" -#~ msgstr "Край с кромкой" +#: ../share/extensions/render_barcode.inx.h:4 +msgid "Bar Height:" +msgstr "Высота штрих-кода:" -#~ msgid "Ridged border with inner bevel" -#~ msgstr "Край с кромкой и внутренней фаской" +#: ../share/extensions/render_barcode.inx.h:6 +#: ../share/extensions/render_barcode_datamatrix.inx.h:6 +#: ../share/extensions/render_barcode_qrcode.inx.h:19 +msgid "Barcode" +msgstr "Штрих-код" -#~ msgid "Ripple" -#~ msgstr "Рябь" +#: ../share/extensions/render_barcode_datamatrix.inx.h:1 +msgid "Datamatrix" +msgstr "Матричный штрих-код" -#~ msgid "Horizontal rippling of edges" -#~ msgstr "Горизонтальная рябь краёв" +#: ../share/extensions/render_barcode_datamatrix.inx.h:3 +#: ../share/extensions/render_barcode_qrcode.inx.h:4 +msgid "Size, in unit squares:" +msgstr "Размер, в квадратах единиц:" -#~ msgid "Speckle" -#~ msgstr "Пятно" +#: ../share/extensions/render_barcode_datamatrix.inx.h:4 +msgid "Square Size (px):" +msgstr "Размер квадрата (px):" -#~ msgid "Fill object with sparse translucent specks" -#~ msgstr "Заполнить объект редкими просвечивающими пятнами" +#: ../share/extensions/render_barcode_qrcode.inx.h:1 +msgid "QR Code" +msgstr "Код QR" -#~ msgid "Oil Slick" -#~ msgstr "Масляная плёнка" +#: ../share/extensions/render_barcode_qrcode.inx.h:2 +msgid "See http://www.denso-wave.com/qrcode/index-e.html for details" +msgstr "" +"Подробности см. по адресу See http://www.denso-wave.com/qrcode/index-e.html" -#~ msgid "Rainbow-colored semitransparent oily splotches" -#~ msgstr "Масляные полупрозрачные пятна радужного цвета" +#: ../share/extensions/render_barcode_qrcode.inx.h:5 +msgid "Auto" +msgstr "Автоматически" -#~ msgid "Frost" -#~ msgstr "Мороз" +#: ../share/extensions/render_barcode_qrcode.inx.h:6 +msgid "" +"With \"Auto\", the size of the barcode depends on the length of the text and " +"the error correction level" +msgstr "" -#~ msgid "Flake-like white splotches" -#~ msgstr "Белые пятна наподобие хлопьев" +#: ../share/extensions/render_barcode_qrcode.inx.h:7 +msgid "Error correction level:" +msgstr "Уровень корреции ошибки:" -#~ msgid "Leopard Fur" -#~ msgstr "Шкура леопарда" +#: ../share/extensions/render_barcode_qrcode.inx.h:9 +#, no-c-format +msgid "L (Approx. 7%)" +msgstr "L (примерно 7%)" -#~ msgid "Materials" -#~ msgstr "Материалы" +#: ../share/extensions/render_barcode_qrcode.inx.h:11 +#, no-c-format +msgid "M (Approx. 15%)" +msgstr "M (примерно 15%)" -#~ msgid "Leopard spots (loses object's own color)" -#~ msgstr "Пятна леопарда (исходный цвет объекта теряется)" +#: ../share/extensions/render_barcode_qrcode.inx.h:13 +#, no-c-format +msgid "Q (Approx. 25%)" +msgstr "Q (примерно 25%)" -#~ msgid "Zebra" -#~ msgstr "Зебра" +#: ../share/extensions/render_barcode_qrcode.inx.h:15 +#, no-c-format +msgid "H (Approx. 30%)" +msgstr "H (примерно 30%)" -#~ msgid "Irregular vertical dark stripes (loses object's own color)" -#~ msgstr "" -#~ "Нерегулярные вертикальные темные полосы (исходный цвет объекта теряется)" +#: ../share/extensions/render_barcode_qrcode.inx.h:17 +msgid "Square size (px):" +msgstr "Размер квадрата (px):" -#~ msgid "Clouds" -#~ msgstr "Облака" +#: ../share/extensions/render_gear_rack.inx.h:1 +#, fuzzy +msgid "Rack Gear" +msgstr "Зубчатое колесо" -#~ msgid "Airy, fluffy, sparse white clouds" -#~ msgstr "Воздушные, пушистые, редкие облака" +#: ../share/extensions/render_gear_rack.inx.h:2 +#, fuzzy +msgid "Rack Length:" +msgstr "Длина:" -#~ msgid "Sharpen edges and boundaries within the object, force=0.15" -#~ msgstr "Повысить резкость краев и границ в рамках объекта, сила=0.15" +#: ../share/extensions/render_gear_rack.inx.h:3 +#, fuzzy +msgid "Tooth Spacing:" +msgstr "Интервал по горизонтали" +#: ../share/extensions/render_gear_rack.inx.h:4 #, fuzzy -#~ msgid "Sharpen More" -#~ msgstr "Усиленное повышение резкости" +msgid "Contact Angle:" +msgstr "Вписанный треугольник" -#~ msgid "Sharpen edges and boundaries within the object, force=0.3" -#~ msgstr "Повысить резкость краев и границ в рамках объекта, сила=0.3" +#: ../share/extensions/render_gear_rack.inx.h:6 +#: ../share/extensions/render_gears.inx.h:1 +msgid "Gear" +msgstr "Зубчатое колесо" -#~ msgid "Oil painting" -#~ msgstr "Масляная краска" +#: ../share/extensions/render_gears.inx.h:2 +#, fuzzy +msgid "Number of teeth:" +msgstr "Количество зубцов" -#~ msgid "Simulate oil painting style" -#~ msgstr "Имитация живописи маслом" +#: ../share/extensions/render_gears.inx.h:3 +#, fuzzy +msgid "Circular pitch (tooth size):" +msgstr "Шаг колеса, px" -#~ msgid "Detect color edges and retrace them in grayscale" -#~ msgstr "Найти в объекте цветные края и перекрасить их в оттенки серого" +#: ../share/extensions/render_gears.inx.h:4 +#, fuzzy +msgid "Pressure angle (degrees):" +msgstr "Угол зацепления" -#~ msgid "Blueprint" -#~ msgstr "Светокопия" +#: ../share/extensions/render_gears.inx.h:5 +msgid "Diameter of center hole (0 for none):" +msgstr "" -#~ msgid "Detect color edges and retrace them in blue" -#~ msgstr "Найти в объекте цветные края и перекрасить их синим цветом" +#: ../share/extensions/render_gears.inx.h:10 +msgid "Unit of measurement for both circular pitch and center diameter." +msgstr "" -#~ msgid "Age" -#~ msgstr "Состаривание" +#: ../share/extensions/replace_font.inx.h:1 +msgid "Replace font" +msgstr "Заменить шрифт" -#~ msgid "Imitate aged photograph" -#~ msgstr "Имитация старой фотографии" +#: ../share/extensions/replace_font.inx.h:2 +msgid "Find and Replace font" +msgstr "_Найти и заменить шрифт" -#~ msgid "Organic" -#~ msgstr "Органика" +#: ../share/extensions/replace_font.inx.h:3 +#, fuzzy +msgid "Find font: " +msgstr "Найти шрифт:" -#~ msgid "Textures" -#~ msgstr "Текстуры" +#: ../share/extensions/replace_font.inx.h:4 +#, fuzzy +msgid "Replace with: " +msgstr "Заменить на:" -#~ msgid "Bulging, knotty, slick 3D surface" -#~ msgstr "Выпяченная, узловатая трехмерная текстура" +#: ../share/extensions/replace_font.inx.h:5 +msgid "Replace all fonts with: " +msgstr "Заменить все шрифты на:" -#~ msgid "Barbed Wire" -#~ msgstr "Колючая проволока" +#: ../share/extensions/replace_font.inx.h:6 +msgid "List all fonts" +msgstr "Перечень шрифтов" -#~ msgid "Gray bevelled wires with drop shadows" -#~ msgstr "Серые выступающие провода, отбрасывающие тень" +#: ../share/extensions/replace_font.inx.h:7 +msgid "" +"Choose this tab if you would like to see a list of the fonts used/found." +msgstr "" -#~ msgid "Swiss Cheese" -#~ msgstr "Швейцарский сыр" +#: ../share/extensions/replace_font.inx.h:8 +msgid "Work on:" +msgstr "Обработать:" -#~ msgid "Random inner-bevel holes" -#~ msgstr "Случайные дыры с внутренней фаской" +#: ../share/extensions/replace_font.inx.h:9 +msgid "Entire drawing" +msgstr "Весь рисунок" -#~ msgid "Blue Cheese" -#~ msgstr "Голубой сыр" +#: ../share/extensions/replace_font.inx.h:10 +msgid "Selected objects only" +msgstr "Только выделенные объекты" -#~ msgid "Marble-like bluish speckles" -#~ msgstr "Голубоватые пятна как в мраморе" +#: ../share/extensions/restack.inx.h:1 +msgid "Restack" +msgstr "Поменять вертикальный порядок" -#~ msgid "Button" -#~ msgstr "Кнопка" +#: ../share/extensions/restack.inx.h:2 +msgid "Restack Direction:" +msgstr "Направление перестановки:" -#~ msgid "Soft bevel, slightly depressed middle" -#~ msgstr "Плавная фаска, немного вдавленный центр" +#: ../share/extensions/restack.inx.h:3 +msgid "Left to Right (0)" +msgstr "Слева направо (0)" -#~ msgid "Inset" -#~ msgstr "Врезка" +#: ../share/extensions/restack.inx.h:4 +msgid "Bottom to Top (90)" +msgstr "Снизу вверх (90)" -#~ msgid "Shadowy outer bevel" -#~ msgstr "Затененная внешняя кромка" +#: ../share/extensions/restack.inx.h:5 +msgid "Right to Left (180)" +msgstr "Справа налево (180)" -#~ msgid "Random paint streaks downwards" -#~ msgstr "Случайное стекание краски вниз" +#: ../share/extensions/restack.inx.h:6 +msgid "Top to Bottom (270)" +msgstr "Сверху вниз (270°)" -#, fuzzy -#~ msgid "Jam Spread" -#~ msgstr "Слой джема" +#: ../share/extensions/restack.inx.h:7 +msgid "Radial Outward" +msgstr "Радиально наружу" -#~ msgid "Glossy clumpy jam spread" -#~ msgstr "Слой блестящего комковатого джема" +#: ../share/extensions/restack.inx.h:8 +msgid "Radial Inward" +msgstr "Радиально вовнутрь" -#, fuzzy -#~ msgid "Pixel Smear" -#~ msgstr "Пиксельные мазки" +#: ../share/extensions/restack.inx.h:9 +msgid "Arbitrary Angle" +msgstr "Произвольный угол" -#~ msgid "Van Gogh painting effect for bitmaps" -#~ msgstr "Эффект рисования в стиле ван Гога" +#: ../share/extensions/restack.inx.h:11 +msgid "Horizontal Point:" +msgstr "Горизонтальная точка:" -#~ msgid "Cracked Glass" -#~ msgstr "Треснутое стекло" +#: ../share/extensions/restack.inx.h:13 +#: ../share/extensions/text_extract.inx.h:9 +#: ../share/extensions/text_merge.inx.h:9 +msgid "Middle" +msgstr "Середина" -#~ msgid "Under a cracked glass" -#~ msgstr "Под треснутым стеклом" +#: ../share/extensions/restack.inx.h:15 +msgid "Vertical Point:" +msgstr "Вертикальная точка:" -#~ msgid "Bubbly Bumps" -#~ msgstr "Пузыристые выпуклости " +#: ../share/extensions/restack.inx.h:16 +#: ../share/extensions/text_extract.inx.h:12 +#: ../share/extensions/text_merge.inx.h:12 +msgid "Top" +msgstr "Верх" -#~ msgid "Flexible bubbles effect with some displacement" -#~ msgstr "Гибкий эффект пузырей с некоторым смещением" +#: ../share/extensions/restack.inx.h:17 +#: ../share/extensions/text_extract.inx.h:13 +#: ../share/extensions/text_merge.inx.h:13 +msgid "Bottom" +msgstr "Низ" -#~ msgid "Glowing Bubble" -#~ msgstr "Светящийся пузырь" +#: ../share/extensions/restack.inx.h:18 +msgid "Arrange" +msgstr "Расстановка" -#~ msgid "Ridges" -#~ msgstr "Кромки" +#: ../share/extensions/rtree.inx.h:1 +msgid "Random Tree" +msgstr "Случайное дерево" -#~ msgid "Bubble effect with refraction and glow" -#~ msgstr "Эффект пузыря с рефракцией и свечением" +#: ../share/extensions/rtree.inx.h:2 +#, fuzzy +msgid "Initial size:" +msgstr "Исходный размер" -#~ msgid "Neon" -#~ msgstr "Неон" +#: ../share/extensions/rtree.inx.h:3 +#, fuzzy +msgid "Minimum size:" +msgstr "Минимальный размер" -#~ msgid "Neon light effect" -#~ msgstr "Эффект неонового свечения" +#: ../share/extensions/rubberstretch.inx.h:1 +msgid "Rubber Stretch" +msgstr "Резиновое растягивание" -#~ msgid "Molten Metal" -#~ msgstr "Расплавленный металл" +#: ../share/extensions/rubberstretch.inx.h:3 +#, no-c-format +msgid "Strength (%):" +msgstr "Сила (%):" -#~ msgid "Melting parts of object together, with a glossy bevel and a glow" -#~ msgstr "Сплавить части объекта, добавив блестящую фаску и свечение" +#: ../share/extensions/rubberstretch.inx.h:5 +#, no-c-format +msgid "Curve (%):" +msgstr "Кривая (%):" -#~ msgid "Pressed Steel" -#~ msgstr "Штампованная сталь" +#: ../share/extensions/scour.inx.h:1 +msgid "Optimized SVG Output" +msgstr "Экспорт в оптимизированный по размеру файла SVG" -#~ msgid "Pressed metal with a rolled edge" -#~ msgstr "Штампованная сталь с вальцованным краем" +#: ../share/extensions/scour.inx.h:3 +#, fuzzy +msgid "Shorten color values" +msgstr "Мягкие цвета" -#~ msgid "Matte Bevel" -#~ msgstr "Матовая фаска" +#: ../share/extensions/scour.inx.h:4 +msgid "Convert CSS attributes to XML attributes" +msgstr "" -#~ msgid "Soft, pastel-colored, blurry bevel" -#~ msgstr "Плавная фаска пастельных тонов" +#: ../share/extensions/scour.inx.h:5 +msgid "Group collapsing" +msgstr "Свести группы" -#~ msgid "Thin Membrane" -#~ msgstr "Тонкая мембрана" +#: ../share/extensions/scour.inx.h:6 +msgid "Create groups for similar attributes" +msgstr "" -#~ msgid "Thin like a soap membrane" -#~ msgstr "Мембрана, тонкая как мыльный пузырь" +#: ../share/extensions/scour.inx.h:7 +msgid "Embed rasters" +msgstr "Встроить все растровые изображения" -#~ msgid "Matte Ridge" -#~ msgstr "Матовая кромка" +#: ../share/extensions/scour.inx.h:8 +msgid "Keep editor data" +msgstr "Сохранить данные редактора" -#~ msgid "Soft pastel ridge" -#~ msgstr "Мягкая пастельная кромка" +#: ../share/extensions/scour.inx.h:9 +msgid "Remove metadata" +msgstr "Удалить метаданные" -#~ msgid "Glowing Metal" -#~ msgstr "Сверкающий металл" +#: ../share/extensions/scour.inx.h:10 +msgid "Remove comments" +msgstr "Удалить комментарии" -#~ msgid "Glowing metal texture" -#~ msgstr "Текстура сверкающего металла" +#: ../share/extensions/scour.inx.h:11 +msgid "Work around renderer bugs" +msgstr "" -#~ msgid "Leaves" -#~ msgstr "Листва" +#: ../share/extensions/scour.inx.h:12 +msgid "Enable viewboxing" +msgstr "Включить viewbox" -#~ msgid "Leaves on the ground in Fall, or living foliage" -#~ msgstr "Листва на осенней земле или лиственный орнамент" +#: ../share/extensions/scour.inx.h:13 +#, fuzzy +msgid "Remove the xml declaration" +msgstr "Удалить переходы" -#~ msgid "Illuminated translucent plastic or glass effect" -#~ msgstr "Эффект подсвеченного полупрозрачного пластика" +#: ../share/extensions/scour.inx.h:14 +msgid "Number of significant digits for coords:" +msgstr "" -#~ msgid "Iridescent Beeswax" -#~ msgstr "Радужный воск" +#: ../share/extensions/scour.inx.h:15 +msgid "XML indentation (pretty-printing):" +msgstr "" -#~ msgid "Waxy texture which keeps its iridescence through color fill change" -#~ msgstr "Восковая текстура с радужностью за счет смены цвета заливки" +#: ../share/extensions/scour.inx.h:16 +msgid "Space" +msgstr "Пробел" -#~ msgid "Eroded Metal" -#~ msgstr "Ржавчина" +#: ../share/extensions/scour.inx.h:17 +msgid "Tab" +msgstr "Табулятор" -#~ msgid "Eroded metal texture with ridges, grooves, holes and bumps" -#~ msgstr "Текстура ржавого металла с кромкой, желобками, дырка и выпуклостями" +#: ../share/extensions/scour.inx.h:18 +#, fuzzy +msgctxt "Indent" +msgid "None" +msgstr "Нет" -#~ msgid "Cracked Lava" -#~ msgstr "Пузырящаяся лава" +#: ../share/extensions/scour.inx.h:19 +#, fuzzy +msgid "Ids" +msgstr "_ID" -#~ msgid "A volcanic texture, a little like leather" -#~ msgstr "Вулканическая текстура с пузырями лавы, похожая на кожу" +#: ../share/extensions/scour.inx.h:20 +msgid "Remove unused ID names for elements" +msgstr "" -#~ msgid "Bark texture, vertical; use with deep colors" -#~ msgstr "" -#~ "Текстура коры дерева, вертикальная; используйте с темными насыщенными " -#~ "цветами" +#: ../share/extensions/scour.inx.h:21 +msgid "Shorten IDs" +msgstr "" -#~ msgid "Lizard Skin" -#~ msgstr "Кожа ящерицы" +#: ../share/extensions/scour.inx.h:22 +msgid "Preserve manually created ID names not ending with digits" +msgstr "" -#~ msgid "Stylized reptile skin texture" -#~ msgstr "Текстура, стилизованная под кожу ящерицы" +#: ../share/extensions/scour.inx.h:23 +msgid "Preserve these ID names, comma-separated:" +msgstr "" -#~ msgid "Stone Wall" -#~ msgstr "Каменная кладка" +#: ../share/extensions/scour.inx.h:24 +msgid "Preserve ID names starting with:" +msgstr "" -#~ msgid "Stone wall texture to use with not too saturated colors" -#~ msgstr "Текстура камня для использования с не очень насыщенными цветами" +#: ../share/extensions/scour.inx.h:25 +#, fuzzy +msgid "Help (Options)" +msgstr "Параметры" -#~ msgid "Silk Carpet" -#~ msgstr "Шёлковый ковер" +#: ../share/extensions/scour.inx.h:27 +#, no-c-format +msgid "" +"This extension optimizes the SVG file according to the following options:\n" +" * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" +" * Convert CSS attributes to XML attributes: convert styles from style " +"tags and inline style=\"\" declarations into XML attributes.\n" +" * Group collapsing: removes useless g elements, promoting their contents " +"up one level. Requires \"Remove unused ID names for elements\" to be set.\n" +" * Create groups for similar attributes: create g elements for runs of " +"elements having at least one attribute in common (e.g. fill color, stroke " +"opacity, ...).\n" +" * Embed rasters: embed raster images as base64-encoded data URLs.\n" +" * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator " +"elements and attributes.\n" +" * Remove metadata: remove metadata tags along with all the information " +"in them, which may include license metadata, alternate versions for non-SVG-" +"enabled browsers, etc.\n" +" * Remove comments: remove comment tags.\n" +" * Work around renderer bugs: emits slightly larger SVG data, but works " +"around a bug in librsvg's renderer, which is used in Eye of GNOME and other " +"various applications.\n" +" * Enable viewboxing: size image to 100%/100% and introduce a viewBox.\n" +" * Number of significant digits for coords: all coordinates are output " +"with that number of significant digits. For example, if 3 is specified, the " +"coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as " +"472.\n" +" * XML indentation (pretty-printing): either None for no indentation, " +"Space to use one space per nesting level, or Tab to use one tab per nesting " +"level." +msgstr "" -#~ msgid "Silk carpet texture, horizontal stripes" -#~ msgstr "Текстура шелкового ковра с горизонтальными полосками" +#: ../share/extensions/scour.inx.h:40 +msgid "Help (Ids)" +msgstr "" -#~ msgid "Refractive Gel A" -#~ msgstr "Преломляющий гель А" +#: ../share/extensions/scour.inx.h:41 +msgid "" +"Ids specific options:\n" +" * Remove unused ID names for elements: remove all unreferenced ID " +"attributes.\n" +" * Shorten IDs: reduce the length of all ID attributes, assigning the " +"shortest to the most-referenced elements. For instance, #linearGradient5621, " +"referenced 100 times, can become #a.\n" +" * Preserve manually created ID names not ending with digits: usually, " +"optimised SVG output removes these, but if they're needed for referencing (e." +"g. #middledot), you may use this option.\n" +" * Preserve these ID names, comma-separated: you can use this in " +"conjunction with the other preserve options if you wish to preserve some " +"more specific ID names.\n" +" * Preserve ID names starting with: usually, optimised SVG output removes " +"all unused ID names, but if all of your preserved ID names start with the " +"same prefix (e.g. #flag-mx, #flag-pt), you may use this option." +msgstr "" -#~ msgid "Gel effect with light refraction" -#~ msgstr "Гелевый эффект с легким преломлением" +#: ../share/extensions/scour.inx.h:47 +msgid "Optimized SVG (*.svg)" +msgstr "Оптимизированный SVG (*.svg)" -#~ msgid "Refractive Gel B" -#~ msgstr "Преломляющий гель Б" +#: ../share/extensions/scour.inx.h:48 +msgid "Scalable Vector Graphics" +msgstr "Scalable Vector Graphics" -#~ msgid "Gel effect with strong refraction" -#~ msgstr "Гелевый эффект с сильным преломлением" +#: ../share/extensions/setup_typography_canvas.inx.h:1 +msgid "1 - Setup Typography Canvas" +msgstr "1 Настроить холст" -#~ msgid "Metallized Paint" -#~ msgstr "Металлизированная краска" +#: ../share/extensions/setup_typography_canvas.inx.h:2 +msgid "Em-size:" +msgstr "Размер em:" -#~ msgid "" -#~ "Metallized effect with a soft lighting, slightly translucent at the edges" -#~ msgstr "Эффект металла в рассеянном свете, слегка полупрозрачного по краям" +#: ../share/extensions/setup_typography_canvas.inx.h:3 +msgid "Ascender:" +msgstr "Верхние выносные:" -#~ msgid "Dragee" -#~ msgstr "Драже" +#: ../share/extensions/setup_typography_canvas.inx.h:4 +msgid "Caps Height:" +msgstr "Высота прописных:" -#~ msgid "Gel Ridge with a pearlescent look" -#~ msgstr "Гелевая кромка жемчужного вида" +#: ../share/extensions/setup_typography_canvas.inx.h:5 +msgid "X-Height:" +msgstr "Высота строчных:" -#~ msgid "Raised Border" -#~ msgstr "Приподнятый край" +#: ../share/extensions/setup_typography_canvas.inx.h:6 +msgid "Descender:" +msgstr "Нижние выносные:" -#~ msgid "Strongly raised border around a flat surface" -#~ msgstr "Высоко поднятая над плоской поверхностью фаска" +#: ../share/extensions/sk1_input.inx.h:1 +msgid "sK1 vector graphics files input" +msgstr "Импорт документов sK1" -#~ msgid "Metallized Ridge" -#~ msgstr "Металлизированная кромка" +#: ../share/extensions/sk1_input.inx.h:2 +#: ../share/extensions/sk1_output.inx.h:2 +#, fuzzy +msgid "sK1 vector graphics files (*.sk1)" +msgstr "Файлы редактора векторной графики sK1 (.sk1)" -#~ msgid "Gel Ridge metallized at its top" -#~ msgstr "Гелевая кромка с металликом наверху" +#: ../share/extensions/sk1_input.inx.h:3 +msgid "Open files saved in sK1 vector graphics editor" +msgstr "Открыть файлы формате редактора векторной графики sK1" -#~ msgid "Fat Oil" -#~ msgstr "Жирная масляная краска" +#: ../share/extensions/sk1_output.inx.h:1 +msgid "sK1 vector graphics files output" +msgstr "Экспорт в документы sK1" -#~ msgid "Fat oil with some adjustable turbulence" -#~ msgstr "Жирная масляная краска с регулируемой турбулентностью" +#: ../share/extensions/sk1_output.inx.h:3 +msgid "File format for use in sK1 vector graphics editor" +msgstr "Формат файлов редактора векторной графики sK1" -#~ msgid "Black Hole" -#~ msgstr "Чёрная дыра" +#: ../share/extensions/sk_input.inx.h:1 +msgid "Sketch Input" +msgstr "Импорт файлов Sketch" -#~ msgid "Creates a black light inside and outside" -#~ msgstr "Создать черный свет изнутри и снаружи" +#: ../share/extensions/sk_input.inx.h:2 +msgid "Sketch Diagram (*.sk)" +msgstr "Рисунок Sketch (*.sk)" -#~ msgid "Cubes" -#~ msgstr "Кубики" +#: ../share/extensions/sk_input.inx.h:3 +msgid "A diagram created with the program Sketch" +msgstr "Рисунок, созданный в программе Sketch" -#~ msgid "Scattered cubes; adjust the Morphology primitive to vary size" -#~ msgstr "" -#~ "Эффект разбросанных кубиков; размер меняется коррекцией примитива " -#~ "Морфология" +#: ../share/extensions/spirograph.inx.h:1 +msgid "Spirograph" +msgstr "Спирограф" +#: ../share/extensions/spirograph.inx.h:2 #, fuzzy -#~ msgid "Peel Off" -#~ msgstr "Шелуха" - -#~ msgid "Peeling painting on a wall" -#~ msgstr "Отслаивающаяся от стены краска" +msgid "R - Ring Radius (px):" +msgstr "R - радиус кольца (px)" +#: ../share/extensions/spirograph.inx.h:3 #, fuzzy -#~ msgid "Gold Splatter" -#~ msgstr "Золотые брызги" +msgid "r - Gear Radius (px):" +msgstr "r — радиус шестерёнки (px)" -#~ msgid "Splattered cast metal, with golden highlights" -#~ msgstr "Брызги металла с золотистыми бликами" +#: ../share/extensions/spirograph.inx.h:4 +#, fuzzy +msgid "d - Pen Radius (px):" +msgstr "d — радиус пера (px)" +#: ../share/extensions/spirograph.inx.h:5 #, fuzzy -#~ msgid "Gold Paste" -#~ msgstr "Золотая паста" +msgid "Gear Placement:" +msgstr "Размещение шестерёнки" + +#: ../share/extensions/spirograph.inx.h:6 +msgid "Inside (Hypotrochoid)" +msgstr "Внутри (гипотрохоида)" -#~ msgid "Fat pasted cast metal, with golden highlights" -#~ msgstr "Толстый пласт металла с золотистыми бликами" +#: ../share/extensions/spirograph.inx.h:7 +msgid "Outside (Epitrochoid)" +msgstr "Снаружи (эпитрохоида)" +#: ../share/extensions/spirograph.inx.h:9 #, fuzzy -#~ msgid "Crumpled Plastic" -#~ msgstr "Мятый пластик" +msgid "Quality (Default = 16):" +msgstr "Качество (по умолчанию = 16)" + +#: ../share/extensions/split.inx.h:1 +msgid "Split text" +msgstr "Разделить текст" -#~ msgid "Crumpled matte plastic, with melted edge" -#~ msgstr "Мятый матовый пластик с оплавленными краями" +#: ../share/extensions/split.inx.h:3 +msgid "Split:" +msgstr "Разделить:" +#: ../share/extensions/split.inx.h:4 #, fuzzy -#~ msgid "Enamel Jewelry" -#~ msgstr "Финифть" +msgid "Preserve original text" +msgstr "Сохранить исходный текст" -#~ msgid "Slightly cracked enameled texture" -#~ msgstr "Текстура слегка потрескавшейся финифти" +#: ../share/extensions/split.inx.h:5 +#, fuzzy +msgctxt "split" +msgid "Lines" +msgstr "Линии" +#: ../share/extensions/split.inx.h:6 #, fuzzy -#~ msgid "Rough Paper" -#~ msgstr "Шероховатая бумага" +msgctxt "split" +msgid "Words" +msgstr "Слова" -#~ msgid "Aquarelle paper effect which can be used for pictures as for objects" -#~ msgstr "" -#~ "Эффект бумаги для акварели; годится для растровых и векторных объектов" +#: ../share/extensions/split.inx.h:7 +#, fuzzy +msgctxt "split" +msgid "Letters" +msgstr "Буквы" +#: ../share/extensions/split.inx.h:9 #, fuzzy -#~ msgid "Rough and Glossy" -#~ msgstr "Грубая глянцевая бумага" +msgid "This effect splits texts into different lines, words or letters." +msgstr "" +"Этот эффект разделяет текстовый блок построчно, пословно или побуквенно. " +"Выберите предпочитаемый способ." -#~ msgid "" -#~ "Crumpled glossy paper effect which can be used for pictures as for objects" -#~ msgstr "Мятая глянцевая бумага; можно применять к готовым рисункам" +#: ../share/extensions/straightseg.inx.h:1 +msgid "Straighten Segments" +msgstr "Выпрямить сегменты" -#~ msgid "Inner colorized shadow, outer black shadow" -#~ msgstr "Внутренняя цветная и черная внешняя тени" +#: ../share/extensions/straightseg.inx.h:2 +#, fuzzy +msgid "Percent:" +msgstr "Процент" +#: ../share/extensions/straightseg.inx.h:3 #, fuzzy -#~ msgid "Air Spray" -#~ msgstr "Аэрограф" +msgid "Behavior:" +msgstr "Поведение" -#~ msgid "Convert to small scattered particles with some thickness" -#~ msgstr "Превратить в маленькие рассеянные частицы некоторой толщины" +#: ../share/extensions/summersnight.inx.h:1 +msgid "Envelope" +msgstr "Перспектива" +#: ../share/extensions/svg2fxg.inx.h:1 #, fuzzy -#~ msgid "Warm Inside" -#~ msgstr "Внутреннее тепло" - -#~ msgid "Blurred colorized contour, filled inside" -#~ msgstr "Заполненный контур с размытой обводкой" +msgid "FXG Output" +msgstr "Экспорт в DXF" +#: ../share/extensions/svg2fxg.inx.h:2 #, fuzzy -#~ msgid "Cool Outside" -#~ msgstr "Прохлада снаружи" +msgid "Flash XML Graphics (*.fxg)" +msgstr "Файл XFIG (*.fig)" -#~ msgid "Blurred colorized contour, empty inside" -#~ msgstr "Пустой контур с размытой обводкой" +#: ../share/extensions/svg2fxg.inx.h:3 +msgid "Adobe's XML Graphics file format" +msgstr "" -#, fuzzy -#~ msgid "Electronic Microscopy" -#~ msgstr "Электронный микроскоп" +#: ../share/extensions/svg2xaml.inx.h:1 +msgid "XAML Output" +msgstr "Экспорт в XAML" -#~ msgid "" -#~ "Bevel, crude light, discoloration and glow like in electronic microscopy" -#~ msgstr "" -#~ "Фаска, жёсткий свет, обесцвечивание и свечение как в электронном " -#~ "микроскопе" +#: ../share/extensions/svg2xaml.inx.h:2 +msgid "Silverlight compatible XAML" +msgstr "" -#~ msgid "Tartan" -#~ msgstr "Шотландка" +#: ../share/extensions/svg2xaml.inx.h:3 ../share/extensions/xaml2svg.inx.h:2 +msgid "Microsoft XAML (*.xaml)" +msgstr "Microsoft XAML (*.xaml)" -#~ msgid "Checkered tartan pattern" -#~ msgstr "Клетчатая шерстяная материя" +#: ../share/extensions/svg2xaml.inx.h:4 ../share/extensions/xaml2svg.inx.h:3 +msgid "Microsoft's GUI definition format" +msgstr "Формат Microsoft для описания GUI" +#: ../share/extensions/svg_and_media_zip_output.inx.h:1 #, fuzzy -#~ msgid "Shaken Liquid" -#~ msgstr "Взболтанная жидкость" +msgid "Compressed Inkscape SVG with media export" +msgstr "Сжатые файлы Inkscape SVG со связанными данными (*.zip)" -#~ msgid "Colorizable filling with flow inside like transparency" -#~ msgstr "Раскрашиваемая заливка с внутренним полупрозрачным потоком" +#: ../share/extensions/svg_and_media_zip_output.inx.h:2 +#, fuzzy +msgid "Image zip directory:" +msgstr "Некорректный рабочий каталог: %s" +#: ../share/extensions/svg_and_media_zip_output.inx.h:3 #, fuzzy -#~ msgid "Soft Focus Lens" -#~ msgstr "Размывание вне фокуса" +msgid "Add font list" +msgstr "Добавить шрифт" -#~ msgid "Glowing image content without blurring it" -#~ msgstr "Свечение содержимого объекта без размывания" +#: ../share/extensions/svg_and_media_zip_output.inx.h:4 +msgid "Compressed Inkscape SVG with media (*.zip)" +msgstr "Сжатые файлы Inkscape SVG со связанными данными (*.zip)" -#~ msgid "Illuminated stained glass effect" -#~ msgstr "Иллюминированный эффект тонированного стекла" +#: ../share/extensions/svg_and_media_zip_output.inx.h:5 +msgid "" +"Inkscape's native file format compressed with Zip and including all media " +"files" +msgstr "" +"Файлы в формате Inkscape, сжатые Zip и включающие все связанные с документом " +"файлы" -#, fuzzy -#~ msgid "Dark Glass" -#~ msgstr "Тёмное стекло" +#: ../share/extensions/svgcalendar.inx.h:1 +msgid "Calendar" +msgstr "Календарь" -#~ msgid "Illuminated glass effect with light coming from beneath" -#~ msgstr "Эффект подсвеченного стекла, при котором свет исходит снизу" +#: ../share/extensions/svgcalendar.inx.h:3 +msgid "Year (4 digits):" +msgstr "Год (четыре цифры):" -#, fuzzy -#~ msgid "HSL Bumps Alpha" -#~ msgstr "Выпуклости HSL с альфа-каналом" +#: ../share/extensions/svgcalendar.inx.h:4 +msgid "Month (0 for all):" +msgstr "Месяц (0 — все)" -#~ msgid "Same as HSL Bumps but with transparent highlights" -#~ msgstr "То же, что и Выпуклости HSL, но с прозрачными яркими участками" +#: ../share/extensions/svgcalendar.inx.h:5 +msgid "Fill empty day boxes with next month's days" +msgstr "Вставлять дни следующего месяца в пустые клетки" +#: ../share/extensions/svgcalendar.inx.h:6 #, fuzzy -#~ msgid "Bubbly Bumps Alpha" -#~ msgstr "Пузыристые выпуклости с альфа-каналом" - -#~ msgid "Same as Bubbly Bumps but with transparent highlights" -#~ msgstr "" -#~ "То же, что и Пузыристые выпуклости, но с прозрачными яркими участками" +msgid "Show week number" +msgstr "Номер слайда" +#: ../share/extensions/svgcalendar.inx.h:7 #, fuzzy -#~ msgid "Torn Edges" -#~ msgstr "Неровные края" - -#~ msgid "" -#~ "Displace the outside of shapes and pictures without altering their content" -#~ msgstr "" -#~ "Сместить внешнюю часть объектов и растровых изображений без изменения их " -#~ "содержимого" +msgid "Week start day:" +msgstr "Первый день недели" -#, fuzzy -#~ msgid "Roughen Inside" -#~ msgstr "Огрубление изнутри" +#: ../share/extensions/svgcalendar.inx.h:8 +msgid "Weekend:" +msgstr "Выходные:" -#~ msgid "Roughen all inside shapes" -#~ msgstr "Огрубление всего внутри объектов" +#: ../share/extensions/svgcalendar.inx.h:9 +msgid "Sunday" +msgstr "Воскресенье" -#~ msgid "Evanescent" -#~ msgstr "Мгновение" +#: ../share/extensions/svgcalendar.inx.h:10 +msgid "Monday" +msgstr "Понедельник" -#~ msgid "" -#~ "Blur the contents of objects, preserving the outline and adding " -#~ "progressive transparency at edges" -#~ msgstr "" -#~ "Размыть содержимое объектов, сохраняя контур и добавляя нарастающую " -#~ "прозрачность по краям" +#: ../share/extensions/svgcalendar.inx.h:11 +msgid "Saturday and Sunday" +msgstr "Суббота и воскресенье" -#, fuzzy -#~ msgid "Chalk and Sponge" -#~ msgstr "Мел и губка" +#: ../share/extensions/svgcalendar.inx.h:12 +msgid "Saturday" +msgstr "Суббота" -#~ msgid "Low turbulence gives sponge look and high turbulence chalk" -#~ msgstr "Низкая турбулентность создает эффект губки, а высокая — мела" +#: ../share/extensions/svgcalendar.inx.h:14 +msgid "Automatically set size and position" +msgstr "Автоматически установить размер и положение" -#~ msgid "People" -#~ msgstr "Толпа" +#: ../share/extensions/svgcalendar.inx.h:15 +msgid "Months per line:" +msgstr "Месяцев на строку:" -#~ msgid "Colorized blotches, like a crowd of people" -#~ msgstr "Разноцветные пятна, напоминающие толпу людей" +#: ../share/extensions/svgcalendar.inx.h:16 +msgid "Month Width:" +msgstr "Ширина блока месяца:" -#~ msgid "Scotland" -#~ msgstr "Шотландия" +#: ../share/extensions/svgcalendar.inx.h:17 +msgid "Month Margin:" +msgstr "Поле вокруг месяца:" -#~ msgid "Colorized mountain tops out of the fog" -#~ msgstr "Раскрашенные верхушки гор, выглядывающие из тумана" +#: ../share/extensions/svgcalendar.inx.h:18 +msgid "The options below have no influence when the above is checked." +msgstr "Параметры ниже не работают, если включена функция выше." -#~ msgid "Garden of Delights" -#~ msgstr "Сады земных наслаждений" +#: ../share/extensions/svgcalendar.inx.h:20 +msgid "Year color:" +msgstr "Цвет года:" -#~ msgid "" -#~ "Phantasmagorical turbulent wisps, like Hieronymus Bosch's Garden of " -#~ "Delights" -#~ msgstr "" -#~ "Фантасмагорическая турбулентность, напоминающая «Сады земных наслаждений» " -#~ "Иеронима Босха" +#: ../share/extensions/svgcalendar.inx.h:21 +msgid "Month color:" +msgstr "Цвет месяца:" -#~ msgid "Cutout Glow" -#~ msgstr "Вырезанное свечение" +#: ../share/extensions/svgcalendar.inx.h:22 +msgid "Weekday name color:" +msgstr "Цвет названия рабочего дня:" -#~ msgid "In and out glow with a possible offset and colorizable flood" -#~ msgstr "" -#~ "Свечение изнутри и снаружи с возможным смещением и раскрашиваемой заливкой" +#: ../share/extensions/svgcalendar.inx.h:23 +msgid "Day color:" +msgstr "Цвет дня:" -#~ msgid "Dark Emboss" -#~ msgstr "Тёмный рельеф" +#: ../share/extensions/svgcalendar.inx.h:24 +msgid "Weekend day color:" +msgstr "Цвет названия выходного дня:" -#~ msgid "Emboss effect : 3D relief where white is replaced by black" -#~ msgstr "Эффект рельефа, где белое заменяется черным" +#: ../share/extensions/svgcalendar.inx.h:25 +msgid "Next month day color:" +msgstr "Цвет дней следующего месяца:" +#: ../share/extensions/svgcalendar.inx.h:26 #, fuzzy -#~ msgid "Bubbly Bumps Matte" -#~ msgstr "Пузыристые матовые выпуклости" +msgid "Week number color:" +msgstr "Цвет названия рабочего дня:" -#~ msgid "" -#~ "Same as Bubbly Bumps but with a diffuse light instead of a specular one" -#~ msgstr "" -#~ "То же, что и пузыристые выпуклости, но с рассеянным, а не отраженным " -#~ "светом" +#: ../share/extensions/svgcalendar.inx.h:27 +msgid "Localization" +msgstr "Локализация" -#, fuzzy -#~ msgid "Blotting Paper" -#~ msgstr "Промокшая бумага" +#: ../share/extensions/svgcalendar.inx.h:28 +msgid "Month names:" +msgstr "Названия месяцев:" -#~ msgid "Inkblot on blotting paper" -#~ msgstr "Чернильное пятно на промокшей бумаге" +#: ../share/extensions/svgcalendar.inx.h:29 +msgid "Day names:" +msgstr "Названия дней:" +#: ../share/extensions/svgcalendar.inx.h:30 #, fuzzy -#~ msgid "Wax Print" -#~ msgstr "Восковая печать" - -#~ msgid "Wax print on tissue texture" -#~ msgstr "Восковая печать на бумажной текстуре" +msgid "Week number column name:" +msgstr "Уменьшить число столбцов:" -#~ msgid "Watercolor" -#~ msgstr "Акварель" +#: ../share/extensions/svgcalendar.inx.h:31 +msgid "Char Encoding:" +msgstr "Кодировка символов:" -#~ msgid "Cloudy watercolor effect" -#~ msgstr "Облачный акварельный эффект" +#: ../share/extensions/svgcalendar.inx.h:32 +msgid "You may change the names for other languages:" +msgstr "Вы можете вставить названия на своем языке:" -#~ msgid "Felt" -#~ msgstr "Войлок" +#: ../share/extensions/svgcalendar.inx.h:33 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Январь Февраль Март Апрель Май Июнь Июль Август Сентябрь Октябрь Ноябрь " +"Декабрь" -#~ msgid "" -#~ "Felt like texture with color turbulence and slightly darker at the edges" -#~ msgstr "" -#~ "Текстура, напоминающая войлок, с цветной турбулентностью, слегка темная " -#~ "по краям" +#: ../share/extensions/svgcalendar.inx.h:34 +msgid "Sun Mon Tue Wed Thu Fri Sat" +msgstr "ВС ПН ВТ СР ЧТ ПТ СБ" +#: ../share/extensions/svgcalendar.inx.h:35 #, fuzzy -#~ msgid "Ink Paint" -#~ msgstr "Краска" +msgid "The day names list must start from Sunday." +msgstr "(Названия должны начинаться с воскресенья)" -#~ msgid "Ink paint on paper with some turbulent color shift" -#~ msgstr "Цветная краска на бумаге, с небольшим турбулентным цветовым сдвигом" +#: ../share/extensions/svgcalendar.inx.h:36 +msgid "Wk" +msgstr "" +#: ../share/extensions/svgcalendar.inx.h:37 #, fuzzy -#~ msgid "Tinted Rainbow" -#~ msgstr "Окрашенная радуга" +msgid "" +"Select your system encoding. More information at http://docs.python.org/" +"library/codecs.html#standard-encodings." +msgstr "" +"(Выберите системную кодировку. Подробнее см. http://docs.python.org/library/" +"codecs.html#standard-encodings)" -#~ msgid "Smooth rainbow colors melted along the edges and colorizable" -#~ msgstr "" -#~ "Мягкие цвета радуги, оплавляющие объект по краям и зависящие от заливки " -#~ "объекта" +#: ../share/extensions/svgfont2layers.inx.h:1 +msgid "Convert SVG Font to Glyph Layers" +msgstr "Сконвертировать шрифт SVG в слои глифов…" + +#: ../share/extensions/svgfont2layers.inx.h:2 +msgid "Load only the first 30 glyphs (Recommended)" +msgstr "Загрузить только первые 30 глифов (рекомендуется)" +#: ../share/extensions/synfig_output.inx.h:1 #, fuzzy -#~ msgid "Melted Rainbow" -#~ msgstr "Расплавленная радуга" +msgid "Synfig Output" +msgstr "Экспорт в SVG" -#~ msgid "Smooth rainbow colors slightly melted along the edges" -#~ msgstr "Мягкие радужные цвета цвета, слегка оплавляющие края объекта" +#: ../share/extensions/synfig_output.inx.h:2 +msgid "Synfig Animation (*.sif)" +msgstr "" -#, fuzzy -#~ msgid "Flex Metal" -#~ msgstr "Гибкий металл" +#: ../share/extensions/synfig_output.inx.h:3 +msgid "Synfig Animation written using the sif-file exporter extension" +msgstr "" -#~ msgid "Bright, polished uneven metal casting, colorizable" -#~ msgstr "Яркая и отполированная раскрашиваемая металлическая отливка" +#: ../share/extensions/tar_layers.inx.h:1 +msgid "Collection of SVG files One per root layer" +msgstr "" -#, fuzzy -#~ msgid "Wavy Tartan" -#~ msgstr "Волнистая шотландка" +#: ../share/extensions/tar_layers.inx.h:2 +msgid "Layers as Separate SVG (*.tar)" +msgstr "" -#~ msgid "Tartan pattern with a wavy displacement and bevel around the edges" -#~ msgstr "" -#~ "Узор клетчатой шерстяной материи с волнистым искажением и фаской по краям" +#: ../share/extensions/tar_layers.inx.h:3 +msgid "" +"Each layer split into it's own svg file and collected as a tape archive (tar " +"file)" +msgstr "" -#, fuzzy -#~ msgid "3D Marble" -#~ msgstr "Трехмерный мрамор" +#: ../share/extensions/text_braille.inx.h:1 +msgid "Convert to Braille" +msgstr "Преобразовать в брайлев текст" + +#: ../share/extensions/text_extract.inx.h:1 +msgid "Extract" +msgstr "Извлечь" -#~ msgid "3D warped marble texture" -#~ msgstr "Объемная текстура мрамора" +#: ../share/extensions/text_extract.inx.h:2 +#: ../share/extensions/text_merge.inx.h:2 +msgid "Text direction:" +msgstr "Направление текста:" -#~ msgid "3D warped, fibered wood texture" -#~ msgstr "Объёмная текстура древесины" +#: ../share/extensions/text_extract.inx.h:3 +#: ../share/extensions/text_merge.inx.h:3 +msgid "Left to right" +msgstr "Слева направо" -#, fuzzy -#~ msgid "3D Mother of Pearl" -#~ msgstr "Объёмный перламутр" +#: ../share/extensions/text_extract.inx.h:4 +#: ../share/extensions/text_merge.inx.h:4 +msgid "Bottom to top" +msgstr "Снизу вверх" -#~ msgid "3D warped, iridescent pearly shell texture" -#~ msgstr "Объёмная текстура перламутровой раковины" +#: ../share/extensions/text_extract.inx.h:5 +#: ../share/extensions/text_merge.inx.h:5 +msgid "Right to left" +msgstr "Справа налево" -#, fuzzy -#~ msgid "Tiger Fur" -#~ msgstr "Тигровая шкура" +#: ../share/extensions/text_extract.inx.h:6 +#: ../share/extensions/text_merge.inx.h:6 +msgid "Top to bottom" +msgstr "Сверху вниз" -#~ msgid "Tiger fur pattern with folds and bevel around the edges" -#~ msgstr "Узор тигровой шкуры со складками и фаской по краям" +#: ../share/extensions/text_extract.inx.h:7 +#: ../share/extensions/text_merge.inx.h:7 +msgid "Horizontal point:" +msgstr "Горизонтальная точка:" -#~ msgid "Black Light" -#~ msgstr "Черный свет" +#: ../share/extensions/text_extract.inx.h:11 +#: ../share/extensions/text_merge.inx.h:11 +msgid "Vertical point:" +msgstr "Вертикальная точка:" -#~ msgid "Light areas turn to black" -#~ msgstr "Светлые области становятся черными" +#: ../share/extensions/text_flipcase.inx.h:1 +msgid "fLIP cASE" +msgstr "иНВЕРТИРОВАТЬ РЕГИСТР" -#, fuzzy -#~ msgid "Film Grain" -#~ msgstr "Пленочный шум" +#: ../share/extensions/text_flipcase.inx.h:3 +#: ../share/extensions/text_lowercase.inx.h:3 +#: ../share/extensions/text_randomcase.inx.h:3 +#: ../share/extensions/text_sentencecase.inx.h:3 +#: ../share/extensions/text_titlecase.inx.h:3 +#: ../share/extensions/text_uppercase.inx.h:3 +msgid "Change Case" +msgstr "Изменить регистр" -#~ msgid "Adds a small scale graininess" -#~ msgstr "Добавить небольшую зашумленность как на фотопленке" +#: ../share/extensions/text_lowercase.inx.h:1 +msgid "lowercase" +msgstr "все строчные" +#. <param name="flowtext" type="boolean" _gui-text="Flow text">false</param> +#: ../share/extensions/text_merge.inx.h:15 #, fuzzy -#~ msgid "Plaster Color" -#~ msgstr "Вставить цвет" +msgid "Keep style" +msgstr "Смена стиля текста" -#, fuzzy -#~ msgid "Colored plaster emboss effect" -#~ msgstr "Облачный акварельный эффект" +#: ../share/extensions/text_randomcase.inx.h:1 +msgid "rANdOm CasE" +msgstr "сЛУчАЙнЫй РЕгИсТр" -#~ msgid "Velvet Bumps" -#~ msgstr "Вельветовые шишки" +#: ../share/extensions/text_sentencecase.inx.h:1 +msgid "Sentence case" +msgstr "Как в предложении" -#~ msgid "Gives Smooth Bumps velvet like" -#~ msgstr "Создать выпуклости наподобие вельветовой ткани" +#: ../share/extensions/text_titlecase.inx.h:1 +msgid "Title Case" +msgstr "Титульный Регистр" -#, fuzzy -#~ msgid "Comics Cream" -#~ msgstr "Кремовый комикс" +#: ../share/extensions/text_uppercase.inx.h:1 +msgid "UPPERCASE" +msgstr "ВСЕ ПРОПИСНЫЕ" -#~ msgid "Non realistic 3D shaders" -#~ msgstr "Нереалистичные 3D-шейдеры" +#: ../share/extensions/triangle.inx.h:1 +msgid "Triangle" +msgstr "Треугольник" -#~ msgid "Comics shader with creamy waves transparency" -#~ msgstr "Комиксовый шейдер с кремовой волнистой полупрозрачностью" +#: ../share/extensions/triangle.inx.h:2 +msgid "Side Length a (px):" +msgstr "Длина стороны a (px):" -#, fuzzy -#~ msgid "Chewing Gum" -#~ msgstr "Жевательная резинка" +#: ../share/extensions/triangle.inx.h:3 +msgid "Side Length b (px):" +msgstr "Длина стороны b (px):" -#~ msgid "" -#~ "Creates colorizable blotches which smoothly flow over the edges of the " -#~ "lines at their crossings" -#~ msgstr "" -#~ "Создать раскрашиваемые пятна, слегка вытекающие за края линий в местах " -#~ "пересечений этих линий" +#: ../share/extensions/triangle.inx.h:4 +msgid "Side Length c (px):" +msgstr "Длина стороны c (px):" -#, fuzzy -#~ msgid "Dark And Glow" -#~ msgstr "Тёмный и светящийся" +#: ../share/extensions/triangle.inx.h:5 +msgid "Angle a (deg):" +msgstr "Угол a (°):" -#~ msgid "Darkens the edge with an inner blur and adds a flexible glow" -#~ msgstr "" -#~ "Затемнить края, добавить внутреннее размывание и настраиваемое свечение" +#: ../share/extensions/triangle.inx.h:6 +msgid "Angle b (deg):" +msgstr "Угол b (°):" -#, fuzzy -#~ msgid "Warped Rainbow" -#~ msgstr "Деформированная радуга" +#: ../share/extensions/triangle.inx.h:7 +msgid "Angle c (deg):" +msgstr "Угол c (°):" -#~ msgid "Smooth rainbow colors warped along the edges and colorizable" -#~ msgstr "" -#~ "Мягкие радужные цвета, деформированные по краям и зависящие от заливки " -#~ "объекта" +#: ../share/extensions/triangle.inx.h:9 +msgid "From Three Sides" +msgstr "Из трех сторон" -#, fuzzy -#~ msgid "Rough and Dilate" -#~ msgstr "Неровный и растянутый" +#: ../share/extensions/triangle.inx.h:10 +msgid "From Sides a, b and Angle c" +msgstr "Из сторон a, b и угла c" -#~ msgid "Create a turbulent contour around" -#~ msgstr "Создать турбулентный контур вокруг" +#: ../share/extensions/triangle.inx.h:11 +msgid "From Sides a, b and Angle a" +msgstr "Из сторон a, b и угла a" -#, fuzzy -#~ msgid "Old Postcard" -#~ msgstr "Старая открытка" +#: ../share/extensions/triangle.inx.h:12 +msgid "From Side a and Angles a, b" +msgstr "Из стороны a и углов a, b" -#~ msgid "Slightly posterize and draw edges like on old printed postcards" -#~ msgstr "Легкая постеризация и края как на старых открытках" +#: ../share/extensions/triangle.inx.h:13 +msgid "From Side c and Angles a, b" +msgstr "Из стороны c и углов a, b" +#: ../share/extensions/voronoi2svg.inx.h:1 #, fuzzy -#~ msgid "Dots Transparency" -#~ msgstr "Прозрачные точки" +msgid "Voronoi Diagram" +msgstr "Мозаика Вороного" -#~ msgid "Gives a pointillist HSL sensitive transparency" -#~ msgstr "Создать пуантилистическую прозрачность, чувствительную к HSL" +#: ../share/extensions/voronoi2svg.inx.h:3 +msgid "Type of diagram:" +msgstr "" +#: ../share/extensions/voronoi2svg.inx.h:4 #, fuzzy -#~ msgid "Canvas Transparency" -#~ msgstr "Прозрачный холст" +msgid "Bounding box of the diagram:" +msgstr "Используемая площадка (BB):" +#: ../share/extensions/voronoi2svg.inx.h:5 #, fuzzy -#~ msgid "Gives a canvas like HSL sensitive transparency." -#~ msgstr "Создать похожую на холст прозрачность, чувствительную к HSL" +msgid "Show the bounding box" +msgstr "Показывать ограничивающую площадку (BB)" +#: ../share/extensions/voronoi2svg.inx.h:6 #, fuzzy -#~ msgid "Smear Transparency" -#~ msgstr "Прозрачные мазки" - -#~ msgid "" -#~ "Paint objects with a transparent turbulence which turns around color edges" -#~ msgstr "" -#~ "Закрасить объекты прозрачной турбулентностью, огибающей цветные края" +msgid "Delaunay Triangulation" +msgstr "Ориентация" +#: ../share/extensions/voronoi2svg.inx.h:7 #, fuzzy -#~ msgid "Thick Paint" -#~ msgstr "Густая краска" - -#~ msgid "Thick painting effect with turbulence" -#~ msgstr "Эффект густой краски с турбулентностью" - -#~ msgid "Burst" -#~ msgstr "Лопнувший шарик" +msgid "Voronoi and Delaunay" +msgstr "Мозаика Вороного" -#~ msgid "Burst balloon texture crumpled and with holes" -#~ msgstr "Текстура разорвавшегося воздушного шарика" +#: ../share/extensions/voronoi2svg.inx.h:8 +msgid "Options for Voronoi diagram" +msgstr "" +#: ../share/extensions/voronoi2svg.inx.h:10 #, fuzzy -#~ msgid "Embossed Leather" -#~ msgstr "Рельефная кожа" - -#~ msgid "" -#~ "Combine a HSL edges detection bump with a leathery or woody and " -#~ "colorizable texture" -#~ msgstr "Эффект текстуры кожи или дерева с выдавливанием краев" - -#~ msgid "Carnaval" -#~ msgstr "Карнавал" - -#~ msgid "White splotches evocating carnaval masks" -#~ msgstr "Белые неровные пятна, напоминающие карнавальные маски" - -#~ msgid "Plastify" -#~ msgstr "Пластификация" - -#~ msgid "" -#~ "HSL edges detection bump with a wavy reflective surface effect and " -#~ "variable crumple" -#~ msgstr "" -#~ "Выпуклость по определенным краям HSL с эффектом волнистой отражающей " -#~ "поверхности и переменной смятостью" - -#~ msgid "Plaster" -#~ msgstr "Штукатурка" - -#~ msgid "" -#~ "Combine a HSL edges detection bump with a matte and crumpled surface " -#~ "effect" -#~ msgstr "" -#~ "Объединение выпуклости по определенным краям с эффектом сморщенной " -#~ "поверхности" +msgid "Automatic from selected objects" +msgstr "Сгруппировать выделенные объекты" -#~ msgid "Rough Transparency" -#~ msgstr "Грубая прозрачность" +#: ../share/extensions/voronoi2svg.inx.h:12 +msgid "" +"Select a set of objects. Their centroids will be used as the sites of the " +"Voronoi diagram. Text objects are not handled." +msgstr "" -#~ msgid "" -#~ "Adds a turbulent transparency which displaces pixels at the same time" -#~ msgstr "" -#~ "Добавить турбулентную прозрачность с одновременным смещением пикселов" +#: ../share/extensions/web-set-att.inx.h:1 +msgid "Set Attributes" +msgstr "Установить атрибуты" -#~ msgid "Gouache" -#~ msgstr "Гуашь" +#: ../share/extensions/web-set-att.inx.h:3 +#, fuzzy +msgid "Attribute to set:" +msgstr "Устанавливаемые атрибуты" -#~ msgid "Partly opaque water color effect with bleed" -#~ msgstr "Полупрозрачный эффект акварели с " +#: ../share/extensions/web-set-att.inx.h:4 +#, fuzzy +msgid "When should the set be done:" +msgstr "Когда установить?" -#~ msgid "Alpha Engraving" -#~ msgstr "Альфа-гравировка" +#: ../share/extensions/web-set-att.inx.h:5 +#, fuzzy +msgid "Value to set:" +msgstr "Устанавливаемое значение:" -#~ msgid "Gives a transparent engraving effect with rough line and filling" -#~ msgstr "Создать прозрачный эффект гравюры с грубыми линиями и заливкой" +#: ../share/extensions/web-set-att.inx.h:6 +#: ../share/extensions/web-transmit-att.inx.h:5 +#, fuzzy +msgid "Compatibility with previews code to this event:" +msgstr "Совместимость с кодом просмотра события:" +#: ../share/extensions/web-set-att.inx.h:7 #, fuzzy -#~ msgid "Alpha Draw Liquid" -#~ msgstr "Текучий прозрачный рисунок" +msgid "Source and destination of setting:" +msgstr "Источник и получатель установки:" -#~ msgid "Gives a transparent fluid drawing effect with rough line and filling" -#~ msgstr "Создать текучий прозрачный эффект с грубыми линиями и заливкой" +#: ../share/extensions/web-set-att.inx.h:8 +#: ../share/extensions/web-transmit-att.inx.h:7 +msgid "on click" +msgstr "при щелчке" -#, fuzzy -#~ msgid "Liquid Drawing" -#~ msgstr "Экспрессионизм" +#: ../share/extensions/web-set-att.inx.h:9 +#: ../share/extensions/web-transmit-att.inx.h:8 +msgid "on focus" +msgstr "при получении фокуса" -#~ msgid "Gives a fluid and wavy expressionist drawing effect to images" -#~ msgstr "" -#~ "Применить эффект текучего и волнистого рисунка в стиле экспрессионизма к " -#~ "растровым изображениям" +#: ../share/extensions/web-set-att.inx.h:10 +#: ../share/extensions/web-transmit-att.inx.h:9 +msgid "on blur" +msgstr "при размывании" -#~ msgid "Marbled Ink" -#~ msgstr "Мраморные чернила" +#: ../share/extensions/web-set-att.inx.h:11 +#: ../share/extensions/web-transmit-att.inx.h:10 +msgid "on activate" +msgstr "при активации" -#~ msgid "Marbled transparency effect which conforms to image detected edges" -#~ msgstr "Эффект прозрачного мрамора, соответствующего обнаруженным краям" +#: ../share/extensions/web-set-att.inx.h:12 +#: ../share/extensions/web-transmit-att.inx.h:11 +msgid "on mouse down" +msgstr "при нажатии клавиши мыши" -#~ msgid "Thick Acrylic" -#~ msgstr "Густая акриловая краска" +#: ../share/extensions/web-set-att.inx.h:13 +#: ../share/extensions/web-transmit-att.inx.h:12 +msgid "on mouse up" +msgstr "при отпускании клавиши мыши" -#~ msgid "Thick acrylic paint texture with high texture depth" -#~ msgstr "Рельефная текстура густой акриловой краски" +#: ../share/extensions/web-set-att.inx.h:14 +#: ../share/extensions/web-transmit-att.inx.h:13 +msgid "on mouse over" +msgstr "при прохождении курсора мыши над" -#~ msgid "Alpha Engraving B" -#~ msgstr "Альфа-гравировка №2" +#: ../share/extensions/web-set-att.inx.h:15 +#: ../share/extensions/web-transmit-att.inx.h:14 +msgid "on mouse move" +msgstr "при перемещении мыши" -#~ msgid "" -#~ "Gives a controllable roughness engraving effect to bitmaps and materials" -#~ msgstr "" -#~ "Применить эффект регулируемой грубой гравировки к растровым изображениям " -#~ "или материалам" +#: ../share/extensions/web-set-att.inx.h:16 +#: ../share/extensions/web-transmit-att.inx.h:15 +msgid "on mouse out" +msgstr "при выходе курсора мыши за пределы" -#~ msgid "Lapping" -#~ msgstr "Плеск волн" +#: ../share/extensions/web-set-att.inx.h:17 +#: ../share/extensions/web-transmit-att.inx.h:16 +msgid "on element loaded" +msgstr "при загрузке элемента" -#~ msgid "Something like a water noise" -#~ msgstr "Что-то вроде водного шума" +#: ../share/extensions/web-set-att.inx.h:18 +msgid "The list of values must have the same size as the attributes list." +msgstr "Количество значений должно равняться количеству атрибутов." -#~ msgid "Monochrome Transparency" -#~ msgstr "Монохромная прозрачность" +#: ../share/extensions/web-set-att.inx.h:19 +#: ../share/extensions/web-transmit-att.inx.h:17 +msgid "Run it after" +msgstr "Запустить после" -#~ msgid "Convert to a colorizable transparent positive or negative" -#~ msgstr "Преобразовать в раскрашиваемый прозрачный позитив или негатив" +#: ../share/extensions/web-set-att.inx.h:20 +#: ../share/extensions/web-transmit-att.inx.h:18 +msgid "Run it before" +msgstr "Запустить до" -#~ msgid "Saturation Map" -#~ msgstr "Прокция насыщенности" +#: ../share/extensions/web-set-att.inx.h:22 +#: ../share/extensions/web-transmit-att.inx.h:20 +msgid "The next parameter is useful when you select more than two elements" +msgstr "Следующий параметр полезен, когда выбрано больше двух элементов" -#~ msgid "" -#~ "Creates an approximative semi-transparent and colorizable image of the " -#~ "saturation levels" -#~ msgstr "" -#~ "Создать приблизительное полупрозрачное и раскрашиваемое изображение " -#~ "уровней насыщенности" +#: ../share/extensions/web-set-att.inx.h:23 +msgid "All selected ones set an attribute in the last one" +msgstr "Все выбранные устанавливают атрибут последнему" -#~ msgid "Riddled" -#~ msgstr "Решето" +#: ../share/extensions/web-set-att.inx.h:24 +msgid "The first selected sets an attribute in all others" +msgstr "Первый выбранный передает атрибут остальным" -#~ msgid "Riddle the surface and add bump to images" -#~ msgstr "Изрешетить поверхность и добавить выпуклости" +#: ../share/extensions/web-set-att.inx.h:26 +#: ../share/extensions/web-transmit-att.inx.h:24 +msgid "" +"This effect adds a feature visible (or usable) only on a SVG enabled web " +"browser (like Firefox)." +msgstr "" +"Этот эффект добавляет функцию, видимую (и используемую) только в браузере с " +"поддержкой SVG (вроде Firefox)" -#~ msgid "Wrinkled Varnish" -#~ msgstr "Смятая глазурь" +#: ../share/extensions/web-set-att.inx.h:27 +msgid "" +"This effect sets one or more attributes in the second selected element, when " +"a defined event occurs on the first selected element." +msgstr "" +"Этот эффект устанавливает один или более атрибутов второго выделенного " +"объекта, когда указанное событие происходит с первым выделенным объектом." -#~ msgid "Thick glossy and translucent paint texture with high depth" -#~ msgstr "Толстая, блестящая, рельефная и полупрозрачная текстура краски" +#: ../share/extensions/web-set-att.inx.h:28 +msgid "" +"If you want to set more than one attribute, you must separate this with a " +"space, and only with a space." +msgstr "" +"Если вы хотите установить более чем один атрибут, необходимо разделить их " +"пробелом." -#~ msgid "Canvas Bumps" -#~ msgstr "Холщовые выпуклости" +#: ../share/extensions/web-set-att.inx.h:29 +#: ../share/extensions/web-transmit-att.inx.h:27 +#: ../share/extensions/webslicer_create_group.inx.h:13 +#: ../share/extensions/webslicer_create_rect.inx.h:41 +#: ../share/extensions/webslicer_export.inx.h:8 +msgid "Web" +msgstr "Веб" -#~ msgid "Canvas texture with an HSL sensitive height map" -#~ msgstr "Текстура холста с чувствительной к HSL картой высот" +#: ../share/extensions/web-transmit-att.inx.h:1 +msgid "Transmit Attributes" +msgstr "Передать атрибуты" +#: ../share/extensions/web-transmit-att.inx.h:3 #, fuzzy -#~ msgid "Canvas Bumps Matte" -#~ msgstr "Холщовые матовые выпуклости" +msgid "Attribute to transmit:" +msgstr "Передаваемые атрибуты" -#~ msgid "" -#~ "Same as Canvas Bumps but with a diffuse light instead of a specular one" -#~ msgstr "" -#~ "То же, что и холщовые выпуклости, но с рассеянным светом вместо " -#~ "отраженного" +#: ../share/extensions/web-transmit-att.inx.h:4 +msgid "When to transmit:" +msgstr "Когда передать:" +#: ../share/extensions/web-transmit-att.inx.h:6 #, fuzzy -#~ msgid "Canvas Bumps Alpha" -#~ msgstr "Холщовые выпуклости с альфа-каналом" +msgid "Source and destination of transmitting:" +msgstr "Источник и получатель передачи:" -#~ msgid "Same as Canvas Bumps but with transparent highlights" -#~ msgstr "То же, что и холщовые выпуклости, но с прозрачными яркими участками" +#: ../share/extensions/web-transmit-att.inx.h:21 +msgid "All selected ones transmit to the last one" +msgstr "Все выбранные передают последнему" -#, fuzzy -#~ msgid "Bright Metal" -#~ msgstr "Яркий металл" +#: ../share/extensions/web-transmit-att.inx.h:22 +msgid "The first selected transmits to all others" +msgstr "Первый выбранный передает всем остальным" -#~ msgid "Bright metallic effect for any color" -#~ msgstr "Яркий эффект металла для любого цвета" +#: ../share/extensions/web-transmit-att.inx.h:25 +msgid "" +"This effect transmits one or more attributes from the first selected element " +"to the second when an event occurs." +msgstr "" +"Этот эффект передаёт один или более атрибутов первого выделенного объекта " +"второму при заданном событии." -#, fuzzy -#~ msgid "Deep Colors Plastic" -#~ msgstr "Тёмный пластик" +#: ../share/extensions/web-transmit-att.inx.h:26 +msgid "" +"If you want to transmit more than one attribute, you should separate this " +"with a space, and only with a space." +msgstr "" +"Если вы хотите передать более чем один атрибут, необходимо разделить их " +"пробелом." -#~ msgid "Transparent plastic with deep colors" -#~ msgstr "Прозрачный пластик тёмных цветов" +#: ../share/extensions/webslicer_create_group.inx.h:1 +msgid "Set a layout group" +msgstr "Установить группу макета" -#, fuzzy -#~ msgid "Melted Jelly Matte" -#~ msgstr "Матовое расплавленное желе" +#: ../share/extensions/webslicer_create_group.inx.h:3 +#: ../share/extensions/webslicer_create_rect.inx.h:18 +msgid "HTML id attribute:" +msgstr "Атрибут id в HTML:" -#~ msgid "Matte bevel with blurred edges" -#~ msgstr "Матовая фаска с размытыми краями" +#: ../share/extensions/webslicer_create_group.inx.h:4 +#: ../share/extensions/webslicer_create_rect.inx.h:19 +msgid "HTML class attribute:" +msgstr "Атрибут класса HTML:" -#~ msgid "Melted Jelly" -#~ msgstr "Расплавленное желе" +#: ../share/extensions/webslicer_create_group.inx.h:5 +msgid "Width unit:" +msgstr "Единица ширины:" -#~ msgid "Glossy bevel with blurred edges" -#~ msgstr "Блестящая фаска с размытыми краями" +#: ../share/extensions/webslicer_create_group.inx.h:6 +msgid "Height unit:" +msgstr "Единица высоты:" -#, fuzzy -#~ msgid "Combined Lighting" -#~ msgstr "Объединённое освещение" +#: ../share/extensions/webslicer_create_group.inx.h:7 +#: ../share/extensions/webslicer_create_rect.inx.h:9 +msgid "Background color:" +msgstr "Цвет фона:" -#~ msgid "Tinfoil" -#~ msgstr "Оловянная фольга" +#: ../share/extensions/webslicer_create_group.inx.h:8 +msgid "Pixel (fixed)" +msgstr "Пиксел (фиксированная)" -#~ msgid "" -#~ "Metallic foil effect combining two lighting types and variable crumple" -#~ msgstr "" -#~ "Эффект металлической фольги, объединяющий два типа освещения и " -#~ "настраиваемую смятость" +#: ../share/extensions/webslicer_create_group.inx.h:9 +msgid "Percent (relative to parent size)" +msgstr "Процент (относительная к размеру родительского элемента)" -#, fuzzy -#~ msgid "Soft Colors" -#~ msgstr "Мягкие цвета" +#: ../share/extensions/webslicer_create_group.inx.h:10 +msgid "Undefined (relative to non-floating content size)" +msgstr "Неопределённая (относительная к размеру неплавающего содержимого)" -#~ msgid "Adds a colorizable edges glow inside objects and pictures" -#~ msgstr "" -#~ "Создать раскрашиваемое свечение краёв внутри объектов и растровых " -#~ "изображений" +#: ../share/extensions/webslicer_create_group.inx.h:12 +msgid "" +"Layout Group is only about to help a better code generation (if you need " +"it). To use this, you must to select some \"Slicer rectangles\" first." +msgstr "" +"Группа макета необходимо лишь для создания более правильного кода. Чтобы " +"работать с ней, сначала выделите несколько «прямоугольников нарезки»." -#, fuzzy -#~ msgid "Relief Print" -#~ msgstr "Рельефный отпечаток" +#: ../share/extensions/webslicer_create_group.inx.h:14 +msgid "Slicer" +msgstr "Нарезка макета" -#~ msgid "Bumps effect with a bevel, color flood and complex lighting" -#~ msgstr "Эффект выпуклости с фаской, заливкой цветом и сложным освещением" +#: ../share/extensions/webslicer_create_rect.inx.h:1 +msgid "Create a slicer rectangle" +msgstr "Установить прямоугольник нарезки" -#~ msgid "Growing Cells" -#~ msgstr "Растущие клетки" +#: ../share/extensions/webslicer_create_rect.inx.h:4 +msgid "DPI:" +msgstr "dpi:" -#~ msgid "Random rounded living cells like fill" -#~ msgstr "Заливка случайными круглыми объектами наподобие живых клеток" +#: ../share/extensions/webslicer_create_rect.inx.h:5 +msgid "Force Dimension:" +msgstr "Принудительное разрешение:" -#~ msgid "Fluorescence" -#~ msgstr "Флюоресценция" +#. i18n. Description duplicated in a fake value attribute in order to make it translatable +#: ../share/extensions/webslicer_create_rect.inx.h:7 +msgid "Force Dimension must be set as <width>x<height>" +msgstr "Принудительное разрешение должно быть указано как <ширина>x<высота>." -#~ msgid "Oversaturate colors which can be fluorescent in real world" -#~ msgstr "" -#~ "Перенасытить цвета, которые в реальном мире могут быть флюоресцирующими" +#: ../share/extensions/webslicer_create_rect.inx.h:8 +msgid "If set, this will replace DPI." +msgstr "Если оно установлено, то заменит собой dpi." -#, fuzzy -#~ msgid "Pixellize" -#~ msgstr "Пиксел" +#: ../share/extensions/webslicer_create_rect.inx.h:10 +msgid "JPG specific options" +msgstr "Специфичные для JPEG параметры" -#, fuzzy -#~ msgid "Pixel tools" -#~ msgstr "Пикселы" +#: ../share/extensions/webslicer_create_rect.inx.h:11 +msgid "Quality:" +msgstr "Качество:" -#, fuzzy -#~ msgid "Set Resolution" -#~ msgstr "Разрешение:" +#: ../share/extensions/webslicer_create_rect.inx.h:12 +msgid "" +"0 is the lowest image quality and highest compression, and 100 is the best " +"quality but least effective compression" +msgstr "" +"0 — наихудшее качество изображения и наисильнейшее сжатие, 100 — наилучшее " +"качество и наименьшее сжатие" -#, fuzzy -#~ msgid "Set filter resolution" -#~ msgstr "Разрешение для экспорта:" +#: ../share/extensions/webslicer_create_rect.inx.h:13 +msgid "GIF specific options" +msgstr "Специфичные для GIF параметры" -#, fuzzy -#~ msgid "Matte emboss effect" -#~ msgstr "Удалить эффекты" +#: ../share/extensions/webslicer_create_rect.inx.h:16 +msgid "Palette" +msgstr "Палитра" -#, fuzzy -#~ msgid "Specular emboss effect" -#~ msgstr "Степень отражения" +#: ../share/extensions/webslicer_create_rect.inx.h:17 +msgid "Palette size:" +msgstr "Размер палитры:" -#, fuzzy -#~ msgid "Linen Canvas" -#~ msgstr "Холст" +#: ../share/extensions/webslicer_create_rect.inx.h:20 +msgid "Options for HTML export" +msgstr "Параметры экспорта в HTML" -#, fuzzy -#~ msgid "Plasticine" -#~ msgstr "Штукатурка" +#: ../share/extensions/webslicer_create_rect.inx.h:21 +msgid "Layout disposition:" +msgstr "Размещение макета:" -#, fuzzy -#~ msgid "Matte modeling paste emboss effect" -#~ msgstr "Вставить динамический контурный эффект" +#: ../share/extensions/webslicer_create_rect.inx.h:22 +msgid "Positioned html block element with the image as Background" +msgstr "Размещённый текстовый блок HTML с изображением как фоном" -#, fuzzy -#~ msgid "Paper like emboss effect" -#~ msgstr "Вставить динамический контурный эффект" +#: ../share/extensions/webslicer_create_rect.inx.h:23 +msgid "Tiled Background (on parent group)" +msgstr "Мозаичный фон (в родительской группе)" -#, fuzzy -#~ msgid "Jelly Bump" -#~ msgstr "Пузыристые выпуклости " +#: ../share/extensions/webslicer_create_rect.inx.h:24 +msgid "Background — repeat horizontally (on parent group)" +msgstr "Фон — горизонтальный повтор (в родительской группе)" -#, fuzzy -#~ msgid "Convert pictures to thick jelly" -#~ msgstr "Текст в кривые Безье" +#: ../share/extensions/webslicer_create_rect.inx.h:25 +msgid "Background — repeat vertically (on parent group)" +msgstr "Фон — вертикальный повтор (в родительской группе)" -#, fuzzy -#~ msgid "Blend Opposites" -#~ msgstr "Режим смешивания:" +#: ../share/extensions/webslicer_create_rect.inx.h:26 +msgid "Background — no repeat (on parent group)" +msgstr "Фон — без повтора (в родительской группе)" -#, fuzzy -#~ msgid "Hue to White" -#~ msgstr "Вращение тона" +#: ../share/extensions/webslicer_create_rect.inx.h:27 +msgid "Positioned Image" +msgstr "Размещённое изображение" -#, fuzzy -#~ msgid "" -#~ "Paint objects with a transparent turbulence which wraps around color edges" -#~ msgstr "" -#~ "Закрасить объекты прозрачной турбулентностью, огибающей цветные края" +#: ../share/extensions/webslicer_create_rect.inx.h:28 +msgid "Non Positioned Image" +msgstr "Неразмещённое изображение" -#~ msgid "Pointillism" -#~ msgstr "Пуантилизм" +#: ../share/extensions/webslicer_create_rect.inx.h:29 +msgid "Left Floated Image" +msgstr "Плавающее слева изображение" -#, fuzzy -#~ msgid "Gives a turbulent pointillist HSL sensitive transparency" -#~ msgstr "Создать пуантилистическую прозрачность, чувствительную к HSL" +#: ../share/extensions/webslicer_create_rect.inx.h:30 +msgid "Right Floated Image" +msgstr "Плавающее справа изображение" -#~ msgid "Basic noise transparency texture" -#~ msgstr "Простая текстура полупрозрачного шума" +#: ../share/extensions/webslicer_create_rect.inx.h:31 +msgid "Position anchor:" +msgstr "Размещение якоря:" -#, fuzzy -#~ msgid "Fill Background" -#~ msgstr "Фон" +#: ../share/extensions/webslicer_create_rect.inx.h:32 +msgid "Top and Left" +msgstr "Вверху и слева" -#, fuzzy -#~ msgid "Adds a colorizable opaque background" -#~ msgstr "Создать раскрашиваемую тень внутри" +#: ../share/extensions/webslicer_create_rect.inx.h:33 +msgid "Top and Center" +msgstr "Вверху и по центру" -#, fuzzy -#~ msgid "Flatten Transparency" -#~ msgstr "Прозрачность диалога:" +#: ../share/extensions/webslicer_create_rect.inx.h:34 +msgid "Top and right" +msgstr "Вверху и справа" -#, fuzzy -#~ msgid "Adds a white opaque background" -#~ msgstr "default background" +#: ../share/extensions/webslicer_create_rect.inx.h:35 +msgid "Middle and Left" +msgstr "Посередине и слева" -#, fuzzy -#~ msgid "Fill Area" -#~ msgstr "Сплошной цвет" +#: ../share/extensions/webslicer_create_rect.inx.h:36 +msgid "Middle and Center" +msgstr "Посередине и по центру" -#, fuzzy -#~ msgid "Blur Double" -#~ msgstr "Размывание" +#: ../share/extensions/webslicer_create_rect.inx.h:37 +msgid "Middle and Right" +msgstr "Посередине и справа" -#, fuzzy -#~ msgid "Adds a small scale screen like noise locally" -#~ msgstr "Добавить небольшую зашумленность как на фотопленке" +#: ../share/extensions/webslicer_create_rect.inx.h:38 +msgid "Bottom and Left" +msgstr "Снизу и слева" -#, fuzzy -#~ msgid "Poster Color Fun" -#~ msgstr "Вставить цвет" +#: ../share/extensions/webslicer_create_rect.inx.h:39 +msgid "Bottom and Center" +msgstr "Снизу и по центру" -#~ msgid "Basic noise fill texture; adjust color in Flood" -#~ msgstr "Простая текстура шума; цвет меняется в примитиве Заливка" +#: ../share/extensions/webslicer_create_rect.inx.h:40 +msgid "Bottom and Right" +msgstr "Снизу и справа" -#, fuzzy -#~ msgid "Alpha Turbulent" -#~ msgstr "Перекрашивание" +#: ../share/extensions/webslicer_export.inx.h:1 +msgid "Export layout pieces and HTML+CSS code" +msgstr "Экспортировать части макета в код HTML и CSS" +#: ../share/extensions/webslicer_export.inx.h:3 #, fuzzy -#~ msgid "Colorize Turbulent" -#~ msgstr "Тонирование" +msgid "Directory path to export:" +msgstr "Каталог для экспорта:" -#, fuzzy -#~ msgid "Cross Noise B" -#~ msgstr "Шум Пуассона" +#: ../share/extensions/webslicer_export.inx.h:4 +msgid "Create directory, if it does not exists" +msgstr "Создать каталог, если его ещё нет" -#, fuzzy -#~ msgid "Adds a small scale crossy graininess" -#~ msgstr "Добавить небольшую зашумленность как на фотопленке" +#: ../share/extensions/webslicer_export.inx.h:5 +msgid "With HTML and CSS" +msgstr "С HTML и CSS" +#: ../share/extensions/webslicer_export.inx.h:7 #, fuzzy -#~ msgid "Cross Noise" -#~ msgstr "Шум Пуассона" +msgid "" +"All sliced images, and optionally - code, will be generated as you had " +"configured and saved to one directory." +msgstr "" +"Все нарезанные изображения и, по выбору, код будут созданы по указанным вами " +"параметрам и сохранены в один каталог." -#, fuzzy -#~ msgid "Adds a small scale screen like graininess" -#~ msgstr "Добавить небольшую зашумленность как на фотопленке" +#: ../share/extensions/whirl.inx.h:1 +msgid "Whirl" +msgstr "Завихрение" -#, fuzzy -#~ msgid "Light Eraser Cracked" -#~ msgstr "Ластик для светлых областей" +#: ../share/extensions/whirl.inx.h:2 +msgid "Amount of whirl:" +msgstr "Величина завихрения:" -#, fuzzy -#~ msgid "Poster Turbulent" -#~ msgstr "Турбулентность" +#: ../share/extensions/whirl.inx.h:3 +msgid "Rotation is clockwise" +msgstr "Поворот по часовой стрелке" -#, fuzzy -#~ msgid "Tartan Smart" -#~ msgstr "Шотландка" +#: ../share/extensions/wireframe_sphere.inx.h:1 +msgid "Wireframe Sphere" +msgstr "Каркасная сфера" -#, fuzzy -#~ msgid "Highly configurable checkered tartan pattern" -#~ msgstr "Клетчатая шерстяная материя" +#: ../share/extensions/wireframe_sphere.inx.h:2 +msgid "Lines of latitude:" +msgstr "Линии широты:" -#, fuzzy -#~ msgid "Light Contour" -#~ msgstr "Источник света:" +#: ../share/extensions/wireframe_sphere.inx.h:3 +msgid "Lines of longitude:" +msgstr "Линии долготы:" -#~ msgid "Liquid" -#~ msgstr "Жидкость" +#: ../share/extensions/wireframe_sphere.inx.h:4 +msgid "Tilt (deg):" +msgstr "Наклон (°):" -#~ msgid "Colorizable filling with liquid transparency" -#~ msgstr "Раскрашиваемая заливка, придающая объекту эффект жидкости" +#: ../share/extensions/wireframe_sphere.inx.h:7 +msgid "Hide lines behind the sphere" +msgstr "Скрыть линии позади сферы" -#~ msgid "Aluminium" -#~ msgstr "Алюминий" +#: ../share/extensions/wmf_input.inx.h:1 +#: ../share/extensions/wmf_output.inx.h:1 +msgid "Windows Metafile Input" +msgstr "Импорт файлов Windows Metafile" -#, fuzzy -#~ msgid "Aluminium effect with sharp brushed reflections" -#~ msgstr "Гелевый эффект с сильным преломлением" +#: ../share/extensions/wmf_input.inx.h:3 +#: ../share/extensions/wmf_output.inx.h:3 +msgid "A popular graphics file format for clipart" +msgstr "Популярный графический формат для клипарата" -#~ msgid "Comics" -#~ msgstr "Комикс" +#: ../share/extensions/xaml2svg.inx.h:1 +msgid "XAML Input" +msgstr "Импорт XAML" #, fuzzy -#~ msgid "Comics cartoon drawing effect" -#~ msgstr "Комикс, нарисованный мокрой кистью" +#~ msgctxt "Symbol" +#~ msgid "Map Symbols" +#~ msgstr "Кхмерские символы" #, fuzzy -#~ msgid "Comics Draft" -#~ msgstr "Черновик комикса" - -#~ msgid "Draft painted cartoon shading with a glassy look" -#~ msgstr "Начерно нарисованный комикс с блеском" +#~ msgctxt "Symbol" +#~ msgid "Bed and Breakfast" +#~ msgstr "Красный и зелёный" #, fuzzy -#~ msgid "Comics Fading" -#~ msgstr "Комикс с затуханием" - -#~ msgid "Cartoon paint style with some fading at the edges" -#~ msgstr "Стиль рисования наподобие комиксов с затуханием по краям" +#~ msgctxt "Symbol" +#~ msgid "Hostel" +#~ msgstr "Host" #, fuzzy -#~ msgid "Brushed Metal" -#~ msgstr "Ржавчина" +#~ msgctxt "Symbol" +#~ msgid "Chalet" +#~ msgstr "Палитра" #, fuzzy -#~ msgid "Opaline" -#~ msgstr "Контур" - -#~ msgid "Contouring version of smooth shader" -#~ msgstr "Абрисная версия плавного шейдера" - -#~ msgid "Chrome" -#~ msgstr "Хром" +#~ msgctxt "Symbol" +#~ msgid "Playground" +#~ msgstr "Фон" #, fuzzy -#~ msgid "Bright chrome effect" -#~ msgstr "Справа налево" +#~ msgctxt "Symbol" +#~ msgid "Police Station" +#~ msgstr "Больше насыщенности" #, fuzzy -#~ msgid "Deep Chrome" -#~ msgstr "Хром" +#~ msgctxt "Symbol" +#~ msgid "Public Building" +#~ msgstr "Общественное достояние" #, fuzzy -#~ msgid "Dark chrome effect" -#~ msgstr "Текущий эффект" +#~ msgctxt "Symbol" +#~ msgid "Survey Point" +#~ msgstr "Точка Жергонна" #, fuzzy -#~ msgid "Emboss Shader" -#~ msgstr "Рельефный шейдер" +#~ msgctxt "Symbol" +#~ msgid "Steps" +#~ msgstr "Шаги" #, fuzzy -#~ msgid "Combination of satiny and emboss effect" -#~ msgstr "Комбинация из плавного и рельефного шейдеров" +#~ msgctxt "Symbol" +#~ msgid "Kissing Gate" +#~ msgstr "Отсутствующий глиф:" #, fuzzy -#~ msgid "Sharp Metal" -#~ msgstr "Тёмный рельеф" +#~ msgctxt "Symbol" +#~ msgid "Entrance" +#~ msgstr "Повысить качество" #, fuzzy -#~ msgid "Chrome effect with darkened edges" -#~ msgstr "Гелевый эффект с легким преломлением" +#~ msgctxt "Symbol" +#~ msgid "Cattle Grid" +#~ msgstr "Картезианская сетка" #, fuzzy -#~ msgid "Brush Draw" -#~ msgstr "Кисть" +#~ msgctxt "Symbol" +#~ msgid "University" +#~ msgstr "Идентичная функция" #, fuzzy -#~ msgid "Chrome Emboss" -#~ msgstr "Тёмный рельеф" +#~ msgctxt "Symbol" +#~ msgid "High/Secondary School" +#~ msgstr "Второй язык:" #, fuzzy -#~ msgid "Embossed chrome effect" -#~ msgstr "Удаление контурного эффекта" +#~ msgctxt "Symbol" +#~ msgid "Dentist" +#~ msgstr "Идентичная функция" #, fuzzy -#~ msgid "Contour Emboss" -#~ msgstr "Цветной рельеф" +#~ msgctxt "Symbol" +#~ msgid "Accident & Emergency" +#~ msgstr "Accent Green" #, fuzzy -#~ msgid "Satiny and embossed contour effect" -#~ msgstr "Удалить эффекты" +#~ msgctxt "Symbol" +#~ msgid "Doctors" +#~ msgstr "Соединительные линии" #, fuzzy -#~ msgid "Sharp Deco" -#~ msgstr "Повысить резкость" - -#~ msgid "Unrealistic reflections with sharp edges" -#~ msgstr "Нереалистичные отражения с острыми краями" +#~ msgctxt "Symbol" +#~ msgid "Power Lines" +#~ msgstr "Линия по узлам" #, fuzzy -#~ msgid "Deep Metal" -#~ msgstr "Гибкий металл" +#~ msgctxt "Symbol" +#~ msgid "Transmitter" +#~ msgstr "Трансформировать текстуры" #, fuzzy -#~ msgid "Aluminium Emboss" -#~ msgstr "Aluminium 1" +#~ msgctxt "Symbol" +#~ msgid "Mountain Pass" +#~ msgstr "Тонированное стекло" #, fuzzy -#~ msgid "Refractive Glass" -#~ msgstr "Преломляющий гель А" +#~ msgctxt "Symbol" +#~ msgid "Supermarket" +#~ msgstr "Установка маркеров" #, fuzzy -#~ msgid "Double reflection through glass with some refraction" -#~ msgstr "Гелевый эффект с сильным преломлением" +#~ msgctxt "Symbol" +#~ msgid "Greengrocer" +#~ msgstr "Зеленый" #, fuzzy -#~ msgid "Frosted Glass" -#~ msgstr "Замороженное стекло" +#~ msgctxt "Symbol" +#~ msgid "Garden Center" +#~ msgstr "Вверху и по центру" #, fuzzy -#~ msgid "Satiny glass effect" -#~ msgstr "Иллюминированный эффект тонированного стекла" +#~ msgctxt "Symbol" +#~ msgid "Hardware / DIY" +#~ msgstr "Устройства" #, fuzzy -#~ msgid "Bump Engraving" -#~ msgstr "Альфа-гравировка №1" +#~ msgctxt "Symbol" +#~ msgid "Confectioner" +#~ msgstr "Cоединения" #, fuzzy -#~ msgid "Carving emboss effect" -#~ msgstr "Вставить динамический контурный эффект" +#~ msgctxt "Symbol" +#~ msgid "Clothing" +#~ msgstr "Сглаживание:" #, fuzzy -#~ msgid "Convoluted emboss effect" -#~ msgstr "Облачный акварельный эффект" +#~ msgctxt "Symbol" +#~ msgid "Leisure Center" +#~ msgstr "Возврат к исходному центру" #, fuzzy -#~ msgid "Emergence" -#~ msgstr "Отклонение" +#~ msgctxt "Symbol" +#~ msgid "Zoo" +#~ msgstr "Лупа" #, fuzzy -#~ msgid "Create a two colors lithographic effect" -#~ msgstr "Создание контурного эффекта" +#~ msgctxt "Symbol" +#~ msgid "Water Wheel" +#~ msgstr "Круг" #, fuzzy -#~ msgid "Paint Channels" -#~ msgstr "Голубой канал (C)" +#~ msgctxt "Symbol" +#~ msgid "Theater" +#~ msgstr "Создать" #, fuzzy -#~ msgid "Posterized Light Eraser" -#~ msgstr "Ластик для светлых областей" +#~ msgctxt "Symbol" +#~ msgid "Monument" +#~ msgstr "Документ" #, fuzzy -#~ msgid "Trichrome" -#~ msgstr "Хром" +#~ msgctxt "Symbol" +#~ msgid "Battle Location" +#~ msgstr "Расположение:" #, fuzzy -#~ msgid "Contouring table" -#~ msgstr "Вписанный треугольник" +#~ msgctxt "Symbol" +#~ msgid "Train" +#~ msgstr "Режим рисования" #, fuzzy -#~ msgid "Blurred multiple contours for objects" -#~ msgstr "Пустой контур с размытой обводкой" +#~ msgctxt "Symbol" +#~ msgid "Flood Gate" +#~ msgstr "Заливка" #, fuzzy -#~ msgid "Contouring discrete" -#~ msgstr "Controlling dock item" +#~ msgctxt "Symbol" +#~ msgid "Disabled Parking" +#~ msgstr "Отключено" #, fuzzy -#~ msgid "Sharp multiple contour for objects" -#~ msgstr "Прилипать центрами объектов" - -#~ msgid "Stripes 1:1" -#~ msgstr "Полосы 1:1" - -#~ msgid "Stripes 1:1 white" -#~ msgstr "Полосы белые 1:1" - -#~ msgid "Stripes 1:1.5" -#~ msgstr "Полосы 1:1.5" - -#~ msgid "Stripes 1:1.5 white" -#~ msgstr "Полосы белые 1:1.5" - -#~ msgid "Stripes 1:2" -#~ msgstr "Полосы 1:2" - -#~ msgid "Stripes 1:2 white" -#~ msgstr "Полосы белые 1:2" - -#~ msgid "Stripes 1:3" -#~ msgstr "Полосы 1:3" - -#~ msgid "Stripes 1:3 white" -#~ msgstr "Полосы белые 1:3" - -#~ msgid "Stripes 1:4" -#~ msgstr "Полосы 1:4" - -#~ msgid "Stripes 1:4 white" -#~ msgstr "Полосы белые 1:4" - -#~ msgid "Stripes 1:5" -#~ msgstr "Полосы 1:5" - -#~ msgid "Stripes 1:5 white" -#~ msgstr "Полосы белые 1:5" - -#~ msgid "Stripes 1:8" -#~ msgstr "Полосы 1:8" +#~ msgid "Extrapolated" +#~ msgstr "Интерполяция" -#~ msgid "Stripes 1:8 white" -#~ msgstr "Полосы белые 1:8" - -#~ msgid "Stripes 1:10" -#~ msgstr "Полосы 1:10" - -#~ msgid "Stripes 1:10 white" -#~ msgstr "Полосы белые 1:10" - -#~ msgid "Stripes 1:16" -#~ msgstr "Полосы 1:16" - -#~ msgid "Stripes 1:16 white" -#~ msgstr "Полосы белые 1:16" - -#~ msgid "Stripes 1:32" -#~ msgstr "Полосы 1:32" - -#~ msgid "Stripes 1:32 white" -#~ msgstr "Полосы белые 1:32" - -#~ msgid "Stripes 1:64" -#~ msgstr "Полосы 1:64" - -#~ msgid "Stripes 2:1" -#~ msgstr "Полосы 2:1" - -#~ msgid "Stripes 2:1 white" -#~ msgstr "Полосы белые 2:1" - -#~ msgid "Stripes 4:1" -#~ msgstr "Полосы 4:1" - -#~ msgid "Stripes 4:1 white" -#~ msgstr "Полосы белые 4:1" - -#~ msgid "Checkerboard" -#~ msgstr "Шахматная доска" - -#~ msgid "Checkerboard white" -#~ msgstr "Шахматная доска белая" - -#~ msgid "Packed circles" -#~ msgstr "Упакованные круги" - -#~ msgid "Polka dots, small" -#~ msgstr "Горошек мелкий" - -#~ msgid "Polka dots, small white" -#~ msgstr "Горошек мелкий белый" - -#~ msgid "Polka dots, medium" -#~ msgstr "Горошек средний" - -#~ msgid "Polka dots, medium white" -#~ msgstr "Горошек средний белый" - -#~ msgid "Polka dots, large" -#~ msgstr "Горошек крупный" - -#~ msgid "Polka dots, large white" -#~ msgstr "Горошек крупный белый" - -#~ msgid "Wavy" -#~ msgstr "Волна" - -#~ msgid "Wavy white" -#~ msgstr "Волна белая" - -#~ msgid "Camouflage" -#~ msgstr "Камуфляж" - -#~ msgid "Ermine" -#~ msgstr "Горностай" - -#~ msgid "Sand (bitmap)" -#~ msgstr "Песок (растровая текстура)" - -#~ msgid "Cloth (bitmap)" -#~ msgstr "Ткань (растровая текстура)" +#, fuzzy +#~ msgid "Set Resolution" +#~ msgstr "Разрешение:" -#~ msgid "Old paint (bitmap)" -#~ msgstr "Старая краска (растровая текстура)" +#, fuzzy +#~ msgid "Set filter resolution" +#~ msgstr "Разрешение для экспорта:" #~ msgid "<b>Flowed text</b> (%d character%s)" #~ msgid_plural "<b>Flowed text</b> (%d characters%s)" -- cgit v1.2.3 From 29bc0cf6c0396b81b11c84453b5bff7548caa57f Mon Sep 17 00:00:00 2001 From: Alvin Penner <penner@vaxxine.com> Date: Sun, 12 Oct 2014 18:48:49 -0400 Subject: improve precision of viewBox in mm (bzr r13605) --- share/ui/units.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/ui/units.xml b/share/ui/units.xml index 69d78565d..872b511d7 100644 --- a/share/ui/units.xml +++ b/share/ui/units.xml @@ -39,21 +39,21 @@ <name>millimeter</name> <plural>millimeters</plural> <abbr>mm</abbr> - <factor>3.543307</factor> + <factor>3.5433071</factor> <description>Millimeters (25.4 mm/in)</description> </unit> <unit type="LINEAR" pri="n"> <name>centimeter</name> <plural>centimeters</plural> <abbr>cm</abbr> - <factor>35.43307</factor> + <factor>35.433071</factor> <description>Centimeters (10 mm/cm)</description> </unit> <unit type="LINEAR" pri="n"> <name>meter</name> <plural>meters</plural> <abbr>m</abbr> - <factor>3543.307</factor> + <factor>3543.3071</factor> <description>Meters (100 cm/m)</description> </unit> <unit type="LINEAR" pri="n"> -- cgit v1.2.3 From 932ab442403e4007b7dfb8e4c587e5d979379df1 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Mon, 13 Oct 2014 10:05:35 +0200 Subject: Fix: "Forming reference to null pointer" (bzr r13606) --- src/style-internal.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/style-internal.cpp b/src/style-internal.cpp index a55a11403..f8a4a43f7 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -981,7 +981,16 @@ SPIPaint::read( gchar const *str ) { if (streq(str, "currentColor")) { set = true; currentcolor = true; - setColor( style->color.value.color ); + if (style) { + setColor( style->color.value.color ); + } else { + // Normally an SPIPaint is part of an SPStyle and the value of 'color' is + // available. SPIPaint can be used 'stand-alone' (e.g. to parse color values) in + // which case a value of 'currentColor' is meaningless, thus we shouldn't reach + // here. + std::cerr << "SPIPaint::read(): value is 'currentColor' but 'color' not available." << std::endl; + setColor( 0 ); + } } else if (streq(str, "none")) { set = true; noneSet = true; -- cgit v1.2.3 From fd587105dcf2e883a6712013b7ea7ce6e3b3b11d Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Mon, 13 Oct 2014 10:21:07 +0200 Subject: Fix "Called C++ object pointer is null" (bzr r13607) --- src/style-internal.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/style-internal.cpp b/src/style-internal.cpp index f8a4a43f7..a81a2799d 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -1405,11 +1405,20 @@ SPIFilter::read( gchar const *str ) { set = true; // Create href if not already done. - if (!href && style->object) { - href = new SPFilterReference(style->object); - href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_filter_ref_changed), style)); + if (!href) { + if (style->object) { + href = new SPFilterReference(style->object); + } + // Do we have href now? + if ( href ) { + href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_filter_ref_changed), style)); + } else { + std::cerr << "SPIFilter::read(): Could not allocate 'href'" << std::endl; + return; + } } + // We have href try { href->attach(Inkscape::URI(uri)); } catch (Inkscape::BadURIException &e) { -- cgit v1.2.3 From 25f2a039c44b34fce5f0f4eb84259c4c1755aa62 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Mon, 13 Oct 2014 10:50:39 +0200 Subject: Fix multiple: "Called C++ object pointer is null" (bzr r13608) --- src/widgets/stroke-style.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 0e0a4fd72..9c8d45908 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -763,6 +763,9 @@ StrokeStyle::setJoinType (unsigned const jointype) tb = joinBevel; break; default: + // Should not happen + std::cerr << "StrokeStyle::setJoinType(): Invalid value" << std::endl; + tb = joinMiter; break; } setJoinButtons(tb); @@ -786,6 +789,9 @@ StrokeStyle::setCapType (unsigned const captype) tb = capSquare; break; default: + // Should not happen + std::cerr << "StrokeStyle::setCapType(): Invalid value" << std::endl; + tb = capButt; break; } setCapButtons(tb); -- cgit v1.2.3 From a2c47e60a02938013ab913bfee2ef9c9fa5ea870 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Mon, 13 Oct 2014 11:11:01 +0200 Subject: Fixed: "Called C++ object pointer is null" (bzr r13609) --- src/ui/dialog/clonetiler.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index e5f18216c..9b67132c0 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -2235,7 +2235,11 @@ void CloneTiler::clonetiler_apply(GtkWidget */*widget*/, GtkWidget *dlg) gdk_window_process_all_updates(); SPObject *obj = selection->singleItem(); - SPItem *item = SP_IS_ITEM(obj) ? SP_ITEM(obj) : 0; + if (!obj) { + // Should never happen (empty selection checked above). + std::cerr << "CloneTiler::clonetile_apply(): No object in single item selection!!!" << std::endl; + return; + } Inkscape::XML::Node *obj_repr = obj->getRepr(); const char *id_href = g_strdup_printf("#%s", obj_repr->attribute("id")); SPObject *parent = obj->parent; @@ -2326,6 +2330,7 @@ void CloneTiler::clonetiler_apply(GtkWidget */*widget*/, GtkWidget *dlg) bool invert_picked = prefs->getBool(prefs_path + "invert_picked"); double gamma_picked = prefs->getDoubleLimited(prefs_path + "gamma_picked", 0, -10, 10); + SPItem *item = SP_IS_ITEM(obj) ? SP_ITEM(obj) : 0; if (dotrace) { clonetiler_trace_setup (sp_desktop_document(desktop), 1.0, item); } -- cgit v1.2.3 From 9c35de31702bb501f596555d347e9db76b248f14 Mon Sep 17 00:00:00 2001 From: Bryce Harrington <bryce@bryceharrington.org> Date: Mon, 13 Oct 2014 19:33:59 -0700 Subject: 2geom: Re-fix IS_NAN and IS_FINITE for solaris This patch should go upstream to 2geom... (bzr r13610) --- src/2geom/math-utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/2geom/math-utils.h b/src/2geom/math-utils.h index 83c7b4f5e..0d5d3667b 100644 --- a/src/2geom/math-utils.h +++ b/src/2geom/math-utils.h @@ -111,7 +111,7 @@ inline void sincos(double angle, double &sin_, double &cos_) { # define IS_NAN(_a) (_isnan(_a)) /* Win32 definition */ #elif defined(isnan) || defined(__FreeBSD__) || defined(__osf__) # define IS_NAN(_a) (isnan(_a)) /* GNU definition */ -#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2 +#elif defined (SOLARIS) # define IS_NAN(_a) (isnan(_a)) /* GNU definition */ #else # define IS_NAN(_a) (boost::math::isnan(_a)) @@ -129,7 +129,7 @@ inline void sincos(double angle, double &sin_, double &cos_) { # define IS_FINITE(_a) (isfinite(_a)) #elif defined(__osf__) # define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a)) -#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2 +#elif defined (SOLARIS) #include <ieeefp.h> #define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a)) #else -- cgit v1.2.3 From 35153b45814dcc844213951352f410b2fc13e2ad Mon Sep 17 00:00:00 2001 From: Bryce Harrington <bryce@bryceharrington.org> Date: Mon, 13 Oct 2014 20:49:44 -0700 Subject: Fix crash with GTK+ 3.14 on launch Patch from Liam to check for undefined desktop during startup. ** (inkscape:57708): CRITICAL **: SPCanvas* sp_desktop_canvas(const SPDesktop*): assertion 'desktop != NULL' failed Fixes: https://bugs.launchpad.net/inkscape/+bug/1375085 Fixed bugs: - https://launchpad.net/bugs/1375085 (bzr r13611) --- src/ui/widget/selected-style.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index f01366e19..a575dd592 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -1199,7 +1199,9 @@ void SelectedStyle::on_opacity_menu (Gtk::Menu *menu) { menu->show_all(); } -void SelectedStyle::on_opacity_changed () { +void SelectedStyle::on_opacity_changed () +{ + g_return_if_fail(_desktop); // TODO this shouldn't happen! if (_opacity_blocked) return; _opacity_blocked = true; -- cgit v1.2.3 From 703ddb77480e2e7ddeda21aa3b7d9a91ff8f23d2 Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 11:26:38 +0200 Subject: Merged src/display folder from svg-paints-support branch (bzr r13611.1.1) --- src/display/CMakeLists.txt | 2 + src/display/Makefile_insert | 2 + src/display/drawing-item.cpp | 45 ++++++++++ src/display/drawing-item.h | 9 +- src/display/drawing-pattern.cpp | 195 ++++++++++++++++++++++++++++++++++++++++ src/display/drawing-pattern.h | 88 ++++++++++++++++++ src/display/drawing-shape.cpp | 8 +- src/display/drawing-text.cpp | 8 +- src/display/nr-style.cpp | 78 +++++++++++----- src/display/nr-style.h | 9 +- src/sp-paint-server.cpp | 5 ++ src/sp-paint-server.h | 1 + 12 files changed, 415 insertions(+), 35 deletions(-) create mode 100644 src/display/drawing-pattern.cpp create mode 100644 src/display/drawing-pattern.h diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 20424c845..800c4d0d4 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -13,6 +13,7 @@ set(display_SRC drawing-group.cpp drawing-image.cpp drawing-item.cpp + drawing-pattern.cpp drawing-shape.cpp drawing-surface.cpp drawing-text.cpp @@ -75,6 +76,7 @@ set(display_SRC drawing-group.h drawing-image.h drawing-item.h + drawing-pattern.h drawing-shape.h drawing-surface.h drawing-text.h diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index abbd89a68..2355c3653 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -33,6 +33,8 @@ ink_common_sources += \ display/drawing-image.h \ display/drawing-item.cpp \ display/drawing-item.h \ + display/drawing-pattern.cpp \ + display/drawing-pattern.h \ display/drawing-shape.cpp \ display/drawing-shape.h \ display/drawing-surface.cpp \ diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp index 2ea3641dc..5226edda3 100644 --- a/src/display/drawing-item.cpp +++ b/src/display/drawing-item.cpp @@ -16,6 +16,7 @@ #include "display/drawing-context.h" #include "display/drawing-item.h" #include "display/drawing-group.h" +#include "display/drawing-pattern.h" #include "display/drawing-surface.h" #include "nr-filter.h" #include "preferences.h" @@ -110,6 +111,8 @@ DrawingItem::DrawingItem(Drawing &drawing) , _transform(NULL) , _clip(NULL) , _mask(NULL) + , _fill_pattern(NULL) + , _stroke_pattern(NULL) , _filter(NULL) , _user_data(NULL) , _cache(NULL) @@ -164,6 +167,12 @@ DrawingItem::~DrawingItem() case CHILD_ROOT: _drawing._root = NULL; break; + case CHILD_FILL_PATTERN: + _parent->_fill_pattern = NULL; + break; + case CHILD_STROKE_PATTERN: + _parent->_stroke_pattern = NULL; + break; default: ; } @@ -172,6 +181,8 @@ DrawingItem::~DrawingItem() } clearChildren(); delete _transform; + delete _stroke_pattern; + delete _fill_pattern; delete _clip; delete _mask; delete _filter; @@ -366,6 +377,34 @@ DrawingItem::setMask(DrawingItem *item) _markForUpdate(STATE_ALL, true); } +void +DrawingItem::setFillPattern(DrawingPattern *pattern) +{ + _markForRendering(); + delete _fill_pattern; + _fill_pattern = pattern; + if (pattern) { + pattern->_parent = this; + assert(pattern->_child_type == CHILD_ORPHAN); + pattern->_child_type = CHILD_FILL_PATTERN; + } + _markForUpdate(STATE_ALL, true); +} + +void +DrawingItem::setStrokePattern(DrawingPattern *pattern) +{ + _markForRendering(); + delete _stroke_pattern; + _stroke_pattern = pattern; + if (pattern) { + pattern->_parent = this; + assert(pattern->_child_type == CHILD_ORPHAN); + pattern->_child_type = CHILD_STROKE_PATTERN; + } + _markForUpdate(STATE_ALL, true); +} + /// Move this item to the given place in the Z order of siblings. /// Does nothing if the item has no parent. void @@ -530,6 +569,12 @@ DrawingItem::update(Geom::IntRect const &area, UpdateContext const &ctx, unsigne if (to_update & STATE_RENDER) { // now that we know drawbox, dirty the corresponding rect on canvas // unless filtered, groups do not need to render by themselves, only their members + if (_fill_pattern) { + _fill_pattern->update(area, child_ctx, flags, reset); + } + if (_stroke_pattern) { + _stroke_pattern->update(area, child_ctx, flags, reset); + } if (!is_drawing_group(this) || (_filter && render_filters)) { _markForRendering(); } diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h index 925bcbddb..c0c6e321e 100644 --- a/src/display/drawing-item.h +++ b/src/display/drawing-item.h @@ -28,6 +28,7 @@ class Drawing; class DrawingCache; class DrawingContext; class DrawingItem; +class DrawingPattern; namespace Filters { @@ -114,6 +115,8 @@ public: void setTransform(Geom::Affine const &trans); void setClip(DrawingItem *item); void setMask(DrawingItem *item); + void setFillPattern(DrawingPattern *pattern); + void setStrokePattern(DrawingPattern *pattern); void setZOrder(unsigned z); void setItemBounds(Geom::OptRect const &bounds); void setFilterBounds(Geom::OptRect const &bounds); @@ -135,8 +138,8 @@ protected: CHILD_CLIP = 2, // referenced by _clip member of parent CHILD_MASK = 3, // referenced by _mask member of parent CHILD_ROOT = 4, // root item of _drawing - CHILD_FILL_PATTERN = 5, // not yet implemented: referenced by fill pattern of parent - CHILD_STROKE_PATTERN = 6 // not yet implemented: referenced by stroke pattern of parent + CHILD_FILL_PATTERN = 5, // referenced by fill pattern of parent + CHILD_STROKE_PATTERN = 6 // referenced by stroke pattern of parent }; enum RenderResult { RENDER_OK = 0, @@ -185,6 +188,8 @@ protected: DrawingItem *_clip; DrawingItem *_mask; + DrawingPattern *_fill_pattern; + DrawingPattern *_stroke_pattern; Inkscape::Filters::Filter *_filter; void *_user_data; ///< Used to associate DrawingItems with SPItems that created them DrawingCache *_cache; diff --git a/src/display/drawing-pattern.cpp b/src/display/drawing-pattern.cpp new file mode 100644 index 000000000..77752bce3 --- /dev/null +++ b/src/display/drawing-pattern.cpp @@ -0,0 +1,195 @@ +/** + * @file + * Canvas belonging to SVG pattern. + *//* + * Authors: + * Tomasz Boczkowski <penginsbacon@gmail.com> + * + * Copyright (C) 2014 Authors + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "display/cairo-utils.h" +#include "display/drawing-context.h" +#include "display/drawing-pattern.h" +#include "display/drawing-surface.h" + +namespace Inkscape { + +DrawingPattern::DrawingPattern(Drawing &drawing, bool debug) + : DrawingGroup(drawing) + , _pattern_to_user(NULL) + , _overflow_steps(1) + , _debug(debug) +{ +} + +DrawingPattern::~DrawingPattern() +{ + delete _pattern_to_user; // delete NULL; is safe +} + +void +DrawingPattern::setPatternToUserTransform(Geom::Affine const &new_trans) { + Geom::Affine current; + if (_pattern_to_user) { + current = *_pattern_to_user; + } + + if (!Geom::are_near(current, new_trans, 1e-18)) { + // mark the area where the object was for redraw. + _markForRendering(); + if (new_trans.isIdentity()) { + delete _pattern_to_user; // delete NULL; is safe + _pattern_to_user = NULL; + } else { + _pattern_to_user = new Geom::Affine(new_trans); + } + _markForUpdate(STATE_ALL, true); + } +} + +void +DrawingPattern::setTileRect(Geom::Rect const &tile_rect) { + _tile_rect = tile_rect; +} + +void +DrawingPattern::setOverflow(Geom::Affine initial_transform, int steps, Geom::Affine step_transform) { + _overflow_initial_transform = initial_transform; + _overflow_steps = steps; + _overflow_step_transform = step_transform; +} + +cairo_pattern_t * +DrawingPattern::renderPattern(float opacity) { + bool needs_opacity = (1.0 - opacity) >= 1e-3; + bool visible = opacity >= 1e-3; + + if (!visible) { + return NULL; + } + + if (!_tile_rect || (_tile_rect->area() == 0)) { + return NULL; + } + Geom::Rect pattern_tile = *_tile_rect; + + //TODO: If pattern_to_user set it to identity transform + + // The DrawingSurface class handles the mapping from "logical space" + // (coordinates in the rendering) to "physical space" (surface pixels). + // An oversampling is done as the pattern may not pixel align with the final surface. + // The cairo surface is created when the DrawingContext is declared. + // Create drawing surface with size of pattern tile (in pattern space) but with number of pixels + // based on required resolution (c). + Inkscape::DrawingSurface pattern_surface(pattern_tile, _pattern_resolution); + Inkscape::DrawingContext dc(pattern_surface); + dc.transform( pattern_surface.drawingTransform().inverse() ); + + pattern_tile *= pattern_surface.drawingTransform(); + Geom::IntRect one_tile = pattern_tile.roundOutwards(); + + // Render pattern. + if (needs_opacity) { + dc.pushGroup(); // this group is for pattern + opacity + } + + if (_debug) { + dc.setSource(0.8, 0.0, 0.8); + dc.paint(); + } + + //FIXME: What flags to choose? + if (_overflow_steps == 1) { + render(dc, one_tile, RENDER_DEFAULT); + } else { + //Overflow transforms need to be transformed to the new coordinate system + //introduced by dc.transform( pattern_surface.drawingTransform().inverse() ); + Geom::Affine dt = pattern_surface.drawingTransform(); + Geom::Affine idt = pattern_surface.drawingTransform().inverse(); + Geom::Affine initial_transform = idt * _overflow_initial_transform * dt; + Geom::Affine step_transform = idt * _overflow_step_transform * dt; + + dc.transform(initial_transform); + for (int i = 0; i < _overflow_steps; i++) { + render(dc, one_tile, RENDER_DEFAULT); + dc.transform(step_transform); + } + } + + //Uncomment to debug + // cairo_surface_t* raw = pattern_surface.raw(); + // std::cout << " cairo_surface (sp-pattern): " + // << " width: " << cairo_image_surface_get_width( raw ) + // << " height: " << cairo_image_surface_get_height( raw ) + // << std::endl; + // std::string filename = "drawing-pattern.png"; + // cairo_surface_write_to_png( pattern_surface.raw(), filename.c_str() ); + + if (needs_opacity) { + dc.popGroupToSource(); // pop raw pattern + dc.paint(opacity); // apply opacity + } + + cairo_pattern_t *cp = cairo_pattern_create_for_surface(pattern_surface.raw()); + // Apply transformation to user space. Also compensate for oversampling. + if (_pattern_to_user) { + ink_cairo_pattern_set_matrix(cp, _pattern_to_user->inverse() * pattern_surface.drawingTransform()); + } else { + ink_cairo_pattern_set_matrix(cp, pattern_surface.drawingTransform()); + } + + if (_debug) { + cairo_pattern_set_extend(cp, CAIRO_EXTEND_NONE); + } else { + cairo_pattern_set_extend(cp, CAIRO_EXTEND_REPEAT); + } + + return cp; +} + +unsigned +DrawingPattern::_updateItem(Geom::IntRect const &area, UpdateContext const &ctx, unsigned flags, unsigned reset) +{ + UpdateContext pattern_ctx; + + if (!_tile_rect || (_tile_rect->area() == 0)) { + return STATE_NONE; + } + + Geom::Rect pattern_tile = *_tile_rect; + + Geom::Coord det_ctm = ctx.ctm.descrim(); + Geom::Coord det_ps2user = _pattern_to_user ? _pattern_to_user->descrim() : 1.0; + Geom::Coord det_child_transform = _child_transform ? _child_transform->descrim() : 1.0; + const double oversampling = 2.0; + double scale = det_ctm*det_ps2user*det_child_transform * oversampling; + //FIXME: When scale is too big (zooming in a hatch), cairo doesn't render the pattern + //More precisely it fails when seting pattern matrix in DrawingPattern::renderPattern + //Fully correct solution should make use of visible area bbox and change hach tile rect + //accordingly + if (scale > 25) { + scale = 25; + } + Geom::Point c(pattern_tile.dimensions()*scale*oversampling); + _pattern_resolution = c.ceil(); + + Inkscape::DrawingSurface pattern_surface(pattern_tile, _pattern_resolution); + + pattern_ctx.ctm = pattern_surface.drawingTransform(); + return DrawingGroup::_updateItem(Geom::IntRect::infinite(), pattern_ctx, flags, reset); +} + +} // end namespace Inkscape + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/display/drawing-pattern.h b/src/display/drawing-pattern.h new file mode 100644 index 000000000..487da51b7 --- /dev/null +++ b/src/display/drawing-pattern.h @@ -0,0 +1,88 @@ +/** + * @file + * Canvas belonging to SVG pattern. + *//* + * Authors: + * Tomasz Boczkowski <penginsbacon@gmail.com> + * + * Copyright (C) 2014 Authors + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifndef SEEN_INKSCAPE_DISPLAY_DRAWING_PATTERN_H +#define SEEN_INKSCAPE_DISPLAY_DRAWING_PATTERN_H + +#include "display/drawing-group.h" + +typedef struct _cairo_pattern cairo_pattern_t; +class SPStyle; + +namespace Inkscape { + +/** + * @brief Drawing tree node used for rendering paints. + * + * DrawingPattern is used for rendering patterns and hatches. + * + * It renders it's children to a cairo_pattern_t structure that can be + * applied as source for fill or stroke operations. + */ +class DrawingPattern + : public DrawingGroup +{ +public: + DrawingPattern(Drawing &drawing, bool debug = false); + ~DrawingPattern(); + + /** + * Set the transformation from pattern to user coordinate systems. + * @see SPPattern description for explanation of coordinate systems. + */ + void setPatternToUserTransform(Geom::Affine const &new_trans); + /** + * Set the tile rect position and dimentions in content coordinate system + */ + void setTileRect(Geom::Rect const &tile_rect); + /** + * Turn on overflow rendering. + * + * Overflow is implemented as repeated rendering of pattern contents. In every step + * a translation transform is applied. + */ + void setOverflow(Geom::Affine initial_transform, int steps, Geom::Affine step_transform); + /** + * Render the pattern. + * + * Returns caito_pattern_t structure that can be set as source surface. + */ + cairo_pattern_t *renderPattern(float opacity); +protected: + virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, + unsigned flags, unsigned reset); + + Geom::Affine *_pattern_to_user; + Geom::Affine _overflow_initial_transform; + Geom::Affine _overflow_step_transform; + int _overflow_steps; + Geom::OptRect _tile_rect; + bool _debug; + + Geom::IntPoint _pattern_resolution; +}; + +bool is_drawing_group(DrawingItem *item); + +} // end namespace Inkscape + +#endif // !SEEN_INKSCAPE_DISPLAY_DRAWING_PATTERN_H + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp index 1a41bdb3a..fe525b1a5 100644 --- a/src/display/drawing-shape.cpp +++ b/src/display/drawing-shape.cpp @@ -155,7 +155,7 @@ DrawingShape::_renderFill(DrawingContext &dc) Inkscape::DrawingContext::Save save(dc); dc.transform(_ctm); - bool has_fill = _nrstyle.prepareFill(dc, _item_bbox); + bool has_fill = _nrstyle.prepareFill(dc, _item_bbox, _fill_pattern); if( has_fill ) { dc.path(_curve->get_pathvector()); @@ -171,7 +171,7 @@ DrawingShape::_renderStroke(DrawingContext &dc) Inkscape::DrawingContext::Save save(dc); dc.transform(_ctm); - bool has_stroke = _nrstyle.prepareStroke(dc, _item_bbox); + bool has_stroke = _nrstyle.prepareStroke(dc, _item_bbox, _stroke_pattern); has_stroke &= (_nrstyle.stroke_width != 0); if( has_stroke ) { @@ -231,8 +231,8 @@ DrawingShape::_renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigne // update fill and stroke paints. // this cannot be done during nr_arena_shape_update, because we need a Cairo context // to render svg:pattern - bool has_fill = _nrstyle.prepareFill(dc, _item_bbox); - bool has_stroke = _nrstyle.prepareStroke(dc, _item_bbox); + bool has_fill = _nrstyle.prepareFill(dc, _item_bbox, _fill_pattern); + bool has_stroke = _nrstyle.prepareStroke(dc, _item_bbox, _stroke_pattern); has_stroke &= (_nrstyle.stroke_width != 0); if (has_fill || has_stroke) { diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp index 9f3b447df..cb6520bcd 100644 --- a/src/display/drawing-text.cpp +++ b/src/display/drawing-text.cpp @@ -445,13 +445,13 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are Inkscape::DrawingContext::Save save(dc); dc.transform(_ctm); - has_fill = _nrstyle.prepareFill( dc, _item_bbox); - has_stroke = _nrstyle.prepareStroke( dc, _item_bbox); + has_fill = _nrstyle.prepareFill( dc, _item_bbox, _fill_pattern); + has_stroke = _nrstyle.prepareStroke( dc, _item_bbox, _stroke_pattern); // Avoid creating patterns if not needed if( decorate ) { - has_td_fill = _nrstyle.prepareTextDecorationFill( dc, _item_bbox); - has_td_stroke = _nrstyle.prepareTextDecorationStroke(dc, _item_bbox); + has_td_fill = _nrstyle.prepareTextDecorationFill( dc, _item_bbox, _fill_pattern); + has_td_stroke = _nrstyle.prepareTextDecorationStroke(dc, _item_bbox, _stroke_pattern); } } diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp index ec3117079..96d16bf06 100644 --- a/src/display/nr-style.cpp +++ b/src/display/nr-style.cpp @@ -14,6 +14,7 @@ #include "sp-paint-server.h" #include "display/canvas-bpath.h" // contains SPStrokeJoinType, SPStrokeCapType etc. (WTF!) #include "display/drawing-context.h" +#include "display/drawing-pattern.h" void NRStyle::Paint::clear() { @@ -95,7 +96,14 @@ NRStyle::~NRStyle() void NRStyle::set(SPStyle *style) { if ( style->fill.isPaintserver() ) { - fill.set(style->getFillPaintServer()); + SPPaintServer* server = style->getFillPaintServer(); + if ( server && server->isValid() ) { + fill.set(server); + } else if ( style->fill.colorSet ) { + fill.set(style->fill.value.color); + } else { + fill.clear(); + } } else if ( style->fill.isColor() ) { fill.set(style->fill.value.color); } else if ( style->fill.isNone() ) { @@ -117,7 +125,14 @@ void NRStyle::set(SPStyle *style) } if ( style->stroke.isPaintserver() ) { - stroke.set(style->getStrokePaintServer()); + SPPaintServer* server = style->getStrokePaintServer(); + if ( server && server->isValid() ) { + stroke.set(server); + } else if ( style->stroke.isColor() ) { + stroke.set(style->stroke.colorSet); + } else { + stroke.clear(); + } } else if ( style->stroke.isColor() ) { stroke.set(style->stroke.value.color); } else if ( style->stroke.isNone() ) { @@ -285,13 +300,16 @@ void NRStyle::set(SPStyle *style) update(); } -bool NRStyle::prepareFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox) +bool NRStyle::prepareFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox, Inkscape::DrawingPattern *pattern) { // update fill pattern if (!fill_pattern) { switch (fill.type) { - case PAINT_SERVER: { - fill_pattern = fill.server->pattern_new(dc.raw(), paintbox, fill.opacity); + case PAINT_SERVER: + if (pattern) { + fill_pattern = pattern->renderPattern(fill.opacity); + } else { + fill_pattern = fill.server->pattern_new(dc.raw(), paintbox, fill.opacity); } break; case PAINT_COLOR: { SPColor const &c = fill.color; @@ -311,14 +329,20 @@ void NRStyle::applyFill(Inkscape::DrawingContext &dc) dc.setFillRule(fill_rule); } -bool NRStyle::prepareTextDecorationFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox) +bool NRStyle::prepareTextDecorationFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox, Inkscape::DrawingPattern *pattern) { // update text decoration pattern if (!text_decoration_fill_pattern) { switch (text_decoration_fill.type) { - case PAINT_SERVER: { - text_decoration_fill_pattern = text_decoration_fill.server->pattern_new(dc.raw(), paintbox, text_decoration_fill.opacity); - } break; + case PAINT_SERVER: + if (pattern) { + text_decoration_fill_pattern = pattern->renderPattern( + text_decoration_fill.opacity); + } else { + text_decoration_fill_pattern = text_decoration_fill.server->pattern_new(dc.raw(), + paintbox, text_decoration_fill.opacity); + } + break; case PAINT_COLOR: { SPColor const &c = text_decoration_fill.color; text_decoration_fill_pattern = cairo_pattern_create_rgba( @@ -337,19 +361,25 @@ void NRStyle::applyTextDecorationFill(Inkscape::DrawingContext &dc) // Fill rule does not matter, no intersections. } -bool NRStyle::prepareStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox) +bool NRStyle::prepareStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox, Inkscape::DrawingPattern *pattern) { if (!stroke_pattern) { switch (stroke.type) { - case PAINT_SERVER: { - stroke_pattern = stroke.server->pattern_new(dc.raw(), paintbox, stroke.opacity); - } break; + case PAINT_SERVER: + if (pattern) { + stroke_pattern = pattern->renderPattern(stroke.opacity); + } else { + stroke_pattern = stroke.server->pattern_new(dc.raw(), paintbox, stroke.opacity); + } + break; case PAINT_COLOR: { SPColor const &c = stroke.color; - stroke_pattern = cairo_pattern_create_rgba( - c.v.c[0], c.v.c[1], c.v.c[2], stroke.opacity); - } break; - default: break; + stroke_pattern = cairo_pattern_create_rgba(c.v.c[0], c.v.c[1], c.v.c[2], + stroke.opacity); + } + break; + default: + break; } } if (!stroke_pattern) return false; @@ -366,13 +396,19 @@ void NRStyle::applyStroke(Inkscape::DrawingContext &dc) cairo_set_dash(dc.raw(), dash, n_dash, dash_offset); // fixme } -bool NRStyle::prepareTextDecorationStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox) +bool NRStyle::prepareTextDecorationStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox, Inkscape::DrawingPattern *pattern) { if (!text_decoration_stroke_pattern) { switch (text_decoration_stroke.type) { - case PAINT_SERVER: { - text_decoration_stroke_pattern = text_decoration_stroke.server->pattern_new(dc.raw(), paintbox, text_decoration_stroke.opacity); - } break; + case PAINT_SERVER: + if (pattern) { + text_decoration_stroke_pattern = pattern->renderPattern( + text_decoration_stroke.opacity); + } else { + text_decoration_stroke_pattern = text_decoration_stroke.server->pattern_new( + dc.raw(), paintbox, text_decoration_stroke.opacity); + } + break; case PAINT_COLOR: { SPColor const &c = text_decoration_stroke.color; text_decoration_stroke_pattern = cairo_pattern_create_rgba( diff --git a/src/display/nr-style.h b/src/display/nr-style.h index 83bcb1ab7..f324fdb56 100644 --- a/src/display/nr-style.h +++ b/src/display/nr-style.h @@ -21,6 +21,7 @@ class SPStyle; namespace Inkscape { class DrawingContext; +class DrawingPattern; } struct NRStyle { @@ -28,10 +29,10 @@ struct NRStyle { ~NRStyle(); void set(SPStyle *); - bool prepareFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox); - bool prepareStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox); - bool prepareTextDecorationFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox); - bool prepareTextDecorationStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox); + bool prepareFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox, Inkscape::DrawingPattern *pattern); + bool prepareStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox, Inkscape::DrawingPattern *pattern); + bool prepareTextDecorationFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox, Inkscape::DrawingPattern *pattern); + bool prepareTextDecorationStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox, Inkscape::DrawingPattern *pattern); void applyFill(Inkscape::DrawingContext &dc); void applyStroke(Inkscape::DrawingContext &dc); void applyTextDecorationFill(Inkscape::DrawingContext &dc); diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp index 692265bd8..d692fc611 100644 --- a/src/sp-paint-server.cpp +++ b/src/sp-paint-server.cpp @@ -58,6 +58,11 @@ bool SPPaintServer::isSolid() const return solid; } +bool SPPaintServer::isValid() const +{ + return true; +} + /* Local Variables: mode:c++ diff --git a/src/sp-paint-server.h b/src/sp-paint-server.h index 02e2f10ec..c1c8d651e 100644 --- a/src/sp-paint-server.h +++ b/src/sp-paint-server.h @@ -29,6 +29,7 @@ public: bool isSwatch() const; bool isSolid() const; + virtual bool isValid() const; virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) = 0; -- cgit v1.2.3 From b7dc999f9754c4a2c139d4fafd49b3bed1c063a3 Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 11:44:36 +0200 Subject: Merged src/style.h from svg-paints-support branch (bzr r13611.1.2) --- src/style.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/style.h b/src/style.h index 3627b4ec2..267398693 100644 --- a/src/style.h +++ b/src/style.h @@ -243,6 +243,11 @@ public: sigc::connection filter_modified_connection; sigc::connection fill_ps_modified_connection; sigc::connection stroke_ps_modified_connection; + sigc::connection fill_ps_changed_connection; + sigc::connection stroke_ps_changed_connection; + + sigc::signal<void, SPObject *, SPObject *> signal_fill_ps_changed; + sigc::signal<void, SPObject *, SPObject *> signal_stroke_ps_changed; SPObject *getFilter() { return (filter.href) ? filter.href->getObject() : NULL; } SPObject const *getFilter() const { return (filter.href) ? filter.href->getObject() : NULL; } -- cgit v1.2.3 From 5b12691684dfd3cb640aa26d5ea90ac4d5173485 Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 11:45:29 +0200 Subject: Merged src/style.h from svg-paints-support branch (bzr r13611.1.3) --- src/style.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/style.h b/src/style.h index 267398693..cb7597918 100644 --- a/src/style.h +++ b/src/style.h @@ -246,7 +246,18 @@ public: sigc::connection fill_ps_changed_connection; sigc::connection stroke_ps_changed_connection; + /** + * Emitted when paint server object, fill paint refers to, is changed. That is + * when the reference starts pointing to a different address in memory. + * + * NB It is different from fill_ps_modified signal. When paint server is modified + * it means some of it's attributes or chilren change. + */ sigc::signal<void, SPObject *, SPObject *> signal_fill_ps_changed; + /** + * Emitted when paint server object, fill paint refers to, is changed. That is + * when the reference starts pointing to a different address in memory. + */ sigc::signal<void, SPObject *, SPObject *> signal_stroke_ps_changed; SPObject *getFilter() { return (filter.href) ? filter.href->getObject() : NULL; } -- cgit v1.2.3 From ca13fe9ec12404692ecf1a8429023b2e38356b30 Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 11:46:46 +0200 Subject: Merged src/style.cpp from svg-paints-support branch (bzr r13611.1.4) --- src/style.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/style.cpp b/src/style.cpp index abc928d76..c20d7ed70 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -437,6 +437,8 @@ SPStyle::~SPStyle() { // Remove connections release_connection.disconnect(); + fill_ps_changed_connection.disconnect(); + stroke_ps_changed_connection.disconnect(); // The following shoud be moved into SPIPaint and SPIFilter if (fill.value.href) { @@ -496,10 +498,10 @@ SPStyle::clear() { filter.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_filter_ref_changed), this)); fill.value.href = new SPPaintServerReference(document); - fill.value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_fill_paint_server_ref_changed), this)); + fill_ps_changed_connection = fill.value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_fill_paint_server_ref_changed), this)); stroke.value.href = new SPPaintServerReference(document); - stroke.value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_stroke_paint_server_ref_changed), this)); + stroke_ps_changed_connection = stroke.value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_stroke_paint_server_ref_changed), this)); } cloned = false; @@ -1112,6 +1114,7 @@ sp_style_fill_paint_server_ref_changed(SPObject *old_ref, SPObject *ref, SPStyle ref->connectModified(sigc::bind(sigc::ptr_fun(&sp_style_paint_server_ref_modified), style)); } + style->signal_fill_ps_changed.emit(old_ref, ref); sp_style_paint_server_ref_modified(ref, 0, style); } @@ -1129,6 +1132,7 @@ sp_style_stroke_paint_server_ref_changed(SPObject *old_ref, SPObject *ref, SPSty ref->connectModified(sigc::bind(sigc::ptr_fun(&sp_style_paint_server_ref_modified), style)); } + style->signal_stroke_ps_changed.emit(old_ref, ref); sp_style_paint_server_ref_modified(ref, 0, style); } @@ -1357,7 +1361,11 @@ sp_style_set_ipaint_to_uri(SPStyle *style, SPIPaint *paint, const Inkscape::URI // now that we have a document, we can create it here if (!paint->value.href && document) { paint->value.href = new SPPaintServerReference(document); - paint->value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun((paint == &style->fill)? sp_style_fill_paint_server_ref_changed : sp_style_stroke_paint_server_ref_changed), style)); + if (paint == &style->fill) { + style->fill_ps_changed_connection = paint->value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_fill_paint_server_ref_changed), style)); + } else { + style->stroke_ps_changed_connection = paint->value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_stroke_paint_server_ref_changed), style)); + } } if (paint->value.href){ -- cgit v1.2.3 From dc40ef8fd79f61fb7735911744f68657aef05c70 Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 11:48:00 +0200 Subject: Merged src/style-internal.cpp from svg-paints-support branch (bzr r13611.1.5) --- src/style-internal.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/style-internal.cpp b/src/style-internal.cpp index a81a2799d..b858e5cb6 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -964,7 +964,11 @@ SPIPaint::read( gchar const *str ) { if (!value.href && document) { // std::cout << " Creating value.href" << std::endl; value.href = new SPPaintServerReference(document); - value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun((this == &style->fill)? sp_style_fill_paint_server_ref_changed : sp_style_stroke_paint_server_ref_changed), style)); + if (this == &style->fill) { + style->fill_ps_changed_connection = value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_fill_paint_server_ref_changed), style)); + } else { + style->stroke_ps_changed_connection = value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_stroke_paint_server_ref_changed), style)); + } } // std::cout << "uri: " << (uri?uri:"null") << std::endl; -- cgit v1.2.3 From dbf713649843be309496ac4199dd36299911009d Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 12:06:13 +0200 Subject: Merged src/sp-item.h from svg-paints-support branch (bzr r13611.1.6) --- src/sp-item.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sp-item.h b/src/sp-item.h index 15784d041..98aed0fd6 100644 --- a/src/sp-item.h +++ b/src/sp-item.h @@ -33,6 +33,7 @@ class SPClipPathReference; class SPMaskReference; class SPAvoidRef; +class SPPattern; struct SPPrintContext; namespace Inkscape { @@ -236,12 +237,15 @@ private: static SPItemView *sp_item_view_new_prepend(SPItemView *list, SPItem *item, unsigned flags, unsigned key, Inkscape::DrawingItem *arenaitem); static void clip_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item); static void mask_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item); + static void fill_ps_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item); + static void stroke_ps_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item); public: virtual void build(SPDocument *document, Inkscape::XML::Node *repr); virtual void release(); virtual void set(unsigned int key, gchar const* value); virtual void update(SPCtx *ctx, guint flags); + virtual void modified(unsigned int flags); virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags); virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; -- cgit v1.2.3 From b9875e6c09fcb62fa4f9c667ee6a48c8b62f8508 Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 12:06:31 +0200 Subject: Merged src/sp-item.cpp from svg-paints-support branch (bzr r13611.1.7) --- src/sp-item.cpp | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 71cdfa394..edf758e7d 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -118,6 +118,9 @@ SPItem::SPItem() : SPObject() { mask_ref = new SPMaskReference(this); mask_ref->changedSignal().connect(sigc::bind(sigc::ptr_fun(mask_ref_changed), this)); + style->signal_fill_ps_changed.connect(sigc::bind(sigc::ptr_fun(fill_ps_ref_changed), this)); + style->signal_stroke_ps_changed.connect(sigc::bind(sigc::ptr_fun(stroke_ps_ref_changed), this)); + avoidRef = new SPAvoidRef(this); } @@ -442,7 +445,15 @@ void SPItem::release() { SPObject::release(); + SPPattern *fill_pattern = SP_PATTERN(style->getFillPaintServer()); + SPPattern *stroke_pattern = SP_PATTERN(style->getStrokePaintServer()); while (item->display) { + if (fill_pattern) { + fill_pattern->hide(item->display->arenaitem->key()); + } + if (stroke_pattern) { + stroke_pattern->hide(item->display->arenaitem->key()); + } item->display = sp_item_view_list_remove(item->display, item->display); } @@ -588,6 +599,34 @@ void SPItem::mask_ref_changed(SPObject *old_mask, SPObject *mask, SPItem *item) } } +void SPItem::fill_ps_ref_changed(SPObject *old_ps, SPObject *ps, SPItem *item) { + SPPattern *old_fill_pattern = SP_PATTERN(old_ps); + if (old_fill_pattern) { + for (SPItemView *v =item->display; v != NULL; v = v->next) { + old_fill_pattern->hide(v->arenaitem->key()); + } + } + + SPPattern *new_fill_pattern = SP_PATTERN(ps); + if (new_fill_pattern) { + Geom::OptRect bbox = item->geometricBounds(); + for (SPItemView *v = item->display; v != NULL; v = v->next) { + if (!v->arenaitem->key()) { + v->arenaitem->setKey(SPItem::display_key_new(3)); + } + Inkscape::DrawingPattern *pi = new_fill_pattern->show( + v->arenaitem->drawing(), v->arenaitem->key()); + v->arenaitem->setFillPattern(pi); + new_fill_pattern->setBBox(v->arenaitem->key(), bbox); + new_fill_pattern->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + } + } +} + +void SPItem::stroke_ps_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item) { + +} + void SPItem::update(SPCtx* /*ctx*/, guint flags) { SPItem *item = this; SPItem* object = item; @@ -647,6 +686,9 @@ void SPItem::update(SPCtx* /*ctx*/, guint flags) { item->avoidRef->handleSettingChange(); } +void SPItem::modified(unsigned int flags) { +} + Inkscape::XML::Node* SPItem::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { SPItem *item = this; SPItem* object = item; @@ -1090,6 +1132,31 @@ Inkscape::DrawingItem *SPItem::invoke_show(Inkscape::Drawing &drawing, unsigned SP_MASK(mask)->sp_mask_set_bbox(mask_key, item_bbox); mask->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } + + SPPattern *fill_pattern = SP_PATTERN(style->getFillPaintServer()); + if (fill_pattern) { + if (!display->arenaitem->key()) { + display->arenaitem->setKey(display_key_new(3)); + } + int fill_key = display->arenaitem->key(); + + Inkscape::DrawingPattern *ac = fill_pattern->show(drawing, fill_key); + ai->setFillPattern(ac); + fill_pattern->setBBox(fill_key, item_bbox); + fill_pattern->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + } + SPPattern *stroke_pattern = SP_PATTERN(style->getStrokePaintServer()); + if (stroke_pattern) { + if (!display->arenaitem->key()) { + display->arenaitem->setKey(display_key_new(3)); + } + int stroke_key = display->arenaitem->key(); + + Inkscape::DrawingPattern *ac = stroke_pattern->show(drawing, stroke_key); + ai->setStrokePattern(ac); + stroke_pattern->setBBox(stroke_key, item_bbox); + stroke_pattern->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + } ai->setData(this); ai->setItemBounds(geometricBounds()); } @@ -1119,6 +1186,14 @@ void SPItem::invoke_hide(unsigned key) mask_ref->getObject()->sp_mask_hide(v->arenaitem->key()); v->arenaitem->setMask(NULL); } + SPPattern *fill_pattern = SP_PATTERN(style->getFillPaintServer()); + if (fill_pattern) { + fill_pattern->hide(v->arenaitem->key()); + } + SPPattern *stroke_pattern = SP_PATTERN(style->getStrokePaintServer()); + if (stroke_pattern) { + stroke_pattern->hide(v->arenaitem->key()); + } if (!ref) { display = v->next; } else { -- cgit v1.2.3 From f3b182a2facfd52c7bbfee67f207ad765f536beb Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 13:01:49 +0200 Subject: Merged hatch rendering code (bzr r13611.1.8) --- share/ui/units.xml | 14 + src/CMakeLists.txt | 4 + src/Makefile_insert | 2 + src/attributes.cpp | 5 + src/attributes.h | 5 + src/display/drawing-pattern.h | 2 +- src/sp-hatch-path.cpp | 290 ++++++++++++++++++++ src/sp-hatch-path.h | 86 ++++++ src/sp-hatch.cpp | 616 ++++++++++++++++++++++++++++++++++++++++++ src/sp-hatch.h | 158 +++++++++++ src/sp-item.cpp | 70 ++--- src/sp-paint-server.h | 57 +++- src/style-internal.h | 3 +- src/svg/CMakeLists.txt | 2 + src/svg/Makefile_insert | 2 + src/svg/svg-angle.cpp | 136 ++++++++++ src/svg/svg-angle.h | 69 +++++ 17 files changed, 1485 insertions(+), 36 deletions(-) create mode 100644 src/sp-hatch-path.cpp create mode 100644 src/sp-hatch-path.h create mode 100644 src/sp-hatch.cpp create mode 100644 src/sp-hatch.h create mode 100644 src/svg/svg-angle.cpp create mode 100644 src/svg/svg-angle.h diff --git a/share/ui/units.xml b/share/ui/units.xml index 872b511d7..ef00aa9ce 100644 --- a/share/ui/units.xml +++ b/share/ui/units.xml @@ -77,6 +77,20 @@ <factor>57.296</factor> <description>Radians (57.296 deg/rad)</description> </unit> +<unit type="RADIAL" pri="n"> + <name>gradian</name> + <plural>gradians</plural> + <abbr>grad</abbr> + <factor>1.111</factor> + <description>Gradians (1.111 deg/grad)</description> +</unit> +<unit type="RADIAL" pri="n"> + <name>turn</name> + <plural>turns</plural> + <abbr>turn</abbr> + <factor>360</factor> + <description>Turns (360 deg/turn)</description> +</unit> <unit type="FONT_HEIGHT" pri="y"> <name>font-height</name> <plural>font-heights</plural> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a792af6b..25556e3bc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,6 +32,8 @@ set(sp_SRC sp-gradient-reference.cpp sp-gradient.cpp sp-guide.cpp + sp-hatch.cpp + sp-hatch-path.cpp sp-image.cpp sp-item-group.cpp sp-item-notify-moveto.cpp @@ -115,6 +117,8 @@ set(sp_SRC sp-guide-attachment.h sp-guide-constraint.h sp-guide.h + sp-hatch.h + sp-hatch-path.h sp-image.h sp-item-group.h sp-item-notify-moveto.h diff --git a/src/Makefile_insert b/src/Makefile_insert index f191839a1..66188f502 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -158,6 +158,8 @@ ink_common_sources += \ sp-guide-attachment.h \ sp-guide-constraint.h \ sp-guide.cpp sp-guide.h \ + sp-hatch.cpp sp-hatch.h \ + sp-hatch-path.cpp sp-hatch-path.h \ sp-image.cpp sp-image.h \ sp-item.cpp sp-item.h \ sp-item-group.cpp sp-item-group.h \ diff --git a/src/attributes.cpp b/src/attributes.cpp index fec5d3af4..75e78957f 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -292,6 +292,11 @@ static SPStyleProp const props[] = { {SP_ATTR_PATTERNUNITS, "patternUnits"}, {SP_ATTR_PATTERNCONTENTUNITS, "patternContentUnits"}, {SP_ATTR_PATTERNTRANSFORM, "patternTransform"}, + /* SPHatch */ + {SP_ATTR_HATCHUNITS, "hatchUnits"}, + {SP_ATTR_HATCHCONTENTUNITS, "hatchContentUnits"}, + {SP_ATTR_HATCHTRANSFORM, "hatchTransform"}, + {SP_ATTR_PITCH, "pitch"}, /* SPClipPath */ {SP_ATTR_CLIPPATHUNITS, "clipPathUnits"}, /* SPMask */ diff --git a/src/attributes.h b/src/attributes.h index 3397e4034..8d3c6399b 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -293,6 +293,11 @@ enum SPAttributeEnum { SP_ATTR_PATTERNUNITS, SP_ATTR_PATTERNCONTENTUNITS, SP_ATTR_PATTERNTRANSFORM, + /* SPHatch */ + SP_ATTR_HATCHUNITS, + SP_ATTR_HATCHCONTENTUNITS, + SP_ATTR_HATCHTRANSFORM, + SP_ATTR_PITCH, /* SPClipPath */ SP_ATTR_CLIPPATHUNITS, /* SPMask */ diff --git a/src/display/drawing-pattern.h b/src/display/drawing-pattern.h index 487da51b7..b614785dc 100644 --- a/src/display/drawing-pattern.h +++ b/src/display/drawing-pattern.h @@ -59,6 +59,7 @@ public: protected: virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, unsigned flags, unsigned reset); + Geom::IntPoint _patternDimentions(); Geom::Affine *_pattern_to_user; Geom::Affine _overflow_initial_transform; @@ -66,7 +67,6 @@ protected: int _overflow_steps; Geom::OptRect _tile_rect; bool _debug; - Geom::IntPoint _pattern_resolution; }; diff --git a/src/sp-hatch-path.cpp b/src/sp-hatch-path.cpp new file mode 100644 index 000000000..bdefd32d8 --- /dev/null +++ b/src/sp-hatch-path.cpp @@ -0,0 +1,290 @@ +/** @file + * SVG <hatchPath> implementation + *//* + * Author: + * Tomasz Boczkowski <penginsbacon@gmail.com> + * + * Copyright (C) 2014 Tomasz Boczkowski + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <cstring> +#include <string> +#include <2geom/path.h> +#include <2geom/transforms.h> + +#include "svg/svg.h" +#include "display/cairo-utils.h" +#include "display/curve.h" +#include "display/drawing-context.h" +#include "display/drawing-surface.h" +#include "display/drawing.h" +#include "display/drawing-shape.h" +#include "attributes.h" +#include "document-private.h" +#include "uri.h" +#include "style.h" +#include "sp-hatch-path.h" +#include "svg/css-ostringstream.h" +#include "xml/repr.h" + +#include "sp-factory.h" + +namespace { +SPObject* createHatchPath() { + return new SPHatchPath(); +} + +bool hatchRegistered = SPFactory::instance().registerObject("svg:hatchPath", createHatchPath); +} + +SPHatchPath::SPHatchPath() + : _curve(NULL) +{ + offset.unset(); +} + +SPHatchPath::~SPHatchPath() { +} + +void SPHatchPath::setCurve(SPCurve *new_curve, bool owner) { + if (_curve) { + _curve = _curve->unref(); + } + + if (new_curve) { + if (owner) { + _curve = new_curve->ref(); + } else { + _curve = new_curve->copy(); + } + } + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); +} + +void SPHatchPath::build(SPDocument* doc, Inkscape::XML::Node* repr) { + SPObject::build(doc, repr); + + this->readAttr("d"); + this->readAttr("offset"); + this->readAttr( "style" ); + + style->fill.setNone(); +} + +void SPHatchPath::release() { + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + delete iter->arenaitem; + iter->arenaitem = NULL; + } + + SPObject::release(); +} + +void SPHatchPath::set(unsigned int key, const gchar* value) { + switch (key) { + case SP_ATTR_D: + if (value) { + Geom::PathVector pv; + _readHatchPathVector(value, pv, _continuous); + SPCurve *curve = new SPCurve(pv); + + if (curve) { + this->setCurve(curve, true); + curve->unref(); + } + } else { + this->setCurve(NULL, true); + } + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + case SP_ATTR_OFFSET: + offset.readOrUnset(value); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + default: + if (SP_ATTRIBUTE_IS_CSS(key)) { + sp_style_read_from_object(this->style, this); + requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG); + } else { + SPObject::set(key, value); + } + break; + } +} + + +void SPHatchPath::update(SPCtx* ctx, unsigned int flags) { + + if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) { + flags &= ~SP_OBJECT_USER_MODIFIED_FLAG_B; + } + + if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) { + if (this->style->stroke_width.unit == SP_CSS_UNIT_PERCENT) { + SPItemCtx *ictx = (SPItemCtx *) ctx; + double const aw = 1.0 / ictx->i2vp.descrim(); + this->style->stroke_width.computed = this->style->stroke_width.value * aw; + + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + iter->arenaitem->setStyle(this->style); + } + } + } + + if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_PARENT_MODIFIED_FLAG)) { + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + _updateView(*iter); + } + } +} + +bool SPHatchPath::isValid() const { + if (_curve && (_repeatLength() <= 0)) { + return false; + } + return true; +} + +Inkscape::DrawingItem *SPHatchPath::show(Inkscape::Drawing &drawing, unsigned int key) { + Inkscape::DrawingShape *s = new Inkscape::DrawingShape(drawing); + _display.push_front(View(s, key)); + + _updateView(_display.front()); + + return s; +} + +void SPHatchPath::hide(unsigned int key) { + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + if (iter->key == key) { + delete iter->arenaitem; + _display.erase(iter); + return; + } + } + + g_assert_not_reached(); +} + +void SPHatchPath::setStripExtents(unsigned int key, Geom::OptInterval const &extents) { + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + if (iter->key == key) { + iter->extents = extents; + break; + } + } +} + +gdouble SPHatchPath::_repeatLength() const { + if (!_curve) { + return 0; + } + + if (!_curve->last_point()) { + return 0; + } + + return _curve->last_point()->y(); +} + +void SPHatchPath::_updateView(View &view) { + SPCurve *calculated_curve = new SPCurve; + + if (!view.extents) { + return; + } + + if (!_curve) { + calculated_curve->moveto(0, view.extents->min()); + calculated_curve->lineto(0, view.extents->max()); + //TODO: if hatch has a dasharray defined, adjust line ends + } else { + gdouble repeatLength = _repeatLength(); + if (repeatLength > 0) { + gdouble initial_y = floor(view.extents->min() / repeatLength) * repeatLength; + int segment_cnt = ceil((view.extents->extent()) / repeatLength) + 1; + + SPCurve *segment =_curve->copy(); + segment->transform(Geom::Translate(0, initial_y)); + + Geom::Affine step_transform = Geom::Translate(0, repeatLength); + for (int i = 0; i < segment_cnt; i++) { + if (_continuous) { + calculated_curve->append_continuous(segment, 0.0625); + } else { + calculated_curve->append(segment, false); + } + segment->transform(step_transform); + } + + segment->unref(); + } + } + + Geom::Affine offset_transform = Geom::Translate(offset.computed, 0); + view.arenaitem->setTransform(offset_transform); + style->fill.setNone(); + view.arenaitem->setStyle(this->style); + view.arenaitem->setPath(calculated_curve); + + calculated_curve->unref(); +} + +void SPHatchPath::_readHatchPathVector(char const *str, Geom::PathVector &pathv, bool &continous_join) { + if (!str) { + return; + } + + pathv = sp_svg_read_pathv(str); + + if (!pathv.empty()) { + continous_join = false; + } else { + Glib::ustring str2 = Glib::ustring::compose("M0,0 %1", str); + pathv = sp_svg_read_pathv(str2.c_str()); + if (pathv.empty()) { + return; + } + + gdouble last_point_x = pathv.back().finalPoint().x(); + Inkscape::CSSOStringStream stream; + stream << last_point_x; + Glib::ustring str3 = Glib::ustring::compose("M%1,0 %2", stream.str(), str); + Geom::PathVector pathv3 = sp_svg_read_pathv(str3.c_str()); + + //Path can be composed of relative commands only. In this case final point + //coordinates would depend on first point position. If this happens, fall + //back to using 0,0 as first path point + if (pathv3.back().finalPoint().y() == pathv.back().finalPoint().y()) { + pathv = pathv3; + } + continous_join = true; + } +} + +SPHatchPath::View::View(Inkscape::DrawingShape *arenaitem, int key) + : arenaitem(arenaitem), key(key) +{ +} + + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: + */ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/sp-hatch-path.h b/src/sp-hatch-path.h new file mode 100644 index 000000000..ff091c6f9 --- /dev/null +++ b/src/sp-hatch-path.h @@ -0,0 +1,86 @@ +/** @file + * SVG <hatchPath> implementation + *//* + * Author: + * Tomasz Boczkowski <penginsbacon@gmail.com> + * + * Copyright (C) 2014 Tomasz Boczkowski + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifndef SEEN_SP_HATCH_PATH_H +#define SEEN_SP_HATCH_PATH_H + +#include <list> +#include <stddef.h> +#include <glibmm/ustring.h> +#include <sigc++/connection.h> + +#include "svg/svg-length.h" + +namespace Inkscape { + +class Drawing; +class DrawingShape; + +} + +#define SP_HATCH_PATH(obj) (dynamic_cast<SPHatchPath*>((SPObject*)obj)) +#define SP_IS_HATCH_PATH(obj) (dynamic_cast<const SPHatchPath*>((SPObject*)obj) != NULL) + +class SPHatchPath : public SPObject { +public: + SPHatchPath(); + virtual ~SPHatchPath(); + + SVGLength offset; + + void setCurve(SPCurve *curve, bool owner); + + bool isValid() const; + + Inkscape::DrawingItem *show(Inkscape::Drawing &drawing, unsigned int key); + void hide(unsigned int key); + + void setStripExtents(unsigned int key, Geom::OptInterval const &extents); + +protected: + virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); + virtual void release(); + virtual void set(unsigned int key, const gchar* value); + virtual void update(SPCtx* ctx, unsigned int flags); + +private: + struct View { + View(Inkscape::DrawingShape *arenaitem, int key); + //Do not delete arenaitem in destructor. + + Inkscape::DrawingShape *arenaitem; + Geom::OptInterval extents; + unsigned int key; + }; + typedef std::list<SPHatchPath::View>::iterator ViewIterator; + std::list<View> _display; + + gdouble _repeatLength() const; + void _updateView(View &view); + + void _readHatchPathVector(char const *str, Geom::PathVector &pathv, bool &continous_join); + + SPCurve *_curve; + bool _continuous; +}; + +#endif // SEEN_SP_HATCH_PATH_H + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/sp-hatch.cpp b/src/sp-hatch.cpp new file mode 100644 index 000000000..cde6c86cb --- /dev/null +++ b/src/sp-hatch.cpp @@ -0,0 +1,616 @@ +/** @file + * SVG <hatch> implementation + *//* + * Author: + * Tomasz Boczkowski <penginsbacon@gmail.com> + * + * Copyright (C) 2014 Tomasz Boczkowski + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <cstring> +#include <string> +#include <2geom/transforms.h> +#include <sigc++/functors/mem_fun.h> + +#include "svg/svg.h" +#include "display/cairo-utils.h" +#include "display/drawing-context.h" +#include "display/drawing-surface.h" +#include "display/drawing.h" +#include "display/drawing-pattern.h" +#include "attributes.h" +#include "document-private.h" +#include "uri.h" +#include "style.h" +#include "sp-hatch.h" +#include "sp-hatch-path.h" +#include "xml/repr.h" + +#include "sp-factory.h" + +namespace { +SPObject* createHatch() { + return new SPHatch(); +} + +bool hatchRegistered = SPFactory::instance().registerObject("svg:hatch", createHatch); +} + +SPHatch::SPHatch() + : SPPaintServer() +{ + this->ref = new SPHatchReference(this); + this->ref->changedSignal().connect(sigc::mem_fun(this, &SPHatch::_onRefChanged)); + + this->_hatchUnits = UNITS_OBJECTBOUNDINGBOX; + this->_hatchUnits_set = false; + + this->_hatchContentUnits = UNITS_USERSPACEONUSE; + this->_hatchContentUnits_set = false; + + this->_hatchTransform = Geom::identity(); + this->_hatchTransform_set = false; + + this->_x.unset(); + this->_y.unset(); + this->_pitch.unset(); + this->_rotate.unset(); +} + +SPHatch::~SPHatch() { +} + +void SPHatch::build(SPDocument* doc, Inkscape::XML::Node* repr) { + SPPaintServer::build(doc, repr); + + this->readAttr("hatchUnits"); + this->readAttr("hatchContentUnits"); + this->readAttr("hatchTransform"); + this->readAttr("x"); + this->readAttr("y"); + this->readAttr("pitch"); + this->readAttr("rotate"); + this->readAttr("xlink:href"); + + /* Register ourselves */ + doc->addResource("hatch", this); +} + +void SPHatch::release() { + if (this->document) { + // Unregister ourselves + this->document->removeResource("hatch", this); + } + + std::vector<SPHatchPath *> children; + _children(children); + for (ViewIterator view_iter = _display.begin(); view_iter != _display.end(); view_iter++) { + for (ChildIterator child_iter = children.begin(); child_iter != children.end(); + child_iter++) { + SPHatchPath *child = *child_iter; + child->hide(view_iter->key); + } + delete view_iter->arenaitem; + view_iter->arenaitem = NULL; + } + + if (this->ref) { + this->_modified_connection.disconnect(); + this->ref->detach(); + delete this->ref; + this->ref = NULL; + } + + SPPaintServer::release(); +} + +void SPHatch::child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) { + SPObject::child_added(child, ref); + + SPHatchPath *path_child = SP_HATCH_PATH(this->document->getObjectByRepr(child)); + + if (path_child) { + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + Inkscape::DrawingItem *ac = path_child->show(iter->arenaitem->drawing(), iter->key); + + Geom::OptInterval strip_extents = _calculateStripExtents(iter->bbox); + path_child->setStripExtents(iter->key, strip_extents); + path_child->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + if (ac) { + iter->arenaitem->prependChild(ac); + } + } + } + //FIXME: notify all hatches that refer to this child set +} + +void SPHatch::set(unsigned int key, const gchar* value) { + switch (key) { + case SP_ATTR_HATCHUNITS: + if (value) { + if (!strcmp(value, "userSpaceOnUse")) { + this->_hatchUnits = UNITS_USERSPACEONUSE; + } else { + this->_hatchUnits = UNITS_OBJECTBOUNDINGBOX; + } + + this->_hatchUnits_set = true; + } else { + this->_hatchUnits_set = false; + } + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + case SP_ATTR_HATCHCONTENTUNITS: + if (value) { + if (!strcmp(value, "userSpaceOnUse")) { + this->_hatchContentUnits = UNITS_USERSPACEONUSE; + } else { + this->_hatchContentUnits = UNITS_OBJECTBOUNDINGBOX; + } + + this->_hatchContentUnits_set = true; + } else { + this->_hatchContentUnits_set = false; + } + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + case SP_ATTR_HATCHTRANSFORM: { + Geom::Affine t; + + if (value && sp_svg_transform_read(value, &t)) { + this->_hatchTransform = t; + this->_hatchTransform_set = true; + } else { + this->_hatchTransform = Geom::identity(); + this->_hatchTransform_set = false; + } + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + } + case SP_ATTR_X: + this->_x.readOrUnset(value); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + case SP_ATTR_Y: + this->_y.readOrUnset(value); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + case SP_ATTR_PITCH: + this->_pitch.readOrUnset(value); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + case SP_ATTR_ROTATE: + this->_rotate.readOrUnset(value); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + case SP_ATTR_XLINK_HREF: + if (value && this->href == value) { + /* Href unchanged, do nothing. */ + } else { + this->href.clear(); + + if (value) { + // First, set the href field; it's only used in the "unchanged" check above. + this->href = value; + // Now do the attaching, which emits the changed signal. + if (value) { + try { + this->ref->attach(Inkscape::URI(value)); + } catch (Inkscape::BadURIException &e) { + g_warning("%s", e.what()); + this->ref->detach(); + } + } else { + this->ref->detach(); + } + } + } + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + break; + + default: + SPPaintServer::set(key, value); + break; + } +} + +bool SPHatch::_hasHatchPatchChildren(SPHatch const *hatch) { + for (SPObject const *child = hatch->firstChild(); child; child = child->getNext() ) { + if (SP_IS_HATCH_PATH(child)) { + return true; + } + } + return false; +} + +void SPHatch::_children(std::vector<SPHatchPath*>& l) { + SPHatch *src = chase_hrefs<SPHatch>(this, sigc::ptr_fun(&_hasHatchPatchChildren)); + + if (src) { + for (SPObject *child = src->firstChild(); child; child = child->getNext()) { + if (SP_IS_HATCH_PATH(child)) { + l.push_back(SP_HATCH_PATH(child)); + } + } + } +} + +void SPHatch::_children(std::vector<SPHatchPath const*>& l) const { + SPHatch const *src = chase_hrefs<SPHatch const>(this, sigc::ptr_fun(&_hasHatchPatchChildren)); + + if (src) { + for (SPObject const *child = src->firstChild(); child; child = child->getNext()) { + if (SP_IS_HATCH_PATH(child)) { + l.push_back(SP_HATCH_PATH(child)); + } + } + } +} + +/* TODO: ::remove_child and ::order_changed handles - see SPPattern */ + + +void SPHatch::update(SPCtx* ctx, unsigned int flags) { + typedef std::list<SPHatch::View>::iterator ViewIterator; + + if (flags & SP_OBJECT_MODIFIED_FLAG) { + flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + } + + flags &= SP_OBJECT_MODIFIED_CASCADE; + + std::vector<SPHatchPath *> children; + _children(children); + + for (ChildIterator iter = children.begin(); iter != children.end(); iter++) { + SPHatchPath* child = *iter; + + sp_object_ref(child, NULL); + + for (ViewIterator view_iter = _display.begin(); view_iter != _display.end(); view_iter++) { + Geom::OptInterval strip_extents = _calculateStripExtents(view_iter->bbox); + child->setStripExtents(view_iter->key, strip_extents); + } + + if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) { + + child->updateDisplay(ctx, flags); + } + + sp_object_unref(child, NULL); + } + + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + _updateView(*iter); + } +} + +void SPHatch::modified(unsigned int flags) { + if (flags & SP_OBJECT_MODIFIED_FLAG) { + flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + } + + flags &= SP_OBJECT_MODIFIED_CASCADE; + + std::vector<SPHatchPath *> children; + _children(children); + + for (ChildIterator iter = children.begin(); iter != children.end(); iter++) { + SPObject *child = *iter; + + sp_object_ref(child, NULL); + + if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) { + child->emitModified(flags); + } + + sp_object_unref(child, NULL); + } +} + +void SPHatch::_onRefChanged(SPObject *old_ref, SPObject *ref) { + typedef std::list<SPHatch::View>::iterator ViewIterator; + + if (old_ref) { + _modified_connection.disconnect(); + } + + if (SP_IS_HATCH(ref)) { + _modified_connection = ref->connectModified(sigc::mem_fun(this, &SPHatch::_onRefModified)); + } + + if (!_hasHatchPatchChildren(this)) { + SPHatch *old_shown = NULL; + SPHatch *new_shown = NULL; + std::vector<SPHatchPath *> old_children; + std::vector<SPHatchPath *> new_children; + if (SP_IS_HATCH(old_ref)) { + old_shown = SP_HATCH(old_ref)->rootHatch(); + old_shown->_children(old_children); + } + if (SP_IS_HATCH(ref)) { + new_shown = SP_HATCH(ref)->rootHatch(); + new_shown->_children(new_children); + } + if (old_shown != new_shown) { + + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + Geom::OptInterval extents = _calculateStripExtents(iter->bbox); + + for (ChildIterator child_iter = old_children.begin(); child_iter != old_children.end(); child_iter++) { + SPHatchPath *child = *child_iter; + child->hide(iter->key); + } + for (ChildIterator child_iter = new_children.begin(); child_iter != new_children.end(); child_iter++) { + SPHatchPath *child = *child_iter; + Inkscape::DrawingItem *cai = child->show(iter->arenaitem->drawing(), iter->key); + child->setStripExtents(iter->key, extents); + child->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + if (cai) { + iter->arenaitem->appendChild(cai); + } + + } + } + } + } + + _onRefModified(ref, 0); +} + +void SPHatch::_onRefModified(SPObject */*ref*/, guint /*flags*/) { + requestModified(SP_OBJECT_MODIFIED_FLAG); + // Conditional to avoid causing infinite loop if there's a cycle in the href chain. +} + + +SPHatch *SPHatch::rootHatch() { + SPHatch *src = chase_hrefs<SPHatch>(this, sigc::ptr_fun(&_hasHatchPatchChildren)); + return src ? src : this; // document is broken, we can't get to root; but at least we can return pat which is supposedly a valid hatch +} + +// Access functions that look up fields up the chain of referenced hatchs and return the first one which is set +// FIXME: all of them must use chase_hrefs as children() and rootHatch() + +SPHatch::HatchUnits SPHatch::hatchUnits() const { + for (SPHatch const *pat_i = this; pat_i != NULL; + pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { + if (pat_i->_hatchUnits_set) + return pat_i->_hatchUnits; + } + return _hatchUnits; +} + +SPHatch::HatchUnits SPHatch::hatchContentUnits() const { + for (SPHatch const *pat_i = this; pat_i != NULL; + pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { + if (pat_i->_hatchContentUnits_set) + return pat_i->_hatchContentUnits; + } + return _hatchContentUnits; +} + +Geom::Affine const &SPHatch::hatchTransform() const { + for (SPHatch const *pat_i = this; pat_i != NULL; + pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { + if (pat_i->_hatchTransform_set) + return pat_i->_hatchTransform; + } + return _hatchTransform; +} + +gdouble SPHatch::x() const { + for (SPHatch const *pat_i = this; pat_i != NULL; + pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { + if (pat_i->_x._set) + return pat_i->_x.computed; + } + return 0; +} + +gdouble SPHatch::y() const { + for (SPHatch const *pat_i = this; pat_i != NULL; + pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { + if (pat_i->_y._set) + return pat_i->_y.computed; + } + return 0; +} + +gdouble SPHatch::pitch() const { + for (SPHatch const *pat_i = this; pat_i != NULL; + pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { + if (pat_i->_pitch._set) + return pat_i->_pitch.computed; + } + return 0; +} + +gdouble SPHatch::rotate() const { + for (SPHatch const *pat_i = this; pat_i != NULL; + pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { + if (pat_i->_rotate._set) + return pat_i->_rotate.computed; + } + return 0; +} + +bool SPHatch::isValid() const { + double strip_pitch = pitch(); + if (strip_pitch <= 0) { + return false; + } + + std::vector<SPHatchPath const *> children; + _children(children); + if (children.empty()) { + return false; + } + for (ConstChildIterator iter = children.begin(); iter != children.end(); iter++) { + SPHatchPath const *child = *iter; + if (!child->isValid()) { + return false; + } + } + + return true; +} + +Inkscape::DrawingPattern *SPHatch::show(Inkscape::Drawing &drawing, unsigned int key) { + Inkscape::DrawingPattern *ai = new Inkscape::DrawingPattern(drawing); + //TODO: set some debug flag to see DrawingPattern + _display.push_front(View(ai, key)); + + std::vector<SPHatchPath *> children; + _children(children); + + for (ChildIterator iter = children.begin(); iter != children.end(); iter++) { + SPHatchPath *child = *iter; + Inkscape::DrawingItem *cai = child->show(drawing, key); + if (cai) { + ai->appendChild(cai); + } + } + + View& view = _display.front(); + _updateView(view); + + return ai; +} + +void SPHatch::hide(unsigned int key) { + std::vector<SPHatchPath *> children; + _children(children); + + for (ChildIterator iter = children.begin(); iter != children.end(); iter++) { + SPHatchPath *child = *iter; + child->hide(key); + } + + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + if (iter->key == key) { + delete iter->arenaitem; + _display.erase(iter); + return; + } + } + + g_assert_not_reached(); +} + +void SPHatch::_updateView(View &view) { + Geom::OptInterval extents = _calculateStripExtents(view.bbox); + if (!extents) { + return; + } + + double tile_x = x(); + double tile_y = y(); + double tile_width = pitch(); + double tile_height = extents->max() - extents->min(); + double tile_rotate = rotate(); + double tile_render_y = extents->min(); + + if (view.bbox && (hatchUnits() == UNITS_OBJECTBOUNDINGBOX)) { + tile_x *= view.bbox->width(); + tile_y *= view.bbox->height(); + tile_width *= view.bbox->width(); + tile_height *= view.bbox->height(); + tile_render_y *= view.bbox->height(); + } + + // Pattern size in hatch space + Geom::Rect hatch_tile = Geom::Rect::from_xywh(0, tile_render_y, tile_width, tile_height); + // Content to bbox + Geom::Affine content2ps; + if (view.bbox && (hatchContentUnits() == UNITS_OBJECTBOUNDINGBOX)) { + content2ps = Geom::Affine(view.bbox->width(), 0.0, 0.0, view.bbox->height(), 0, 0); + } + + // Tile (hatch space) to user. + Geom::Affine ps2user = Geom::Translate(tile_x, tile_y) * Geom::Rotate::from_degrees(tile_rotate) * hatchTransform(); + + view.arenaitem->setChildTransform(content2ps); + view.arenaitem->setPatternToUserTransform(ps2user); + view.arenaitem->setTileRect(hatch_tile); + view.arenaitem->setStyle(this->style); +} + +//calculates strip extents in content space +Geom::OptInterval SPHatch::_calculateStripExtents(Geom::OptRect bbox) { + if (!bbox || (bbox->area() == 0)) { + return Geom::OptInterval(); + } + + double tile_x = x(); + double tile_y = y(); + double tile_rotate = rotate(); + + Geom::Affine ps2user = Geom::Translate(tile_x, tile_y) * Geom::Rotate::from_degrees(tile_rotate) * hatchTransform(); + Geom::Affine user2ps = ps2user.inverse(); + + Geom::Interval extents; + for (int i = 0; i < 4; i++) { + Geom::Point corner = bbox->corner(i); + Geom::Point corner_ps = corner * user2ps; + if (i == 0 || corner_ps.y() < extents.min()) { + extents.setMin(corner_ps.y()); + } + if (i == 0 || corner_ps.y() > extents.max()) { + extents.setMax(corner_ps.y()); + } + } + + if (hatchUnits() == UNITS_OBJECTBOUNDINGBOX) { + extents /= bbox->height(); + } + + return extents; +} + +cairo_pattern_t* SPHatch::pattern_new(cairo_t *base_ct, Geom::OptRect const &bbox, double opacity) { + //this code should not be used + //it is however required by the fact that SPPaintServer::hatch_new is pure virtual + return cairo_pattern_create_rgb(0.5, 0.5, 1.0); +} + +void SPHatch::setBBox(unsigned int key, Geom::OptRect const &bbox) { + typedef std::list<View>::iterator ViewIter; + + for (ViewIter iter = _display.begin(); iter != _display.end(); iter++) { + if (iter->key == key) { + iter->bbox = bbox; + break; + } + } +} + +SPHatch::View::View(Inkscape::DrawingPattern *arenaitem, int key) + : arenaitem(arenaitem), key(key) +{ +} +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: + */ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/sp-hatch.h b/src/sp-hatch.h new file mode 100644 index 000000000..170f68a7a --- /dev/null +++ b/src/sp-hatch.h @@ -0,0 +1,158 @@ +/** @file + * SVG <hatch> implementation + *//* + * Author: + * Tomasz Boczkowski <penginsbacon@gmail.com> + * + * Copyright (C) 2014 Tomasz Boczkowski + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifndef SEEN_SP_HATCH_H +#define SEEN_SP_HATCH_H + +#include <list> +#include <stddef.h> +#include <glibmm/ustring.h> +#include <sigc++/connection.h> + +#include "svg/svg-length.h" +#include "svg/svg-angle.h" +#include "sp-paint-server.h" +#include "uri-references.h" + +class SPHatchReference; +class SPHatchPath; +class SPItem; + +namespace Inkscape { + +class Drawing; +class DrawingPattern; + +namespace XML { + +class Node; + +} +} + +#define SP_HATCH(obj) (dynamic_cast<SPHatch*>((SPObject*)obj)) +#define SP_IS_HATCH(obj) (dynamic_cast<const SPHatch*>((SPObject*)obj) != NULL) + +class SPHatch : public SPPaintServer { +public: + enum HatchUnits { + UNITS_USERSPACEONUSE, + UNITS_OBJECTBOUNDINGBOX + }; + + SPHatch(); + virtual ~SPHatch(); + + /* Reference (href) */ + Glib::ustring href; + SPHatchReference *ref; + + gdouble x() const; + gdouble y() const; + gdouble pitch() const; + gdouble rotate() const; + HatchUnits hatchUnits() const; + HatchUnits hatchContentUnits() const; + Geom::Affine const &hatchTransform() const; + SPHatch *rootHatch(); //TODO: const + + bool isValid() const; + + Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key); + void hide(unsigned int key); + virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); + + void setBBox(unsigned int key, Geom::OptRect const &bbox); + +protected: + virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); + virtual void release(); + virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); + virtual void set(unsigned int key, const gchar* value); + virtual void update(SPCtx* ctx, unsigned int flags); + virtual void modified(unsigned int flags); + +private: + struct View { + View(Inkscape::DrawingPattern *arenaitem, int key); + //Do not delete arenaitem in destructor. + + Inkscape::DrawingPattern *arenaitem; + Geom::OptRect bbox; + unsigned int key; + }; + typedef std::vector<SPHatchPath *>::iterator ChildIterator; + typedef std::vector<SPHatchPath const *>::const_iterator ConstChildIterator; + typedef std::list<View>::iterator ViewIterator; + void _updateView(View &view); + + static bool _hasHatchPatchChildren(SPHatch const* hatch); + + void _children(std::vector<SPHatchPath*>& l); + void _children(std::vector<SPHatchPath const *>& l) const; + + Geom::OptInterval _calculateStripExtents(Geom::OptRect bbox); + + /** + Gets called when the hatch is reattached to another <hatch> + */ + void _onRefChanged(SPObject *old_ref, SPObject *ref); + + /** + Gets called when the referenced <hatch> is changed + */ + void _onRefModified(SPObject *ref, guint flags); + + /* patternUnits and patternContentUnits attribute */ + HatchUnits _hatchUnits : 1; + bool _hatchUnits_set : 1; + HatchUnits _hatchContentUnits : 1; + bool _hatchContentUnits_set : 1; + /* hatchTransform attribute */ + Geom::Affine _hatchTransform; + bool _hatchTransform_set : 1; + /* Strip */ + SVGLength _x; + SVGLength _y; + SVGLength _pitch; + SVGAngle _rotate; + + sigc::connection _modified_connection; + + std::list<View> _display; +}; + + +class SPHatchReference : public Inkscape::URIReference { +public: + SPHatchReference (SPObject *obj) : URIReference(obj) {} + SPHatch *getObject() const { + return reinterpret_cast<SPHatch *>(URIReference::getObject()); + } + +protected: + virtual bool _acceptObject(SPObject *obj) const { + return SP_IS_HATCH (obj); + } +}; + +#endif // SEEN_SP_HATCH_H + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/sp-item.cpp b/src/sp-item.cpp index edf758e7d..da6e6ea58 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -445,14 +445,14 @@ void SPItem::release() { SPObject::release(); - SPPattern *fill_pattern = SP_PATTERN(style->getFillPaintServer()); - SPPattern *stroke_pattern = SP_PATTERN(style->getStrokePaintServer()); + SPPaintServer *fill_ps = style->getFillPaintServer(); + SPPaintServer *stroke_ps = style->getStrokePaintServer(); while (item->display) { - if (fill_pattern) { - fill_pattern->hide(item->display->arenaitem->key()); + if (fill_ps) { + fill_ps->hide(item->display->arenaitem->key()); } - if (stroke_pattern) { - stroke_pattern->hide(item->display->arenaitem->key()); + if (stroke_ps) { + stroke_ps->hide(item->display->arenaitem->key()); } item->display = sp_item_view_list_remove(item->display, item->display); } @@ -600,25 +600,27 @@ void SPItem::mask_ref_changed(SPObject *old_mask, SPObject *mask, SPItem *item) } void SPItem::fill_ps_ref_changed(SPObject *old_ps, SPObject *ps, SPItem *item) { - SPPattern *old_fill_pattern = SP_PATTERN(old_ps); - if (old_fill_pattern) { + SPPaintServer *old_fill_ps = SP_PAINT_SERVER(old_ps); + if (old_fill_ps) { for (SPItemView *v =item->display; v != NULL; v = v->next) { - old_fill_pattern->hide(v->arenaitem->key()); + old_fill_ps->hide(v->arenaitem->key()); } } - SPPattern *new_fill_pattern = SP_PATTERN(ps); - if (new_fill_pattern) { + SPPaintServer *new_fill_ps = SP_PAINT_SERVER(ps); + if (new_fill_ps) { Geom::OptRect bbox = item->geometricBounds(); for (SPItemView *v = item->display; v != NULL; v = v->next) { if (!v->arenaitem->key()) { v->arenaitem->setKey(SPItem::display_key_new(3)); } - Inkscape::DrawingPattern *pi = new_fill_pattern->show( + Inkscape::DrawingPattern *pi = new_fill_ps->show( v->arenaitem->drawing(), v->arenaitem->key()); v->arenaitem->setFillPattern(pi); - new_fill_pattern->setBBox(v->arenaitem->key(), bbox); - new_fill_pattern->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + new_fill_ps->setBBox(v->arenaitem->key(), bbox); + if (pi) { + new_fill_ps->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + } } } } @@ -1133,29 +1135,33 @@ Inkscape::DrawingItem *SPItem::invoke_show(Inkscape::Drawing &drawing, unsigned mask->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } - SPPattern *fill_pattern = SP_PATTERN(style->getFillPaintServer()); - if (fill_pattern) { + SPPaintServer *fill_ps = style->getFillPaintServer(); + if (fill_ps) { if (!display->arenaitem->key()) { display->arenaitem->setKey(display_key_new(3)); } int fill_key = display->arenaitem->key(); - Inkscape::DrawingPattern *ac = fill_pattern->show(drawing, fill_key); - ai->setFillPattern(ac); - fill_pattern->setBBox(fill_key, item_bbox); - fill_pattern->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + Inkscape::DrawingPattern *ap = fill_ps->show(drawing, fill_key); + ai->setFillPattern(ap); + fill_ps->setBBox(fill_key, item_bbox); + if (ap) { + fill_ps->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + } } - SPPattern *stroke_pattern = SP_PATTERN(style->getStrokePaintServer()); - if (stroke_pattern) { + SPPaintServer *stroke_ps = style->getStrokePaintServer(); + if (stroke_ps) { if (!display->arenaitem->key()) { display->arenaitem->setKey(display_key_new(3)); } int stroke_key = display->arenaitem->key(); - Inkscape::DrawingPattern *ac = stroke_pattern->show(drawing, stroke_key); - ai->setStrokePattern(ac); - stroke_pattern->setBBox(stroke_key, item_bbox); - stroke_pattern->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + Inkscape::DrawingPattern *ap = stroke_ps->show(drawing, stroke_key); + ai->setStrokePattern(ap); + stroke_ps->setBBox(stroke_key, item_bbox); + if (ap) { + stroke_ps->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + } } ai->setData(this); ai->setItemBounds(geometricBounds()); @@ -1186,13 +1192,13 @@ void SPItem::invoke_hide(unsigned key) mask_ref->getObject()->sp_mask_hide(v->arenaitem->key()); v->arenaitem->setMask(NULL); } - SPPattern *fill_pattern = SP_PATTERN(style->getFillPaintServer()); - if (fill_pattern) { - fill_pattern->hide(v->arenaitem->key()); + SPPaintServer *fill_ps = style->getFillPaintServer(); + if (fill_ps) { + fill_ps->hide(v->arenaitem->key()); } - SPPattern *stroke_pattern = SP_PATTERN(style->getStrokePaintServer()); - if (stroke_pattern) { - stroke_pattern->hide(v->arenaitem->key()); + SPPaintServer *stroke_ps = style->getStrokePaintServer(); + if (stroke_ps) { + stroke_ps->hide(v->arenaitem->key()); } if (!ref) { display = v->next; diff --git a/src/sp-paint-server.h b/src/sp-paint-server.h index c1c8d651e..91d292424 100644 --- a/src/sp-paint-server.h +++ b/src/sp-paint-server.h @@ -17,8 +17,16 @@ #include <cairo.h> #include <2geom/rect.h> +#include <sigc++/slot.h> #include "sp-object.h" +namespace Inkscape { + +class Drawing; +class DrawingPattern; + +} + #define SP_PAINT_SERVER(obj) (dynamic_cast<SPPaintServer*>((SPObject*)obj)) #define SP_IS_PAINT_SERVER(obj) (dynamic_cast<const SPPaintServer*>((SPObject*)obj) != NULL) @@ -31,12 +39,59 @@ public: bool isSolid() const; virtual bool isValid() const; - virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) = 0; + //There are two ways to render a paint. The simple one is to create cairo_pattern_t structure + //on demand by pattern_new method. It is used for gradients. The other one is to add elements + //representing PaintServer in NR tree. It is used by hatches and patterns. + //Either pattern new or all three methods show, hide, setBBox need to be implemented + virtual Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key) {return NULL;} + virtual void hide(unsigned int key) {}; + virtual void setBBox(unsigned int key, Geom::OptRect const &bbox) {}; + + virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) {return NULL;} protected: bool swatch; }; +/** + * Returns the first of {src, src-\>ref-\>getObject(), + * src-\>ref-\>getObject()-\>ref-\>getObject(),...} + * for which \a match is true, or NULL if none found. + * + * The raison d'être of this routine is that it correctly handles cycles in the href chain (e.g., if + * a gradient gives itself as its href, or if each of two gradients gives the other as its href). + * + * \pre SP_IS_GRADIENT(src). + */ +template <class PaintServer> +PaintServer *chase_hrefs(PaintServer *src, sigc::slot<bool, PaintServer const *> match) { + /* Use a pair of pointers for detecting loops: p1 advances half as fast as p2. If there is a + loop, then once p1 has entered the loop, we'll detect it the next time the distance between + p1 and p2 is a multiple of the loop size. */ + PaintServer *p1 = src, *p2 = src; + bool do1 = false; + for (;;) { + if (match(p2)) { + return p2; + } + + p2 = p2->ref->getObject(); + if (!p2) { + return p2; + } + if (do1) { + p1 = p1->ref->getObject(); + } + do1 = !do1; + + if ( p2 == p1 ) { + /* We've been here before, so return NULL to indicate that no matching gradient found + * in the chain. */ + return NULL; + } + } +} + #endif // SEEN_SP_PAINT_SERVER_H /* Local Variables: diff --git a/src/style-internal.h b/src/style-internal.h index 69784199c..0b2b40001 100644 --- a/src/style-internal.h +++ b/src/style-internal.h @@ -505,8 +505,7 @@ class SPIPaint : public SPIBase { void setColor( float r, float g, float b ) {value.color.set( r, g, b ); colorSet = true;} void setColor( guint32 val ) {value.color.set( val ); colorSet = true;} void setColor( SPColor const& color ) {value.color = color; colorSet = true;} - - + void setNone() {noneSet = true; colorSet=false;} // To do: make private public: diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt index 968287895..f9d0bc52d 100644 --- a/src/svg/CMakeLists.txt +++ b/src/svg/CMakeLists.txt @@ -7,6 +7,7 @@ set(svg_SRC strip-trailing-zeros.cpp svg-affine.cpp svg-color.cpp + svg-angle.cpp svg-length.cpp svg-path.cpp # test-stubs.cpp @@ -24,6 +25,7 @@ set(svg_SRC svg-color-test.h svg-color.h svg-icc-color.h + svg-angle.h svg-length-test.h svg-length.h svg-path-geom-test.h diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert index cf9bf3fbb..4f82bdd76 100644 --- a/src/svg/Makefile_insert +++ b/src/svg/Makefile_insert @@ -13,6 +13,8 @@ ink_common_sources += \ svg/svg-color.cpp \ svg/svg-color.h \ svg/svg-icc-color.h \ + svg/svg-angle.cpp \ + svg/svg-angle.h \ svg/svg-length.cpp \ svg/svg-length.h \ svg/svg-path.cpp \ diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp new file mode 100644 index 000000000..63152368e --- /dev/null +++ b/src/svg/svg-angle.cpp @@ -0,0 +1,136 @@ +/** + * \file src/svg/svg-angle.cpp + * \brief SVG angle type + */ +/* + * Authors: + * Tomasz Boczkowski <penginsbacon@gmail.com> + * + * Copyright (C) 1999-2002 Lauris Kaplinski + * Copyright (C) 2000-2001 Ximian, Inc. + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <cstring> +#include <string> +#include <math.h> +#include <glib.h> + +#include "svg.h" +#include "stringstream.h" +#include "svg/svg-angle.h" +#include "util/units.h" + + +static bool sp_svg_angle_read_lff(gchar const *str, SVGAngle::Unit &unit, float &val, float &computed); + +SVGAngle::SVGAngle() + : _set(false) + , unit(NONE) + , value(0) + , computed(0) +{ +} + +/* Angle */ + +bool SVGAngle::read(gchar const *str) +{ + if (!str) { + return false; + } + + SVGAngle::Unit u; + float v; + float c; + if (!sp_svg_angle_read_lff(str, u, v, c)) { + return false; + } + + _set = true; + unit = u; + value = v; + computed = c; + + return true; +} + +void SVGAngle::unset(SVGAngle::Unit u, float v, float c) { + _set = false; + unit = u; + value = v; + computed = c; +} + +void SVGAngle::readOrUnset(gchar const *str, Unit u, float v, float c) { + if (!read(str)) { + unset(u, v, c); + } +} + +static bool sp_svg_angle_read_lff(gchar const *str, SVGAngle::Unit &unit, float &val, float &computed) +{ + if (!str) { + return false; + } + + gchar const *e; + float const v = g_ascii_strtod(str, (char **) &e); + if (e == str) { + return false; + } + + if (!e[0]) { + /* Unitless (defaults to degrees)*/ + unit = SVGAngle::NONE; + val = v; + computed = v; + return true; + } else if (!g_ascii_isalnum(e[0])) { + if (g_ascii_isspace(e[0]) && e[1] && g_ascii_isalpha(e[1])) { + return false; // spaces between value and unit are not allowed + } else { + /* Unitless (defaults to degrees)*/ + unit = SVGAngle::NONE; + val = v; + computed = v; + return true; + } + } else { + if (strncmp(e, "deg", 3) == 0) { + unit = SVGAngle::DEG; + computed = v; + } else if (strncmp(e, "grad", 4) == 0) { + unit = SVGAngle::GRAD; + computed = Inkscape::Util::Quantity::convert(v, "grad", "°"); + } else if (strncmp(e, "rad", 3) == 0) { + unit = SVGAngle::RAD; + computed = Inkscape::Util::Quantity::convert(v, "rad", "°"); + } else if (strncmp(e, "turn", 4) == 0) { + unit = SVGAngle::TURN; + computed = Inkscape::Util::Quantity::convert(v, "turn", "°"); + } else { + return false; + } + return true; + } + + /* Invalid */ + return false; +} + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/svg/svg-angle.h b/src/svg/svg-angle.h new file mode 100644 index 000000000..966491174 --- /dev/null +++ b/src/svg/svg-angle.h @@ -0,0 +1,69 @@ +#ifndef SEEN_SP_SVG_ANGLE_H +#define SEEN_SP_SVG_ANGLE_H + +/** + * \file src/svg/svg-angle.h + * \brief SVG angle type + */ +/* + * Authors: + * Tomasz Boczkowski <penginsbacon@gmail.com> + * + * Copyright (C) 1999-2002 Lauris Kaplinski + * Copyright (C) 2000-2001 Ximian, Inc. + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include <glib.h> + +class SVGAngle +{ +public: + SVGAngle(); + + enum Unit { + NONE, + DEG, + GRAD, + RAD, + TURN, + LAST_UNIT = TURN + }; + + // The object's value is valid / exists in SVG. + bool _set; + + // The unit of value. + Unit unit; + + // The value of this SVGAngle as found in the SVG. + float value; + + // The value in degrees. + float computed; + + float operator=(float v) { + _set = true; + unit = NONE; + value = computed = v; + return v; + } + + bool read(gchar const *str); + void unset(Unit u = NONE, float v = 0, float c = 0); + void readOrUnset(gchar const *str, Unit u = NONE, float v = 0, float c = 0); +}; + +#endif // SEEN_SP_SVG_ANGLE_H + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : -- cgit v1.2.3 From bf11ecdfe29082801833fa565f0a1710f6fcd281 Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <penginsbacon@gmail.com> Date: Tue, 14 Oct 2014 13:30:31 +0200 Subject: Merged hatch pdf and png export code (bzr r13611.1.9) --- src/display/drawing-pattern.cpp | 1 - src/display/drawing-pattern.h | 1 - src/extension/internal/cairo-render-context.cpp | 116 ++++++++++++++++++---- src/extension/internal/cairo-render-context.h | 1 + src/extension/internal/cairo-renderer.cpp | 16 +++ src/extension/internal/cairo-renderer.h | 2 + src/sp-hatch-path.cpp | 61 ++++++++++-- src/sp-hatch-path.h | 7 +- src/sp-hatch.cpp | 124 ++++++++++++++++++------ src/sp-hatch.h | 26 ++++- src/sp-item.cpp | 32 ++++-- src/sp-paint-server.h | 2 +- 12 files changed, 315 insertions(+), 74 deletions(-) diff --git a/src/display/drawing-pattern.cpp b/src/display/drawing-pattern.cpp index 77752bce3..cf6358278 100644 --- a/src/display/drawing-pattern.cpp +++ b/src/display/drawing-pattern.cpp @@ -159,7 +159,6 @@ DrawingPattern::_updateItem(Geom::IntRect const &area, UpdateContext const &ctx, } Geom::Rect pattern_tile = *_tile_rect; - Geom::Coord det_ctm = ctx.ctm.descrim(); Geom::Coord det_ps2user = _pattern_to_user ? _pattern_to_user->descrim() : 1.0; Geom::Coord det_child_transform = _child_transform ? _child_transform->descrim() : 1.0; diff --git a/src/display/drawing-pattern.h b/src/display/drawing-pattern.h index b614785dc..7483ba067 100644 --- a/src/display/drawing-pattern.h +++ b/src/display/drawing-pattern.h @@ -59,7 +59,6 @@ public: protected: virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx, unsigned flags, unsigned reset); - Geom::IntPoint _patternDimentions(); Geom::Affine *_pattern_to_user; Geom::Affine _overflow_initial_transform; diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index c09b8e9c8..7e61cdbbb 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -39,6 +39,7 @@ #include "sp-item.h" #include "sp-item-group.h" #include "style.h" +#include "sp-hatch.h" #include "sp-linear-gradient.h" #include "sp-radial-gradient.h" #include "sp-pattern.h" @@ -1129,6 +1130,82 @@ CairoRenderContext::_createPatternPainter(SPPaintServer const *const paintserver return result; } +cairo_pattern_t* +CairoRenderContext::_createHatchPainter(SPPaintServer const *const paintserver, Geom::OptRect const &pbox) { + g_assert( SP_IS_HATCH(paintserver) ); + SPHatch *hatch = SP_HATCH(paintserver); + + g_assert(hatch->pitch() > 0); + + // create drawing and group + Inkscape::Drawing drawing; + unsigned dkey = SPItem::display_key_new(1); + + hatch->show(drawing, dkey, pbox); + + SPHatch::RenderInfo render_info = hatch->calculateRenderInfo(dkey); + Geom::Rect tile_rect = render_info.tile_rect; + + // Cairo requires an integer pattern surface width/height. + // Subtract 0.5 to prevent small rounding errors from increasing pattern size by one pixel. + // Multiply by SUBPIX_SCALE to allow for less than a pixel precision + const int subpix_scale = 10; + double surface_width = MAX(ceil(subpix_scale * tile_rect.width() - 0.5), 1); + double surface_height = MAX(ceil(subpix_scale * tile_rect.height() - 0.5), 1); + Geom::Affine drawing_scale = Geom::Scale(surface_width / tile_rect.width(), surface_height / tile_rect.height()); + Geom::Affine drawing_transform = Geom::Translate(-tile_rect.min()) * drawing_scale; + + Geom::Affine child_transform = render_info.child_transform; + child_transform *= drawing_transform; + + //The rendering of hatch overflow is implemented by repeated drawing + //of hatch paths over one strip. Within each iteration paths are moved by pitch value. + //The movement progresses from right to left. This gives the same result + //as drawing whole strips in left-to-right order. + gdouble overflow_right_strip = 0.0; + int overflow_steps = 1; + Geom::Affine overflow_transform; + if (hatch->style->overflow.computed == SP_CSS_OVERFLOW_VISIBLE) { + Geom::Interval bounds = hatch->bounds(); + overflow_right_strip = floor(bounds.max() / hatch->pitch()) * hatch->pitch(); + overflow_steps = ceil((overflow_right_strip - bounds.min()) / hatch->pitch()) + 1; + overflow_transform = Geom::Translate(hatch->pitch(), 0.0); + } + + CairoRenderContext *pattern_ctx = cloneMe(surface_width, surface_height); + pattern_ctx->setTransform(child_transform); + pattern_ctx->transform(Geom::Translate(-overflow_right_strip, 0.0)); + pattern_ctx->pushState(); + + std::vector<SPHatchPath *> children; + hatch->hatchPaths(children); + + for (int i = 0; i < overflow_steps; i++) { + for (std::vector<SPHatchPath *>::iterator iter = children.begin(); iter != children.end(); iter++) { + SPHatchPath *path = *iter; + _renderer->renderHatchPath(pattern_ctx, *path, dkey); + } + pattern_ctx->transform(overflow_transform); + } + + pattern_ctx->popState(); + + // setup a cairo_pattern_t + cairo_surface_t *pattern_surface = pattern_ctx->getSurface(); + TEST(pattern_ctx->saveAsPng("hatch.png")); + cairo_pattern_t *result = cairo_pattern_create_for_surface(pattern_surface); + cairo_pattern_set_extend(result, CAIRO_EXTEND_REPEAT); + + Geom::Affine pattern_transform; + pattern_transform = render_info.pattern_to_user_transform.inverse() * drawing_transform; + ink_cairo_pattern_set_matrix(result, pattern_transform); + + hatch->hide(dkey); + + delete pattern_ctx; + return result; +} + cairo_pattern_t* CairoRenderContext::_createPatternForPaintServer(SPPaintServer const *const paintserver, Geom::OptRect const &pbox, float alpha) @@ -1182,8 +1259,9 @@ CairoRenderContext::_createPatternForPaintServer(SPPaintServer const *const pain cairo_pattern_add_color_stop_rgba(pattern, rg->vector.stops[i].offset, rgb[0], rgb[1], rgb[2], rg->vector.stops[i].opacity * alpha); } } else if (SP_IS_PATTERN (paintserver)) { - pattern = _createPatternPainter(paintserver, pbox); + } else if (SP_IS_HATCH (paintserver)) { + pattern = _createHatchPainter(paintserver, pbox); } else { return NULL; } @@ -1249,26 +1327,29 @@ CairoRenderContext::_setFillStyle(SPStyle const *const style, Geom::OptRect cons TRACE(("merged op=%f\n", alpha)); } - if (style->fill.isColor()) { - float rgb[3]; - sp_color_get_rgb_floatv(&style->fill.value.color, rgb); + SPPaintServer const *paint_server = style->getFillPaintServer(); + if (paint_server && paint_server->isValid()) { - cairo_set_source_rgba(_cr, rgb[0], rgb[1], rgb[2], alpha); - - } else if (!style->fill.set) { // unset fill is black - cairo_set_source_rgba(_cr, 0, 0, 0, alpha); - - } else { - g_assert( style->fill.isPaintserver() - || SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) - || SP_IS_PATTERN(SP_STYLE_FILL_SERVER(style)) ); - - cairo_pattern_t *pattern = _createPatternForPaintServer(SP_STYLE_FILL_SERVER(style), pbox, alpha); + g_assert(SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) + || SP_IS_PATTERN(SP_STYLE_FILL_SERVER(style)) + || SP_IS_HATCH(SP_STYLE_FILL_SERVER(style))); + cairo_pattern_t *pattern = _createPatternForPaintServer(paint_server, pbox, alpha); if (pattern) { cairo_set_source(_cr, pattern); cairo_pattern_destroy(pattern); } + } else if (style->fill.colorSet) { + float rgb[3]; + sp_color_get_rgb_floatv(&style->fill.value.color, rgb); + + cairo_set_source_rgba(_cr, rgb[0], rgb[1], rgb[2], alpha); + + } else { // unset fill is black + g_assert(!style->fill.set + || (paint_server && !paint_server->isValid())); + + cairo_set_source_rgba(_cr, 0, 0, 0, alpha); } } @@ -1279,7 +1360,7 @@ CairoRenderContext::_setStrokeStyle(SPStyle const *style, Geom::OptRect const &p if (_state->merge_opacity) alpha *= _state->opacity; - if (style->stroke.isColor()) { + if (style->stroke.isColor() || (style->stroke.isPaintserver() && !style->getStrokePaintServer()->isValid())) { float rgb[3]; sp_color_get_rgb_floatv(&style->stroke.value.color, rgb); @@ -1287,7 +1368,8 @@ CairoRenderContext::_setStrokeStyle(SPStyle const *style, Geom::OptRect const &p } else { g_assert( style->stroke.isPaintserver() || SP_IS_GRADIENT(SP_STYLE_STROKE_SERVER(style)) - || SP_IS_PATTERN(SP_STYLE_STROKE_SERVER(style)) ); + || SP_IS_PATTERN(SP_STYLE_STROKE_SERVER(style)) + || SP_IS_HATCH(SP_STYLE_STROKE_SERVER(style))); cairo_pattern_t *pattern = _createPatternForPaintServer(SP_STYLE_STROKE_SERVER(style), pbox, alpha); diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h index 8d3e63775..59781a49c 100644 --- a/src/extension/internal/cairo-render-context.h +++ b/src/extension/internal/cairo-render-context.h @@ -201,6 +201,7 @@ protected: cairo_pattern_t *_createPatternForPaintServer(SPPaintServer const *const paintserver, Geom::OptRect const &pbox, float alpha); cairo_pattern_t *_createPatternPainter(SPPaintServer const *const paintserver, Geom::OptRect const &pbox); + cairo_pattern_t *_createHatchPainter(SPPaintServer const *const paintserver, Geom::OptRect const &pbox); unsigned int _showGlyphs(cairo_t *cr, PangoFont *font, std::vector<CairoGlyphInfo> const &glyphtext, bool is_stroke); diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 6fbc85c05..ec302bbfc 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -50,6 +50,7 @@ #include "sp-use.h" #include "sp-text.h" #include "sp-flowtext.h" +#include "sp-hatch-path.h" #include "sp-image.h" #include "sp-symbol.h" #include "sp-pattern.h" @@ -596,6 +597,21 @@ void CairoRenderer::renderItem(CairoRenderContext *ctx, SPItem *item) ctx->popState(); } +void CairoRenderer::renderHatchPath(CairoRenderContext *ctx, SPHatchPath const &hatchPath, unsigned key) { + ctx->pushState(); + ctx->setStateForStyle(hatchPath.style); + ctx->transform(Geom::Translate(hatchPath.offset.computed, 0)); + + SPCurve *curve = hatchPath.calculateRenderCurve(key); + Geom::PathVector const & pathv =curve->get_pathvector(); + if (!pathv.empty()) { + ctx->renderPathVector(pathv, hatchPath.style, Geom::OptRect()); + } + + curve->unref(); + ctx->popState(); +} + bool CairoRenderer::setupDocument(CairoRenderContext *ctx, SPDocument *doc, bool pageBoundingBox, float bleedmargin_px, SPItem *base) { diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h index cfef6bdea..abc0447d8 100644 --- a/src/extension/internal/cairo-renderer.h +++ b/src/extension/internal/cairo-renderer.h @@ -29,6 +29,7 @@ class SPClipPath; class SPMask; +class SPHatchPath; namespace Inkscape { namespace Extension { @@ -57,6 +58,7 @@ public: /** Traverses the object tree and invokes the render methods. */ void renderItem(CairoRenderContext *ctx, SPItem *item); + void renderHatchPath(CairoRenderContext *ctx, SPHatchPath const &hatchPath, unsigned key); }; // FIXME: this should be a static method of CairoRenderer diff --git a/src/sp-hatch-path.cpp b/src/sp-hatch-path.cpp index bdefd32d8..f7138fac2 100644 --- a/src/sp-hatch-path.cpp +++ b/src/sp-hatch-path.cpp @@ -25,6 +25,7 @@ #include "display/drawing-surface.h" #include "display/drawing.h" #include "display/drawing-shape.h" +#include "helper/geom.h" #include "attributes.h" #include "document-private.h" #include "uri.h" @@ -45,6 +46,7 @@ bool hatchRegistered = SPFactory::instance().registerObject("svg:hatchPath", cre SPHatchPath::SPHatchPath() : _curve(NULL) + , _continuous(false) { offset.unset(); } @@ -131,6 +133,8 @@ void SPHatchPath::update(SPCtx* ctx, unsigned int flags) { if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) { if (this->style->stroke_width.unit == SP_CSS_UNIT_PERCENT) { + //TODO: Check specification + SPItemCtx *ictx = (SPItemCtx *) ctx; double const aw = 1.0 / ictx->i2vp.descrim(); this->style->stroke_width.computed = this->style->stroke_width.value * aw; @@ -155,9 +159,10 @@ bool SPHatchPath::isValid() const { return true; } -Inkscape::DrawingItem *SPHatchPath::show(Inkscape::Drawing &drawing, unsigned int key) { +Inkscape::DrawingItem *SPHatchPath::show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptInterval extents) { Inkscape::DrawingShape *s = new Inkscape::DrawingShape(drawing); _display.push_front(View(s, key)); + _display.front().extents = extents; _updateView(_display.front()); @@ -185,6 +190,36 @@ void SPHatchPath::setStripExtents(unsigned int key, Geom::OptInterval const &ext } } +Geom::Interval SPHatchPath::bounds() const { + Geom::OptRect bbox; + Geom::Interval result; + + Geom::Affine transform = Geom::Translate(offset.computed, 0); + if (!this->_curve) { + SPCurve test_curve; + test_curve.moveto(Geom::Point(0, 0)); + test_curve.moveto(Geom::Point(0, 1)); + bbox = bounds_exact_transformed(test_curve.get_pathvector(), transform); + } else { + bbox = bounds_exact_transformed(this->_curve->get_pathvector(), transform); + } + + gdouble stroke_width = style->stroke_width.computed; + result.setMin(bbox->left() - stroke_width / 2); + result.setMax(bbox->right() + stroke_width / 2); + return result; +} + +SPCurve *SPHatchPath::calculateRenderCurve(unsigned key) const { + for (ConstViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + if (iter->key == key) { + return _calculateRenderCurve(*iter); + } + } + g_assert_not_reached(); + return NULL; +} + gdouble SPHatchPath::_repeatLength() const { if (!_curve) { return 0; @@ -198,10 +233,22 @@ gdouble SPHatchPath::_repeatLength() const { } void SPHatchPath::_updateView(View &view) { + SPCurve *calculated_curve = _calculateRenderCurve(view); + + Geom::Affine offset_transform = Geom::Translate(offset.computed, 0); + view.arenaitem->setTransform(offset_transform); + style->fill.setNone(); + view.arenaitem->setStyle(this->style); + view.arenaitem->setPath(calculated_curve); + + calculated_curve->unref(); +} + +SPCurve *SPHatchPath::_calculateRenderCurve(View const &view) const { SPCurve *calculated_curve = new SPCurve; if (!view.extents) { - return; + return calculated_curve; } if (!_curve) { @@ -230,16 +277,10 @@ void SPHatchPath::_updateView(View &view) { segment->unref(); } } - - Geom::Affine offset_transform = Geom::Translate(offset.computed, 0); - view.arenaitem->setTransform(offset_transform); - style->fill.setNone(); - view.arenaitem->setStyle(this->style); - view.arenaitem->setPath(calculated_curve); - - calculated_curve->unref(); + return calculated_curve; } + void SPHatchPath::_readHatchPathVector(char const *str, Geom::PathVector &pathv, bool &continous_join) { if (!str) { return; diff --git a/src/sp-hatch-path.h b/src/sp-hatch-path.h index ff091c6f9..57b3a8237 100644 --- a/src/sp-hatch-path.h +++ b/src/sp-hatch-path.h @@ -40,10 +40,13 @@ public: bool isValid() const; - Inkscape::DrawingItem *show(Inkscape::Drawing &drawing, unsigned int key); + Inkscape::DrawingItem *show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptInterval extents); void hide(unsigned int key); void setStripExtents(unsigned int key, Geom::OptInterval const &extents); + Geom::Interval bounds() const; + + SPCurve *calculateRenderCurve(unsigned key) const; protected: virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); @@ -61,10 +64,12 @@ private: unsigned int key; }; typedef std::list<SPHatchPath::View>::iterator ViewIterator; + typedef std::list<SPHatchPath::View>::const_iterator ConstViewIterator; std::list<View> _display; gdouble _repeatLength() const; void _updateView(View &view); + SPCurve *_calculateRenderCurve(View const &view) const; void _readHatchPathVector(char const *str, Geom::PathVector &pathv, bool &continous_join); diff --git a/src/sp-hatch.cpp b/src/sp-hatch.cpp index cde6c86cb..98cc596d7 100644 --- a/src/sp-hatch.cpp +++ b/src/sp-hatch.cpp @@ -77,6 +77,7 @@ void SPHatch::build(SPDocument* doc, Inkscape::XML::Node* repr) { this->readAttr("pitch"); this->readAttr("rotate"); this->readAttr("xlink:href"); + this->readAttr( "style" ); /* Register ourselves */ doc->addResource("hatch", this); @@ -89,7 +90,7 @@ void SPHatch::release() { } std::vector<SPHatchPath *> children; - _children(children); + hatchPaths(children); for (ViewIterator view_iter = _display.begin(); view_iter != _display.end(); view_iter++) { for (ChildIterator child_iter = children.begin(); child_iter != children.end(); child_iter++) { @@ -117,10 +118,9 @@ void SPHatch::child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) if (path_child) { for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { - Inkscape::DrawingItem *ac = path_child->show(iter->arenaitem->drawing(), iter->key); + Geom::OptInterval extents = _calculateStripExtents(iter->bbox); + Inkscape::DrawingItem *ac = path_child->show(iter->arenaitem->drawing(), iter->key, extents); - Geom::OptInterval strip_extents = _calculateStripExtents(iter->bbox); - path_child->setStripExtents(iter->key, strip_extents); path_child->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); if (ac) { iter->arenaitem->prependChild(ac); @@ -224,7 +224,12 @@ void SPHatch::set(unsigned int key, const gchar* value) { break; default: - SPPaintServer::set(key, value); + if (SP_ATTRIBUTE_IS_CSS(key)) { + sp_style_read_from_object(this->style, this); + requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG); + } else { + SPPaintServer::set(key, value); + } break; } } @@ -238,7 +243,7 @@ bool SPHatch::_hasHatchPatchChildren(SPHatch const *hatch) { return false; } -void SPHatch::_children(std::vector<SPHatchPath*>& l) { +void SPHatch::hatchPaths(std::vector<SPHatchPath*>& l) { SPHatch *src = chase_hrefs<SPHatch>(this, sigc::ptr_fun(&_hasHatchPatchChildren)); if (src) { @@ -250,7 +255,7 @@ void SPHatch::_children(std::vector<SPHatchPath*>& l) { } } -void SPHatch::_children(std::vector<SPHatchPath const*>& l) const { +void SPHatch::hatchPaths(std::vector<SPHatchPath const*>& l) const { SPHatch const *src = chase_hrefs<SPHatch const>(this, sigc::ptr_fun(&_hasHatchPatchChildren)); if (src) { @@ -275,7 +280,7 @@ void SPHatch::update(SPCtx* ctx, unsigned int flags) { flags &= SP_OBJECT_MODIFIED_CASCADE; std::vector<SPHatchPath *> children; - _children(children); + hatchPaths(children); for (ChildIterator iter = children.begin(); iter != children.end(); iter++) { SPHatchPath* child = *iter; @@ -308,7 +313,7 @@ void SPHatch::modified(unsigned int flags) { flags &= SP_OBJECT_MODIFIED_CASCADE; std::vector<SPHatchPath *> children; - _children(children); + hatchPaths(children); for (ChildIterator iter = children.begin(); iter != children.end(); iter++) { SPObject *child = *iter; @@ -337,29 +342,28 @@ void SPHatch::_onRefChanged(SPObject *old_ref, SPObject *ref) { if (!_hasHatchPatchChildren(this)) { SPHatch *old_shown = NULL; SPHatch *new_shown = NULL; - std::vector<SPHatchPath *> old_children; - std::vector<SPHatchPath *> new_children; + std::vector<SPHatchPath *> oldhatchPaths; + std::vector<SPHatchPath *> newhatchPaths; if (SP_IS_HATCH(old_ref)) { old_shown = SP_HATCH(old_ref)->rootHatch(); - old_shown->_children(old_children); + old_shown->hatchPaths(oldhatchPaths); } if (SP_IS_HATCH(ref)) { new_shown = SP_HATCH(ref)->rootHatch(); - new_shown->_children(new_children); + new_shown->hatchPaths(newhatchPaths); } if (old_shown != new_shown) { for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { Geom::OptInterval extents = _calculateStripExtents(iter->bbox); - for (ChildIterator child_iter = old_children.begin(); child_iter != old_children.end(); child_iter++) { + for (ChildIterator child_iter = oldhatchPaths.begin(); child_iter != oldhatchPaths.end(); child_iter++) { SPHatchPath *child = *child_iter; child->hide(iter->key); } - for (ChildIterator child_iter = new_children.begin(); child_iter != new_children.end(); child_iter++) { + for (ChildIterator child_iter = newhatchPaths.begin(); child_iter != newhatchPaths.end(); child_iter++) { SPHatchPath *child = *child_iter; - Inkscape::DrawingItem *cai = child->show(iter->arenaitem->drawing(), iter->key); - child->setStripExtents(iter->key, extents); + Inkscape::DrawingItem *cai = child->show(iter->arenaitem->drawing(), iter->key, extents); child->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); if (cai) { iter->arenaitem->appendChild(cai); @@ -457,7 +461,7 @@ bool SPHatch::isValid() const { } std::vector<SPHatchPath const *> children; - _children(children); + hatchPaths(children); if (children.empty()) { return false; } @@ -471,17 +475,19 @@ bool SPHatch::isValid() const { return true; } -Inkscape::DrawingPattern *SPHatch::show(Inkscape::Drawing &drawing, unsigned int key) { +Inkscape::DrawingPattern *SPHatch::show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptRect bbox) { Inkscape::DrawingPattern *ai = new Inkscape::DrawingPattern(drawing); //TODO: set some debug flag to see DrawingPattern _display.push_front(View(ai, key)); + _display.front().bbox = bbox; std::vector<SPHatchPath *> children; - _children(children); + hatchPaths(children); + Geom::OptInterval extents = _calculateStripExtents(bbox); for (ChildIterator iter = children.begin(); iter != children.end(); iter++) { SPHatchPath *child = *iter; - Inkscape::DrawingItem *cai = child->show(drawing, key); + Inkscape::DrawingItem *cai = child->show(drawing, key, extents); if (cai) { ai->appendChild(cai); } @@ -495,7 +501,7 @@ Inkscape::DrawingPattern *SPHatch::show(Inkscape::Drawing &drawing, unsigned int void SPHatch::hide(unsigned int key) { std::vector<SPHatchPath *> children; - _children(children); + hatchPaths(children); for (ChildIterator iter = children.begin(); iter != children.end(); iter++) { SPHatchPath *child = *iter; @@ -513,10 +519,56 @@ void SPHatch::hide(unsigned int key) { g_assert_not_reached(); } + +Geom::Interval SPHatch::bounds() const { + Geom::Interval result; + std::vector<SPHatchPath const *> children; + hatchPaths(children); + + for (ConstChildIterator iter = children.begin(); iter != children.end(); iter++) { + SPHatchPath const *child = *iter; + if (result.extent() == 0) { + result = child->bounds(); + } else { + result |= child->bounds(); + } + } + return result; +} + +SPHatch::RenderInfo SPHatch::calculateRenderInfo(unsigned key) const { + RenderInfo info; + for (ConstViewIterator iter = _display.begin(); iter != _display.end(); iter++) { + if (iter->key == key) { + return _calculateRenderInfo(*iter); + } + } + g_assert_not_reached(); + return info; +} + void SPHatch::_updateView(View &view) { + RenderInfo info = _calculateRenderInfo(view); + //The rendering of hatch overflow is implemented by repeated drawing + //of hatch paths over one strip. Within each iteration paths are moved by pitch value. + //The movement progresses from right to left. This gives the same result + //as drawing whole strips in left-to-right order. + + + view.arenaitem->setChildTransform(info.child_transform); + view.arenaitem->setPatternToUserTransform(info.pattern_to_user_transform); + view.arenaitem->setTileRect(info.tile_rect); + view.arenaitem->setStyle(this->style); + view.arenaitem->setOverflow(info.overflow_initial_transform, info.overflow_steps, + info.overflow_step_transform); +} + +SPHatch::RenderInfo SPHatch::_calculateRenderInfo(View const &view) const { + RenderInfo info; + Geom::OptInterval extents = _calculateStripExtents(view.bbox); if (!extents) { - return; + return info; } double tile_x = x(); @@ -545,14 +597,26 @@ void SPHatch::_updateView(View &view) { // Tile (hatch space) to user. Geom::Affine ps2user = Geom::Translate(tile_x, tile_y) * Geom::Rotate::from_degrees(tile_rotate) * hatchTransform(); - view.arenaitem->setChildTransform(content2ps); - view.arenaitem->setPatternToUserTransform(ps2user); - view.arenaitem->setTileRect(hatch_tile); - view.arenaitem->setStyle(this->style); + info.child_transform = content2ps; + info.pattern_to_user_transform = ps2user; + info.tile_rect = hatch_tile; + + if (style->overflow.computed == SP_CSS_OVERFLOW_VISIBLE) { + Geom::Interval bounds = this->bounds(); + gdouble pitch = this->pitch(); + gdouble overflow_right_strip = floor(bounds.max() / pitch) * pitch; + info.overflow_steps = ceil((overflow_right_strip - bounds.min()) / pitch) + 1; + info.overflow_step_transform = Geom::Translate(pitch, 0.0); + info.overflow_initial_transform = Geom::Translate(-overflow_right_strip, 0.0); + } else { + info.overflow_steps = 1; + } + + return info; } //calculates strip extents in content space -Geom::OptInterval SPHatch::_calculateStripExtents(Geom::OptRect bbox) { +Geom::OptInterval SPHatch::_calculateStripExtents(Geom::OptRect bbox) const { if (!bbox || (bbox->area() == 0)) { return Geom::OptInterval(); } @@ -590,9 +654,7 @@ cairo_pattern_t* SPHatch::pattern_new(cairo_t *base_ct, Geom::OptRect const &bbo } void SPHatch::setBBox(unsigned int key, Geom::OptRect const &bbox) { - typedef std::list<View>::iterator ViewIter; - - for (ViewIter iter = _display.begin(); iter != _display.end(); iter++) { + for (ViewIterator iter = _display.begin(); iter != _display.end(); iter++) { if (iter->key == key) { iter->bbox = bbox; break; diff --git a/src/sp-hatch.h b/src/sp-hatch.h index 170f68a7a..dc6ee0add 100644 --- a/src/sp-hatch.h +++ b/src/sp-hatch.h @@ -48,6 +48,16 @@ public: UNITS_OBJECTBOUNDINGBOX }; + struct RenderInfo { + Geom::Affine child_transform; + Geom::Affine pattern_to_user_transform; + Geom::Rect tile_rect; + + int overflow_steps; + Geom::Affine overflow_step_transform; + Geom::Affine overflow_initial_transform; + }; + SPHatch(); virtual ~SPHatch(); @@ -64,12 +74,17 @@ public: Geom::Affine const &hatchTransform() const; SPHatch *rootHatch(); //TODO: const + void hatchPaths(std::vector<SPHatchPath*>& l); + void hatchPaths(std::vector<SPHatchPath const *>& l) const; + bool isValid() const; - Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key); + Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptRect bbox); void hide(unsigned int key); virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); + RenderInfo calculateRenderInfo(unsigned key) const; + Geom::Interval bounds() const; void setBBox(unsigned int key, Geom::OptRect const &bbox); protected: @@ -89,17 +104,18 @@ private: Geom::OptRect bbox; unsigned int key; }; + typedef std::vector<SPHatchPath *>::iterator ChildIterator; typedef std::vector<SPHatchPath const *>::const_iterator ConstChildIterator; typedef std::list<View>::iterator ViewIterator; - void _updateView(View &view); + typedef std::list<View>::const_iterator ConstViewIterator; static bool _hasHatchPatchChildren(SPHatch const* hatch); - void _children(std::vector<SPHatchPath*>& l); - void _children(std::vector<SPHatchPath const *>& l) const; + void _updateView(View &view); + RenderInfo _calculateRenderInfo(View const &view) const; + Geom::OptInterval _calculateStripExtents(Geom::OptRect bbox) const; - Geom::OptInterval _calculateStripExtents(Geom::OptRect bbox); /** Gets called when the hatch is reattached to another <hatch> diff --git a/src/sp-item.cpp b/src/sp-item.cpp index da6e6ea58..f6de165a6 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -615,9 +615,8 @@ void SPItem::fill_ps_ref_changed(SPObject *old_ps, SPObject *ps, SPItem *item) { v->arenaitem->setKey(SPItem::display_key_new(3)); } Inkscape::DrawingPattern *pi = new_fill_ps->show( - v->arenaitem->drawing(), v->arenaitem->key()); + v->arenaitem->drawing(), v->arenaitem->key(), bbox); v->arenaitem->setFillPattern(pi); - new_fill_ps->setBBox(v->arenaitem->key(), bbox); if (pi) { new_fill_ps->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } @@ -625,8 +624,29 @@ void SPItem::fill_ps_ref_changed(SPObject *old_ps, SPObject *ps, SPItem *item) { } } -void SPItem::stroke_ps_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item) { +void SPItem::stroke_ps_ref_changed(SPObject *old_ps, SPObject *ps, SPItem *item) { + SPPaintServer *old_stroke_ps = SP_PAINT_SERVER(old_ps); + if (old_stroke_ps) { + for (SPItemView *v =item->display; v != NULL; v = v->next) { + old_stroke_ps->hide(v->arenaitem->key()); + } + } + SPPaintServer *new_stroke_ps = SP_PAINT_SERVER(ps); + if (new_stroke_ps) { + Geom::OptRect bbox = item->geometricBounds(); + for (SPItemView *v = item->display; v != NULL; v = v->next) { + if (!v->arenaitem->key()) { + v->arenaitem->setKey(SPItem::display_key_new(3)); + } + Inkscape::DrawingPattern *pi = new_stroke_ps->show( + v->arenaitem->drawing(), v->arenaitem->key(), bbox); + v->arenaitem->setStrokePattern(pi); + if (pi) { + new_stroke_ps->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + } + } + } } void SPItem::update(SPCtx* /*ctx*/, guint flags) { @@ -1142,9 +1162,8 @@ Inkscape::DrawingItem *SPItem::invoke_show(Inkscape::Drawing &drawing, unsigned } int fill_key = display->arenaitem->key(); - Inkscape::DrawingPattern *ap = fill_ps->show(drawing, fill_key); + Inkscape::DrawingPattern *ap = fill_ps->show(drawing, fill_key, item_bbox); ai->setFillPattern(ap); - fill_ps->setBBox(fill_key, item_bbox); if (ap) { fill_ps->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } @@ -1156,9 +1175,8 @@ Inkscape::DrawingItem *SPItem::invoke_show(Inkscape::Drawing &drawing, unsigned } int stroke_key = display->arenaitem->key(); - Inkscape::DrawingPattern *ap = stroke_ps->show(drawing, stroke_key); + Inkscape::DrawingPattern *ap = stroke_ps->show(drawing, stroke_key, item_bbox); ai->setStrokePattern(ap); - stroke_ps->setBBox(stroke_key, item_bbox); if (ap) { stroke_ps->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } diff --git a/src/sp-paint-server.h b/src/sp-paint-server.h index 91d292424..6c88199b9 100644 --- a/src/sp-paint-server.h +++ b/src/sp-paint-server.h @@ -43,7 +43,7 @@ public: //on demand by pattern_new method. It is used for gradients. The other one is to add elements //representing PaintServer in NR tree. It is used by hatches and patterns. //Either pattern new or all three methods show, hide, setBBox need to be implemented - virtual Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key) {return NULL;} + virtual Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptRect bbox) {return NULL;} virtual void hide(unsigned int key) {}; virtual void setBBox(unsigned int key, Geom::OptRect const &bbox) {}; -- cgit v1.2.3 From f8d50684eddc79a56c79a679b6d0d608b739a0cc Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Tue, 14 Oct 2014 13:49:43 +0200 Subject: Add 'white-space' CSS property (replaces deprecated xml:space). (bzr r13612) --- src/attributes.cpp | 10 +++-- src/attributes.h | 31 ++++++++++---- src/sp-string.cpp | 119 ++++++++++++++++++++++++++++++++++++++++++----------- src/style-enums.h | 17 ++++++++ src/style.cpp | 10 +++++ src/style.h | 40 ++++++++++++------ 6 files changed, 177 insertions(+), 50 deletions(-) diff --git a/src/attributes.cpp b/src/attributes.cpp index fec5d3af4..2474e4abe 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -413,10 +413,6 @@ static SPStyleProp const props[] = { /* Text */ {SP_PROP_TEXT_INDENT, "text-indent"}, {SP_PROP_TEXT_ALIGN, "text-align"}, - {SP_PROP_TEXT_DECORATION, "text-decoration"}, - {SP_PROP_TEXT_DECORATION_LINE, "text-decoration-line"}, - {SP_PROP_TEXT_DECORATION_STYLE,"text-decoration-style"}, - {SP_PROP_TEXT_DECORATION_COLOR,"text-decoration-color"}, {SP_PROP_LINE_HEIGHT, "line-height"}, {SP_PROP_LETTER_SPACING, "letter-spacing"}, {SP_PROP_WORD_SPACING, "word-spacing"}, @@ -433,6 +429,12 @@ static SPStyleProp const props[] = { {SP_PROP_GLYPH_ORIENTATION_VERTICAL, "glyph-orientation-vertical"}, {SP_PROP_KERNING, "kerning"}, {SP_PROP_TEXT_ANCHOR, "text-anchor"}, + {SP_PROP_WHITE_SPACE, "white-space"}, + /* Text Decoration */ + {SP_PROP_TEXT_DECORATION, "text-decoration"}, + {SP_PROP_TEXT_DECORATION_LINE, "text-decoration-line"}, + {SP_PROP_TEXT_DECORATION_STYLE,"text-decoration-style"}, + {SP_PROP_TEXT_DECORATION_COLOR,"text-decoration-color"}, /* Misc */ {SP_PROP_CLIP, "clip"}, {SP_PROP_COLOR, "color"}, diff --git a/src/attributes.h b/src/attributes.h index 3397e4034..7f18cb5ea 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -399,9 +399,11 @@ enum SPAttributeEnum { SP_ATTR_TEXT_EXCLUDE, SP_ATTR_LAYOUT_OPTIONS, - /* CSS2 */ - /* Custom full font name because Font stuff below is inadequate */ + /* CSS & SVG Properties */ + + /* Custom full font name because Font stuff below is inadequate REMOVE ME */ SP_PROP_INKSCAPE_FONT_SPEC, + /* Font */ SP_PROP_FONT, SP_PROP_FONT_FAMILY, @@ -411,18 +413,16 @@ enum SPAttributeEnum { SP_PROP_FONT_STYLE, SP_PROP_FONT_VARIANT, SP_PROP_FONT_WEIGHT, - /* Text */ + + /* Text Layout */ SP_PROP_TEXT_INDENT, SP_PROP_TEXT_ALIGN, - SP_PROP_TEXT_DECORATION, /* SVG 1 underline etc.( no color or style) OR SVG2 with _LINE, _STYLE, _COLOR values */ - SP_PROP_TEXT_DECORATION_LINE, /* SVG 2 underline etc. */ - SP_PROP_TEXT_DECORATION_STYLE, /* SVG 2 proposed solid [SVG 1], dotted, etc.)*/ - SP_PROP_TEXT_DECORATION_COLOR, /* SVG 2 proposed same as text [SVG 1], specified*/ + SP_PROP_LINE_HEIGHT, SP_PROP_LETTER_SPACING, SP_PROP_WORD_SPACING, SP_PROP_TEXT_TRANSFORM, - /* text (css3) */ + SP_PROP_DIRECTION, SP_PROP_BLOCK_PROGRESSION, SP_PROP_WRITING_MODE, @@ -434,6 +434,14 @@ enum SPAttributeEnum { SP_PROP_GLYPH_ORIENTATION_VERTICAL, SP_PROP_KERNING, SP_PROP_TEXT_ANCHOR, + SP_PROP_WHITE_SPACE, + + /* Text Decoration */ + SP_PROP_TEXT_DECORATION, /* SVG 1 underline etc.( no color or style) OR SVG2 with _LINE, _STYLE, _COLOR values */ + SP_PROP_TEXT_DECORATION_LINE, /* SVG 2 underline etc. */ + SP_PROP_TEXT_DECORATION_STYLE, /* SVG 2 proposed solid [SVG 1], dotted, etc.)*/ + SP_PROP_TEXT_DECORATION_COLOR, /* SVG 2 proposed same as text [SVG 1], specified*/ + /* Misc */ SP_PROP_CLIP, SP_PROP_COLOR, @@ -443,24 +451,29 @@ enum SPAttributeEnum { SP_PROP_VISIBILITY, SP_PROP_MIX_BLEND_MODE, SP_PROP_ISOLATION, + /* SVG */ /* Clip/Mask */ SP_PROP_CLIP_PATH, SP_PROP_CLIP_RULE, SP_PROP_MASK, SP_PROP_OPACITY, + /* Filter */ SP_PROP_ENABLE_BACKGROUND, SP_PROP_FILTER, SP_PROP_FLOOD_COLOR, SP_PROP_FLOOD_OPACITY, SP_PROP_LIGHTING_COLOR, + /* Gradient */ SP_PROP_STOP_COLOR, SP_PROP_STOP_OPACITY, SP_PROP_STOP_PATH, + /* Interactivity */ SP_PROP_POINTER_EVENTS, + /* Paint */ SP_PROP_COLOR_INTERPOLATION, SP_PROP_COLOR_INTERPOLATION_FILTERS, @@ -487,10 +500,12 @@ enum SPAttributeEnum { SP_PROP_STROKE_OPACITY, SP_PROP_STROKE_WIDTH, SP_PROP_TEXT_RENDERING, + /* Conditional */ SP_PROP_SYSTEM_LANGUAGE, SP_PROP_REQUIRED_FEATURES, SP_PROP_REQUIRED_EXTENSIONS, + /* LivePathEffect */ SP_PROP_PATH_EFFECT, }; diff --git a/src/sp-string.cpp b/src/sp-string.cpp index e9dfc168b..b561187d0 100644 --- a/src/sp-string.cpp +++ b/src/sp-string.cpp @@ -30,10 +30,14 @@ #include "sp-string.h" +#include "style.h" + #include "xml/repr.h" #include "sp-factory.h" +#include <iostream> + namespace { SPObject* createString() { return new SPString(); @@ -65,45 +69,110 @@ void SPString::release() { void SPString::read_content() { - SPString* object = this; + SPString* object = this; SPString *string = SP_STRING(object); string->string.clear(); //XML Tree being used directly here while it shouldn't be. gchar const *xml_string = string->getRepr()->content(); - // see algorithms described in svg 1.1 section 10.15 - if (object->xml_space.value == SP_XML_SPACE_PRESERVE) { - for ( ; *xml_string ; xml_string = g_utf8_next_char(xml_string) ) { - gunichar c = g_utf8_get_char(xml_string); - if ((c == 0xa) || (c == 0xd) || (c == '\t')) { - c = ' '; - } - string->string += c; + + // std::cout << ">" << (xml_string?xml_string:"Null") << "<" << std::endl; + + // SVG2/CSS Text Level 3 'white-space' has five values. + // See: http://dev.w3.org/csswg/css-text/#white-space + // | New Lines | Spaces/Tabs | Text Wrapping + // ---------|------------|--------------|-------------- + // normal | Collapes | Collapse | Wrap + // pre | Preserve | Preserve | No Wrap + // nowrap | Collapse | Collapse | No Wrap + // pre-wrap | Preserve | Preserve | Wrap + // pre-line | Preserve | Collapse | Wrap + + // 'xml:space' has two values: + // 'default' which corresponds to 'normal' (without wrapping). + // 'preserve' which corresponds to 'pre' except new lines are converted to spaces. + // See algorithms described in svg 1.1 section 10.15 + + bool collapse_space = true; + bool collapse_line = true; + bool is_css = false; + + // Strings don't have style, check parent for style + if( object->parent && object->parent->style ) { + if( object->parent->style->white_space.computed == SP_CSS_WHITE_SPACE_PRE || + object->parent->style->white_space.computed == SP_CSS_WHITE_SPACE_PREWRAP || + object->parent->style->white_space.computed == SP_CSS_WHITE_SPACE_PRELINE ) { + collapse_line = false; + } + if( object->parent->style->white_space.computed == SP_CSS_WHITE_SPACE_PRE || + object->parent->style->white_space.computed == SP_CSS_WHITE_SPACE_PREWRAP ) { + collapse_space = false; + } + if( object->parent->style->white_space.computed != SP_CSS_WHITE_SPACE_NORMAL ) { + is_css = true; // If white-space not normal, we assume white-space is set. } } - else { - bool whitespace = false; - for ( ; *xml_string ; xml_string = g_utf8_next_char(xml_string) ) { - gunichar c = g_utf8_get_char(xml_string); - if ((c == 0xa) || (c == 0xd)) { + if( !is_css ) { + // SVG 2: Use 'xml:space' only if 'white-space' not 'normal'. + if (object->xml_space.value == SP_XML_SPACE_PRESERVE) { + collapse_space = false; + } + } + + bool white_space = false; + for ( ; *xml_string ; xml_string = g_utf8_next_char(xml_string) ) { + + gunichar c = g_utf8_get_char(xml_string); + switch (c) { + case 0xd: // Carriage return + // XML Parsers convert 0xa, 0xd, 0xD 0xA to 0xA. CSS also follows this rule so we + // should never see 0xd. + std::cerr << "SPString: Carriage Return found! Argh!" << std::endl; continue; - } - if ((c == ' ') || (c == '\t')) { - whitespace = true; - } else { - if (whitespace && (!string->string.empty() || (object->getPrev() != NULL))) { + break; + case 0xa: // Line feed + if( collapse_line ) { + if( !is_css && collapse_space ) continue; // xml:space == 'default' strips LFs. + white_space = true; // Convert to space and collapse + } else { + string->string += c; // Preserve line feed + continue; + } + break; + case '\t': // Tab + if( collapse_space ) { + white_space = true; // Convert to space and collapse + } else { + string->string += c; // Preserve tab + continue; + } + break; + case ' ': // Space + if( collapse_space ) { + white_space = true; // Collapse white space + } else { + string->string += c; // Preserve space + continue; + } + break; + default: + if( white_space && (!string->string.empty() || (object->getPrev() != NULL))) { string->string += ' '; } string->string += c; - whitespace = false; - } - } - if (whitespace && object->getRepr()->next() != NULL) { // can't use SPObject::getNext() when the SPObject tree is still being built - string->string += ' '; - } + white_space = false; + + } // End switch + } // End loop + + // Insert white space at end if more text follows + if (white_space && object->getRepr()->next() != NULL) { // can't use SPObject::getNext() when the SPObject tree is still being built + string->string += ' '; } + + // std::cout << ">" << string->string << "<" << std::endl; object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } diff --git a/src/style-enums.h b/src/style-enums.h index 356029a40..024943458 100644 --- a/src/style-enums.h +++ b/src/style-enums.h @@ -113,6 +113,14 @@ enum SPTextAnchor { SP_CSS_TEXT_ANCHOR_END }; +enum SPWhiteSpace { + SP_CSS_WHITE_SPACE_NORMAL, + SP_CSS_WHITE_SPACE_PRE, + SP_CSS_WHITE_SPACE_NOWRAP, + SP_CSS_WHITE_SPACE_PREWRAP, + SP_CSS_WHITE_SPACE_PRELINE +}; + enum SPCSSBaselineShift { SP_CSS_BASELINE_SHIFT_BASELINE, SP_CSS_BASELINE_SHIFT_SUB, @@ -326,6 +334,15 @@ static SPStyleEnum const enum_text_anchor[] = { {NULL, -1} }; +static SPStyleEnum const enum_white_space[] = { + {"normal", SP_CSS_WHITE_SPACE_NORMAL }, + {"pre", SP_CSS_WHITE_SPACE_PRE }, + {"nowrap", SP_CSS_WHITE_SPACE_NOWRAP }, + {"pre-wrap", SP_CSS_WHITE_SPACE_PREWRAP}, + {"pre-line", SP_CSS_WHITE_SPACE_PRELINE}, + {NULL, -1} +}; + static SPStyleEnum const enum_direction[] = { {"ltr", SP_CSS_DIRECTION_LTR}, {"rtl", SP_CSS_DIRECTION_RTL}, diff --git a/src/style.cpp b/src/style.cpp index abc928d76..a91611d89 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -135,6 +135,7 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : writing_mode( "writing-mode", enum_writing_mode, SP_CSS_WRITING_MODE_LR_TB ), baseline_shift(), text_anchor( "text-anchor", enum_text_anchor, SP_CSS_TEXT_ANCHOR_START ), + white_space( "white-space", enum_white_space, SP_CSS_WHITE_SPACE_NORMAL ), // General visual properties clip_rule( "clip-rule", enum_clip_rule, SP_WIND_RULE_NONZERO ), @@ -297,6 +298,7 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : _properties.push_back( &writing_mode ); _properties.push_back( &baseline_shift ); _properties.push_back( &text_anchor ); + _properties.push_back( &white_space ); _properties.push_back( &clip_rule ); _properties.push_back( &display ); @@ -379,6 +381,7 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : // _propmap.insert( std::make_pair( writing_mode.name, reinterpret_cast<SPIBasePtr>(&SPStyle::writing_mode ) ) ); // _propmap.insert( std::make_pair( baseline_shift.name, reinterpret_cast<SPIBasePtr>(&SPStyle::baseline_shift ) ) ); // _propmap.insert( std::make_pair( text_anchor.name, reinterpret_cast<SPIBasePtr>(&SPStyle::text_anchor ) ) ); + // _propmap.insert( std::make_pair( white_space.name, reinterpret_cast<SPIBasePtr>(&SPStyle::white_space ) ) ); // _propmap.insert( std::make_pair( clip_rule.name, reinterpret_cast<SPIBasePtr>(&SPStyle::clip_rule ) ) ); // _propmap.insert( std::make_pair( display.name, reinterpret_cast<SPIBasePtr>(&SPStyle::display ) ) ); @@ -670,6 +673,9 @@ SPStyle::readIfUnset( gint id, gchar const *val ) { case SP_PROP_TEXT_ANCHOR: text_anchor.readIfUnset( val ); break; + case SP_PROP_WHITE_SPACE: + white_space.readIfUnset( val ); + break; case SP_PROP_BASELINE_SHIFT: baseline_shift.readIfUnset( val ); break; @@ -1623,6 +1629,9 @@ sp_style_unset_property_attrs(SPObject *o) if (style->text_anchor.set) { repr->setAttribute("text-anchor", NULL); } + if (style->white_space.set) { + repr->setAttribute("white_space", NULL); + } if (style->writing_mode.set) { repr->setAttribute("writing_mode", NULL); } @@ -1712,6 +1721,7 @@ sp_css_attr_unset_text(SPCSSAttr *css) sp_repr_css_set_property(css, "block-progression", NULL); sp_repr_css_set_property(css, "writing-mode", NULL); sp_repr_css_set_property(css, "text-anchor", NULL); + sp_repr_css_set_property(css, "white_space", NULL); sp_repr_css_set_property(css, "kerning", NULL); // not implemented yet sp_repr_css_set_property(css, "dominant-baseline", NULL); // not implemented yet sp_repr_css_set_property(css, "alignment-baseline", NULL); // not implemented yet diff --git a/src/style.h b/src/style.h index 3627b4ec2..01a9d4b84 100644 --- a/src/style.h +++ b/src/style.h @@ -92,8 +92,10 @@ private: public: /* ----------------------- THE PROPERTIES ------------------------- */ + /* Match order in style.cpp. */ + + /* Font ---------------------------- */ - /* Font */ /** Font style */ SPIEnum font_style; /** Which substyle of the font */ @@ -113,23 +115,13 @@ public: /** Full font name, as font_factory::ConstructFontSpecification would give, for internal use. */ SPIString font_specification; + /* Text ----------------------------- */ + /** First line indent of paragraphs (css2 16.1) */ SPILength text_indent; /** text alignment (css2 16.2) (not to be confused with text-anchor) */ SPIEnum text_align; - /** text decoration (css2 16.3.1) */ - SPITextDecoration text_decoration; - /** CSS 3 2.1, 2.2, 2.3 */ - /** Not done yet, test_decoration3 = css3 2.4*/ - SPITextDecorationLine text_decoration_line; - SPITextDecorationStyle text_decoration_style; // SPIEnum? Only one can be set at time. - SPIColor text_decoration_color; - // used to implement text_decoration, not saved to or read from SVG file - SPITextDecorationData text_decoration_data; - - // 16.3.2 is text-shadow. That's complicated. - /** letter spacing (css2 16.4) */ SPILengthOrNormal letter_spacing; /** word spacing (also css2 16.4) */ @@ -151,6 +143,25 @@ public: /** Anchor of the text (svg1.1 10.9.1) */ SPIEnum text_anchor; + /** white space (svg2) */ + SPIEnum white_space; + + /* Text Decoration ----------------------- */ + + /** text decoration (css2 16.3.1) */ + SPITextDecoration text_decoration; + /** CSS 3 2.1, 2.2, 2.3 */ + /** Not done yet, test_decoration3 = css3 2.4*/ + SPITextDecorationLine text_decoration_line; + SPITextDecorationStyle text_decoration_style; // SPIEnum? Only one can be set at time. + SPIColor text_decoration_color; + // used to implement text_decoration, not saved to or read from SVG file + SPITextDecorationData text_decoration_data; + + // 16.3.2 is text-shadow. That's complicated. + + /* General visual properties ------------- */ + /** clip-rule: 0 nonzero, 1 evenodd */ SPIEnum clip_rule; @@ -215,6 +226,8 @@ public: SPIString marker_end; SPIString* marker_ptrs[SP_MARKER_LOC_QTY]; + /* Filter effects ------------------------ */ + /** Filter effect */ SPIFilter filter; /** Filter blend mode */ @@ -225,6 +238,7 @@ public: /** enable-background, used for defining where filter effects get their background image */ SPIEnum enable_background; + /* Rendering hints ----------------------- */ /** hints on how to render: e.g. speed vs. accuracy. * As of April, 2013, only image_rendering used. */ -- cgit v1.2.3 From bf8e83bf9a5a48eda128d0428f72824360f196a7 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Tue, 14 Oct 2014 14:04:51 +0200 Subject: Implement marker 'orient' attribute value 'auto-start-reverse'. (bzr r13613) --- src/extension/internal/cairo-renderer.cpp | 12 +++++---- src/marker.cpp | 41 +++++++++++++++++++------------ src/marker.h | 8 +++++- src/sp-shape.cpp | 20 ++++++++++----- 4 files changed, 53 insertions(+), 28 deletions(-) diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 6fbc85c05..0fec68c06 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -202,8 +202,10 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx) if ( shape->_marker[i] ) { SPMarker* marker = SP_MARKER (shape->_marker[i]); Geom::Affine tr; - if (marker->orient_auto) { + if (marker->orient_mode == MARKER_ORIENT_AUTO) { tr = sp_shape_marker_get_transform_at_start(pathv.begin()->front()); + } else if (marker->orient_mode == MARKER_ORIENT_AUTO_START_REVERSE) { + tr = Geom::Rotate::from_degrees( 180.0 ) * sp_shape_marker_get_transform_at_start(pathv.begin()->front()); } else { tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(pathv.begin()->front().pointAt(0)); } @@ -220,7 +222,7 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx) && ! ((path_it == (pathv.end()-1)) && (path_it->size_default() == 0)) ) // if this is the last path and it is a moveto-only, there is no mid marker there { Geom::Affine tr; - if (marker->orient_auto) { + if (marker->orient_mode != MARKER_ORIENT_ANGLE) { tr = sp_shape_marker_get_transform_at_start(path_it->front()); } else { tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(path_it->front().pointAt(0)); @@ -237,7 +239,7 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx) * Loop to end_default (so including closing segment), because when a path is closed, * there should be a midpoint marker between last segment and closing straight line segment */ Geom::Affine tr; - if (marker->orient_auto) { + if (marker->orient_mode != MARKER_ORIENT_ANGLE) { tr = sp_shape_marker_get_transform(*curve_it1, *curve_it2); } else { tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(curve_it1->pointAt(1)); @@ -253,7 +255,7 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx) if ( path_it != (pathv.end()-1) && !path_it->empty()) { Geom::Curve const &lastcurve = path_it->back_default(); Geom::Affine tr; - if (marker->orient_auto) { + if (marker->orient_mode != MARKER_ORIENT_ANGLE) { tr = sp_shape_marker_get_transform_at_end(lastcurve); } else { tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(lastcurve.pointAt(1)); @@ -277,7 +279,7 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx) Geom::Curve const &lastcurve = path_last[index]; Geom::Affine tr; - if (marker->orient_auto) { + if (marker->orient_mode != MARKER_ORIENT_ANGLE) { tr = sp_shape_marker_get_transform_at_end(lastcurve); } else { tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(lastcurve.pointAt(1)); diff --git a/src/marker.cpp b/src/marker.cpp index 7fee16ead..a4cbc30ca 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -52,7 +52,7 @@ SPMarker::SPMarker() : SPGroup(), SPViewBox() { this->markerUnits = 0; this->markerUnits_set = 0; - this->orient_auto = 0; + this->orient_mode = MARKER_ORIENT_ANGLE; this->orient_set = 0; this->orient = 0; @@ -158,16 +158,20 @@ void SPMarker::set(unsigned int key, const gchar* value) { case SP_ATTR_ORIENT: this->orient_set = FALSE; - this->orient_auto = FALSE; + this->orient_mode = MARKER_ORIENT_ANGLE; this->orient = 0.0; if (value) { - if (!strcmp (value, "auto")) { - this->orient_auto = TRUE; - this->orient_set = TRUE; - } else if (sp_svg_number_read_f (value, &this->orient)) { - this->orient_set = TRUE; - } + if (!strcmp (value, "auto")) { + this->orient_mode = MARKER_ORIENT_AUTO; + this->orient_set = TRUE; + } else if (!strcmp (value, "auto-start-reverse")) { + this->orient_mode = MARKER_ORIENT_AUTO_START_REVERSE; + this->orient_set = TRUE; + } else if (sp_svg_number_read_f (value, &this->orient)) { + this->orient_mode = MARKER_ORIENT_ANGLE; + this->orient_set = TRUE; + } } this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); @@ -264,15 +268,17 @@ Inkscape::XML::Node* SPMarker::write(Inkscape::XML::Document *xml_doc, Inkscape: } if (this->orient_set) { - if (this->orient_auto) { - repr->setAttribute("orient", "auto"); - } else { - sp_repr_set_css_double(repr, "orient", this->orient); - } + if (this->orient_mode == MARKER_ORIENT_AUTO) { + repr->setAttribute("orient", "auto"); + } else if (this->orient_mode == MARKER_ORIENT_AUTO_START_REVERSE) { + repr->setAttribute("orient", "auto-start-reverse"); + } else { + sp_repr_set_css_double(repr, "orient", this->orient); + } } else { - repr->setAttribute("orient", NULL); + repr->setAttribute("orient", NULL); } - + /* fixme: */ //XML Tree being used directly here while it shouldn't be.... repr->setAttribute("viewBox", this->getRepr()->attribute("viewBox")); @@ -381,7 +387,10 @@ sp_marker_show_instance ( SPMarker *marker, Inkscape::DrawingItem *parent, } if (v->items[pos]) { Geom::Affine m; - if (marker->orient_auto) { + if (marker->orient_mode == MARKER_ORIENT_AUTO) { + m = base; + } else if (marker->orient_mode == MARKER_ORIENT_AUTO_START_REVERSE) { + m = Geom::Rotate::from_degrees( 180.0 ) * base; m = base; } else { /* fixme: Orient units (Lauris) */ diff --git a/src/marker.h b/src/marker.h index 585615476..9eefcdf16 100644 --- a/src/marker.h +++ b/src/marker.h @@ -32,6 +32,12 @@ struct SPMarkerView; #include "uri-references.h" #include "viewbox.h" +enum markerOrient { + MARKER_ORIENT_ANGLE, + MARKER_ORIENT_AUTO, + MARKER_ORIENT_AUTO_START_REVERSE +}; + class SPMarker : public SPGroup, public SPViewBox { public: SPMarker(); @@ -51,7 +57,7 @@ public: /* orient */ unsigned int orient_set : 1; - unsigned int orient_auto : 1; + markerOrient orient_mode : 2; float orient; /* Private views */ diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp index de9103dee..d76bd9780 100644 --- a/src/sp-shape.cpp +++ b/src/sp-shape.cpp @@ -288,8 +288,13 @@ sp_shape_update_marker_view(SPShape *shape, Inkscape::DrawingItem *ai) Geom::Affine const m (sp_shape_marker_get_transform_at_start(pathv.begin()->front())); for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START if ( shape->_marker[i] ) { + Geom::Affine m_auto = m; + // Reverse start marker if necessary. + if (SP_MARKER(shape->_marker[i])->orient_mode == MARKER_ORIENT_AUTO_START_REVERSE) { + m_auto = Geom::Rotate::from_degrees( 180.0 ) * m; + } sp_marker_show_instance ((SPMarker* ) shape->_marker[i], ai, - ai->key() + i, counter[i], m, + ai->key() + i, counter[i], m_auto, shape->style->stroke_width.computed); counter[i]++; } @@ -425,7 +430,10 @@ Geom::OptRect SPShape::bbox(Geom::Affine const &transform, SPItem::BBoxType bbox if (marker_item) { Geom::Affine tr(sp_shape_marker_get_transform_at_start(pathv.begin()->front())); - if (!marker->orient_auto) { + if (marker->orient_mode == MARKER_ORIENT_AUTO_START_REVERSE) { + // Reverse start marker if necessary + tr = Geom::Rotate::from_degrees( 180.0 ) * tr; + } else if (marker->orient_mode == MARKER_ORIENT_ANGLE) { Geom::Point transl = tr.translation(); tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl); } @@ -463,7 +471,7 @@ Geom::OptRect SPShape::bbox(Geom::Affine const &transform, SPItem::BBoxType bbox { Geom::Affine tr(sp_shape_marker_get_transform_at_start(path_it->front())); - if (!marker->orient_auto) { + if (marker->orient_mode == MARKER_ORIENT_ANGLE) { Geom::Point transl = tr.translation(); tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl); } @@ -493,7 +501,7 @@ Geom::OptRect SPShape::bbox(Geom::Affine const &transform, SPItem::BBoxType bbox if (marker_item) { Geom::Affine tr(sp_shape_marker_get_transform(*curve_it1, *curve_it2)); - if (!marker->orient_auto) { + if (marker->orient_mode == MARKER_ORIENT_ANGLE) { Geom::Point transl = tr.translation(); tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl); } @@ -516,7 +524,7 @@ Geom::OptRect SPShape::bbox(Geom::Affine const &transform, SPItem::BBoxType bbox Geom::Curve const &lastcurve = path_it->back_default(); Geom::Affine tr = sp_shape_marker_get_transform_at_end(lastcurve); - if (!marker->orient_auto) { + if (marker->orient_mode == MARKER_ORIENT_ANGLE) { Geom::Point transl = tr.translation(); tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl); } @@ -551,7 +559,7 @@ Geom::OptRect SPShape::bbox(Geom::Affine const &transform, SPItem::BBoxType bbox Geom::Affine tr = sp_shape_marker_get_transform_at_end(lastcurve); - if (!marker->orient_auto) { + if (marker->orient_mode == MARKER_ORIENT_ANGLE) { Geom::Point transl = tr.translation(); tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl); } -- cgit v1.2.3 From dcbfb36e7c6279b1cc651131758700961152a8b0 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" <jon@joncruz.org> Date: Wed, 15 Oct 2014 02:43:52 -0700 Subject: Post-merge cleanup. (bzr r13615) --- src/sp-hatch.cpp | 3 +- src/sp-item.cpp | 3 +- src/sp-paint-server.cpp | 20 +- src/sp-paint-server.h | 8 +- src/style-internal.h | 654 +++++++++++++++++++++++++++++++++++------------- src/style.cpp | 9 +- 6 files changed, 510 insertions(+), 187 deletions(-) diff --git a/src/sp-hatch.cpp b/src/sp-hatch.cpp index 98cc596d7..b007fc846 100644 --- a/src/sp-hatch.cpp +++ b/src/sp-hatch.cpp @@ -647,7 +647,8 @@ Geom::OptInterval SPHatch::_calculateStripExtents(Geom::OptRect bbox) const { return extents; } -cairo_pattern_t* SPHatch::pattern_new(cairo_t *base_ct, Geom::OptRect const &bbox, double opacity) { +cairo_pattern_t* SPHatch::pattern_new(cairo_t * /*base_ct*/, Geom::OptRect const &/*bbox*/, double /*opacity*/) +{ //this code should not be used //it is however required by the fact that SPPaintServer::hatch_new is pure virtual return cairo_pattern_create_rgb(0.5, 0.5, 1.0); diff --git a/src/sp-item.cpp b/src/sp-item.cpp index f6de165a6..52ee6b7d8 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -708,7 +708,8 @@ void SPItem::update(SPCtx* /*ctx*/, guint flags) { item->avoidRef->handleSettingChange(); } -void SPItem::modified(unsigned int flags) { +void SPItem::modified(unsigned int /*flags*/) +{ } Inkscape::XML::Node* SPItem::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp index d692fc611..3211b75d7 100644 --- a/src/sp-paint-server.cpp +++ b/src/sp-paint-server.cpp @@ -60,9 +60,27 @@ bool SPPaintServer::isSolid() const bool SPPaintServer::isValid() const { - return true; + return true; } +Inkscape::DrawingPattern *SPPaintServer::show(Inkscape::Drawing &/*drawing*/, unsigned int /*key*/, Geom::OptRect /*bbox*/) +{ + return NULL; +} + +void SPPaintServer::hide(unsigned int /*key*/) +{ +} + +void SPPaintServer::setBBox(unsigned int /*key*/, Geom::OptRect const &/*bbox*/) +{ +} + +cairo_pattern_t* SPPaintServer::pattern_new(cairo_t * /*ct*/, Geom::OptRect const &/*bbox*/, double /*opacity*/) +{ +} + + /* Local Variables: mode:c++ diff --git a/src/sp-paint-server.h b/src/sp-paint-server.h index 6c88199b9..7f3bfcba0 100644 --- a/src/sp-paint-server.h +++ b/src/sp-paint-server.h @@ -43,11 +43,11 @@ public: //on demand by pattern_new method. It is used for gradients. The other one is to add elements //representing PaintServer in NR tree. It is used by hatches and patterns. //Either pattern new or all three methods show, hide, setBBox need to be implemented - virtual Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptRect bbox) {return NULL;} - virtual void hide(unsigned int key) {}; - virtual void setBBox(unsigned int key, Geom::OptRect const &bbox) {}; + virtual Inkscape::DrawingPattern *show(Inkscape::Drawing &drawing, unsigned int key, Geom::OptRect bbox); // TODO check passing bbox by value. Looks suspicious. + virtual void hide(unsigned int key); + virtual void setBBox(unsigned int key, Geom::OptRect const &bbox); - virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity) {return NULL;} + virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity); protected: bool swatch; diff --git a/src/style-internal.h b/src/style-internal.h index 0b2b40001..039b0bbe3 100644 --- a/src/style-internal.h +++ b/src/style-internal.h @@ -104,22 +104,45 @@ static const unsigned SP_STYLE_FLAG_IFDIFF (1 << 1); */ /// Virtual base class for all SPStyle interal classes -class SPIBase { +class SPIBase +{ - public: +public: SPIBase( Glib::ustring const &name, bool inherits = true ) - : name(name), inherits(inherits), set(false), inherit(false), style_att(false), style(NULL) {}; - virtual ~SPIBase() {}; + : name(name), + inherits(inherits), + set(false), + inherit(false), + style_att(false), + style(NULL) + {} + + virtual ~SPIBase() + {} + virtual void read( gchar const *str ) = 0; - virtual void readIfUnset( gchar const *str ) { if( !set ) read( str ); } - virtual void readAttribute( Inkscape::XML::Node *repr ) { readIfUnset( repr->attribute( name.c_str() ) ); } + virtual void readIfUnset( gchar const *str ) { + if ( !set ) { + read( str ); + } + } + + virtual void readAttribute( Inkscape::XML::Node *repr ) { + readIfUnset( repr->attribute( name.c_str() ) ); + } + virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const = 0; - virtual void clear() { set = false, inherit = false; }; + virtual void clear() { + set = false, inherit = false; + } + virtual void cascade( const SPIBase* const parent ) = 0; virtual void merge( const SPIBase* const parent ) = 0; - virtual void setStylePointer( SPStyle *style_in ) { style = style_in; }; + virtual void setStylePointer( SPStyle *style_in ) { + style = style_in; + } // Explicit assignment operator required due to templates. SPIBase& operator=(const SPIBase& rhs) { @@ -133,11 +156,16 @@ class SPIBase { } // Check apples being compared to apples - virtual bool operator==(const SPIBase& rhs) { return (name == rhs.name); }; - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator==(const SPIBase& rhs) { + return (name == rhs.name); + } + + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: Glib::ustring name; // Make const unsigned inherits : 1; // Property inherits by default from parent. unsigned set : 1; // Property has been explicitly set (vs. inherited). @@ -145,22 +173,35 @@ class SPIBase { unsigned style_att : 2; // Source (attribute, style attribute, style-sheet). NOT USED YET FIX ME // To do: make private after g_asserts removed - public: +public: SPStyle* style; // Used by SPIPaint, SPIFilter... to find values of other properties }; /// Float type internal to SPStyle. (Only 'stroke-miterlimit') -class SPIFloat : public SPIBase { - - public: - SPIFloat() : SPIBase( "anonymous_float" ), value(0.0) {}; - SPIFloat( Glib::ustring name, float value_default = 0.0 ) - : SPIBase( name ), value(value_default), value_default(value_default) {}; - virtual ~SPIFloat() {}; +class SPIFloat : public SPIBase +{ + +public: + SPIFloat() + : SPIBase( "anonymous_float" ), + value(0.0) + {} + + SPIFloat( Glib::ustring const &name, float value_default = 0.0 ) + : SPIBase( name ), + value(value_default), + value_default(value_default) + {} + + virtual ~SPIFloat() {} virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); value = value_default; }; + virtual void clear() { + SPIBase::clear(); + value = value_default; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -172,13 +213,15 @@ class SPIFloat : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: float value; - private: +private: float value_default; }; @@ -214,17 +257,32 @@ static const unsigned SP_SCALE24_MAX = 0xff0000; /// 24 bit data type internal to SPStyle. // Used only for opacity, fill-opacity, stroke-opacity. // Opacity does not inherit but stroke-opacity and fill-opacity do. -class SPIScale24 : public SPIBase { +class SPIScale24 : public SPIBase +{ + +public: + SPIScale24() + : SPIBase( "anonymous_scale24" ), + value(0) + {} + + SPIScale24( Glib::ustring const &name, unsigned value = 0, bool inherits = true ) + : SPIBase( name, inherits ), + value(value), + value_default(value) + {} + + virtual ~SPIScale24() + {} - public: - SPIScale24() : SPIBase( "anonymous_scale24" ), value(0) {}; - SPIScale24( Glib::ustring name, unsigned value = 0, bool inherits = true ) - : SPIBase( name, inherits ), value(value), value_default(value) {}; - virtual ~SPIScale24() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); value = value_default; }; + virtual void clear() { + SPIBase::clear(); + value = value_default; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -236,14 +294,16 @@ class SPIScale24 : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: unsigned value : 24; - private: +private: unsigned value_default : 24; }; @@ -265,17 +325,37 @@ enum SPCSSUnit { /// Length type internal to SPStyle. // Needs access to 'font-size' and 'font-family' for computed values. // Used for 'stroke-width' 'stroke-dash-offset' ('none' not handled), text-indent -class SPILength : public SPIBase { +class SPILength : public SPIBase +{ + +public: + SPILength() + : SPIBase( "anonymous_length" ), + unit(SP_CSS_UNIT_NONE), + value(0), + computed(0) + {} + + SPILength( Glib::ustring const &name, unsigned value = 0 ) + : SPIBase( name ), + unit(SP_CSS_UNIT_NONE), + value(value), + computed(value), + value_default(value) + {} + + virtual ~SPILength() + {} - public: - SPILength() : SPIBase( "anonymous_length" ), unit(SP_CSS_UNIT_NONE), value(0), computed(0) {}; - SPILength( Glib::ustring name, unsigned value = 0 ) - : SPIBase( name ), unit(SP_CSS_UNIT_NONE), value(value), computed(value), value_default(value) {}; - virtual ~SPILength() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); unit = SP_CSS_UNIT_NONE, value = value_default; computed = value_default; }; + virtual void clear() { + SPIBase::clear(); + unit = SP_CSS_UNIT_NONE, value = value_default; + computed = value_default; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -286,35 +366,51 @@ class SPILength : public SPIBase { computed = rhs.computed; value_default = rhs.value_default; return *this; - }; + } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: unsigned unit : 4; float value; float computed; - private: +private: float value_default; }; /// Extended length type internal to SPStyle. // Used for: line-height, letter-spacing, word-spacing -class SPILengthOrNormal : public SPILength { +class SPILengthOrNormal : public SPILength +{ + +public: + SPILengthOrNormal() + : SPILength( "anonymous_length" ), + normal(true) + {} + + SPILengthOrNormal( Glib::ustring const &name, unsigned value = 0 ) + : SPILength( name, value ), + normal(true) + {} + + virtual ~SPILengthOrNormal() + {} - public: - SPILengthOrNormal() : SPILength( "anonymous_length" ), normal(true) {}; - SPILengthOrNormal( Glib::ustring name, unsigned value = 0 ) - : SPILength( name, value ), normal(true) {}; - virtual ~SPILengthOrNormal() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPILength::clear(); normal = true; }; + virtual void clear() { + SPILength::clear(); + normal = true; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -325,33 +421,59 @@ class SPILengthOrNormal : public SPILength { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: bool normal : 1; }; /// Enum type internal to SPStyle. // Used for many properties. 'font-stretch' and 'font-weight' must be special cased. -class SPIEnum : public SPIBase { +class SPIEnum : public SPIBase +{ - public: +public: SPIEnum() : - SPIBase( "anonymous_enum" ), enums( NULL ), value(0), computed(0) {}; - SPIEnum( Glib::ustring name, SPStyleEnum const *enums, unsigned value = 0, bool inherits = true ) : - SPIBase( name, inherits ), enums( enums ), value(value), computed(value), - value_default(value), computed_default(value) {}; + SPIBase( "anonymous_enum" ), + enums( NULL ), + value(0), + computed(0) + {} + + SPIEnum( Glib::ustring const &name, SPStyleEnum const *enums, unsigned value = 0, bool inherits = true ) : + SPIBase( name, inherits ), + enums( enums ), + value(value), + computed(value), + value_default(value), + computed_default(value) + {} + // Following is needed for font-weight - SPIEnum( Glib::ustring name, SPStyleEnum const *enums, SPCSSFontWeight value, SPCSSFontWeight computed ) : - SPIBase( name ), enums( enums ), value(value), computed(computed), - value_default(value), computed_default(computed) {}; - virtual ~SPIEnum() {}; + SPIEnum( Glib::ustring const &name, SPStyleEnum const *enums, SPCSSFontWeight value, SPCSSFontWeight computed ) : + SPIBase( name ), + enums( enums ), + value(value), + computed(computed), + value_default(value), + computed_default(computed) + {} + + virtual ~SPIEnum() + {} + virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); value = value_default, computed = computed_default; }; + virtual void clear() { + SPIBase::clear(); + value = value_default, computed = computed_default; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -365,16 +487,18 @@ class SPIEnum : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: SPStyleEnum const *enums; unsigned value : 8; unsigned computed: 8; - private: +private: unsigned value_default : 8; unsigned computed_default: 8; // for font-weight }; @@ -382,20 +506,31 @@ class SPIEnum : public SPIBase { /// String type internal to SPStyle. // Used for 'marker', ..., 'font', 'font-family', 'inkscape-font-specification' -class SPIString : public SPIBase { - - public: - SPIString() : - SPIBase( "anonymous_string" ), value(NULL) {}; - SPIString( Glib::ustring name, gchar* value_default_in = NULL ) : - SPIBase( name ) , value(NULL) , value_default(NULL) { - value_default = value_default_in?g_strdup(value_default_in):NULL; - }; - virtual ~SPIString() { g_free(value); g_free(value_default); }; +class SPIString : public SPIBase +{ + +public: + SPIString() + : SPIBase( "anonymous_string" ), + value(NULL) + {} + + // TODO probably want to avoid gchar* and c-style strings. + SPIString( Glib::ustring const &name, gchar* value_default_in = NULL ) + : SPIBase( name ), + value(NULL), + value_default(value_default_in ? g_strdup(value_default_in) : NULL) + {} + + virtual ~SPIString() { + g_free(value); + g_free(value_default); + } + virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear(); + virtual void clear(); // TODO check about value and value_default virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -403,31 +538,50 @@ class SPIString : public SPIBase { SPIBase::operator=(rhs); g_free(value); g_free(value_default); - value = rhs.value?g_strdup(rhs.value):NULL; - value_default = rhs.value_default?g_strdup(rhs.value_default):NULL; + value = rhs.value ? g_strdup(rhs.value) : NULL; + value_default = rhs.value_default ? g_strdup(rhs.value_default) : NULL; return *this; } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private, convert value to Glib::ustring - public: +public: gchar *value; gchar *value_default; }; /// Color type interal to SPStyle, FIXME Add string value to store SVG named color. -class SPIColor : public SPIBase { +class SPIColor : public SPIBase +{ + +public: + SPIColor() + : SPIBase( "anonymous_color" ), + currentcolor(false) { + value.color.set(0); + } + + SPIColor( Glib::ustring const &name ) + : SPIBase( name ), + currentcolor(false) { + value.color.set(0); + } + + virtual ~SPIColor() + {} - public: - SPIColor() : SPIBase( "anonymous_color" ), currentcolor(false) { value.color.set(0); } - SPIColor( Glib::ustring name ) : SPIBase( name ), currentcolor(false) { value.color.set(0); } - virtual ~SPIColor() {} virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); value.color.set(0); } + virtual void clear() { + SPIBase::clear(); + value.color.set(0); + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -439,13 +593,23 @@ class SPIColor : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); } + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } - void setColor( float r, float g, float b ) { value.color.set( r, g, b ); } - void setColor( guint32 val ) { value.color.set( val ); } - void setColor( SPColor const& color ) { value.color = color; } + void setColor( float r, float g, float b ) { + value.color.set( r, g, b ); + } + + void setColor( guint32 val ) { + value.color.set( val ); + } + + void setColor( SPColor const& color ) { + value.color = color; + } - public: +public: bool currentcolor : 1; // FIXME: remove structure and derive SPIPaint from this class. struct { @@ -459,18 +623,28 @@ class SPIColor : public SPIBase { #define SP_STYLE_STROKE_SERVER(s) ((const_cast<SPStyle *> (s))->getStrokePaintServer()) /// Paint type internal to SPStyle. -class SPIPaint : public SPIBase { - - public: - SPIPaint() : SPIBase( "anonymous_paint" ), currentcolor(false), colorSet(false), noneSet(false) { +class SPIPaint : public SPIBase +{ + +public: + SPIPaint() + : SPIBase( "anonymous_paint" ), + currentcolor(false), + colorSet(false), + noneSet(false) { value.href = NULL; clear(); - }; - SPIPaint( Glib::ustring name ) - : SPIBase( name ), currentcolor(false), colorSet(false), noneSet(false) { + } + + SPIPaint( Glib::ustring const &name ) + : SPIBase( name ), + currentcolor(false), + colorSet(false), + noneSet(false) { value.href = NULL; clear(); // Sets defaults - }; + } + virtual ~SPIPaint(); // Clear and delete href. virtual void read( gchar const *str ); virtual void read( gchar const *str, SPStyle &style, SPDocument *document = 0); @@ -492,23 +666,46 @@ class SPIPaint : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } + + bool isSameType( SPIPaint const & other ) const { + return (isPaintserver() == other.isPaintserver()) && (colorSet == other.colorSet) && (currentcolor == other.currentcolor); + } + + bool isNoneSet() const { + return noneSet; + } + + bool isNone() const { + return !currentcolor && !colorSet && !isPaintserver(); + } // TODO refine + + bool isColor() const { + return colorSet && !isPaintserver(); + } - bool isSameType( SPIPaint const & other ) const {return (isPaintserver() == other.isPaintserver()) && (colorSet == other.colorSet) && (currentcolor == other.currentcolor);} + bool isPaintserver() const { + return (value.href) ? value.href->getObject() : 0; + } - bool isNoneSet() const {return noneSet;} + void setColor( float r, float g, float b ) { + value.color.set( r, g, b ); colorSet = true; + } - bool isNone() const {return !currentcolor && !colorSet && !isPaintserver();} // TODO refine - bool isColor() const {return colorSet && !isPaintserver();} - bool isPaintserver() const {return (value.href) ? value.href->getObject():0;} + void setColor( guint32 val ) { + value.color.set( val ); colorSet = true; + } + + void setColor( SPColor const& color ) { + value.color = color; colorSet = true; + } - void setColor( float r, float g, float b ) {value.color.set( r, g, b ); colorSet = true;} - void setColor( guint32 val ) {value.color.set( val ); colorSet = true;} - void setColor( SPColor const& color ) {value.color = color; colorSet = true;} void setNone() {noneSet = true; colorSet=false;} // To do: make private - public: +public: bool currentcolor : 1; bool colorSet : 1; bool noneSet : 1; @@ -535,11 +732,20 @@ enum SPPaintOrderLayer { const size_t PAINT_ORDER_LAYERS = 3; /// Paint order type internal to SPStyle -class SPIPaintOrder : public SPIBase { +class SPIPaintOrder : public SPIBase +{ + +public: + SPIPaintOrder() + : SPIBase( "paint-order" ), + value(NULL) { + this->clear(); + } + + virtual ~SPIPaintOrder() { + g_free( value ); + } - public: - SPIPaintOrder() : SPIBase( "paint-order" ), value(NULL) { this->clear(); }; - virtual ~SPIPaintOrder() { g_free( value ); }; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; @@ -567,11 +773,13 @@ class SPIPaintOrder : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: SPPaintOrderLayer layer[PAINT_ORDER_LAYERS]; bool layer_set[PAINT_ORDER_LAYERS]; gchar *value; // Raw string @@ -579,15 +787,25 @@ class SPIPaintOrder : public SPIBase { /// Filter type internal to SPStyle -class SPIDashArray : public SPIBase { +class SPIDashArray : public SPIBase +{ + +public: + SPIDashArray() + : SPIBase( "stroke-dasharray" ) + {} // Only one instance of SPIDashArray + + virtual ~SPIDashArray() + {} - public: - SPIDashArray() : SPIBase( "stroke-dasharray" ) {}; // Only one instance of SPIDashArray - virtual ~SPIDashArray() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); values.clear(); }; + virtual void clear() { + SPIBase::clear(); + values.clear(); + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -598,19 +816,26 @@ class SPIDashArray : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private, change double to SVGLength - public: +public: std::vector<double> values; }; /// Filter type internal to SPStyle -class SPIFilter : public SPIBase { +class SPIFilter : public SPIBase +{ + +public: + SPIFilter() + : SPIBase( "filter", false ), + href(NULL) + {} - public: - SPIFilter() : SPIBase( "filter", false ), href(NULL) {}; virtual ~SPIFilter(); virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, @@ -626,10 +851,12 @@ class SPIFilter : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: SPFilterReference *href; }; @@ -642,16 +869,27 @@ enum { }; /// Fontsize type internal to SPStyle (also used by libnrtype/Layout-TNG-Input.cpp). -class SPIFontSize : public SPIBase { +class SPIFontSize : public SPIBase +{ + +public: + SPIFontSize() + : SPIBase( "font-size" ) { + this->clear(); + } + + virtual ~SPIFontSize() + {} - public: - SPIFontSize() : SPIBase( "font-size" ) { this->clear(); }; - virtual ~SPIFontSize() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); type = SP_FONT_SIZE_LITERAL, unit = SP_CSS_UNIT_NONE, - literal = SP_CSS_FONT_SIZE_MEDIUM, value = 12.0, computed = 12.0; } + virtual void clear() { + SPIBase::clear(); + type = SP_FONT_SIZE_LITERAL, unit = SP_CSS_UNIT_NONE, + literal = SP_CSS_FONT_SIZE_MEDIUM, value = 12.0, computed = 12.0; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -666,39 +904,51 @@ class SPIFontSize : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } - public: +public: static float const font_size_default; // To do: make private - public: +public: unsigned type : 2; unsigned unit : 4; unsigned literal : 4; float value; float computed; - private: +private: double relative_fraction() const; static float const font_size_table[]; }; /// Font type internal to SPStyle ('font' shorthand) -class SPIFont : public SPIBase { +class SPIFont : public SPIBase +{ + +public: + SPIFont() + : SPIBase( "font" ) + {} + + virtual ~SPIFont() + {} - public: - SPIFont() : SPIBase( "font" ) {}; - virtual ~SPIFont() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; virtual void clear() { SPIBase::clear(); - }; - virtual void cascade( const SPIBase* const parent ) { (void)parent; }; // Done in dependent properties - virtual void merge( const SPIBase* const parent ) { (void)parent; }; + } + + virtual void cascade( const SPIBase* const /*parent*/ ) + {} // Done in dependent properties + + virtual void merge( const SPIBase* const /*parent*/ ) + {} SPIFont& operator=(const SPIFont& rhs) { SPIBase::operator=(rhs); @@ -706,7 +956,9 @@ class SPIFont : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } }; @@ -717,16 +969,27 @@ enum { }; /// Baseline shift type internal to SPStyle. (This is actually just like SPIFontSize) -class SPIBaselineShift : public SPIBase { +class SPIBaselineShift : public SPIBase +{ + +public: + SPIBaselineShift() + : SPIBase( "baseline-shift", false ) { + this->clear(); + } + + virtual ~SPIBaselineShift() + {} - public: - SPIBaselineShift() : SPIBase( "baseline-shift", false ) { this->clear(); }; - virtual ~SPIBaselineShift() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); type=SP_BASELINE_SHIFT_LITERAL, unit=SP_CSS_UNIT_NONE, - literal = SP_CSS_BASELINE_SHIFT_BASELINE, value = 0.0, computed = 0.0; } + virtual void clear() { + SPIBase::clear(); + type=SP_BASELINE_SHIFT_LITERAL, unit=SP_CSS_UNIT_NONE, + literal = SP_CSS_BASELINE_SHIFT_BASELINE, value = 0.0, computed = 0.0; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -742,11 +1005,14 @@ class SPIBaselineShift : public SPIBase { // This is not used but we have it for completeness, it has not been tested. virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } + bool isZero() const; // To do: make private - public: +public: unsigned type : 2; unsigned unit : 4; unsigned literal: 2; @@ -759,15 +1025,26 @@ class SPIBaselineShift : public SPIBase { // CSS3 2.2 /// Text decoration line type internal to SPStyle. THIS SHOULD BE A GENERIC CLASS -class SPITextDecorationLine : public SPIBase { +class SPITextDecorationLine : public SPIBase +{ + +public: + SPITextDecorationLine() + : SPIBase( "text-decoration-line" ) { + this->clear(); + } + + virtual ~SPITextDecorationLine() + {} - public: - SPITextDecorationLine() : SPIBase( "text-decoration-line" ) { this->clear(); }; - virtual ~SPITextDecorationLine() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); underline = false, overline = false, line_through = false, blink = false; } + virtual void clear() { + SPIBase::clear(); + underline = false, overline = false, line_through = false, blink = false; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -781,10 +1058,12 @@ class SPITextDecorationLine : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: bool underline : 1; bool overline : 1; bool line_through : 1; @@ -793,15 +1072,26 @@ class SPITextDecorationLine : public SPIBase { // CSS3 2.2 /// Text decoration style type internal to SPStyle. THIS SHOULD JUST BE SPIEnum! -class SPITextDecorationStyle : public SPIBase { +class SPITextDecorationStyle : public SPIBase +{ + +public: + SPITextDecorationStyle() + : SPIBase( "text-decoration-style" ) { + this->clear(); + } + + virtual ~SPITextDecorationStyle() + {} - public: - SPITextDecorationStyle() : SPIBase( "text-decoration-style" ) { this->clear(); }; - virtual ~SPITextDecorationStyle() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; - virtual void clear() { SPIBase::clear(); solid = true, isdouble = false, dotted = false, dashed = false, wavy = false; } + virtual void clear() { + SPIBase::clear(); + solid = true, isdouble = false, dotted = false, dashed = false, wavy = false; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -816,10 +1106,12 @@ class SPITextDecorationStyle : public SPIBase { } virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } // To do: make private - public: +public: bool solid : 1; bool isdouble : 1; // cannot use "double" as it is a reserved keyword bool dotted : 1; @@ -836,18 +1128,26 @@ class SPITextDecorationStyle : public SPIBase { // the right style. (See http://www.w3.org/TR/css-text-decor-3/#text-decoration-property ) /// Text decoration type internal to SPStyle. -class SPITextDecoration : public SPIBase { +class SPITextDecoration : public SPIBase +{ + +public: + SPITextDecoration() + : SPIBase( "text-decoration" ), + style_td( NULL ) + {} + + virtual ~SPITextDecoration() + {} - public: - SPITextDecoration() : SPIBase( "text-decoration" ), style_td( NULL ) {}; - virtual ~SPITextDecoration() {}; virtual void read( gchar const *str ); virtual const Glib::ustring write( guint const flags = SP_STYLE_FLAG_IFSET, SPIBase const *const base = NULL ) const; virtual void clear() { SPIBase::clear(); style_td = NULL; - }; + } + virtual void cascade( const SPIBase* const parent ); virtual void merge( const SPIBase* const parent ); @@ -858,9 +1158,11 @@ class SPITextDecoration : public SPIBase { // Use CSS2 value virtual bool operator==(const SPIBase& rhs); - virtual bool operator!=(const SPIBase& rhs) { return !(*this == rhs); }; + virtual bool operator!=(const SPIBase& rhs) { + return !(*this == rhs); + } - public: +public: SPStyle* style_td; // Style to be used for drawing CSS2 text decorations }; diff --git a/src/style.cpp b/src/style.cpp index c17f06761..364dd2c21 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -121,10 +121,6 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : // Text related properties text_indent( "text-indent", 0.0 ), // SPILength text_align( "text-align", enum_text_align, SP_CSS_TEXT_ALIGN_START ), - text_decoration(), - text_decoration_line(), - text_decoration_style(), - text_decoration_color( "text-decoration-color" ), // SPIColor letter_spacing( "letter-spacing", 0.0 ), // SPILengthOrNormal word_spacing( "word-spacing", 0.0 ), // SPILengthOrNormal @@ -137,6 +133,11 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : text_anchor( "text-anchor", enum_text_anchor, SP_CSS_TEXT_ANCHOR_START ), white_space( "white-space", enum_white_space, SP_CSS_WHITE_SPACE_NORMAL ), + text_decoration(), + text_decoration_line(), + text_decoration_style(), + text_decoration_color( "text-decoration-color" ), // SPIColor + // General visual properties clip_rule( "clip-rule", enum_clip_rule, SP_WIND_RULE_NONZERO ), display( "display", enum_display, SP_CSS_DISPLAY_INLINE, false ), -- cgit v1.2.3 From 79bf9b103a578281c06a0ea1dd706f11783bf18e Mon Sep 17 00:00:00 2001 From: "Liam P. White" <inkscapebrony@gmail.com> Date: Wed, 15 Oct 2014 11:54:49 -0400 Subject: Fix build (bzr r13616) --- src/sp-paint-server.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp index 3211b75d7..af510cd11 100644 --- a/src/sp-paint-server.cpp +++ b/src/sp-paint-server.cpp @@ -78,6 +78,7 @@ void SPPaintServer::setBBox(unsigned int /*key*/, Geom::OptRect const &/*bbox*/) cairo_pattern_t* SPPaintServer::pattern_new(cairo_t * /*ct*/, Geom::OptRect const &/*bbox*/, double /*opacity*/) { + return NULL; } -- cgit v1.2.3 From 83e50305d77a98329ea2085f90b6a9f154e1509f Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Wed, 15 Oct 2014 20:01:50 +0200 Subject: LiamW's initial font caching work. (bzr r13616.1.1) --- src/ink-comboboxentry-action.cpp | 2 + src/libnrtype/FontFactory.cpp | 76 ++ src/libnrtype/FontFactory.h | 10 +- src/libnrtype/font-lister.cpp | 1686 +++++++++++++++++++------------------- src/libnrtype/font-lister.h | 556 ++++++------- src/ui/dialog/text-edit.cpp | 6 +- src/widgets/font-selector.cpp | 4 +- src/widgets/text-toolbar.cpp | 10 +- 8 files changed, 1225 insertions(+), 1125 deletions(-) diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp index 6579c8ff8..f7d1c8724 100644 --- a/src/ink-comboboxentry-action.cpp +++ b/src/ink-comboboxentry-action.cpp @@ -390,6 +390,8 @@ GtkWidget* create_tool_item( GtkAction* action ) NULL, NULL ); } + // FIXME: once gtk3 migration is done this can be removed + // https://bugzilla.gnome.org/show_bug.cgi?id=734915 gtk_widget_show_all (comboBoxEntry); // Optionally add formatting... diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index e11fed20c..cb9af5eb0 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -514,6 +514,82 @@ static bool StyleNameCompareInternal(const StyleNames &style1, const StyleNames return( StyleNameValue( style1.CssName ) < StyleNameValue( style2.CssName ) ); } +static bool ustringPairSort(std::pair<PangoFontFamily*, Glib::ustring> const& first, std::pair<PangoFontFamily*, Glib::ustring> const& second) +{ + // well, this looks weird. + return first.second < second.second; +} + +void font_factory::GetUIFamilies(std::vector<PangoFontFamily *>& out) +{ + // Gather the family names as listed by Pango + PangoFontFamily** families = NULL; + int numFamilies = 0; + pango_font_map_list_families(fontServer, &families, &numFamilies); + + std::vector<std::pair<PangoFontFamily *, Glib::ustring> > sorted; + + // not size_t + for (int currentFamily = 0; currentFamily < numFamilies; ++currentFamily) { + const char* displayName = pango_font_family_get_name(families[currentFamily]); + + if (displayName == 0 || *displayName == '\0') { + continue; + } + sorted.push_back(std::make_pair(families[currentFamily], displayName)); + } + + std::sort(sorted.begin(), sorted.end(), ustringPairSort); + + for (size_t i = 0; i < sorted.size(); ++i) { + out.push_back(sorted[i].first); + } +} + +GList* font_factory::GetUIStyles(PangoFontFamily * in) +{ + GList* ret = NULL; + // Gather the styles for this family + PangoFontFace** faces = NULL; + int numFaces = 0; + pango_font_family_list_faces(in, &faces, &numFaces); + + for (int currentFace = 0; currentFace < numFaces; currentFace++) { + + // If the face has a name, describe it, and then use the + // description to get the UI family and face strings + const gchar* displayName = pango_font_face_get_face_name(faces[currentFace]); + if (displayName == NULL || *displayName == '\0') { + continue; + } + + PangoFontDescription *faceDescr = pango_font_face_describe(faces[currentFace]); + if (faceDescr) { + Glib::ustring familyUIName = GetUIFamilyString(faceDescr); + Glib::ustring styleUIName = GetUIStyleString(faceDescr); + + // Disable synthesized (faux) font faces except for CSS generic faces + if (pango_font_face_is_synthesized(faces[currentFace]) ) { + if (familyUIName.compare( "sans-serif" ) != 0 && + familyUIName.compare( "serif" ) != 0 && + familyUIName.compare( "monospace" ) != 0 && + familyUIName.compare( "fantasy" ) != 0 && + familyUIName.compare( "cursive" ) != 0 ) { + continue; + } + } + + if (!familyUIName.empty() && !styleUIName.empty()) { + // Add the style information + ret = g_list_append(ret, new StyleNames(styleUIName, displayName)); + } + } + pango_font_description_free(faceDescr); + } + g_free(faces); + return ret; +} + void font_factory::GetUIFamiliesAndStyles(FamilyToStylesMap *map) { g_assert(map); diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h index bb3a8fa25..85576e08d 100644 --- a/src/libnrtype/FontFactory.h +++ b/src/libnrtype/FontFactory.h @@ -21,7 +21,7 @@ #include <pango/pango.h> #include "nr-type-primitives.h" -#include "../style.h" +#include "style.h" /* Freetype */ #ifdef USE_PANGO_WIN32 @@ -121,7 +121,13 @@ public: // Gathers all strings needed for UI while storing pango information in // fontInstanceMap and fontStringMap + // don't use this function, it's too slow void GetUIFamiliesAndStyles(FamilyToStylesMap *map); + + // Helpfully inserts all font families into the provided vector + void GetUIFamilies(std::vector<PangoFontFamily *>& out); + // Retrieves style information about a family in a newly allocated GList. + GList* GetUIStyles(PangoFontFamily * in); /// Retrieve a font_instance from a style object, first trying to use the font-specification, the CSS information font_instance* FaceFromStyle(SPStyle const *style); @@ -174,4 +180,4 @@ private: fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 6727cdda6..9a978b0fd 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm/treemodel.h> @@ -27,410 +27,432 @@ // CSS dictates that font family names are case insensitive. // This should really implement full Unicode case unfolding. -bool familyNamesAreEqual( const Glib::ustring &a, const Glib::ustring &b ) { +bool familyNamesAreEqual(const Glib::ustring &a, const Glib::ustring &b) +{ + return (a.casefold().compare(b.casefold()) == 0); +} - return( a.casefold().compare( b.casefold() ) == 0 ); +static const char* sp_font_family_get_name(PangoFontFamily* family) +{ + const char* name = pango_font_family_get_name(family); + if (strncmp(name, "Sans", 4) == 0 && strlen(name) == 4) + return "sans-serif"; + if (strncmp(name, "Serif", 5) == 0 && strlen(name) == 5) + return "serif"; + if (strncmp(name, "Monospace", 9) == 0 && strlen(name) == 9) + return "monospace"; + return name; } -namespace Inkscape +namespace Inkscape { + +FontLister::FontLister() { - FontLister::FontLister () - { - font_list_store = Gtk::ListStore::create (FontList); - font_list_store->freeze_notify(); - - FamilyToStylesMap familyStyleMap; - font_factory::Default()->GetUIFamiliesAndStyles(&familyStyleMap); - - // Grab the family names into a list and then sort them - std::list<Glib::ustring> familyList; - for (FamilyToStylesMap::iterator iter = familyStyleMap.begin(); - iter != familyStyleMap.end(); - ++iter) { - familyList.push_back((*iter).first); + font_list_store = Gtk::ListStore::create(FontList); + font_list_store->freeze_notify(); + + /* Create default styles for use when font-family is unknown on system. */ + default_styles = g_list_append(NULL, new StyleNames("Normal")); + default_styles = g_list_append(default_styles, new StyleNames("Italic")); + default_styles = g_list_append(default_styles, new StyleNames("Bold")); + default_styles = g_list_append(default_styles, new StyleNames("Bold Italic")); + + // Get sorted font families from Pango + std::vector<PangoFontFamily *> familyVector; + font_factory::Default()->GetUIFamilies(familyVector); + + // Traverse through the family names and set up the list store + for (size_t i = 0; i < familyVector.size(); ++i) { + const char* displayName = sp_font_family_get_name(familyVector[i]); + + if (displayName == 0 || *displayName == '\0') { + continue; } - familyList.sort(); - // Traverse through the family names and set up the list store (note that - // the styles list that are the map's values are already sorted) - while (!familyList.empty()) { - Glib::ustring familyName = familyList.front(); - familyList.pop_front(); - - if (!familyName.empty()) { - Gtk::TreeModel::iterator treeModelIter = font_list_store->append(); - //(*treeModelIter)[FontList.family] = reinterpret_cast<const char*>(g_strdup(familyName.c_str())); - (*treeModelIter)[FontList.family] = familyName; - - // Now go through the styles - GList *styles = NULL; - std::list<StyleNames> &styleStrings = familyStyleMap[familyName]; - for (std::list<StyleNames>::iterator it=styleStrings.begin(); - it != styleStrings.end(); - ++it) { - // Our own copy - StyleNames *copy = new StyleNames( *it ); - styles = g_list_append(styles, copy); - } - - (*treeModelIter)[FontList.styles] = styles; - (*treeModelIter)[FontList.onSystem] = true; - } + Glib::ustring familyName = displayName; + if (!familyName.empty()) { + Gtk::TreeModel::iterator treeModelIter = font_list_store->append(); + (*treeModelIter)[FontList.family] = familyName; + + // we don't set this now (too slow) but the style will be cached if the user + // ever decides to use this font + (*treeModelIter)[FontList.styles] = NULL; + // store the pango representation for generating the style + (*treeModelIter)[FontList.pango_family] = familyVector[i]; + (*treeModelIter)[FontList.onSystem] = true; } - current_family_row = 0; - current_family = "sans-serif"; - current_style = "Normal"; - current_fontspec = "sans-serif"; // Empty style -> Normal - current_fontspec_system = "Sans"; - - /* Create default styles for use when font-family is unknown on system. */ - default_styles = g_list_append( NULL, new StyleNames( "Normal" ) ); - default_styles = g_list_append( default_styles, new StyleNames( "Italic" ) ); - default_styles = g_list_append( default_styles, new StyleNames( "Bold" ) ); - default_styles = g_list_append( default_styles, new StyleNames( "Bold Italic" ) ); - - font_list_store->thaw_notify(); - - style_list_store = Gtk::ListStore::create (FontStyleList); - - // Initialize style store with defaults - style_list_store->freeze_notify(); - style_list_store->clear(); - for (GList *l=default_styles; l; l = l->next) { - Gtk::TreeModel::iterator treeModelIter = style_list_store->append(); - (*treeModelIter)[FontStyleList.cssStyle] = ((StyleNames*)l->data)->CssName; - (*treeModelIter)[FontStyleList.displayStyle] = ((StyleNames*)l->data)->DisplayName; + } + + current_family_row = 0; + current_family = "sans-serif"; + current_style = "Normal"; + current_fontspec = "sans-serif"; // Empty style -> Normal + current_fontspec_system = "Sans"; + + font_list_store->thaw_notify(); + + style_list_store = Gtk::ListStore::create(FontStyleList); + + // Initialize style store with defaults + style_list_store->freeze_notify(); + style_list_store->clear(); + for (GList *l = default_styles; l; l = l->next) { + Gtk::TreeModel::iterator treeModelIter = style_list_store->append(); + (*treeModelIter)[FontStyleList.cssStyle] = ((StyleNames *)l->data)->CssName; + (*treeModelIter)[FontStyleList.displayStyle] = ((StyleNames *)l->data)->DisplayName; + } + style_list_store->thaw_notify(); +} + +FontLister::~FontLister() +{ + // Delete default_styles + for (GList *l = default_styles; l; l = l->next) { + delete ((StyleNames *)l->data); + } + + // Delete other styles + Gtk::TreeModel::iterator iter = font_list_store->get_iter("0"); + while (iter != font_list_store->children().end()) { + Gtk::TreeModel::Row row = *iter; + GList *styles = row[FontList.styles]; + for (GList *l = styles; l; l = l->next) { + delete ((StyleNames *)l->data); } - style_list_store->thaw_notify(); + ++iter; } +} - FontLister::~FontLister() { +FontLister *FontLister::get_instance() +{ + static Inkscape::FontLister *instance = new Inkscape::FontLister(); + return instance; +} - // Delete default_styles - for (GList *l=default_styles; l; l = l->next) { - delete ((StyleNames*)l->data); +void FontLister::ensureRowStyles(GtkTreeModel* model, GtkTreeIter const* iterator) +{ + Gtk::TreeIter iter(model, iterator); + Gtk::TreeModel::Row row = *iter; + if (!row[FontList.styles]) { + if (row[FontList.pango_family]) { + row[FontList.styles] = font_factory::Default()->GetUIStyles(row[FontList.pango_family]); } + } +} - // Delete other styles - Gtk::TreeModel::iterator iter = font_list_store->get_iter( "0" ); - while( iter != font_list_store->children().end() ) { - Gtk::TreeModel::Row row = *iter; - GList *styles = row[FontList.styles]; - for (GList *l=styles; l; l = l->next) { - delete ((StyleNames*)l->data); +// Example of how to use "foreach_iter" +// bool +// FontLister::print_document_font( const Gtk::TreeModel::iterator &iter ) { +// Gtk::TreeModel::Row row = *iter; +// if( !row[FontList.onSystem] ) { +// std::cout << " Not on system: " << row[FontList.family] << std::endl; +// return false; +// } +// return true; +// } +// font_list_store->foreach_iter( sigc::mem_fun(*this, &FontLister::print_document_font )); + +/* Used to insert a font that was not in the document and not on the system into the font list. */ +void FontLister::insert_font_family(Glib::ustring new_family) +{ + GList *styles = default_styles; + + /* In case this is a fallback list, check if first font-family on system. */ + std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(",", new_family); + if (!tokens.empty() && !tokens[0].empty()) { + Gtk::TreeModel::iterator iter2 = font_list_store->get_iter("0"); + while (iter2 != font_list_store->children().end()) { + Gtk::TreeModel::Row row = *iter2; + if (row[FontList.onSystem] && familyNamesAreEqual(tokens[0], row[FontList.family])) { + if (!row[FontList.styles]) { + row[FontList.styles] = font_factory::Default()->GetUIStyles(row[FontList.pango_family]); + } + styles = row[FontList.styles]; + break; } - ++iter; + ++iter2; } } - // Example of how to use "foreach_iter" - // bool - // FontLister::print_document_font( const Gtk::TreeModel::iterator &iter ) { - // Gtk::TreeModel::Row row = *iter; - // if( !row[FontList.onSystem] ) { - // std::cout << " Not on system: " << row[FontList.family] << std::endl; - // return false; - // } - // return true; - // } - // font_list_store->foreach_iter( sigc::mem_fun(*this, &FontLister::print_document_font )); - - /* Used to insert a font that was not in the document and not on the system into the font list. */ - void - FontLister::insert_font_family( Glib::ustring new_family ) { - - GList *styles = default_styles; - - /* In case this is a fallback list, check if first font-family on system. */ - std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(",", new_family ); - if( !tokens.empty() && !tokens[0].empty() ) { - - Gtk::TreeModel::iterator iter2 = font_list_store->get_iter( "0" ); - while( iter2 != font_list_store->children().end() ) { - Gtk::TreeModel::Row row = *iter2; - if( row[FontList.onSystem] && familyNamesAreEqual( tokens[0], row[FontList.family] ) ) { - styles = row[FontList.styles]; + Gtk::TreeModel::iterator treeModelIter = font_list_store->prepend(); + (*treeModelIter)[FontList.family] = new_family; + (*treeModelIter)[FontList.styles] = styles; + (*treeModelIter)[FontList.onSystem] = false; +} + +void FontLister::update_font_list(SPDocument *document) +{ + SPObject *r = document->getRoot(); + if (!r) { + return; + } + + font_list_store->freeze_notify(); + + /* Find if current row is in document or system part of list */ + gboolean row_is_system = false; + if (current_family_row > -1) { + Gtk::TreePath path; + path.push_back(current_family_row); + Gtk::TreeModel::iterator iter = font_list_store->get_iter(path); + if (iter) { + row_is_system = (*iter)[FontList.onSystem]; + // std::cout << " In: row: " << current_family_row << " " << (*iter)[FontList.family] << std::endl; + } + } + + /* Clear all old document font-family entries */ + Gtk::TreeModel::iterator iter = font_list_store->get_iter("0"); + while (iter != font_list_store->children().end()) { + Gtk::TreeModel::Row row = *iter; + if (!row[FontList.onSystem]) { + // std::cout << " Not on system: " << row[FontList.family] << std::endl; + iter = font_list_store->erase(iter); + } else { + // std::cout << " First on system: " << row[FontList.family] << std::endl; break; - } - ++iter2; } - } + } + + /* Get "font-family"s used in document. */ + std::list<Glib::ustring> fontfamilies; + update_font_list_recursive(r, &fontfamilies); + + fontfamilies.sort(); + fontfamilies.unique(); + fontfamilies.reverse(); + - Gtk::TreeModel::iterator treeModelIter = font_list_store->prepend(); - (*treeModelIter)[FontList.family] = reinterpret_cast<const char*>(g_strdup(new_family.c_str())); - (*treeModelIter)[FontList.styles] = styles; - (*treeModelIter)[FontList.onSystem] = false; + /* Insert separator */ + if (!fontfamilies.empty()) { + Gtk::TreeModel::iterator treeModelIter = font_list_store->prepend(); + (*treeModelIter)[FontList.family] = "#"; + (*treeModelIter)[FontList.onSystem] = false; } - void - FontLister::update_font_list( SPDocument* document ) { - - SPObject *r = document->getRoot(); - if( !r ) { - return; - } - - font_list_store->freeze_notify(); - - /* Find if current row is in document or system part of list */ - gboolean row_is_system = false; - if( current_family_row > -1 ) { - Gtk::TreePath path; - path.push_back( current_family_row ); - Gtk::TreeModel::iterator iter = font_list_store->get_iter( path ); - if( iter ) { - row_is_system = (*iter)[FontList.onSystem]; - // std::cout << " In: row: " << current_family_row << " " << (*iter)[FontList.family] << std::endl; - } - } - - /* Clear all old document font-family entries */ - Gtk::TreeModel::iterator iter = font_list_store->get_iter( "0" ); - while( iter != font_list_store->children().end() ) { - Gtk::TreeModel::Row row = *iter; - if( !row[FontList.onSystem] ) { - // std::cout << " Not on system: " << row[FontList.family] << std::endl; - iter = font_list_store->erase( iter ); - } else { - // std::cout << " First on system: " << row[FontList.family] << std::endl; - break; - } - } - - /* Get "font-family"s used in document. */ - std::list<Glib::ustring> fontfamilies; - update_font_list_recursive( r, &fontfamilies ); - - fontfamilies.sort(); - fontfamilies.unique(); - fontfamilies.reverse(); - - /* Insert separator */ - if( !fontfamilies.empty() ) { - Gtk::TreeModel::iterator treeModelIter = font_list_store->prepend(); - (*treeModelIter)[FontList.family] = "#"; - (*treeModelIter)[FontList.onSystem] = false; - } - - /* Insert font-family's in document. */ - std::list<Glib::ustring>::iterator i; - for( i = fontfamilies.begin(); i != fontfamilies.end(); ++i) { - - GList *styles = default_styles; + /* Insert font-family's in document. */ + std::list<Glib::ustring>::iterator i; + for (i = fontfamilies.begin(); i != fontfamilies.end(); ++i) { + + GList *styles = default_styles; /* See if font-family (or first in fallback list) is on system. If so, get styles. */ - std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(",", *i ); - if( !tokens.empty() && !tokens[0].empty() ) { - - Gtk::TreeModel::iterator iter2 = font_list_store->get_iter( "0" ); - while( iter2 != font_list_store->children().end() ) { - Gtk::TreeModel::Row row = *iter2; - if( row[FontList.onSystem] && familyNamesAreEqual( tokens[0], row[FontList.family] ) ) { - styles = row[FontList.styles]; - break; - } - ++iter2; - } - } - - Gtk::TreeModel::iterator treeModelIter = font_list_store->prepend(); - (*treeModelIter)[FontList.family] = reinterpret_cast<const char*>(g_strdup((*i).c_str())); - (*treeModelIter)[FontList.styles] = styles; - (*treeModelIter)[FontList.onSystem] = false; - } - - /* Now we do a song and dance to find the correct row as the row corresponding - * to the current_family may have changed. We can't simply search for the - * family name in the list since it can occur twice, once in the document - * font family part and once in the system font family part. Above we determined - * which part it is in. - */ - if( current_family_row > -1 ) { - int start = 0; - if( row_is_system ) start = fontfamilies.size(); - int length = font_list_store->children().size(); - for( int i = 0; i < length; ++i ) { - int row = i + start; - if( row >= length ) row -= length; - Gtk::TreePath path; - path.push_back( row ); - Gtk::TreeModel::iterator iter = font_list_store->get_iter( path ); - if( iter ) { - if( familyNamesAreEqual( current_family, (*iter)[FontList.family] ) ) { - current_family_row = row; - break; - } - } - } - } - // std::cout << " Out: row: " << current_family_row << " " << current_family << std::endl; - - font_list_store->thaw_notify(); + std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(",", *i); + if (!tokens.empty() && !tokens[0].empty()) { + + Gtk::TreeModel::iterator iter2 = font_list_store->get_iter("0"); + while (iter2 != font_list_store->children().end()) { + Gtk::TreeModel::Row row = *iter2; + if (row[FontList.onSystem] && familyNamesAreEqual(tokens[0], row[FontList.family])) { + if (!row[FontList.styles]) { + row[FontList.styles] = font_factory::Default()->GetUIStyles(row[FontList.pango_family]); + } + styles = row[FontList.styles]; + break; + } + ++iter2; + } + } + + Gtk::TreeModel::iterator treeModelIter = font_list_store->prepend(); + (*treeModelIter)[FontList.family] = reinterpret_cast<const char *>(g_strdup((*i).c_str())); + (*treeModelIter)[FontList.styles] = styles; + (*treeModelIter)[FontList.onSystem] = false; + } - void - FontLister::update_font_list_recursive( SPObject *r, std::list<Glib::ustring> *l ) { + /* Now we do a song and dance to find the correct row as the row corresponding + * to the current_family may have changed. We can't simply search for the + * family name in the list since it can occur twice, once in the document + * font family part and once in the system font family part. Above we determined + * which part it is in. + */ + if (current_family_row > -1) { + int start = 0; + if (row_is_system) + start = fontfamilies.size(); + int length = font_list_store->children().size(); + for (int i = 0; i < length; ++i) { + int row = i + start; + if (row >= length) + row -= length; + Gtk::TreePath path; + path.push_back(row); + Gtk::TreeModel::iterator iter = font_list_store->get_iter(path); + if (iter) { + if (familyNamesAreEqual(current_family, (*iter)[FontList.family])) { + current_family_row = row; + break; + } + } + } + } + // std::cout << " Out: row: " << current_family_row << " " << current_family << std::endl; - const gchar *font_family = r->style->font_family.value; - if( font_family ) { - l->push_back( Glib::ustring( font_family ) ); - } + font_list_store->thaw_notify(); +} - for (SPObject *child = r->firstChild(); child; child = child->getNext()) { - update_font_list_recursive( child, l ); - } +void FontLister::update_font_list_recursive(SPObject *r, std::list<Glib::ustring> *l) +{ + const gchar *font_family = r->style->font_family.value; + if (font_family) { + l->push_back(Glib::ustring(font_family)); } - Glib::ustring - FontLister::canonize_fontspec( Glib::ustring fontspec ) { - - // Pass fontspec to and back from Pango to get a the fontspec in - // canonical form. -inkscape-font-specification relies on the - // Pango constructed fontspec not changing form. If it does, - // this is the place to fix it. - PangoFontDescription *descr = pango_font_description_from_string( fontspec.c_str() ); - gchar* canonized = pango_font_description_to_string ( descr ); - Glib::ustring Canonized = canonized; - g_free( canonized ); - pango_font_description_free( descr ); - - // Pango canonized strings remove space after comma between family names. Put it back. - size_t i = 0; - while( (i = Canonized.find(",", i)) != std::string::npos) { - Canonized.replace(i, 1, ", "); - i += 2; - } - - return Canonized; + for (SPObject *child = r->firstChild(); child; child = child->getNext()) { + update_font_list_recursive(child, l); } +} - Glib::ustring - FontLister::system_fontspec( Glib::ustring fontspec ) { +Glib::ustring FontLister::canonize_fontspec(Glib::ustring fontspec) +{ - // Find what Pango thinks is the closest match. - Glib::ustring out = fontspec; + // Pass fontspec to and back from Pango to get a the fontspec in + // canonical form. -inkscape-font-specification relies on the + // Pango constructed fontspec not changing form. If it does, + // this is the place to fix it. + PangoFontDescription *descr = pango_font_description_from_string(fontspec.c_str()); + gchar *canonized = pango_font_description_to_string(descr); + Glib::ustring Canonized = canonized; + g_free(canonized); + pango_font_description_free(descr); + + // Pango canonized strings remove space after comma between family names. Put it back. + size_t i = 0; + while ((i = Canonized.find(",", i)) != std::string::npos) { + Canonized.replace(i, 1, ", "); + i += 2; + } + + return Canonized; +} - PangoFontDescription *descr = pango_font_description_from_string(fontspec.c_str()); - font_instance *res = (font_factory::Default())->Face(descr); - if (res->pFont) { +Glib::ustring FontLister::system_fontspec(Glib::ustring fontspec) +{ + + // Find what Pango thinks is the closest match. + Glib::ustring out = fontspec; + + PangoFontDescription *descr = pango_font_description_from_string(fontspec.c_str()); + font_instance *res = (font_factory::Default())->Face(descr); + if (res->pFont) { PangoFontDescription *nFaceDesc = pango_font_describe(res->pFont); out = sp_font_description_get_family(nFaceDesc); - } - pango_font_description_free(descr); - - return out; } + pango_font_description_free(descr); - std::pair<Glib::ustring, Glib::ustring> - FontLister::ui_from_fontspec( Glib::ustring fontspec ) { - - PangoFontDescription *descr = pango_font_description_from_string(fontspec.c_str()); - const gchar* family = pango_font_description_get_family(descr); - if(!family) - family = "sans-serif"; - Glib::ustring Family = family; - - // PANGO BUG... - // A font spec of Delicious, 500 Italic should result in a family of 'Delicious' - // and a style of 'Medium Italic'. It results instead with: a family of - // 'Delicious, 500' with a style of 'Medium Italic'. We chop of any weight numbers - // at the end of the family: match ",[1-9]00^". - Glib::RefPtr<Glib::Regex> weight = Glib::Regex::create(",[1-9]00$"); - Family = weight->replace( Family, 0, "", Glib::REGEX_MATCH_PARTIAL ); - - // Pango canonized strings remove space after comma between family names. Put it back. - size_t i = 0; - while( (i = Family.find(",", i)) != std::string::npos) { - Family.replace(i, 1, ", "); - i += 2; - } - - pango_font_description_unset_fields(descr, PANGO_FONT_MASK_FAMILY); - gchar* style = pango_font_description_to_string( descr ); - Glib::ustring Style = style; - pango_font_description_free(descr); - g_free( style ); - - return std::make_pair( Family, Style ); + return out; +} + +std::pair<Glib::ustring, Glib::ustring> FontLister::ui_from_fontspec(Glib::ustring fontspec) +{ + PangoFontDescription *descr = pango_font_description_from_string(fontspec.c_str()); + const gchar *family = pango_font_description_get_family(descr); + if (!family) + family = "sans-serif"; + Glib::ustring Family = family; + + // PANGO BUG... + // A font spec of Delicious, 500 Italic should result in a family of 'Delicious' + // and a style of 'Medium Italic'. It results instead with: a family of + // 'Delicious, 500' with a style of 'Medium Italic'. We chop of any weight numbers + // at the end of the family: match ",[1-9]00^". + Glib::RefPtr<Glib::Regex> weight = Glib::Regex::create(",[1-9]00$"); + Family = weight->replace(Family, 0, "", Glib::REGEX_MATCH_PARTIAL); + + // Pango canonized strings remove space after comma between family names. Put it back. + size_t i = 0; + while ((i = Family.find(",", i)) != std::string::npos) { + Family.replace(i, 1, ", "); + i += 2; } - std::pair<Glib::ustring, Glib::ustring> - FontLister::selection_update () { + pango_font_description_unset_fields(descr, PANGO_FONT_MASK_FAMILY); + gchar *style = pango_font_description_to_string(descr); + Glib::ustring Style = style; + pango_font_description_free(descr); + g_free(style); + + return std::make_pair(Family, Style); +} + +std::pair<Glib::ustring, Glib::ustring> FontLister::selection_update() +{ #ifdef DEBUG_FONT - std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; - std::cout << "FontLister::selection_update: entrance" << std::endl; + std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cout << "FontLister::selection_update: entrance" << std::endl; #endif - // Get fontspec from a selection, preferences, or thin air. - Glib::ustring fontspec; - SPStyle *query = sp_style_new (SP_ACTIVE_DOCUMENT); - - // Directly from stored font specification. - int result = - sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONT_SPECIFICATION); - - //std::cout << " Attempting selected style" << std::endl; - if( result != QUERY_STYLE_NOTHING && query->font_specification.set ) { - fontspec = query->font_specification.value; - //std::cout << " fontspec from query :" << fontspec << ":" << std::endl; - } - - // From style - if( fontspec.empty() ) { + // Get fontspec from a selection, preferences, or thin air. + Glib::ustring fontspec; + SPStyle *query = sp_style_new(SP_ACTIVE_DOCUMENT); + + // Directly from stored font specification. + int result = + sp_desktop_query_style(SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONT_SPECIFICATION); + + //std::cout << " Attempting selected style" << std::endl; + if (result != QUERY_STYLE_NOTHING && query->font_specification.set) { + fontspec = query->font_specification.value; + //std::cout << " fontspec from query :" << fontspec << ":" << std::endl; + } + + // From style + if (fontspec.empty()) { //std::cout << " Attempting desktop style" << std::endl; - int rfamily = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTFAMILY); - int rstyle = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTSTYLE); - - // Must have text in selection - if( rfamily != QUERY_STYLE_NOTHING && rstyle != QUERY_STYLE_NOTHING ) { - fontspec = fontspec_from_style( query ); - } - //std::cout << " fontspec from style :" << fontspec << ":" << std::endl; - } - - // From preferences - if( fontspec.empty() ) { + int rfamily = sp_desktop_query_style(SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTFAMILY); + int rstyle = sp_desktop_query_style(SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTSTYLE); + + // Must have text in selection + if (rfamily != QUERY_STYLE_NOTHING && rstyle != QUERY_STYLE_NOTHING) { + fontspec = fontspec_from_style(query); + } + //std::cout << " fontspec from style :" << fontspec << ":" << std::endl; + } + + // From preferences + if (fontspec.empty()) { //std::cout << " Attempting preferences" << std::endl; sp_style_read_from_prefs(query, "/tools/text"); - fontspec = fontspec_from_style( query ); - //std::cout << " fontspec from prefs :" << fontspec << ":" << std::endl; - } - sp_style_unref(query); + fontspec = fontspec_from_style(query); + //std::cout << " fontspec from prefs :" << fontspec << ":" << std::endl; + } + sp_style_unref(query); - // From thin air - if( fontspec.empty() ) { + // From thin air + if (fontspec.empty()) { //std::cout << " Attempting thin air" << std::endl; - fontspec = current_family + ", " + current_style; - //std::cout << " fontspec from thin air :" << fontspec << ":" << std::endl; - } - - // Do we really need? Removes spaces between font-families. - //current_fontspec = canonize_fontspec( fontspec ); - current_fontspec = fontspec; // Ignore for now + fontspec = current_family + ", " + current_style; + //std::cout << " fontspec from thin air :" << fontspec << ":" << std::endl; + } - current_fontspec_system = system_fontspec( current_fontspec ); + // Do we really need? Removes spaces between font-families. + //current_fontspec = canonize_fontspec( fontspec ); + current_fontspec = fontspec; // Ignore for now - std::pair<Glib::ustring, Glib::ustring> ui = ui_from_fontspec( current_fontspec ); - set_font_family( ui.first ); - set_font_style( ui.second ); + current_fontspec_system = system_fontspec(current_fontspec); + + std::pair<Glib::ustring, Glib::ustring> ui = ui_from_fontspec(current_fontspec); + set_font_family(ui.first); + set_font_style(ui.second); #ifdef DEBUG_FONT - std::cout << " family_row: :" << current_family_row << ":" << std::endl; - std::cout << " canonized: :" << current_fontspec << ":" << std::endl; - std::cout << " system: :" << current_fontspec_system << ":" << std::endl; - std::cout << " family: :" << current_family << ":" << std::endl; - std::cout << " style: :" << current_style << ":" << std::endl; - std::cout << "FontLister::selection_update: exit" << std::endl; - std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; + std::cout << " family_row: :" << current_family_row << ":" << std::endl; + std::cout << " canonized: :" << current_fontspec << ":" << std::endl; + std::cout << " system: :" << current_fontspec_system << ":" << std::endl; + std::cout << " family: :" << current_family << ":" << std::endl; + std::cout << " style: :" << current_style << ":" << std::endl; + std::cout << "FontLister::selection_update: exit" << std::endl; + std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; #endif - return std::make_pair( current_family, current_style ); - } - + return std::make_pair(current_family, current_style); +} + // Set fontspec. If check is false, best style match will not be done. -void FontLister::set_fontspec(Glib::ustring new_fontspec, gboolean /*check*/) +void FontLister::set_fontspec(Glib::ustring new_fontspec, bool /*check*/) { - std::pair<Glib::ustring,Glib::ustring> ui = ui_from_fontspec( new_fontspec ); + std::pair<Glib::ustring, Glib::ustring> ui = ui_from_fontspec(new_fontspec); Glib::ustring new_family = ui.first; Glib::ustring new_style = ui.second; @@ -439,13 +461,13 @@ void FontLister::set_fontspec(Glib::ustring new_fontspec, gboolean /*check*/) << " style:" << new_style << std::endl; #endif - set_font_family( new_family, false ); - set_font_style( new_style ); + set_font_family(new_family, false); + set_font_style(new_style); } // TODO: use to determine font-selector best style -std::pair<Glib::ustring, Glib::ustring> FontLister::new_font_family (Glib::ustring new_family, gboolean /*check_style*/ ) +std::pair<Glib::ustring, Glib::ustring> FontLister::new_font_family(Glib::ustring new_family, bool /*check_style*/) { #ifdef DEBUG_FONT std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; @@ -453,12 +475,12 @@ std::pair<Glib::ustring, Glib::ustring> FontLister::new_font_family (Glib::ustri #endif // No need to do anything if new family is same as old family. - if ( familyNamesAreEqual( new_family, current_family ) ) { + if (familyNamesAreEqual(new_family, current_family)) { #ifdef DEBUG_FONT - std::cout << "FontLister::new_font_family: exit: no change in family." << std::endl; - std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; + std::cout << "FontLister::new_font_family: exit: no change in family." << std::endl; + std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; #endif - return std::make_pair( current_family, current_style ); + return std::make_pair(current_family, current_style); } // We need to do two things: @@ -466,601 +488,602 @@ std::pair<Glib::ustring, Glib::ustring> FontLister::new_font_family (Glib::ustri // 2. Select best valid style match to old style. // For finding style list, use list of first family in font-family list. - GList* styles = NULL; - Gtk::TreeModel::iterator iter = font_list_store->get_iter( "0" ); - while( iter != font_list_store->children().end() ) { + GList *styles = NULL; + Gtk::TreeModel::iterator iter = font_list_store->get_iter("0"); + while (iter != font_list_store->children().end()) { - Gtk::TreeModel::Row row = *iter; + Gtk::TreeModel::Row row = *iter; - if( familyNamesAreEqual( new_family, row[FontList.family] ) ) { + if (familyNamesAreEqual(new_family, row[FontList.family])) { + if (!row[FontList.styles]) { + row[FontList.styles] = font_factory::Default()->GetUIStyles(row[FontList.pango_family]); + } styles = row[FontList.styles]; break; - } - ++iter; + } + ++iter; } // Newly typed in font-family may not yet be in list... use default list. // TODO: if font-family is list, check if first family in list is on system // and set style accordingly. - if( styles == NULL ) { - styles = default_styles; + if (styles == NULL) { + styles = default_styles; } - + // Update style list. style_list_store->freeze_notify(); style_list_store->clear(); - for (GList *l=styles; l; l = l->next) { - Gtk::TreeModel::iterator treeModelIter = style_list_store->append(); - (*treeModelIter)[FontStyleList.cssStyle] = ((StyleNames*)l->data)->CssName; - (*treeModelIter)[FontStyleList.displayStyle] = ((StyleNames*)l->data)->DisplayName; + for (GList *l = styles; l; l = l->next) { + Gtk::TreeModel::iterator treeModelIter = style_list_store->append(); + (*treeModelIter)[FontStyleList.cssStyle] = ((StyleNames *)l->data)->CssName; + (*treeModelIter)[FontStyleList.displayStyle] = ((StyleNames *)l->data)->DisplayName; } style_list_store->thaw_notify(); - + // Find best match to the style from the old font-family to the // styles available with the new font. // TODO: Maybe check if an exact match exists before using Pango. - Glib::ustring best_style = get_best_style_match( new_family, current_style ); + Glib::ustring best_style = get_best_style_match(new_family, current_style); #ifdef DEBUG_FONT std::cout << "FontLister::new_font_family: exit: " << new_family << " " << best_style << std::endl; std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; #endif - return std::make_pair( new_family, best_style ); + return std::make_pair(new_family, best_style); } - - std::pair<Glib::ustring, Glib::ustring> - FontLister::set_font_family (Glib::ustring new_family, gboolean check_style) { + +std::pair<Glib::ustring, Glib::ustring> FontLister::set_font_family(Glib::ustring new_family, bool check_style) +{ #ifdef DEBUG_FONT - std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; - std::cout << "FontLister::set_font_family: " << new_family << std::endl; + std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cout << "FontLister::set_font_family: " << new_family << std::endl; #endif - std::pair<Glib::ustring, Glib::ustring> ui = new_font_family( new_family, check_style ); - current_family = ui.first; - current_style = ui.second; - current_fontspec = canonize_fontspec( current_family + ", " + current_style ); - current_fontspec_system = system_fontspec( current_fontspec ); + std::pair<Glib::ustring, Glib::ustring> ui = new_font_family(new_family, check_style); + current_family = ui.first; + current_style = ui.second; + current_fontspec = canonize_fontspec(current_family + ", " + current_style); + current_fontspec_system = system_fontspec(current_fontspec); #ifdef DEBUG_FONT - std::cout << " family_row: :" << current_family_row << ":" << std::endl; - std::cout << " canonized: :" << current_fontspec << ":" << std::endl; - std::cout << " system: :" << current_fontspec_system << ":" << std::endl; - std::cout << " family: :" << current_family << ":" << std::endl; - std::cout << " style: :" << current_style << ":" << std::endl; - std::cout << "FontLister::set_font_family: end" << std::endl; - std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; + std::cout << " family_row: :" << current_family_row << ":" << std::endl; + std::cout << " canonized: :" << current_fontspec << ":" << std::endl; + std::cout << " system: :" << current_fontspec_system << ":" << std::endl; + std::cout << " family: :" << current_family << ":" << std::endl; + std::cout << " style: :" << current_style << ":" << std::endl; + std::cout << "FontLister::set_font_family: end" << std::endl; + std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; #endif - return ui; - } - + return ui; +} - std::pair<Glib::ustring, Glib::ustring> - FontLister::set_font_family (int row, gboolean check_style) { + +std::pair<Glib::ustring, Glib::ustring> FontLister::set_font_family(int row, bool check_style) +{ #ifdef DEBUG_FONT - std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; - std::cout << "FontLister::set_font_family( row ): " << row << std::endl; + std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cout << "FontLister::set_font_family( row ): " << row << std::endl; #endif - current_family_row = row; - Gtk::TreePath path; - path.push_back( row ); - Glib::ustring new_family = current_family; - Gtk::TreeModel::iterator iter = font_list_store->get_iter( path ); - if( iter ) { - new_family = (*iter)[FontList.family]; - } + current_family_row = row; + Gtk::TreePath path; + path.push_back(row); + Glib::ustring new_family = current_family; + Gtk::TreeModel::iterator iter = font_list_store->get_iter(path); + if (iter) { + new_family = (*iter)[FontList.family]; + } - std::pair<Glib::ustring, Glib::ustring> ui = set_font_family( new_family, check_style ); + std::pair<Glib::ustring, Glib::ustring> ui = set_font_family(new_family, check_style); #ifdef DEBUG_FONT - std::cout << "FontLister::set_font_family( row ): end" << std::endl; - std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; + std::cout << "FontLister::set_font_family( row ): end" << std::endl; + std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; #endif - return ui; - } + return ui; +} - void - FontLister::set_font_style (Glib::ustring new_style) { +void FontLister::set_font_style(Glib::ustring new_style) +{ - // TODO: Validate input using Pango. If Pango doesn't recognize a style it will - // attach the "invalid" style to the font-family. +// TODO: Validate input using Pango. If Pango doesn't recognize a style it will +// attach the "invalid" style to the font-family. #ifdef DEBUG_FONT - std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; - std::cout << "FontLister:set_font_style: " << new_style << std::endl; + std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cout << "FontLister:set_font_style: " << new_style << std::endl; #endif - current_style = new_style; - current_fontspec = canonize_fontspec( current_family + ", " + current_style ); - current_fontspec_system = system_fontspec( current_fontspec ); + current_style = new_style; + current_fontspec = canonize_fontspec(current_family + ", " + current_style); + current_fontspec_system = system_fontspec(current_fontspec); #ifdef DEBUG_FONT - std::cout << " canonized: :" << current_fontspec << ":" << std::endl; - std::cout << " system: :" << current_fontspec_system << ":" << std::endl; - std::cout << " family: " << current_family << std::endl; - std::cout << " style: " << current_style << std::endl; - std::cout << "FontLister::set_font_style: end" << std::endl; - std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; + std::cout << " canonized: :" << current_fontspec << ":" << std::endl; + std::cout << " system: :" << current_fontspec_system << ":" << std::endl; + std::cout << " family: " << current_family << std::endl; + std::cout << " style: " << current_style << std::endl; + std::cout << "FontLister::set_font_style: end" << std::endl; + std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; #endif - } +} - // We do this ourselves as we can't rely on FontFactory. - void - FontLister::fill_css( SPCSSAttr *css, Glib::ustring fontspec ) { +// We do this ourselves as we can't rely on FontFactory. +void FontLister::fill_css(SPCSSAttr *css, Glib::ustring fontspec) +{ - if( fontspec.empty() ) { - fontspec = current_fontspec; - } - std::pair<Glib::ustring,Glib::ustring> ui = ui_from_fontspec( fontspec ); + if (fontspec.empty()) { + fontspec = current_fontspec; + } + std::pair<Glib::ustring, Glib::ustring> ui = ui_from_fontspec(fontspec); - Glib::ustring family = ui.first; + Glib::ustring family = ui.first; - // Font spec is single quoted... for the moment - Glib::ustring fontspec_quoted( fontspec ); - css_quote( fontspec_quoted ); - sp_repr_css_set_property (css, "-inkscape-font-specification", fontspec_quoted.c_str() ); + // Font spec is single quoted... for the moment + Glib::ustring fontspec_quoted(fontspec); + css_quote(fontspec_quoted); + sp_repr_css_set_property(css, "-inkscape-font-specification", fontspec_quoted.c_str()); - // Font families needs to be properly quoted in CSS (used unquoted in font-lister) - css_font_family_quote( family ); - sp_repr_css_set_property (css, "font-family", family.c_str() ); + // Font families needs to be properly quoted in CSS (used unquoted in font-lister) + css_font_family_quote(family); + sp_repr_css_set_property(css, "font-family", family.c_str()); - PangoFontDescription *desc = pango_font_description_from_string( fontspec.c_str() ); - PangoWeight weight = pango_font_description_get_weight( desc ); - switch ( weight ) { - case PANGO_WEIGHT_THIN: - sp_repr_css_set_property (css, "font-weight", "100" ); - break; - case PANGO_WEIGHT_ULTRALIGHT: - sp_repr_css_set_property (css, "font-weight", "200" ); - break; - case PANGO_WEIGHT_LIGHT: - sp_repr_css_set_property (css, "font-weight", "300" ); - break; + PangoFontDescription *desc = pango_font_description_from_string(fontspec.c_str()); + PangoWeight weight = pango_font_description_get_weight(desc); + switch (weight) { + case PANGO_WEIGHT_THIN: + sp_repr_css_set_property(css, "font-weight", "100"); + break; + case PANGO_WEIGHT_ULTRALIGHT: + sp_repr_css_set_property(css, "font-weight", "200"); + break; + case PANGO_WEIGHT_LIGHT: + sp_repr_css_set_property(css, "font-weight", "300"); + break; #if PANGO_VERSION_CHECK(1,36,6) - case PANGO_WEIGHT_SEMILIGHT: - sp_repr_css_set_property (css, "font-weight", "350" ); - break; + case PANGO_WEIGHT_SEMILIGHT: + sp_repr_css_set_property (css, "font-weight", "350"); + break; #endif - case PANGO_WEIGHT_BOOK: - sp_repr_css_set_property (css, "font-weight", "380" ); - break; - case PANGO_WEIGHT_NORMAL: - sp_repr_css_set_property (css, "font-weight", "normal" ); - break; - case PANGO_WEIGHT_MEDIUM: - sp_repr_css_set_property (css, "font-weight", "500" ); - break; - case PANGO_WEIGHT_SEMIBOLD: - sp_repr_css_set_property (css, "font-weight", "600" ); - break; - case PANGO_WEIGHT_BOLD: - sp_repr_css_set_property (css, "font-weight", "bold" ); - break; - case PANGO_WEIGHT_ULTRABOLD: - sp_repr_css_set_property (css, "font-weight", "800" ); - break; - case PANGO_WEIGHT_HEAVY: - sp_repr_css_set_property (css, "font-weight", "900" ); - break; - case PANGO_WEIGHT_ULTRAHEAVY: - sp_repr_css_set_property (css, "font-weight", "1000" ); - break; - } - - PangoStyle style = pango_font_description_get_style( desc ); - switch ( style ) { - case PANGO_STYLE_NORMAL: - sp_repr_css_set_property (css, "font-style", "normal" ); - break; - case PANGO_STYLE_OBLIQUE: - sp_repr_css_set_property (css, "font-style", "oblique" ); - break; - case PANGO_STYLE_ITALIC: - sp_repr_css_set_property (css, "font-style", "italic" ); - break; - } - - PangoStretch stretch = pango_font_description_get_stretch( desc ); - switch ( stretch ) { - case PANGO_STRETCH_ULTRA_CONDENSED: - sp_repr_css_set_property (css, "font-stretch", "ultra-condensed" ); - break; - case PANGO_STRETCH_EXTRA_CONDENSED: - sp_repr_css_set_property (css, "font-stretch", "extra-condensed" ); - break; - case PANGO_STRETCH_CONDENSED: - sp_repr_css_set_property (css, "font-stretch", "condensed" ); - break; - case PANGO_STRETCH_SEMI_CONDENSED: - sp_repr_css_set_property (css, "font-stretch", "semi-condensed" ); - break; - case PANGO_STRETCH_NORMAL: - sp_repr_css_set_property (css, "font-stretch", "normal" ); - break; - case PANGO_STRETCH_SEMI_EXPANDED: - sp_repr_css_set_property (css, "font-stretch", "semi-expanded" ); - break; - case PANGO_STRETCH_EXPANDED: - sp_repr_css_set_property (css, "font-stretch", "expanded" ); - break; - case PANGO_STRETCH_EXTRA_EXPANDED: - sp_repr_css_set_property (css, "font-stretch", "extra-expanded" ); - break; - case PANGO_STRETCH_ULTRA_EXPANDED: - sp_repr_css_set_property (css, "font-stretch", "ultra-expanded" ); - break; - } - - PangoVariant variant = pango_font_description_get_variant( desc ); - switch ( variant ) { - case PANGO_VARIANT_NORMAL: - sp_repr_css_set_property (css, "font-variant", "normal" ); - break; - case PANGO_VARIANT_SMALL_CAPS: - sp_repr_css_set_property (css, "font-variant", "small-caps" ); - break; - } + case PANGO_WEIGHT_BOOK: + sp_repr_css_set_property(css, "font-weight", "380"); + break; + case PANGO_WEIGHT_NORMAL: + sp_repr_css_set_property(css, "font-weight", "normal"); + break; + case PANGO_WEIGHT_MEDIUM: + sp_repr_css_set_property(css, "font-weight", "500"); + break; + case PANGO_WEIGHT_SEMIBOLD: + sp_repr_css_set_property(css, "font-weight", "600"); + break; + case PANGO_WEIGHT_BOLD: + sp_repr_css_set_property(css, "font-weight", "bold"); + break; + case PANGO_WEIGHT_ULTRABOLD: + sp_repr_css_set_property(css, "font-weight", "800"); + break; + case PANGO_WEIGHT_HEAVY: + sp_repr_css_set_property(css, "font-weight", "900"); + break; + case PANGO_WEIGHT_ULTRAHEAVY: + sp_repr_css_set_property(css, "font-weight", "1000"); + break; } - // We do this ourselves as we can't rely on FontFactory. - Glib::ustring - FontLister::fontspec_from_style (SPStyle* style) { + PangoStyle style = pango_font_description_get_style(desc); + switch (style) { + case PANGO_STYLE_NORMAL: + sp_repr_css_set_property(css, "font-style", "normal"); + break; + case PANGO_STYLE_OBLIQUE: + sp_repr_css_set_property(css, "font-style", "oblique"); + break; + case PANGO_STYLE_ITALIC: + sp_repr_css_set_property(css, "font-style", "italic"); + break; + } - //std::cout << "FontLister:fontspec_from_style: " << std::endl; + PangoStretch stretch = pango_font_description_get_stretch(desc); + switch (stretch) { + case PANGO_STRETCH_ULTRA_CONDENSED: + sp_repr_css_set_property(css, "font-stretch", "ultra-condensed"); + break; + case PANGO_STRETCH_EXTRA_CONDENSED: + sp_repr_css_set_property(css, "font-stretch", "extra-condensed"); + break; + case PANGO_STRETCH_CONDENSED: + sp_repr_css_set_property(css, "font-stretch", "condensed"); + break; + case PANGO_STRETCH_SEMI_CONDENSED: + sp_repr_css_set_property(css, "font-stretch", "semi-condensed"); + break; + case PANGO_STRETCH_NORMAL: + sp_repr_css_set_property(css, "font-stretch", "normal"); + break; + case PANGO_STRETCH_SEMI_EXPANDED: + sp_repr_css_set_property(css, "font-stretch", "semi-expanded"); + break; + case PANGO_STRETCH_EXPANDED: + sp_repr_css_set_property(css, "font-stretch", "expanded"); + break; + case PANGO_STRETCH_EXTRA_EXPANDED: + sp_repr_css_set_property(css, "font-stretch", "extra-expanded"); + break; + case PANGO_STRETCH_ULTRA_EXPANDED: + sp_repr_css_set_property(css, "font-stretch", "ultra-expanded"); + break; + } - Glib::ustring fontspec; - if (style) { + PangoVariant variant = pango_font_description_get_variant(desc); + switch (variant) { + case PANGO_VARIANT_NORMAL: + sp_repr_css_set_property(css, "font-variant", "normal"); + break; + case PANGO_VARIANT_SMALL_CAPS: + sp_repr_css_set_property(css, "font-variant", "small-caps"); + break; + } +} + +// We do this ourselves as we can't rely on FontFactory. +Glib::ustring FontLister::fontspec_from_style(SPStyle *style) +{ + + //std::cout << "FontLister:fontspec_from_style: " << std::endl; - // First try to use the font specification if it is set - if (style->font_specification.set - && style->font_specification.value - && *style->font_specification.value) { + Glib::ustring fontspec; + if (style) { - fontspec = style->font_specification.value; + // First try to use the font specification if it is set + if (style->font_specification.set && style->font_specification.value && *style->font_specification.value) { + + fontspec = style->font_specification.value; } else { - fontspec = style->font_family.value; - fontspec += ","; - - // Use weight names as defined by Pango - switch (style->font_weight.computed) { + fontspec = style->font_family.value; + fontspec += ","; - case SP_CSS_FONT_WEIGHT_100: - fontspec += " Thin"; - break; - - case SP_CSS_FONT_WEIGHT_200: - fontspec += " Ultra-Light"; - break; + // Use weight names as defined by Pango + switch (style->font_weight.computed) { - case SP_CSS_FONT_WEIGHT_300: - fontspec += " Light"; - break; + case SP_CSS_FONT_WEIGHT_100: + fontspec += " Thin"; + break; - case SP_CSS_FONT_WEIGHT_400: - case SP_CSS_FONT_WEIGHT_NORMAL: - //fontspec += " normal"; - break; - - case SP_CSS_FONT_WEIGHT_500: - fontspec += " Medium"; - break; - - case SP_CSS_FONT_WEIGHT_600: - fontspec += " Semi-Bold"; - break; - - case SP_CSS_FONT_WEIGHT_700: - case SP_CSS_FONT_WEIGHT_BOLD: - fontspec += " Bold"; - break; - - case SP_CSS_FONT_WEIGHT_800: - fontspec += " Ultra-Bold"; - break; - - case SP_CSS_FONT_WEIGHT_900: - fontspec += " Heavy"; - break; - - case SP_CSS_FONT_WEIGHT_LIGHTER: - case SP_CSS_FONT_WEIGHT_BOLDER: - default: - g_warning("Unrecognized font_weight.computed value"); - break; - } - - switch (style->font_style.computed) { - case SP_CSS_FONT_STYLE_ITALIC: - fontspec += " italic"; - break; - - case SP_CSS_FONT_STYLE_OBLIQUE: - fontspec += " oblique"; - break; - - case SP_CSS_FONT_STYLE_NORMAL: - default: - //fontspec += " normal"; - break; - } - - switch (style->font_stretch.computed) { - - case SP_CSS_FONT_STRETCH_ULTRA_CONDENSED: - fontspec += " ultra-condensed"; - break; - - case SP_CSS_FONT_STRETCH_EXTRA_CONDENSED: - fontspec += " extra-condensed"; - break; - - case SP_CSS_FONT_STRETCH_CONDENSED: - case SP_CSS_FONT_STRETCH_NARROWER: - fontspec += " condensed"; - break; - - case SP_CSS_FONT_STRETCH_SEMI_CONDENSED: - fontspec += " semi-condensed"; - break; - - case SP_CSS_FONT_STRETCH_NORMAL: - //fontspec += " normal"; - break; - - case SP_CSS_FONT_STRETCH_SEMI_EXPANDED: - fontspec += " semi-expanded"; - break; - - case SP_CSS_FONT_STRETCH_EXPANDED: - case SP_CSS_FONT_STRETCH_WIDER: - fontspec += " expanded"; - break; - - case SP_CSS_FONT_STRETCH_EXTRA_EXPANDED: - fontspec += " extra-expanded"; - break; - - case SP_CSS_FONT_STRETCH_ULTRA_EXPANDED: - fontspec += " ultra-expanded"; - break; - - default: - //fontspec += " normal"; - break; - } - - switch (style->font_variant.computed) { - - case SP_CSS_FONT_VARIANT_SMALL_CAPS: - fontspec += "small-caps"; - break; - - default: - //fontspec += "normal"; - break; - } - } - } - return canonize_fontspec( fontspec ); - } + case SP_CSS_FONT_WEIGHT_200: + fontspec += " Ultra-Light"; + break; + case SP_CSS_FONT_WEIGHT_300: + fontspec += " Light"; + break; - Gtk::TreeModel::Row - FontLister::get_row_for_font (Glib::ustring family) - { - Gtk::TreePath path; + case SP_CSS_FONT_WEIGHT_400: + case SP_CSS_FONT_WEIGHT_NORMAL: + //fontspec += " normal"; + break; + + case SP_CSS_FONT_WEIGHT_500: + fontspec += " Medium"; + break; + + case SP_CSS_FONT_WEIGHT_600: + fontspec += " Semi-Bold"; + break; - Gtk::TreeModel::iterator iter = font_list_store->get_iter( "0" ); - while( iter != font_list_store->children().end() ) { + case SP_CSS_FONT_WEIGHT_700: + case SP_CSS_FONT_WEIGHT_BOLD: + fontspec += " Bold"; + break; - Gtk::TreeModel::Row row = *iter; + case SP_CSS_FONT_WEIGHT_800: + fontspec += " Ultra-Bold"; + break; - if( familyNamesAreEqual( family, row[FontList.family] ) ) { - return row; - } + case SP_CSS_FONT_WEIGHT_900: + fontspec += " Heavy"; + break; - ++iter; - } + case SP_CSS_FONT_WEIGHT_LIGHTER: + case SP_CSS_FONT_WEIGHT_BOLDER: + default: + g_warning("Unrecognized font_weight.computed value"); + break; + } - throw FAMILY_NOT_FOUND; - } + switch (style->font_style.computed) { + case SP_CSS_FONT_STYLE_ITALIC: + fontspec += " italic"; + break; - Gtk::TreePath - FontLister::get_path_for_font (Glib::ustring family) - { - return font_list_store->get_path( get_row_for_font ( family ) ); + case SP_CSS_FONT_STYLE_OBLIQUE: + fontspec += " oblique"; + break; + + case SP_CSS_FONT_STYLE_NORMAL: + default: + //fontspec += " normal"; + break; + } + + switch (style->font_stretch.computed) { + + case SP_CSS_FONT_STRETCH_ULTRA_CONDENSED: + fontspec += " ultra-condensed"; + break; + + case SP_CSS_FONT_STRETCH_EXTRA_CONDENSED: + fontspec += " extra-condensed"; + break; + + case SP_CSS_FONT_STRETCH_CONDENSED: + case SP_CSS_FONT_STRETCH_NARROWER: + fontspec += " condensed"; + break; + + case SP_CSS_FONT_STRETCH_SEMI_CONDENSED: + fontspec += " semi-condensed"; + break; + + case SP_CSS_FONT_STRETCH_NORMAL: + //fontspec += " normal"; + break; + + case SP_CSS_FONT_STRETCH_SEMI_EXPANDED: + fontspec += " semi-expanded"; + break; + + case SP_CSS_FONT_STRETCH_EXPANDED: + case SP_CSS_FONT_STRETCH_WIDER: + fontspec += " expanded"; + break; + + case SP_CSS_FONT_STRETCH_EXTRA_EXPANDED: + fontspec += " extra-expanded"; + break; + + case SP_CSS_FONT_STRETCH_ULTRA_EXPANDED: + fontspec += " ultra-expanded"; + break; + + default: + //fontspec += " normal"; + break; + } + + switch (style->font_variant.computed) { + + case SP_CSS_FONT_VARIANT_SMALL_CAPS: + fontspec += "small-caps"; + break; + + default: + //fontspec += "normal"; + break; + } + } } + return canonize_fontspec(fontspec); +} - Gtk::TreeModel::Row - FontLister::get_row_for_style (Glib::ustring style) - { - Gtk::TreePath path; - Gtk::TreeModel::iterator iter = style_list_store->get_iter( "0" ); - while( iter != style_list_store->children().end() ) { +Gtk::TreeModel::Row FontLister::get_row_for_font(Glib::ustring family) +{ + Gtk::TreePath path; - Gtk::TreeModel::Row row = *iter; + Gtk::TreeModel::iterator iter = font_list_store->get_iter("0"); + while (iter != font_list_store->children().end()) { - if( familyNamesAreEqual( style, row[FontStyleList.cssStyle] ) ) { - return row; - } + Gtk::TreeModel::Row row = *iter; - ++iter; - } + if (familyNamesAreEqual(family, row[FontList.family])) { + return row; + } - throw STYLE_NOT_FOUND; + ++iter; } - static gint - compute_distance (const PangoFontDescription *a, - const PangoFontDescription *b ) { - - // Weight: multiples of 100 - gint distance = abs( pango_font_description_get_weight( a ) - - pango_font_description_get_weight( b ) ); - - distance += 10000 * abs( pango_font_description_get_stretch( a ) - - pango_font_description_get_stretch( b ) ); - - PangoStyle style_a = pango_font_description_get_style( a ); - PangoStyle style_b = pango_font_description_get_style( b ); - if( style_a != style_b ) { - if( (style_a == PANGO_STYLE_OBLIQUE && style_b == PANGO_STYLE_ITALIC) || - (style_b == PANGO_STYLE_OBLIQUE && style_a == PANGO_STYLE_ITALIC) ) { - distance += 1000; // Oblique and italic are almost the same - } else { - distance += 100000; // Normal vs oblique/italic, not so similar - } - } - - // Normal vs small-caps - distance += 1000000 * abs( pango_font_description_get_variant( a ) - - pango_font_description_get_variant( b ) ); - return distance; + throw FAMILY_NOT_FOUND; +} + +Gtk::TreePath FontLister::get_path_for_font(Glib::ustring family) +{ + return font_list_store->get_path(get_row_for_font(family)); +} + +Gtk::TreeModel::Row FontLister::get_row_for_style(Glib::ustring style) +{ + Gtk::TreePath path; + + Gtk::TreeModel::iterator iter = style_list_store->get_iter("0"); + while (iter != style_list_store->children().end()) { + + Gtk::TreeModel::Row row = *iter; + + if (familyNamesAreEqual(style, row[FontStyleList.cssStyle])) { + return row; + } + + ++iter; } - // This is inspired by pango_font_description_better_match, but that routine - // always returns false if variant or stretch are different. This means, for - // example, that PT Sans Narrow with style Bold Condensed is never matched - // to another font-family with Bold style. - gboolean - font_description_better_match( PangoFontDescription* target, - PangoFontDescription* old_desc, - PangoFontDescription* new_desc ) { + throw STYLE_NOT_FOUND; +} + +static gint compute_distance(const PangoFontDescription *a, const PangoFontDescription *b) +{ - if( old_desc == NULL ) return true; - if( new_desc == NULL ) return false; + // Weight: multiples of 100 + gint distance = abs(pango_font_description_get_weight(a) - + pango_font_description_get_weight(b)); - int old_distance = compute_distance( target, old_desc ); - int new_distance = compute_distance( target, new_desc ); - //std::cout << "font_description_better_match: old: " << old_distance << std::endl; - //std::cout << " new: " << new_distance << std::endl; + distance += 10000 * abs(pango_font_description_get_stretch(a) - + pango_font_description_get_stretch(b)); - return (new_distance < old_distance ); + PangoStyle style_a = pango_font_description_get_style(a); + PangoStyle style_b = pango_font_description_get_style(b); + if (style_a != style_b) { + if ((style_a == PANGO_STYLE_OBLIQUE && style_b == PANGO_STYLE_ITALIC) || + (style_b == PANGO_STYLE_OBLIQUE && style_a == PANGO_STYLE_ITALIC)) { + distance += 1000; // Oblique and italic are almost the same + } else { + distance += 100000; // Normal vs oblique/italic, not so similar + } } - // void - // font_description_dump( PangoFontDescription* target ) { - // std::cout << " Font: " << pango_font_description_to_string( target ) << std::endl; - // std::cout << " style: " << pango_font_description_get_style( target ) << std::endl; - // std::cout << " weight: " << pango_font_description_get_weight( target ) << std::endl; - // std::cout << " variant: " << pango_font_description_get_variant( target ) << std::endl; - // std::cout << " stretch: " << pango_font_description_get_stretch( target ) << std::endl; - // std::cout << " gravity: " << pango_font_description_get_gravity( target ) << std::endl; - // } - - /* Returns style string */ - // TODO: Remove or turn into function to be used by new_font_family. - Glib::ustring - FontLister::get_best_style_match (Glib::ustring family, Glib::ustring target_style) { + // Normal vs small-caps + distance += 1000000 * abs(pango_font_description_get_variant(a) - + pango_font_description_get_variant(b)); + return distance; +} + +// This is inspired by pango_font_description_better_match, but that routine +// always returns false if variant or stretch are different. This means, for +// example, that PT Sans Narrow with style Bold Condensed is never matched +// to another font-family with Bold style. +gboolean font_description_better_match(PangoFontDescription *target, PangoFontDescription *old_desc, PangoFontDescription *new_desc) +{ + if (old_desc == NULL) + return true; + if (new_desc == NULL) + return false; + + int old_distance = compute_distance(target, old_desc); + int new_distance = compute_distance(target, new_desc); + //std::cout << "font_description_better_match: old: " << old_distance << std::endl; + //std::cout << " new: " << new_distance << std::endl; + + return (new_distance < old_distance); +} + +// void +// font_description_dump( PangoFontDescription* target ) { +// std::cout << " Font: " << pango_font_description_to_string( target ) << std::endl; +// std::cout << " style: " << pango_font_description_get_style( target ) << std::endl; +// std::cout << " weight: " << pango_font_description_get_weight( target ) << std::endl; +// std::cout << " variant: " << pango_font_description_get_variant( target ) << std::endl; +// std::cout << " stretch: " << pango_font_description_get_stretch( target ) << std::endl; +// std::cout << " gravity: " << pango_font_description_get_gravity( target ) << std::endl; +// } + +/* Returns style string */ +// TODO: Remove or turn into function to be used by new_font_family. +Glib::ustring FontLister::get_best_style_match(Glib::ustring family, Glib::ustring target_style) +{ #ifdef DEBUG_FONT - std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; - std::cout << "FontLister::get_best_style_match: " << family << " : " << target_style << std::endl; + std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cout << "FontLister::get_best_style_match: " << family << " : " << target_style << std::endl; #endif - Glib::ustring fontspec = family + ", " + target_style; + Glib::ustring fontspec = family + ", " + target_style; - Gtk::TreeModel::Row row; - try { - row = get_row_for_font( family ); - } catch (...) { - //std::cout << " ERROR: can't find family: " << family << std::endl; - return (target_style); - } + Gtk::TreeModel::Row row; + try + { + row = get_row_for_font(family); + } + catch (...) + { + //std::cout << " ERROR: can't find family: " << family << std::endl; + return (target_style); + } - PangoFontDescription* target = pango_font_description_from_string( fontspec.c_str() ); - PangoFontDescription* best = NULL; + PangoFontDescription *target = pango_font_description_from_string(fontspec.c_str()); + PangoFontDescription *best = NULL; - //font_description_dump( target ); + //font_description_dump( target ); - GList* styles = row[FontList.styles]; - for (GList *l=styles; l; l = l->next) { + if (!row[FontList.styles]) { + row[FontList.styles] = font_factory::Default()->GetUIStyles(row[FontList.pango_family]); + } + GList *styles = row[FontList.styles]; + for (GList *l = styles; l; l = l->next) { Glib::ustring fontspec = family + ", " + ((StyleNames *)l->data)->CssName; - PangoFontDescription* candidate = pango_font_description_from_string( fontspec.c_str() ); - //font_description_dump( candidate ); - //std::cout << " " << font_description_better_match( target, best, candidate ) << std::endl; - if( font_description_better_match( target, best, candidate ) ) { - pango_font_description_free( best ); - best = candidate; - //std::cout << " ... better: " << std::endl; - } else { - pango_font_description_free( candidate ); - //std::cout << " ... not better: " << std::endl; - } - } - - Glib::ustring best_style = target_style; - if( best ) { - pango_font_description_unset_fields( best, PANGO_FONT_MASK_FAMILY ); - best_style = pango_font_description_to_string( best ); - } - - if( target ) pango_font_description_free( target ); - if( best ) pango_font_description_free( best ); + PangoFontDescription *candidate = pango_font_description_from_string(fontspec.c_str()); + //font_description_dump( candidate ); + //std::cout << " " << font_description_better_match( target, best, candidate ) << std::endl; + if (font_description_better_match(target, best, candidate)) { + pango_font_description_free(best); + best = candidate; + //std::cout << " ... better: " << std::endl; + } else { + pango_font_description_free(candidate); + //std::cout << " ... not better: " << std::endl; + } + } + + Glib::ustring best_style = target_style; + if (best) { + pango_font_description_unset_fields(best, PANGO_FONT_MASK_FAMILY); + best_style = pango_font_description_to_string(best); + } + + if (target) + pango_font_description_free(target); + if (best) + pango_font_description_free(best); #ifdef DEBUG_FONT - std::cout << " Returning: " << best_style << std::endl; - std::cout << "FontLister::get_best_style_match: exit" << std::endl; - std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; + std::cout << " Returning: " << best_style << std::endl; + std::cout << "FontLister::get_best_style_match: exit" << std::endl; + std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; #endif - return best_style; - } + return best_style; +} - const Glib::RefPtr<Gtk::ListStore> - FontLister::get_font_list () const - { - return font_list_store; - } +const Glib::RefPtr<Gtk::ListStore> FontLister::get_font_list() const +{ + return font_list_store; +} - const Glib::RefPtr<Gtk::ListStore> - FontLister::get_style_list () const - { - return style_list_store; - } +const Glib::RefPtr<Gtk::ListStore> FontLister::get_style_list() const +{ + return style_list_store; } +} // namespace Inkscape + // Helper functions // Separator function (if true, a separator will be drawn) -gboolean font_lister_separator_func(GtkTreeModel *model, - GtkTreeIter *iter, - gpointer /*data*/) +gboolean font_lister_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer /*data*/) { - gchar* text = 0; - gtk_tree_model_get(model, iter, 0, &text, -1 ); // Column 0: FontList.family - return (text && strcmp(text,"#") == 0); + gchar *text = 0; + gtk_tree_model_get(model, iter, 0, &text, -1); // Column 0: FontList.family + return (text && strcmp(text, "#") == 0); } -void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer /*data*/) +void font_lister_cell_data_func(GtkCellLayout * /*cell_layout*/, + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer /*data*/) { gchar *family; gboolean onSystem = false; gtk_tree_model_get(model, iter, 0, &family, 2, &onSystem, -1); - Glib::ustring family_escaped = g_markup_escape_text(family, -1); + gchar* family_escaped = g_markup_escape_text(family, -1); //g_free(family); Glib::ustring markup; - if( !onSystem ) { + if (!onSystem) { markup = "<span foreground='darkblue'>"; /* See if font-family on system */ - std::vector<Glib::ustring> tokens = Glib::Regex::split_simple("\\s*,\\s*", family_escaped ); - for( size_t i=0; i < tokens.size(); ++i ) { + std::vector<Glib::ustring> tokens = Glib::Regex::split_simple("\\s*,\\s*", family_escaped); + for (size_t i = 0; i < tokens.size(); ++i) { Glib::ustring token = tokens[i]; @@ -1069,17 +1092,17 @@ void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/, gchar *family = 0; gboolean onSystem = true; gboolean found = false; - for( valid = gtk_tree_model_get_iter_first( GTK_TREE_MODEL(model), &iter ); + for (valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter); valid; - valid = gtk_tree_model_iter_next( GTK_TREE_MODEL(model), &iter ) ) { + valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter)) { gtk_tree_model_get(model, &iter, 0, &family, 2, &onSystem, -1); - if( onSystem && familyNamesAreEqual( token, family ) ) { + if (onSystem && familyNamesAreEqual(token, family)) { found = true; break; } } - if( found ) { + if (found) { markup += g_markup_escape_text(token.c_str(), -1); markup += ", "; } else { @@ -1090,13 +1113,13 @@ void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/, } } // Remove extra comma and space from end. - if( markup.size() >= 2 ) { - markup.resize( markup.size()-2 ); + if (markup.size() >= 2) { + markup.resize(markup.size() - 2); } markup += "</span>"; // std::cout << markup << std::endl; } else { - markup = family_escaped; + markup = family_escaped; } Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -1104,17 +1127,20 @@ void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/, if (show_sample) { Glib::ustring sample = prefs->getString("/tools/text/font_sample"); - Glib::ustring sample_escaped = g_markup_escape_text(sample.data(), -1); + gchar* sample_escaped = g_markup_escape_text(sample.data(), -1); markup += " <span foreground='gray' font_family='"; markup += family_escaped; markup += "'>"; markup += sample_escaped; markup += "</span>"; + g_free(sample_escaped); } - g_object_set (G_OBJECT (cell), "markup", markup.c_str(), NULL); + g_object_set(G_OBJECT(cell), "markup", markup.c_str(), NULL); + g_free(family_escaped); } + /* Local Variables: mode:c++ @@ -1124,4 +1150,4 @@ void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/, fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h index c89dab550..18e0d4b6e 100644 --- a/src/libnrtype/font-lister.h +++ b/src/libnrtype/font-lister.h @@ -28,294 +28,280 @@ class SPDocument; class SPCSSAttr; class SPStyle; -namespace Inkscape -{ - /** - * This class enumerates fonts using libnrtype into reusable data stores and - * allows for random access to the font-family list and the font-style list. - * Setting the font-family updates the font-style list. "Style" in this case - * refers to everything but family and size (e.g. italic/oblique, weight). - * - * This class handles font-family lists and fonts that are not on the system, - * where there is not an entry in the fontInstanceMap. - * - * This class uses the idea of "font_spec". This is a plain text string as used by - * Pango. It is similar to the CSS font shorthand except that font-family comes - * first and in this class the font-size is not used. - * - * This class uses the FontFactory class to get a list of system fonts - * and to find best matches via Pango. The Pango interface is only setup - * to deal with fonts that are on the system so care must be taken. For - * example, best matches should only be done with the first font-family - * in a font-family list. If the first font-family is not on the system - * then a generic font-family should be used (sans-serif -> Sans). - * - * This class is used by the UI interface (text-toolbar, font-select, etc.). - * - * "Font" includes family and style. It should not be used when one - * means font-family. - */ - class FontLister - { - public: - - enum Exceptions - { - FAMILY_NOT_FOUND, - STYLE_NOT_FOUND - }; - - - virtual ~FontLister (); - - /** GtkTreeModelColumnRecord for the font-family list Gtk::ListStore - */ - class FontListClass - : public Gtk::TreeModelColumnRecord - { - public: - /** Column containing the family name - */ - Gtk::TreeModelColumn<Glib::ustring> family; - - /** Column containing the styles for each family name. - */ - Gtk::TreeModelColumn<GList*> styles; - - /** Column containing flag if font is on system - */ - Gtk::TreeModelColumn<gboolean> onSystem; - - FontListClass () - { - add (family); - add (styles); - add (onSystem); - } - }; - - FontListClass FontList; - - class FontStyleListClass - : public Gtk::TreeModelColumnRecord - { - public: - /** Column containing the styles as Font designer used. - */ - Gtk::TreeModelColumn<Glib::ustring> displayStyle; - - /** Column containing the styles in CSS/Pango format. - */ - Gtk::TreeModelColumn<Glib::ustring> cssStyle; - - FontStyleListClass () - { - add (cssStyle); - add (displayStyle); - } - }; - - FontStyleListClass FontStyleList; - - /** Returns the ListStore with the family names - * - * The return is const and the function is declared as const. - * The ListStore is ready to be used after class instantiation - * and should not (cannot) be modified. - */ - const Glib::RefPtr<Gtk::ListStore> - get_font_list () const; - - /** Returns the ListStore with the styles - * - */ - const Glib::RefPtr<Gtk::ListStore> - get_style_list () const; - - /** Inserts a font family or font-fallback list (for use when not - * already in document or on system). - */ - void - insert_font_family ( Glib::ustring new_family ); - - /** Updates font list to include fonts in document - * - */ - void - update_font_list ( SPDocument* document); - - private: - void - update_font_list_recursive( SPObject *r, std::list<Glib::ustring> *l ); - - public: - static Inkscape::FontLister* - get_instance () - { - static Inkscape::FontLister* instance = new Inkscape::FontLister(); - return instance; - } - - /** Takes a hand written font spec and returns a Pango generated one in - * standard form. - */ - Glib::ustring canonize_fontspec( Glib::ustring fontspec ); - - /** Find closest system font to given font. - */ - Glib::ustring system_fontspec( Glib::ustring fontspec ); - - /** Gets font-family and style from fontspec. - * font-family and style returned. - */ - std::pair<Glib::ustring, Glib::ustring> - ui_from_fontspec (Glib::ustring fontspec); - - /** Sets font-family and style after a selection change. - * New font-family and style returned. - */ - std::pair<Glib::ustring, Glib::ustring> - selection_update (); - - /** Sets current_fontspec, etc. If check is false, won't - * try to find best style match (assumes style in fontspec - * valid for given font-family). - */ - void - set_fontspec (Glib::ustring fontspec, gboolean check=true); - - Glib::ustring - get_fontspec () - { - return current_fontspec; - } - - /** Changes font-family, updating style list and attempting to find - * closest style to current_style style (if check_style is true). - * New font-family and style returned. - * Does NOT update current_family and current_style. - * (For potential use in font-selector which doesn't update until - * "Apply" button clicked.) - */ - std::pair<Glib::ustring, Glib::ustring> - new_font_family (Glib::ustring family, gboolean check_style = true); - - /** Sets font-family, updating style list and attempting - * to find closest style to old current_style. - * New font-family and style returned. - * Updates current_family and current_style. - * Calls new_font_family(). - * (For use in text-toolbar where update is immediate.) - */ - std::pair<Glib::ustring, Glib::ustring> - set_font_family (Glib::ustring family, gboolean check_style = true); - - /** Sets font-family from row in list store. - * The row can be used to determine if we are in the - * document or system part of the font-family list. - * This is needed to handle scrolling through the - * font-family list correctly. - * Calls set_font_family(). - */ - std::pair<Glib::ustring, Glib::ustring> - set_font_family (int row, gboolean check_style = true); - - Glib::ustring - get_font_family () - { - return current_family; - } - - int - get_font_family_row () - { - return current_family_row; - } - - /** Sets style. Does not validate style for family. - */ - void - set_font_style (Glib::ustring style); - - Glib::ustring - get_font_style () - { - return current_style; - } - - Glib::ustring - fontspec_from_style (SPStyle* style); - - /** Fill css using current_fontspec. - */ - void - fill_css( SPCSSAttr *css, Glib::ustring fontspec = "" ); - - Gtk::TreeModel::Row - get_row_for_font (Glib::ustring family); - - Gtk::TreePath - get_path_for_font (Glib::ustring family); - - Gtk::TreeModel::Row - get_row_for_style (Glib::ustring style); - - Gtk::TreePath - get_path_for_style (Glib::ustring style); - - std::pair<Gtk::TreePath, Gtk::TreePath> - get_paths (Glib::ustring family, Glib::ustring style); - - /** Return best style match for new font given style for old font. - */ - Glib::ustring - get_best_style_match (Glib::ustring family, Glib::ustring style); - - /* Not Used */ - const NRNameList - get_name_list () const - { - return families; - } - - private: - - FontLister (); - - NRNameList families; - - Glib::RefPtr<Gtk::ListStore> font_list_store; - Glib::RefPtr<Gtk::ListStore> style_list_store; - - /** Info for currently selected font (what is shown in the UI). - * May include font-family lists and fonts not on system. - */ - int current_family_row; - Glib::ustring current_family; - Glib::ustring current_style; - Glib::ustring current_fontspec; - - /** fontspec of system font closest to current_fontspec. - * (What the system will use to display current_fontspec.) - */ - Glib::ustring current_fontspec_system; - - /** If a font-family is not on system, this list of styles is used. - */ - GList *default_styles; - }; -} +namespace Inkscape { + +/** + * This class enumerates fonts using libnrtype into reusable data stores and + * allows for random access to the font-family list and the font-style list. + * Setting the font-family updates the font-style list. "Style" in this case + * refers to everything but family and size (e.g. italic/oblique, weight). + * + * This class handles font-family lists and fonts that are not on the system, + * where there is not an entry in the fontInstanceMap. + * + * This class uses the idea of "font_spec". This is a plain text string as used by + * Pango. It is similar to the CSS font shorthand except that font-family comes + * first and in this class the font-size is not used. + * + * This class uses the FontFactory class to get a list of system fonts + * and to find best matches via Pango. The Pango interface is only setup + * to deal with fonts that are on the system so care must be taken. For + * example, best matches should only be done with the first font-family + * in a font-family list. If the first font-family is not on the system + * then a generic font-family should be used (sans-serif -> Sans). + * + * This class is used by the UI interface (text-toolbar, font-select, etc.). + * + * "Font" includes family and style. It should not be used when one + * means font-family. + */ + +class FontLister { +public: + enum Exceptions { + FAMILY_NOT_FOUND, + STYLE_NOT_FOUND + }; + + virtual ~FontLister(); + + /** + * GtkTreeModelColumnRecord for the font-family list Gtk::ListStore + */ + struct FontListClass : public Gtk::TreeModelColumnRecord { + /** + * Column containing the family name + */ + Gtk::TreeModelColumn<Glib::ustring> family; + + /** + * Column containing the styles for each family name. + */ + Gtk::TreeModelColumn<GList *> styles; + + /** + * Column containing flag if font is on system + */ + Gtk::TreeModelColumn<bool> onSystem; + + /** + * Not actually a column. + * Necessary for quick initialization of FontLister, + * we initially store the pango family and if the + * font style is actually used we'll cache it in + * %styles. + */ + Gtk::TreeModelColumn<PangoFontFamily *> pango_family; + + FontListClass() + { + add(family); + add(styles); + add(onSystem); + add(pango_family); + } + }; + + FontListClass FontList; + + struct FontStyleListClass : public Gtk::TreeModelColumnRecord { + /** + * Column containing the styles as Font designer used. + */ + Gtk::TreeModelColumn<Glib::ustring> displayStyle; + + /** + * Column containing the styles in CSS/Pango format. + */ + Gtk::TreeModelColumn<Glib::ustring> cssStyle; + + FontStyleListClass() + { + add(cssStyle); + add(displayStyle); + } + }; + + FontStyleListClass FontStyleList; + + /** + * @return the ListStore with the family names + * + * The return is const and the function is declared as const. + * The ListStore is ready to be used after class instantiation + * and should not be modified. + */ + const Glib::RefPtr<Gtk::ListStore> get_font_list() const; + + /** + * @return the ListStore with the styles + */ + const Glib::RefPtr<Gtk::ListStore> get_style_list() const; + + /** + * Inserts a font family or font-fallback list (for use when not + * already in document or on system). + */ + void insert_font_family(Glib::ustring new_family); + + /** + * Updates font list to include fonts in document. + */ + void update_font_list(SPDocument *document); + +public: + static Inkscape::FontLister *get_instance(); + + /** + * Takes a hand written font spec and returns a Pango generated one in + * standard form. + */ + Glib::ustring canonize_fontspec(Glib::ustring fontspec); + + /** + * Find closest system font to given font. + */ + Glib::ustring system_fontspec(Glib::ustring fontspec); + + /** + * Gets font-family and style from fontspec. + * font-family and style returned. + */ + std::pair<Glib::ustring, Glib::ustring> ui_from_fontspec(Glib::ustring fontspec); + + /** + * Sets font-family and style after a selection change. + * New font-family and style returned. + */ + std::pair<Glib::ustring, Glib::ustring> selection_update(); + + /** + * Sets current_fontspec, etc. If check is false, won't + * try to find best style match (assumes style in fontspec + * valid for given font-family). + */ + void set_fontspec(Glib::ustring fontspec, bool check = true); + + Glib::ustring get_fontspec() + { + return current_fontspec; + } + + /** + * Changes font-family, updating style list and attempting to find + * closest style to current_style style (if check_style is true). + * New font-family and style returned. + * Does NOT update current_family and current_style. + * (For potential use in font-selector which doesn't update until + * "Apply" button clicked.) + */ + std::pair<Glib::ustring, Glib::ustring> new_font_family(Glib::ustring family, bool check_style = true); + + /** + * Sets font-family, updating style list and attempting + * to find closest style to old current_style. + * New font-family and style returned. + * Updates current_family and current_style. + * Calls new_font_family(). + * (For use in text-toolbar where update is immediate.) + */ + std::pair<Glib::ustring, Glib::ustring> set_font_family(Glib::ustring family, bool check_style = true); + + /** + * Sets font-family from row in list store. + * The row can be used to determine if we are in the + * document or system part of the font-family list. + * This is needed to handle scrolling through the + * font-family list correctly. + * Calls set_font_family(). + */ + std::pair<Glib::ustring, Glib::ustring> set_font_family(int row, bool check_style = true); + + Glib::ustring get_font_family() + { + return current_family; + } + + int get_font_family_row() + { + return current_family_row; + } + + /** + * Sets style. Does not validate style for family. + */ + void set_font_style(Glib::ustring style); + + Glib::ustring get_font_style() + { + return current_style; + } + + Glib::ustring fontspec_from_style(SPStyle *style); + + /** + * Fill css using current_fontspec. + */ + void fill_css(SPCSSAttr *css, Glib::ustring fontspec = ""); + + Gtk::TreeModel::Row get_row_for_font(Glib::ustring family); + + Gtk::TreePath get_path_for_font(Glib::ustring family); + + Gtk::TreeModel::Row get_row_for_style(Glib::ustring style); + + Gtk::TreePath get_path_for_style(Glib::ustring style); + + std::pair<Gtk::TreePath, Gtk::TreePath> get_paths(Glib::ustring family, Glib::ustring style); + + /** + * Return best style match for new font given style for old font. + */ + Glib::ustring get_best_style_match(Glib::ustring family, Glib::ustring style); + + void ensureRowStyles(GtkTreeModel* model, GtkTreeIter const* iter); + +private: + FontLister(); + + void update_font_list_recursive(SPObject *r, std::list<Glib::ustring> *l); + + Glib::RefPtr<Gtk::ListStore> font_list_store; + Glib::RefPtr<Gtk::ListStore> style_list_store; + + /** + * Info for currently selected font (what is shown in the UI). + * May include font-family lists and fonts not on system. + */ + int current_family_row; + Glib::ustring current_family; + Glib::ustring current_style; + Glib::ustring current_fontspec; + + /** + * fontspec of system font closest to current_fontspec. + * (What the system will use to display current_fontspec.) + */ + Glib::ustring current_fontspec_system; + + /** + * If a font-family is not on system, this list of styles is used. + */ + GList *default_styles; +}; + +} // namespace Inkscape // Helper functions gboolean font_lister_separator_func(GtkTreeModel *model, - GtkTreeIter *iter, - gpointer /*data*/); + GtkTreeIter *iter, + gpointer /*data*/); -void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer /*data*/); +void font_lister_cell_data_func(GtkCellLayout * /*cell_layout*/, + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer /*data*/); #endif @@ -328,4 +314,4 @@ void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/, fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index a00db1715..9996fc0f9 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -343,9 +343,9 @@ void TextEdit::onReadSelection ( gboolean dostyle, gboolean /*docontent*/ ) Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance(); - // This is done for us by text-toolbar. No need to do it twice. - // fontlister->update_font_list( sp_desktop_document( SP_ACTIVE_DESKTOP )); - // fontlister->selection_update(); + // This is normally done for us by text-toolbar but only when we are in text editing context + fontlister->update_font_list(sp_desktop_document(this->desktop)); + fontlister->selection_update(); Glib::ustring fontspec = fontlister->get_fontspec(); diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp index f00f05768..327349844 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -304,6 +304,9 @@ static void sp_font_selector_family_select_row(GtkTreeSelection *selection, GtkTreeModel *model; GtkTreeIter iter; if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return; + + Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance(); + fontlister->ensureRowStyles(model, &iter); // Next get family name with its style list gchar *family; @@ -311,7 +314,6 @@ static void sp_font_selector_family_select_row(GtkTreeSelection *selection, gtk_tree_model_get (model, &iter, 0, &family, 1, &list, -1); // Find best style match for selected family with current style (e.g. of selected text). - Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance(); Glib::ustring style = fontlister->get_font_style(); Glib::ustring best = fontlister->get_best_style_match (family, style); diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 36a151c52..2697beb8a 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -819,7 +819,7 @@ static void sp_text_set_sizes(GtkListStore* model_size, int unit) * It is called whenever a text selection is changed, including stepping cursor * through text, or setting focus to text. */ -static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/, GObject *tbl) +static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/, GObject *tbl, bool subselection = false) // don't bother to update font list if subsel changed { #ifdef DEBUG_TEXT static int count = 0; @@ -859,7 +859,9 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontStyleAction" ) ); Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance(); - fontlister->update_font_list( sp_desktop_document( SP_ACTIVE_DESKTOP )); + if (!subselection) { + fontlister->update_font_list( sp_desktop_document( SP_ACTIVE_DESKTOP )); + } fontlister->selection_update(); // Update font list, but only if widget already created. @@ -1154,7 +1156,7 @@ static void sp_text_toolbox_selection_modified(Inkscape::Selection *selection, g static void sp_text_toolbox_subselection_changed (gpointer /*tc*/, GObject *tbl) { - sp_text_toolbox_selection_changed (NULL, tbl); + sp_text_toolbox_selection_changed (NULL, tbl, true); } // TODO: possibly share with font-selector by moving most code to font-lister (passing family name) @@ -1640,7 +1642,7 @@ static void text_toolbox_watch_ec(SPDesktop* desktop, Inkscape::UI::Tools::ToolB if (SP_IS_TEXT_CONTEXT(ec)) { // Watch selection - c_selection_changed = sp_desktop_selection(desktop)->connectChanged(bind(ptr_fun(sp_text_toolbox_selection_changed), holder)); + c_selection_changed = sp_desktop_selection(desktop)->connectChanged(bind(ptr_fun(sp_text_toolbox_selection_changed), holder, false)); c_selection_modified = sp_desktop_selection (desktop)->connectModified(bind(ptr_fun(sp_text_toolbox_selection_modified), holder)); c_subselection_changed = desktop->connectToolSubselectionChanged(bind(ptr_fun(sp_text_toolbox_subselection_changed), holder)); } else { -- cgit v1.2.3 From a7384aa7c43a5fe4b56e5d5d610ece0cafcaa748 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Wed, 15 Oct 2014 20:03:43 +0200 Subject: Fix strict build with Gtk+ 2 (experimental commit r13513) (bzr r13616.1.2) --- src/libnrtype/font-lister.cpp | 2 +- src/ui/tools/tool-base.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 9a978b0fd..39c557cc6 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -2,8 +2,8 @@ #include <config.h> #endif -#include <gtkmm/treemodel.h> #include <gtkmm/liststore.h> +#include <gtkmm/treemodel.h> #include <libnrtype/font-instance.h> #include <libnrtype/TextWrapper.h> diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index f1d90f6c6..1c1e8a17a 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -18,6 +18,8 @@ # include "config.h" #endif +#include "widgets/desktop-widget.h" + #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> #endif @@ -40,7 +42,6 @@ #include "desktop-handles.h" #include "desktop-events.h" #include "desktop-style.h" -#include "widgets/desktop-widget.h" #include "sp-namedview.h" #include "selection.h" #include "interface.h" -- cgit v1.2.3 From 89c93099750a1123ea99bc98feb00ff51ee64373 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Wed, 15 Oct 2014 20:17:43 +0200 Subject: More direct way of finding font-family. One entry per unique style. (experimental r13580 and r12581) (bzr r13616.1.3) --- src/extension/internal/pdfinput/svg-builder.cpp | 11 +- src/libnrtype/FontFactory.cpp | 483 ++---------------------- src/libnrtype/FontFactory.h | 38 +- 3 files changed, 50 insertions(+), 482 deletions(-) diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 71e6dc6ae..7a504add0 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -123,12 +123,11 @@ void SvgBuilder::_init() { _height = 0; // Fill _availableFontNames (Bug LP #179589) (code cfr. FontLister) - FamilyToStylesMap familyStyleMap; - font_factory::Default()->GetUIFamiliesAndStyles(&familyStyleMap); - for (FamilyToStylesMap::iterator iter = familyStyleMap.begin(); - iter != familyStyleMap.end(); - ++iter) { - _availableFontNames.push_back(iter->first.c_str()); + std::vector<PangoFontFamily *> families; + font_factory::Default()->GetUIFamilies(families); + for ( std::vector<PangoFontFamily *>::iterator iter = families.begin(); + iter != families.end(); ++iter ) { + _availableFontNames.push_back(pango_font_family_get_name(*iter)); } _transp_group_stack = NULL; diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index cb9af5eb0..cb9602394 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -130,13 +130,6 @@ font_factory::~font_factory(void) delete tmp; loadedPtr = 0; } - - // Delete the pango font pointers in the string to instance map - PangoStringToDescrMap::iterator it = fontInstanceMap.begin(); - while (it != fontInstanceMap.end()) { - pango_font_description_free((*it).second); - ++it; - } } @@ -249,248 +242,6 @@ Glib::ustring font_factory::GetUIStyleString(PangoFontDescription const *fontDes return style; } -/** - Replace font family leaving style alone (if possible). - @param fontSpec the given font - @param newFamily - @return the changed fontspec, if the property can not be set return an empty string - The routine first searches for an exact match. - If no exact match found, calls FontSpecificationBestMatch(). -*/ -Glib::ustring font_factory::ReplaceFontSpecificationFamily(const Glib::ustring & fontSpec, const Glib::ustring & newFamily) -{ - Glib::ustring newFontSpec; - - // Although we are using the string from pango_font_description_to_string for the - // font specification, we definitely cannot just set the new family in the - // PangoFontDescription structure and ask for a new string. This is because - // what constitutes a "family" in our own UI may be different from how Pango - // sees it. - - // Find the PangoFontDescription associated with the old font specification string. - PangoStringToDescrMap::iterator it = fontInstanceMap.find(fontSpec); - - - if (it != fontInstanceMap.end()) { - // Description found! - - // Make copy - PangoFontDescription *descr = pango_font_description_copy((*it).second); - - // Grab the old UI Family string from the descr - Glib::ustring uiFamily = GetUIFamilyString(descr); - - // Replace the UI Family name with the new family name - std::size_t found = fontSpec.find(uiFamily); - if (found != Glib::ustring::npos) { - - // Add comma to end of newFamily... commas at end don't hurt but are - // required if the last part of a family name is a valid font style - // (e.g. "Arial Black"). - Glib::ustring newFamilyComma = newFamily; - if( *newFamilyComma.rbegin() != ',' ) { - newFamilyComma += ","; - } - newFontSpec = fontSpec; - newFontSpec.erase(found, uiFamily.size()); - newFontSpec.insert(found, newFamilyComma); - - // If the new font specification does not exist in the reference maps, - // search for the next best match for the faces in that style - it = fontInstanceMap.find(newFontSpec); - if (it == fontInstanceMap.end()) { - - // Search for best match, empty string returned if not found. - newFontSpec = FontSpecificationBestMatch( newFontSpec ); - - } - } - - pango_font_description_free(descr); - } - - return newFontSpec; -} - -/** - Apply style property to the given font - @param fontSpec the given font - @param turnOn true to set italic style - @return the changed fontspec, if the property can not be set return an empty string - The routine first searches for an exact match to "FontFamily Italic" or - "Font Family Oblique" (turnOn is true) or "FontFamily" (turnOn is false). - If no exact match found, calls FontSpecificationBestMatch(). -*/ -Glib::ustring font_factory::FontSpecificationSetItalic(const Glib::ustring & fontSpec, bool turnOn) -{ - Glib::ustring newFontSpec; - - // Find the PangoFontDescription associated with the font specification string. - PangoStringToDescrMap::iterator it = fontInstanceMap.find(fontSpec); - - if (it != fontInstanceMap.end()) { - // Description found! - - // Make copy. - PangoFontDescription *descr = pango_font_description_copy((*it).second); - - PangoStyle style; - if (turnOn) { - // First try Oblique, we'll try Italic later - style = PANGO_STYLE_OBLIQUE; - } else { - style = PANGO_STYLE_NORMAL; - } - - pango_font_description_set_style(descr, style); - - newFontSpec = ConstructFontSpecification(descr); - - bool exactMatchFound = true; - if (fontInstanceMap.find(newFontSpec) == fontInstanceMap.end()) { - - exactMatchFound = false; - if (turnOn) { - // Next try Italic - style = PANGO_STYLE_ITALIC; - pango_font_description_set_style(descr, style); - - exactMatchFound = true; - if (fontInstanceMap.find(newFontSpec) == fontInstanceMap.end()) { - exactMatchFound = false; - } - } - } - - // Search for best match, empty string returned if not found. - if( !exactMatchFound ) { - newFontSpec = FontSpecificationBestMatch( newFontSpec ); - } - - pango_font_description_free(descr); - } - - return newFontSpec; // Empty if not found. -} - -/** - Apply weight property to the given font - @param fontSpec the given font - @param turnOn true to set bold - @return the changed fontspec, if the property can not be set return an empty string - This routine first searches for an exact match, if none found - it calls FontSpecificationBestMatch(). -*/ -Glib::ustring font_factory::FontSpecificationSetBold(const Glib::ustring & fontSpec, bool turnOn) -{ - Glib::ustring newFontSpec; - - // Find the PangoFontDescription associated with the font specification string. - PangoStringToDescrMap::iterator it = fontInstanceMap.find(fontSpec); - - if (it != fontInstanceMap.end()) { - // Description found! - - // Make copy. - PangoFontDescription *descr = pango_font_description_copy((*it).second); - - - PangoWeight weight; - if (turnOn) { - weight = PANGO_WEIGHT_BOLD; - } else { - weight = PANGO_WEIGHT_NORMAL; - } - - pango_font_description_set_weight(descr, weight); - - newFontSpec = ConstructFontSpecification(descr); - - if (fontInstanceMap.find(newFontSpec) == fontInstanceMap.end()) { - // Search for best match, empty string returned if not found. - newFontSpec = FontSpecificationBestMatch( newFontSpec ); - } - - pango_font_description_free(descr); - } - - return newFontSpec; // Empty if not found. -} - -/** - Use pango_font_description_better_match() to find best font match. - This handles cases like Century Schoolbook L where the "normal" - font is Century Schoolbook L Medium so just removing Italic - from the font name doesn't yield the correct name. - @param fontSpec the given font - @return the changed fontspec, if the property can not be set return an empty string -*/ -// http://library.gnome.org/devel/pango/1.28/pango-Fonts.html#pango-font-description-better-match -Glib::ustring font_factory::FontSpecificationBestMatch(const Glib::ustring & fontSpec ) -{ - - Glib::ustring newFontSpec; - - // Look for exact match - PangoStringToDescrMap::iterator it = fontInstanceMap.find(fontSpec); - - // If there is no exact match, look for the best match. - if (it != fontInstanceMap.end()) { - - newFontSpec = fontSpec; - - } else { - - PangoFontDescription *fontDescr = pango_font_description_from_string(fontSpec.c_str()); - PangoFontDescription *bestMatchDescr = NULL; - - // Grab the UI Family string from the descr - Glib::ustring family = GetUIFamilyString(fontDescr); - Glib::ustring bestMatchDescription; - - bool setFirstFamilyMatch = false; - for (it = fontInstanceMap.begin(); it != fontInstanceMap.end(); ++it) { - - Glib::ustring currentFontSpec = (*it).first; - Glib::ustring currentFamily = GetUIFamilyString((*it).second); - - // Save some time by only looking at the right family. - // Must use family name rather than fontSpec - // (otherwise DejaVu Sans matches DejaVu Sans Mono). - if (currentFamily == family) { - if (!setFirstFamilyMatch) { - // This ensures that the closest match is at least within the correct - // family rather than the first font in the list - bestMatchDescr = pango_font_description_copy((*it).second); - bestMatchDescription = currentFontSpec; - setFirstFamilyMatch = true; - } else { - // Get the font description that corresponds, and - // then see if we've found a better match - PangoFontDescription *possibleMatch = pango_font_description_copy((*it).second); - - if (pango_font_description_better_match( - fontDescr, bestMatchDescr, possibleMatch)) { - - pango_font_description_free(bestMatchDescr); - bestMatchDescr = possibleMatch; - bestMatchDescription = currentFontSpec; - } else { - pango_font_description_free(possibleMatch); - } - } - } - } // for - - newFontSpec = bestMatchDescription; // If NULL, then no match found - - pango_font_description_free(fontDescr); - pango_font_description_free(bestMatchDescr); - - } - - return newFontSpec; -} ///// @@ -509,10 +260,10 @@ static int StyleNameValue( const Glib::ustring &style ) } // Determines order in which styles are presented (sorted by CSS style values) -static bool StyleNameCompareInternal(const StyleNames &style1, const StyleNames &style2) -{ - return( StyleNameValue( style1.CssName ) < StyleNameValue( style2.CssName ) ); -} +//static bool StyleNameCompareInternal(const StyleNames &style1, const StyleNames &style2) +//{ +// return( StyleNameValue( style1.CssName ) < StyleNameValue( style2.CssName ) ); +//} static bool ustringPairSort(std::pair<PangoFontFamily*, Glib::ustring> const& first, std::pair<PangoFontFamily*, Glib::ustring> const& second) { @@ -559,6 +310,7 @@ GList* font_factory::GetUIStyles(PangoFontFamily * in) // If the face has a name, describe it, and then use the // description to get the UI family and face strings const gchar* displayName = pango_font_face_get_face_name(faces[currentFace]); + // std::cout << "Display Name: " << displayName << std::endl; if (displayName == NULL || *displayName == '\0') { continue; } @@ -579,7 +331,19 @@ GList* font_factory::GetUIStyles(PangoFontFamily * in) } } - if (!familyUIName.empty() && !styleUIName.empty()) { + bool exists = false; + for(GList *temp = ret; temp; temp = temp->next) { + if( ((StyleNames*)temp->data)->CssName.compare( styleUIName ) == 0 ) { + exists = true; + std::cerr << "Warning: Font face with same CSS values already added: " + << familyUIName << " " << styleUIName + << " (" << ((StyleNames*)temp->data)->DisplayName + << ", " << displayName << ")" << std::endl; + break; + } + } + + if (!exists && !familyUIName.empty() && !styleUIName.empty()) { // Add the style information ret = g_list_append(ret, new StyleNames(styleUIName, displayName)); } @@ -590,140 +354,6 @@ GList* font_factory::GetUIStyles(PangoFontFamily * in) return ret; } -void font_factory::GetUIFamiliesAndStyles(FamilyToStylesMap *map) -{ - g_assert(map); - - if (map) { - - // Gather the family names as listed by Pango - PangoFontFamily** families = NULL; - int numFamilies = 0; - pango_font_map_list_families(fontServer, &families, &numFamilies); - - for (int currentFamily=0; currentFamily < numFamilies; currentFamily++) { - - // Gather the styles for this family - PangoFontFace** faces = NULL; - int numFaces = 0; - pango_font_family_list_faces(families[currentFamily], &faces, &numFaces); - - for (int currentFace=0; currentFace < numFaces; currentFace++) { - - // If the face has a name, describe it, and then use the - // description to get the UI family and face strings - - const gchar* displayName = pango_font_face_get_face_name(faces[currentFace]); - if (displayName == NULL) { - continue; - } - - PangoFontDescription *faceDescr = pango_font_face_describe(faces[currentFace]); - if (faceDescr) { - Glib::ustring familyUIName = GetUIFamilyString(faceDescr); - Glib::ustring styleUIName = GetUIStyleString(faceDescr); - // std::cout << familyUIName << " " << styleUIName << " (" << displayName << ")" << std::endl; - - // Disable synthesized (faux) font faces except for CSS generic faces - if (pango_font_face_is_synthesized(faces[currentFace]) ) { - if( familyUIName.compare( "sans-serif" ) != 0 && - familyUIName.compare( "serif" ) != 0 && - familyUIName.compare( "monospace" ) != 0 && - familyUIName.compare( "fantasy" ) != 0 && - familyUIName.compare( "cursive" ) != 0 ) { - //std::cout << "faux: " << familyUIName << " | " << styleUIName << std::endl; - continue; - } - } - - // Pango breaks the 1 to 1 mapping between Pango weights and CSS weights by - // adding Semi-Light (as of 1.36.7), Book (as of 1.24), and Ultra-Heavy (as of - // 1.24). We need to map these weights to CSS weights. Book and Ultra-Heavy - // are rarely used. Semi-Light (350) is problematic as it is halfway between - // Light (300) and Normal (400) and if care is not taken it is converted to - // Normal, rather than Light. - // - // Note: The ultimate solution to handling various weight in the same - // font family is to support the @font rules from CSS. - // - // Additional notes, helpful for debugging: - // Pango's FC backend: - // Weights defined in fontconfig/fontconfig.h - // String equivalents in src/fcfreetype.c - // Weight set from os2->usWeightClass - // Use Fontforge: Element->Font Info...->OS/2->Misc->Weight Class to check font weight - size_t f = styleUIName.find( "Book" ); - if( f != Glib::ustring::npos ) { - styleUIName.replace( f, 4, "Normal" ); - } - f = styleUIName.find( "Semi-Light" ); - if( f != Glib::ustring::npos ) { - styleUIName.replace( f, 10, "Light" ); - } - f = styleUIName.find( "Ultra-Heavy" ); - if( f != Glib::ustring::npos ) { - styleUIName.replace( f, 11, "Heavy" ); - } - - if (!familyUIName.empty() && !styleUIName.empty()) { - - // Find the right place to put the style information, adding - // a map entry for the family name if it doesn't yet exist - - FamilyToStylesMap::iterator iter = map->find(familyUIName); - - // Insert new family - if (iter == map->end()) { - map->insert(std::make_pair(familyUIName, std::list<StyleNames>())); - } - - // Insert into the style list and save the info in the reference maps - // only if the style does not yet exist - - bool exists = false; - std::list<StyleNames> &styleList = (*map)[familyUIName]; - - for (std::list<StyleNames>::iterator it=styleList.begin(); - it != styleList.end(); - ++it) { - if ( (*it).CssName == styleUIName) { - exists = true; - std::cerr << "Warning: Font face with same CSS values already added: " << familyUIName << " " << styleUIName << " (" << (*it).DisplayName << ", " << displayName << ")" << std::endl; - break; - } - } - - if (!exists) { - styleList.push_back( StyleNames(styleUIName,displayName) ); - - // Add the string info needed in the reference maps - fontStringMap.insert( - std::make_pair( - Glib::ustring(familyUIName) + Glib::ustring(styleUIName), - ConstructFontSpecification(faceDescr))); - fontInstanceMap.insert( - std::make_pair(ConstructFontSpecification(faceDescr), faceDescr)); - - } else { - pango_font_description_free(faceDescr); - } - } else { - pango_font_description_free(faceDescr); - } - } - } - g_free(faces); - faces = 0; - } - g_free(families); - families = 0; - - // Sort the style lists - for (FamilyToStylesMap::iterator iter = map->begin() ; iter != map->end(); ++iter) { - (*iter).second.sort(StyleNameCompareInternal); - } - } -} font_instance* font_factory::FaceFromStyle(SPStyle const *style) { @@ -869,14 +499,6 @@ font_instance* font_factory::FaceFromStyle(SPStyle const *style) font = Face(temp_descr); pango_font_description_free(temp_descr); - - // We now find closest match to this font: - Glib::ustring fontSpec = font_factory::Default()->ConstructFontSpecification(font); - Glib::ustring newFontSpec = FontSpecificationBestMatch( fontSpec ); - if( fontSpec != newFontSpec ) { - font->Unref(); - font = FaceFromFontSpecification( newFontSpec.c_str() ); - } } } @@ -892,37 +514,6 @@ font_instance *font_factory::FaceFromDescr(char const *family, char const *style return res; } -font_instance* font_factory::FaceFromUIStrings(char const *uiFamily, char const *uiStyle) -{ - font_instance *fontInstance = NULL; - - g_assert(uiFamily && uiStyle); - if (uiFamily && uiStyle) { - - // If font list, take only first font in list - gchar** tokens = g_strsplit( uiFamily, ",", 0 ); - g_strstrip( tokens[0] ); - - Glib::ustring uiString = Glib::ustring(tokens[0]) + Glib::ustring(uiStyle); - - g_strfreev( tokens ); - - UIStringToPangoStringMap::iterator uiToPangoIter = fontStringMap.find(uiString); - - if (uiToPangoIter != fontStringMap.end ()) { - PangoStringToDescrMap::iterator pangoToDescrIter = fontInstanceMap.find((*uiToPangoIter).second); - if (pangoToDescrIter != fontInstanceMap.end()) { - // We found the pango description - now we can make a font_instance - PangoFontDescription *tempDescr = pango_font_description_copy((*pangoToDescrIter).second); - fontInstance = Face(tempDescr); - pango_font_description_free(tempDescr); - } - } - } - - return fontInstance; -} - font_instance* font_factory::FaceFromPangoString(char const *pangoString) { font_instance *fontInstance = NULL; @@ -930,25 +521,15 @@ font_instance* font_factory::FaceFromPangoString(char const *pangoString) g_assert(pangoString); if (pangoString) { - PangoFontDescription *descr = NULL; - - // First attempt to find the font specification in the reference map - PangoStringToDescrMap::iterator it = fontInstanceMap.find(Glib::ustring(pangoString)); - if (it != fontInstanceMap.end()) { - descr = pango_font_description_copy((*it).second); - } - // Or create a font description from the string - this may fail or + // Create a font description from the string - this may fail or // produce unexpected results if the string does not have a good format - if (!descr) { - descr = pango_font_description_from_string(pangoString); - } - - if (descr && (sp_font_description_get_family(descr) != NULL)) { - fontInstance = Face(descr); - } + PangoFontDescription *descr = pango_font_description_from_string(pangoString); if (descr) { + if (sp_font_description_get_family(descr) != NULL) { + fontInstance = Face(descr); + } pango_font_description_free(descr); } } @@ -1113,24 +694,6 @@ void font_factory::AddInCache(font_instance *who) nbEnt++; } -/* - { - std::cout << " Printing out fontInstanceMap: " << std::endl; - PangoStringToDescrMap::iterator it = fontInstanceMap.begin(); - while (it != fontInstanceMap.end()) { - - PangoFontDescription *descr = pango_font_description_copy((*it).second); - - // Grab the UI Family string from the descr - Glib::ustring uiFamily = GetUIFamilyString(descr); - Glib::ustring uiStyle = GetUIStyleString(descr); - std::cout << " " << uiFamily << " " << uiStyle << std::endl; - - it++; - } - } -*/ - /* Local Variables: mode:c++ diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h index 85576e08d..bd5a4460c 100644 --- a/src/libnrtype/FontFactory.h +++ b/src/libnrtype/FontFactory.h @@ -112,18 +112,6 @@ public: Glib::ustring GetUIFamilyString(PangoFontDescription const *fontDescr); Glib::ustring GetUIStyleString(PangoFontDescription const *fontDescr); - /// Modifiers for the font specification (returns new font specification) - Glib::ustring ReplaceFontSpecificationFamily(const Glib::ustring & fontSpec, const Glib::ustring & newFamily); - Glib::ustring FontSpecificationSetItalic(const Glib::ustring & fontSpec, bool turnOn); - Glib::ustring FontSpecificationSetBold(const Glib::ustring & fontSpec, bool turnOn); - - Glib::ustring FontSpecificationBestMatch(const Glib::ustring& fontSpec ); - - // Gathers all strings needed for UI while storing pango information in - // fontInstanceMap and fontStringMap - // don't use this function, it's too slow - void GetUIFamiliesAndStyles(FamilyToStylesMap *map); - // Helpfully inserts all font families into the provided vector void GetUIFamilies(std::vector<PangoFontFamily *>& out); // Retrieves style information about a family in a newly allocated GList. @@ -152,19 +140,37 @@ public: private: void* loadedPtr; + + // The following two commented out maps were an attempt to allow Inkscape to use font faces + // that could not be distinguished by CSS values alone. In practice, they never were that + // useful as PangoFontDescription, which is used throughout our code, cannot distinguish + // between faces anymore than raw CSS values (with the exception of two additional weight + // values). + // + // During various works, for example to handle font-family lists and fonts that are not + // installed on the system, the code has become less reliant on these maps. And in the work to + // catch style information to speed up start up times, the maps were not being filled. + // I've removed all code that used these maps as of Oct 2014 in the experimental branch. + // The commented out maps are left here as a reminder of the path that was attempted. + // + // One possible method to keep track of font faces would be to use the 'display name', keeping + // pointers to the appropriate PangoFontFace. The font_factory loadedFaces map indexing would + // have to be changed to incorporate 'display name' (InkscapeFontDescription?). + + // These two maps are used for translating between what's in the UI and a pango // font description. This is necessary because Pango cannot always // reproduce these structures from the names it gave us in the first place. // Key: A string produced by font_factory::ConstructFontSpecification // Value: The associated PangoFontDescription - typedef std::map<Glib::ustring, PangoFontDescription *> PangoStringToDescrMap; - PangoStringToDescrMap fontInstanceMap; + // typedef std::map<Glib::ustring, PangoFontDescription *> PangoStringToDescrMap; + // PangoStringToDescrMap fontInstanceMap; // Key: Family name in UI + Style name in UI // Value: The associated string that should be produced with font_factory::ConstructFontSpecification - typedef std::map<Glib::ustring, Glib::ustring> UIStringToPangoStringMap; - UIStringToPangoStringMap fontStringMap; + // typedef std::map<Glib::ustring, Glib::ustring> UIStringToPangoStringMap; + // UIStringToPangoStringMap fontStringMap; }; -- cgit v1.2.3 From 91741bf6f23e79c0c709e08b0ec0c0f8aad8139f Mon Sep 17 00:00:00 2001 From: Tavmjong Bah <tavmjong@free.fr> Date: Wed, 15 Oct 2014 20:38:31 +0200 Subject: Various small font things. (experimental r13577-13579) (bzr r13616.1.4) --- src/libnrtype/FontFactory.cpp | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index cb9602394..d052eeb42 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -265,6 +265,12 @@ static int StyleNameValue( const Glib::ustring &style ) // return( StyleNameValue( style1.CssName ) < StyleNameValue( style2.CssName ) ); //} +static gint StyleNameCompareInternalGlib(gconstpointer a, gconstpointer b) +{ + return( StyleNameValue( ((StyleNames *)a)->CssName ) < + StyleNameValue( ((StyleNames *)b)->CssName ) ? -1 : 1 ); +} + static bool ustringPairSort(std::pair<PangoFontFamily*, Glib::ustring> const& first, std::pair<PangoFontFamily*, Glib::ustring> const& second) { // well, this looks weird. @@ -319,7 +325,7 @@ GList* font_factory::GetUIStyles(PangoFontFamily * in) if (faceDescr) { Glib::ustring familyUIName = GetUIFamilyString(faceDescr); Glib::ustring styleUIName = GetUIStyleString(faceDescr); - + // std::cout << familyUIName << " " << styleUIName << " " << displayName << std::endl; // Disable synthesized (faux) font faces except for CSS generic faces if (pango_font_face_is_synthesized(faces[currentFace]) ) { if (familyUIName.compare( "sans-serif" ) != 0 && @@ -331,6 +337,35 @@ GList* font_factory::GetUIStyles(PangoFontFamily * in) } } + // Pango breaks the 1 to 1 mapping between Pango weights and CSS weights by + // adding Semi-Light (as of 1.36.7), Book (as of 1.24), and Ultra-Heavy (as of + // 1.24). We need to map these weights to CSS weights. Book and Ultra-Heavy + // are rarely used. Semi-Light (350) is problematic as it is halfway between + // Light (300) and Normal (400) and if care is not taken it is converted to + // Normal, rather than Light. + // + // Note: The ultimate solution to handling various weight in the same + // font family is to support the @font rules from CSS. + // + // Additional notes, helpful for debugging: + // Pango's FC backend: + // Weights defined in fontconfig/fontconfig.h + // String equivalents in src/fcfreetype.c + // Weight set from os2->usWeightClass + // Use Fontforge: Element->Font Info...->OS/2->Misc->Weight Class to check font weight + size_t f = styleUIName.find( "Book" ); + if( f != Glib::ustring::npos ) { + styleUIName.replace( f, 4, "Normal" ); + } + f = styleUIName.find( "Semi-Light" ); + if( f != Glib::ustring::npos ) { + styleUIName.replace( f, 10, "Light" ); + } + f = styleUIName.find( "Ultra-Heavy" ); + if( f != Glib::ustring::npos ) { + styleUIName.replace( f, 11, "Heavy" ); + } + bool exists = false; for(GList *temp = ret; temp; temp = temp->next) { if( ((StyleNames*)temp->data)->CssName.compare( styleUIName ) == 0 ) { @@ -351,10 +386,12 @@ GList* font_factory::GetUIStyles(PangoFontFamily * in) pango_font_description_free(faceDescr); } g_free(faces); + + // Sort the style lists + ret = g_list_sort( ret, StyleNameCompareInternalGlib ); return ret; } - font_instance* font_factory::FaceFromStyle(SPStyle const *style) { font_instance *font = NULL; -- cgit v1.2.3 From ee307b787adb19aadadbe8f3cac785e2317eceaf Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" <jon@joncruz.org> Date: Wed, 15 Oct 2014 23:31:29 -0700 Subject: Cleanup of unintialized and leaked values. (bzr r13618) --- src/extension/internal/pdfinput/pdf-parser.cpp | 182 +++++++++++++++++-------- src/extension/internal/pdfinput/pdf-parser.h | 30 +--- 2 files changed, 124 insertions(+), 88 deletions(-) diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index c5f03e5aa..0b7dc7905 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -247,30 +247,74 @@ PdfOperator PdfParser::opTab[] = { #define numOps (sizeof(opTab) / sizeof(PdfOperator)) +namespace { + +GfxPatch blankPatch() +{ + GfxPatch patch; + memset(&patch, 0, sizeof(patch)); // quick-n-dirty + return patch; +} + +} // namespace + //------------------------------------------------------------------------ -// PdfParser +// ClipHistoryEntry //------------------------------------------------------------------------ -PdfParser::PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA, - int /*pageNum*/, int rotate, Dict *resDict, - PDFRectangle *box, PDFRectangle *cropBox) -{ - xref = xrefA; - subPage = gFalse; - printCommands = false; +class ClipHistoryEntry { +public: + + ClipHistoryEntry(GfxPath *clipPath = NULL, GfxClipType clipType = clipNormal); + virtual ~ClipHistoryEntry(); + + // Manipulate clip path stack + ClipHistoryEntry *save(); + ClipHistoryEntry *restore(); + GBool hasSaves() { return saved != NULL; } + void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); + GfxPath *getClipPath() { return clipPath; } + GfxClipType getClipType() { return clipType; } - // start the resource stack - res = new GfxResources(xref, resDict, NULL); +private: - // initialize - state = new GfxState(72.0, 72.0, box, rotate, gTrue); - clipHistory = new ClipHistoryEntry(); + ClipHistoryEntry *saved; // next clip path on stack + + GfxPath *clipPath; // used as the path to be filled for an 'sh' operator + GfxClipType clipType; + + ClipHistoryEntry(ClipHistoryEntry *other); +}; + +//------------------------------------------------------------------------ +// PdfParser +//------------------------------------------------------------------------ + +PdfParser::PdfParser(XRef *xrefA, + Inkscape::Extension::Internal::SvgBuilder *builderA, + int /*pageNum*/, + int rotate, + Dict *resDict, + PDFRectangle *box, + PDFRectangle *cropBox) : + xref(xrefA), + builder(builderA), + subPage(gFalse), + printCommands(false), + res(new GfxResources(xref, resDict, NULL)), // start the resource stack + state(new GfxState(72.0, 72.0, box, rotate, gTrue)), + fontChanged(gFalse), + clip(clipNone), + ignoreUndef(0), + baseMatrix(), + formDepth(0), + parser(NULL), + colorDeltas(), + maxDepths(), + clipHistory(new ClipHistoryEntry()), + operatorHistory(NULL) +{ setDefaultApproximationPrecision(); - fontChanged = gFalse; - clip = clipNone; - ignoreUndef = 0; - operatorHistory = NULL; - builder = builderA; builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"), Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px")); @@ -306,50 +350,62 @@ PdfParser::PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *bui pushOperator("startPage"); } -PdfParser::PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA, - Dict *resDict, PDFRectangle *box) { - - int i; - parser = NULL; - - xref = xrefA; - subPage = gTrue; - printCommands = false; - - // start the resource stack - res = new GfxResources(xref, resDict, NULL); - - // initialize - operatorHistory = NULL; - builder = builderA; - state = new GfxState(72, 72, box, 0, gFalse); - clipHistory = new ClipHistoryEntry(); +PdfParser::PdfParser(XRef *xrefA, + Inkscape::Extension::Internal::SvgBuilder *builderA, + Dict *resDict, + PDFRectangle *box) : + xref(xrefA), + builder(builderA), + subPage(gTrue), + printCommands(false), + res(new GfxResources(xref, resDict, NULL)), // start the resource stack + state(new GfxState(72, 72, box, 0, gFalse)), + fontChanged(gFalse), + clip(clipNone), + ignoreUndef(0), + baseMatrix(), + formDepth(0), + parser(NULL), + colorDeltas(), + maxDepths(), + clipHistory(new ClipHistoryEntry()), + operatorHistory(NULL) +{ setDefaultApproximationPrecision(); - fontChanged = gFalse; - clip = clipNone; - ignoreUndef = 0; - for (i = 0; i < 6; ++i) { + for (int i = 0; i < 6; ++i) { baseMatrix[i] = state->getCTM()[i]; } formDepth = 0; } PdfParser::~PdfParser() { - while (state->hasSaves()) { + while(operatorHistory) { + OpHistoryEntry *tmp = operatorHistory->next; + delete operatorHistory; + operatorHistory = tmp; + } + + while (state && state->hasSaves()) { restoreState(); } + if (!subPage) { //out->endPage(); } + while (res) { popResources(); } + if (state) { delete state; + state = NULL; } + if (clipHistory) { delete clipHistory; + clipHistory = NULL; } } @@ -460,7 +516,8 @@ void PdfParser::go(GBool /*topLevel*/) } } -void PdfParser::pushOperator(const char *name) { +void PdfParser::pushOperator(const char *name) +{ OpHistoryEntry *newEntry = new OpHistoryEntry; newEntry->name = name; newEntry->state = NULL; @@ -2086,13 +2143,19 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) { } void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { - GfxPatch patch00, patch01, patch10, patch11; + GfxPatch patch00 = blankPatch(); + GfxPatch patch01 = blankPatch(); + GfxPatch patch10 = blankPatch(); + GfxPatch patch11 = blankPatch(); #ifdef POPPLER_NEW_GFXPATCH - GfxColor color; + GfxColor color = {{0}}; #endif - double xx[4][8], yy[4][8]; - double xxm, yym; - double patchColorDelta = colorDeltas[pdfPatchMeshShading-1]; + double xx[4][8]; + double yy[4][8]; + double xxm; + double yym; + double patchColorDelta = colorDeltas[pdfPatchMeshShading - 1]; + int i; for (i = 0; i < nComps; ++i) { @@ -3463,9 +3526,7 @@ void PdfParser::popResources() { } void PdfParser::setDefaultApproximationPrecision() { - int i; - - for (i = 1; i <= pdfNumShadingTypes; ++i) { + for (int i = 1; i <= pdfNumShadingTypes; ++i) { setApproximationPrecision(i, defaultShadingColorDelta, defaultShadingMaxDepth); } } @@ -3484,19 +3545,18 @@ void PdfParser::setApproximationPrecision(int shadingType, double colorDelta, // ClipHistoryEntry //------------------------------------------------------------------------ -ClipHistoryEntry::ClipHistoryEntry(GfxPath *clipPathA, GfxClipType clipTypeA) { - if (clipPathA) { - clipPath = clipPathA->copy(); - } else { - clipPath = NULL; - } - clipType = clipTypeA; - saved = NULL; +ClipHistoryEntry::ClipHistoryEntry(GfxPath *clipPathA, GfxClipType clipTypeA) : + saved(NULL), + clipPath((clipPathA) ? clipPathA->copy() : NULL), + clipType(clipTypeA) +{ } -ClipHistoryEntry::~ClipHistoryEntry() { +ClipHistoryEntry::~ClipHistoryEntry() +{ if (clipPath) { delete clipPath; + clipPath = NULL; } } @@ -3510,6 +3570,7 @@ void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { clipType = clipTypeA; } else { clipPath = NULL; + clipType = clipNormal; } } @@ -3526,7 +3587,7 @@ ClipHistoryEntry *ClipHistoryEntry::restore() { if (saved) { oldEntry = saved; saved = NULL; - delete this; + delete this; // TODO really should avoid deleting from inside. } else { oldEntry = this; } @@ -3540,6 +3601,7 @@ ClipHistoryEntry::ClipHistoryEntry(ClipHistoryEntry *other) { this->clipType = other->clipType; } else { this->clipPath = NULL; + this->clipType = clipNormal; } saved = NULL; } diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h index a63d669c7..e28fecc2e 100644 --- a/src/extension/internal/pdfinput/pdf-parser.h +++ b/src/extension/internal/pdfinput/pdf-parser.h @@ -58,6 +58,8 @@ class AnnotBorderStyle; class PdfParser; +class ClipHistoryEntry; + //------------------------------------------------------------------------ #ifndef GFX_H @@ -100,34 +102,6 @@ struct OpHistoryEntry { unsigned depth; // total number of entries descending from this }; -//------------------------------------------------------------------------ -// ClipHistoryEntry -//------------------------------------------------------------------------ - -class ClipHistoryEntry { -public: - - ClipHistoryEntry(GfxPath *clipPath=NULL, GfxClipType clipType=clipNormal); - virtual ~ClipHistoryEntry(); - - // Manipulate clip path stack - ClipHistoryEntry *save(); - ClipHistoryEntry *restore(); - GBool hasSaves() { return saved != NULL; } - void setClip(GfxPath *newClipPath, GfxClipType newClipType=clipNormal); - GfxPath *getClipPath() { return clipPath; } - GfxClipType getClipType() { return clipType; } - -private: - - ClipHistoryEntry *saved; // next clip path on stack - - GfxPath *clipPath; // used as the path to be filled for an 'sh' operator - GfxClipType clipType; - - ClipHistoryEntry(ClipHistoryEntry *other); -}; - //------------------------------------------------------------------------ // PdfParser //------------------------------------------------------------------------ -- cgit v1.2.3 From 14a9c655de4723dda0c280f4717f2b29d46287a1 Mon Sep 17 00:00:00 2001 From: root <root@jtx.marker.es> Date: Thu, 16 Oct 2014 15:27:50 +0200 Subject: Update to bspline branch, now helper path fixed and optional (bzr r13341.1.275) --- src/live_effects/lpe-bspline.cpp | 126 ++++++++++++++++++++++++++------------- src/live_effects/lpe-bspline.h | 18 +++--- 2 files changed, 94 insertions(+), 50 deletions(-) diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp index e8df6e464..b68799d08 100644 --- a/src/live_effects/lpe-bspline.cpp +++ b/src/live_effects/lpe-bspline.cpp @@ -59,17 +59,22 @@ const double noPower = 0.0; const double defaultStartPower = 0.3334; const double defaultEndPower = 0.6667; -LPEBSpline::LPEBSpline(LivePathEffectObject *lpeobject) : - Effect(lpeobject), - steps(_("Steps whith CTRL:"), _("Change number of steps whith CTRL pressed"), "steps", &wr, this, 2), - ignoreCusp(_("Ignore cusp nodes"), _("Change ignoring cusp nodes"), "ignoreCusp", &wr, this, true), - onlySelected(_("Change only selected nodes"), _("Change only selected nodes"), "onlySelected", &wr, this, false), - weight(_("Change weight:"), _("Change weight of the effect"), "weight", &wr, this, defaultStartPower) +LPEBSpline::LPEBSpline(LivePathEffectObject *lpeobject) + : Effect(lpeobject), + // initialise your parameters here: + //testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, + //Geom::Point(100,100)), + steps(_("Steps whith CTRL:"), _("Change number of steps whith CTRL pressed"), "steps", &wr, this, 2), + ignoreCusp(_("Ignore cusp nodes"), _("Change ignoring cusp nodes"), "ignoreCusp", &wr, this, true), + onlySelected(_("Change only selected nodes"), _("Change only selected nodes"), "onlySelected", &wr, this, false), + showHelper(_("Show helper paths"), _("Show helper paths"), "showHelper", &wr, this, false), + weight(_("Change weight:"), _("Change weight of the effect"), "weight", &wr, this, defaultStartPower) { - registerParameter(&weight); - registerParameter(&steps); - registerParameter(&ignoreCusp); - registerParameter(&onlySelected); + registerParameter(dynamic_cast<Parameter *>(&weight)); + registerParameter(dynamic_cast<Parameter *>(&steps)); + registerParameter(dynamic_cast<Parameter *>(&ignoreCusp)); + registerParameter(dynamic_cast<Parameter *>(&onlySelected)); + registerParameter(dynamic_cast<Parameter *>(&showHelper)); weight.param_set_range(noPower, 1); weight.param_set_increments(0.1, 0.1); @@ -89,7 +94,9 @@ void LPEBSpline::doBeforeEffect (SPLPEItem const* lpeitem) } } -void LPEBSpline::createAndApply(const char *name, SPDocument *doc, SPItem *item) + +void LPEBSpline::createAndApply(const char *name, SPDocument *doc, + SPItem *item) { if (!SP_IS_SHAPE(item)) { g_warning("LPE BSpline can only be applied to shapes (not groups)."); @@ -99,7 +106,8 @@ void LPEBSpline::createAndApply(const char *name, SPDocument *doc, SPItem *item) Inkscape::XML::Node *repr = xml_doc->createElement("inkscape:path-effect"); repr->setAttribute("effect", name); - doc->getDefs()->getRepr()->addChild(repr, NULL); // adds to <defs> and assigns the 'id' attribute + doc->getDefs()->getRepr() + ->addChild(repr, NULL); // adds to <defs> and assigns the 'id' attribute const gchar *repr_id = repr->attribute("id"); Inkscape::GC::release(repr); @@ -111,13 +119,13 @@ void LPEBSpline::createAndApply(const char *name, SPDocument *doc, SPItem *item) void LPEBSpline::doEffect(SPCurve *curve) { + if (curve->get_segment_count() < 1){ return; } - + // Make copy of old path as it is changed during processing Geom::PathVector const original_pathv = curve->get_pathvector(); curve->reset(); - double radiusHelperNodes = 6.0; SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop){ @@ -125,7 +133,6 @@ void LPEBSpline::doEffect(SPCurve *curve) SPNamedView *nv = sp_desktop_namedview(desktop); radiusHelperNodes = Inkscape::Util::Quantity::convert(radiusHelperNodes, "px", nv->doc_units->abbr); } - for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { if (path_it->empty()) @@ -133,7 +140,7 @@ void LPEBSpline::doEffect(SPCurve *curve) Geom::Path::const_iterator curve_it1 = path_it->begin(); Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); - Geom::Path::const_iterator curve_endit = path_it->end_default(); + Geom::Path::const_iterator curve_endit = path_it->end_default(); SPCurve *nCurve = new SPCurve(); Geom::Point previousNode(0, 0); Geom::Point node(0, 0); @@ -145,13 +152,29 @@ void LPEBSpline::doEffect(SPCurve *curve) Geom::D2<Geom::SBasis> SBasisHelper; Geom::CubicBezier const *cubic = NULL; if (path_it->closed()) { - const Geom::Curve &closingline = path_it->back_closed(); + // if the path is closed, maybe we have to stop a bit earlier because the + // closing line segment has zerolength. + const Geom::Curve &closingline = + path_it->back_closed(); // the closing line segment is always of type + // Geom::LineSegment. if (are_near(closingline.initialPoint(), closingline.finalPoint())) { + // closingline.isDegenerate() did not work, because it only checks for + // *exact* zero length, which goes wrong for relative coordinates and + // rounding errors... + // the closing line segment has zero-length. So stop before that one! curve_endit = path_it->end_open(); } } + //Si la curva está cerrada calculamos el punto donde + //deveria estar el nodo BSpline de cierre/inicio de la curva + //en posible caso de que se cierre con una linea recta creando un nodo + //BSPline nCurve->moveto(curve_it1->initialPoint()); + //Recorremos todos los segmentos menos el último while (curve_it1 != curve_endit) { + //previousPointAt3 = pointAt3; + //Calculamos los puntos que dividirían en tres segmentos iguales el path + //recto de entrada y de salida SPCurve *in = new SPCurve(); in->moveto(curve_it1->initialPoint()); in->lineto(curve_it1->finalPoint()); @@ -192,7 +215,6 @@ void LPEBSpline::doEffect(SPCurve *curve) out->reset(); delete out; } - Geom::Point startNode = path_it->begin()->initialPoint(); if (path_it->closed() && curve_it2 == curve_endit) { SPCurve *start = new SPCurve(); start->moveto(path_it->begin()->initialPoint()); @@ -225,9 +247,9 @@ void LPEBSpline::doEffect(SPCurve *curve) SBasisHelper = lineHelper->first_segment()->toSBasis(); lineHelper->reset(); delete lineHelper; - startNode = SBasisHelper.valueAt(0.5); - nCurve->curveto(pointAt1, pointAt2, startNode); - nCurve->move_endpoints(startNode, startNode); + node = SBasisHelper.valueAt(0.5); + nCurve->curveto(pointAt1, pointAt2, node); + nCurve->move_endpoints(node, node); } else if ( curve_it2 == curve_endit) { nCurve->curveto(pointAt1, pointAt2, curve_it1->finalPoint()); nCurve->move_endpoints(path_it->begin()->initialPoint(), curve_it1->finalPoint()); @@ -238,17 +260,26 @@ void LPEBSpline::doEffect(SPCurve *curve) SBasisHelper = lineHelper->first_segment()->toSBasis(); lineHelper->reset(); delete lineHelper; + //almacenamos el punto del anterior bucle -o el de cierre- que nos hara de + //principio de curva previousNode = node; + //Y este hará de final de curva node = SBasisHelper.valueAt(0.5); Geom::CubicBezier const *cubic2 = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1); if((cubic && are_near((*cubic)[0],(*cubic)[1])) || (cubic2 && are_near((*cubic2)[2],(*cubic2)[3]))) { node = curve_it1->finalPoint(); } nCurve->curveto(pointAt1, pointAt2, node); - if(!are_near(node,curve_it1->finalPoint())){ - drawHandle(node, radiusHelperNodes); - } } + if(!are_near(node,curve_it1->finalPoint()) && showHelper){ + drawHandle(node, radiusHelperNodes); + } + //La curva BSpline se forma calculando el centro del segmanto de unión + //de el punto situado en las 2/3 partes de el segmento de entrada + //con el punto situado en la posición 1/3 del segmento de salida + //Estos dos puntos ademas estan posicionados en el lugas correspondiente + //de los manejadores de la curva + //aumentamos los valores para el siguiente paso en el bucle ++curve_it1; ++curve_it2; } @@ -259,6 +290,8 @@ void LPEBSpline::doEffect(SPCurve *curve) curve->append(nCurve, false); nCurve->reset(); delete nCurve; + } + if(showHelper){ Geom::PathVector const pathv = curve->get_pathvector(); hp.push_back(pathv[0]); } @@ -293,32 +326,44 @@ Gtk::Widget *LPEBSpline::newWidget() while (it != param_vector.end()) { if ((*it)->widget_is_visible) { Parameter *param = *it; - Gtk::Widget *widg = Gtk::manage(param->param_newWidget()); + Gtk::Widget *widg = dynamic_cast<Gtk::Widget *>(param->param_newWidget()); if (param->param_key == "weight") { - Gtk::HBox * buttons = Gtk::manage(new Gtk::HBox(true, 0)); - - Gtk::Button *defaultWeight = Gtk::manage(new Gtk::Button(Glib::ustring(_("Default weight")))); - defaultWeight->signal_clicked().connect(sigc::bind<Gtk::Widget *>(sigc::mem_fun(*this, &LPEBSpline::toDefaultWeight), widg)); + Gtk::HBox * buttons = Gtk::manage(new Gtk::HBox(true,0)); + Gtk::Button *defaultWeight = + Gtk::manage(new Gtk::Button(Glib::ustring(_("Default weight")))); + defaultWeight->signal_clicked() + .connect(sigc::bind<Gtk::Widget *>(sigc::mem_fun(*this, &LPEBSpline::toDefaultWeight), widg)); buttons->pack_start(*defaultWeight, true, true, 2); - - Gtk::Button *makeCusp = Gtk::manage(new Gtk::Button(Glib::ustring(_("Make cusp")))); - makeCusp->signal_clicked().connect(sigc::bind<Gtk::Widget *>(sigc::mem_fun(*this, &LPEBSpline::toMakeCusp), widg)); + Gtk::Button *makeCusp = + Gtk::manage(new Gtk::Button(Glib::ustring(_("Make cusp")))); + makeCusp->signal_clicked() + .connect(sigc::bind<Gtk::Widget *>(sigc::mem_fun(*this, &LPEBSpline::toMakeCusp), widg)); buttons->pack_start(*makeCusp, true, true, 2); - vbox->pack_start(*buttons, true, true, 2); } if (param->param_key == "weight" || param->param_key == "steps") { - Inkscape::UI::Widget::Scalar *widgRegistered = Gtk::manage(dynamic_cast<Inkscape::UI::Widget::Scalar *>(widg)); - widgRegistered->signal_value_changed().connect(sigc::mem_fun(*this, &LPEBSpline::toWeight)); - + Inkscape::UI::Widget::Scalar *widgRegistered = + Gtk::manage(dynamic_cast<Inkscape::UI::Widget::Scalar *>(widg)); + widgRegistered->signal_value_changed() + .connect(sigc::mem_fun(*this, &LPEBSpline::toWeight)); + widg = dynamic_cast<Gtk::Widget *>(widgRegistered); if (widg) { Gtk::HBox * scalarParameter = dynamic_cast<Gtk::HBox *>(widg); - std::vector<Gtk::Widget *> childList = scalarParameter->get_children(); + std::vector< Gtk::Widget* > childList = scalarParameter->get_children(); Gtk::Entry* entryWidg = dynamic_cast<Gtk::Entry *>(childList[1]); entryWidg->set_width_chars(6); } } - + if (param->param_key == "onlySelected") { + Gtk::CheckButton *widgRegistered = + Gtk::manage(dynamic_cast<Gtk::CheckButton *>(widg)); + widg = dynamic_cast<Gtk::Widget *>(widgRegistered); + } + if (param->param_key == "ignoreCusp") { + Gtk::CheckButton *widgRegistered = + Gtk::manage(dynamic_cast<Gtk::CheckButton *>(widg)); + widg = dynamic_cast<Gtk::Widget *>(widgRegistered); + } Glib::ustring *tip = param->param_getTooltip(); if (widg) { vbox->pack_start(*widg, true, true, 2); @@ -333,7 +378,7 @@ Gtk::Widget *LPEBSpline::newWidget() ++it; } - return vbox; + return dynamic_cast<Gtk::Widget *>(vbox); } void LPEBSpline::toDefaultWeight(Gtk::Widget *widgWeight) @@ -379,7 +424,8 @@ void LPEBSpline::changeWeight(double weightValue) g_free(str); curve->unref(); desktop->clearWaitingCursor(); - DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_LPE, _("Modified the weight of a BSpline")); + DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_LPE, + _("Modified the weight of the BSpline")); } bool LPEBSpline::nodeIsSelected(Geom::Point nodePoint) diff --git a/src/live_effects/lpe-bspline.h b/src/live_effects/lpe-bspline.h index e066015ad..169658b94 100644 --- a/src/live_effects/lpe-bspline.h +++ b/src/live_effects/lpe-bspline.h @@ -24,19 +24,16 @@ public: return SUPPRESS_FLASH; } virtual void doEffect(SPCurve *curve); - virtual void doBeforeEffect(SPLPEItem const* lpeitem); + virtual void doBeforeEffect (SPLPEItem const* lpeitem); void drawHandle(Geom::Point p, double radiusHelperNodes); void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); - - void doBSplineFromWidget(SPCurve *curve, double value); - bool nodeIsSelected(Geom::Point nodePoint); - + virtual void doBSplineFromWidget(SPCurve *curve, double value); + virtual bool nodeIsSelected(Geom::Point nodePoint); virtual Gtk::Widget *newWidget(); - - void changeWeight(double weightValue); - void toDefaultWeight(Gtk::Widget *widgWeight); - void toMakeCusp(Gtk::Widget *widgWeight); - void toWeight(); + virtual void changeWeight(double weightValue); + virtual void toDefaultWeight(Gtk::Widget *widgWeight); + virtual void toMakeCusp(Gtk::Widget *widgWeight); + virtual void toWeight(); // TODO make this private ScalarParam steps; @@ -45,6 +42,7 @@ private: std::vector<Geom::Point> points; BoolParam ignoreCusp; BoolParam onlySelected; + BoolParam showHelper; ScalarParam weight; Geom::PathVector hp; -- cgit v1.2.3 From c006641818185435dcb6b98c49fdae2fa561d762 Mon Sep 17 00:00:00 2001 From: "Liam P. White" <inkscapebrony@gmail.com> Date: Thu, 16 Oct 2014 18:05:08 -0400 Subject: Fix previous revision. revid:jtx@jtx.marker.es-20141016153516-eng0y49ppsk2vt5b 13617 Jabiertxof2014-10-16 Change LPE from envelope-perspective to perspective-envelope For me is easy to use/find with this new name. Also fix a rounding error on envelope at small sizes (bzr r13341.1.276) --- po/POTFILES.in | 4 +- src/live_effects/CMakeLists.txt | 5 +- src/live_effects/Makefile_insert | 6 +- src/live_effects/effect-enum.h | 2 +- src/live_effects/effect.cpp | 8 +- src/live_effects/lpe-envelope-perspective.cpp | 440 -------------------------- src/live_effects/lpe-envelope-perspective.h | 76 ----- src/live_effects/lpe-perspective-envelope.cpp | 384 ++++++++++++++++++++++ src/live_effects/lpe-perspective-envelope.h | 70 ++++ 9 files changed, 466 insertions(+), 529 deletions(-) delete mode 100644 src/live_effects/lpe-envelope-perspective.cpp delete mode 100644 src/live_effects/lpe-envelope-perspective.h create mode 100644 src/live_effects/lpe-perspective-envelope.cpp create mode 100644 src/live_effects/lpe-perspective-envelope.h diff --git a/po/POTFILES.in b/po/POTFILES.in index df2b13745..1dc42ac65 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -135,7 +135,7 @@ src/live_effects/lpe-clone-original.cpp src/live_effects/lpe-constructgrid.cpp src/live_effects/lpe-curvestitch.cpp src/live_effects/lpe-envelope.cpp -src/live_effects/lpe-envelope-perspective.cpp +src/live_effects/lpe-perspective-envelope.cpp src/live_effects/lpe-extrude.cpp src/live_effects/lpe-fillet-chamfer.cpp src/live_effects/lpe-gears.cpp @@ -153,7 +153,7 @@ src/live_effects/lpe-show_handles.cpp src/live_effects/lpe-skeleton.cpp src/live_effects/lpe-sketch.cpp src/live_effects/lpe-vonkoch.cpp -src/live_effects/lpe-envelope-perspective.cpp +src/live_effects/lpe-perspective-envelope.cpp src/live_effects/lpe-attach-path.cpp src/live_effects/lpe-bounding-box.cpp src/live_effects/lpe-ellipse_5pts.cpp diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt index 30c2b2f41..c8a02c810 100644 --- a/src/live_effects/CMakeLists.txt +++ b/src/live_effects/CMakeLists.txt @@ -15,7 +15,6 @@ set(live_effects_SRC lpe-dynastroke.cpp lpe-ellipse-5pts.cpp lpe-envelope.cpp - lpe-envelope-perspective.cpp lpe-extrude.cpp lpe-fill-between-many.cpp lpe-fill-between-strokes.cpp @@ -32,6 +31,7 @@ set(live_effects_SRC lpe-patternalongpath.cpp lpe-perp_bisector.cpp lpe-perspective_path.cpp + lpe-perspective-envelope.cpp lpe-powerstroke.cpp lpe-recursiveskeleton.cpp lpe-rough-hatches.cpp @@ -47,7 +47,6 @@ set(live_effects_SRC lpe-bspline.cpp lpe-text_label.cpp lpe-vonkoch.cpp - lpe-envelope-perspective.cpp lpegroupbbox.cpp lpeobject-reference.cpp lpeobject.cpp @@ -106,6 +105,7 @@ set(live_effects_SRC lpe-patternalongpath.h lpe-perp_bisector.h lpe-perspective_path.h + lpe-perspective-envelope.h lpe-powerstroke.h lpe-powerstroke-interpolators.h lpe-recursiveskeleton.h @@ -122,7 +122,6 @@ set(live_effects_SRC lpe-bspline.h lpe-text_label.h lpe-vonkoch.h - lpe-envelope-perspective.h lpegroupbbox.h lpeobject-reference.h lpeobject.h diff --git a/src/live_effects/Makefile_insert b/src/live_effects/Makefile_insert index f18dcdef0..8f0a3ac57 100644 --- a/src/live_effects/Makefile_insert +++ b/src/live_effects/Makefile_insert @@ -70,6 +70,8 @@ ink_common_sources += \ live_effects/lpe-circle_with_radius.h \ live_effects/lpe-perspective_path.cpp \ live_effects/lpe-perspective_path.h \ + live_effects/lpe-perspective-envelope.cpp \ + live_effects/lpe-perspective-envelope.h \ live_effects/lpe-mirror_symmetry.cpp \ live_effects/lpe-mirror_symmetry.h \ live_effects/lpe-circle_3pts.cpp \ @@ -112,6 +114,4 @@ ink_common_sources += \ live_effects/lpe-jointype.cpp \ live_effects/lpe-jointype.h \ live_effects/lpe-taperstroke.cpp \ - live_effects/lpe-taperstroke.h \ - live_effects/lpe-envelope-perspective.cpp \ - live_effects/lpe-envelope-perspective.h + live_effects/lpe-taperstroke.h diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h index c53f1a5b9..383eec19e 100644 --- a/src/live_effects/effect-enum.h +++ b/src/live_effects/effect-enum.h @@ -63,7 +63,7 @@ enum EffectType { BOUNDING_BOX, JOIN_TYPE, TAPER_STROKE, - ENVELOPE_PERSPECTIVE, + PERSPECTIVE_ENVELOPE, FILLET_CHAMFER, INVALID_LPE // This must be last (I made it such that it is not needed anymore I think..., Don't trust on it being last. - johan) }; diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 0885ad6f0..1a64defd9 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -25,6 +25,7 @@ #include "live_effects/lpe-curvestitch.h" #include "live_effects/lpe-circle_with_radius.h" #include "live_effects/lpe-perspective_path.h" +#include "live_effects/lpe-perspective-envelope.h" #include "live_effects/lpe-spiro.h" #include "live_effects/lpe-lattice.h" #include "live_effects/lpe-lattice2.h" @@ -60,7 +61,6 @@ #include "live_effects/lpe-bounding-box.h" #include "live_effects/lpe-jointype.h" #include "live_effects/lpe-taperstroke.h" -#include "live_effects/lpe-envelope-perspective.h" #include "live_effects/lpe-fillet-chamfer.h" #include "xml/node-event-vector.h" @@ -152,7 +152,7 @@ const Util::EnumData<EffectType> LPETypeData[] = { /* 0.91 */ {SIMPLIFY, N_("Simplify"), "simplify"}, {LATTICE2, N_("Lattice Deformation 2"), "lattice2"}, - {ENVELOPE_PERSPECTIVE, N_("Envelope-Perspective"), "envelope-perspective"}, + {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, }; @@ -311,8 +311,8 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case LATTICE2: neweffect = static_cast<Effect*> ( new LPELattice2(lpeobj) ); break; - case ENVELOPE_PERSPECTIVE: - neweffect = static_cast<Effect*> ( new LPEEnvelopePerspective(lpeobj) ); + case PERSPECTIVE_ENVELOPE: + neweffect = static_cast<Effect*> ( new LPEPerspectiveEnvelope(lpeobj) ); break; case FILLET_CHAMFER: neweffect = static_cast<Effect*> ( new LPEFilletChamfer(lpeobj) ); diff --git a/src/live_effects/lpe-envelope-perspective.cpp b/src/live_effects/lpe-envelope-perspective.cpp deleted file mode 100644 index c62dbbf6a..000000000 --- a/src/live_effects/lpe-envelope-perspective.cpp +++ /dev/null @@ -1,440 +0,0 @@ -/** \file - * LPE <envelope-perspective> implementation - - */ -/* - * Authors: - * Jabiertxof Code migration from python extensions envelope and perspective - * Aaron Spike, aaron@ekips.org from envelope and perspective phyton code - * Dmitry Platonov, shadowjack@mail.ru, 2006 perspective approach & math - * Jose Hevia (freon) Transform algorithm from envelope - * - * Copyright (C) 2007-2014 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include <gtkmm.h> -#include "live_effects/lpe-envelope-perspective.h" -#include "helper/geom.h" -#include "display/curve.h" -#include "svg/svg.h" -#include "ui/tools-switch.h" -#include <gsl/gsl_linalg.h> -#include "desktop.h" - -using namespace Geom; - -namespace Inkscape { -namespace LivePathEffect { - -enum DeformationType { - DEFORMATION_ENVELOPE, - DEFORMATION_PERSPECTIVE -}; - -static const Util::EnumData<unsigned> DeformationTypeData[] = { - {DEFORMATION_ENVELOPE , N_("Envelope deformation"), "Envelope deformation"}, - {DEFORMATION_PERSPECTIVE , N_("Perspective"), "Perspective"} -}; - -static const Util::EnumDataConverter<unsigned> DeformationTypeConverter(DeformationTypeData, sizeof(DeformationTypeData)/sizeof(*DeformationTypeData)); - -LPEEnvelopePerspective::LPEEnvelopePerspective(LivePathEffectObject *lpeobject) : - Effect(lpeobject), - // initialise your parameters here: - deform_type(_("Type"), _("Select the type of deformation"), "deform_type", DeformationTypeConverter, &wr, this, DEFORMATION_ENVELOPE), - Up_Left_Point(_("Top Left"), _("Top Left - Ctrl+Alt+Click to reset"), "Up_Left_Point", &wr, this), - Up_Right_Point(_("Top Right"), _("Top Right - Ctrl+Alt+Click to reset"), "Up_Right_Point", &wr, this), - Down_Left_Point(_("Down Left"), _("Down Left - Ctrl+Alt+Click to reset"), "Down_Left_Point", &wr, this), - Down_Right_Point(_("Down Right"), _("Down Right - Ctrl+Alt+Click to reset"), "Down_Right_Point", &wr, this) -{ - // register all your parameters here, so Inkscape knows which parameters this effect has: - registerParameter( dynamic_cast<Parameter *>(&deform_type)); - registerParameter( dynamic_cast<Parameter *>(&Up_Left_Point) ); - registerParameter( dynamic_cast<Parameter *>(&Up_Right_Point) ); - registerParameter( dynamic_cast<Parameter *>(&Down_Left_Point) ); - registerParameter( dynamic_cast<Parameter *>(&Down_Right_Point) ); -} - -LPEEnvelopePerspective::~LPEEnvelopePerspective() -{ -} - -void LPEEnvelopePerspective::doEffect(SPCurve *curve) { - using Geom::X; - using Geom::Y; - double projmatrix[3][3]; - if(deform_type == DEFORMATION_PERSPECTIVE){ - std::vector<Geom::Point> handles(4); - handles[0] = Down_Left_Point; - handles[1] = Up_Left_Point; - handles[2] = Up_Right_Point; - handles[3] = Down_Right_Point; - std::vector<Geom::Point> sourceHandles(4); - sourceHandles[0] = Geom::Point(boundingbox_X.min(), boundingbox_Y.max()); - sourceHandles[1] = Geom::Point(boundingbox_X.min(), boundingbox_Y.min()); - sourceHandles[2] = Geom::Point(boundingbox_X.max(), boundingbox_Y.min()); - sourceHandles[3] = Geom::Point(boundingbox_X.max(), boundingbox_Y.max()); - double solmatrix[8][8] = {{0}}; - double free_term[8] = {0}; - double gslSolmatrix[64]; - for(unsigned int i = 0; i < 4; ++i){ - solmatrix[i][0] = sourceHandles[i][X]; - solmatrix[i][1] = sourceHandles[i][Y]; - solmatrix[i][2] = 1; - solmatrix[i][6] = -handles[i][X] * sourceHandles[i][X]; - solmatrix[i][7] = -handles[i][X] * sourceHandles[i][Y]; - solmatrix[i+4][3] = sourceHandles[i][X]; - solmatrix[i+4][4] = sourceHandles[i][Y]; - solmatrix[i+4][5] = 1; - solmatrix[i+4][6] = -handles[i][Y] * sourceHandles[i][X]; - solmatrix[i+4][7] = -handles[i][Y] * sourceHandles[i][Y]; - free_term[i] = handles[i][X]; - free_term[i+4] = handles[i][Y]; - } - int h = 0; - for( int i = 0; i < 8; i++ ) { - for( int j = 0; j < 8; j++ ) { - gslSolmatrix[h] = solmatrix[i][j]; - h++; - } - } - //this is get by this page: - //http://www.gnu.org/software/gsl/manual/html_node/Linear-Algebra-Examples.html#Linear-Algebra-Examples - gsl_matrix_view m = gsl_matrix_view_array (gslSolmatrix, 8, 8); - gsl_vector_view b = gsl_vector_view_array (free_term, 8); - gsl_vector *x = gsl_vector_alloc (8); - int s; - gsl_permutation * p = gsl_permutation_alloc (8); - gsl_linalg_LU_decomp (&m.matrix, p, &s); - gsl_linalg_LU_solve (&m.matrix, p, &b.vector, x); - h = 0; - for( int i = 0; i < 3; i++ ) { - for( int j = 0; j < 3; j++ ) { - if(h==8){ - projmatrix[2][2] = 1.0; - continue; - } - projmatrix[i][j] = gsl_vector_get(x, h); - h++; - } - } - gsl_permutation_free (p); - gsl_vector_free (x); - } - Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(curve->get_pathvector()); - curve->reset(); - Geom::CubicBezier const *cubic = NULL; - Geom::Point pointAt1(0, 0); - Geom::Point pointAt2(0, 0); - Geom::Point pointAt3(0, 0); - for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { - //Si está vacío... - if (path_it->empty()) - continue; - //Itreadores - SPCurve *nCurve = new SPCurve(); - Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve - Geom::Path::const_iterator curve_it2 = - ++(path_it->begin()); // outgoing curve - Geom::Path::const_iterator curve_endit = - path_it->end_default(); // this determines when the loop has to stop - - if (path_it->closed()) { - // if the path is closed, maybe we have to stop a bit earlier because the - // closing line segment has zerolength. - const Geom::Curve &closingline = - path_it->back_closed(); // the closing line segment is always of type - // Geom::LineSegment. - if (are_near(closingline.initialPoint(), closingline.finalPoint())) { - // closingline.isDegenerate() did not work, because it only checks for - // *exact* zero length, which goes wrong for relative coordinates and - // rounding errors... - // the closing line segment has zero-length. So stop before that one! - curve_endit = path_it->end_open(); - } - } - if(deform_type == DEFORMATION_PERSPECTIVE){ - nCurve->moveto(project_point(curve_it1->initialPoint(),projmatrix)); - }else{ - nCurve->moveto(project_point(curve_it1->initialPoint())); - } - while (curve_it2 != curve_endit) { - cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1); - if (cubic) { - pointAt1 = (*cubic)[1]; - pointAt2 = (*cubic)[2]; - } else { - pointAt1 = curve_it1->initialPoint(); - pointAt2 = curve_it1->finalPoint(); - } - pointAt3 = curve_it1->finalPoint(); - if(deform_type == DEFORMATION_PERSPECTIVE){ - pointAt1 = project_point(pointAt1,projmatrix); - pointAt2 = project_point(pointAt2,projmatrix); - pointAt3 = project_point(pointAt3,projmatrix); - }else{ - pointAt1 = project_point(pointAt1); - pointAt2 = project_point(pointAt2); - pointAt3 = project_point(pointAt3); - } - nCurve->curveto(pointAt1, pointAt2, pointAt3); - ++curve_it1; - ++curve_it2; - } - cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1); - if (cubic) { - pointAt1 = (*cubic)[1]; - pointAt2 = (*cubic)[2]; - } else { - pointAt1 = curve_it1->initialPoint(); - pointAt2 = curve_it1->finalPoint(); - } - pointAt3 = curve_it1->finalPoint(); - if(deform_type == DEFORMATION_PERSPECTIVE){ - pointAt1 = project_point(pointAt1,projmatrix); - pointAt2 = project_point(pointAt2,projmatrix); - pointAt3 = project_point(pointAt3,projmatrix); - }else{ - pointAt1 = project_point(pointAt1); - pointAt2 = project_point(pointAt2); - pointAt3 = project_point(pointAt3); - } - nCurve->curveto(pointAt1, pointAt2, pointAt3); - if(deform_type == DEFORMATION_PERSPECTIVE){ - nCurve->move_endpoints(project_point(path_it->begin()->initialPoint(),projmatrix), pointAt3); - }else{ - nCurve->move_endpoints(project_point(path_it->begin()->initialPoint()), pointAt3); - } - //y cerramos la curva - if (path_it->closed()) { - nCurve->closepath_current(); - } - curve->append(nCurve, false); - nCurve->reset(); - delete nCurve; - } -} - -Geom::Point -LPEEnvelopePerspective::project_point(Geom::Point p){ - double width = boundingbox_X.extent(); - double height = boundingbox_Y.extent(); - Geom::Coord xratio = abs(Geom::Point(boundingbox_X.min(), boundingbox_Y.max())[X]-p[X])/width; - Geom::Coord yratio = abs(Geom::Point(boundingbox_X.min(), boundingbox_Y.max())[Y]-p[Y])/height; - Geom::Line* horiz = new Geom::Line(); - Geom::Line* vert = new Geom::Line(); - vert->setPoints (pointAtRatio(yratio,Down_Left_Point,Up_Left_Point),pointAtRatio(yratio,Down_Right_Point,Up_Right_Point)); - horiz->setPoints (pointAtRatio(xratio,Down_Left_Point,Down_Right_Point),pointAtRatio(xratio,Up_Left_Point,Up_Right_Point)); - - OptCrossing crossPoint = intersection(*horiz,*vert); - if(crossPoint){ - return horiz->pointAt(Geom::Coord(crossPoint->ta)); - }else{ - return p; - } -} - -Geom::Point -LPEEnvelopePerspective::project_point(Geom::Point p, double m[][3]){ - Geom::Coord x = p[0]; - Geom::Coord y = p[1]; - return Geom::Point( - Geom::Coord((x*m[0][0] + y*m[0][1] + m[0][2])/(x*m[2][0]+y*m[2][1]+m[2][2])), - Geom::Coord((x*m[1][0] + y*m[1][1] + m[1][2])/(x*m[2][0]+y*m[2][1]+m[2][2]))); -} - -Geom::Point -LPEEnvelopePerspective::pointAtRatio(Geom::Coord ratio,Geom::Point A, Geom::Point B){ - Geom::Coord x = A[X] + (ratio * (B[X]-A[X])); - Geom::Coord y = A[Y]+ (ratio * (B[Y]-A[Y])); - return Point(x, y); -} - - -Gtk::Widget * -LPEEnvelopePerspective::newWidget() -{ - // use manage here, because after deletion of Effect object, others might still be pointing to this widget. - Gtk::VBox * vbox = Gtk::manage( new Gtk::VBox(Effect::newWidget()) ); - - vbox->set_border_width(5); - vbox->set_homogeneous(false); - vbox->set_spacing(6); - std::vector<Parameter *>::iterator it = param_vector.begin(); - Gtk::HBox * hboxUpHandles = Gtk::manage(new Gtk::HBox(false,0)); - Gtk::HBox * hboxDownHandles = Gtk::manage(new Gtk::HBox(false,0)); - while (it != param_vector.end()) { - if ((*it)->widget_is_visible) { - Parameter * param = *it; - Gtk::Widget * widg = dynamic_cast<Gtk::Widget *>(param->param_newWidget()); - if (param->param_key == "Up_Left_Point" || - param->param_key == "Up_Right_Point" || - param->param_key == "Down_Left_Point" || - param->param_key == "Down_Right_Point") - { - Gtk::HBox * pointParameter = dynamic_cast<Gtk::HBox *>(widg); - std::vector< Gtk::Widget* > childList = pointParameter->get_children(); - Gtk::HBox * pointParameterHBox = dynamic_cast<Gtk::HBox *>(childList[0]); - std::vector< Gtk::Widget* > childList2 = pointParameterHBox->get_children(); - pointParameterHBox->remove(childList2[0][0]); - Glib::ustring * tip = param->param_getTooltip(); - if (widg) { - if(param->param_key == "Up_Left_Point"){ - Gtk::Label* handles = Gtk::manage(new Gtk::Label(Glib::ustring(_("Handles:")),Gtk::ALIGN_START)); - vbox->pack_start(*handles, false, false, 2); - hboxUpHandles->pack_start(*widg, true, true, 2); -#if WITH_GTKMM_3_0 - hboxUpHandles->pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_EXPAND_WIDGET); -#else - hboxUpHandles->pack_start(*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_EXPAND_WIDGET); -#endif - }else if(param->param_key == "Up_Right_Point"){ - hboxUpHandles->pack_start(*widg, true, true, 2); - }else if(param->param_key == "Down_Left_Point"){ - hboxDownHandles->pack_start(*widg, true, true, 2); -#if WITH_GTKMM_3_0 - hboxDownHandles->pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_EXPAND_WIDGET); -#else - hboxDownHandles->pack_start(*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_EXPAND_WIDGET); -#endif - }else{ - hboxDownHandles->pack_start(*widg, true, true, 2); - } - if (tip) { - widg->set_tooltip_text(*tip); - } else { - widg->set_tooltip_text(""); - widg->set_has_tooltip(false); - } - } - }else{ - Glib::ustring * tip = param->param_getTooltip(); - if (widg) { - vbox->pack_start(*widg, true, true, 2); - if (tip) { - widg->set_tooltip_text(*tip); - } else { - widg->set_tooltip_text(""); - widg->set_has_tooltip(false); - } - } - } - } - - ++it; - } - vbox->pack_start(*hboxUpHandles,true, true, 2); - Gtk::HBox * hboxMiddle = Gtk::manage(new Gtk::HBox(true,2)); -#if WITH_GTKMM_3_0 - hboxMiddle->pack_start(*Gtk::manage(new Gtk::Separator()), Gtk::PACK_EXPAND_WIDGET); - hboxMiddle->pack_start(*Gtk::manage(new Gtk::Separator()), Gtk::PACK_EXPAND_WIDGET); -#else - hboxMiddle->pack_start(*Gtk::manage(new Gtk::HSeparator()), Gtk::PACK_EXPAND_WIDGET); - hboxMiddle->pack_start(*Gtk::manage(new Gtk::HSeparator()), Gtk::PACK_EXPAND_WIDGET); -#endif - vbox->pack_start(*hboxMiddle, false, true, 2); - vbox->pack_start(*hboxDownHandles, true, true, 2); - Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false,0)); - Gtk::Button* resetButton = Gtk::manage(new Gtk::Button(Gtk::Stock::CLEAR)); - resetButton->signal_clicked().connect(sigc::mem_fun (*this,&LPEEnvelopePerspective::resetGrid)); - resetButton->set_size_request(140,45); - vbox->pack_start(*hbox, true,true,2); - hbox->pack_start(*resetButton, false, false,2); - return dynamic_cast<Gtk::Widget *>(vbox); -} - -void -LPEEnvelopePerspective::doBeforeEffect (SPLPEItem const* lpeitem) -{ - original_bbox(lpeitem); - setDefaults(); - SPLPEItem * item = const_cast<SPLPEItem*>(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); -} - -void -LPEEnvelopePerspective::setDefaults() -{ - Geom::Point Up_Left(boundingbox_X.min(), boundingbox_Y.min()); - Geom::Point Up_Right(boundingbox_X.max(), boundingbox_Y.min()); - Geom::Point Down_Left(boundingbox_X.min(), boundingbox_Y.max()); - Geom::Point Down_Right(boundingbox_X.max(), boundingbox_Y.max()); - - Up_Left_Point.param_update_default(Up_Left); - Up_Right_Point.param_update_default(Up_Right); - Down_Right_Point.param_update_default(Down_Right); - Down_Left_Point.param_update_default(Down_Left); -} - -void -LPEEnvelopePerspective::resetGrid() -{ - Up_Left_Point.param_set_and_write_default(); - Up_Right_Point.param_set_and_write_default(); - Down_Right_Point.param_set_and_write_default(); - Down_Left_Point.param_set_and_write_default(); - //todo:this hack is only to reposition the knots on reser grid button - //Better update path effect in LPEITEM - SPDesktop * desktop = inkscape_active_desktop(); - tools_switch(desktop, TOOLS_SELECT); - tools_switch(desktop, TOOLS_NODES); -} - -void -LPEEnvelopePerspective::resetDefaults(SPItem const* item) -{ - Effect::resetDefaults(item); - original_bbox(SP_LPE_ITEM(item)); - setDefaults(); - resetGrid(); -} - -void -LPEEnvelopePerspective::calculateCurve(Geom::Point a,Geom::Point b, SPCurve* c, bool horizontal, bool move) -{ - using Geom::X; - using Geom::Y; - if(move) c->moveto(a); - Geom::Point cubic1 = a + (1./3)* (b - a); - Geom::Point cubic2 = b + (1./3)* (a - b); - if(horizontal) c->curveto(Geom::Point(cubic1[X],a[Y]),Geom::Point(cubic2[X],b[Y]),b); - else c->curveto(Geom::Point(a[X],cubic1[Y]),Geom::Point(b[X],cubic2[Y]),b); -} - -void -LPEEnvelopePerspective::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) -{ - hp_vec.clear(); - - SPCurve *c = new SPCurve(); - c->reset(); - c->moveto(Up_Left_Point); - c->lineto(Up_Right_Point); - c->lineto(Down_Right_Point); - c->lineto(Down_Left_Point); - c->lineto(Up_Left_Point); - hp_vec.push_back(c->get_pathvector()); -} - - -/* ######################## */ - -} //namespace LivePathEffect -} /* namespace Inkscape */ - - - - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/live_effects/lpe-envelope-perspective.h b/src/live_effects/lpe-envelope-perspective.h deleted file mode 100644 index 0de9a0e35..000000000 --- a/src/live_effects/lpe-envelope-perspective.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef INKSCAPE_LPE_ENVELOPE_PERSPECTIVE_H -#define INKSCAPE_LPE_ENVELOPE_PERSPECTIVE_H - -/** \file - * LPE <envelope-perspective> implementation , see lpe-envelope-perspective.cpp. - - */ -/* - * Authors: - * Jabiertxof Code migration from python extensions envelope and perspective - * Aaron Spike, aaron@ekips.org from envelope and perspective phyton code - * Dmitry Platonov, shadowjack@mail.ru, 2006 perspective approach & math - * Jose Hevia (freon) Transform algorithm from envelope - * - * Copyright (C) 2007-2014 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "live_effects/parameter/enum.h" -#include "live_effects/effect.h" -#include "live_effects/parameter/pointreseteable.h" -#include "live_effects/lpegroupbbox.h" - -namespace Inkscape { -namespace LivePathEffect { - -class LPEEnvelopePerspective : public Effect, GroupBBoxEffect { -public: - - LPEEnvelopePerspective(LivePathEffectObject *lpeobject); - virtual ~LPEEnvelopePerspective(); - - virtual void doEffect(SPCurve *curve); - - virtual Geom::Point project_point(Geom::Point p); - - virtual Geom::Point project_point(Geom::Point p, double m[][3]); - - Geom::Point pointAtRatio(Geom::Coord ratio,Geom::Point A, Geom::Point B); - - virtual void resetDefaults(SPItem const* item); - - virtual void doBeforeEffect(SPLPEItem const* lpeitem); - - virtual Gtk::Widget * newWidget(); - - virtual void calculateCurve(Geom::Point a,Geom::Point b, SPCurve *c, bool horizontal, bool move); - - virtual void setDefaults(); - - virtual void resetGrid(); - - //virtual void original_bbox(SPLPEItem const* lpeitem, bool absolute = false); - - //virtual void addCanvasIndicators(SPLPEItem const*/*lpeitem*/, std::vector<Geom::PathVector> &/*hp_vec*/); - - //virtual std::vector<Geom::PathVector> getHelperPaths(SPLPEItem const* lpeitem); -protected: - void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); -private: - - EnumParam<unsigned> deform_type; - PointReseteableParam Up_Left_Point; - PointReseteableParam Up_Right_Point; - PointReseteableParam Down_Left_Point; - PointReseteableParam Down_Right_Point; - - LPEEnvelopePerspective(const LPEEnvelopePerspective&); - LPEEnvelopePerspective& operator=(const LPEEnvelopePerspective&); -}; - -} //namespace LivePathEffect -} //namespace Inkscape - -#endif diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp new file mode 100644 index 000000000..249269b6f --- /dev/null +++ b/src/live_effects/lpe-perspective-envelope.cpp @@ -0,0 +1,384 @@ +/** \file + * LPE <perspective-envelope> implementation + + */ +/* + * Authors: + * Jabiertxof Code migration from python extensions envelope and perspective + * Aaron Spike, aaron@ekips.org from envelope and perspective phyton code + * Dmitry Platonov, shadowjack@mail.ru, 2006 perspective approach & math + * Jose Hevia (freon) Transform algorithm from envelope + * + * Copyright (C) 2007-2014 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include <gtkmm.h> +#include "live_effects/lpe-perspective-envelope.h" +#include "helper/geom.h" +#include "display/curve.h" +#include "svg/svg.h" +#include "ui/tools-switch.h" +#include <gsl/gsl_linalg.h> +#include "desktop.h" + +using namespace Geom; + +namespace Inkscape { +namespace LivePathEffect { + +enum DeformationType { + DEFORMATION_PERSPECTIVE, + DEFORMATION_ENVELOPE +}; + +static const Util::EnumData<unsigned> DeformationTypeData[] = { + {DEFORMATION_PERSPECTIVE , N_("Perspective"), "Perspective"}, + {DEFORMATION_ENVELOPE , N_("Envelope deformation"), "Envelope deformation"} +}; + +static const Util::EnumDataConverter<unsigned> DeformationTypeConverter(DeformationTypeData, sizeof(DeformationTypeData)/sizeof(*DeformationTypeData)); + +LPEPerspectiveEnvelope::LPEPerspectiveEnvelope(LivePathEffectObject *lpeobject) : + Effect(lpeobject), + // initialise your parameters here: + deform_type(_("Type"), _("Select the type of deformation"), "deform_type", DeformationTypeConverter, &wr, this, DEFORMATION_PERSPECTIVE), + Up_Left_Point(_("Top Left"), _("Top Left - Ctrl+Alt+Click to reset"), "Up_Left_Point", &wr, this), + Up_Right_Point(_("Top Right"), _("Top Right - Ctrl+Alt+Click to reset"), "Up_Right_Point", &wr, this), + Down_Left_Point(_("Down Left"), _("Down Left - Ctrl+Alt+Click to reset"), "Down_Left_Point", &wr, this), + Down_Right_Point(_("Down Right"), _("Down Right - Ctrl+Alt+Click to reset"), "Down_Right_Point", &wr, this) +{ + // register all your parameters here, so Inkscape knows which parameters this effect has: + registerParameter( dynamic_cast<Parameter *>(&deform_type)); + registerParameter( dynamic_cast<Parameter *>(&Up_Left_Point) ); + registerParameter( dynamic_cast<Parameter *>(&Up_Right_Point) ); + registerParameter( dynamic_cast<Parameter *>(&Down_Left_Point) ); + registerParameter( dynamic_cast<Parameter *>(&Down_Right_Point) ); +} + +LPEPerspectiveEnvelope::~LPEPerspectiveEnvelope() +{ +} + +void LPEPerspectiveEnvelope::doEffect(SPCurve *curve) { + using Geom::X; + using Geom::Y; + double projmatrix[3][3]; + if(deform_type == DEFORMATION_PERSPECTIVE){ + std::vector<Geom::Point> handles(4); + handles[0] = Down_Left_Point; + handles[1] = Up_Left_Point; + handles[2] = Up_Right_Point; + handles[3] = Down_Right_Point; + std::vector<Geom::Point> sourceHandles(4); + sourceHandles[0] = Geom::Point(boundingbox_X.min(), boundingbox_Y.max()); + sourceHandles[1] = Geom::Point(boundingbox_X.min(), boundingbox_Y.min()); + sourceHandles[2] = Geom::Point(boundingbox_X.max(), boundingbox_Y.min()); + sourceHandles[3] = Geom::Point(boundingbox_X.max(), boundingbox_Y.max()); + double solmatrix[8][8] = {{0}}; + double free_term[8] = {0}; + double gslSolmatrix[64]; + for(unsigned int i = 0; i < 4; ++i){ + solmatrix[i][0] = sourceHandles[i][X]; + solmatrix[i][1] = sourceHandles[i][Y]; + solmatrix[i][2] = 1; + solmatrix[i][6] = -handles[i][X] * sourceHandles[i][X]; + solmatrix[i][7] = -handles[i][X] * sourceHandles[i][Y]; + solmatrix[i+4][3] = sourceHandles[i][X]; + solmatrix[i+4][4] = sourceHandles[i][Y]; + solmatrix[i+4][5] = 1; + solmatrix[i+4][6] = -handles[i][Y] * sourceHandles[i][X]; + solmatrix[i+4][7] = -handles[i][Y] * sourceHandles[i][Y]; + free_term[i] = handles[i][X]; + free_term[i+4] = handles[i][Y]; + } + int h = 0; + for( int i = 0; i < 8; i++ ) { + for( int j = 0; j < 8; j++ ) { + gslSolmatrix[h] = solmatrix[i][j]; + h++; + } + } + //this is get by this page: + //http://www.gnu.org/software/gsl/manual/html_node/Linear-Algebra-Examples.html#Linear-Algebra-Examples + gsl_matrix_view m = gsl_matrix_view_array (gslSolmatrix, 8, 8); + gsl_vector_view b = gsl_vector_view_array (free_term, 8); + gsl_vector *x = gsl_vector_alloc (8); + int s; + gsl_permutation * p = gsl_permutation_alloc (8); + gsl_linalg_LU_decomp (&m.matrix, p, &s); + gsl_linalg_LU_solve (&m.matrix, p, &b.vector, x); + h = 0; + for( int i = 0; i < 3; i++ ) { + for( int j = 0; j < 3; j++ ) { + if(h==8){ + projmatrix[2][2] = 1.0; + continue; + } + projmatrix[i][j] = gsl_vector_get(x, h); + h++; + } + } + gsl_permutation_free (p); + gsl_vector_free (x); + } + Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(curve->get_pathvector()); + curve->reset(); + Geom::CubicBezier const *cubic = NULL; + Geom::Point pointAt1(0, 0); + Geom::Point pointAt2(0, 0); + Geom::Point pointAt3(0, 0); + for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { + //Si está vacío... + if (path_it->empty()) + continue; + //Itreadores + SPCurve *nCurve = new SPCurve(); + Geom::Path::const_iterator curve_it1 = path_it->begin(); + Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); + Geom::Path::const_iterator curve_endit = path_it->end_default(); + + if (path_it->closed()) { + const Geom::Curve &closingline = + path_it->back_closed(); + if (are_near(closingline.initialPoint(), closingline.finalPoint())) { + curve_endit = path_it->end_open(); + } + } + if(deform_type == DEFORMATION_PERSPECTIVE){ + nCurve->moveto(project_point(curve_it1->initialPoint(),projmatrix)); + }else{ + nCurve->moveto(project_point(curve_it1->initialPoint())); + } + while (curve_it1 != curve_endit) { + cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1); + if (cubic) { + pointAt1 = (*cubic)[1]; + pointAt2 = (*cubic)[2]; + } else { + pointAt1 = curve_it1->initialPoint(); + pointAt2 = curve_it1->finalPoint(); + } + pointAt3 = curve_it1->finalPoint(); + if(deform_type == DEFORMATION_PERSPECTIVE){ + pointAt1 = project_point(pointAt1,projmatrix); + pointAt2 = project_point(pointAt2,projmatrix); + pointAt3 = project_point(pointAt3,projmatrix); + }else{ + pointAt1 = project_point(pointAt1); + pointAt2 = project_point(pointAt2); + pointAt3 = project_point(pointAt3); + } + nCurve->curveto(pointAt1, pointAt2, pointAt3); + ++curve_it1; + if(curve_it2 != curve_endit) { + ++curve_it2; + } + } + //y cerramos la curva + if (path_it->closed()) { + nCurve->move_endpoints(pointAt3, pointAt3); + nCurve->closepath_current(); + } + curve->append(nCurve, false); + nCurve->reset(); + delete nCurve; + } +} + +Geom::Point +LPEPerspectiveEnvelope::project_point(Geom::Point p){ + double width = boundingbox_X.extent(); + double height = boundingbox_Y.extent(); + double delta_x = boundingbox_X.min() - p[X]; + double delta_y = boundingbox_Y.max() - p[Y]; + Geom::Coord xratio = (delta_x * sgn(delta_x)) / width; + Geom::Coord yratio = (delta_y * sgn(delta_y)) / height; + Geom::Line* horiz = new Geom::Line(); + Geom::Line* vert = new Geom::Line(); + vert->setPoints (pointAtRatio(yratio,Down_Left_Point,Up_Left_Point),pointAtRatio(yratio,Down_Right_Point,Up_Right_Point)); + horiz->setPoints (pointAtRatio(xratio,Down_Left_Point,Down_Right_Point),pointAtRatio(xratio,Up_Left_Point,Up_Right_Point)); + + OptCrossing crossPoint = intersection(*horiz,*vert); + if(crossPoint){ + return horiz->pointAt(Geom::Coord(crossPoint->ta)); + }else{ + return p; + } +} + +Geom::Point +LPEPerspectiveEnvelope::project_point(Geom::Point p, double m[][3]){ + Geom::Coord x = p[0]; + Geom::Coord y = p[1]; + return Geom::Point( + Geom::Coord((x*m[0][0] + y*m[0][1] + m[0][2])/(x*m[2][0]+y*m[2][1]+m[2][2])), + Geom::Coord((x*m[1][0] + y*m[1][1] + m[1][2])/(x*m[2][0]+y*m[2][1]+m[2][2]))); +} + +Geom::Point +LPEPerspectiveEnvelope::pointAtRatio(Geom::Coord ratio,Geom::Point A, Geom::Point B){ + Geom::Coord x = A[X] + (ratio * (B[X]-A[X])); + Geom::Coord y = A[Y]+ (ratio * (B[Y]-A[Y])); + return Point(x, y); +} + + +Gtk::Widget * +LPEPerspectiveEnvelope::newWidget() +{ + // use manage here, because after deletion of Effect object, others might still be pointing to this widget. + Gtk::VBox * vbox = Gtk::manage( new Gtk::VBox(Effect::newWidget()) ); + + vbox->set_border_width(5); + vbox->set_homogeneous(false); + vbox->set_spacing(6); + std::vector<Parameter *>::iterator it = param_vector.begin(); + Gtk::HBox * hboxUpHandles = Gtk::manage(new Gtk::HBox(false,0)); + Gtk::HBox * hboxDownHandles = Gtk::manage(new Gtk::HBox(false,0)); + while (it != param_vector.end()) { + if ((*it)->widget_is_visible) { + Parameter * param = *it; + Gtk::Widget * widg = dynamic_cast<Gtk::Widget *>(param->param_newWidget()); + if (param->param_key == "Up_Left_Point" || + param->param_key == "Up_Right_Point" || + param->param_key == "Down_Left_Point" || + param->param_key == "Down_Right_Point") + { + Gtk::HBox * pointParameter = dynamic_cast<Gtk::HBox *>(widg); + std::vector< Gtk::Widget* > childList = pointParameter->get_children(); + Gtk::HBox * pointParameterHBox = dynamic_cast<Gtk::HBox *>(childList[0]); + std::vector< Gtk::Widget* > childList2 = pointParameterHBox->get_children(); + pointParameterHBox->remove(childList2[0][0]); + Glib::ustring * tip = param->param_getTooltip(); + if (widg) { + if(param->param_key == "Up_Left_Point"){ + Gtk::Label* handles = Gtk::manage(new Gtk::Label(Glib::ustring(_("Handles:")),Gtk::ALIGN_START)); + vbox->pack_start(*handles, false, false, 2); + hboxUpHandles->pack_start(*widg, true, true, 2); + hboxUpHandles->pack_start(*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_EXPAND_WIDGET); + }else if(param->param_key == "Up_Right_Point"){ + hboxUpHandles->pack_start(*widg, true, true, 2); + }else if(param->param_key == "Down_Left_Point"){ + hboxDownHandles->pack_start(*widg, true, true, 2); + hboxDownHandles->pack_start(*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_EXPAND_WIDGET); + }else{ + hboxDownHandles->pack_start(*widg, true, true, 2); + } + if (tip) { + widg->set_tooltip_text(*tip); + } else { + widg->set_tooltip_text(""); + widg->set_has_tooltip(false); + } + } + }else{ + Glib::ustring * tip = param->param_getTooltip(); + if (widg) { + vbox->pack_start(*widg, true, true, 2); + if (tip) { + widg->set_tooltip_text(*tip); + } else { + widg->set_tooltip_text(""); + widg->set_has_tooltip(false); + } + } + } + } + + ++it; + } + vbox->pack_start(*hboxUpHandles,true, true, 2); + Gtk::HBox * hboxMiddle = Gtk::manage(new Gtk::HBox(true,2)); + hboxMiddle->pack_start(*Gtk::manage(new Gtk::HSeparator()), Gtk::PACK_EXPAND_WIDGET); + hboxMiddle->pack_start(*Gtk::manage(new Gtk::HSeparator()), Gtk::PACK_EXPAND_WIDGET); + vbox->pack_start(*hboxMiddle, false, true, 2); + vbox->pack_start(*hboxDownHandles, true, true, 2); + Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false,0)); + Gtk::Button* resetButton = Gtk::manage(new Gtk::Button(Gtk::Stock::CLEAR)); + resetButton->signal_clicked().connect(sigc::mem_fun (*this,&LPEPerspectiveEnvelope::resetGrid)); + resetButton->set_size_request(140,45); + vbox->pack_start(*hbox, true,true,2); + hbox->pack_start(*resetButton, false, false,2); + return dynamic_cast<Gtk::Widget *>(vbox); +} + +void +LPEPerspectiveEnvelope::doBeforeEffect (SPLPEItem const* lpeitem) +{ + original_bbox(lpeitem); + setDefaults(); +} + +void +LPEPerspectiveEnvelope::setDefaults() +{ + Geom::Point Up_Left(boundingbox_X.min(), boundingbox_Y.min()); + Geom::Point Up_Right(boundingbox_X.max(), boundingbox_Y.min()); + Geom::Point Down_Left(boundingbox_X.min(), boundingbox_Y.max()); + Geom::Point Down_Right(boundingbox_X.max(), boundingbox_Y.max()); + + Up_Left_Point.param_update_default(Up_Left); + Up_Right_Point.param_update_default(Up_Right); + Down_Right_Point.param_update_default(Down_Right); + Down_Left_Point.param_update_default(Down_Left); +} + +void +LPEPerspectiveEnvelope::resetGrid() +{ + Up_Left_Point.param_set_and_write_default(); + Up_Right_Point.param_set_and_write_default(); + Down_Right_Point.param_set_and_write_default(); + Down_Left_Point.param_set_and_write_default(); + //todo:this hack is only to reposition the knots on reser grid button + //Better update path effect in LPEITEM + SPDesktop * desktop = inkscape_active_desktop(); + tools_switch(desktop, TOOLS_SELECT); + tools_switch(desktop, TOOLS_NODES); +} + +void +LPEPerspectiveEnvelope::resetDefaults(SPItem const* item) +{ + Effect::resetDefaults(item); + original_bbox(SP_LPE_ITEM(item)); + setDefaults(); + resetGrid(); +} + +void +LPEPerspectiveEnvelope::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) +{ + hp_vec.clear(); + + SPCurve *c = new SPCurve(); + c->reset(); + c->moveto(Up_Left_Point); + c->lineto(Up_Right_Point); + c->lineto(Down_Right_Point); + c->lineto(Down_Left_Point); + c->lineto(Up_Left_Point); + hp_vec.push_back(c->get_pathvector()); +} + + +/* ######################## */ + +} //namespace LivePathEffect +} /* namespace Inkscape */ + + + + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: file_type=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/live_effects/lpe-perspective-envelope.h b/src/live_effects/lpe-perspective-envelope.h new file mode 100644 index 000000000..2f253882e --- /dev/null +++ b/src/live_effects/lpe-perspective-envelope.h @@ -0,0 +1,70 @@ +#ifndef INKSCAPE_LPE_PERSPECTIVE_ENVELOPE_H +#define INKSCAPE_LPE_PERSPECTIVE_ENVELOPE_H + +/** \file + * LPE <perspective-envelope> implementation , see lpe-perspective-envelope.cpp. + + */ +/* + * Authors: + * Jabiertxof Code migration from python extensions envelope and perspective + * Aaron Spike, aaron@ekips.org from envelope and perspective phyton code + * Dmitry Platonov, shadowjack@mail.ru, 2006 perspective approach & math + * Jose Hevia (freon) Transform algorithm from envelope + * + * Copyright (C) 2007-2014 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "live_effects/parameter/enum.h" +#include "live_effects/effect.h" +#include "live_effects/parameter/pointreseteable.h" +#include "live_effects/lpegroupbbox.h" + +namespace Inkscape { +namespace LivePathEffect { + +class LPEPerspectiveEnvelope : public Effect, GroupBBoxEffect { +public: + + LPEPerspectiveEnvelope(LivePathEffectObject *lpeobject); + + virtual ~LPEPerspectiveEnvelope(); + + virtual void doEffect(SPCurve *curve); + + virtual Geom::Point project_point(Geom::Point p); + + virtual Geom::Point project_point(Geom::Point p, double m[][3]); + + virtual Geom::Point pointAtRatio(Geom::Coord ratio,Geom::Point A, Geom::Point B); + + virtual void resetDefaults(SPItem const* item); + + virtual void doBeforeEffect(SPLPEItem const* lpeitem); + + virtual Gtk::Widget * newWidget(); + + virtual void setDefaults(); + + virtual void resetGrid(); + +protected: + void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec); +private: + + EnumParam<unsigned> deform_type; + PointReseteableParam Up_Left_Point; + PointReseteableParam Up_Right_Point; + PointReseteableParam Down_Left_Point; + PointReseteableParam Down_Right_Point; + + LPEPerspectiveEnvelope(const LPEPerspectiveEnvelope&); + LPEPerspectiveEnvelope& operator=(const LPEPerspectiveEnvelope&); +}; + +} //namespace LivePathEffect +} //namespace Inkscape + +#endif -- cgit v1.2.3 From 197f66062c6d6cc77539117526a9ecc30449bd61 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" <jon@joncruz.org> Date: Thu, 16 Oct 2014 15:42:34 -0700 Subject: Removed dangerous GTK-mimicking macros. (bzr r13619) --- src/box3d-side.h | 4 +--- src/box3d.cpp | 23 +++++++++++++---------- src/desktop-style.cpp | 6 ++++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/box3d-side.h b/src/box3d-side.h index 04bd196c2..519ed495e 100644 --- a/src/box3d-side.h +++ b/src/box3d-side.h @@ -7,6 +7,7 @@ * Authors: * Maximilian Albert <Anhalter42@gmx.de> * Abhishek Sharma + * Jon A. Cruz <jon@joncruz.org> * * Copyright (C) 2007 Authors * @@ -17,9 +18,6 @@ #include "axis-manip.h" -#define SP_BOX3D_SIDE(obj) (dynamic_cast<Box3DSide*>((SPObject*)obj)) -#define SP_IS_BOX3D_SIDE(obj) (dynamic_cast<const Box3DSide*>((SPObject*)obj) != NULL) - class SPBox3D; class Persp3D; diff --git a/src/box3d.cpp b/src/box3d.cpp index eb82524dd..5f60766f4 100644 --- a/src/box3d.cpp +++ b/src/box3d.cpp @@ -6,6 +6,7 @@ * Lauris Kaplinski <lauris@kaplinski.com> * bulia byak <buliabyak@users.sf.net> * Abhishek Sharma + * Jon A. Cruz <jon@joncruz.org> * * Copyright (C) 2007 Authors * Copyright (C) 1999-2002 Lauris Kaplinski @@ -263,9 +264,10 @@ void box3d_position_set(SPBox3D *box) { /* This draws the curve and calls requestDisplayUpdate() for each side (the latter is done in box3d_side_position_set() to avoid update conflicts with the parent box) */ - for ( SPObject *child = box->firstChild(); child; child = child->getNext() ) { - if (SP_IS_BOX3D_SIDE(child)) { - box3d_side_position_set(SP_BOX3D_SIDE(child)); + for ( SPObject *obj = box->firstChild(); obj; obj = obj->getNext() ) { + Box3DSide *side = dynamic_cast<Box3DSide *>(obj); + if (side) { + box3d_side_position_set(side); } } } @@ -1079,10 +1081,10 @@ box3d_recompute_z_orders (SPBox3D *box) { static std::map<int, Box3DSide *> box3d_get_sides(SPBox3D *box) { std::map<int, Box3DSide *> sides; - for ( SPObject *side = box->firstChild(); side; side = side->getNext() ) { - if (SP_IS_BOX3D_SIDE(side)){ - Box3DSide *bside = SP_BOX3D_SIDE(side); - sides[Box3D::face_to_int(bside->getFaceId())] = bside; + for ( SPObject *obj = box->firstChild(); obj; obj = obj->getNext() ) { + Box3DSide *side = dynamic_cast<Box3DSide *>(obj); + if (side) { + sides[Box3D::face_to_int(side->getFaceId())] = side; } } sides.erase(-1); @@ -1280,9 +1282,10 @@ SPGroup *box3d_convert_to_group(SPBox3D *box) // create a new group and add the sides (converted to ordinary paths) as its children Inkscape::XML::Node *grepr = xml_doc->createElement("svg:g"); - for ( SPObject *child = box->firstChild(); child; child = child->getNext() ) { - if (SP_IS_BOX3D_SIDE(child)) { - Inkscape::XML::Node *repr = box3d_side_convert_to_path(SP_BOX3D_SIDE(child)); + for ( SPObject *obj = box->firstChild(); obj; obj = obj->getNext() ) { + Box3DSide *side = dynamic_cast<Box3DSide *>(obj); + if (side) { + Inkscape::XML::Node *repr = box3d_side_convert_to_path(side); grepr->appendChild(repr); } else { g_warning("Non-side item encountered as child of a 3D box."); diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 0b2e15d34..c2aa769f6 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -173,8 +173,10 @@ sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write for (const GSList *i = desktop->selection->itemList(); i != NULL; i = i->next) { /* last used styles for 3D box faces are stored separately */ - if (SP_IS_BOX3D_SIDE (i->data)) { - const char * descr = box3d_side_axes_string(SP_BOX3D_SIDE(i->data)); + SPObject *obj = reinterpret_cast<SPObject *>(i->data); // TODO unsafe until Selection is refactored. + Box3DSide *side = dynamic_cast<Box3DSide *>(obj); + if (side) { + const char * descr = box3d_side_axes_string(side); if (descr != NULL) { prefs->mergeStyle(Glib::ustring("/desktop/") + descr + "/style", css_write); } -- cgit v1.2.3 From 4f98972d426507aaceb1c55d5fdee5b258999445 Mon Sep 17 00:00:00 2001 From: "Liam P. White" <inkscapebrony@gmail.com> Date: Fri, 17 Oct 2014 15:40:53 -0400 Subject: Small warning cleanup (bzr r13341.1.277) --- src/2geom/numeric/symmetric-matrix-fs-operation.h | 2 +- src/2geom/numeric/symmetric-matrix-fs-trace.h | 2 +- src/style-internal.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/2geom/numeric/symmetric-matrix-fs-operation.h b/src/2geom/numeric/symmetric-matrix-fs-operation.h index 5222d2734..37ece56ae 100644 --- a/src/2geom/numeric/symmetric-matrix-fs-operation.h +++ b/src/2geom/numeric/symmetric-matrix-fs-operation.h @@ -44,7 +44,7 @@ namespace Geom { namespace NL { template <size_t N> inline -SymmetricMatrix<N> adj(const ConstBaseSymmetricMatrix<N> & S) +SymmetricMatrix<N> adj(const ConstBaseSymmetricMatrix<N> & /*S*/) { THROW_NOTIMPLEMENTED(); return SymmetricMatrix<N>(); diff --git a/src/2geom/numeric/symmetric-matrix-fs-trace.h b/src/2geom/numeric/symmetric-matrix-fs-trace.h index 099c834a8..dbabecf6e 100644 --- a/src/2geom/numeric/symmetric-matrix-fs-trace.h +++ b/src/2geom/numeric/symmetric-matrix-fs-trace.h @@ -74,7 +74,7 @@ template <size_t K, size_t N> struct trace { static - double evaluate (const ConstBaseSymmetricMatrix<N> & S) + double evaluate (const ConstBaseSymmetricMatrix<N> & /*S*/) { THROW_NOTIMPLEMENTED(); return K; diff --git a/src/style-internal.h b/src/style-internal.h index 9158ed60e..5a853fcef 100644 --- a/src/style-internal.h +++ b/src/style-internal.h @@ -387,7 +387,7 @@ class SPIString : public SPIBase { public: SPIString() : SPIBase( "anonymous_string" ), value(NULL) {}; - SPIString( Glib::ustring name, gchar* value_default_in = NULL ) : + SPIString( Glib::ustring name, gchar const* value_default_in = NULL ) : SPIBase( name ) , value(NULL) , value_default(NULL) { value_default = value_default_in?g_strdup(value_default_in):NULL; }; -- cgit v1.2.3