diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp index ecf880dc1b..205100f1a2 100644 --- a/src/Gui/DocumentRecovery.cpp +++ b/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(); diff --git a/src/Gui/GestureNavigationStyle.cpp b/src/Gui/GestureNavigationStyle.cpp index 61c183c923..5237def414 100644 --- a/src/Gui/GestureNavigationStyle.cpp +++ b/src/Gui/GestureNavigationStyle.cpp @@ -1,6 +1,5 @@ /*************************************************************************** - * Copyright (c) Victor Titov (DeepSOIC) * - * (vv.titov@gmail.com) 2015 * + * Copyright (c) 2015 Victor Titov (DeepSOIC) * * * * 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"; } diff --git a/src/Gui/MayaGestureNavigationStyle.cpp b/src/Gui/MayaGestureNavigationStyle.cpp index 98da13a2aa..dd09521992 100644 --- a/src/Gui/MayaGestureNavigationStyle.cpp +++ b/src/Gui/MayaGestureNavigationStyle.cpp @@ -1,6 +1,5 @@ /*************************************************************************** - * Copyright (c) Victor Titov (DeepSOIC) * - * (vv.titov@gmail.com) 2015 * + * Copyright (c) 2015 Victor Titov (DeepSOIC) * * * * 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; } - diff --git a/src/Mod/Path/PathScripts/PathSanity.py b/src/Mod/Path/PathScripts/PathSanity.py index 5d401bd4aa..88485da7eb 100644 --- a/src/Mod/Path/PathScripts/PathSanity.py +++ b/src/Mod/Path/PathScripts/PathSanity.py @@ -162,4 +162,3 @@ class CommandPathSanity: if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand('Path_Sanity',CommandPathSanity()) - diff --git a/src/Mod/Spreadsheet/Gui/Command.cpp b/src/Mod/Spreadsheet/Gui/Command.cpp index d6b2145b34..7cc83d2e9a 100644 --- a/src/Mod/Spreadsheet/Gui/Command.cpp +++ b/src/Mod/Spreadsheet/Gui/Command.cpp @@ -518,7 +518,7 @@ CmdSpreadsheetAlignVCenter::CmdSpreadsheetAlignVCenter() sAppModule = "Spreadsheet"; sGroup = QT_TR_NOOP("Spreadsheet"); sMenuText = QT_TR_NOOP("Vertically center-align"); - sToolTipText = QT_TR_NOOP("Center-align contents vertically of selected cells"); + sToolTipText = QT_TR_NOOP("Vertically center-align contents of selected cells"); sWhatsThis = "Spreadsheet_AlignVCenter"; sStatusTip = sToolTipText; sPixmap = "SpreadsheetAlignVCenter"; @@ -718,7 +718,7 @@ CmdSpreadsheetStyleUnderline::CmdSpreadsheetStyleUnderline() sAppModule = "Spreadsheet"; sGroup = QT_TR_NOOP("Spreadsheet"); sMenuText = QT_TR_NOOP("Underline text"); - sToolTipText = QT_TR_NOOP("Set underline text in selected cells"); + sToolTipText = QT_TR_NOOP("Underline text in selected cells"); sWhatsThis = "Spreadsheet_StyleUnderline"; sStatusTip = sToolTipText; sPixmap = "SpreadsheetStyleUnderline"; @@ -904,4 +904,3 @@ void CreateSpreadsheetCommands(void) rcCmdMgr.addCommand(new CmdSpreadsheetSetAlias()); } -