Git commit 94880317a647fbc33675c3170c7ac4adf62aac2b by Friedrich W. H. Koss=
ebau.
Committed on 18/07/2016 at 15:34.
Pushed by kossebau into branch 'master'.

Fix name of calligra_shape_formular to calligra_shape_formula

CCMAIL:kde-i18n-doc@kde.org

M  +5    -5    plugins/formulashape/CMakeLists.txt
M  +1    -1    plugins/formulashape/Messages.sh
R  +1    -1    plugins/formulashape/calligra_shape_formula.desktop [from: p=
lugins/formulashape/calligra_shape_formular.desktop - 097% similarity]

http://commits.kde.org/calligra/94880317a647fbc33675c3170c7ac4adf62aac2b

diff --git a/plugins/formulashape/CMakeLists.txt b/plugins/formulashape/CMa=
keLists.txt
index 24c2b17..0721a59 100644
--- a/plugins/formulashape/CMakeLists.txt
+++ b/plugins/formulashape/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DTRANSLATION_DOMAIN=3D\"calligra_shape_formular\")
+add_definitions(-DTRANSLATION_DOMAIN=3D\"calligra_shape_formula\")
 =

 # To hide all the warnings from the generated itex2MML code
 if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC)
@@ -114,14 +114,14 @@ ki18n_wrap_ui( formulashape_PART_SRCS
     FormulaToolWidget.ui
 )
 =

-add_library(calligra_shape_formular MODULE ${formulashape_PART_SRCS})
-kcoreaddons_desktop_to_json(calligra_shape_formular calligra_shape_formula=
r.desktop)
+add_library(calligra_shape_formula MODULE ${formulashape_PART_SRCS})
+kcoreaddons_desktop_to_json(calligra_shape_formula calligra_shape_formula.=
desktop)
 =

-target_link_libraries(calligra_shape_formular koformula ${M2MML_TOOL_LIBRA=
RIES})
+target_link_libraries(calligra_shape_formula koformula ${M2MML_TOOL_LIBRAR=
IES})
 =

 =

 #set_target_properties(koformula PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB=
_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
-install(TARGETS calligra_shape_formular  DESTINATION ${PLUGIN_INSTALL_DIR}=
/calligra/shapes)
+install(TARGETS calligra_shape_formula  DESTINATION ${PLUGIN_INSTALL_DIR}/=
calligra/shapes)
 =

 add_subdirectory( pics ) =

 add_subdirectory( fonts ) =

diff --git a/plugins/formulashape/Messages.sh b/plugins/formulashape/Messag=
es.sh
index 38640e4..f3102cc 100755
--- a/plugins/formulashape/Messages.sh
+++ b/plugins/formulashape/Messages.sh
@@ -2,5 +2,5 @@
 source ../../calligra_xgettext.sh
 =

 $EXTRACTRC *.ui >> rc.cpp
-calligra_xgettext calligra_shape_formular.pot *.cpp *.h elements/*.cpp ele=
ments/*.h
+calligra_xgettext calligra_shape_formula.pot *.cpp *.h elements/*.cpp elem=
ents/*.h
 rm -f rc.cpp
diff --git a/plugins/formulashape/calligra_shape_formular.desktop b/plugins=
/formulashape/calligra_shape_formula.desktop
similarity index 97%
rename from plugins/formulashape/calligra_shape_formular.desktop
rename to plugins/formulashape/calligra_shape_formula.desktop
index 4502524..56841c1 100644
--- a/plugins/formulashape/calligra_shape_formular.desktop
+++ b/plugins/formulashape/calligra_shape_formula.desktop
@@ -46,6 +46,6 @@ Name[zh_TW]=3D=E5=85=AC=E5=BC=8F=E5=85=83=E4=BB=B6
 X-KDE-ServiceTypes=3DCalligra/Flake
 Type=3DService
 X-KDE-PluginInfo-Name=3Dformulashape
-X-KDE-Library=3Dcalligra_shape_formular
+X-KDE-Library=3Dcalligra_shape_formula
 X-Flake-MinVersion=3D28
 X-Flake-PluginVersion=3D28