Index: kde-croatia/kde4/summit/hr/summit/messages/koffice/krita.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/koffice/krita.po	(revision 1090)
+++ kde-croatia/kde4/summit/hr/summit/messages/koffice/krita.po	(revision 1123)
@@ -7,5 +7,5 @@
 "Project-Id-Version: krita 0\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-06-22 08:58+0200\n"
+"POT-Creation-Date: 2011-07-08 10:27+0200\n"
 "PO-Revision-Date: 2011-03-18 18:21+0100\n"
 "Last-Translator: Marko DimjaÅ¡eviÄ <marko@dimjasevic.net>\n"
@@ -32,7 +32,7 @@
 
 #. +> trunk stable
-#: benchmarks/kis_floodfill_benchmark.cpp:88
+#: benchmarks/kis_floodfill_benchmark.cpp:87
 #: plugins/tools/defaulttools/kis_tool_fill.cc:100
-#: plugins/tools/defaulttools/kis_tool_fill.cc:149
+#: plugins/tools/defaulttools/kis_tool_fill.cc:142
 #, fuzzy
 msgid "Flood Fill"
@@ -40,5 +40,5 @@
 
 #. +> trunk stable
-#: benchmarks/kis_gradient_benchmark.cpp:71
+#: benchmarks/kis_gradient_benchmark.cpp:70
 #, fuzzy
 msgid "Gradient Fill"
@@ -1115,11 +1115,26 @@
 msgstr "zadano"
 
-#. +> trunk stable
+#. +> trunk
 #: image/commands/kis_change_filter_command.h:40
 #, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Change Filter"
 msgstr "&Bijela"
 
-#. +> trunk stable
+#. +> stable
+#: image/commands/kis_change_filter_command.h:40
+#, fuzzy
+msgid "Change Filter"
+msgstr "&Bijela"
+
+#. +> trunk
+#: image/commands/kis_change_generator_command.h:40
+#, fuzzy
+#| msgid "General"
+msgctxt "(qtundo-format)"
+msgid "Change Generator"
+msgstr "OpÄenito"
+
+#. +> stable
 #: image/commands/kis_change_generator_command.h:40
 #, fuzzy
@@ -1128,11 +1143,27 @@
 msgstr "OpÄenito"
 
-#. +> trunk stable
+#. +> trunk
 #: image/commands/kis_deselect_global_selection_command.cpp:30
 #, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Deselect"
 msgstr "Odabir"
 
-#. +> trunk stable
+#. +> stable
+#: image/commands/kis_deselect_global_selection_command.cpp:30
+#, fuzzy
+msgid "Deselect"
+msgstr "Odabir"
+
+#. +> trunk
+#: image/commands/kis_image_layer_add_command.cpp:27
+#: image/commands/kis_image_layer_add_command.cpp:35
+#, fuzzy
+#| msgid "Add Layer"
+msgctxt "(qtundo-format)"
+msgid "Add Layer"
+msgstr "/Dodaj Masku SlojaÂ âŠ"
+
+#. +> stable
 #: image/commands/kis_image_layer_add_command.cpp:27
 #: image/commands/kis_image_layer_add_command.cpp:35
@@ -1140,69 +1171,138 @@
 msgstr "/Dodaj Masku SlojaÂ âŠ"
 
-#. +> trunk stable
+#. +> trunk
 #: image/commands/kis_image_layer_move_command.cpp:39
 #: image/commands/kis_image_layer_move_command.cpp:50
 #, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Move Layer"
 msgstr "preimenuj sloj"
 
-#. +> trunk stable
+#. +> stable
+#: image/commands/kis_image_layer_move_command.cpp:39
+#: image/commands/kis_image_layer_move_command.cpp:50
+#, fuzzy
+msgid "Move Layer"
+msgstr "preimenuj sloj"
+
+#. +> trunk
+#: image/commands/kis_image_layer_remove_command.cpp:27
+#, fuzzy
+#| msgid "Remove Layer"
+msgctxt "(qtundo-format)"
+msgid "Remove Layer"
+msgstr "preimenuj sloj"
+
+#. +> stable
 #: image/commands/kis_image_layer_remove_command.cpp:27
 msgid "Remove Layer"
 msgstr "preimenuj sloj"
 
-#. +> trunk stable
+#. +> trunk
 #: image/commands/kis_image_node_lower_command.cpp:28
 #: image/commands/kis_image_node_to_bottom_command.cpp:29
 #: image/commands/kis_image_node_to_top_command.cpp:28
 #, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Lower"
 msgstr "Spusti %1"
 
-#. +> trunk stable
+#. +> stable
+#: image/commands/kis_image_node_lower_command.cpp:28
+#: image/commands/kis_image_node_to_bottom_command.cpp:29
+#: image/commands/kis_image_node_to_top_command.cpp:28
+#, fuzzy
+msgid "Lower"
+msgstr "Spusti %1"
+
+#. +> trunk
 #: image/commands/kis_image_node_raise_command.cpp:28
 #, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Raise"
 msgstr "Uzdigni %1"
 
-#. +> trunk stable
-#: image/commands/kis_image_resize_command.cpp:28 image/kis_image.cc:385
+#. +> stable
+#: image/commands/kis_image_node_raise_command.cpp:28
+#, fuzzy
+msgid "Raise"
+msgstr "Uzdigni %1"
+
+#. +> trunk
+#: image/commands/kis_image_resize_command.cpp:28
+#, fuzzy
+#| msgid "Resize Image"
+msgctxt "(qtundo-format)"
 msgid "Resize Image"
 msgstr "Promijeni veliÄinu slike"
 
-#. +> trunk stable
+#. +> trunk
 #: image/commands/kis_image_set_projection_color_space_command.cpp:29
 #, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Convert Image Type"
 msgstr "Promijeni veliÄinu slikeÂ âŠ"
 
-#. +> trunk stable
+#. +> stable
+#: image/commands/kis_image_set_projection_color_space_command.cpp:29
+#, fuzzy
+msgid "Convert Image Type"
+msgstr "Promijeni veliÄinu slikeÂ âŠ"
+
+#. +> trunk
 #: image/commands/kis_layer_props_command.cpp:43
 #: image/commands/kis_node_property_list_command.cpp:25
+#, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Property Changes"
-msgstr ""
-
-#. +> trunk stable
+msgstr "Svojstva tablice"
+
+#. +> stable
+#: image/commands/kis_layer_props_command.cpp:42
+#: image/commands/kis_node_property_list_command.cpp:25
+msgid "Property Changes"
+msgstr ""
+
+#. +> trunk
 #: image/commands/kis_node_compositeop_command.cpp:28
 #, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Node Composite Mode"
 msgstr "PoloÅŸaj"
 
-#. i18n: ectx: property (text), widget (QRadioButton, moveBtn)
-#. +> trunk stable
+#. +> stable
+#: image/commands/kis_node_compositeop_command.cpp:28
+#, fuzzy
+msgid "Node Composite Mode"
+msgstr "PoloÅŸaj"
+
+#. +> trunk
 #: image/commands/kis_node_move_command.cpp:30
-#: plugins/paintops/deform/wdgdeformoptions.ui:75
-#: plugins/tools/defaulttools/kis_tool_move.cc:160
-#, fuzzy
+#, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Move"
 msgstr "NaÄin:"
 
-#. +> trunk stable
+#. +> trunk
 #: image/commands/kis_node_opacity_command.cpp:26
 #, fuzzy
+msgctxt "(qtundo-format)"
 msgid "Node Opacity"
 msgstr "Neprozirnost:"
 
-#. +> trunk stable
+#. +> stable
+#: image/commands/kis_node_opacity_command.cpp:26
+#, fuzzy
+msgid "Node Opacity"
+msgstr "Neprozirnost:"
+
+#. +> trunk
+#: image/commands/kis_reselect_global_selection_command.cpp:30
+#, fuzzy
+msgctxt "(qtundo-format)"
+msgid "Reselect"
+msgstr "Odabir"
+
+#. +> stable
 #: image/commands/kis_reselect_global_selection_command.cpp:30
 #, fuzzy
@@ -1292,12 +1392,12 @@
 
 #. +> trunk stable
-#: image/kis_base_node.cpp:130 ui/kis_node_model.cpp:312
+#: image/kis_base_node.cpp:131 ui/kis_node_model.cpp:313
 msgid "Visible"
 msgstr "Vidljivo"
 
 #. +> trunk stable
-#: image/kis_base_node.cpp:131
+#: image/kis_base_node.cpp:132
 #: plugins/extensions/dockers/channeldocker/channelmodel.cpp:63
-#: ui/kis_node_model.cpp:313
+#: ui/kis_node_model.cpp:314
 #, fuzzy
 msgid "Locked"
@@ -1318,5 +1418,5 @@
 #. i18n: ectx: property (windowTitle), widget (QWidget, WdgToolCrop)
 #. +> trunk stable
-#: image/kis_crop_visitor.h:121 plugins/tools/tool_crop/kis_tool_crop.cc:451
+#: image/kis_crop_visitor.h:142 plugins/tools/tool_crop/kis_tool_crop.cc:451
 #: plugins/tools/tool_crop/wdg_tool_crop.ui:14
 #, fuzzy
@@ -1387,5 +1487,10 @@
 
 #. +> trunk stable
-#: image/kis_image.cc:431 plugins/extensions/imagesize/imagesize.cc:123
+#: image/kis_image.cc:385
+msgid "Resize Image"
+msgstr "Promijeni veliÄinu slike"
+
+#. +> trunk stable
+#: image/kis_image.cc:431 plugins/extensions/imagesize/imagesize.cc:125
 #, fuzzy
 msgid "Scale Image"
@@ -1428,5 +1533,5 @@
 
 #. +> trunk stable
-#: image/kis_image.cc:730 ui/kis_layer_manager.cc:803
+#: image/kis_image.cc:730 ui/kis_layer_manager.cc:768
 #, fuzzy
 msgid "Flatten Image"
@@ -1488,5 +1593,5 @@
 
 #. +> trunk stable
-#: image/kis_selection_mask.cpp:104 ui/kis_node_model.cpp:314
+#: image/kis_selection_mask.cpp:104 ui/kis_node_model.cpp:315
 #, fuzzy
 msgid "Active"
@@ -1499,5 +1604,12 @@
 msgstr "Rotiraj"
 
-#. +> trunk stable
+#. +> trunk
+#: image/kis_transformation_mask.cpp:112
+#, fuzzy
+msgctxt "(qtundo-format)"
+msgid "Transformation Mask Settings"
+msgstr "Transformacija"
+
+#. +> stable
 #: image/kis_transformation_mask.cpp:112
 #, fuzzy
@@ -2074,5 +2186,5 @@
 #: plugins/extensions/backgrounds/wdg_backgrounds.ui:41
 #: plugins/extensions/backgrounds/wdg_backgrounds.ui:48
-#: plugins/extensions/dockers/defaultdockers/wdglayerbox.ui:171
+#: plugins/extensions/dockers/defaultdockers/wdglayerbox.ui:209
 #: plugins/extensions/painterlyframework/kis_painterlymixer.ui:326
 #: plugins/extensions/painterlyframework/kis_painterlymixer.ui:336
@@ -2307,5 +2419,5 @@
 #: plugins/extensions/bracketing2hdr/wdgbracketing2hdr.ui:162
 #: plugins/extensions/tonemapping/wdgtonemappingdialog.ui:93
-#: ui/kis_view2.cpp:447
+#: ui/kis_view2.cpp:486
 #, fuzzy
 msgid "Cancel"
@@ -2653,5 +2765,5 @@
 #. i18n: ectx: property (text), widget (QLabel, label_4)
 #. +> trunk stable
-#: plugins/extensions/compose/wdg_compose.ui:52 ui/kis_paintop_box.cc:134
+#: plugins/extensions/compose/wdg_compose.ui:52
 #, fuzzy
 msgid "Opacity: "
@@ -2795,5 +2907,5 @@
 #. +> trunk stable
 #: plugins/extensions/dockers/advancedcolorselector/wdg_color_selector_settings.ui:24
-#: ui/dialogs/kis_dlg_preferences.cc:533 ui/dialogs/kis_dlg_preferences.cc:534
+#: ui/dialogs/kis_dlg_preferences.cc:512 ui/dialogs/kis_dlg_preferences.cc:513
 msgid "General"
 msgstr "OpÄenito"
@@ -3067,5 +3179,5 @@
 #: plugins/extensions/dockers/advancedcolorselector/wdg_color_selector_settings.ui:663
 #: plugins/formats/pdf/pdfimportwidgetbase.ui:186
-#: ui/forms/wdgdisplaysettings.ui:68
+#: ui/forms/wdgdisplaysettings.ui:68 ui/kis_paintop_box.cc:136
 #, fuzzy
 msgid "Size:"
@@ -3204,15 +3316,15 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:79
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:81
 msgid "Layers"
 msgstr "Slojevi"
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:104
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:106
 msgid "Minimal View"
 msgstr ""
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:106
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:108
 #, fuzzy
 msgid "Detailed View"
@@ -3220,5 +3332,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:108
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:110
 #, fuzzy
 msgid "Thumbnail View"
@@ -3226,5 +3338,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:119
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:121
 #, fuzzy
 msgid "View mode"
@@ -3232,5 +3344,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:156
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:168
 #, fuzzy
 #| msgid "&Layer"
@@ -3239,5 +3351,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:158
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:170
 #, fuzzy
 msgid "&Group Layer"
@@ -3245,5 +3357,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:160
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:172
 #, fuzzy
 msgid "&Clone Layer"
@@ -3251,5 +3363,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:162
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:174
 #, fuzzy
 msgid "&Shape Layer"
@@ -3257,5 +3369,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:164
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:176
 #, fuzzy
 msgid "&Filter Layer..."
@@ -3263,5 +3375,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:166
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:178
 #, fuzzy
 msgid "&Generated Layer..."
@@ -3269,5 +3381,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:168
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:180
 #, fuzzy
 msgid "&Transparency Mask"
@@ -3275,5 +3387,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:170
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:182
 #, fuzzy
 msgid "&Filter Mask..."
@@ -3287,5 +3399,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:172
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:184
 #, fuzzy
 msgid "&Local Selection"
@@ -3293,5 +3405,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:189
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:201
 #, fuzzy
 msgid "&Transformation Mask..."
@@ -3299,5 +3411,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:348
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:361
 #, fuzzy
 msgid "&Properties..."
@@ -3305,13 +3417,20 @@
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:350
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:363
 msgid "&Remove Layer"
 msgstr "&preimenuj sloj"
 
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:351
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:364
 #, fuzzy
 msgid "&Duplicate Layer or Mask"
 msgstr "Dupliciraj Sloj"
+
+#. +> trunk stable
+#: plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp:365
+#: ui/kis_layer_manager.cc:138
+#, fuzzy
+msgid "&Merge with Layer Below"
+msgstr "&preimenuj sloj"
 
 #. +> trunk stable
@@ -3391,7 +3510,21 @@
 msgstr "preimenuj sloj"
 
+#. i18n: ectx: property (toolTip), widget (QToolButton, bnLeft)
+#. +> trunk
+#: plugins/extensions/dockers/defaultdockers/wdglayerbox.ui:168
+#, fuzzy
+msgid "Move layer out of group"
+msgstr "preimenuj sloj"
+
+#. i18n: ectx: property (toolTip), widget (QToolButton, bnRight)
+#. +> trunk
+#: plugins/extensions/dockers/defaultdockers/wdglayerbox.ui:187
+#, fuzzy
+msgid "Move layer into group"
+msgstr "Premjesti prozor u grupu"
+
 #. i18n: ectx: property (toolTip), widget (QToolButton, bnProperties)
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/wdglayerbox.ui:168
+#: plugins/extensions/dockers/defaultdockers/wdglayerbox.ui:206
 msgid "View or change the layer properties"
 msgstr ""
@@ -3399,5 +3532,5 @@
 #. i18n: ectx: property (toolTip), widget (QToolButton, bnDelete)
 #. +> trunk stable
-#: plugins/extensions/dockers/defaultdockers/wdglayerbox.ui:203
+#: plugins/extensions/dockers/defaultdockers/wdglayerbox.ui:241
 #, fuzzy
 msgid "Delete the layer or mask"
@@ -3543,5 +3676,5 @@
 #: plugins/filters/randompickfilter/wdgrandompickoptions.ui:48
 #: ui/forms/wdgautogradient.ui:238 ui/forms/wdgnewimage.ui:255
-#: ui/forms/wdgpaintactioneditor.ui:89
+#: ui/forms/wdgpaintactioneditor.ui:89 ui/kis_paintop_box.cc:134
 msgid "Opacity:"
 msgstr "Neprozirnost:"
@@ -3813,5 +3946,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/imagesize/imagesize.cc:170
+#: plugins/extensions/imagesize/imagesize.cc:172
 #, fuzzy
 msgid "Layer Size"
@@ -3819,5 +3952,6 @@
 
 #. +> trunk stable
-#: plugins/extensions/imagesize/imagesize.cc:209
+#: plugins/extensions/imagesize/imagesize.cc:211
+#: plugins/extensions/imagesize/imagesize.cc:225
 #, fuzzy
 msgid "Scale Selection"
@@ -4981,6 +5115,6 @@
 #. +> trunk stable
 #: plugins/extensions/modify_selection/dlg_border_selection.cc:31
-#: plugins/extensions/modify_selection/modify_selection.cc:160
-#: ui/kis_selection_manager.cc:1195
+#: plugins/extensions/modify_selection/modify_selection.cc:176
+#: ui/kis_selection_manager_p.h:218
 #, fuzzy
 msgid "Border Selection"
@@ -4989,6 +5123,6 @@
 #. +> trunk stable
 #: plugins/extensions/modify_selection/dlg_feather_selection.cc:32
-#: plugins/extensions/modify_selection/modify_selection.cc:183
-#: ui/kis_selection_manager.cc:1413
+#: plugins/extensions/modify_selection/modify_selection.cc:199
+#: ui/kis_selection_manager_p.h:439
 #, fuzzy
 #| msgid "Selection"
@@ -4998,6 +5132,6 @@
 #. +> trunk stable
 #: plugins/extensions/modify_selection/dlg_grow_selection.cc:30
-#: plugins/extensions/modify_selection/modify_selection.cc:112
-#: ui/kis_selection_manager.cc:733
+#: plugins/extensions/modify_selection/modify_selection.cc:128
+#: ui/kis_selection_manager_p.h:488
 #, fuzzy
 msgid "Grow Selection"
@@ -5006,6 +5140,6 @@
 #. +> trunk stable
 #: plugins/extensions/modify_selection/dlg_shrink_selection.cc:30
-#: plugins/extensions/modify_selection/modify_selection.cc:135
-#: ui/kis_selection_manager.cc:846
+#: plugins/extensions/modify_selection/modify_selection.cc:151
+#: ui/kis_selection_manager_p.h:617
 #, fuzzy
 msgid "Shrink Selection"
@@ -5019,5 +5153,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/modify_selection/modify_selection.cc:74
+#: plugins/extensions/modify_selection/modify_selection.cc:75
 #, fuzzy
 msgid "Shrink Selection..."
@@ -5025,5 +5159,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/modify_selection/modify_selection.cc:76
+#: plugins/extensions/modify_selection/modify_selection.cc:78
 #, fuzzy
 msgid "Border Selection..."
@@ -5031,5 +5165,5 @@
 
 #. +> trunk stable
-#: plugins/extensions/modify_selection/modify_selection.cc:78
+#: plugins/extensions/modify_selection/modify_selection.cc:81
 #, fuzzy
 #| msgid "Selection"
@@ -5181,5 +5315,5 @@
 #. +> trunk stable
 #: plugins/extensions/rotateimage/rotateimage.cc:151
-#: ui/kis_layer_manager.cc:741
+#: ui/kis_layer_manager.cc:706
 #, fuzzy
 msgid "Rotate Layer"
@@ -5650,5 +5784,5 @@
 #. +> trunk stable
 #: plugins/extensions/separate_channels/kis_channel_separator.cc:242
-#: ui/kis_layer_manager.cc:894
+#: ui/kis_layer_manager.cc:859
 msgid "Export Layer"
 msgstr ""
@@ -6193,5 +6327,5 @@
 #: plugins/filters/blur/wdg_lens_blur.ui:73
 #: plugins/filters/roundcorners/kis_round_corners_filter.cpp:136
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:958
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:971
 #: plugins/tools/selectiontools/kis_tool_select_magnetic_option_widget.ui:31
 #, fuzzy
@@ -6207,5 +6341,5 @@
 #: plugins/paintops/libpaintop/kis_pressure_rotation_option.cpp:27
 #: plugins/paintops/spray/wdgshapedynamicsoptions.ui:42
-#: plugins/tools/defaulttools/kis_tool_line.cc:81
+#: plugins/tools/defaulttools/kis_tool_line.cc:86
 #, fuzzy
 msgid "Rotation"
@@ -6263,10 +6397,10 @@
 
 #. +> trunk stable
-#: plugins/filters/bumpmap/bumpmap.cpp:91
+#: plugins/filters/bumpmap/bumpmap.cpp:92
 msgid "Bumpmap"
 msgstr "Grbavi teren"
 
 #. +> trunk stable
-#: plugins/filters/bumpmap/bumpmap.cpp:91
+#: plugins/filters/bumpmap/bumpmap.cpp:92
 #, fuzzy
 msgid "&Bumpmap..."
@@ -6687,5 +6821,5 @@
 
 #. +> trunk stable
-#: plugins/filters/example/example.h:45 ui/kis_selection_manager.cc:665
+#: plugins/filters/example/example.h:45
 #, fuzzy
 msgid "Invert"
@@ -6860,5 +6994,5 @@
 
 #. +> trunk stable
-#: plugins/filters/phongbumpmap/phongbumpmap.cpp:270
+#: plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp:34
 #, fuzzy
 #| msgid "Bumpmap"
@@ -6867,5 +7001,5 @@
 
 #. +> trunk stable
-#: plugins/filters/phongbumpmap/phongbumpmap.cpp:270
+#: plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp:35
 #, fuzzy
 msgid "&PhongBumpmap..."
@@ -6980,5 +7114,5 @@
 #: plugins/generators/solid/colorgenerator.h:53
 #: plugins/paintops/libpaintop/kis_paintop_option.cpp:31
-#: ui/dialogs/kis_dlg_preferences.cc:550 ui/forms/wdgnewimage.ui:227
+#: ui/dialogs/kis_dlg_preferences.cc:529 ui/forms/wdgnewimage.ui:227
 #, fuzzy
 msgid "Color"
@@ -8259,4 +8393,12 @@
 msgstr ""
 
+#. i18n: ectx: property (text), widget (QRadioButton, moveBtn)
+#. +> trunk stable
+#: plugins/paintops/deform/wdgdeformoptions.ui:75
+#: plugins/tools/defaulttools/kis_tool_move.cc:160
+#, fuzzy
+msgid "Move"
+msgstr "NaÄin:"
+
 #. i18n: ectx: property (text), widget (QRadioButton, colorBtn)
 #. +> trunk stable
@@ -9235,5 +9377,5 @@
 #: plugins/paintops/libpaintop/forms/wdgcustombrush.ui:74
 #: plugins/paintops/libpaintop/kis_dynamic_sensor.h:45
-#: plugins/tools/defaulttools/kis_tool_line.cc:79
+#: plugins/tools/defaulttools/kis_tool_line.cc:84
 #, fuzzy
 msgid "Pressure"
@@ -9383,4 +9525,18 @@
 msgid "--"
 msgstr "-"
+
+#. i18n: ectx: property (toolTip), widget (QCheckBox, pipeModeChbox)
+#. +> trunk
+#: plugins/paintops/libpaintop/forms/wdgtextbrush.ui:122
+#, fuzzy
+msgid "use only one letter at a time"
+msgstr "Ispis svake boje zasebno"
+
+#. i18n: ectx: property (text), widget (QCheckBox, pipeModeChbox)
+#. +> trunk
+#: plugins/paintops/libpaintop/forms/wdgtextbrush.ui:125
+#, fuzzy
+msgid "Pipe mode"
+msgstr "Jednostavno 1"
 
 #. +> trunk stable
@@ -9626,5 +9782,5 @@
 #. +> trunk stable
 #: plugins/paintops/libpaintop/kis_pressure_mirror_option.cpp:31
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:918
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:931
 #, fuzzy
 msgid "Mirror"
@@ -9645,5 +9801,5 @@
 #. +> trunk stable
 #: plugins/paintops/libpaintop/kis_pressure_mirror_option_widget.cpp:35
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:938
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:951
 #, fuzzy
 msgid "Horizontally"
@@ -9652,5 +9808,5 @@
 #. +> trunk stable
 #: plugins/paintops/libpaintop/kis_pressure_mirror_option_widget.cpp:37
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:940
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:953
 #, fuzzy
 msgid "Vertically"
@@ -10585,6 +10741,6 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_brush.cc:137
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:882
+#: plugins/tools/defaulttools/kis_tool_brush.cc:135
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:895
 #, fuzzy
 msgctxt "smooth out the curves while drawing"
@@ -10593,6 +10749,6 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_brush.cc:152
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:897
+#: plugins/tools/defaulttools/kis_tool_brush.cc:150
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:910
 #, fuzzy
 msgid "Assistant:"
@@ -10600,12 +10756,12 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_brush.cc:153
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:898
+#: plugins/tools/defaulttools/kis_tool_brush.cc:151
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:911
 msgid "You need to add Ruler Assistants before this tool will work."
 msgstr ""
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_brush.cc:156
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:901
+#: plugins/tools/defaulttools/kis_tool_brush.cc:154
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:914
 #, fuzzy
 msgid "Assistant Magnetism"
@@ -10654,5 +10810,5 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_fill.cc:215
+#: plugins/tools/defaulttools/kis_tool_fill.cc:208
 #, fuzzy
 msgid "Threshold: "
@@ -10660,5 +10816,5 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_fill.cc:223
+#: plugins/tools/defaulttools/kis_tool_fill.cc:216
 #, fuzzy
 msgid "Use pattern"
@@ -10666,10 +10822,10 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_fill.cc:224
+#: plugins/tools/defaulttools/kis_tool_fill.cc:217
 msgid "When checked do not use the foreground color, but the gradient selected to fill with"
 msgstr ""
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_fill.cc:228
+#: plugins/tools/defaulttools/kis_tool_fill.cc:221
 #: plugins/tools/selectiontools/kis_tool_select_contiguous.cc:141
 #, fuzzy
@@ -10678,5 +10834,5 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_fill.cc:232
+#: plugins/tools/defaulttools/kis_tool_fill.cc:225
 #, fuzzy
 msgid "Fill entire selection"
@@ -10684,5 +10840,5 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_fill.cc:233
+#: plugins/tools/defaulttools/kis_tool_fill.cc:226
 msgid "When checked do not look at the current layer colors, but just fill all of the selected area"
 msgstr ""
@@ -10787,5 +10943,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_line.cc:80
+#: plugins/tools/defaulttools/kis_tool_line.cc:85
 #, fuzzy
 msgid "Tilt"
@@ -10793,5 +10949,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_line.cc:82
+#: plugins/tools/defaulttools/kis_tool_line.cc:87
 #, fuzzy
 #| msgid "Address"
@@ -10800,5 +10956,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_line.cc:83
+#: plugins/tools/defaulttools/kis_tool_line.cc:88
 #, fuzzy
 msgid "Varying End-Points"
@@ -10806,5 +10962,5 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_line.cc:219
+#: plugins/tools/defaulttools/kis_tool_line.cc:224
 #, fuzzy
 msgctxt "a straight drawn line"
@@ -10813,10 +10969,10 @@
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_line.cc:303
+#: plugins/tools/defaulttools/kis_tool_line.cc:307
 msgid "Alt+Drag will move the origin of the currently displayed line around, Shift+Drag will force you to draw straight lines"
 msgstr ""
 
 #. +> trunk stable
-#: plugins/tools/defaulttools/kis_tool_line.h:83
+#: plugins/tools/defaulttools/kis_tool_line.h:85
 msgid "Draw a straight line with the current brush"
 msgstr ""
@@ -10861,5 +11017,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:910
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:923
 #, fuzzy
 msgid "Axis point"
@@ -10867,5 +11023,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:917
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:930
 #, fuzzy
 msgid "Symmetry"
@@ -10873,5 +11029,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:919
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:932
 #, fuzzy
 msgid "Translate"
@@ -10879,5 +11035,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_multihand.cpp:923
+#: plugins/tools/defaulttools/kis_tool_multihand.cpp:936
 #, fuzzy
 msgid "Brush count"
@@ -10885,5 +11041,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_multihand.h:220
+#: plugins/tools/defaulttools/kis_tool_multihand.h:221
 #, fuzzy
 msgid "Paint with multibrushes"
@@ -10891,5 +11047,5 @@
 
 #. +> trunk
-#: plugins/tools/defaulttools/kis_tool_multihand.h:234
+#: plugins/tools/defaulttools/kis_tool_multihand.h:235
 #, fuzzy
 msgid "MultiBrush"
@@ -11376,5 +11532,5 @@
 
 #. +> trunk stable
-#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:338
+#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:336
 #, fuzzy
 #| msgid "Width:"
@@ -11383,5 +11539,5 @@
 
 #. +> trunk stable
-#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:339
+#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:337
 #, fuzzy
 msgid "Mass:"
@@ -11389,5 +11545,5 @@
 
 #. +> trunk stable
-#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:340
+#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:338
 #, fuzzy
 msgid "Drag:"
@@ -11395,5 +11551,5 @@
 
 #. +> trunk stable
-#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:341
+#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:339
 #, fuzzy
 msgid "X angle:"
@@ -11401,5 +11557,5 @@
 
 #. +> trunk stable
-#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:342
+#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:340
 #, fuzzy
 msgid "Y angle:"
@@ -11407,5 +11563,5 @@
 
 #. +> trunk stable
-#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:343
+#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:341
 #, fuzzy
 msgid "Width range:"
@@ -11413,5 +11569,5 @@
 
 #. +> trunk stable
-#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:345
+#: plugins/tools/tool_dyna/kis_tool_dyna.cpp:343
 #, fuzzy
 msgid "Fixed angle:"
@@ -11514,5 +11670,13 @@
 msgstr "Transformacije"
 
-#. +> trunk stable
+#. +> trunk
+#: plugins/tools/tool_transform2/tool_transform_commands.cc:55
+#, fuzzy
+#| msgid "Transform"
+msgctxt "(qtundo-format)"
+msgid "Transform"
+msgstr "Preoblikuj"
+
+#. +> stable
 #: plugins/tools/tool_transform2/tool_transform_commands.cc:55
 #, fuzzy
@@ -11676,6 +11840,6 @@
 
 #. +> trunk stable
-#: ui/canvas/kis_grid_manager.cpp:47 ui/dialogs/kis_dlg_preferences.cc:567
-#: ui/dialogs/kis_dlg_preferences.cc:568
+#: ui/canvas/kis_grid_manager.cpp:47 ui/dialogs/kis_dlg_preferences.cc:546
+#: ui/dialogs/kis_dlg_preferences.cc:547
 #, fuzzy
 msgid "Grid"
@@ -11757,5 +11921,5 @@
 
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_layer_properties.cc:62
+#: ui/dialogs/kis_dlg_layer_properties.cc:78
 #, fuzzy
 msgid "Layer Properties"
@@ -11773,5 +11937,5 @@
 
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_preferences.cc:525
+#: ui/dialogs/kis_dlg_preferences.cc:504
 msgid "Preferences"
 msgstr "PodeÅ¡enja"
@@ -11780,5 +11944,5 @@
 #. i18n: ectx: property (windowTitle), widget (QWidget, WdgDisplaySettings)
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_preferences.cc:541 ui/dialogs/kis_dlg_preferences.cc:542
+#: ui/dialogs/kis_dlg_preferences.cc:520 ui/dialogs/kis_dlg_preferences.cc:521
 #: ui/forms/wdgcolorsettings.ui:59 ui/forms/wdgdisplaysettings.ui:14
 #, fuzzy
@@ -11787,5 +11951,5 @@
 
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_preferences.cc:549
+#: ui/dialogs/kis_dlg_preferences.cc:528
 #, fuzzy
 msgid "Color Management"
@@ -11793,5 +11957,5 @@
 
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_preferences.cc:558 ui/dialogs/kis_dlg_preferences.cc:559
+#: ui/dialogs/kis_dlg_preferences.cc:537 ui/dialogs/kis_dlg_preferences.cc:538
 #, fuzzy
 msgid "Performance"
@@ -11799,5 +11963,5 @@
 
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_preferences.cc:575
+#: ui/dialogs/kis_dlg_preferences.cc:554
 #, fuzzy
 msgid "Tablet settings"
@@ -11805,5 +11969,5 @@
 
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_preferences.cc:576
+#: ui/dialogs/kis_dlg_preferences.cc:555
 #, fuzzy
 msgid "Tablet"
@@ -11811,5 +11975,5 @@
 
 #. +> trunk
-#: ui/dialogs/kis_dlg_preferences.cc:584
+#: ui/dialogs/kis_dlg_preferences.cc:563
 #, fuzzy
 msgid "Full-screen settings"
@@ -11817,5 +11981,5 @@
 
 #. +> trunk
-#: ui/dialogs/kis_dlg_preferences.cc:585
+#: ui/dialogs/kis_dlg_preferences.cc:564
 #, fuzzy
 msgid "Full-screen"
@@ -11823,5 +11987,5 @@
 
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_preferences.cc:685
+#: ui/dialogs/kis_dlg_preferences.cc:655
 msgid ""
 "You are trying to enable OpenGL\n"
@@ -11834,5 +11998,5 @@
 
 #. +> trunk stable
-#: ui/dialogs/kis_dlg_preferences.cc:688 ui/kis_aboutdata.h:31
+#: ui/dialogs/kis_dlg_preferences.cc:658 ui/kis_aboutdata.h:31
 #: ui/kis_clipboard.cc:154
 msgid "Krita"
@@ -12206,5 +12370,5 @@
 #. i18n: ectx: property (text), widget (QLabel, lblProfiles)
 #. +> trunk stable
-#: ui/forms/wdgcolorspaceselector.ui:75 ui/forms/wdglayerproperties.ui:66
+#: ui/forms/wdgcolorspaceselector.ui:75 ui/forms/wdglayerproperties.ui:72
 msgid "Profile:"
 msgstr ""
@@ -12688,8 +12852,8 @@
 msgstr "pi"
 
+#. i18n: ectx: property (text), widget (QLabel, lblName)
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: ectx: property (text), widget (QLabel, lblName)
-#. +> trunk stable
-#: ui/forms/wdglayerproperties.ui:19 ui/forms/wdgnewimage.ui:25
+#. +> trunk stable
+#: ui/forms/wdglayerproperties.ui:25 ui/forms/wdgnewimage.ui:25
 #, fuzzy
 msgid "&Name:"
@@ -12698,5 +12862,5 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
 #. +> trunk stable
-#: ui/forms/wdglayerproperties.ui:32
+#: ui/forms/wdglayerproperties.ui:38
 #, fuzzy
 msgid "&Opacity:"
@@ -12705,5 +12869,5 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
 #. +> trunk stable
-#: ui/forms/wdglayerproperties.ui:45
+#: ui/forms/wdglayerproperties.ui:51
 msgid "Composite mode:"
 msgstr ""
@@ -12711,12 +12875,19 @@
 #. i18n: ectx: property (text), widget (QLabel, lblColorSpaces)
 #. +> trunk stable
-#: ui/forms/wdglayerproperties.ui:52
+#: ui/forms/wdglayerproperties.ui:58
 #, fuzzy
 msgid "Color space:"
 msgstr "HvataÄ boje"
 
+#. i18n: ectx: property (text), widget (QCheckBox, checkBoxPreview)
+#. +> trunk
+#: ui/forms/wdglayerproperties.ui:110
+#, fuzzy
+msgid "&Preview"
+msgstr "&Pregled"
+
 #. i18n: ectx: property (toolTip), widget (QGroupBox, grpActiveChannels)
 #. +> trunk stable
-#: ui/forms/wdglayerproperties.ui:97
+#: ui/forms/wdglayerproperties.ui:126
 msgid "Select the set of active channels."
 msgstr ""
@@ -12724,5 +12895,5 @@
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, grpActiveChannels)
 #. +> trunk stable
-#: ui/forms/wdglayerproperties.ui:100
+#: ui/forms/wdglayerproperties.ui:129
 msgid "Select the set of active channels. Only active channels will be visible, filtered or affected by painting."
 msgstr ""
@@ -12730,5 +12901,5 @@
 #. i18n: ectx: property (title), widget (QGroupBox, grpActiveChannels)
 #. +> trunk stable
-#: ui/forms/wdglayerproperties.ui:103
+#: ui/forms/wdglayerproperties.ui:132
 #, fuzzy
 msgid "&Active Channels"
@@ -12988,5 +13159,5 @@
 #. i18n: ectx: property (whatsThis), widget (KIntNumInput, m_maxTiles)
 #. +> trunk stable
-#: ui/forms/wdgperformancesettings.ui:25 ui/forms/wdgperformancesettings.ui:36
+#: ui/forms/wdgperformancesettings.ui:26 ui/forms/wdgperformancesettings.ui:37
 msgid ""
 "The maximum number of \"tiles\" that are kept in memory. For regular RGBA8 images, each tile is about 16 kB in size. Thus, for a value of 500 tiles this usually means about 8 megabytes are used for image data. If you regularly handle large images, a greater value here might be useful.\n"
@@ -12996,10 +13167,10 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #. +> trunk stable
-#: ui/forms/wdgperformancesettings.ui:28
+#: ui/forms/wdgperformancesettings.ui:29
 msgid "Maximum number of tiles kept in memory:"
 msgstr ""
 
 #. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. +> trunk stable
+#. +> stable
 #: ui/forms/wdgperformancesettings.ui:69
 msgid "This configures how much Krita will use the swap file. If you move the slider all the way to the left, Krita will not use the swap file at all. If you move it all the way to the right, Krita will make maximum use of the swap file."
@@ -13007,5 +13178,5 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. +> trunk stable
+#. +> stable
 #: ui/forms/wdgperformancesettings.ui:72
 msgid "Swappiness:"
@@ -13013,5 +13184,5 @@
 
 #. i18n: ectx: property (whatsThis), widget (QSlider, m_swappiness)
-#. +> trunk stable
+#. +> stable
 #: ui/forms/wdgperformancesettings.ui:79
 msgid "This configures how much Krita likes to swap. Move the slider to the left, and there is no swapping at all. Move it to the right there is a lot of swapping going on."
@@ -13537,4 +13708,10 @@
 msgstr ""
 
+#. +> trunk
+#: ui/kis_composite_ops_model.cc:29
+#, fuzzy
+msgid "Favorites"
+msgstr "Omiljeno"
+
 #. +> trunk stable
 #: ui/kis_control_frame.cpp:79 ui/kis_control_frame.cpp:80
@@ -13675,10 +13852,4 @@
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:138
-#, fuzzy
-msgid "&Merge with Layer Below"
-msgstr "&preimenuj sloj"
-
-#. +> trunk stable
 #: ui/kis_layer_manager.cc:143
 #, fuzzy
@@ -13687,5 +13858,5 @@
 
 #. +> trunk
-#: ui/kis_layer_manager.cc:147 ui/kis_layer_manager.cc:866
+#: ui/kis_layer_manager.cc:147 ui/kis_layer_manager.cc:831
 #, fuzzy
 msgid "Rasterize Layer"
@@ -13721,19 +13892,19 @@
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:353 ui/kis_layer_manager.cc:369
-#: ui/kis_layer_manager.cc:413 ui/kis_layer_manager.cc:446
-#: ui/kis_layer_manager.cc:584
+#: ui/kis_layer_manager.cc:318 ui/kis_layer_manager.cc:334
+#: ui/kis_layer_manager.cc:378 ui/kis_layer_manager.cc:411
+#: ui/kis_layer_manager.cc:549
 msgid "Could not add layer to image."
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:353 ui/kis_layer_manager.cc:369
-#: ui/kis_layer_manager.cc:413 ui/kis_layer_manager.cc:446
-#: ui/kis_layer_manager.cc:584
+#: ui/kis_layer_manager.cc:318 ui/kis_layer_manager.cc:334
+#: ui/kis_layer_manager.cc:378 ui/kis_layer_manager.cc:411
+#: ui/kis_layer_manager.cc:549
 msgid "Layer Error"
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:476
+#: ui/kis_layer_manager.cc:441
 #, fuzzy
 msgid "New Filter Layer"
@@ -13741,5 +13912,5 @@
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:661 ui/kis_layer_manager.cc:671
+#: ui/kis_layer_manager.cc:626 ui/kis_layer_manager.cc:636
 #, fuzzy
 msgid "Mirror Layer X"
@@ -13747,5 +13918,5 @@
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:688 ui/kis_layer_manager.cc:698
+#: ui/kis_layer_manager.cc:653 ui/kis_layer_manager.cc:663
 #: ui/kis_mask_manager.cc:378
 #, fuzzy
@@ -13754,5 +13925,5 @@
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:720
+#: ui/kis_layer_manager.cc:685
 #, fuzzy
 msgid "Scale Layer"
@@ -13760,5 +13931,5 @@
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:773 ui/kis_layer_manager.cc:776
+#: ui/kis_layer_manager.cc:738 ui/kis_layer_manager.cc:741
 #, fuzzy
 msgid "Shear layer"
@@ -13766,10 +13937,10 @@
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:802
+#: ui/kis_layer_manager.cc:767
 msgid "The image contains hidden layers that will be lost."
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_layer_manager.cc:804
+#: ui/kis_layer_manager.cc:769
 #, fuzzy
 msgid "&Flatten Image"
@@ -13856,5 +14027,5 @@
 
 #. +> trunk stable
-#: ui/kis_node_model.cpp:321
+#: ui/kis_node_model.cpp:322
 #, fuzzy
 msgid "Alpha Locked"
@@ -13877,10 +14048,10 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:90
+#: ui/kis_paintop_box.cc:92
 msgid "Painter's Toolchest"
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:94
+#: ui/kis_paintop_box.cc:96
 #, fuzzy
 msgid "Edit brush settings"
@@ -13893,5 +14064,5 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:99
+#: ui/kis_paintop_box.cc:101
 #, fuzzy
 msgid "Choose brush preset"
@@ -13899,5 +14070,5 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:105
+#: ui/kis_paintop_box.cc:107
 #, fuzzy
 #| msgid "Search"
@@ -13906,5 +14077,5 @@
 
 #. +> trunk
-#: ui/kis_paintop_box.cc:115
+#: ui/kis_paintop_box.cc:117
 #, fuzzy
 #| msgid "Vertical alignment:"
@@ -13913,5 +14084,5 @@
 
 #. +> trunk
-#: ui/kis_paintop_box.cc:124
+#: ui/kis_paintop_box.cc:126
 #, fuzzy
 #| msgid "Search"
@@ -13919,6 +14090,12 @@
 msgstr "&TraÅŸi"
 
-#. +> trunk stable
-#: ui/kis_paintop_box.cc:130
+#. +> trunk
+#: ui/kis_paintop_box.cc:135
+#, fuzzy
+msgid "Flow:"
+msgstr "Slijedi"
+
+#. +> trunk stable
+#: ui/kis_paintop_box.cc:157
 #, fuzzy
 msgid "Mode: "
@@ -13926,5 +14103,5 @@
 
 #. +> trunk stable
-#: ui/kis_paintop_box.cc:142
+#: ui/kis_paintop_box.cc:160
 #, fuzzy
 msgid "Save to Palette"
@@ -13932,5 +14109,5 @@
 
 #. +> trunk
-#: ui/kis_paintop_box.cc:145
+#: ui/kis_paintop_box.cc:163
 #, fuzzy
 msgid "Choose workspace"
@@ -13938,5 +14115,5 @@
 
 #. +> trunk
-#: ui/kis_palette_manager.cpp:61
+#: ui/kis_palette_manager.cpp:62
 #, fuzzy
 msgid "Palette Manager"
@@ -13956,5 +14133,5 @@
 
 #. +> trunk
-#: ui/kis_palette_manager.cpp:77
+#: ui/kis_palette_manager.cpp:80
 #, fuzzy
 msgid "Add to Palette"
@@ -13968,5 +14145,5 @@
 
 #. +> trunk
-#: ui/kis_palette_manager.cpp:83
+#: ui/kis_palette_manager.cpp:86
 #, fuzzy
 msgid "Available Presets"
@@ -13974,5 +14151,5 @@
 
 #. +> trunk
-#: ui/kis_palette_manager.cpp:94
+#: ui/kis_palette_manager.cpp:97
 #, fuzzy
 msgid "Remove Preset"
@@ -13986,5 +14163,5 @@
 
 #. +> trunk
-#: ui/kis_palette_manager.cpp:100
+#: ui/kis_palette_manager.cpp:103
 #, fuzzy
 msgid "Favorite Presets"
@@ -14004,5 +14181,5 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:134
+#: ui/kis_selection_manager.cc:136
 #, fuzzy
 msgid "Paste into &New Image"
@@ -14010,5 +14187,5 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:138
+#: ui/kis_selection_manager.cc:140
 #, fuzzy
 msgid "Paste at cursor"
@@ -14016,5 +14193,5 @@
 
 #. +> trunk
-#: ui/kis_selection_manager.cc:142
+#: ui/kis_selection_manager.cc:144
 #, fuzzy
 msgid "Copy merged"
@@ -14022,5 +14199,5 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:154
+#: ui/kis_selection_manager.cc:156
 #, fuzzy
 msgid "&Reselect"
@@ -14028,5 +14205,5 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:159
+#: ui/kis_selection_manager.cc:161
 #, fuzzy
 msgid "&Invert Selection"
@@ -14034,10 +14211,10 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:164
+#: ui/kis_selection_manager.cc:166
 msgid "Copy Selection to New Layer"
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:169
+#: ui/kis_selection_manager.cc:171
 #, fuzzy
 msgid "Cut Selection to New Layer"
@@ -14045,10 +14222,10 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:174 ui/kis_selection_manager.cc:627
+#: ui/kis_selection_manager.cc:176 ui/kis_selection_manager.cc:575
 msgid "Fill with Foreground Color"
 msgstr "Ispuna sa Bojom Prednjeg plana"
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:179 ui/kis_selection_manager.cc:632
+#: ui/kis_selection_manager.cc:181 ui/kis_selection_manager.cc:580
 #, fuzzy
 msgid "Fill with Background Color"
@@ -14056,5 +14233,5 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:184 ui/kis_selection_manager.cc:637
+#: ui/kis_selection_manager.cc:186 ui/kis_selection_manager.cc:585
 #, fuzzy
 msgid "Fill with Pattern"
@@ -14062,5 +14239,5 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:188
+#: ui/kis_selection_manager.cc:190
 #, fuzzy
 msgid "Display Selection"
@@ -14074,10 +14251,10 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:195
+#: ui/kis_selection_manager.cc:197
 msgid "Smooth..."
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:199
+#: ui/kis_selection_manager.cc:201
 #, fuzzy
 msgid "Size Canvas to Size of Selection"
@@ -14085,5 +14262,5 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:386
+#: ui/kis_selection_manager.cc:365
 #, fuzzy
 msgid "Cut"
@@ -14091,10 +14268,16 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:456
+#: ui/kis_selection_manager.cc:427
 msgid "(pasted)"
 msgstr ""
 
-#. +> trunk stable
-#: ui/kis_selection_manager.cc:518
+#. +> trunk
+#: ui/kis_selection_manager.cc:468
+#, fuzzy
+msgid "Pasted"
+msgstr "Zalijepi"
+
+#. +> trunk stable
+#: ui/kis_selection_manager.cc:492
 #, fuzzy
 msgid "Select All"
@@ -14102,14 +14285,32 @@
 
 #. +> trunk stable
-#: ui/kis_selection_manager.cc:569
-#, fuzzy
-msgid "Clear"
-msgstr "Kist"
-
-#. +> trunk stable
-#: ui/kis_selection_manager.cc:1554
+#: ui/kis_selection_manager.cc:695
 #, fuzzy
 msgid "Resize Image to Size of Selection"
 msgstr "Kreiraj novu sliku od odabranog"
+
+#. +> trunk
+#: ui/kis_selection_manager_p.h:88
+#, fuzzy
+msgid "Erode Selection"
+msgstr "Odabir"
+
+#. +> trunk
+#: ui/kis_selection_manager_p.h:150
+#, fuzzy
+msgid "Dilate Selection"
+msgstr "Odabir datoteka"
+
+#. +> trunk
+#: ui/kis_selection_manager_p.h:763
+#, fuzzy
+msgid "Smooth Selection"
+msgstr "Umetni odabrano"
+
+#. +> trunk
+#: ui/kis_selection_manager_p.h:821
+#, fuzzy
+msgid "Invert Selection"
+msgstr "Odaberi obrnuto"
 
 #. +> trunk stable
@@ -14131,5 +14332,5 @@
 
 #. +> trunk
-#: ui/kis_view2.cpp:260
+#: ui/kis_view2.cpp:264
 #, fuzzy
 msgid "Save Incremental &Version"
@@ -14137,10 +14338,10 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:269
+#: ui/kis_view2.cpp:273
 msgid "Total Refresh"
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:274
+#: ui/kis_view2.cpp:278
 #, fuzzy
 msgid "&Create Template From Image..."
@@ -14148,5 +14349,5 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:278
+#: ui/kis_view2.cpp:282
 #, fuzzy
 msgid "Load Tutorial"
@@ -14154,5 +14355,5 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:282
+#: ui/kis_view2.cpp:286
 #, fuzzy
 msgid "Mirror Image"
@@ -14166,5 +14367,5 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:288
+#: ui/kis_view2.cpp:292
 #, fuzzy
 msgid "Rotate Canvas Right"
@@ -14172,5 +14373,5 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:293
+#: ui/kis_view2.cpp:297
 #, fuzzy
 msgid "Rotate Canvas Left"
@@ -14178,5 +14379,5 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:298
+#: ui/kis_view2.cpp:302
 #, fuzzy
 msgid "Reset Canvas Transformations"
@@ -14184,5 +14385,5 @@
 
 #. +> trunk
-#: ui/kis_view2.cpp:303
+#: ui/kis_view2.cpp:307
 #, fuzzy
 msgid "Show Status Bar"
@@ -14190,5 +14391,5 @@
 
 #. +> trunk
-#: ui/kis_view2.cpp:304
+#: ui/kis_view2.cpp:308
 #, fuzzy
 #| msgid "Show &status bar"
@@ -14197,5 +14398,5 @@
 
 #. +> trunk
-#: ui/kis_view2.cpp:306
+#: ui/kis_view2.cpp:310
 #, fuzzy
 #| msgid "Show &status bar"
@@ -14204,5 +14405,5 @@
 
 #. +> trunk
-#: ui/kis_view2.cpp:310
+#: ui/kis_view2.cpp:314
 #, fuzzy
 msgid "Show Canvas Only"
@@ -14210,5 +14411,5 @@
 
 #. +> trunk
-#: ui/kis_view2.cpp:311
+#: ui/kis_view2.cpp:315
 #, fuzzy
 msgid "Return to Window"
@@ -14216,11 +14417,17 @@
 
 #. +> trunk
-#: ui/kis_view2.cpp:312
+#: ui/kis_view2.cpp:316
 #, fuzzy
 msgid "Shows just the canvas or the whole window"
 msgstr "PokaÅŸi ili sakrij traku izbornika u prozoru terminala"
 
-#. +> trunk stable
-#: ui/kis_view2.cpp:441
+#. +> trunk
+#: ui/kis_view2.cpp:434
+#, fuzzy
+msgid "Pasted Layer"
+msgstr "/Hrpa/Podigni Sloj"
+
+#. +> trunk stable
+#: ui/kis_view2.cpp:480
 #, fuzzy
 msgid "Insert as New Layer"
@@ -14228,5 +14435,5 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:442
+#: ui/kis_view2.cpp:481
 #, fuzzy
 msgid "Insert as New Layers"
@@ -14234,15 +14441,15 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:444
+#: ui/kis_view2.cpp:483
 msgid "Open in New Document"
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:445
+#: ui/kis_view2.cpp:484
 msgid "Open in New Documents"
 msgstr ""
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:655
+#: ui/kis_view2.cpp:694
 #, fuzzy
 msgid "Edit Palette..."
@@ -14250,5 +14457,5 @@
 
 #. +> trunk stable
-#: ui/kis_view2.cpp:770 ui/kis_view2.cpp:773
+#: ui/kis_view2.cpp:809 ui/kis_view2.cpp:812
 #, fuzzy
 msgid "Edit Palette"
@@ -14286,5 +14493,5 @@
 
 #. +> trunk stable
-#: ui/tool/kis_tool.cc:113
+#: ui/tool/kis_tool.cc:115
 #, fuzzy
 msgid "Swap Foreground and Background Color"
@@ -14292,5 +14499,5 @@
 
 #. +> trunk stable
-#: ui/tool/kis_tool.cc:118
+#: ui/tool/kis_tool.cc:120
 #, fuzzy
 msgid "Reset Foreground and Background Color"
@@ -14298,5 +14505,11 @@
 
 #. +> trunk stable
-#: ui/tool/kis_tool.cc:585
+#: ui/tool/kis_tool.cc:569
+#, fuzzy
+msgid "Clear"
+msgstr "Kist"
+
+#. +> trunk stable
+#: ui/tool/kis_tool.cc:614
 #, fuzzy
 msgid "No options"
@@ -14330,5 +14543,5 @@
 
 #. +> trunk stable
-#: ui/widgets/kis_gradient_chooser.cc:74
+#: ui/widgets/kis_gradient_chooser.cc:75
 #, fuzzy
 msgid "Custom Gradient..."
@@ -14369,5 +14582,5 @@
 
 #. +> trunk stable
-#: ui/widgets/kis_paintop_presets_chooser_popup.cpp:47
+#: ui/widgets/kis_paintop_presets_chooser_popup.cpp:49
 #, fuzzy
 msgid "Thumbnails"
@@ -14375,5 +14588,5 @@
 
 #. +> trunk stable
-#: ui/widgets/kis_paintop_presets_chooser_popup.cpp:52
+#: ui/widgets/kis_paintop_presets_chooser_popup.cpp:54
 #, fuzzy
 msgid "Details"
@@ -15221,8 +15434,4 @@
 
 #, fuzzy
-#~ msgid "&Preview"
-#~ msgstr "&Pregled"
-
-#, fuzzy
 #~ msgid "&Native"
 #~ msgstr "Ime:"
