Merge remote-tracking branch 'origin/master' into kazakov/audio-track-support

# Conflicts: # plugins/dockers/animation/timeline_frames_model.h # plugins/dockers/animation/timeline_frames_view.cpp

Merge remote-tracking branch 'origin/master' into kazakov/audio-track-support
# Conflicts: # plugins/dockers/animation/timeline_frames_model.h # plugins/dockers/animation/timeline_frames_view.cpp
71d1a45c · Dmitry Kazakov · 6419771e · 9e661852 · 71d1a45c · 71d1a45c
Commit 71d1a45c authored Dec 26, 2016 by Dmitry Kazakov
247 changed files
--- a/3rdparty/ext_frameworks/CMakeLists.txt
+++ b/3rdparty/ext_frameworks/CMakeLists.txt
@@ -18,7 +18,7 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
 ExternalProject_Add(
    ext_extra_cmake_modules
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/extra-cmake-modules-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/extra-cmake-modules-5.24.0.zip
    URL_MD5 e0c19ba97ebd964f9bdc9110c64ce96a
    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff
    INSTALL_DIR ${EXTPREFIX_frameworks}
@@ -35,7 +35,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_karchive
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/karchive-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/karchive-5.24.0.zip
    URL_MD5 739843accfe9bd85ab2f1582722cf01e
    INSTALL_DIR ${EXTPREFIX_frameworks}
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
@@ -52,7 +52,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kconfig
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kconfig-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kconfig-5.24.0.zip
    URL_MD5 f87ecff795eb76e4ec6561758a5baf87
    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
    INSTALL_DIR ${EXTPREFIX_frameworks}
@@ -70,7 +70,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kwidgetsaddons
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kwidgetsaddons-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kwidgetsaddons-5.24.0.zip
    URL_MD5 0e399b427814a4814c65a3cf407f9d79
    INSTALL_DIR ${EXTPREFIX_frameworks}
    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
@@ -88,7 +88,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kcompletion
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kcompletion-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kcompletion-5.24.0.zip
    URL_MD5 e8764251ab45005aa81dba242852300c
    INSTALL_DIR ${EXTPREFIX_frameworks}
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
@@ -105,7 +105,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kcoreaddons
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kcoreaddons-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kcoreaddons-5.24.0.zip
    URL_MD5 2885878625b19ad0300ef3770b897112
    INSTALL_DIR ${EXTPREFIX_frameworks}
    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
@@ -123,7 +123,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kguiaddons
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kguiaddons-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kguiaddons-5.24.0.zip
    URL_MD5 9bdadbc57d0634816ef80ee9798c3d6c
    INSTALL_DIR ${EXTPREFIX_frameworks}
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
@@ -159,7 +159,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kitemmodels
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kitemmodels-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kitemmodels-5.24.0.zip
    URL_MD5 ff41589f48395fc01d5fc7887593779d
    INSTALL_DIR ${EXTPREFIX_frameworks}
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
@@ -175,7 +175,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kitemviews
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kitemviews-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kitemviews-5.24.0.zip
    URL_MD5 33f638d027a3011a6a69f7484eee3287
    INSTALL_DIR ${EXTPREFIX_frameworks}
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
@@ -191,7 +191,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kimageformats
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kimageformats-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kimageformats-5.24.0.zip
    URL_MD5 c1964516bcb2bfe882858f0c0913deb5
    INSTALL_DIR ${EXTPREFIX_frameworks}
    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
@@ -208,7 +208,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kwindowsystem
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kwindowsystem-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kwindowsystem-5.24.0.zip
    URL_MD5 5915e4f63ded983af6db7db3a6cbae1a
    INSTALL_DIR ${EXTPREFIX_frameworks}
    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
@@ -225,7 +225,7 @@ ExternalProject_Add(
 ExternalProject_Add(
    ext_kcrash
    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.kde.org/stable/frameworks/5.24/kcrash-5.24.0.zip
+    URL http://download.kde.org/stable/attic/frameworks/5.24/kcrash-5.24.0.zip
    URL_MD5 a2e41e6650105fc3ac8fbd44afbae4fe
    INSTALL_DIR ${EXTPREFIX_frameworks}
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}

--- a/Messages.sh
+++ b/Messages.sh
 #! /bin/sh
-source krita_xgettext.sh
+source kundo2_aware_xgettext.sh

 $EXTRACTRC `find . -name \*.ui | grep -v '/tests/'` >> rc.cpp
 RCFILES=`find . -name \*.xmlgui                                               \
@@ -19,7 +19,7 @@ perl extracti18n.pl > i18ndata
 # Ignore sdk/templates which contains templates for writing future plugins.
 # Also ignore crashreporter, it has it's own catalog
 # None of the placeholder strings inside will be seen by users.
-krita_xgettext krita.pot i18ndata rc.cpp \
+kundo2_aware_xgettext krita.pot i18ndata rc.cpp \
                  `find . -name \*.cc -o -name \*.h  -o -name \*.cpp | \
                  grep -v '/tests/' | grep -v './sdk/templates' | grep -v './krita/crashreporter/'`


--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@
 Krita is a free and open source digital painting application. It is for artists who want to create professional work from start to end. Krita is used by comic book artists, illustrators, concept artists, matte and texture painters and in the digital VFX industry.

 If you are reading this on Github, be aware that this is just a mirror. Our real
-code repository is provided by KDE:  https://phabricator.kde.org/diffusion/KRITA/
+code repository is provided by KDE: https://phabricator.kde.org/source/krita/ 

-This repository contains the current, Qt5-based, development version of Krita 3. Krita 3.0 has been released and development on Krita 2.9 has stopped.  Krita 2.9 was part of Calligra: https://phabricator.kde.org/diffusion/CALLIGRA/
+This repository contains the current, Qt5-based, development version of Krita 3. Krita 3.0 has been released and development on Krita 2.9 has stopped.  Krita 2.9 was part of Calligra: https://phabricator.kde.org/source/krita/

 ![Picture] (https://krita.org/wp-content/uploads/2016/04/krita-30-screenshot.jpg)


--- a/krita/data/aboutdata/backers.txt
+++ b/krita/data/aboutdata/backers.txt
@@ -443,6 +443,7 @@ sam@cmpct
 Sami Kyöstilä
 Samuel Stoney
 Sarah Laufer
+Shawn Rutledge
 Scott Petrovic
 Scott Wilson
 Scotty

--- a/krita/data/actions/ConnectionTool.action
+++ b/krita/data/actions/ConnectionTool.action
+<!-- Disabled, since Connection Tool is disabled in Krita
+
 <?xml version="1.0" encoding="UTF-8"?>
 <ActionCollection version="2" name="Tools">
  <Actions category="connection-tool">
@@ -154,3 +156,5 @@
    </Action>
  </Actions>
 </ActionCollection>
+
+commented out! -->
--- a/krita/data/profiles/elles-icc-profiles/CMakeLists.txt
+++ b/krita/data/profiles/elles-icc-profiles/CMakeLists.txt
 ########### install files ###############
 install(FILES
-    ACES-elle-V2-g10.icc
-    ACES-elle-V4-g10.icc
-    ACES-elle-V2-g22.icc
-    ACES-elle-V4-g22.icc
-    ACES-elle-V2-labl.icc
-    ACES-elle-V4-labl.icc
-    ACES-elle-V2-srgbtrc.icc
-    ACES-elle-V4-srgbtrc.icc
-    ACEScg-elle-V2-g10.icc
    ACEScg-elle-V4-g10.icc
-    ACEScg-elle-V2-labl.icc
-    ACEScg-elle-V4-labl.icc
-    ACEScg-elle-V2-srgbtrc.icc
-    ACEScg-elle-V4-srgbtrc.icc
-    AllColorsRGB-elle-V2-g10.icc
-    AllColorsRGB-elle-V4-g10.icc
-    AllColorsRGB-elle-V2-labl.icc
-    AllColorsRGB-elle-V4-labl.icc
-    AllColorsRGB-elle-V2-srgbtrc.icc
-    AllColorsRGB-elle-V4-srgbtrc.icc
-    CIERGB-elle-V2-g10.icc
-    CIERGB-elle-V2-g22.icc
-    CIERGB-elle-V2-srgbtrc.icc
-    CIERGB-elle-V4-g10.icc
-    CIERGB-elle-V4-g22.icc
-    CIERGB-elle-V4-srgbtrc.icc
-    CIERGB-elle-V2-labl.icc
-    CIERGB-elle-V4-labl.icc
-    ClayRGB-elle-V2-g10.icc
-    ClayRGB-elle-V2-g22.icc
-    ClayRGB-elle-V2-srgbtrc.icc
-    ClayRGB-elle-V4-g10.icc
-    ClayRGB-elle-V4-g22.icc
    ClayRGB-elle-V4-srgbtrc.icc
-    ClayRGB-elle-V2-labl.icc;
-    ClayRGB-elle-V4-labl.icc
-    CMakeLists.txt
+
    Gray-D50-elle-V2-g10.icc
    Gray-D50-elle-V2-g18.icc
    Gray-D50-elle-V2-g22.icc
@@ -49,48 +15,13 @@ install(FILES
    Gray-D50-elle-V4-labl.icc
    Gray-D50-elle-V2-rec709.icc
    Gray-D50-elle-V4-rec709.icc
-    IdentityRGB-elle-V2-g10.icc
-    IdentityRGB-elle-V2-srgbtrc.icc
-    IdentityRGB-elle-V4-g10.icc
-    IdentityRGB-elle-V4-srgbtrc.icc
-    IdentityRGB-elle-V2-labl.icc
-    IdentityRGB-elle-V4-labl.icc
+
    Lab-D50-Identity-elle-V2.icc
    Lab-D50-Identity-elle-V4.icc
-    LargeRGB-elle-V2-g10.icc
-    LargeRGB-elle-V2-g18.icc
-    LargeRGB-elle-V2-srgbtrc.icc
-    LargeRGB-elle-V4-g10.icc
-    LargeRGB-elle-V4-g18.icc
-    LargeRGB-elle-V4-srgbtrc.icc
-    LargeRGB-elle-V2-labl.icc
-    LargeRGB-elle-V4-labl.icc
-    Rec2020-elle-V2-rec709.icc
-    Rec2020-elle-V4-rec709.icc
-    Rec2020-elle-V2-g10.icc
-    Rec2020-elle-V4-g10.icc
-    Rec2020-elle-V2-labl.icc
-    Rec2020-elle-V4-labl.icc
-    Rec2020-elle-V2-srgbtrc.icc
-    Rec2020-elle-V4-srgbtrc.icc
+
    sRGB-elle-V2-g10.icc
    sRGB-elle-V2-srgbtrc.icc
-    sRGB-elle-V4-g10.icc
-    sRGB-elle-V4-srgbtrc.icc
-    sRGB-elle-V2-labl.icc
-    sRGB-elle-V4-labl.icc
-    #sRGB-elle-V2-rec709.icc
-    #sRGB-elle-V4-rec709.icc
-    WideRGB-elle-V2-g10.icc
-    WideRGB-elle-V2-g22.icc
-    WideRGB-elle-V2-srgbtrc.icc
-    WideRGB-elle-V4-g10.icc
-    WideRGB-elle-V4-g22.icc
-    WideRGB-elle-V4-srgbtrc.icc
-    WideRGB-elle-V2-srgbtrc.icc
-    WideRGB-elle-V4-srgbtrc.icc
-    WideRGB-elle-V2-labl.icc
-    WideRGB-elle-V4-labl.icc
+
    Lab-D50-Identity-elle-V2.icc
    Lab-D50-Identity-elle-V4.icc
    XYZ-D50-Identity-elle-V4.icc

--- a/krita/data/templates/animation/Anim-Jp-EN.kra
+++ b/krita/data/templates/animation/Anim-Jp-EN.kra
--- a/krita/data/templates/comics/.directory
+++ b/krita/data/templates/comics/.directory
 [Desktop Entry]
 Name=Comic Templates
-Name[ast]=Plantíes de comics
 Name[bs]=Predlošci stripova
 Name[ca]=Plantilles per a còmics
 Name[ca@valencia]=Plantilles per a còmics

--- a/krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop
+++ b/krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop
 [Desktop Entry]
 Icon=template_dslr
 Name=Nikon_D5000_4288x2848
+Name[ast]=Nikon_D5000_4288x2848
 Name[bs]=Nikon_D5000_4288x2848
 Name[ca]=Nikon_D5000_4288x2848
 Name[ca@valencia]=Nikon_D5000_4288x2848

--- a/krita/krita.action
+++ b/krita/krita.action
@@ -50,18 +50,6 @@
      <isCheckable>false</isCheckable>
      <statusTip></statusTip>
    </Action>
-    <Action name="import_resources">
-      <icon></icon>
-      <text>Import Resources or Bundles...</text>
-      <whatsThis></whatsThis>
-      <toolTip>Import Resources or Bundles</toolTip>
-      <iconText>Import Resources or Bundles</iconText>
-      <activationFlags>0</activationFlags>
-      <activationConditions>0</activationConditions>
-      <shortcut></shortcut>
-      <isCheckable>false</isCheckable>
-      <statusTip></statusTip>
-    </Action>
    <Action name="create_bundle">
      <icon></icon>
      <text>Create Resource Bundle...</text>
@@ -189,6 +177,18 @@
      <isCheckable>false</isCheckable>
      <statusTip></statusTip>
    </Action>
+    <Action name="update_composition">
+      <icon></icon>
+      <text>Update Composition</text>
+      <whatsThis></whatsThis>
+      <toolTip>Update Composition</toolTip>
+      <iconText>Update Composition</iconText>
+      <activationFlags>0</activationFlags>
+      <activationConditions>0</activationConditions>
+      <shortcut></shortcut>
+      <isCheckable>false</isCheckable>
+      <statusTip></statusTip>
+    </Action>
  </Actions>

  <Actions category="Painting">
@@ -500,26 +500,6 @@
      <isCheckable>true</isCheckable>
      <statusTip></statusTip>
    </Action>
-    <Action name="zoom_in">
-      <icon>zoom-in</icon>
-      <text>Zoom &amp;In</text>
-      <whatsThis></whatsThis>
-      <toolTip>Zoom In</toolTip>
-      <iconText>Zoom In</iconText>
-      <shortcut>Ctrl++; Ctrl+=</shortcut>
-      <isCheckable>false</isCheckable>
-      <statusTip></statusTip>
-    </Action>
-    <Action name="zoom_out">
-      <icon>zoom-out</icon>
-      <text>Zoom &amp;Out</text>
-      <whatsThis></whatsThis>
-      <toolTip>Zoom Out</toolTip>
-      <iconText>Zoom Out</iconText>
-      <shortcut>Ctrl+-</shortcut>
-      <isCheckable>false</isCheckable>
-      <statusTip></statusTip>
-    </Action>
    <Action name="reset_fg_bg">
      <icon></icon>
      <text>Reset Foreground and Background Color</text>
@@ -1002,10 +982,10 @@
    </Action>
    <Action name="krita_filter_phongbumpmap">
      <icon></icon>
-      <text>&amp;PhongBumpmap...</text>
+      <text>&amp;Phong Bumpmap...</text>
      <whatsThis></whatsThis>
-      <toolTip>PhongBumpmap</toolTip>
-      <iconText>PhongBumpmap</iconText>
+      <toolTip>Phong Bumpmap</toolTip>
+      <iconText>Phong Bumpmap</iconText>
      <activationFlags>10000</activationFlags>
      <activationConditions>0</activationConditions>
      <shortcut></shortcut>
@@ -1602,20 +1582,12 @@
      <isCheckable>false</isCheckable>
      <statusTip></statusTip>
    </Action>
-    <Action name="KisToolSelectBrush">
-      <icon></icon>
-      <text>Brush Selection Tool</text>
-      <whatsThis></whatsThis>
-      <toolTip>Brush Selection Tool</toolTip>
-      <iconText>Brush Selection Tool</iconText>
-      <shortcut></shortcut>
-      <isCheckable>false</isCheckable>
-      <statusTip></statusTip>
-    </Action>
  </Actions>

  <Actions category="Blending Modes">
    <text>Blending Modes</text>
+
+<!-- commented out in the code right now
    <Action name="Next Blending Mode">
      <icon></icon>
      <text>Next Blending Mode</text>
@@ -1636,6 +1608,7 @@
      <isCheckable>false</isCheckable>
      <statusTip></statusTip>
    </Action>
+-->
    <Action name="Select Normal Blending Mode">
      <icon></icon>
      <text>Select Normal Blending Mode</text>
@@ -2123,6 +2096,18 @@
      <isCheckable>false</isCheckable>
      <statusTip></statusTip>
    </Action>
+    <Action name="switchToPreviouslyActiveNode">
+      <icon></icon>
+      <text>Activate previously selected layer</text>
+      <whatsThis></whatsThis>
+      <toolTip>Activate previously selected layer</toolTip>
+      <iconText>Activate previously selected layer</iconText>
+      <activationFlags>1000</activationFlags>
+      <activationConditions>0</activationConditions>
+      <shortcut>;</shortcut>
+      <isCheckable>false</isCheckable>
+      <statusTip></statusTip>
+    </Action>
    <Action name="add_new_group_layer">
      <icon>groupLayer</icon>
      <text>&amp;Group Layer</text>
@@ -2369,7 +2354,7 @@
      <whatsThis></whatsThis>
      <toolTip>Create a group layer containing selected layers</toolTip>
      <iconText>Quick Group</iconText>
-      <activationFlags>0</activationFlags>
+      <activationFlags>100000</activationFlags>
      <activationConditions>0</activationConditions>
      <shortcut>Ctrl+G</shortcut>
      <isCheckable>false</isCheckable>
@@ -2381,7 +2366,7 @@
      <whatsThis></whatsThis>
      <toolTip>Remove grouping of the layers or remove one layer out of the group</toolTip>
      <iconText>Quick Ungroup</iconText>
-      <activationFlags>0</activationFlags>
+      <activationFlags>100000</activationFlags>
      <activationConditions>0</activationConditions>
      <shortcut>Ctrl+Alt+G</shortcut>
      <isCheckable>false</isCheckable>
@@ -2393,7 +2378,7 @@
      <whatsThis></whatsThis>
      <toolTip>Group selected layers and add a layer with clipped alpha channel</toolTip>
      <iconText>Quick Clipping Group</iconText>
-      <activationFlags>0</activationFlags>
+      <activationFlags>100000</activationFlags>
      <activationConditions>0</activationConditions>
      <shortcut>Ctrl+Shift+G</shortcut>
      <isCheckable>false</isCheckable>
@@ -2867,16 +2852,6 @@
      <isCheckable>false</isCheckable>
      <statusTip></statusTip>
    </Action>
-    <Action name="merge_selected_layers">
-      <icon></icon>
-      <text>&amp;Merge Selected Layers</text>
-      <whatsThis></whatsThis>
-      <toolTip>Merge Selected Layers</toolTip>
-      <iconText>Merge Selected Layers</iconText>
-      <shortcut>Ctrl+Alt+E</shortcut>
-      <isCheckable>false</isCheckable>
-      <statusTip></statusTip>
-    </Action>
    <Action name="layer_style">
      <icon></icon>
      <text>La&amp;yer Style...</text>

--- a/krita/krita.xmlgui
+++ b/krita/krita.xmlgui
@@ -2,7 +2,7 @@
 <kpartgui xmlns="http://www.kde.org/standards/kxmlgui/1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 name="Krita"
-version="98"
+version="103"
 xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0  http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
  <MenuBar>
    <Menu name="file">

--- a/krita/kritamenu.action
+++ b/krita/kritamenu.action
@@ -62,6 +62,7 @@
      <isCheckable>false</isCheckable>
      <statusTip></statusTip>
    </Action>
+<!-- commented out in the code right now
    <Action name="file_reload_file">
      <icon></icon>
      <text>Reload</text>
@@ -74,6 +75,7 @@
      <isCheckable>false</isCheckable>
      <statusTip></statusTip>
    </Action>
+-->
    <Action name="file_import_file">
      <icon>document-import</icon>
      <text>Open ex&amp;isting Document as Untitled Document...</text>
@@ -283,7 +285,7 @@
      <statusTip></statusTip>
    </Action>
    <Action name="edit_redo">
-      <icon>_edit-redo</icon>
+      <icon>edit-redo</icon>
      <text>Redo</text>
      <whatsThis></whatsThis>
      <toolTip>Redo last undone action</toolTip>
@@ -440,7 +442,7 @@
    </Action>
    <Action name="stroke_selection">
      <icon></icon>
-      <text>Stroke selec&amp;tion</text>
+      <text>Stroke Selec&amp;tion...</text>
      <whatsThis></whatsThis>
      <toolTip>Stroke selection</toolTip>
      <iconText>Stroke selection</iconText>
@@ -525,7 +527,7 @@
      <activationFlags>0</activationFlags>
      <activationConditions>0</activationConditions>
      <shortcut>Ctrl+Shift+F</shortcut>
-      <isCheckable>false</isCheckable>
+      <isCheckable>true</isCheckable>
      <statusTip></statusTip>
    </Action>
    <Action name="wrap_around_mode">

--- a/krita/org.kde.krita.appdata.xml
+++ b/krita/org.kde.krita.appdata.xml
@@ -3,7 +3,6 @@
  <id>org.kde.krita.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <summary>Digital Painting, Creative Freedom</summary>
-  <summary xml:lang="ast">Pintura dixital, llibertá creativa</summary>
  <summary xml:lang="bs">Digitalno crtanje, kreativna sloboda</summary>
  <summary xml:lang="ca">Dibuix digital, Llibertat creativa</summary>
  <summary xml:lang="ca-valencia">Dibuix digital, Llibertat creativa</summary>
@@ -30,7 +29,6 @@
  <summary xml:lang="zh-CN">数码绘图，自由创作</summary>
  <description>
    <p>Krita is the full-featured digital art studio.</p>
-    <p xml:lang="ast">Krita ye l'estudiu dixital d'arte completu.</p>
    <p xml:lang="bs">Krita je potpuni digitalni umjetnički studio.</p>
    <p xml:lang="ca">Krita és l'estudi d'art digital ple de funcionalitats.</p>
    <p xml:lang="ca-valencia">Krita és l'estudi d'art digital ple de funcionalitats.</p>

--- a/krita/pics/misc-dark/dark_pivot-point.svg
+++ b/krita/pics/misc-dark/dark_pivot-point.svg
+<?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://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"
+   version="1.1"
+   width="22"
+   height="22"
+   id="svg6190"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="dark_pivot-point.svg"
+   inkscape:export-filename="../dark_lazyframeOn.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"