Git commit e2f272dbe80aae8a12f4f86ca7d9fd5d2cd67503 by Dag Andersen. Committed on 17/04/2023 at 12:04. Pushed by danders into branch 'master'.
Fix typos found in misc. directories On behalf of: Author: luz paz <luz...@users.noreply.github.com> Date: Sat Dec 4 17:44:43 2021 -0500 Fix typos found in misc. directories Found via `codespell -q 3 -S *.svg,*.desktop,*.xpm,./plugins/textediting/autocorrection,./plugins/textediting/thesaurus -L ba,blok,childs,currenty,fo,libray,pard,parm,parms,readed,ser,som,uptodate,vektor,vertexes` M +4 -4 CMakeLists.txt M +1 -1 OBSOLETE.TXT M +4 -4 README.PACKAGERS M +1 -1 braindump/plugins/stateshape/StateShape.h M +1 -1 braindump/plugins/webshape/WebShape.h M +1 -1 braindump/src/MainWindow.cpp M +1 -1 cmake/modules/CalligraProductSetMacros.cmake M +1 -1 cmake/modules/MacroBoolTo01.cmake M +1 -1 cmake/productsets/README M +1 -1 components/ViewController.h M +1 -1 devtools/cstester/scripts/checkdocs.sh M +3 -3 devtools/scripts/OpenDocument-schema-v1.0-os.rng M +1 -1 devtools/scripts/massTester.pl M +1 -1 devtools/slidecompare/CMakeLists.txt M +3 -3 doc/api/gendocs.pl M +1 -1 doc/sheets/commands.docbook M +2 -2 doc/stage/great-presentations.docbook M +2 -2 doc/stage/menus.docbook M +1 -1 filters/karbon/xaml/xamlexport.cc M +1 -1 filters/sheets/gnumeric/gnumericimport.cc M +1 -1 gemini/cloud/dropbox/3rdparty/networkcontroller.cc M +1 -1 gemini/qml/components/PageStack.qml M +1 -1 gemini/qml/welcomepages/cloud/git/RepositoryContent.qml M +1 -1 interfaces/KoGenericRegistry.h M +4 -4 karbon/CHANGES M +1 -1 karbon/plugins/roundcorners/RoundCornersCommand.cpp M +1 -1 karbon/ui/KarbonView.cpp M +1 -1 karbon/ui/KarbonView.h M +1 -1 libs/widgets/KoResourceServer.h M +1 -1 sheets/ui/actions/dialogs/FormulaDialog.cpp M +2 -2 windows/calligra_installer/README.txt M +1 -1 windows/calligra_installer/en-us.wxl https://invent.kde.org/office/calligra/commit/e2f272dbe80aae8a12f4f86ca7d9fd5d2cd67503 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cb06fecdd8..c3a438f0efc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ endif() # ensure out-of-source build string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" isBuildInSource) if(isBuildInSource) - message(FATAL_ERROR "Compiling Calligra inside the source folder is not possible.\nPlease refer to the build instruction: https://community.kde.org/Calligra/Building/3\nYou need to clean up the source folder from all build artifacts just created, otherwise further building attempts will fail again: With a git repo, you can use \"git clean -df\" in the toplevel source folder (attention! will remove also uncommited changes to the source code). With sources from a file bundle (like a zip file), delete the source folder and unbundle the sources again.") + message(FATAL_ERROR "Compiling Calligra inside the source folder is not possible.\nPlease refer to the build instruction: https://community.kde.org/Calligra/Building/3\nYou need to clean up the source folder from all build artifacts just created, otherwise further building attempts will fail again: With a git repo, you can use \"git clean -df\" in the toplevel source folder (attention! will remove also uncommitted changes to the source code). With sources from a file bundle (like a zip file), delete the source folder and unbundle the sources again.") endif() ###################### @@ -459,7 +459,7 @@ endif() ## ## Test for marble ## -# Temporary fix to avoid looking for Marble unneccessary +# Temporary fix to avoid looking for Marble unnecessarily # Its only used in RDF so until soprano is ported there is no use for Marble if (Soprano_FOUND) macro_optional_find_package(Marble CONFIG) @@ -594,7 +594,7 @@ endif() ## -## Test endianess +## Test endianness ## include (TestBigEndian) test_big_endian(CMAKE_WORDS_BIGENDIAN) @@ -1016,7 +1016,7 @@ calligra_drop_products_on_old_flag(words PART_WORDS APP_WORDS) #### Temporarily broken products #### ############################################# -# If a product does not build due to some temporary brokeness disable it here, +# If a product does not build due to some temporary brokenness disable it here, # by calling calligra_disable_product with the product id and the reason, # e.g.: # calligra_disable_product(APP_FOO "isn't buildable at the moment") diff --git a/OBSOLETE.TXT b/OBSOLETE.TXT index eb096dbc156..b4ccaaf7011 100644 --- a/OBSOLETE.TXT +++ b/OBSOLETE.TXT @@ -103,7 +103,7 @@ Filters: parts of KDE. googledocs -- worked for a while, but then bitrotted when the switch from KPart to KoPart was done, as this plugin was based on KPart::Plugin architecture, and - noone cared for more than a year [D] + no one cared for more than a year [D] Tools: diff --git a/README.PACKAGERS b/README.PACKAGERS index 633e028d7a4..38f57d837f6 100644 --- a/README.PACKAGERS +++ b/README.PACKAGERS @@ -70,7 +70,7 @@ be packaged separately. If Calligra is build with support for RDF enabled, it is STRONGLY RECOMMENDED to separate the semantic item plugins coming from "plugins/semanticitems" into their own package. That package should not be an automatic dependency on any -other Calligra package, but only installed explicitely by the user. Reason are +other Calligra package, but only installed explicitly by the user. Reason are the external dependencies with these plugins, especially kdepimlibs. So if e.g. a user just installs the Braindump package, this should not pull in all @@ -104,9 +104,9 @@ kowidgets 4. IMPORTANT On using CPU vector capabilities in Calligra Libs ======================================================================== -IN BRIEF: 1) Intall Vc library [1] and don't forget to activate +IN BRIEF: 1) Install Vc library [1] and don't forget to activate PACKAGERS_BUILD=ON option when building a package. - 2) Vc libary should be present on the building system only, + 2) Vc library should be present on the building system only, it need not be installed on all the client systems. Pigment can make use of the vector capabilities of the @@ -189,7 +189,7 @@ runtime dependency on the respective filters. 6. Adding unmaintained applications/modules =========================================== -A few applications and modules do not have maintainers. So there is noone +A few applications and modules do not have maintainers. So there is no one to handle bugs experienced by users or discuss new features/improvements. Still those applications & modules are usable for certain needs. If you want diff --git a/braindump/plugins/stateshape/StateShape.h b/braindump/plugins/stateshape/StateShape.h index d52e079de0e..39055b6eebd 100644 --- a/braindump/plugins/stateshape/StateShape.h +++ b/braindump/plugins/stateshape/StateShape.h @@ -30,7 +30,7 @@ public: StateShape(); ~StateShape(); - // absolutly necessary: + // absolutely necessary: void paint(QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &paintcontext); virtual void saveOdf(KoShapeSavingContext & context) const; diff --git a/braindump/plugins/webshape/WebShape.h b/braindump/plugins/webshape/WebShape.h index 732d60bbeb4..414408f454d 100644 --- a/braindump/plugins/webshape/WebShape.h +++ b/braindump/plugins/webshape/WebShape.h @@ -34,7 +34,7 @@ public: WebShape(); ~WebShape(); - // absolutly necessary: + // absolutely necessary: void paint(QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &paintcontext); virtual void saveOdf(KoShapeSavingContext & context) const; diff --git a/braindump/src/MainWindow.cpp b/braindump/src/MainWindow.cpp index 5f8bad160f2..ff0f9637a9e 100644 --- a/braindump/src/MainWindow.cpp +++ b/braindump/src/MainWindow.cpp @@ -193,7 +193,7 @@ DockerManager* MainWindow::dockerManager() void MainWindow::activateView(View* view) { Q_ASSERT(factory()); - // Desactivate previous view + // Deactivate previous view if(m_activeView) { factory()->removeClient(m_activeView); foreach(StatusBarItem * item, m_statusBarItems[m_activeView]) { diff --git a/cmake/modules/CalligraProductSetMacros.cmake b/cmake/modules/CalligraProductSetMacros.cmake index 46e329de2f5..46162ee865b 100644 --- a/cmake/modules/CalligraProductSetMacros.cmake +++ b/cmake/modules/CalligraProductSetMacros.cmake @@ -143,7 +143,7 @@ macro(calligra_set_productset _productset_string) set(_productset_list "") # _product_id could be a product, feature or product set (predefined or from file) foreach(_product_id ${_productset_ids}) - # be gracefull and compare the productset id case insensitive + # be graceful and compare the productset id case insensitive string(TOUPPER "${_product_id}" _uppercase_product_id) if(_uppercase_product_id STREQUAL "ALL") diff --git a/cmake/modules/MacroBoolTo01.cmake b/cmake/modules/MacroBoolTo01.cmake index ddcb908d723..f9ae32e8851 100644 --- a/cmake/modules/MacroBoolTo01.cmake +++ b/cmake/modules/MacroBoolTo01.cmake @@ -1,6 +1,6 @@ # MACRO_BOOL_TO_01( VAR RESULT0 ... RESULTN ) # This macro evaluates its first argument -# and sets all the given vaiables either to 0 or 1 +# and sets all the given variables either to 0 or 1 # depending on the value of the first one # SPDX-FileCopyrightText: 2006 Alexander Neundorf <neund...@kde.org> diff --git a/cmake/productsets/README b/cmake/productsets/README index 851fcebf157..39458720177 100644 --- a/cmake/productsets/README +++ b/cmake/productsets/README @@ -1,4 +1,4 @@ This directory stores additional productsets. Please read the explanation in the toplevel file "CalligraProducts.cmake", -secion "How to add another productset?" at the end. +section "How to add another productset?" at the end. diff --git a/components/ViewController.h b/components/ViewController.h index d1c213e56fe..7a190b51e89 100644 --- a/components/ViewController.h +++ b/components/ViewController.h @@ -265,6 +265,6 @@ private: }; } // Namespace Components -} // Namepsace Calligra +} // Namespace Calligra #endif // CALLIGRA_COMPONENTS_VIEWCONTROLLER_H diff --git a/devtools/cstester/scripts/checkdocs.sh b/devtools/cstester/scripts/checkdocs.sh index cb5703a325b..42cbc4e3c92 100755 --- a/devtools/cstester/scripts/checkdocs.sh +++ b/devtools/cstester/scripts/checkdocs.sh @@ -1,7 +1,7 @@ #!/bin/bash # # script to check all documents in the current directory and create log of the failed ones . -# the logile will be written to LOG="../error-out.log" where out is replaced with the basename of the used out directory +# the logfile will be written to LOG="../error-out.log" where out is replaced with the basename of the used out directory LOG="../error-out.log" if [ -z "$1" ] diff --git a/devtools/scripts/OpenDocument-schema-v1.0-os.rng b/devtools/scripts/OpenDocument-schema-v1.0-os.rng index cf4ee51741a..fc01ca0d30c 100644 --- a/devtools/scripts/OpenDocument-schema-v1.0-os.rng +++ b/devtools/scripts/OpenDocument-schema-v1.0-os.rng @@ -12289,7 +12289,7 @@ <attribute name="text:number-position" a:defaultValue="left"> <choice> <value>left</value> - <value>rigth</value> + <value>right</value> <value>inner</value> <value>outer</value> </choice> @@ -14009,7 +14009,7 @@ <define name="shadowType"> <choice> <value>none</value> - <!-- The follwing string must match an XSL shadow decl --> + <!-- The following string must match an XSL shadow decl --> <ref name="string"/> </choice> </define> @@ -16412,7 +16412,7 @@ <attribute name="dr3d:texture-kind"> <choice> <value>luminance</value> - <value>intesity</value> + <value>intensity</value> <value>color</value> </choice> </attribute> diff --git a/devtools/scripts/massTester.pl b/devtools/scripts/massTester.pl index e3504c8cbc1..d2efc07b6a2 100755 --- a/devtools/scripts/massTester.pl +++ b/devtools/scripts/massTester.pl @@ -1,7 +1,7 @@ #! /usr/bin/perl -w use strict; -# This script runs a commnand on a list of input arguments that are supplied on +# This script runs a command on a list of input arguments that are supplied on # the standard input. # Graphical output is handled in a Xephyr window. # Output of the command is given in a file results.txt diff --git a/devtools/slidecompare/CMakeLists.txt b/devtools/slidecompare/CMakeLists.txt index 329e9b1849f..cacb2af4942 100644 --- a/devtools/slidecompare/CMakeLists.txt +++ b/devtools/slidecompare/CMakeLists.txt @@ -19,6 +19,6 @@ if(OOOSDK_FOUND) kpresenterslideloader.cpp oothread.cpp ${MOCFILES}) target_link_libraries(slidecompare ${OOOSDK_LIBRARIES} ${QT_LIBRARIES} Qt5::OpenGL komain kopageapp ppttoodplib) - # it would be nice if this explicit depencency was not needed + # it would be nice if this explicit dependency was not needed add_dependencies(slidecompare _oooheaders) endif() diff --git a/doc/api/gendocs.pl b/doc/api/gendocs.pl index ea90427b1e4..a9f0ed03225 100755 --- a/doc/api/gendocs.pl +++ b/doc/api/gendocs.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # SPDX-FileCopyrightText: 2006 Thomas Zander <zan...@kde.org> # this script generates dox based on the availability of a Mainpage.dox file. -# whereever there is one, doxygen is started. +# wherever there is one, doxygen is started. #set basedir relative to ours. $rootdir=`pwd`; @@ -12,7 +12,7 @@ if(! -d $basedir) { exit 1; } -# used in the tag decleration +# used in the tag declaration $remoteDocs_kdelibs="$rootdir/../kdelibs/doc/api"; $remoteDocs_qt="$rootdir/../qt-copy/doc/api"; @@ -27,7 +27,7 @@ if($#ARGV >= 0) { $ok=1; } elsif($ARGV[$i] eq "--remote") { - print "Using remote url for browing\n"; + print "Using remote url for browsing\n"; $remoteDocs_kdelibs="http://www.calligra.org/developer/kdelibs-api/"; $remoteDocs_qt="http://www.calligra.org/developer/qt-api/"; $ok=1; diff --git a/doc/sheets/commands.docbook b/doc/sheets/commands.docbook index 25b0ea3e9ae..9528770036a 100644 --- a/doc/sheets/commands.docbook +++ b/doc/sheets/commands.docbook @@ -690,7 +690,7 @@ To manage styles use <menuchoice> <guimenu>Format</guimenu> <guimenuitem>AutoFormat...</guimenuitem> </menuchoice></term> -<listitem><para><action>Autoformat the selected cells: a dialog let you choose betwen two proposed formats.</action> +<listitem><para><action>Autoformat the selected cells: a dialog let you choose between two proposed formats.</action> </para></listitem> </varlistentry> diff --git a/doc/stage/great-presentations.docbook b/doc/stage/great-presentations.docbook index 789af59f0ce..38888370c09 100644 --- a/doc/stage/great-presentations.docbook +++ b/doc/stage/great-presentations.docbook @@ -87,7 +87,7 @@ skill that needs practice. If you are using an Overhead projector, you can use transparent overlay slides and a pen over the top of your computer generated ones.</para> -<para>When you are doing the presentation do not accidently look into +<para>When you are doing the presentation do not accidentally look into the light, it's easy to do. If you are not going to use the machine for a few minutes, turn it off. Practise to get where you are going to stand sorted out. Check the room you intend to use for electrical @@ -101,7 +101,7 @@ equipment fails.</para> <para>I have not said much about the content yet. At present all you have is a piece of paper with everything you want to say on it. Before -you make anything, ask youself if their understanding of what you are +you make anything, ask yourself if their understanding of what you are saying is going to improved by showing them a picture. Bad presentations consist of a series of slides full of text. The presenter then reads the slide to the audience (who have already read diff --git a/doc/stage/menus.docbook b/doc/stage/menus.docbook index b6cdcafdf11..e68d49f3435 100644 --- a/doc/stage/menus.docbook +++ b/doc/stage/menus.docbook @@ -1397,7 +1397,7 @@ choosing a color/gradient.</para> <title><guimenu>Text</guimenu> Menu</title> <para>This menu modifies selected text and provides a few tools familiar from -word processing applications for your convienience for when you are making +word processing applications for your convenience for when you are making presentations with large amounts of text in them. The <guimenu>Text</guimenu> menu will only effect selected or highlighted text.</para> @@ -1795,7 +1795,7 @@ including whether to show the duration on screen, which of the slides in a presentation to include, and several other global settings.</para> </listitem> </varlistentry> -<!--FIXME Configure Presenter Wiew item mising--> +<!--FIXME Configure Presenter View item missing--> <!-- <varlistentry> <term> diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc index d2933161219..4408b4340e1 100644 --- a/filters/karbon/xaml/xamlexport.cc +++ b/filters/karbon/xaml/xamlexport.cc @@ -114,7 +114,7 @@ XAMLExport::visitVDocument(KarbonDocument& document) // TODO: schemas // http://schemas.microsoft.com/winfx/avalon/2005 // http://schemas.microsoft.com/2003/xaml - // need to mention defs too Defenitions namespace xmlns:def="Definition" + // need to mention defs too Definitions namespace xmlns:def="Definition" *m_defs << "<!-- Generator: Calligra Karbon WVG XAML Graphics export filter $VERSION/$DATE. -->" << endl; *m_defs << diff --git a/filters/sheets/gnumeric/gnumericimport.cc b/filters/sheets/gnumeric/gnumericimport.cc index 454331f7c15..7c1c3cc5574 100644 --- a/filters/sheets/gnumeric/gnumericimport.cc +++ b/filters/sheets/gnumeric/gnumericimport.cc @@ -1943,7 +1943,7 @@ KoFilter::ConversionStatus GNUMERICFilter::convert(const QByteArray & from, cons /* CELL handling STOP */ /* STYLE handling START */ - //Laurent - 2001-12-07 desactivate this code : otherwise we + //Laurent - 2001-12-07 deactivate this code : otherwise we //create 65535*255 cells (Styleregion is define for a area and //not for cell, so gnumeric define a style as : col start=0 col end=255 //rowstart=0 rowend=255 => we create 255*255 cells diff --git a/gemini/cloud/dropbox/3rdparty/networkcontroller.cc b/gemini/cloud/dropbox/3rdparty/networkcontroller.cc index ed762f18884..98d9e0c580e 100644 --- a/gemini/cloud/dropbox/3rdparty/networkcontroller.cc +++ b/gemini/cloud/dropbox/3rdparty/networkcontroller.cc @@ -108,7 +108,7 @@ void NetworkController::finished(QNetworkReply *networkreply){ qDebug() << "readAll() body = " << networkreply->readAll(); - QString errorstr("Unknow error!"); + QString errorstr("Unknown error!"); if (m_state == NetworkController::FILES_FOLDERS || m_state == NetworkController::REQUEST_TOKEN){ if (networkreply->error() == QNetworkReply::AuthenticationRequiredError) diff --git a/gemini/qml/components/PageStack.qml b/gemini/qml/components/PageStack.qml index 01496b15f95..d11eb0c05dd 100644 --- a/gemini/qml/components/PageStack.qml +++ b/gemini/qml/components/PageStack.qml @@ -263,7 +263,7 @@ Item { } } - // Handles state change depening on transition animation status + // Handles state change depending on transition animation status function setState(newState) { if (transitionAnimationRunning) diff --git a/gemini/qml/welcomepages/cloud/git/RepositoryContent.qml b/gemini/qml/welcomepages/cloud/git/RepositoryContent.qml index d7aee522391..d6d11aa11d3 100644 --- a/gemini/qml/welcomepages/cloud/git/RepositoryContent.qml +++ b/gemini/qml/welcomepages/cloud/git/RepositoryContent.qml @@ -175,7 +175,7 @@ Item { } QtControls.Label { anchors.fill: parent; - text: "No Documents\n\nPlease add some documents to your reporitory.\n(%1)".arg(docList.model.documentsFolder); + text: "No Documents\n\nPlease add some documents to your repository.\n(%1)".arg(docList.model.documentsFolder); horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; visible: docList.count === 0; diff --git a/interfaces/KoGenericRegistry.h b/interfaces/KoGenericRegistry.h index a82b43743de..b6fd6cf0a7f 100644 --- a/interfaces/KoGenericRegistry.h +++ b/interfaces/KoGenericRegistry.h @@ -19,7 +19,7 @@ * * Items are mapped by QString as a unique Id. * - * Exemple of use: + * Example of use: * @code * class KoMyClassRegistry : public KoGenericRegistry<MyClass*> { * public: diff --git a/karbon/CHANGES b/karbon/CHANGES index c818d966ac1..4d1fa0aada7 100644 --- a/karbon/CHANGES +++ b/karbon/CHANGES @@ -47,8 +47,8 @@ Changes after 1.4.1 (available from 1.4.2): - Object/layer listview is now better synced to the documents object hierarchy when deleting or grouping/ungrouping objects - Enabled multi-selection within the layer listview - Object/layer listview items get automatically selected when selecting their corresponding object with the selection tool -- Visiblity and locking states are now set correctly from the layer listview -- When embeded zoom the drawing so that it's completely visible +- Visibility and locking states are now set correctly from the layer listview +- When embedded zoom the drawing so that it's completely visible - Make this statusbar text label stretchable, so the rest of the labels won't jump around - Filter SVG: Added reading of group names - Filter SVG: Fix percentage loading error @@ -89,7 +89,7 @@ Changes after 1.4 (available from 1.4.1): Changes after 1.3 XMas preview: - Make sure we draw non-empty paths, otherwise we get extra, unwanted lines using non-AA painter and in print preview. -- Hack to fix bug #70644 for karbon. However note this doesnt fix the total bug, just +- Hack to fix bug #70644 for karbon. However note this doesn't fix the total bug, just for karbon. Changes after 1.3 RC1: @@ -108,7 +108,7 @@ Changes after 1.3 beta 1 : - zooming fixes - svg exporting uses document dimension, not dimension of the active selection -- new style docker introduced, with dragable cliparts +- new style docker introduced, with draggable cliparts - added aspect-ratio keeping way of scaling for select tool - various ui tweaks, including new icons (Tomislav) - improved behaviour for strokefill preview widget (Tomislav) diff --git a/karbon/plugins/roundcorners/RoundCornersCommand.cpp b/karbon/plugins/roundcorners/RoundCornersCommand.cpp index 2a9e250c99c..043c2390dfa 100644 --- a/karbon/plugins/roundcorners/RoundCornersCommand.cpp +++ b/karbon/plugins/roundcorners/RoundCornersCommand.cpp @@ -253,7 +253,7 @@ void RoundCornersCommand::roundPath() qreal prevSplit = prevLength > m_radius ? prevSeg.paramAtLength(prevLength - m_radius) : 0.5; QPair<KoPathSegment, KoPathSegment> prevParts = prevSeg.splitAt(prevSplit); - // add the remaining part up to the split point of the pervious segment + // add the remaining part up to the split point of the previous segment lastPoint = addSegment(m_path, prevParts.first); // split the next segment at radius diff --git a/karbon/ui/KarbonView.cpp b/karbon/ui/KarbonView.cpp index 770443095e1..f75f165a97d 100644 --- a/karbon/ui/KarbonView.cpp +++ b/karbon/ui/KarbonView.cpp @@ -200,7 +200,7 @@ KarbonView::KarbonView(KarbonPart *karbonPart, KarbonDocument* doc, QWidget* par connect(d->smallPreview, &KarbonSmallStylePreview::fillApplied, this, &KarbonView::applyFillToSelection); connect(d->smallPreview, &KarbonSmallStylePreview::strokeApplied, this, &KarbonView::applyStrokeToSelection); addStatusBarItem(d->smallPreview, 0); - // FIXME: This was not neccessary before refactoring to pageapp, why now? + // FIXME: This was not necessary before refactoring to pageapp, why now? // Also, changing colors of a shape does not update preview connect(shapeManager(), &KoShapeManager::selectionChanged, d->smallPreview, &KarbonSmallStylePreview::selectionChanged); diff --git a/karbon/ui/KarbonView.h b/karbon/ui/KarbonView.h index e543ff9d237..8088113b7fc 100644 --- a/karbon/ui/KarbonView.h +++ b/karbon/ui/KarbonView.h @@ -124,7 +124,7 @@ protected Q_SLOTS: void applyPaletteColor(const KoColor &color); protected: - /// Use own configuaration dialog + /// Use own configuration dialog void openConfiguration() override; void updateReadWrite(bool readwrite) override; diff --git a/libs/widgets/KoResourceServer.h b/libs/widgets/KoResourceServer.h index d6fc48661ea..eb99cbbc15c 100644 --- a/libs/widgets/KoResourceServer.h +++ b/libs/widgets/KoResourceServer.h @@ -402,7 +402,7 @@ public: /** - * Addes an observer to the server + * Adds an observer to the server * @param observer the observer to be added * @param notifyLoadedResources determines if the observer should be notified about the already loaded resources */ diff --git a/sheets/ui/actions/dialogs/FormulaDialog.cpp b/sheets/ui/actions/dialogs/FormulaDialog.cpp index 7ba039ad50c..ad6139574d4 100644 --- a/sheets/ui/actions/dialogs/FormulaDialog.cpp +++ b/sheets/ui/actions/dialogs/FormulaDialog.cpp @@ -278,7 +278,7 @@ void FormulaDialog::setFormula (const QString& formulaName) void FormulaDialog::slotPressReturn() { - //laurent 2001-07-07 desactivate this code + //laurent 2001-07-07 deactivate this code //because Calligra Sheets crash. //TODO fix it /* diff --git a/windows/calligra_installer/README.txt b/windows/calligra_installer/README.txt index 74a0c848cb6..5929a8d9a28 100644 --- a/windows/calligra_installer/README.txt +++ b/windows/calligra_installer/README.txt @@ -18,7 +18,7 @@ parent +-deps (stores 3rd party dependencies - Visual C++ runtime components for the installer) +-vcredist +-DLLs - +-MergeModules (stores .msm files distrubuted with Visual Studio) + +-MergeModules (stores .msm files distributed with Visual Studio) +-wix36 (install wix 3.6 here) You will require the latest copy of the Wix toolset, 3.6 beta. @@ -50,7 +50,7 @@ You will need to run the following within a working KDE for Windows environment. From the c2winstaller directory, call: env -This sets most of the required environment variables, using defaults unless you have overriden these previously. +This sets most of the required environment variables, using defaults unless you have overridden these previously. You will need to set CALLIGRA_INST if you intend to package Now you can run: diff --git a/windows/calligra_installer/en-us.wxl b/windows/calligra_installer/en-us.wxl index b60c9187602..08aa41a8ad1 100644 --- a/windows/calligra_installer/en-us.wxl +++ b/windows/calligra_installer/en-us.wxl @@ -17,7 +17,7 @@ <String Id="ApplicationNameStage">Calligra Stage [C2WINSTALL_VERSIONSTRING]</String> <String Id="ApplicationNameKarbon">Karbon [C2WINSTALL_VERSIONSTRING]</String> - <!-- Filetype assocations --> + <!-- Filetype associations --> <String Id="ExplorerMenuOpen">Open</String> <String Id="OdtFileDescription">ODF Text Document</String>