[gimp/gimp-attributes-wip: 26/102] Merge to stay up-to-date



commit 2d3a0560b4cceea54f67aa66f5b3d28bb3a896b3
Merge: ae16788 509f911
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Sat Mar 19 15:34:06 2016 +0100

    Merge to stay up-to-date

 app/actions/edit-commands.c                        |    2 +-
 app/actions/select-actions.c                       |   14 +
 app/actions/select-commands.c                      |   77 +
 app/actions/select-commands.h                      |    5 +
 app/actions/vectors-actions.c                      |   18 +
 app/actions/vectors-commands.c                     |   79 +-
 app/actions/vectors-commands.h                     |    5 +
 app/core/gimp-edit.c                               |    2 +-
 app/core/gimpchannel.c                             |   46 +-
 app/core/gimpfilloptions.c                         |   26 +-
 app/core/gimpfilloptions.h                         |    4 +-
 app/core/gimpitem.c                                |   42 +
 app/core/gimpitem.h                                |   13 +
 app/core/gimpselection.c                           |   44 +
 app/dialogs/Makefile.am                            |    2 +
 app/dialogs/fill-dialog.c                          |  200 +
 app/dialogs/fill-dialog.h                          |   33 +
 app/display/gimpdisplayshell-dnd.c                 |   57 +-
 app/paint/gimpairbrush.c                           |   36 +-
 app/paint/gimppaintbrush.c                         |   38 +-
 app/pdb/edit-cmds.c                                |    6 +-
 app/tools/gimpbucketfilltool.c                     |    2 +-
 app/vectors/gimpvectors.c                          |   33 +-
 app/widgets/gimpdrawabletreeview.c                 |   72 +-
 app/widgets/gimphelp-ids.h                         |    2 +
 icons/Symbolic/12/gimp-close.png                   |  Bin 396 -> 499 bytes
 icons/Symbolic/12/gimp-linked.png                  |  Bin 397 -> 383 bytes
 icons/Symbolic/12/gimp-menu-left.png               |  Bin 431 -> 387 bytes
 icons/Symbolic/12/gimp-menu-right.png              |  Bin 428 -> 376 bytes
 icons/Symbolic/12/gimp-quick-mask-off.png          |  Bin 340 -> 414 bytes
 icons/Symbolic/12/gimp-quick-mask-on.png           |  Bin 311 -> 438 bytes
 icons/Symbolic/12/gimp-swap-colors.png             |  Bin 385 -> 514 bytes
 icons/Symbolic/12/gimp-visible.png                 |  Bin 461 -> 563 bytes
 icons/Symbolic/12/gimp-zoom-follow-window.png      |  Bin 531 -> 493 bytes
 icons/Symbolic/16/gimp-channel-alpha.png           |  Bin 497 -> 596 bytes
 icons/Symbolic/16/gimp-channel-blue.png            |  Bin 405 -> 426 bytes
 icons/Symbolic/16/gimp-channel-gray.png            |  Bin 326 -> 402 bytes
 icons/Symbolic/16/gimp-channel-green.png           |  Bin 418 -> 425 bytes
 icons/Symbolic/16/gimp-channel-indexed.png         |  Bin 489 -> 401 bytes
 icons/Symbolic/16/gimp-channel-red.png             |  Bin 407 -> 422 bytes
 icons/Symbolic/16/gimp-channels.png                |  Bin 354 -> 419 bytes
 icons/Symbolic/16/gimp-color-triangle.png          |  Bin 887 -> 900 bytes
 icons/Symbolic/16/gimp-controller.png              |  Bin 478 -> 525 bytes
 icons/Symbolic/16/gimp-convert-grayscale.png       |  Bin 910 -> 906 bytes
 icons/Symbolic/16/gimp-convert-indexed.png         |  Bin 886 -> 951 bytes
 icons/Symbolic/16/gimp-convert-rgb.png             |  Bin 853 -> 838 bytes
 .../Symbolic/16/gimp-display-filter-colorblind.png |  Bin 545 -> 480 bytes
 icons/Symbolic/16/gimp-display-filter-contrast.png |  Bin 395 -> 437 bytes
 icons/Symbolic/16/gimp-display-filter-gamma.png    |  Bin 565 -> 622 bytes
 icons/Symbolic/16/gimp-display-filter-lcms.png     |  Bin 694 -> 763 bytes
 icons/Symbolic/16/gimp-display-filter-proof.png    |  Bin 613 -> 553 bytes
 icons/Symbolic/16/gimp-flip-horizontal.png         |  Bin 566 -> 440 bytes
 icons/Symbolic/16/gimp-flip-vertical.png           |  Bin 596 -> 384 bytes
 icons/Symbolic/16/gimp-floating-selection.png      |  Bin 682 -> 778 bytes
 icons/Symbolic/16/gimp-histogram.png               |  Bin 357 -> 457 bytes
 icons/Symbolic/16/gimp-images.png                  |  Bin 565 -> 577 bytes
 icons/Symbolic/16/gimp-layer-mask.png              |  Bin 486 -> 596 bytes
 icons/Symbolic/16/gimp-layer-to-imagesize.png      |  Bin 541 -> 528 bytes
 icons/Symbolic/16/gimp-layer.png                   |  Bin 518 -> 598 bytes
 icons/Symbolic/16/gimp-layers.png                  |  Bin 227 -> 398 bytes
 icons/Symbolic/16/gimp-list.png                    |  Bin 396 -> 381 bytes
 icons/Symbolic/16/gimp-navigation.png              |  Bin 504 -> 450 bytes
 icons/Symbolic/16/gimp-path-stroke.png             |  Bin 580 -> 610 bytes
 icons/Symbolic/16/gimp-path.png                    |  Bin 467 -> 513 bytes
 icons/Symbolic/16/gimp-prefs-playground.png        |  Bin 482 -> 0 bytes
 icons/Symbolic/16/gimp-reset.png                   |  Bin 748 -> 749 bytes
 icons/Symbolic/16/gimp-reshow-filter.png           |  Bin 791 -> 792 bytes
 icons/Symbolic/16/gimp-resize.png                  |  Bin 679 -> 584 bytes
 icons/Symbolic/16/gimp-scale.png                   |  Bin 577 -> 550 bytes
 icons/Symbolic/16/gimp-selection-add.png           |  Bin 287 -> 394 bytes
 icons/Symbolic/16/gimp-selection-intersect.png     |  Bin 272 -> 379 bytes
 icons/Symbolic/16/gimp-selection-none.png          |  Bin 354 -> 534 bytes
 icons/Symbolic/16/gimp-selection-replace.png       |  Bin 753 -> 608 bytes
 icons/Symbolic/16/gimp-selection-subtract.png      |  Bin 273 -> 380 bytes
 icons/Symbolic/16/gimp-selection-to-channel.png    |  Bin 402 -> 444 bytes
 icons/Symbolic/16/gimp-selection-to-path.png       |  Bin 501 -> 549 bytes
 icons/Symbolic/16/gimp-text-layer.png              |  Bin 533 -> 640 bytes
 icons/Symbolic/16/gimp-tool-blend.png              |  Bin 401 -> 400 bytes
 icons/Symbolic/16/gimp-tool-crop.png               |  Bin 541 -> 418 bytes
 icons/Symbolic/16/gimp-tool-dodge.png              |  Bin 419 -> 605 bytes
 icons/Symbolic/16/gimp-tool-handle-transform.png   |  Bin 507 -> 569 bytes
 icons/Symbolic/16/gimp-tool-measure.png            |  Bin 784 -> 781 bytes
 icons/Symbolic/16/gimp-tool-options.png            |  Bin 412 -> 433 bytes
 icons/Symbolic/16/gimp-tool-path.png               |  Bin 683 -> 564 bytes
 icons/Symbolic/16/gimp-tool-perspective-clone.png  |  Bin 449 -> 549 bytes
 icons/Symbolic/16/gimp-tool-preset.png             |  Bin 714 -> 427 bytes
 icons/Symbolic/16/gimp-tool-unified-transform.png  |  Bin 571 -> 566 bytes
 icons/Symbolic/18/gimp-color-picker-black.png      |  Bin 635 -> 645 bytes
 icons/Symbolic/18/gimp-color-picker-gray.png       |  Bin 607 -> 645 bytes
 icons/Symbolic/18/gimp-color-picker-white.png      |  Bin 622 -> 643 bytes
 icons/Symbolic/20/gimp-linked.png                  |  Bin 560 -> 556 bytes
 icons/Symbolic/20/gimp-visible.png                 |  Bin 786 -> 904 bytes
 icons/Symbolic/22/gimp-histogram.png               |  Bin 513 -> 613 bytes
 icons/Symbolic/22/gimp-path.png                    |  Bin 568 -> 666 bytes
 icons/Symbolic/22/gimp-prefs-playground.png        |  Bin 620 -> 812 bytes
 icons/Symbolic/22/gimp-tool-blend.png              |  Bin 806 -> 888 bytes
 icons/Symbolic/22/gimp-tool-crop.png               |  Bin 606 -> 610 bytes
 icons/Symbolic/22/gimp-tool-dodge.png              |  Bin 571 -> 811 bytes
 icons/Symbolic/22/gimp-tool-handle-transform.png   |  Bin 682 -> 806 bytes
 icons/Symbolic/22/gimp-tool-measure.png            |  Bin 1025 -> 1047 bytes
 icons/Symbolic/22/gimp-tool-path.png               |  Bin 884 -> 866 bytes
 icons/Symbolic/22/gimp-tool-perspective-clone.png  |  Bin 698 -> 795 bytes
 icons/Symbolic/22/gimp-tool-preset.png             |  Bin 1020 -> 883 bytes
 icons/Symbolic/22/gimp-tool-unified-transform.png  |  Bin 719 -> 710 bytes
 icons/Symbolic/24/gimp-channel-alpha.png           |  Bin 621 -> 746 bytes
 icons/Symbolic/24/gimp-channel-blue.png            |  Bin 433 -> 435 bytes
 icons/Symbolic/24/gimp-channel-gray.png            |  Bin 331 -> 430 bytes
 icons/Symbolic/24/gimp-channel-green.png           |  Bin 405 -> 448 bytes
 icons/Symbolic/24/gimp-channel-indexed.png         |  Bin 727 -> 434 bytes
 icons/Symbolic/24/gimp-channel-red.png             |  Bin 432 -> 435 bytes
 icons/Symbolic/24/gimp-channels.png                |  Bin 423 -> 523 bytes
 icons/Symbolic/24/gimp-controller.png              |  Bin 586 -> 656 bytes
 .../Symbolic/24/gimp-display-filter-colorblind.png |  Bin 653 -> 686 bytes
 icons/Symbolic/24/gimp-display-filter-contrast.png |  Bin 480 -> 617 bytes
 icons/Symbolic/24/gimp-display-filter-gamma.png    |  Bin 765 -> 852 bytes
 icons/Symbolic/24/gimp-display-filter-lcms.png     |  Bin 1038 -> 1139 bytes
 icons/Symbolic/24/gimp-display-filter-proof.png    |  Bin 855 -> 759 bytes
 icons/Symbolic/24/gimp-floating-selection.png      |  Bin 758 -> 1158 bytes
 icons/Symbolic/24/gimp-images.png                  |  Bin 752 -> 830 bytes
 icons/Symbolic/24/gimp-layer-mask.png              |  Bin 700 -> 804 bytes
 icons/Symbolic/24/gimp-layer.png                   |  Bin 756 -> 744 bytes
 icons/Symbolic/24/gimp-layers.png                  |  Bin 336 -> 466 bytes
 icons/Symbolic/24/gimp-text-layer.png              |  Bin 770 -> 877 bytes
 icons/Symbolic/24/gimp-tool-options.png            |  Bin 554 -> 555 bytes
 icons/Symbolic/32/gimp-channel-alpha.png           |  Bin 781 -> 1004 bytes
 icons/Symbolic/32/gimp-channel-blue.png            |  Bin 502 -> 474 bytes
 icons/Symbolic/32/gimp-channel-gray.png            |  Bin 355 -> 449 bytes
 icons/Symbolic/32/gimp-channel-green.png           |  Bin 486 -> 478 bytes
 icons/Symbolic/32/gimp-channel-indexed.png         |  Bin 586 -> 479 bytes
 icons/Symbolic/32/gimp-channel-red.png             |  Bin 468 -> 473 bytes
 icons/Symbolic/32/gimp-floating-selection.png      |  Bin 1526 -> 1633 bytes
 icons/Symbolic/32/gimp-layer-mask.png              |  Bin 798 -> 927 bytes
 icons/Symbolic/32/gimp-layer.png                   |  Bin 904 -> 781 bytes
 icons/Symbolic/32/gimp-text-layer.png              |  Bin 936 -> 1043 bytes
 icons/Symbolic/48/gimp-channel-alpha.png           |  Bin 1148 -> 1388 bytes
 icons/Symbolic/48/gimp-channel-blue.png            |  Bin 580 -> 551 bytes
 icons/Symbolic/48/gimp-channel-gray.png            |  Bin 461 -> 522 bytes
 icons/Symbolic/48/gimp-channel-green.png           |  Bin 570 -> 554 bytes
 icons/Symbolic/48/gimp-channel-indexed.png         |  Bin 809 -> 556 bytes
 icons/Symbolic/48/gimp-channel-red.png             |  Bin 573 -> 556 bytes
 icons/Symbolic/48/gimp-floating-selection.png      |  Bin 2491 -> 2603 bytes
 icons/Symbolic/48/gimp-layer-mask.png              |  Bin 1095 -> 1243 bytes
 icons/Symbolic/48/gimp-layer.png                   |  Bin 1236 -> 963 bytes
 icons/Symbolic/48/gimp-prefs-playground.png        |  Bin 1269 -> 1171 bytes
 icons/Symbolic/48/gimp-text-layer.png              |  Bin 1296 -> 1403 bytes
 icons/Symbolic/scalable.svg                        | 7108 +++++++------
 menus/image-menu.xml.in                            |    2 +
 po-plug-ins/es.po                                  |  102 +-
 po-plug-ins/hu.po                                  | 2013 ++--
 po/POTFILES.in                                     |    1 +
 po/de.po                                           | 5102 +++++----
 po/es.po                                           |  722 +-
 po/hu.po                                           |11501 ++++++++++++--------
 po/pl.po                                           |  388 +-
 tools/pdbgen/pdb/edit.pdb                          |    6 +-
 155 files changed, 16223 insertions(+), 11580 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]