diff --git a/common/lc_commands.cpp b/common/lc_commands.cpp index 9465fa4e..f3b53d89 100644 --- a/common/lc_commands.cpp +++ b/common/lc_commands.cpp @@ -8,7 +8,7 @@ const lcCommand gCommands[] = QT_TRANSLATE_NOOP("Action", "File.New"), QT_TRANSLATE_NOOP("Menu", "&New"), QT_TRANSLATE_NOOP("Status", "Create a new model"), - QT_TRANSLATE_NOOP("WhatsThis", "

New Project

Start a new project with an empty model. If the current project has unsaved changes, LeoCAD asks whether to save them before replacing it.

"), + QT_TRANSLATE_NOOP("WhatsThis", "

New Model

Create a new, empty model. If the current model has unsaved changes, LeoCAD asks whether to save them before replacing it.

"), "Ctrl+N" }, // LC_FILE_OPEN @@ -16,7 +16,7 @@ const lcCommand gCommands[] = QT_TRANSLATE_NOOP("Action", "File.Open"), QT_TRANSLATE_NOOP("Menu", "&Open..."), QT_TRANSLATE_NOOP("Status", "Open an existing model"), - QT_TRANSLATE_NOOP("WhatsThis", "

Open Project

Choose an existing model or project file to work on. If the current project has unsaved changes, save or discard those changes before opening the chosen file.

"), + QT_TRANSLATE_NOOP("WhatsThis", "

Open Model

Choose an existing model file to work on. If the current model has unsaved changes, save or discard those changes before opening the chosen file.

"), "Ctrl+O" }, // LC_FILE_MERGE @@ -32,7 +32,7 @@ const lcCommand gCommands[] = QT_TRANSLATE_NOOP("Action", "File.Save"), QT_TRANSLATE_NOOP("Menu", "&Save"), QT_TRANSLATE_NOOP("Status", "Save the current model"), - QT_TRANSLATE_NOOP("WhatsThis", "

Save Project

Write the current project, including its submodels, to disk. The first save asks for a filename. Use Save As to save a separate copy under another name.

"), + QT_TRANSLATE_NOOP("WhatsThis", "

Save Model

Save the model and its submodels to disk. The first save asks for a filename. Use Save As to save a separate copy under another name.

"), "Ctrl+S" }, // LC_FILE_SAVEAS @@ -328,7 +328,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Edit.SelectNone"), QT_TRANSLATE_NOOP("Menu", "Select &None"), - QT_TRANSLATE_NOOP("Status", "De-select everything"), + QT_TRANSLATE_NOOP("Status", "Deselect everything"), "", "" }, @@ -432,7 +432,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Edit.Snap.Toggle"), QT_TRANSLATE_NOOP("Menu", "Move Snap Enabled"), - QT_TRANSLATE_NOOP("Status", "Toggle snap axes"), + QT_TRANSLATE_NOOP("Status", "Toggle movement snapping"), "", "" }, @@ -743,8 +743,8 @@ const lcCommand gCommands[] = // LC_EDIT_ACTION_SPOTLIGHT { QT_TRANSLATE_NOOP("Action", "Edit.Tool.SpotLight"), - QT_TRANSLATE_NOOP("Menu", "Spot Light"), - QT_TRANSLATE_NOOP("Status", "Add new spot lights to the model"), + QT_TRANSLATE_NOOP("Menu", "Spotlight"), + QT_TRANSLATE_NOOP("Status", "Add new spotlights to the model"), QT_TRANSLATE_NOOP("WhatsThis", "

Spotlight Tool

Use the model view to create a directed cone of light. In Properties, adjust its position and target, cone angle, penumbra, and renderer-specific power.

"), "" }, @@ -752,7 +752,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Edit.Tool.DirectionalLight"), QT_TRANSLATE_NOOP("Menu", "Directional Light"), - QT_TRANSLATE_NOOP("Status", "Add new omnidirectional light sources to the model"), + QT_TRANSLATE_NOOP("Status", "Add new directional light sources to the model"), QT_TRANSLATE_NOOP("WhatsThis", "

Directional Light Tool

Create a light with parallel rays, such as sunlight. Its direction determines the illumination. Select it to adjust its transform, color, and renderer-specific settings in Properties.

"), "" }, @@ -896,7 +896,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "View.ZoomExtents"), QT_TRANSLATE_NOOP("Menu", "Zoom E&xtents"), - QT_TRANSLATE_NOOP("Status", "Fit all pieces in the current view (hold the CTRL key down to zoom all views)"), + QT_TRANSLATE_NOOP("Status", "Fit all pieces in the current view"), "", "" }, @@ -1439,8 +1439,8 @@ const lcCommand gCommands[] = // LC_PIECE_REMOVE_KEY_FRAMES { QT_TRANSLATE_NOOP("Action", "Piece.RemoveKeyFrames"), - QT_TRANSLATE_NOOP("Menu", "Remove &Key Frames"), - QT_TRANSLATE_NOOP("Status", "Remove all key frames from the selected pieces"), + QT_TRANSLATE_NOOP("Menu", "Remove &Keyframes"), + QT_TRANSLATE_NOOP("Status", "Remove all keyframes from the selected pieces"), "", "" }, @@ -1536,7 +1536,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Piece.Rotate.PlusX"), QT_TRANSLATE_NOOP("Menu", "Rotate +X"), - QT_TRANSLATE_NOOP("Status", "Rotate selected objects along the X axis"), + QT_TRANSLATE_NOOP("Status", "Rotate selected objects around the X axis"), "", "Shift+Down" }, @@ -1544,7 +1544,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Piece.Rotate.MinusX"), QT_TRANSLATE_NOOP("Menu", "Rotate -X"), - QT_TRANSLATE_NOOP("Status", "Rotate selected objects along the X axis"), + QT_TRANSLATE_NOOP("Status", "Rotate selected objects around the X axis"), "", "Shift+Up" }, @@ -1552,7 +1552,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Piece.Rotate.PlusY"), QT_TRANSLATE_NOOP("Menu", "Rotate +Y"), - QT_TRANSLATE_NOOP("Status", "Rotate selected objects along the Y axis"), + QT_TRANSLATE_NOOP("Status", "Rotate selected objects around the Y axis"), "", "Shift+Right" }, @@ -1560,7 +1560,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Piece.Rotate.MinusY"), QT_TRANSLATE_NOOP("Menu", "Rotate -Y"), - QT_TRANSLATE_NOOP("Status", "Rotate selected objects along the Y axis"), + QT_TRANSLATE_NOOP("Status", "Rotate selected objects around the Y axis"), "", "Shift+Left" }, @@ -1568,7 +1568,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Piece.Rotate.PlusZ"), QT_TRANSLATE_NOOP("Menu", "Rotate +Z"), - QT_TRANSLATE_NOOP("Status", "Rotate selected objects along the Z axis"), + QT_TRANSLATE_NOOP("Status", "Rotate selected objects around the Z axis"), "", "Shift+PgUp" }, @@ -1576,7 +1576,7 @@ const lcCommand gCommands[] = { QT_TRANSLATE_NOOP("Action", "Piece.Rotate.MinusZ"), QT_TRANSLATE_NOOP("Menu", "Rotate -Z"), - QT_TRANSLATE_NOOP("Status", "Rotate selected objects along the Z axis"), + QT_TRANSLATE_NOOP("Status", "Rotate selected objects around the Z axis"), "", "Shift+PgDown" }, diff --git a/common/lc_htmldialog.ui b/common/lc_htmldialog.ui index 2f9f0543..9c1040a7 100644 --- a/common/lc_htmldialog.ui +++ b/common/lc_htmldialog.ui @@ -97,7 +97,7 @@ - <p><b>Models</b></p><p>Export all models in the project, only the current model, or the current model with the submodels it references. When several models are exported, an overall index links to their instructions.</p> + <p><b>Models</b></p><p>Export instructions for the model and all submodels, only the model or submodel being edited, or that entry with its referenced submodels. When several entries are exported, an overall index links to their instructions.</p> Models @@ -106,7 +106,7 @@ - Export instructions for every model in the project. + Export instructions for the model and all submodels. All Models diff --git a/common/lc_library.cpp b/common/lc_library.cpp index 80201627..71b21c2d 100644 --- a/common/lc_library.cpp +++ b/common/lc_library.cpp @@ -166,7 +166,7 @@ lcResult lcPiecesLibrary::LoadExternalProject(const QFileInfo& FileInf const QString Path = FileInfo.canonicalFilePath(); if (std::find(LoadingPaths.begin(), LoadingPaths.end(), Path) != LoadingPaths.end()) - return lcUnexpected(tr("External project include cycle at '%1'.").arg(Path)); + return lcUnexpected(tr("Circular reference between external model files at '%1'.").arg(Path)); LoadingPaths.push_back(Path); @@ -179,7 +179,7 @@ lcResult lcPiecesLibrary::LoadExternalProject(const QFileInfo& FileInf if (!Loaded) { delete ExternalProject; - return lcUnexpected(tr("Could not load external project '%1'.").arg(FileInfo.absoluteFilePath())); + return lcUnexpected(tr("Could not load external model file '%1'.").arg(FileInfo.absoluteFilePath())); } return ExternalProject; @@ -267,7 +267,7 @@ bool lcPiecesLibrary::RemapProjectPieceData(lcPieceData* PieceData, const QStrin else { PieceData->DetachContainer(); - PieceData->SetFailed(tr("Could not find external project '%1'.").arg(Candidate.absoluteFilePath())); + PieceData->SetFailed(tr("Could not find external model file '%1'.").arg(Candidate.absoluteFilePath())); } NotifyAssetStatusChanged(); diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index b6056db2..eaece88b 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -643,7 +643,7 @@ void lcMainWindow::CreateToolBars() mStandardToolBar = addToolBar(tr("Standard")); mStandardToolBar->setObjectName("StandardToolbar"); - mStandardToolBar->setWhatsThis(tr("

Standard Toolbar

Use file controls to create, open, and save projects, and Undo or Redo to navigate edit history. Before moving or rotating objects, choose the selection rule, coordinate reference, and snapping increments from the four drop-down controls. Help > What's This? explains individual controls.

")); + mStandardToolBar->setWhatsThis(tr("

Standard Toolbar

Use file controls to create, open, and save models, and Undo or Redo to navigate edit history. Before moving or rotating objects, choose the selection rule, coordinate reference, and snapping increments from the four drop-down controls. Help > What's This? explains individual controls.

")); mStandardToolBar->addAction(mActions[LC_FILE_NEW]); mStandardToolBar->addAction(mActions[LC_FILE_OPEN]); mStandardToolBar->addAction(mActions[LC_FILE_SAVE]); @@ -2821,7 +2821,7 @@ bool lcMainWindow::SaveProject(const QString& FileName) if (QFileInfo(SaveFileName).suffix().toLower() == QLatin1String("lcd")) { - QMessageBox::warning(this, tr("Save Project"), tr("Saving files in LCD format is no longer supported. Please use the LDR or MPD formats instead.")); + QMessageBox::warning(this, tr("Save Model"), tr("Saving files in LCD format is no longer supported. Please use the LDR or MPD formats instead.")); return false; } @@ -2829,7 +2829,7 @@ bool lcMainWindow::SaveProject(const QString& FileName) if (!SaveResult) { - QMessageBox::warning(this, tr("Save Project"), SaveResult.error()); + QMessageBox::warning(this, tr("Save Model"), SaveResult.error()); return false; } diff --git a/common/lc_model.cpp b/common/lc_model.cpp index 725a9bbb..4ec7e1ce 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -3509,7 +3509,7 @@ void lcModel::RemoveSelectedObjectsKeyFrames() Light->RemoveKeyFrames(); EndEditHistory(); - EndHistorySequence(tr("Remove Key Frames")); + EndHistorySequence(tr("Remove Keyframes")); } void lcModel::InsertControlPoint() @@ -4329,7 +4329,7 @@ void lcModel::SetObjectsKeyFrame(const std::vector& Objects, lcObject if (Modified) { EndEditHistory(); - EndHistorySequence(KeyFrame ? tr("Add Key Frame") : tr("Remove Key Frame")); + EndHistorySequence(KeyFrame ? tr("Add Keyframe") : tr("Remove Keyframe")); gMainWindow->UpdateSelectedObjects(false); } @@ -5707,7 +5707,7 @@ void lcModel::InsertLightToolClicked(const lcVector3& Position, lcLightType Ligh break; case lcLightType::Spot: - ActionName = tr("Add Spot Light"); + ActionName = tr("Add Spotlight"); break; case lcLightType::Directional: diff --git a/common/lc_modellistdialog.ui b/common/lc_modellistdialog.ui index 91b01f83..dd6fa9c7 100644 --- a/common/lc_modellistdialog.ui +++ b/common/lc_modellistdialog.ui @@ -3,7 +3,7 @@ lcModelListDialog - <p><b>Submodels</b></p><p>Manage the models stored in this project. Create, rename, duplicate, delete, or reorder them, then choose OK to apply the changes. Cancel discards the list changes; files already exported remain on disk.</p><p>Drag list entries to change their order. Use Set Active to switch to the current list item when applying changes.</p> + <p><b>Submodels</b></p><p>Manage the model and its submodels. Create, rename, duplicate, delete, or reorder entries, then choose OK to apply the changes. Cancel discards the list changes; files already exported remain on disk.</p><p>Drag list entries to change their order. Use Set Active to switch to the current list item when applying changes.</p> @@ -28,7 +28,7 @@ Submodels - <p><b>Model List</b></p><p>Select one or more entries for actions such as Rename, Duplicate, Export, or Delete. Drag entries to reorder them. Double-click an entry to apply the list changes and make that model active.</p><p>Names must be unique within the project; capitalization alone does not make a name unique.</p> + <p><b>Model List</b></p><p>Select one or more entries for actions such as Rename, Duplicate, Export, or Delete. Drag entries to reorder them. Double-click an entry to apply the list changes and make that entry active.</p><p>Model and submodel names must be unique; capitalization alone does not make a name unique.</p> QAbstractItemView::ExtendedSelection @@ -40,7 +40,7 @@ - Add a new empty submodel to the project. + Add a new empty submodel. &New... @@ -50,10 +50,10 @@ - Remove the selected models from the project. + Remove the selected entries. - <p><b>Delete Submodels</b></p><p>Remove the selected entries after confirmation. At least one model must remain. The project is changed when you accept this dialog.</p> + <p><b>Delete Submodels</b></p><p>Remove the selected entries after confirmation. At least one entry must remain. Changes take effect when you accept this dialog.</p> D&elete... @@ -99,7 +99,7 @@ Switch to the current list item when applying the changes. - <p><b>Set Active</b></p><p>When checked, accepting this dialog makes the current list item the active model for editing. When unchecked, the existing active model is retained if it remains in the project.</p> + <p><b>Set Active</b></p><p>When checked, accepting this dialog makes the current list entry active for editing. When unchecked, the existing active entry is retained if it remains in the list.</p> Set Active diff --git a/common/lc_propertieswidget.cpp b/common/lc_propertieswidget.cpp index a8311edb..64cb7b2f 100644 --- a/common/lc_propertieswidget.cpp +++ b/common/lc_propertieswidget.cpp @@ -170,7 +170,7 @@ void lcPropertiesWidget::UpdateKeyFrameWidget(lcObjectPropertyId PropertyId) void lcPropertiesWidget::AddKeyFrameWidget(lcObjectPropertyId PropertyId) { lcKeyFrameWidget* Widget = new lcKeyFrameWidget(this); - Widget->setToolTip(tr("Toggle Key Frame")); + Widget->setToolTip(tr("Toggle Keyframe")); connect(Widget, &QCheckBox::stateChanged, this, &lcPropertiesWidget::KeyFrameChanged); @@ -1224,8 +1224,8 @@ void lcPropertiesWidget::CreateWidgets() AddSpacing(); - AddFloatProperty(lcObjectPropertyId::LightSpotConeAngle, tr("Cone Angle"), tr("Angle in degrees of the spot light's beam"), true, 0.0f, 179.9f); - AddFloatProperty(lcObjectPropertyId::LightSpotPenumbraAngle, tr("Penumbra Angle"), tr("Angle in degrees over which the intensity of the spot light falls off to zero"), true, 0.0f, 179.9f); + AddFloatProperty(lcObjectPropertyId::LightSpotConeAngle, tr("Cone Angle"), tr("Angle in degrees of the spotlight's beam"), true, 0.0f, 179.9f); + AddFloatProperty(lcObjectPropertyId::LightSpotPenumbraAngle, tr("Penumbra Angle"), tr("Angle in degrees over which the intensity of the spotlight falls off to zero"), true, 0.0f, 179.9f); AddStringListProperty(lcObjectPropertyId::LightAreaShape, tr("Area Shape"), tr("The shape of the area light"), false, lcLight::GetAreaShapeStrings()); AddFloatProperty(lcObjectPropertyId::LightAreaSizeX, tr("Size X"), tr("The width of the area light"), true, 0.0f, FLT_MAX); AddFloatProperty(lcObjectPropertyId::LightAreaSizeY, tr("Y"), tr("The height of the area light"), true, 0.0f, FLT_MAX); @@ -1245,7 +1245,7 @@ void lcPropertiesWidget::CreateWidgets() AddFloatProperty(lcObjectPropertyId::LightPOVRayPower, tr("Power"), tr("Power of the light (multiplicative factor)"), true, 0.0f, FLT_MAX); AddFloatProperty(lcObjectPropertyId::LightPOVRayFadeDistance, tr("Fade Distance"), tr("The distance at which the full light intensity arrives"), true, 0.0f, FLT_MAX); AddFloatProperty(lcObjectPropertyId::LightPOVRayFadePower, tr("Fade Power"), tr("Light falloff rate"), true, 0.0f, FLT_MAX); - AddFloatProperty(lcObjectPropertyId::LightPOVRaySpotTightness, tr("Tightness"), tr("Additional exponential spot light edge softening"), true, 0.0f, FLT_MAX); + AddFloatProperty(lcObjectPropertyId::LightPOVRaySpotTightness, tr("Tightness"), tr("Additional exponential spotlight edge softening"), true, 0.0f, FLT_MAX); AddIntegerProperty(lcObjectPropertyId::LightPOVRayAreaGridX, tr("Grid X"), tr("Number of point sources along the X axis"), true, 1, INT_MAX); AddIntegerProperty(lcObjectPropertyId::LightPOVRayAreaGridY, tr("Y"), tr("Number of point sources along the Y axis"), true, 1, INT_MAX); diff --git a/common/light.cpp b/common/light.cpp index 37f1360d..a7787bba 100644 --- a/common/light.cpp +++ b/common/light.cpp @@ -43,7 +43,7 @@ QString lcLight::GetLightTypeString(lcLightType LightType) return QT_TRANSLATE_NOOP("Light Types", "Point Light"); case lcLightType::Spot: - return QT_TRANSLATE_NOOP("Light Types", "Spot Light"); + return QT_TRANSLATE_NOOP("Light Types", "Spotlight"); case lcLightType::Directional: return QT_TRANSLATE_NOOP("Light Types", "Directional Light"); @@ -175,7 +175,7 @@ void lcLight::CreateName(const std::vector>& Lights) break; case lcLightType::Spot: - Prefix = QLatin1String("Spot Light "); + Prefix = QLatin1String("Spotlight "); break; case lcLightType::Directional: diff --git a/common/object.cpp b/common/object.cpp index 3a20c30e..f8f19817 100644 --- a/common/object.cpp +++ b/common/object.cpp @@ -90,13 +90,13 @@ QString lcObject::GetCheckpointString(lcObjectPropertyId PropertyId) return QT_TRANSLATE_NOOP("Checkpoint", "Change Area Light Y Size"); case lcObjectPropertyId::LightSpotConeAngle: - return QT_TRANSLATE_NOOP("Checkpoint", "Change Spot Light Cone Angle"); + return QT_TRANSLATE_NOOP("Checkpoint", "Change Spotlight Cone Angle"); case lcObjectPropertyId::LightSpotPenumbraAngle: - return QT_TRANSLATE_NOOP("Checkpoint", "Change Spot Light Penumbra Angle"); + return QT_TRANSLATE_NOOP("Checkpoint", "Change Spotlight Penumbra Angle"); case lcObjectPropertyId::LightPOVRaySpotTightness: - return QT_TRANSLATE_NOOP("Checkpoint", "Change Spot Light POV-Ray Tightness"); + return QT_TRANSLATE_NOOP("Checkpoint", "Change Spotlight POV-Ray Tightness"); case lcObjectPropertyId::LightAreaShape: return QT_TRANSLATE_NOOP("Checkpoint", "Change Area Light Shape"); diff --git a/common/project.cpp b/common/project.cpp index 3c6e1c51..37ad93fc 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -327,7 +327,7 @@ QString Project::GetNewModelName(QWidget* ParentWidget, const QString& DialogTit if (ExistingPiece && (!CurrentModel || ExistingPiece != CurrentModel->GetPieceData()) && (!ExistingPiece->IsModel() || ExistingModels.contains(Name, Qt::CaseInsensitive))) { - QMessageBox::information(ParentWidget, DialogTitle, tr("A piece named '%1' already exists in this project. Please enter a unique name.").arg(Name)); + QMessageBox::information(ParentWidget, DialogTitle, tr("A piece named '%1' already exists in this model. Please enter a unique name.").arg(Name)); continue; } } @@ -411,7 +411,7 @@ void Project::ShowModelListDialog() if (!FinalNames.insert(Name).second) { - QMessageBox::information(gMainWindow, tr("Submodels"), tr("A piece named '%1' already exists in this project.").arg(Entry.Name)); + QMessageBox::information(gMainWindow, tr("Submodels"), tr("A piece named '%1' already exists in this model.").arg(Entry.Name)); return; } @@ -438,7 +438,7 @@ void Project::ShowModelListDialog() if (!Vacated) { - QMessageBox::information(gMainWindow, tr("Submodels"), tr("A piece named '%1' already exists in this project.").arg(Entry.Name)); + QMessageBox::information(gMainWindow, tr("Submodels"), tr("A piece named '%1' already exists in this model.").arg(Entry.Name)); return; } } @@ -495,7 +495,7 @@ void Project::ShowModelListDialog() if (!lcGetPiecesLibrary()->RenameModelPieceData(Model->GetPieceData(), Entry.Name.toLatin1().constData())) { - QMessageBox::information(gMainWindow, tr("Submodels"), tr("A piece named '%1' already exists in this project.").arg(Entry.Name)); + QMessageBox::information(gMainWindow, tr("Submodels"), tr("A piece named '%1' already exists in this model.").arg(Entry.Name)); return; } @@ -1500,7 +1500,7 @@ lcResult Project::MergeInternal(const std::vector& Sources, cons const auto Existing = MergedData.find(Name); if (Existing != MergedData.end() && !SameEmbeddedData(*Existing->second, *Data)) - return lcUnexpected(tr("Both projects contain different embedded data named '%1'. Rename one before merging.").arg(Data->FileName)); + return lcUnexpected(tr("Both models contain different embedded data named '%1'. Rename one before merging.").arg(Data->FileName)); MergedData.emplace(Name, Data); } @@ -1568,7 +1568,7 @@ lcResult Project::MergeInternal(const std::vector& Sources, cons for (const std::map::value_type& Entry : Source->mPieceIndex) { if (!RegisterSourcePiece(Entry.first, Entry.second)) - return lcUnexpected(tr("Both projects contain different pieces named '%1'. Rename one before merging.").arg(ConflictName)); + return lcUnexpected(tr("Both models contain different pieces named '%1'. Rename one before merging.").arg(ConflictName)); } for (const std::unique_ptr& Model : Source->mModels) @@ -1580,7 +1580,7 @@ lcResult Project::MergeInternal(const std::vector& Sources, cons const std::string Name = lcPiecesLibrary::NormalizePieceDataName(Piece->GetID().toLatin1().constData()); if (!RegisterSourcePiece(Name, Piece->mPieceData.Get())) - return lcUnexpected(tr("Both projects contain different pieces named '%1'. Rename one before merging.").arg(ConflictName)); + return lcUnexpected(tr("Both models contain different pieces named '%1'. Rename one before merging.").arg(ConflictName)); } } } diff --git a/qt/lc_qpreferencesdialog.ui b/qt/lc_qpreferencesdialog.ui index 4c9719ac..de2cbcda 100644 --- a/qt/lc_qpreferencesdialog.ui +++ b/qt/lc_qpreferencesdialog.ui @@ -406,7 +406,7 @@ - Restore saved model tabs and view layouts when opening a project. + Restore saved model tabs and view layouts when opening a model. Restore tab layout diff --git a/qt/lc_qpropertiesdialog.ui b/qt/lc_qpropertiesdialog.ui index 7e334cdb..81baeddf 100644 --- a/qt/lc_qpropertiesdialog.ui +++ b/qt/lc_qpropertiesdialog.ui @@ -24,7 +24,7 @@ - <p><b>Model Summary</b></p><p>Author, description, and comments are stored with this model when the project is saved. Measurements show its overall size.</p> + <p><b>Model Summary</b></p><p>Author, description, and comments are stored in the model file when you save it. Measurements show its overall size.</p> diff --git a/qt/qtmain.cpp b/qt/qtmain.cpp index c4f0efd6..373b2501 100644 --- a/qt/qtmain.cpp +++ b/qt/qtmain.cpp @@ -87,7 +87,7 @@ static void lcRegisterShellFileTypes() if (GetShortPathName(LongModulePath, ModulePath, _MAX_PATH) == 0) lstrcpy(ModulePath, LongModulePath); - if (RegSetValue(HKEY_CLASSES_ROOT, TEXT("LeoCAD.Project"), REG_SZ, TEXT("LeoCAD Project"), lstrlen(TEXT("LeoCAD Project")) * sizeof(TCHAR)) != ERROR_SUCCESS) + if (RegSetValue(HKEY_CLASSES_ROOT, TEXT("LeoCAD.Project"), REG_SZ, TEXT("LeoCAD Model"), lstrlen(TEXT("LeoCAD Model")) * sizeof(TCHAR)) != ERROR_SUCCESS) return; lstrcpy(Temp, ModulePath);