[openmeca] 02/03: typos
Damien André
damien-andre-guest at moszumanska.debian.org
Tue Apr 25 11:31:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
damien-andre-guest pushed a commit to branch patch-queue/master
in repository openmeca.
commit b5b7cd51715e7fb7d9796efd5709e72c8d834f09
Author: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Date: Tue Apr 25 09:26:51 2017 +0200
typos
===================================================================
Gbp-Pq: Name typos.patch
---
SRC/OpenMeca/Core/Software.cpp | 58 ++++++++++++++++++------------------
SRC/OpenMeca/Gui/MainWindow.cpp | 2 +-
SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts | 2 +-
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/SRC/OpenMeca/Core/Software.cpp b/SRC/OpenMeca/Core/Software.cpp
index c634808..24f9be7 100644
--- a/SRC/OpenMeca/Core/Software.cpp
+++ b/SRC/OpenMeca/Core/Software.cpp
@@ -91,35 +91,35 @@ namespace OpenMeca
QFile file(fileInfo_.c_str());
if(!file.open(QIODevice::ReadOnly))
{
- OMC_ASSERT_MSG(0, "Can't read the sofware file info");
- }
- QTextStream in(&file);
-
- while(!in.atEnd())
- {
- QString line = in.readLine();
- QStringList fields = line.split(":");
- OMC_ASSERT_MSG(fields.count()==2, "Problem while reading software info file");
- fields.first().replace(" ","");
- const std::string key = (fields.first()).toStdString();
- const std::string value = (fields.last()).toStdString();
-
- OMC_ASSERT_MSG(info_.count(key)==0, "Problem while reading software info file, the key value is already used");
- info_[key] = value;
- }
- }
-
-
- void
- Software::FakeTranslate()
- {
- // It's just to force translation of some keywords...
-
- // Keyword inside xml menumanager file
- QObject::tr("Geometry");
- QObject::tr("Cosmetic");
- QObject::tr("Loading");
- QObject::tr("Plot data...");
+ OMC_ASSERT_MSG(0, "Can't read the software file info");
+ }
+ QTextStream in(&file);
+
+ while(!in.atEnd())
+ {
+ QString line = in.readLine();
+ QStringList fields = line.split(":");
+ OMC_ASSERT_MSG(fields.count()==2, "Problem while reading software info file");
+ fields.first().replace(" ","");
+ const std::string key = (fields.first()).toStdString();
+ const std::string value = (fields.last()).toStdString();
+
+ OMC_ASSERT_MSG(info_.count(key)==0, "Problem while reading software info file, the key value is already used");
+ info_[key] = value;
+ }
+ }
+
+
+ void
+ Software::FakeTranslate()
+ {
+ // It's just to force translation of some keywords...
+
+ // Keyword inside xml menumanager file
+ QObject::tr("Geometry");
+ QObject::tr("Cosmetic");
+ QObject::tr("Loading");
+ QObject::tr("Plot data...");
QObject::tr("Save data...");
QObject::tr("Help");
QObject::tr("About...");
diff --git a/SRC/OpenMeca/Gui/MainWindow.cpp b/SRC/OpenMeca/Gui/MainWindow.cpp
index 8bf3cb9..02309b8 100755
--- a/SRC/OpenMeca/Gui/MainWindow.cpp
+++ b/SRC/OpenMeca/Gui/MainWindow.cpp
@@ -628,7 +628,7 @@ namespace OpenMeca
text += "<br><br>";
- text += "<b>" + tr("Main informations") + "</b>";
+ text += "<b>" + tr("Main information") + "</b>";
text += Core::Software::Get().HtmlText();
diff --git a/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts b/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
index a01c112..e227875 100644
--- a/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
+++ b/SRC/OpenMeca/Rsc/Lang/openmeca_fr.ts
@@ -709,7 +709,7 @@ The dialog will be closed</source>
</message>
<message>
<location filename="../../Gui/MainWindow.cpp" line="611"/>
- <source>Main informations</source>
+ <source>Main information</source>
<translation>Informations générales</translation>
</message>
<message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openmeca.git
More information about the debian-science-commits
mailing list