[SCM] qstopmotion/master: New upstream version 2.3.2
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Mon Nov 14 20:17:18 UTC 2016
The following commit has been merged in the master branch:
commit 329fed0ad1ef3a09230a442706c7117709d65f2b
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Mon Nov 14 20:27:21 2016 +0100
New upstream version 2.3.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa70f01..d83cb81 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
###############################################################################
# CMake file for the qStopMotion project #
# (c) Ralf Lange, longsoft.de #
-# Last update: 2016-08-08 #
+# Last update: 2016-11-10 #
# #
# Usage: #
# * Qt-Creator (Windows, Linux) #
@@ -80,7 +80,7 @@ SET(CMAKE_PROJECT_NAME "qstopmotion")
SET(QSTOPMOTION_HOMEPAGE "http://www.qstopmotion.org")
SET(QSTOPMOTION_VERSION_MAJOR "2")
SET(QSTOPMOTION_VERSION_MINOR "3")
-SET(QSTOPMOTION_VERSION_PATCH "1")
+SET(QSTOPMOTION_VERSION_PATCH "2")
SET(FILES_TO_TRANSLATE )
@@ -388,7 +388,8 @@ SET(
###############################################################################
IF(UNIX AND NOT APPLE)
- include(${CMAKE_SOURCE_DIR}/cmake/FindGPhoto2PkgConfig.cmake)
+ find_package(PkgConfig)
+ pkg_check_modules(GPHOTO2 REQUIRED libgphoto2)
message("GPHOTO2_INCLUDE_DIR: ${GPHOTO2_INCLUDE_DIR}")
message("GPHOTO2_LIBRARIES: ${GPHOTO2_LIBRARIES}")
ELSE(UNIX AND NOT APPLE)
@@ -1218,6 +1219,7 @@ SET(
CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
"/usr/bin"
"/usr/share/applications"
+ "/usr/share/icons"
"/usr/share/pixmaps"
"/usr/share/man"
"/usr/share/man/man1"
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
deleted file mode 100644
index e40d8ed..0000000
--- a/CMakeLists.txt.user
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.3, 2016-08-08T20:25:16. -->
-<qtcreator>
- <data>
- <variable>EnvironmentId</variable>
- <value type="QByteArray">{d0b3cea9-235f-4ac2-8ef5-74cbb1d5e5e5}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">0</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap"/>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{15da1916-2e89-4ca6-ae13-6166dee829e2}</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <valuelist type="QVariantList" key="CMake.Configuration">
- <value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
- <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}</value>
- <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
- </valuelist>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lange/Animation-Dev/qStopMotion/qstopmotion-build-creator</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
- <value type="QString">all</value>
- </valuelist>
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
- <value type="QString">clean</value>
- </valuelist>
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">all</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Lokales Deployment</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
- <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
- <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
- <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
- <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
- <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qstopmotion</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/lange/Animation-Dev/qStopMotion/qstopmotion-build-creator/bin</value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qstopmotion</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qstopmotion</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="int">1</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
- <value type="int">18</value>
- </data>
- <data>
- <variable>Version</variable>
- <value type="int">18</value>
- </data>
-</qtcreator>
diff --git a/Changes.txt b/Changes.txt
index a4bf8ce..3fae711 100755
--- a/Changes.txt
+++ b/Changes.txt
@@ -1,6 +1,9 @@
Last Changes in the sources on qStopMotion
===============================================================================
+qStopMotion (2.3.2) - 2016-11-10
+ * Some spelling corrections.
+ * Update of the Czech translation.
qStopMotion (2.3.0) - 2016-08-02
* Overlay intensity slider now works.
* Change the onion scinning to gray scale images.
@@ -19,11 +22,7 @@ qStopMotion (2.0.1) - 2015-06-11
* Update the RPM package generation.
* Video4Linux2 grabber can handle BGR image format.
* Add libav as the second encoder application.
-<<<<<<< local
qStopMotion (2.0.0 (Beta)) - 2015-05-21
-=======
-qStopMotion (2.0.0 (Beta))
->>>>>>> other
* Remove of the Gstreamer grabber from the Windows platform.
* On Windows qStopMotion can be started as an portable application.
* Video4Linux2 grabber on the Linux platform.
diff --git a/deb/changelog b/deb/changelog
index 3232ca0..3dbcf38 100644
--- a/deb/changelog
+++ b/deb/changelog
@@ -1,3 +1,21 @@
+qStopMotion (2.3.2) unstable; urgency=low
+ * Some spelling corrections.
+ * Update of the Czech translation.
+ -- Ralf Lange <ralf.lange at qstopmotion.org> Thu, 10 Nov 2016 00:09:11 +0100
+
+qStopMotion (2.3.0) unstable; urgency=low
+ * Overlay intensity slider now works.
+ * Change the onion scinning to gray scale images.
+ * Remove all gstreamer using.
+ * Bug fixing.
+ -- Ralf Lange <ralf.lange at qstopmotion.org> Thu, 02 Aug 2016 00:09:11 +0100
+
+qStopMotion (2.2.0) unstable; urgency=low
+ * Change the controller dialog from listboxes to slider
+ * Improve the gphoto image grabber
+ * Bug fixing.
+ -- Ralf Lange <ralf.lange at qstopmotion.org> Thu, 09 May 2016 00:09:11 +0100
+
qstopmotion (2.0.2) unstable; urgency=low
* Update the Ubuntu package generation. Fix most of the lintian messages.
* Add the CentOS package generation.
diff --git a/deb/changelog.gz b/deb/changelog.gz
index 32e8fc6..eb160cd 100644
Binary files a/deb/changelog.gz and b/deb/changelog.gz differ
diff --git a/deb/postinst b/deb/postinst
old mode 100644
new mode 100755
diff --git a/linux/qstopmotion.1 b/linux/qstopmotion.1
index abeb95c..f3cf63e 100644
--- a/linux/qstopmotion.1
+++ b/linux/qstopmotion.1
@@ -44,7 +44,7 @@ A summary of options is included below.
Creates a new project containing the images located in DIR (e.g. /foo/bar)
.SH SEE ALSO
The full documentation for qStopMotion is maintained in the application help menu.
-Visit the projects website for more informations.
+Visit the projects website for more information.
(http://www.qStopMotion.org)
.br
.SH AUTHORS
diff --git a/linux/qstopmotion.1.gz b/linux/qstopmotion.1.gz
index ce751d9..386fd8e 100644
Binary files a/linux/qstopmotion.1.gz and b/linux/qstopmotion.1.gz differ
diff --git a/linux/qstopmotion.desktop b/linux/qstopmotion.desktop
index 0d33ed4..345c649 100644
--- a/linux/qstopmotion.desktop
+++ b/linux/qstopmotion.desktop
@@ -8,4 +8,5 @@ X-MultipleArgs=false
Type=Application
Categories=AudioVideo;Video;AudioVideoEditing;
StartupNotify=true
+Keywords=animation;stop-motion;video;
MimeType=application/x-qstopmotion;
diff --git a/manual/adding_sound.html b/manual/adding_sound.html
index c8e28b3..3b72a80 100644
--- a/manual/adding_sound.html
+++ b/manual/adding_sound.html
@@ -22,8 +22,8 @@
</DIV>
<DIV CLASS="section">
<H1 CLASS="section">X. Adding sound</H1>
- <P>You also can add sound to your animations. Before you can do this however you need to have a frame to attatch the sound to. Therefore you should add some frames from the harddrive or webcamera first.</P>
- <P>When you have one or more frames you can add a sound by double clicking with the mouse on the frame to attatch the sound to. You will then get a menu where you can add sounds. When running the animation the sound will be played from this frame and until the sound is completed or the animation is at an end.</P>
+ <P>You also can add sound to your animations. Before you can do this however you need to have a frame to attach the sound to. Therefore you should add some frames from the harddrive or webcamera first.</P>
+ <P>When you have one or more frames you can add a sound by double clicking with the mouse on the frame to attach the sound to. You will then get a menu where you can add sounds. When running the animation the sound will be played from this frame and until the sound is completed or the animation is at an end.</P>
<DIV CLASS="note">
<TABLE CLASS="note" WIDTH="100%" BORDER="0">
<TR>
diff --git a/src/domain/animation/animationproject.cpp b/src/domain/animation/animationproject.cpp
index 014e0c9..b0188e8 100644
--- a/src/domain/animation/animationproject.cpp
+++ b/src/domain/animation/animationproject.cpp
@@ -1479,13 +1479,13 @@ int AnimationProject::addSoundToScene(unsigned int sceneIndex, const QString &so
frontend->showWarning(tr("Add Sound"),
tr("Cannot open the selected audio file for reading.\n"
"Check that you have the right permissions set.\n"
- "The animation will be runned without sound if you\n"
+ "The animation will be run without sound if you\n"
"choose to play."));
--soundsNumber;
} else if (ret == -2) {
frontend->showWarning(tr("Add Sound"),
tr("The selected audio file is not valid within the\n"
- "given audio format. The animation will be runned\n"
+ "given audio format. The animation will be run\n"
"without sound if you choose to play."));
--soundsNumber;
}
diff --git a/src/domain/animation/animationproject.h b/src/domain/animation/animationproject.h
index 224d387..bf96fb8 100644
--- a/src/domain/animation/animationproject.h
+++ b/src/domain/animation/animationproject.h
@@ -90,7 +90,7 @@ public:
/**
* Retrieves the new project file name
- * @return the project file name if it's setted, NULL otherwise.
+ * @return the project file name if it's set, NULL otherwise.
*/
const QString getNewProjectFilePath() const;
diff --git a/src/domain/domainfacade.h b/src/domain/domainfacade.h
index 28b3c02..02e68a0 100644
--- a/src/domain/domainfacade.h
+++ b/src/domain/domainfacade.h
@@ -156,19 +156,19 @@ public:
/**
* Retrieves the new project file path.
- * @return the project file path if it's setted, NULL otherwise.
+ * @return the project file path if it's set, NULL otherwise.
*/
const QString getNewProjectFilePath();
/**
* Retrieves the new project path.
- * @return the project path if it's setted, NULL otherwise.
+ * @return the project path if it's set, NULL otherwise.
*/
const QString getNewProjectPath();
/**
* Retrieves the project description.
- * @return the project description if it's setted, NULL otherwise.
+ * @return the project description if it's set, NULL otherwise.
*/
const QString getProjectDescription();
diff --git a/src/frontends/observer.h b/src/frontends/observer.h
index b10fdd2..4014cd0 100644
--- a/src/frontends/observer.h
+++ b/src/frontends/observer.h
@@ -34,7 +34,7 @@ class Exposure;
* The observer interface. All classes who wants to be notified when something
* changes in the animationmodel has to implement from this class.
*
- * The observers implemented with this class also has to be attatched to the
+ * The observers implemented with this class also has to be attached to the
* animationmodel.
*
* The observer is implemented with strong use of the push model. Although this
diff --git a/src/frontends/qtfrontend/dialogs/descriptiondialog.cpp b/src/frontends/qtfrontend/dialogs/descriptiondialog.cpp
index 40492c6..028d3da 100644
--- a/src/frontends/qtfrontend/dialogs/descriptiondialog.cpp
+++ b/src/frontends/qtfrontend/dialogs/descriptiondialog.cpp
@@ -71,19 +71,19 @@ DescriptionDialog::DescriptionDialog(Frontend *f, descriptionType type, QWidget
switch (type) {
case ProjectDescription:
- setWindowTitle(tr("Project Decription"));
+ setWindowTitle(tr("Project Description"));
projectDescrEdit->setEnabled(true);
sceneDescrEdit->setEnabled(true);
takeDescrEdit->setEnabled(true);
break;
case SceneDescription:
- setWindowTitle(tr("Scene Decription"));
+ setWindowTitle(tr("Scene Description"));
projectDescrEdit->setEnabled(false);
sceneDescrEdit->setEnabled(true);
takeDescrEdit->setEnabled(true);
break;
case TakeDescription:
- setWindowTitle(tr("Take Decription"));
+ setWindowTitle(tr("Take Description"));
projectDescrEdit->setEnabled(false);
sceneDescrEdit->setEnabled(false);
takeDescrEdit->setEnabled(true);
diff --git a/src/frontends/qtfrontend/dialogs/externalcommanddialog.cpp b/src/frontends/qtfrontend/dialogs/externalcommanddialog.cpp
index 9253da1..f4c91b1 100644
--- a/src/frontends/qtfrontend/dialogs/externalcommanddialog.cpp
+++ b/src/frontends/qtfrontend/dialogs/externalcommanddialog.cpp
@@ -128,7 +128,7 @@ void ExternalCommandDialog::displayExitStatus(int exitCode, QProcess::ExitStatus
} else {
QMessageBox::information(this,
tr("Result"),
- tr("Successfull!"));
+ tr("Successful!"));
}
lineEdit->setEnabled(false);
diff --git a/src/frontends/qtfrontend/frameview/frameviewinterface.cpp b/src/frontends/qtfrontend/frameview/frameviewinterface.cpp
index dbf52e1..1430d8d 100644
--- a/src/frontends/qtfrontend/frameview/frameviewinterface.cpp
+++ b/src/frontends/qtfrontend/frameview/frameviewinterface.cpp
@@ -56,9 +56,9 @@ FrameViewInterface::FrameViewInterface(Frontend *f, QWidget *parent, int fps)
setNormalRatio();
- frontend->getView()->attatch(this);
+ frontend->getView()->attach(this);
- qDebug() << "FrameViewInterface::Constructor --> FrameView is attatched to the ViewFacade";
+ qDebug() << "FrameViewInterface::Constructor --> FrameView is attached to the ViewFacade";
connect(&grabTimer, SIGNAL(timeout()), this, SLOT(redraw()));
connect(&playbackTimer, SIGNAL(timeout()), this, SLOT(nextPlayBack()));
diff --git a/src/frontends/qtfrontend/frameview/frameviewinterface.h b/src/frontends/qtfrontend/frameview/frameviewinterface.h
index c155fa5..870d70f 100644
--- a/src/frontends/qtfrontend/frameview/frameviewinterface.h
+++ b/src/frontends/qtfrontend/frameview/frameviewinterface.h
@@ -320,13 +320,13 @@ public:
/**
* Sets the live view frames per second.
- * @param fps the speed to be setted
+ * @param fps the speed to be set
*/
void setLiveViewFps(int fps);
/**
* Sets the video frames per second for the playback.
- * @param fps the speed to be setted
+ * @param fps the speed to be set
*/
void setVideoFps(int fps);
diff --git a/src/frontends/qtfrontend/mainwindowgui.cpp b/src/frontends/qtfrontend/mainwindowgui.cpp
index 4e9bb18..1975b25 100644
--- a/src/frontends/qtfrontend/mainwindowgui.cpp
+++ b/src/frontends/qtfrontend/mainwindowgui.cpp
@@ -274,7 +274,7 @@ void MainWindowGUI::retranslateHelpText()
tr("<h4>Save</h4> "
"<p><em>Saves</em> the current animation as a qStopMotion "
"project file. <BR>If this project has been saved before it will "
- "automaticly be saved to the previously selected file.</p>");
+ "automatically be saved to the previously selected file.</p>");
saveAct->setWhatsThis(infoText);
infoText =
saveAct->toolTip().prepend(tr("Save project"));
@@ -1422,9 +1422,9 @@ void MainWindowGUI::exportToVideo()
if (activeEncoderApplication == VideoEncoder::noneApplication) {
frontend->showWarning(tr("Warning"),
tr("No encoder selected for the video export.\n"
- "This can be setted in the properties dialog of the project.\n"
+ "This can be set in the properties dialog of the project.\n"
"Export to video will not be possible until you\n"
- "have setted an encoder to use!"));
+ "have set an encoder to use!"));
return;
}
@@ -1462,9 +1462,9 @@ void MainWindowGUI::exportToVideo()
case VideoEncoder::noneFormat:
frontend->showWarning(tr("Warning"),
tr("No video format selected for the video export.\n"
- "This can be setted in the properties dialog of the project.\n"
+ "This can be set in the properties dialog of the project.\n"
"Export to video will not be possible until you\n"
- "have setted an video format to use!"));
+ "have set an video format to use!"));
return;
}
diff --git a/src/frontends/qtfrontend/qtfrontend.cpp b/src/frontends/qtfrontend/qtfrontend.cpp
index 6e11953..81fbd16 100644
--- a/src/frontends/qtfrontend/qtfrontend.cpp
+++ b/src/frontends/qtfrontend/qtfrontend.cpp
@@ -197,8 +197,8 @@ bool QtFrontend::checkApplicationDirectory(char *binDirName)
pathLength = absoluteAppName.lastIndexOf("/");
appBinDirName.append(absoluteAppName.left(pathLength + 1));
}
- qDebug() << "QtFrontend::checkApplicationDirectory --> Application Direcory:" << appApplicationDirName;
- qDebug() << "QtFrontend::checkApplicationDirectory --> Application Binary Direcory:" << appBinDirName;
+ qDebug() << "QtFrontend::checkApplicationDirectory --> Application Directory:" << appApplicationDirName;
+ qDebug() << "QtFrontend::checkApplicationDirectory --> Application Binary Directory:" << appBinDirName;
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
// Windows version
@@ -253,9 +253,9 @@ bool QtFrontend::checkApplicationDirectory(char *binDirName)
#endif
- qDebug() << "QtFrontend::checkApplicationDirectory --> Application Manual Direcory:" << appManualDirName;
- qDebug() << "QtFrontend::checkApplicationDirectory --> Application Translations Direcory:" << appTranslationsDirName;
- qDebug() << "QtFrontend::checkApplicationDirectory --> Application Graphics Direcory:" << appGraphicsDirName;
+ qDebug() << "QtFrontend::checkApplicationDirectory --> Application Manual Directory:" << appManualDirName;
+ qDebug() << "QtFrontend::checkApplicationDirectory --> Application Translations Directory:" << appTranslationsDirName;
+ qDebug() << "QtFrontend::checkApplicationDirectory --> Application Graphics Directory:" << appGraphicsDirName;
otherDirName.clear();
@@ -263,14 +263,14 @@ bool QtFrontend::checkApplicationDirectory(char *binDirName)
otherDirName.append(PreferencesTool::iconsDirectory);
otherDirName.append(QLatin1String("/"));
appIconsDirName.append(otherDirName);
- qDebug() << "QtFrontend::checkApplicationDirectory --> Application Icon Direcory:" << appIconsDirName;
+ qDebug() << "QtFrontend::checkApplicationDirectory --> Application Icon Directory:" << appIconsDirName;
otherDirName.clear();
otherDirName.append(appGraphicsDirName);
otherDirName.append(PreferencesTool::picturesDirectory);
otherDirName.append(QLatin1String("/"));
appPicturesDirName.append(otherDirName);
- qDebug() << "QtFrontend::checkApplicationDirectory --> Application Pictures Direcory:" << appPicturesDirName;
+ qDebug() << "QtFrontend::checkApplicationDirectory --> Application Pictures Directory:" << appPicturesDirName;
qDebug() << "QtFrontend::checkApplicationDirectory --> End";
return 0;
@@ -900,7 +900,7 @@ bool QtFrontend::recoverProject()
int ret = askQuestion(tr("Recovery"),
tr("Something caused qStopmotion to exit abnormally\n"
- "last time it was runned. Do you want to recover?"));
+ "last time it was run. Do you want to recover?"));
// The user wants to recover
if (ret != 0) {
qDebug() << "QtFrontend::recoverProject --> End (False)";
@@ -1080,7 +1080,7 @@ void QtFrontend::test(QWidget *parentWidget, int level)
QObjectList testList = parentWidget->children();
int testSize = testList.size();
if (testSize == 0) {
- QDebug(QtDebugMsg) << "QtFrontend::test of level: " << level << " --> End (no childs) <<<<<<<<<<<<<<<=======================";
+ QDebug(QtDebugMsg) << "QtFrontend::test of level: " << level << " --> End (no children) <<<<<<<<<<<<<<<=======================";
return;
}
QDebug(QtDebugMsg) << "QtFrontend::test of level: " << level << " --> testSize: " << testSize;
diff --git a/src/frontends/qtfrontend/timeline/thumbview.h b/src/frontends/qtfrontend/timeline/thumbview.h
index cb789d0..326028e 100644
--- a/src/frontends/qtfrontend/timeline/thumbview.h
+++ b/src/frontends/qtfrontend/timeline/thumbview.h
@@ -69,8 +69,8 @@ public:
/**
* Abstract function for telling a exposurethumbview that it has one or more sounds
- * attatched to it.
- * @param hasSounds true if the frame has one or more sounds attatched to it.
+ * attached to it.
+ * @param hasSounds true if the frame has one or more sounds attached to it.
*/
virtual void setHasSounds(bool hasSounds);
diff --git a/src/frontends/qtfrontend/timeline/timeline.cpp b/src/frontends/qtfrontend/timeline/timeline.cpp
index d3ae949..496a7ab 100644
--- a/src/frontends/qtfrontend/timeline/timeline.cpp
+++ b/src/frontends/qtfrontend/timeline/timeline.cpp
@@ -127,8 +127,8 @@ TimeLine::TimeLine(Frontend* f, QWidget *parent)
setBackgroundRole(QPalette::Dark);
setAcceptDrops(true);
- qDebug() << "TimeLine::Constructor --> TimeLine is attatched to the model";
- frontend->getView()->attatch(this);
+ qDebug() << "TimeLine::Constructor --> TimeLine is attached to the model";
+ frontend->getView()->attach(this);
qDebug() << "TimeLine::Constructor --> End";
}
diff --git a/src/frontends/qtfrontend/tooltabs/projecttab.cpp b/src/frontends/qtfrontend/tooltabs/projecttab.cpp
index 62b0d9d..339eb9c 100644
--- a/src/frontends/qtfrontend/tooltabs/projecttab.cpp
+++ b/src/frontends/qtfrontend/tooltabs/projecttab.cpp
@@ -80,7 +80,7 @@ ProjectTab::ProjectTab(Frontend *f,
makeGUI();
retranslateStrings();
enableTab();
- frontend->getView()->attatch(this);
+ frontend->getView()->attach(this);
qDebug() << "ProjectTab::Constructor --> End";
}
diff --git a/src/frontends/viewfacade.cpp b/src/frontends/viewfacade.cpp
index 4856c0d..4116e54 100644
--- a/src/frontends/viewfacade.cpp
+++ b/src/frontends/viewfacade.cpp
@@ -53,17 +53,17 @@ DomainFacade* ViewFacade::getProject()
}
-void ViewFacade::attatch(Observer *o)
+void ViewFacade::attach(Observer *o)
{
- qDebug() << "ViewFacade::attatch --> Start";
+ qDebug() << "ViewFacade::attach --> Start";
if (o != NULL) {
observers.append(o);
} else {
- qDebug() << "ViewFacade::attatch --> Trying to attatch a NULL pointer to the ViewFacade";
+ qDebug() << "ViewFacade::attach --> Trying to attach a NULL pointer to the ViewFacade";
}
- qDebug() << "ViewFacade::attatch --> End";
+ qDebug() << "ViewFacade::attach --> End";
}
diff --git a/src/frontends/viewfacade.h b/src/frontends/viewfacade.h
index f9a43ca..c2c5562 100644
--- a/src/frontends/viewfacade.h
+++ b/src/frontends/viewfacade.h
@@ -72,9 +72,9 @@ public:
/**
* Attatches a new observer to the model. The observer will be notified
* when something is changed in the model.
- * @param o the observer to be attatched to the model.
+ * @param o the observer to be attached to the model.
*/
- void attatch(Observer *o);
+ void attach(Observer *o);
/**
* Detatches an observer from the model. The observer will no longer be
diff --git a/src/technical/grabber/gphoto2/gpgrabber.h b/src/technical/grabber/gphoto2/gpgrabber.h
index cbff99d..ba2507a 100644
--- a/src/technical/grabber/gphoto2/gpgrabber.h
+++ b/src/technical/grabber/gphoto2/gpgrabber.h
@@ -56,7 +56,7 @@ public:
bool initialization(QVector<ImageGrabberDevice*> &devices);
/**
- * Starts the grabber if it is marked to be runned in deamon mode.
+ * Starts the grabber if it is marked to be run in deamon mode.
* @return true on success, false otherwise
*/
bool setUp();
@@ -78,7 +78,7 @@ public:
bool grab();
/**
- * Shut downs the grabber process either if it is runned in deamon
+ * Shut downs the grabber process either if it is run in deamon
* mode or "single grab" mode.
* @return true on success, false otherwise
*/
diff --git a/src/technical/grabber/mediafoundation/mfgrabber.h b/src/technical/grabber/mediafoundation/mfgrabber.h
index c07b50e..58eae4c 100755
--- a/src/technical/grabber/mediafoundation/mfgrabber.h
+++ b/src/technical/grabber/mediafoundation/mfgrabber.h
@@ -60,7 +60,7 @@ public:
bool initialization(QVector<ImageGrabberDevice*> &devices);
/**
- * Starts the grabber if it is marked to be runned in deamon mode.
+ * Starts the grabber if it is marked to be run in deamon mode.
* @return true on success, false otherwise
*/
bool setUp();
@@ -82,7 +82,7 @@ public:
bool grab();
/**
- * Shut downs the grabber process either if it is runned in deamon
+ * Shut downs the grabber process either if it is run in deamon
* mode or "single grab" mode.
* @return true on success, false otherwise
*/
diff --git a/src/technical/grabber/video4linux2/v4l2grabber.h b/src/technical/grabber/video4linux2/v4l2grabber.h
index a0831c3..ac3ef83 100644
--- a/src/technical/grabber/video4linux2/v4l2grabber.h
+++ b/src/technical/grabber/video4linux2/v4l2grabber.h
@@ -59,7 +59,7 @@ public:
bool initialization(QVector<ImageGrabberDevice*> &devices);
/**
- * Starts the grabber if it is marked to be runned in deamon mode.
+ * Starts the grabber if it is marked to be run in deamon mode.
* @return true on success, false otherwise
*/
bool setUp();
@@ -81,7 +81,7 @@ public:
bool grab();
/**
- * Shut downs the grabber process either if it is runned in deamon
+ * Shut downs the grabber process either if it is run in deamon
* mode or "single grab" mode.
* @return true on success, false otherwise
*/
diff --git a/src/technical/preferencestool.cpp b/src/technical/preferencestool.cpp
index ed31269..e3c0024 100644
--- a/src/technical/preferencestool.cpp
+++ b/src/technical/preferencestool.cpp
@@ -35,7 +35,7 @@
const QString PreferencesTool::applicationShowName = QLatin1String("qStopMotion");
const QString PreferencesTool::applicationName = QLatin1String("qstopmotion");
-const QString PreferencesTool::applicationVersion = QLatin1String("2.3.1");
+const QString PreferencesTool::applicationVersion = QLatin1String("2.3.2");
const QString PreferencesTool::applicationYear = QLatin1String("2016");
const QString PreferencesTool::preferencesVersion = QLatin1String("0.9");
const QString PreferencesTool::preferencesSuffix = QLatin1String("qsmp");
diff --git a/translations/qstopmotion_cs.qm b/translations/qstopmotion_cs.qm
index caf1782..3daa979 100644
Binary files a/translations/qstopmotion_cs.qm and b/translations/qstopmotion_cs.qm differ
diff --git a/translations/qstopmotion_cs.ts b/translations/qstopmotion_cs.ts
old mode 100644
new mode 100755
index 2dc3b03..7e2350c
--- a/translations/qstopmotion_cs.ts
+++ b/translations/qstopmotion_cs.ts
@@ -109,7 +109,7 @@
<message>
<source>Cannot open the selected audio file for reading.
Check that you have the right permissions set.
-The animation will be runned without sound if you
+The animation will be run without sound if you
choose to play.</source>
<translation>Vybraný soubor se záznamem zvuku nelze otevřít pro čtení.
Prověřte, že jsou oprávnění nastavena správně.
@@ -118,7 +118,7 @@ přehrána bez zvuku.</translation>
</message>
<message>
<source>The selected audio file is not valid within the
-given audio format. The animation will be runned
+given audio format. The animation will be run
without sound if you choose to play.</source>
<translation>Vybraný soubor se záznamem zvuku není v platném
zvukovém formátu. Animace bude, v případě že se
@@ -319,7 +319,7 @@ rozhodnete pro přehrání, přehrána bez zvuku.</translation>
<translation>Popis &záběru:</translation>
</message>
<message>
- <source>Project Decription</source>
+ <source>Project Description</source>
<translation>Popis projektu</translation>
</message>
<message>
@@ -327,7 +327,7 @@ rozhodnete pro přehrání, přehrána bez zvuku.</translation>
<translation>Informace</translation>
</message>
<message>
- <source>Take Decription</source>
+ <source>Take Description</source>
<translation>Popis záběru</translation>
</message>
<message>
@@ -343,7 +343,7 @@ rozhodnete pro přehrání, přehrána bez zvuku.</translation>
<translation>Znak '|' není v popisu výjevu dovolen.</translation>
</message>
<message>
- <source>Scene Decription</source>
+ <source>Scene Description</source>
<translation>Popis výjevu</translation>
</message>
<message>
@@ -478,7 +478,7 @@ rozhodnete pro přehrání, přehrána bez zvuku.</translation>
</message>
<message>
<source>libav</source>
- <translation type="unfinished"></translation>
+ <translation>libav</translation>
</message>
</context>
<context>
@@ -531,7 +531,7 @@ rozhodnete pro přehrání, přehrána bez zvuku.</translation>
<translation>Nepodařilo se!</translation>
</message>
<message>
- <source>Successfull!</source>
+ <source>Successful!</source>
<translation>Podařilo se!</translation>
</message>
<message>
@@ -1012,9 +1012,9 @@ nabídce pro nastavení.</translation>
</message>
<message>
<source>No encoder selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation>Pro vyvedení obrazového záznamu není vybrán
žádný kodér. Toto můžete změnit v dialogu pro
nastaveníi projektu. vyvedení obrazu bude možné
@@ -1038,9 +1038,9 @@ teprve, až vyberete nějaký kodér. Chcete to udělat nyní?</translation>
</message>
<message>
<source>No video format selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an video format to use!</source>
+have set an video format to use!</source>
<translation>Pro vyvedení obrazového záznamu není vybrán
žádný formát obrazu. Toto můžete změnit v dialogu pro
nastaveníi projektu. vyvedení obrazu bude možné
@@ -1106,7 +1106,7 @@ na kartě pro nahrávání.</translation>
<translation>Uložit &jako</translation>
</message>
<message>
- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
+ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
<translation><h4>Uložit</h4> <p>Uloží nynější animaci jako soubor s projektem qStopMotion. </p></translation>
</message>
<message>
@@ -1277,7 +1277,8 @@ Prověřte nastavení v dialogu vlastností projektu!</translation>
<message>
<source>The selected encoder is not installed on your computer.
Install the encoder or select another one!</source>
- <translation type="unfinished"></translation>
+ <translation>Vybraný kodér není nainstalován na vašem počítači.
+Kodér nainstalujte nebo vyberte jiný!</translation>
</message>
</context>
<context>
@@ -1584,7 +1585,7 @@ Install the encoder or select another one!</source>
</message>
<message>
<source>Video 4 Linux 2 (USB WebCam)</source>
- <translation type="unfinished"></translation>
+ <translation>Video 4 Linux (USB WebCam)</translation>
</message>
</context>
<context>
@@ -1617,7 +1618,7 @@ tato oprávnění potřebujete k vytvoření adresáře .qstopmotion ve vašem d
</message>
<message>
<source>Something caused qStopmotion to exit abnormally
-last time it was runned. Do you want to recover?</source>
+last time it was run. Do you want to recover?</source>
<translation>Vypadá to, že qStopmotion nebyl při posledním používání správně
ukončen. Chcete obnovit poslední sezení?</translation>
</message>
diff --git a/translations/qstopmotion_da.qm b/translations/qstopmotion_da.qm
index 405e0a7..274a6a6 100644
Binary files a/translations/qstopmotion_da.qm and b/translations/qstopmotion_da.qm differ
diff --git a/translations/qstopmotion_da.ts b/translations/qstopmotion_da.ts
index 565ddbc..fa98e39 100644
--- a/translations/qstopmotion_da.ts
+++ b/translations/qstopmotion_da.ts
@@ -149,7 +149,7 @@
<location filename="../src/domain/animation/animationproject.cpp" line="1480"/>
<source>Cannot open the selected audio file for reading.
Check that you have the right permissions set.
-The animation will be runned without sound if you
+The animation will be run without sound if you
choose to play.</source>
<translation>Kan ikke åbne den valgte lydfil til læsning.
Check at du har sat de rigtige rettigheder.
@@ -159,7 +159,7 @@ hvis du vælger afspil.</translation>
<message>
<location filename="../src/domain/animation/animationproject.cpp" line="1487"/>
<source>The selected audio file is not valid within the
-given audio format. The animation will be runned
+given audio format. The animation will be run
without sound if you choose to play.</source>
<translation>Den valgte audio fil er ugyldig indenfor det
valgte lyd format. Animationen vil blivet spillet
@@ -499,17 +499,17 @@ uden lyd hvis du vælger afspil.</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="74"/>
- <source>Project Decription</source>
+ <source>Project Description</source>
<translation>Projekt Beskrivelse</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="80"/>
- <source>Scene Decription</source>
+ <source>Scene Description</source>
<translation>Scene Beskrivelse</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="86"/>
- <source>Take Decription</source>
+ <source>Take Description</source>
<translation>Take Beskrivelse</translation>
</message>
<message>
@@ -878,7 +878,7 @@ uden lyd hvis du vælger afspil.</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/externalcommanddialog.cpp" line="131"/>
- <source>Successfull!</source>
+ <source>Successful!</source>
<translation>Succes!</translation>
</message>
</context>
@@ -1634,9 +1634,9 @@ Install the encoder or select another one!</source>
</message>
<message>
<source>Cannot find any registered encoder to be used for video export.
-This can be setted in the preferences menu.
+This can be set in the preferences menu.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation type="obsolete">Kan ikke finde en registreret encoder for video export.
Det kan sættes i foretrukne menuen.
Eksport til video er ikke mulig før du har
@@ -1727,7 +1727,7 @@ Tjek dine indstillinger i foretrukne menuen!</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="274"/>
- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
+ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
<translation><h4>Gem</h4> <p><em>Gemmer</em> den aktive animation som en qStopMotion projekt fil. <BR>Er projektet tidligere gemt, vil det automatisk blive gemt som den tidligere gemte fil.</p></translation>
</message>
<message>
@@ -1866,9 +1866,9 @@ Tjek dine indstillinger i foretrukne menuen!</translation>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="1424"/>
<source>No encoder selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation>Ingen encoder er valgt til video eksport.
Denne kan vælges i projektets indstillingsdialog.
Eksport til video er ikke mulig før du har valgt
@@ -1877,9 +1877,9 @@ en encoder!</translation>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="1464"/>
<source>No video format selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an video format to use!</source>
+have set an video format to use!</source>
<translation>Video format er ikke valgt til video eksport.
Denne kan vælges i projektets indstillingsdialog.
Eksport til video er ikke mulig før du har valgt
@@ -2409,7 +2409,7 @@ Du behøver ret til at læse, skrive og eksekvere i .qstopmotion mappen.</transl
<message>
<location filename="../src/frontends/qtfrontend/qtfrontend.cpp" line="902"/>
<source>Something caused qStopmotion to exit abnormally
-last time it was runned. Do you want to recover?</source>
+last time it was run. Do you want to recover?</source>
<translation>Noget fik qStopmotion til at stoppe uregelmæssigt
sidst. Ønsker du at genoprette?</translation>
</message>
diff --git a/translations/qstopmotion_de.qm b/translations/qstopmotion_de.qm
index 76836e3..b6076ac 100644
Binary files a/translations/qstopmotion_de.qm and b/translations/qstopmotion_de.qm differ
diff --git a/translations/qstopmotion_de.ts b/translations/qstopmotion_de.ts
index 4d444fa..c1ec4b1 100644
--- a/translations/qstopmotion_de.ts
+++ b/translations/qstopmotion_de.ts
@@ -181,7 +181,7 @@
<location filename="../src/domain/animation/animationproject.cpp" line="1480"/>
<source>Cannot open the selected audio file for reading.
Check that you have the right permissions set.
-The animation will be runned without sound if you
+The animation will be run without sound if you
choose to play.</source>
<translation>Die ausgewählte Ton-Datei kann nicht zum lesen geöffnet werden.
Überprüfen Sie, dass die Rechte richtig gesetzt sind.
@@ -191,7 +191,7 @@ abspielen wählen.</translation>
<message>
<location filename="../src/domain/animation/animationproject.cpp" line="1487"/>
<source>The selected audio file is not valid within the
-given audio format. The animation will be runned
+given audio format. The animation will be run
without sound if you choose to play.</source>
<translation>Die ausgewählte Ton-Datei hat kein gültiges
Ton-Format. Die Animation wird ohne Ton abgespielt,
@@ -448,17 +448,17 @@ wenn Sie abspielen wählen.</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="74"/>
- <source>Project Decription</source>
+ <source>Project Description</source>
<translation>Projektbeschreibung</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="80"/>
- <source>Scene Decription</source>
+ <source>Scene Description</source>
<translation>Szenebeschreibung</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="86"/>
- <source>Take Decription</source>
+ <source>Take Description</source>
<translation>Aufnahmebeschreibung</translation>
</message>
<message>
@@ -760,7 +760,7 @@ wenn Sie abspielen wählen.</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/externalcommanddialog.cpp" line="131"/>
- <source>Successfull!</source>
+ <source>Successful!</source>
<translation>Erfolgreich!</translation>
</message>
</context>
@@ -1492,7 +1492,7 @@ Check your settings in the preferences menu!</source>
</message>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="274"/>
- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
+ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
<translation><h4>Speichern</h4> <p>Speichert die aktuelle Animation als qStopMotion Projektdatei. </p></translation>
</message>
<message>
@@ -1654,9 +1654,9 @@ This can be set in the preferences menu.</source>
</message>
<message>
<source>Cannot find any registered encoder to be used for video export.
-This can be setted in the preferences menu.
+This can be set in the preferences menu.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation type="obsolete">Für den Video-Export konnte kein Encoder gefunden werden.
Sie können dies im Einstellungs-Menü ändern. Video-Export
wird erst möglich, wenn sie einen Encoder eingestellt haben.
@@ -1856,9 +1856,9 @@ Dies kann auf dem Aufnahme Tab erfolgen.</translation>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="1424"/>
<source>No encoder selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation>Für den Video-Export ist kein Encoder ausgewählt.
Sie können dies im Eigenschaften-Dialog des Projekts ändern. Video-Export
wird erst möglich, wenn sie einen Encoder ausgewählt haben.</translation>
@@ -1866,9 +1866,9 @@ wird erst möglich, wenn sie einen Encoder ausgewählt haben.</translation>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="1464"/>
<source>No video format selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an video format to use!</source>
+have set an video format to use!</source>
<translation>Für den Video-Export ist kein Videoformat ausgewählt.
Sie können dies im Eigenschaften-Dialog des Projekts ändern. Video-Export
wird erst möglich, wenn sie ein Videoformat ausgewählt haben.</translation>
@@ -2416,7 +2416,7 @@ Sie benötigen Rechte zum lesen, schreiben und ausführen im Verzeichnis ~/.qsto
<message>
<location filename="../src/frontends/qtfrontend/qtfrontend.cpp" line="902"/>
<source>Something caused qStopmotion to exit abnormally
-last time it was runned. Do you want to recover?</source>
+last time it was run. Do you want to recover?</source>
<translation>Es sieht so aus, als wurde qStopmotion bei der letzten Nutzung nicht
ordentlich beendet. Möchten Sie die letzte Sitzung wiederherstellen?</translation>
</message>
diff --git a/translations/qstopmotion_fr.qm b/translations/qstopmotion_fr.qm
index a3f4d46..1314ec7 100644
Binary files a/translations/qstopmotion_fr.qm and b/translations/qstopmotion_fr.qm differ
diff --git a/translations/qstopmotion_fr.ts b/translations/qstopmotion_fr.ts
index 9b14e0d..28459df 100644
--- a/translations/qstopmotion_fr.ts
+++ b/translations/qstopmotion_fr.ts
@@ -181,7 +181,7 @@
<location filename="../src/domain/animation/animationproject.cpp" line="1480"/>
<source>Cannot open the selected audio file for reading.
Check that you have the right permissions set.
-The animation will be runned without sound if you
+The animation will be run without sound if you
choose to play.</source>
<translation>Il n'est pas possible d'ouvrir le fichier audio pour le lire.
Veuillez vérifier si vous avez mis les bons droits d'accès.
@@ -190,7 +190,7 @@ L'animation est visualisée sans son si vous choisissez de le lire.</transl
<message>
<location filename="../src/domain/animation/animationproject.cpp" line="1487"/>
<source>The selected audio file is not valid within the
-given audio format. The animation will be runned
+given audio format. The animation will be run
without sound if you choose to play.</source>
<translation>Le fichier audio choisi n'a pas de format audio valide.
L'animation est visualisée sans son si vous choisissez de le lire.</translation>
@@ -438,17 +438,17 @@ L'animation est visualisée sans son si vous choisissez de le lire.</transl
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="74"/>
- <source>Project Decription</source>
+ <source>Project Description</source>
<translation>Description du projet</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="80"/>
- <source>Scene Decription</source>
+ <source>Scene Description</source>
<translation>Description de la scène</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="86"/>
- <source>Take Decription</source>
+ <source>Take Description</source>
<translation>Description de l'enregistrement</translation>
</message>
<message>
@@ -734,7 +734,7 @@ L'animation est visualisée sans son si vous choisissez de le lire.</transl
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/externalcommanddialog.cpp" line="131"/>
- <source>Successfull!</source>
+ <source>Successful!</source>
<translation>Réussi!</translation>
</message>
</context>
@@ -1418,17 +1418,17 @@ This can be set on the recording tool tab.</source>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="1424"/>
<source>No encoder selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="1464"/>
<source>No video format selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an video format to use!</source>
+have set an video format to use!</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1464,7 +1464,7 @@ Check your settings in the properties dialo of the project!</source>
</message>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="274"/>
- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
+ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
<translation><h4>Enregistrer</h4> <p><em>Enregistre</em> l'animation courante sous forme de fichier projet qStopMotion. <BR>Si ce projet a été enregistré précédemment, il sera enregistré automatiquement dans le même fichier (écrasement).</p></translation>
</message>
<message>
@@ -1619,9 +1619,9 @@ Ceci peut être fait dans la fenêtre de préférences.</translation>
</message>
<message>
<source>Cannot find any registered encoder to be used for video export.
-This can be setted in the preferences menu.
+This can be set in the preferences menu.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation type="obsolete">Il n'est pas possible de trouver un encodeur enregistré pour être utilisé pour l'exportation de la vidéo.
Ceci peut être situé dans la fenêtre de préférences.
L'exportation comme vidéo n'est pas possible jusqu'à ce que vous ayez installé un encodeur!</translation>
@@ -2309,7 +2309,7 @@ Il vous faut des droits d'accès pour lire, écrire et exécuter dans ~/.qs
<message>
<location filename="../src/frontends/qtfrontend/qtfrontend.cpp" line="902"/>
<source>Something caused qStopmotion to exit abnormally
-last time it was runned. Do you want to recover?</source>
+last time it was run. Do you want to recover?</source>
<translation>Probablement qStopMotion n'a pas été correctement terminé lors de le dernière séance.
Voulez-vous restaurer la dernière séance?</translation>
</message>
diff --git a/translations/qstopmotion_se.qm b/translations/qstopmotion_se.qm
index 891f1a7..d83be91 100644
Binary files a/translations/qstopmotion_se.qm and b/translations/qstopmotion_se.qm differ
diff --git a/translations/qstopmotion_se.ts b/translations/qstopmotion_se.ts
index 0bcdb7a..6e3a7d9 100644
--- a/translations/qstopmotion_se.ts
+++ b/translations/qstopmotion_se.ts
@@ -150,14 +150,14 @@
<location filename="../src/domain/animation/animationproject.cpp" line="1480"/>
<source>Cannot open the selected audio file for reading.
Check that you have the right permissions set.
-The animation will be runned without sound if you
+The animation will be run without sound if you
choose to play.</source>
<translation></translation>
</message>
<message>
<location filename="../src/domain/animation/animationproject.cpp" line="1487"/>
<source>The selected audio file is not valid within the
-given audio format. The animation will be runned
+given audio format. The animation will be run
without sound if you choose to play.</source>
<translation>Den valda ljudfilen är inte i ett fungerande ljudformat. Animationen visas utan ljud om du väljer att spela.</translation>
</message>
@@ -497,17 +497,17 @@ without sound if you choose to play.</source>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="74"/>
- <source>Project Decription</source>
+ <source>Project Description</source>
<translation>Prjektbeskrivning</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="80"/>
- <source>Scene Decription</source>
+ <source>Scene Description</source>
<translation>Scenbeskrivning</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/descriptiondialog.cpp" line="86"/>
- <source>Take Decription</source>
+ <source>Take Description</source>
<translation>Tagningsbeskrivning</translation>
</message>
<message>
@@ -882,7 +882,7 @@ without sound if you choose to play.</source>
</message>
<message>
<location filename="../src/frontends/qtfrontend/dialogs/externalcommanddialog.cpp" line="131"/>
- <source>Successfull!</source>
+ <source>Successful!</source>
<translation>Lyckades!</translation>
</message>
</context>
@@ -1607,9 +1607,9 @@ Install the encoder or select another one!</source>
</message>
<message>
<source>Cannot find any registered encoder to be used for video export.
-This can be setted in the preferences menu.
+This can be set in the preferences menu.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation type="obsolete">Kan inte hitta någon registrerad kodare för videoexport.
En sådan kan anges i inställningsmenyn.
Videoexportering är inte möjligt förrän en videokodare är angiven!</translation>
@@ -1706,7 +1706,7 @@ Kontrollera dina inställningar i menyn!</translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="274"/>
- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
+ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
<translation><h4>Spara</h4> <p><em>Sparar</em>den aktuella animationen som en qStopMotion projektfil. <BR>Om projektet sparats tidigare så sparas det automatiskt till samma projektfil.</p></translation>
</message>
<message>
@@ -1846,17 +1846,17 @@ Kontrollera dina inställningar i menyn!</translation>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="1424"/>
<source>No encoder selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an encoder to use!</source>
+have set an encoder to use!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="1464"/>
<source>No video format selected for the video export.
-This can be setted in the properties dialog of the project.
+This can be set in the properties dialog of the project.
Export to video will not be possible until you
-have setted an video format to use!</source>
+have set an video format to use!</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2368,7 +2368,7 @@ Du behöver rättighet att läsa, skriva och köra filer som program i .qstopmot
<message>
<location filename="../src/frontends/qtfrontend/qtfrontend.cpp" line="902"/>
<source>Something caused qStopmotion to exit abnormally
-last time it was runned. Do you want to recover?</source>
+last time it was run. Do you want to recover?</source>
<translation>Något orsakade att qStopMotion oväntat avslutades
vid senaste användningen. Vill du återskapa?</translation>
</message>
--
qstopmotion packaging
More information about the pkg-multimedia-commits
mailing list