diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp index 0479fb975d..cce02a49f7 100644 --- a/src/Gui/CommandDoc.cpp +++ b/src/Gui/CommandDoc.cpp @@ -517,10 +517,10 @@ StdCmdMergeProjects::StdCmdMergeProjects() { sAppModule = "File"; sGroup = "File"; - sMenuText = QT_TR_NOOP("Merge project..."); - sToolTipText = QT_TR_NOOP("Merge project"); + sMenuText = QT_TR_NOOP("Merge document..."); + sToolTipText = QT_TR_NOOP("Merge document"); sWhatsThis = "Std_MergeProjects"; - sStatusTip = QT_TR_NOOP("Merge project"); + sStatusTip = QT_TR_NOOP("Merge document"); sPixmap = "Std_MergeProjects"; } @@ -530,7 +530,7 @@ void StdCmdMergeProjects::activated(int iMsg) QString exe = qApp->applicationName(); QString project = FileDialog::getOpenFileName(Gui::getMainWindow(), - QString::fromUtf8(QT_TR_NOOP("Merge project")), FileDialog::getWorkingDirectory(), + QString::fromUtf8(QT_TR_NOOP("Merge document")), FileDialog::getWorkingDirectory(), QString::fromUtf8(QT_TR_NOOP("%1 document (*.FCStd)")).arg(exe)); if (!project.isEmpty()) { FileDialog::setWorkingDirectory(project); @@ -539,12 +539,12 @@ void StdCmdMergeProjects::activated(int iMsg) QFileInfo proj(project); if (proj == info) { QMessageBox::critical(Gui::getMainWindow(), - QString::fromUtf8(QT_TR_NOOP("Merge project")), - QString::fromUtf8(QT_TR_NOOP("Cannot merge project with itself."))); + QString::fromUtf8(QT_TR_NOOP("Merge document")), + QString::fromUtf8(QT_TR_NOOP("Cannot merge document with itself."))); return; } - doc->openTransaction("Merge project"); + doc->openTransaction("Merge document"); Base::FileInfo fi((const char*)project.toUtf8()); Base::ifstream str(fi, std::ios::in | std::ios::binary); MergeDocuments md(doc); @@ -825,10 +825,10 @@ StdCmdProjectInfo::StdCmdProjectInfo() { // setting the sGroup = "File"; - sMenuText = QT_TR_NOOP("Project i&nformation..."); - sToolTipText = QT_TR_NOOP("Show details of the currently active project"); + sMenuText = QT_TR_NOOP("Document i&nformation..."); + sToolTipText = QT_TR_NOOP("Show details of the currently active document"); sWhatsThis = "Std_ProjectInfo"; - sStatusTip = QT_TR_NOOP("Show details of the currently active project"); + sStatusTip = QT_TR_NOOP("Show details of the currently active document"); sPixmap = "document-properties"; } @@ -856,9 +856,9 @@ StdCmdProjectUtil::StdCmdProjectUtil() // setting the sGroup = "Tools"; sWhatsThis = "Std_ProjectUtil"; - sMenuText = QT_TR_NOOP("Project utility..."); - sToolTipText = QT_TR_NOOP("Utility to extract or create project files"); - sStatusTip = QT_TR_NOOP("Utility to extract or create project files"); + sMenuText = QT_TR_NOOP("Document utility..."); + sToolTipText = QT_TR_NOOP("Utility to extract or create document files"); + sStatusTip = QT_TR_NOOP("Utility to extract or create document files"); sPixmap = "Std_ProjectUtil"; } diff --git a/src/Gui/DlgProjectInformation.ui b/src/Gui/DlgProjectInformation.ui index 679d64a71f..38254cbcfe 100644 --- a/src/Gui/DlgProjectInformation.ui +++ b/src/Gui/DlgProjectInformation.ui @@ -11,7 +11,7 @@ - Project information + Document information true diff --git a/src/Gui/DlgProjectUtility.cpp b/src/Gui/DlgProjectUtility.cpp index c9877786b9..75de3e8fe1 100644 --- a/src/Gui/DlgProjectUtility.cpp +++ b/src/Gui/DlgProjectUtility.cpp @@ -101,7 +101,7 @@ void DlgProjectUtility::tryExtractArchive(const QString& source, const QString& Gui::Command::runCommand(Gui::Command::App, str.str().c_str()); } catch (const Base::Exception& e) { - QMessageBox::critical(this, tr("Failed to extract project"), QString::fromLatin1(e.what())); + QMessageBox::critical(this, tr("Failed to extract document"), QString::fromLatin1(e.what())); } } @@ -118,7 +118,7 @@ void DlgProjectUtility::tryCreateArchive(const QString& source, const QString& t } } catch (const Base::Exception& e) { - QMessageBox::critical(this, tr("Failed to create project"), QString::fromLatin1(e.what())); + QMessageBox::critical(this, tr("Failed to create document"), QString::fromLatin1(e.what())); } } diff --git a/src/Gui/DlgProjectUtility.ui b/src/Gui/DlgProjectUtility.ui index 9f0c2ea470..c6b3f3348e 100644 --- a/src/Gui/DlgProjectUtility.ui +++ b/src/Gui/DlgProjectUtility.ui @@ -11,7 +11,7 @@ - Project utility + Document utility @@ -19,7 +19,7 @@ - Extract project + Extract document @@ -32,7 +32,7 @@ - Project file (*.FCStd) + Document file (*.FCStd) @@ -69,7 +69,7 @@ - Create project + Create document @@ -134,7 +134,7 @@ - Load project file after creation + Load document file after creation diff --git a/src/Gui/PreferencePages/DlgSettingsGeneral.ui b/src/Gui/PreferencePages/DlgSettingsGeneral.ui index ca1a8b03b5..2bf14ce7c2 100644 --- a/src/Gui/PreferencePages/DlgSettingsGeneral.ui +++ b/src/Gui/PreferencePages/DlgSettingsGeneral.ui @@ -59,7 +59,7 @@ - Unit system for all parts of the application. Can be overridden by specifying a project unit system. + Unit system for all parts of the application. Can be overridden by specifying a document unit system. @@ -90,21 +90,21 @@ - Project unit system: + Document unit system: - Unit system stored in the current project + Unit system stored in the current document - If enabled, project unit systems are ignored + If enabled, document unit systems are ignored Ignore