Crowdin: fixes pre-0.18 release

src/Base/Exception.h

@@ -40,7 +40,7 @@
 /// If you want to mark text for translation, use the QT_TRANSLATE_NOOP macro
 /// with the context "Exceptions" and the right throwing macro from below (the one ending in T)
 /// example:
-/// THROWMT(Base::ValueError,QT_TRANSLATE_NOOP("Exceptions","The multiplicity cannot be increased beyond the degree of the b-spline."));
+/// THROWMT(Base::ValueError,QT_TRANSLATE_NOOP("Exceptions","The multiplicity cannot be increased beyond the degree of the B-Spline."));
 ///
 /// N.B.: The QT_TRANSLATE_NOOP macro won't translate your string. It will just allow lupdate to identify that string for translation so that
 /// if you ask for a translation (and the translator have provided one) at that time it gets translated (e.g. in the UI before showing the message

src/Gui/CADNavigationStyle.cpp

@@ -69,9 +69,9 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode)
     case NavigationStyle::PANNING:
         return QT_TR_NOOP("Press middle mouse button");
     case NavigationStyle::DRAGGING:
-        return QT_TR_NOOP("Press middle and left or right mouse button");
+        return QT_TR_NOOP("Press middle+left or middle+right button");
     case NavigationStyle::ZOOMING:
-        return QT_TR_NOOP("Scroll middle mouse button or keep middle button pressed\n"
+        return QT_TR_NOOP("Scroll middle mouse button or keep middle button depressed\n"
                           "while doing a left or right click and move the mouse up or down");
     default:
         return "No description";
@@ -259,8 +259,8 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev)
             this->lockrecenter = true;
             if (!viewer->isEditing()) {
                 // If we are in zoom or pan mode ignore RMB events otherwise
-                // the canvas doesn't get any release events 
-                if (this->currentmode != NavigationStyle::ZOOMING && 
+                // the canvas doesn't get any release events
+                if (this->currentmode != NavigationStyle::ZOOMING &&
                     this->currentmode != NavigationStyle::PANNING &&
                     this->currentmode != NavigationStyle::DRAGGING) {
                     if (this->isPopupMenuEnabled()) {

src/Gui/CommandDoc.cpp

@@ -1143,7 +1143,7 @@ void StdCmdDelete::activated(int iMsg)
                     //message for linked items
                     if (!affectedLabels.empty()) {
                         bodyMessageStream << qApp->translate("Std_Delete",
-                                                             "These items are linked to items selected for deletion and might break.\n\n");
+                                                             "These items are linked to items selected for deletion and might break.") << "\n\n";
                         for (const auto &currentLabel : affectedLabels)
                           bodyMessageStream << currentLabel << '\n';
                     }
@@ -1154,13 +1154,13 @@ void StdCmdDelete::activated(int iMsg)
                             bodyMessageStream << "\n";
                         }
                         std::string thisDoc = pGuiDoc->getDocument()->getName();
-                        bodyMessageStream << qApp->translate("Std_Delete", 
-                                             "These items are selected for deletion, but are not in the active document. \n\n"); 
+                        bodyMessageStream << qApp->translate("Std_Delete",
+                                             "These items are selected for deletion, but are not in the active document.") << "\n\n";
                         for (const auto &currentLabel : inactiveLabels)
                           bodyMessageStream << currentLabel << " / " << Base::Tools::fromStdString(thisDoc) << '\n';
                     }
-                    bodyMessageStream << qApp->translate("Std_Delete",
-                                                         "\n\nAre you sure you want to continue?");
+                    bodyMessageStream << "\n\n" << qApp->translate("Std_Delete",
+                                                         "Are you sure you want to continue?");
 
                     int ret = QMessageBox::question(Gui::getMainWindow(),
                         qApp->translate("Std_Delete", "Delete Selection Issues"), bodyMessage,
@@ -1477,4 +1477,3 @@ void CreateDocCommands(void)
 }
 
 } // namespace Gui
-

src/Gui/DocumentRecovery.cpp

@@ -501,7 +501,7 @@ void DocumentRecovery::on_buttonCleanup_clicked()
     msgBox.setIcon(QMessageBox::Warning);
     msgBox.setWindowTitle(tr("Cleanup"));
     msgBox.setText(tr("Are you sure you want to delete all transient directories?"));
-    msgBox.setInformativeText(tr("When deleting all transient directory you won't be able to recover any files afterwards."));
+    msgBox.setInformativeText(tr("When deleting all transient directories you won't be able to recover any files afterwards."));
     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
     msgBox.setDefaultButton(QMessageBox::No);
     int ret = msgBox.exec();

src/Gui/GestureNavigationStyle.cpp

@@ -1,6 +1,5 @@
 /***************************************************************************
- *   Copyright (c) Victor Titov (DeepSOIC)                                 *
- *                                           (vv.titov@gmail.com) 2015     *
+ *   Copyright (c) 2015 Victor Titov (DeepSOIC) <vv.titov@gmail.com>       *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
@@ -101,13 +100,13 @@ const char* GestureNavigationStyle::mouseButtons(ViewerMode mode)
 {
     switch (mode) {
     case NavigationStyle::SELECTION:
-        return QT_TR_NOOP("Tap. Or click left mouse button.");
+        return QT_TR_NOOP("Tap OR click left mouse button.");
     case NavigationStyle::PANNING:
-        return QT_TR_NOOP("Drag screen with two fingers. Or press right mouse button.");
+        return QT_TR_NOOP("Drag screen with two fingers OR press right mouse button.");
     case NavigationStyle::DRAGGING:
-        return QT_TR_NOOP("Drag the screen with one finger. Or press left mouse button. In Sketcher and other edit modes, hold Alt in addition.");
+        return QT_TR_NOOP("Drag screen with one finger OR press left mouse button. In Sketcher and other edit modes, hold Alt in addition.");
     case NavigationStyle::ZOOMING:
-        return QT_TR_NOOP("Pinch (put two fingers on the screen and drag them apart/to each other). Or scroll middle mouse button. Or PgUp/PgDown on keyboard.");
+        return QT_TR_NOOP("Pinch (place two fingers on the screen and drag them apart from or towards each other) OR scroll middle mouse button OR PgUp/PgDown on keyboard.");
     default:
         return "No description";
     }

src/Gui/MayaGestureNavigationStyle.cpp

@@ -1,6 +1,5 @@
 /***************************************************************************
- *   Copyright (c) Victor Titov (DeepSOIC)                                 *
- *                                           (vv.titov@gmail.com) 2015     *
+ *   Copyright (c) 2015 Victor Titov (DeepSOIC) <vv.titov@gmail.com>       *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
@@ -107,13 +106,13 @@ const char* MayaGestureNavigationStyle::mouseButtons(ViewerMode mode)
 {
     switch (mode) {
     case NavigationStyle::SELECTION:
-        return QT_TR_NOOP("Tap. Or click left mouse button.");
+        return QT_TR_NOOP("Tap OR click left mouse button.");
     case NavigationStyle::PANNING:
-        return QT_TR_NOOP("Drag screen with two fingers. Or press ALT + middle mouse button.");
+        return QT_TR_NOOP("Drag screen with two fingers OR press ALT + middle mouse button.");
     case NavigationStyle::DRAGGING:
-        return QT_TR_NOOP("Drag the screen with one finger. Or press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition.");
+        return QT_TR_NOOP("Drag screen with one finger OR press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition.");
     case NavigationStyle::ZOOMING:
-        return QT_TR_NOOP("Pinch (put two fingers on the screen and drag them apart/to each other). Or scroll middle mouse button. Or press ALT + right mouse button. Or PgUp/PgDown on keyboard.");
+        return QT_TR_NOOP("Pinch (place two fingers on the screen and drag them apart from or towards each other) OR scroll middle mouse button OR press ALT + right mouse button OR PgUp/PgDown on keyboard.");
     default:
         return "No description";
     }
@@ -413,7 +412,7 @@ SbBool MayaGestureNavigationStyle::processSoEvent(const SoEvent * const ev)
                 // starts PANNING mode
                 if(press & this->altdown){
                     setViewingMode(NavigationStyle::PANNING);
-                } else if(press){ 
+                } else if(press){
                     // if not PANNING then look at point
                     SbBool ret = NavigationStyle::lookAtPoint(event->getPosition());
                     if(!ret){
@@ -612,4 +611,3 @@ SbBool MayaGestureNavigationStyle::processSoEvent(const SoEvent * const ev)
 finalize:
     return processed;
 }
-

src/Gui/NetworkRetriever.cpp

@@ -118,7 +118,8 @@ void NetworkRetriever::testFailure()
     if ( wget->state() == QProcess::Running )
     {
         d->fail = false;
-        Base::Console().Message( tr("Download started...\n").toLatin1() );
+        QString msg = tr("Download started...") + QString::fromUtf8("\n");    // all QString
+        Base::Console().Message(msg.toUtf8().constData());                    // all cStyleString
     }
 }
 

src/Gui/Selection.cpp

@@ -506,12 +506,14 @@ bool SelectionSingleton::setPreselect(const char* pDocName, const char* pObjectN
             } else {
                 msg = QCoreApplication::translate("SelectionFilter","Not allowed:");
             }
+            msg += QString::fromUtf8(" "); 
             msg.append(
-                        QObject::tr(" %1.%2.%3 ")
+                        QObject::tr("%1.%2.%3")
                        .arg(QString::fromLatin1(pDocName))
                        .arg(QString::fromLatin1(pObjectName))
                        .arg(QString::fromLatin1(pSubName))
                         );
+            msg += QString::fromUtf8(" "); 
 
             if (getMainWindow()) {
                 getMainWindow()->showMessage(msg);

src/Gui/SoFCCSysDragger.cpp

@@ -61,20 +61,20 @@
    *     file to include in the project. I would have gone this way but after installing
    *     inventor-demo(ubuntu), the mock compiler tool was there only in source and make
    *     didn't do anything. Didn't want to put any time into something I didn't like anyway.
-   * 
+   *
    * static SbList <SoNode*> * defaultdraggerparts = NULL; is a global definition
    * in SoInteractionKit that contains the geometry. There doesn't appear to be anyway
    * to add to this other than readDefaultParts, that takes a file. So maybe a temp file?
-   * 
+   *
    * naming appears to be central to the core. It looks like as long as an object
    * is alive SoNode::getByName() will find it. So maybe just create my own little
    * container of objects to keep the default geometry alive....This appears to be
    * working and I like this solution.
-   * 
+   *
    * SoInteractionKit warns about these
    * names all being the same scope and do NOT have to be unique. Need to make names
    * descriptive to avoid collisions.
-   
+
    * this is point of the SoGroup accessed from SoFCDB::getStorage().
 */
 
@@ -270,10 +270,10 @@ void TDragger::drag()
     SbVec3f hitPoint = projector.project(getNormalizedLocaterPosition());
     SbVec3f startingPoint = getLocalStartingPoint();
     SbVec3f localMovement = hitPoint - startingPoint;
-    
+
     //scale the increment to match local space.
     float scaledIncrement = static_cast<float>(translationIncrement.getValue()) / autoScaleResult.getValue();
-    
+
     localMovement = roundTranslation(localMovement, scaledIncrement);
     //when the movement vector is null either the appendTranslation or
     //the setMotionMatrix doesn't work. either way it stops translating
@@ -287,11 +287,11 @@ void TDragger::drag()
     }
     else
         setMotionMatrix(appendTranslation(getStartMotionMatrix(), localMovement));
-    
+
     Base::Quantity quantity(
       static_cast<double>(translationIncrementCount.getValue()) * translationIncrement.getValue(), Base::Unit::Length);
-    
-    QString message(QObject::tr("Translation: "));
+
+    QString message(QObject::tr("Translation:")+QString::fromUtf8(" "));
     message += quantity.getUserString();
     getMainWindow()->showMessage(message, 3000);
 }
@@ -571,12 +571,12 @@ void RDragger::drag()
     }
     else
         setMotionMatrix(appendRotation(getStartMotionMatrix(), localRotation, SbVec3f(0.0, 0.0, 0.0)));
-    
+
     Base::Quantity quantity(
       static_cast<double>(rotationIncrementCount.getValue())  * (180.0 / M_PI) *
       rotationIncrement.getValue(), Base::Unit::Angle);
-    
-    QString message(QObject::tr("Rotation: "));
+
+    QString message(QObject::tr("Rotation:")+QString::fromUtf8(" "));
     message += quantity.getUserString();
     getMainWindow()->showMessage(message, 3000);
 }
@@ -651,7 +651,7 @@ SoFCCSysDragger::SoFCCSysDragger()
     SO_KIT_ADD_CATALOG_ENTRY(xTranslatorSeparator, SoSeparator, TRUE, xTranslatorSwitch, "", TRUE);
     SO_KIT_ADD_CATALOG_ENTRY(yTranslatorSeparator, SoSeparator, TRUE, yTranslatorSwitch, "", TRUE);
     SO_KIT_ADD_CATALOG_ENTRY(zTranslatorSeparator, SoSeparator, TRUE, zTranslatorSwitch, "", TRUE);
-    
+
     SO_KIT_ADD_CATALOG_ENTRY(xTranslatorColor, SoBaseColor, TRUE, xTranslatorSeparator, "", TRUE);
     SO_KIT_ADD_CATALOG_ENTRY(yTranslatorColor, SoBaseColor, TRUE, yTranslatorSeparator, "", TRUE);
     SO_KIT_ADD_CATALOG_ENTRY(zTranslatorColor, SoBaseColor, TRUE, zTranslatorSeparator, "", TRUE);
@@ -675,7 +675,7 @@ SoFCCSysDragger::SoFCCSysDragger()
     SO_KIT_ADD_CATALOG_ENTRY(xRotatorColor, SoBaseColor, TRUE, xRotatorSeparator, "", TRUE);
     SO_KIT_ADD_CATALOG_ENTRY(yRotatorColor, SoBaseColor, TRUE, yRotatorSeparator, "", TRUE);
     SO_KIT_ADD_CATALOG_ENTRY(zRotatorColor, SoBaseColor, TRUE, zRotatorSeparator, "", TRUE);
-    
+
     SO_KIT_ADD_CATALOG_ENTRY(xRotatorRotation, SoRotation, TRUE, xRotatorSeparator, "", TRUE);
     SO_KIT_ADD_CATALOG_ENTRY(yRotatorRotation, SoRotation, TRUE, yRotatorSeparator, "", TRUE);
     SO_KIT_ADD_CATALOG_ENTRY(zRotatorRotation, SoRotation, TRUE, zRotatorSeparator, "", TRUE);
@@ -700,7 +700,7 @@ SoFCCSysDragger::SoFCCSysDragger()
     SO_KIT_ADD_FIELD(autoScaleResult, (1.0));
 
     SO_KIT_INIT_INSTANCE();
-    
+
     SoBaseColor *color;
     color = SO_GET_ANY_PART(this, "xTranslatorColor", SoBaseColor);
     color->rgb.setValue(1.0, 0.0, 0.0);
@@ -720,12 +720,12 @@ SoFCCSysDragger::SoFCCSysDragger()
     tDragger->translationIncrement.connectFrom(&this->translationIncrement);
     tDragger->autoScaleResult.connectFrom(&this->autoScaleResult);
     translationIncrementCountX.connectFrom(&tDragger->translationIncrementCount);
-    
+
     tDragger = SO_GET_ANY_PART(this, "yTranslatorDragger", TDragger);
     tDragger->translationIncrement.connectFrom(&this->translationIncrement);
     tDragger->autoScaleResult.connectFrom(&this->autoScaleResult);
     translationIncrementCountY.connectFrom(&tDragger->translationIncrementCount);
-    
+
     tDragger = SO_GET_ANY_PART(this, "zTranslatorDragger", TDragger);
     tDragger->translationIncrement.connectFrom(&this->translationIncrement);
     tDragger->autoScaleResult.connectFrom(&this->autoScaleResult);

src/Mod/AddonManager/AddonManager.py

@@ -705,13 +705,13 @@ def retrieve_macros_from_git(self):
         """Retrieve macros from FreeCAD-macros.git
 
         Emits a signal for each macro in
-        https://github.com/FreeCAD/FreeCAD-macros.git.
+        https://github.com/FreeCAD/FreeCAD-macros.git
         """
         try:
             import git
         except ImportError:
             self.info_label_signal.emit("GitPython not installed! Cannot retrieve macros from git")
-            FreeCAD.Console.PrintWarning('GitPython not installed! Cannot retrieve macros from git')
+            FreeCAD.Console.PrintWarning(translate('AddonInstaller', 'GitPython not installed! Cannot retrieve macros from git')+"\n")
             return
 
         self.info_label_signal.emit('Downloading list of macros for git...')
@@ -768,7 +768,7 @@ def run(self):
             desc = self.repos[self.idx][3]
         else:
             url = self.repos[self.idx][1]
-            self.info_label.emit(translate("AddonsInstaller", "Retrieving info from ") + str(url))
+            self.info_label.emit(translate("AddonsInstaller", "Retrieving info from") + ' ' + str(url))
             u = urlopen(url)
             p = u.read()
             if sys.version_info.major >= 3 and isinstance(p, bytes):

src/Mod/Arch/ArchFloor.py

@@ -2,8 +2,7 @@
 
 #***************************************************************************
 #*                                                                         *
-#*   Copyright (c) 2011                                                    *
-#*   Yorik van Havre <yorik@uncreated.net>                                 *
+#*   Copyright (c) 2011 Yorik van Havre <yorik@uncreated.net>              *
 #*                                                                         *
 #*   This program is free software; you can redistribute it and/or modify  *
 #*   it under the terms of the GNU Lesser General Public License (LGPL)    *
@@ -99,9 +98,9 @@ def Activated(self):
                 else:
                     warning = True
         if warning :
-            message = translate( "Arch" , "You can put anything but Site, Building, Floor object in a Floor object.\n\
-Floor object are not allowed to accept Site or Building object.\n\
-Site, Building and Floor objects will be removed from the selection.\n\
+            message = translate( "Arch" , "You can put anything but the following objects: Site, Building, and Floor - in a Floor object.\n\
+Floor object is not allowed to accept Site or Building objects.\n\
+Site, Building, and Floor objects will be removed from the selection.\n\
 You can change that in the preferences.") + "\n"
             ArchCommands.printMessage( message )
         if sel and len(floorobj) == 0: