diff -Nru librecad-2.0.3/debian/bzr-builder.manifest librecad-2.0.4/debian/bzr-builder.manifest --- librecad-2.0.3/debian/bzr-builder.manifest 2014-04-25 19:26:09.000000000 +0000 +++ librecad-2.0.4/debian/bzr-builder.manifest 2014-06-24 10:32:48.000000000 +0000 @@ -1,2 +1,2 @@ # bzr-builder format 0.3 deb-version {debversion}~daily -lp:debian/librecad revid:package-import@ubuntu.com-20140423160106-44hg7qvejkdm4xuf +lp:debian/librecad revid:package-import@ubuntu.com-20140623215219-yl236oeiag3vta79 diff -Nru librecad-2.0.3/debian/changelog librecad-2.0.4/debian/changelog --- librecad-2.0.3/debian/changelog 2014-04-25 19:26:09.000000000 +0000 +++ librecad-2.0.4/debian/changelog 2014-06-24 10:32:48.000000000 +0000 @@ -1,8 +1,14 @@ -librecad (2.0.3-2~daily~ubuntu14.10.1) utopic; urgency=low +librecad (2.0.4-1~daily~ubuntu14.10.1) utopic; urgency=low * Auto build. - -- Launchpad Package Builder Fri, 25 Apr 2014 19:26:09 +0000 + -- Launchpad Package Builder Tue, 24 Jun 2014 10:32:48 +0000 + +librecad (2.0.4-1) unstable; urgency=medium + + * New upstream release. + + -- Scott Howard Mon, 23 Jun 2014 21:52:19 -0400 librecad (2.0.3-2) unstable; urgency=low diff -Nru librecad-2.0.3/desktop/graphics_program_icons/circle2pr.svg librecad-2.0.4/desktop/graphics_program_icons/circle2pr.svg --- librecad-2.0.3/desktop/graphics_program_icons/circle2pr.svg 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/desktop/graphics_program_icons/circle2pr.svg 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,164 @@ + + + + diff -Nru librecad-2.0.3/libraries/jwwlib/src/dl_entities.h librecad-2.0.4/libraries/jwwlib/src/dl_entities.h --- librecad-2.0.3/libraries/jwwlib/src/dl_entities.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/libraries/jwwlib/src/dl_entities.h 2014-05-30 03:54:17.000000000 +0000 @@ -51,7 +51,7 @@ int lFlags,bool lPlotF) { name = lName; flags = lFlags; - plotF = lPlotF;//set help Layer, if plotF is false. + plotF = lPlotF;//set construction Layer, if plotF is false. } /** Layer name. */ diff -Nru librecad-2.0.3/libraries/libdxfrw/src/drw_entities.cpp librecad-2.0.4/libraries/libdxfrw/src/drw_entities.cpp --- librecad-2.0.3/libraries/libdxfrw/src/drw_entities.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/libraries/libdxfrw/src/drw_entities.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -21,19 +21,30 @@ * @author Rallaz */ void DRW_Entity::calculateAxis(DRW_Coord extPoint){ + //Follow the arbitrary DXF definitions for extrusion axes. if (fabs(extPoint.x) < 0.015625 && fabs(extPoint.y) < 0.015625) { + //If we get here, implement Ax = Wy x N where Wy is [0,1,0] per the DXF spec. + //The cross product works out to Wy.y*N.z-Wy.z*N.y, Wy.z*N.x-Wy.x*N.z, Wy.x*N.y-Wy.y*N.x + //Factoring in the fixed values for Wy gives N.z,0,-N.x extAxisX.x = extPoint.z; extAxisX.y = 0; extAxisX.z = -extPoint.x; } else { + //Otherwise, implement Ax = Wz x N where Wz is [0,0,1] per the DXF spec. + //The cross product works out to Wz.y*N.z-Wz.z*N.y, Wz.z*N.x-Wz.x*N.z, Wz.x*N.y-Wz.y*N.x + //Factoring in the fixed values for Wz gives -N.y,N.x,0. extAxisX.x = -extPoint.y; extAxisX.y = extPoint.x; extAxisX.z = 0; } + extAxisX.unitize(); + + //Ay = N x Ax extAxisY.x = (extPoint.y * extAxisX.z) - (extAxisX.y * extPoint.z); extAxisY.y = (extPoint.z * extAxisX.x) - (extAxisX.z * extPoint.x); extAxisY.z = (extPoint.x * extAxisX.y) - (extAxisX.x * extPoint.y); + extAxisY.unitize(); } //! Extrude a point using arbitary axis @@ -141,6 +152,8 @@ void DRW_Circle::applyExtrusion(){ if (haveExtrusion) { + //NOTE: Commenting these out causes the the arcs being tested to be located + //on the other side of the y axis (all x dimensions are negated). calculateAxis(extPoint); extrudePoint(extPoint, &basePoint); } @@ -157,6 +170,26 @@ } } +void DRW_Arc::applyExtrusion(){ + DRW_Circle::applyExtrusion(); + + if(haveExtrusion){ + // If the extrusion vector has a z value less than 0, the angles for the arc + // have to be mirrored since DXF files use the right hand rule. + // Note that the following code only handles the special case where there is a 2D + // drawing with the z axis heading into the paper (or rather screen). An arbitrary + // extrusion axis (with x and y values greater than 1/64) may still have issues. + if (fabs(extPoint.x) < 0.015625 && fabs(extPoint.y) < 0.015625 && extPoint.z < 0.0) { + staangle=M_PI-staangle; + endangle=M_PI-endangle; + + double temp = staangle; + staangle=endangle; + endangle=temp; + } + } +} + void DRW_Arc::parseCode(int code, dxfReader *reader){ switch (code) { case 50: diff -Nru librecad-2.0.3/libraries/libdxfrw/src/drw_entities.h librecad-2.0.4/libraries/libdxfrw/src/drw_entities.h --- librecad-2.0.3/libraries/libdxfrw/src/drw_entities.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/libraries/libdxfrw/src/drw_entities.h 2014-05-30 03:54:17.000000000 +0000 @@ -223,7 +223,7 @@ isccw = 1; } - virtual void applyExtrusion(){DRW_Circle::applyExtrusion();} + virtual void applyExtrusion(); void parseCode(int code, dxfReader *reader); public: diff -Nru librecad-2.0.3/libraries/libraries.pro librecad-2.0.4/libraries/libraries.pro --- librecad-2.0.3/libraries/libraries.pro 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/libraries/libraries.pro 2014-05-30 03:54:17.000000000 +0000 @@ -12,8 +12,8 @@ libdxfrw \ jwwlib -equals(build_muparser, "true"){ - message("build muparser from source") +macx|win32|equals(build_muparser, "true"){ + message("Using bundled muparser lib") SUBDIRS += muparser }else{ message("Using external muparser lib") Binary files /tmp/zdkEr1kKGA/librecad-2.0.3/librecad/res/extui/circle2pr.png and /tmp/aYvp1xo_bG/librecad-2.0.4/librecad/res/extui/circle2pr.png differ diff -Nru librecad-2.0.3/librecad/res/extui/extui.qrc librecad-2.0.4/librecad/res/extui/extui.qrc --- librecad-2.0.3/librecad/res/extui/extui.qrc 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/res/extui/extui.qrc 2014-05-30 03:54:17.000000000 +0000 @@ -187,5 +187,6 @@ circletan1_2p.png circletan2_1p.png reverse.png + circle2pr.png diff -Nru librecad-2.0.3/librecad/res/ui/ui.qrc librecad-2.0.4/librecad/res/ui/ui.qrc --- librecad-2.0.3/librecad/res/ui/ui.qrc 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/res/ui/ui.qrc 2014-05-30 03:54:17.000000000 +0000 @@ -43,7 +43,6 @@ linetype06.png linetype07.png mouse.png - viewdraft.png viewgrid.png visibleblock.png visiblelayer.png Binary files /tmp/zdkEr1kKGA/librecad-2.0.3/librecad/res/ui/viewdraft.png and /tmp/aYvp1xo_bG/librecad-2.0.4/librecad/res/ui/viewdraft.png differ diff -Nru librecad-2.0.3/librecad/src/actions/lc_actiondrawcircle2pr.cpp librecad-2.0.4/librecad/src/actions/lc_actiondrawcircle2pr.cpp --- librecad-2.0.3/librecad/src/actions/lc_actiondrawcircle2pr.cpp 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/librecad/src/actions/lc_actiondrawcircle2pr.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,248 @@ +/**************************************************************************** +* +This file is part of the LibreCAD project, a 2D CAD program + +Copyright (C) 2014 Dongxu Li (dongxuli2011 at gmail.com) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**********************************************************************/ + +#include "lc_actiondrawcircle2pr.h" + +#include +#include "rs_dialogfactory.h" +#include "rs_graphicview.h" +#include "rs_commandevent.h" + + + +LC_ActionDrawCircle2PR::LC_ActionDrawCircle2PR(RS_EntityContainer& container, + RS_GraphicView& graphicView) + :RS_ActionDrawCircleCR(container, graphicView) +{ + reset(); +} + + + +LC_ActionDrawCircle2PR::~LC_ActionDrawCircle2PR() {} + + +QAction* LC_ActionDrawCircle2PR::createGUIAction(RS2::ActionType /*type*/, QObject* /*parent*/) { + // "Circle: 2 Points, Radius" + QAction* action = new QAction(tr("2 Points, Radius"), NULL); + action->setIcon(QIcon(":/extui/circle2pr.png")); + return action; +} + + + +void LC_ActionDrawCircle2PR::reset() { + data.reset(); + data.radius=0.; + point1 = RS_Vector(false); + point2 = RS_Vector(false); +} + + + +void LC_ActionDrawCircle2PR::init(int status) { + RS_PreviewActionInterface::init(status); + + reset(); +} + + + +void LC_ActionDrawCircle2PR::trigger() { + RS_PreviewActionInterface::trigger(); + + RS_Circle* circle = new RS_Circle(container, + data); + circle->setLayerToActive(); + circle->setPenToActive(); + container->addEntity(circle); + + // upd. undo list: + if (document!=NULL) { + document->startUndoCycle(); + document->addUndoable(circle); + document->endUndoCycle(); + } + RS_Vector rz = graphicView->getRelativeZero(); + graphicView->redraw(RS2::RedrawDrawing); + graphicView->moveRelativeZero(rz); + drawSnapper(); + + setStatus(SetPoint1); + reset(); +} + + +bool LC_ActionDrawCircle2PR::preparePreview(const RS_Vector& mouse) { + const RS_Vector vp=(point1 + point2)*0.5; + const RS_Vector dvp=RS_Vector(point1.angleTo(point2) + 0.5*M_PI)*sqrt(data.radius*data.radius-0.25*point1.squaredTo(point2)); + const RS_Vector center1= vp + dvp; + const RS_Vector center2= vp - dvp; + + if( center1.squaredTo(center2) < RS_TOLERANCE ) { + //no need to select center, as only one solution possible + data.center=vp; + return false; + } + + const double ds=mouse.squaredTo(center1) - mouse.squaredTo(center2); + if (ds < 0. ){ + data.center=center1; + return true; + } + if (ds > 0. ){ + data.center=center2; + return true; + } + data.center.valid=false; + return false; + +} + + + +void LC_ActionDrawCircle2PR::mouseMoveEvent(QMouseEvent* e) { + RS_Vector mouse = snapPoint(e); + + switch (getStatus()) { + case SetPoint1: + point1 = mouse; + break; + + case SetPoint2: + if(mouse.distanceTo(point1) <= 2.*data.radius) point2 = mouse; + break; + + case SelectCenter: { + if(preparePreview(mouse)){ + RS_Circle* circle = new RS_Circle(preview, data); + + deletePreview(); + preview->addEntity(circle); + drawPreview(); + }else{ + if(data.isValid()) trigger(); + } + } +} +} + + + +void LC_ActionDrawCircle2PR::mouseReleaseEvent(QMouseEvent* e) { + if (e->button()==Qt::LeftButton) { + RS_CoordinateEvent ce(snapPoint(e)); + coordinateEvent(&ce); + } else if (e->button()==Qt::RightButton) { + deletePreview(); + init(getStatus()-1); + } +} + + + +void LC_ActionDrawCircle2PR::coordinateEvent(RS_CoordinateEvent* e) { + if (e==NULL) { + return; + } + RS_Vector mouse = e->getCoordinate(); + + switch (getStatus()) { + case SetPoint1: + point1 = mouse; + graphicView->moveRelativeZero(mouse); + setStatus(SetPoint2); + break; + + case SetPoint2: + if(mouse.distanceTo(point1) <= 2.*data.radius){ + point2 = mouse; + graphicView->moveRelativeZero(mouse); + setStatus(SelectCenter); + }else{ + RS_DIALOGFACTORY->commandMessage(tr("radius=%1 is too small for points selected\ndistance between points=%2 is larger than diameter=%3"). + arg(data.radius).arg(point1.distanceTo(point2)).arg(2.*data.radius)); + } + break; + + case SelectCenter: { + bool showPreview=preparePreview(mouse); + if(showPreview || data.isValid()) + trigger(); + else + RS_DIALOGFACTORY->commandMessage(tr("Select from two possible circle centers")); + } + break; + + default: + break; + } +} + + + +void LC_ActionDrawCircle2PR::commandEvent(RS_CommandEvent* e) { + QString c = e->getCommand().toLower(); + + if (checkCommand("help", c)) { + RS_DIALOGFACTORY->commandMessage(msgAvailableCommands() + + getAvailableCommands().join(", ")); + return; + } +} + + + +QStringList LC_ActionDrawCircle2PR::getAvailableCommands() { + QStringList cmd; + return cmd; +} + + + +void LC_ActionDrawCircle2PR::updateMouseButtonHints() { + switch (getStatus()) { + case SetPoint1: + RS_DIALOGFACTORY->updateMouseWidget(tr("Specify first point"), + tr("Cancel")); + break; + case SetPoint2: + RS_DIALOGFACTORY->updateMouseWidget(tr("Specify second point"), + tr("Back")); + break; + case SelectCenter: + RS_DIALOGFACTORY->updateMouseWidget(tr("Select circle center"), + tr("Back")); + break; + default: + RS_DIALOGFACTORY->updateMouseWidget("", ""); + break; + } +} + + + +void LC_ActionDrawCircle2PR::updateMouseCursor() { + graphicView->setMouseCursor(RS2::CadCursor); +} + +// EOF + diff -Nru librecad-2.0.3/librecad/src/actions/lc_actiondrawcircle2pr.h librecad-2.0.4/librecad/src/actions/lc_actiondrawcircle2pr.h --- librecad-2.0.3/librecad/src/actions/lc_actiondrawcircle2pr.h 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/librecad/src/actions/lc_actiondrawcircle2pr.h 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,88 @@ +/**************************************************************************** +** + * Draw circle, given its radius and two points on circle + +Copyright (C) 2014 Dongxu Li (dongxuli2011 at gmail.com) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**********************************************************************/ +#ifndef LC_ACTIONDRAWCIRCLE2PR_H +#define LC_ACTIONDRAWCIRCLE2PR_H + +#include "rs_previewactioninterface.h" +#include "rs_actiondrawcirclecr.h" + +/** + * This action class can handle user events to draw a + * circle with radius and two points on the circle + * + * @author Dongxu Li + */ +class LC_ActionDrawCircle2PR : public RS_ActionDrawCircleCR { + Q_OBJECT +public: + /** + * Action States. + */ + enum Status { + SetPoint1, /**< Setting the 1st point. */ + SetPoint2, /**< Setting the 2nd point. */ + SelectCenter /**< select center out of two possibilities. */ + }; + +public: + LC_ActionDrawCircle2PR(RS_EntityContainer& container, + RS_GraphicView& graphicView); + ~LC_ActionDrawCircle2PR(); + + static QAction* createGUIAction(RS2::ActionType /*type*/, QObject* /*parent*/); + + virtual RS2::ActionType rtti() { + return RS2::ActionDrawCircle2PR; + } + void reset(); + + virtual void init(int status=0); + + virtual void trigger(); + bool preparePreview(const RS_Vector& mouse); + + virtual void mouseMoveEvent(QMouseEvent* e); + virtual void mouseReleaseEvent(QMouseEvent* e); + + virtual void coordinateEvent(RS_CoordinateEvent* e); + virtual void commandEvent(RS_CommandEvent* e); + virtual QStringList getAvailableCommands(); + + virtual void updateMouseButtonHints(); + virtual void updateMouseCursor(); +// virtual void updateToolBar(); + +protected: + /** + * Circle data defined so far. + */ +// RS_CircleData data; + /** + * 1st point. + */ + RS_Vector point1; + /** + * 2nd point. + */ + RS_Vector point2; +}; + +#endif diff -Nru librecad-2.0.3/librecad/src/actions/rs_actiondrawcirclecr.cpp librecad-2.0.4/librecad/src/actions/rs_actiondrawcirclecr.cpp --- librecad-2.0.3/librecad/src/actions/rs_actiondrawcirclecr.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/actions/rs_actiondrawcirclecr.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -92,6 +92,14 @@ circle->getId()); } +void RS_ActionDrawCircleCR::setRadius(double r) +{ + if(r>RS_TOLERANCE){ + data.radius=r; + }else{ + RS_DIALOGFACTORY->commandMessage(tr("radius=%1 is invalid").arg(r)); + } +} void RS_ActionDrawCircleCR::mouseMoveEvent(QMouseEvent* e) { diff -Nru librecad-2.0.3/librecad/src/actions/rs_actiondrawcirclecr.h librecad-2.0.4/librecad/src/actions/rs_actiondrawcirclecr.h --- librecad-2.0.3/librecad/src/actions/rs_actiondrawcirclecr.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/actions/rs_actiondrawcirclecr.h 2014-05-30 03:54:17.000000000 +0000 @@ -69,7 +69,7 @@ virtual void coordinateEvent(RS_CoordinateEvent* e); virtual void commandEvent(RS_CommandEvent* e); - virtual QStringList getAvailableCommands(); + virtual QStringList getAvailableCommands(); virtual void hideOptions(); virtual void showOptions(); @@ -82,9 +82,7 @@ return data.radius; } - void setRadius(double r) { - data.radius = r; - } + void setRadius(double r); protected: /** diff -Nru librecad-2.0.3/librecad/src/actions/rs_actionlayerstoggleprint.cpp librecad-2.0.4/librecad/src/actions/rs_actionlayerstoggleprint.cpp --- librecad-2.0.3/librecad/src/actions/rs_actionlayerstoggleprint.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/actions/rs_actionlayerstoggleprint.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -1,6 +1,6 @@ /**************************************************************************** ** - * Toggle whether a layer should appear on print (a help layer doesn't appear on + * Toggle whether a layer should appear on print (a construction layer doesn't appear on printout, and have straight lines of infinite length) Copyright (C) 2011 Dongxu Li (dongxuli2011@gmail.com) @@ -31,7 +31,7 @@ #include "rs_layer.h" /** - * whether a layer should appear on print (a help layer doesn't appear on + * whether a layer should appear on print (a construction layer doesn't appear on printout, and have straight lines of infinite length) * * @author Dongxu Li diff -Nru librecad-2.0.3/librecad/src/actions/rs_actionlayerstoggleprint.h librecad-2.0.4/librecad/src/actions/rs_actionlayerstoggleprint.h --- librecad-2.0.3/librecad/src/actions/rs_actionlayerstoggleprint.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/actions/rs_actionlayerstoggleprint.h 2014-05-30 03:54:17.000000000 +0000 @@ -1,6 +1,6 @@ /**************************************************************************** ** - * Toggle whether a layer should appear on print (a help layer doesn't appear on + * Toggle whether a layer should appear on print (a construction layer doesn't appear on printout, and have straight lines of infinite length) Copyright (C) 2011 Dongxu Li (dongxuli2011@gmail.com) @@ -29,7 +29,7 @@ /** - * whether a layer should appear on print (a help layer doesn't appear on + * whether a layer should appear on print (a construction layer doesn't appear on printout, and have straight lines of infinite length) * * @author Dongxu Li diff -Nru librecad-2.0.3/librecad/src/cmd/rs_commands.cpp librecad-2.0.4/librecad/src/cmd/rs_commands.cpp --- librecad-2.0.3/librecad/src/cmd/rs_commands.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/cmd/rs_commands.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -33,6 +33,10 @@ RS_Commands* RS_Commands::uniqueInstance = NULL; +const char* RS_Commands::FnPrefix = "Fn"; +const char* RS_Commands::AltPrefix = "Alt-"; +const char* RS_Commands::MetaPrefix = "Meta-"; + /** * Constructor. Initiates main command dictionary. * mainCommand keeps a map from translated commands to actionType @@ -151,6 +155,24 @@ cmdTranslation.insert("dimregen", tr("dimregen")); mainCommands.insert(tr("dimregen"), RS2::ActionToolRegenerateDimensions); + // restrictions: + cmdTranslation.insert("rn", tr("rn", "restrict - nothing")); + mainCommands.insert(tr("rn", "restrict - nothing"), RS2::ActionRestrictNothing); + shortCommands.insert(tr("rn"), RS2::ActionRestrictNothing); + + cmdTranslation.insert("rr", tr("rr", "restrict - orthogonal")); + mainCommands.insert(tr("rr", "restrict - orthogonal"), RS2::ActionRestrictOrthogonal); + shortCommands.insert(tr("rr"), RS2::ActionRestrictOrthogonal); + + cmdTranslation.insert("rh", tr("rh", "restrict - horizontal")); + mainCommands.insert(tr("rh", "restrict - horizontal"), RS2::ActionRestrictHorizontal); + shortCommands.insert(tr("rh"), RS2::ActionRestrictHorizontal); + + cmdTranslation.insert("rv", tr("rv", "restrict - vertical")); + mainCommands.insert(tr("rv", "restrict - vertical"), RS2::ActionRestrictVertical); + shortCommands.insert(tr("rv"), RS2::ActionRestrictVertical); + + // modify: cmdTranslation.insert("tm", tr("tm")); mainCommands.insert(tr("tm", "modify - multi trim (extend)"), RS2::ActionModifyTrim2); @@ -498,11 +520,25 @@ * of key-strokes that is entered like hotkeys. */ RS2::ActionType RS_Commands::keycodeToAction(const QString& code) { - if(code.size()<1 || code.contains(QRegExp("^[a-z].*",Qt::CaseInsensitive)) == false ) return RS2::ActionNone; - QString c = code.toLower(); + if(code.size() < 1) + return RS2::ActionNone; + + QString c; + + if(!(code.startsWith(RS_Commands::FnPrefix) || code.startsWith(RS_Commands::AltPrefix) || code.startsWith(RS_Commands::MetaPrefix))) { + if(code.size() < 1 || code.contains(QRegExp("^[a-z].*",Qt::CaseInsensitive)) == false ) + return RS2::ActionNone; + c = code.toLower(); + } else { + c = code; + } + + // std::cout<<"regex: "<::iterator it = shortCommands.find(c); + if( it == shortCommands.end() ) { //not found, searching for main commands diff -Nru librecad-2.0.3/librecad/src/cmd/rs_commands.h librecad-2.0.4/librecad/src/cmd/rs_commands.h --- librecad-2.0.3/librecad/src/cmd/rs_commands.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/cmd/rs_commands.h 2014-05-30 03:54:17.000000000 +0000 @@ -70,6 +70,11 @@ static QString msgAvailableCommands(); void updateAlias(); + // Prefixes for function-, Meta- and Alt- keys. + static const char *FnPrefix; + static const char *AltPrefix; + static const char *MetaPrefix; + protected: static RS_Commands* uniqueInstance; diff -Nru librecad-2.0.3/librecad/src/lib/engine/rs_entitycontainer.cpp librecad-2.0.4/librecad/src/lib/engine/rs_entitycontainer.cpp --- librecad-2.0.3/librecad/src/lib/engine/rs_entitycontainer.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/engine/rs_entitycontainer.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -25,7 +25,10 @@ **********************************************************************/ -#include +#include + +#include "rs_dialogfactory.h" +#include "qg_dialogfactory.h" #include "rs_entitycontainer.h" #include "rs_debug.h" @@ -1679,13 +1682,15 @@ vpStart=current->getStartpoint(); vpEnd=current->getEndpoint(); } - RS_Entity* next(NULL); + RS_Entity* next(NULL); // std::cout<<"RS_EntityContainer::optimizeContours: 4"<0){ double dist(0.); // std::cout<<" count()="<1e-8) { if(vpEnd.squaredTo(vpStart)<1e-8){ RS_Entity* e2=entityAt(0); @@ -1695,6 +1700,7 @@ removeEntity(e2); continue; } + QG_DIALOGFACTORY->commandMessage(errMsg.arg(dist).arg(vpTmp.x).arg(vpTmp.y).arg(vpEnd.x).arg(vpEnd.y)); closed=false; } if(next && closed){ //workaround if next is NULL @@ -1714,7 +1720,8 @@ } // DEBUG_HEADER(); if(vpEnd.valid && vpEnd.squaredTo(vpStart)>1e-8) { -// std::cout<<"ds2="<commandMessage(errMsg.arg(vpEnd.distanceTo(vpStart)) + .arg(vpStart.x).arg(vpStart.y).arg(vpEnd.x).arg(vpEnd.y)); closed=false; } // std::cout<<"RS_EntityContainer::optimizeContours: 5"< entities; for (RS_Entity* e=firstEntity(RS2::ResolveNone); e!=NULL; e = nextEntity(RS2::ResolveNone)) { - //view->drawEntity(painter, e); - entities<bool{ - const RS_Layer* l1=e1->getLayer(); - const RS_Layer* l2=e2->getLayer(); - if(l1 != NULL || l2 != NULL ) { - if(l1==NULL) return false; - if(l2==NULL) return true; - if (e1->getLayer()->getName() < e2->getLayer()->getName()) return true; - else - if (e1->getLayer()->getName() > e2->getLayer()->getName()) return false; - } - return e1->getId() < e2->getId(); - }); - for(RS_Entity* e: entities){ + view->drawEntity(painter, e); } } - /** * Dumps the entities to stdout. */ diff -Nru librecad-2.0.3/librecad/src/lib/engine/rs_entity.cpp librecad-2.0.4/librecad/src/lib/engine/rs_entity.cpp --- librecad-2.0.3/librecad/src/lib/engine/rs_entity.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/engine/rs_entity.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -880,15 +880,15 @@ return varList.keys(); } -//! helpLayer contains entities of infinite length, helpLayer doesn't show up in print -bool RS_Entity::isHelpLayer(bool typeCheck) const { +//! constructionLayer contains entities of infinite length, constructionLayer doesn't show up in print +bool RS_Entity::isConstructionLayer(bool typeCheck) const { if( typeCheck && getParent() != NULL && RS2::EntityLine != rtti() ){ - // do not expand entities on help layers, except lines + // do not expand entities on construction layers, except lines return false; } - if(layer != NULL) return layer->isHelpLayer(); + if(layer != NULL) return layer->isConstructionLayer(); return false; } diff -Nru librecad-2.0.3/librecad/src/lib/engine/rs_entity.h librecad-2.0.4/librecad/src/lib/engine/rs_entity.h --- librecad-2.0.3/librecad/src/lib/engine/rs_entity.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/engine/rs_entity.h 2014-05-30 03:54:17.000000000 +0000 @@ -562,9 +562,9 @@ /** Recalculates the borders of this entity. */ virtual void calculateBorders() = 0; - /** whether the entity is on a helpLayer */ - //! helpLayer contains entities of infinite length, helpLayer doesn't show up in print - bool isHelpLayer(bool typeCheck = false) const; // ignore certain entity types for helpLayer check + /** whether the entity is on a constructionLayer */ + //! constructionLayer contains entities of infinite length, constructionLayer doesn't show up in print + bool isConstructionLayer(bool typeCheck = false) const; // ignore certain entity types for constructionLayer check /** return the equation of the entity for quadratic, diff -Nru librecad-2.0.3/librecad/src/lib/engine/rs.h librecad-2.0.4/librecad/src/lib/engine/rs.h --- librecad-2.0.3/librecad/src/lib/engine/rs.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/engine/rs.h 2014-05-30 03:54:17.000000000 +0000 @@ -248,6 +248,7 @@ ActionDrawArcTangential, ActionDrawCircle, ActionDrawCircle2P, + ActionDrawCircle2PR, ActionDrawCircle3P, ActionDrawCircleCR, ActionDrawCircleParallel, diff -Nru librecad-2.0.3/librecad/src/lib/engine/rs_layer.cpp librecad-2.0.4/librecad/src/lib/engine/rs_layer.cpp --- librecad-2.0.3/librecad/src/lib/engine/rs_layer.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/engine/rs_layer.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -38,7 +38,7 @@ data.pen.setColor(Qt::black); data.frozen = false; data.locked = false; - data.helpLayer = false; + data.constructionLayer = false; } diff -Nru librecad-2.0.3/librecad/src/lib/engine/rs_layer.h librecad-2.0.4/librecad/src/lib/engine/rs_layer.h --- librecad-2.0.3/librecad/src/lib/engine/rs_layer.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/engine/rs_layer.h 2014-05-30 03:54:17.000000000 +0000 @@ -70,8 +70,8 @@ //! Converted flag (cam) bool converted; - //! Help Layer, a help layer has entities of infinite length, and will never be printed out - bool helpLayer; + //! Construction Layer, a construction layer has entities of infinite length, and will never be printed out + bool constructionLayer; //! visible in layer list bool visibleInLayerList; @@ -172,7 +172,7 @@ * Toggles printing of this layer on / off. */ void togglePrint() { - data.helpLayer = !data.helpLayer; + data.constructionLayer = !data.constructionLayer; } /** @@ -206,8 +206,8 @@ return data.visibleInLayerList; } /** - whether the layer is a help layer - A help layer has plotF flag=false + whether the layer is a construction layer + A construction layer has plotF flag=false 1- LAYER dxf group codes: 70 Standard flags (bit-coded values): 1 = Layer is frozen; otherwise layer is thawed @@ -215,12 +215,12 @@ ... more codes follow not used by LC 290 Plotting flag. If set to 0, do not plot this layer */ - bool isHelpLayer(){ - return data.helpLayer; + bool isConstructionLayer(){ + return data.constructionLayer; } - bool setHelpLayer(bool helpLayer){ - data.helpLayer=helpLayer; - return helpLayer; + bool setConstructionLayer(bool constructionLayer){ + data.constructionLayer=constructionLayer; + return constructionLayer; } /** * Copies all attributes (pen) and the name of the layer. diff -Nru librecad-2.0.3/librecad/src/lib/engine/rs_layerlist.cpp librecad-2.0.4/librecad/src/lib/engine/rs_layerlist.cpp --- librecad-2.0.3/librecad/src/lib/engine/rs_layerlist.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/engine/rs_layerlist.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -157,7 +157,7 @@ l->freeze( layer->isFrozen()); l->lock( layer->isLocked()); l->setConverted( layer->isConverted()); - l->setHelpLayer( layer->isHelpLayer()); + l->setConstructionLayer( layer->isConstructionLayer()); l->visibleInLayerList( layer->isVisibleInLayerList()); l->setPen(layer->getPen()); diff -Nru librecad-2.0.3/librecad/src/lib/engine/rs_line.cpp librecad-2.0.4/librecad/src/lib/engine/rs_line.cpp --- librecad-2.0.3/librecad/src/lib/engine/rs_line.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/engine/rs_line.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -130,7 +130,7 @@ }else{ //find projection on line vpc = data.startpoint + direction*RS_Vector::dotP(vpc,direction)/a; - if( !isHelpLayer() && onEntity && + if( !isConstructionLayer() && onEntity && ! vpc.isInWindowOrdered(minV,maxV) ){ // !( vpc.x>= minV.x && vpc.x <= maxV.x && vpc.y>= minV.y && vpc.y<=maxV.y) ) { //projection point not within range, find the nearest endpoint @@ -623,8 +623,8 @@ RS_Vector pEnd(view->toGui(endPoints.at(1))); // std::cout<<"draw line: "< RS_TOLERANCE){ - //extend line on a help layer to fill the whole view + if(isConstructionLayer(true) && direction.squared() > RS_TOLERANCE){ + //extend line on a construction layer to fill the whole view RS_Vector lb(0,0); RS_Vector rt(view->getWidth(),view->getHeight()); QList rect; diff -Nru librecad-2.0.3/librecad/src/lib/filters/rs_filterdxf.cpp librecad-2.0.4/librecad/src/lib/filters/rs_filterdxf.cpp --- librecad-2.0.3/librecad/src/lib/filters/rs_filterdxf.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/filters/rs_filterdxf.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -168,7 +168,7 @@ RS_Layer* layer = new RS_Layer(toNativeString(data.name.c_str(),getDXFEncoding())); RS_DEBUG->print("RS_FilterDXF::addLayer: set pen"); layer->setPen(attributesToPen(attributes)); - layer->setHelpLayer(! data.plotF); //plotF is used to indicate whether the plot is plotted in printing + layer->setConstructionLayer(! data.plotF); //plotF is used to indicate whether the plot is plotted in printing //layer->setFlags(data.flags&0x07); RS_DEBUG->print("RS_FilterDXF::addLayer: flags"); @@ -1472,7 +1472,7 @@ dxf.writeLayer( dw, DL_LayerData(toDxfString(l->getName()).toStdString(), //RLZ: verify layername whit locales - l->isFrozen() + (l->isLocked()<<2), ! l->isHelpLayer()), + l->isFrozen() + (l->isLocked()<<2), ! l->isConstructionLayer()), DL_Attributes(std::string(""), colorToNumber(l->getPen().getColor()), widthToNumber(l->getPen().getWidth()), diff -Nru librecad-2.0.3/librecad/src/lib/filters/rs_filterdxfrw.cpp librecad-2.0.4/librecad/src/lib/filters/rs_filterdxfrw.cpp --- librecad-2.0.3/librecad/src/lib/filters/rs_filterdxfrw.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/filters/rs_filterdxfrw.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -183,10 +183,10 @@ if (data.flags&0x04) { layer->lock(true); } - //help layer doesn't appear in printing - layer->setHelpLayer(! data.plotF); - if (layer->isHelpLayer()) - RS_DEBUG->print(RS_Debug::D_WARNING, "RS_FilterDXF::addLayer: layer %s is help layer", layer->getName().toStdString().c_str()); + //construction layer doesn't appear in printing + layer->setConstructionLayer(! data.plotF); + if (layer->isConstructionLayer()) + RS_DEBUG->print(RS_Debug::D_WARNING, "RS_FilterDXF::addLayer: layer %s is construction layer", layer->getName().toStdString().c_str()); RS_DEBUG->print("RS_FilterDXF::addLayer: add layer to graphic"); graphic->addLayer(layer); @@ -1731,9 +1731,9 @@ lay.lineType = lineTypeToName(pen.getLineType()).toStdString(); lay.flags = l->isFrozen() ? 0x01 : 0x00; if (l->isLocked()) lay.flags |=0x04; - lay.plotF = ! l->isHelpLayer(); // a help layer should not appear in print + lay.plotF = ! l->isConstructionLayer(); // a construction layer should not appear in print if (!lay.plotF) - RS_DEBUG->print(RS_Debug::D_WARNING, "RS_FilterDXF::writeLayers: layer %s saved as help layer", lay.name.c_str()); + RS_DEBUG->print(RS_Debug::D_WARNING, "RS_FilterDXF::writeLayers: layer %s saved as construction layer", lay.name.c_str()); // lay.lineType = lineType.toStdString(); //.toLatin1().data(); dxfW->writeLayer(&lay); } diff -Nru librecad-2.0.3/librecad/src/lib/gui/rs_graphicview.cpp librecad-2.0.4/librecad/src/lib/gui/rs_graphicview.cpp --- librecad-2.0.3/librecad/src/lib/gui/rs_graphicview.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/gui/rs_graphicview.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -1275,8 +1275,8 @@ return; } if( isPrintPreview() || isPrinting() ) { - //do not draw help layer on print preview or print - if(e->isHelpLayer()) return; + //do not draw construction layer on print preview or print + if(e->isConstructionLayer()) return; } // test if the entity is in the viewport diff -Nru librecad-2.0.3/librecad/src/lib/information/rs_information.cpp librecad-2.0.4/librecad/src/lib/information/rs_information.cpp --- librecad-2.0.3/librecad/src/lib/information/rs_information.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/information/rs_information.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -225,7 +225,7 @@ } // a little check to avoid doing unneeded intersections, an attempt to avoid O(N^2) increasing of checking two-entity information if (onEntities && - (! (e1 -> isHelpLayer() || e2 -> isHelpLayer() )) + (! (e1 -> isConstructionLayer() || e2 -> isConstructionLayer() )) && ( e1 -> getMin().x > e2 -> getMax().x || e1 -> getMax().x < e2 -> getMin().x @@ -256,8 +256,8 @@ if (onEntities==true) { //ignore intersections not on entity if (!( - (e1->isHelpLayer(true) || e1->isPointOnEntity(vp, tol)) && - (e2->isHelpLayer(true) || e2->isPointOnEntity(vp, tol)) + (e1->isConstructionLayer(true) || e1->isPointOnEntity(vp, tol)) && + (e2->isConstructionLayer(true) || e2->isPointOnEntity(vp, tol)) ) ) { // std::cout<<"Ignored intersection "< -#include "rs_math.h" +#include "rs_math.h" #include "rs_debug.h" #ifdef EMU_C99 @@ -132,7 +132,7 @@ // bool ret = false; - if (reversed) swap(a1,a2); + if (reversed) std::swap(a1,a2); //a1 and a2 almost the same angle // the |a2-a1| % (2 pi)=0 means the whole angular range if(fabs( remainder(correctAngle(a2 - a1 ) , 2.*M_PI)) < RS_TOLERANCE_ANGLE) return true; @@ -358,8 +358,10 @@ valStr.setNum(value, 'f', prec); -// if(valStr.contains('.')) { -// // Remove zeros at the end: + if(valStr.contains('.')) { + // Remove tailing point and zeros: + valStr.replace(QRegExp("0*$"), ""); + valStr.replace(QRegExp(R"(\.$)"), ""); // while (valStr.at(valStr.length()-1)=='0') { // valStr.truncate(valStr.length()-1); // } @@ -367,7 +369,8 @@ // if(valStr.at(valStr.length()-1)=='.') { // valStr.truncate(valStr.length()-1); // } -// } + + } return valStr; } diff -Nru librecad-2.0.3/librecad/src/lib/math/rs_math.h librecad-2.0.4/librecad/src/lib/math/rs_math.h --- librecad-2.0.3/librecad/src/lib/math/rs_math.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/lib/math/rs_math.h 2014-05-30 03:54:17.000000000 +0000 @@ -90,13 +90,6 @@ static double eval(const QString& expr, double def=0.0); static bool cmpDouble(double v1, double v2, double tol=0.001); -//swap of two variables - template - static void swap( T &a, T &b) { - const T ttmp(a); - a=b; - b=ttmp; - } static double eval(const QString& expr, bool* ok); diff -Nru librecad-2.0.3/librecad/src/main/qc_applicationwindow.cpp librecad-2.0.4/librecad/src/main/qc_applicationwindow.cpp --- librecad-2.0.3/librecad/src/main/qc_applicationwindow.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/main/qc_applicationwindow.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -92,6 +92,7 @@ #include "qg_dlgimageoptions.h" #include "qg_filedialog.h" #include "qg_selectionwidget.h" +#include "qg_activelayername.h" #include "qg_mousewidget.h" #include "rs_dialogfactory.h" @@ -1024,6 +1025,9 @@ action = actionFactory.createAction(RS2::ActionDrawCircle2P, actionHandler); subMenu->addAction(action); connect(this, SIGNAL(windowsChanged(bool)), action, SLOT(setEnabled(bool))); + action = actionFactory.createAction(RS2::ActionDrawCircle2PR, actionHandler); + subMenu->addAction(action); + connect(this, SIGNAL(windowsChanged(bool)), action, SLOT(setEnabled(bool))); action = actionFactory.createAction(RS2::ActionDrawCircle3P, actionHandler); subMenu->addAction(action); connect(this, SIGNAL(windowsChanged(bool)), action, SLOT(setEnabled(bool))); @@ -1675,6 +1679,14 @@ statusBar()->addWidget(mouseWidget); selectionWidget = new QG_SelectionWidget(statusBar(), "selections"); statusBar()->addWidget(selectionWidget); + m_pActiveLayerName=new QG_ActiveLayerName(this); + statusBar()->addWidget(m_pActiveLayerName); +} + +void QC_ApplicationWindow::slotUpdateActiveLayer() +{ + if(layerWidget&&m_pActiveLayerName) + m_pActiveLayerName->activeLayerChanged(layerWidget->getActiveName()); } @@ -3370,6 +3382,8 @@ RS_SETTINGS->endGroup(); // printer setup: + printer.setOutputFormat(QPrinter::NativeFormat); + QPrintDialog printDialog(&printer, this); if (printDialog.exec() == QDialog::Accepted) { //printer.setOutputToFile(true); @@ -5017,27 +5031,61 @@ // multi key codes: static QTime ts = QTime(); static QList doubleCharacters; + bool actionProcessed = false; QTime now = QTime::currentTime(); - bool actionProcessed=false; + + // Handle "single" function keys and Alt- hotkeys. + QString modCode = ""; + int fn_nr = 0; + + if(e->key() >= Qt::Key_F1 && e->key() <= Qt::Key_F35) { + fn_nr = e->key() - Qt::Key_F1 + 1; + } + + if(e->text().size() > 0) { + if(e->modifiers() & Qt::AltModifier) { + modCode += RS_Commands::AltPrefix; + modCode += e->text(); + } else if(e->modifiers() & Qt::MetaModifier) { + modCode += RS_Commands::MetaPrefix; + modCode += e->text(); + } + } else if(fn_nr > 0) { + modCode += RS_Commands::FnPrefix; + modCode += QString::number(fn_nr); + } + + if(modCode.size() > 0) { + // We found a single function key. Handle it. + //std::cout << modCode.toStdString() << std::endl; + actionHandler->keycode(modCode); + ts = now; + + return; + } + + // Handle double character keycodes. doubleCharacters << e->key(); - if (doubleCharacters.size()>2) - doubleCharacters=doubleCharacters.mid(doubleCharacters.size()-2,2); - if (ts.msecsTo(now)<2000) { - QString code=""; + if (doubleCharacters.size() > 2) + doubleCharacters = doubleCharacters.mid(doubleCharacters.size() - 2, 2); + + if (ts.msecsTo(now) < 2000 && doubleCharacters.size() == 2) { + QString code = ""; QList::iterator i; + for (i = doubleCharacters.begin(); i != doubleCharacters.end(); ++i) code += QChar(*i); // Check against double keycode handler - if (actionHandler->keycode(code)==true) { - actionProcessed=true; + if (actionHandler->keycode(code) == true) { + actionProcessed = true; } // Matches doublescape, since this is not a action, it's not done in actionHandler (is that logical??) if (doubleCharacters == (QList() << Qt::Key_Escape << Qt::Key_Escape) ) { slotKillAllActions(); - actionProcessed=true; + actionProcessed = true; RS_DEBUG->print("QC_ApplicationWindow::Got double escape!"); } @@ -5047,7 +5095,7 @@ } ts = now; - if (actionProcessed==false) { + if (actionProcessed == false) { // single key codes: switch (e->key()) { //need to pass Escape to actions, issue#285 @@ -5097,8 +5145,6 @@ return; } - - QMainWindow::keyPressEvent(e); } diff -Nru librecad-2.0.3/librecad/src/main/qc_applicationwindow.h librecad-2.0.4/librecad/src/main/qc_applicationwindow.h --- librecad-2.0.3/librecad/src/main/qc_applicationwindow.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/main/qc_applicationwindow.h 2014-05-30 03:54:17.000000000 +0000 @@ -56,6 +56,7 @@ class QG_PenToolBar; class QHelpEngine; class QC_PluginInterface; +class QG_ActiveLayerName; /** * Main application window. Hold together document, view and controls. @@ -212,6 +213,11 @@ void slotTestResize800(); /** resizes window to 640x480 for screen shots */ void slotTestResize1024(); + /** + * @brief slotUpdateActiveLayer + * update layer name when active layer changed + */ + void slotUpdateActiveLayer(); signals: void gridChanged(bool on); @@ -377,6 +383,7 @@ QG_MouseWidget* mouseWidget; /** Selection Status */ QG_SelectionWidget* selectionWidget; + QG_ActiveLayerName* m_pActiveLayerName; /** Option widget for individual tool options */ QToolBar* optionWidget; diff -Nru librecad-2.0.3/librecad/src/muparser.pri librecad-2.0.4/librecad/src/muparser.pri --- librecad-2.0.3/librecad/src/muparser.pri 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/muparser.pri 2014-05-30 03:54:17.000000000 +0000 @@ -1,31 +1,11 @@ -unix { - +macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){ + message("Using bundled muparser") + LIBS += ../../generated/lib/libmuparser.a + DEPENDPATH += ../../libraries/muparser/src +}else{ + message("Using external muparser") CONFIG += link_pkgconfig PKGCONFIG += muparser - -} - -win32 { - - isEmpty( MUPARSER_DIR) { - # MUPARSER_DIR was not set in custom.pro - MUPARSER_DIR = /muparser/muparser_v2_2_3 - } - !exists("$$MUPARSER_DIR") { - # check env for MUPARSER_DIR - exists("$$(MUPARSER_DIR)"){ - MUPARSER_DIR = "$$(MUPARSER_DIR)" - } - } - - exists("$$MUPARSER_DIR"){ - INCLUDEPATH += "$${MUPARSER_DIR}/include" - LIBS += -L"$${MUPARSER_DIR}/lib" -lmuparser - message("Using muParser libraries from $${MUPARSER_DIR}.") - } else { - message("muParser was not found in $${MUPARSER_DIR}, please install muParser or check settings in custom.pro!") - } - } diff -Nru librecad-2.0.3/librecad/src/src.pro librecad-2.0.4/librecad/src/src.pro --- librecad-2.0.3/librecad/src/src.pro 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/src.pro 2014-05-30 03:54:17.000000000 +0000 @@ -13,20 +13,14 @@ DEFINES -= DWGSUPPORT DEFINES -= JWW_WRITE_SUPPORT -SCMREVISION="2.0.3" +SCMREVISION="2.0.4" # Store intermedia stuff somewhere else GENERATED_DIR = ../../generated/librecad # Use common project definitions. include(../../common.pri) include(./boost.pri) - -equals(build_muparser, "true"){ - LIBS += -lmuparser - DEPENDPATH += ../../libraries/muparser/src -}else{ - include(./muparser.pri) -} +include(./muparser.pri) #uncomment to use 2D rs_vector instead of 3D #DEFINES += RS_VECTOR2D=1 @@ -59,6 +53,7 @@ DEFINES += QINITIMAGES_LIBRECAD="qInitImages_LibreCAD" RC_FILE = ../res/main/librecad.icns QMAKE_POST_LINK = cd $$_PRO_FILE_PWD_/../.. && scripts/postprocess-osx.sh + QT += printsupport } else { TARGET = librecad @@ -213,7 +208,9 @@ lib/scripting/rs_python_wrappers.h \ lib/scripting/rs_script.h \ lib/scripting/rs_scriptlist.h \ - ui/forms/qg_snaptoolbar.h + ui/forms/qg_snaptoolbar.h \ + actions/lc_actiondrawcircle2pr.h \ + ui/forms/qg_activelayername.h SOURCES += \ lib/actions/rs_actioninterface.cpp \ @@ -295,7 +292,9 @@ lib/scripting/rs_scriptlist.cpp \ ui/forms/qg_snaptoolbar.cpp \ lib/engine/rs_color.cpp \ - lib/engine/rs_pen.cpp + lib/engine/rs_pen.cpp \ + actions/lc_actiondrawcircle2pr.cpp \ + ui/forms/qg_activelayername.cpp # ################################################################################ # Command @@ -843,7 +842,8 @@ ui/forms/qg_textoptions.ui \ ui/forms/qg_trimamountoptions.ui \ ui/forms/qg_widgetpen.ui \ - ui/forms/qg_snaptoolbar.ui + ui/forms/qg_snaptoolbar.ui \ + ui/forms/qg_activelayername.ui RESOURCES += ../res/ui/ui.qrc diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_activelayername.cpp librecad-2.0.4/librecad/src/ui/forms/qg_activelayername.cpp --- librecad-2.0.3/librecad/src/ui/forms/qg_activelayername.cpp 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_activelayername.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,12 @@ +#include "qg_activelayername.h" + +QG_ActiveLayerName::QG_ActiveLayerName(QWidget *parent) : + QWidget(parent) +{ + setupUi(this); +} + +void QG_ActiveLayerName::activeLayerChanged(const QString& name) +{ + lActiveLayerName->setText(name); +} diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_activelayername.h librecad-2.0.4/librecad/src/ui/forms/qg_activelayername.h --- librecad-2.0.3/librecad/src/ui/forms/qg_activelayername.h 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_activelayername.h 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,16 @@ +#ifndef QG_ACTIVELAYERNAME_H +#define QG_ACTIVELAYERNAME_H + +#include "ui_qg_activelayername.h" + + +class QG_ActiveLayerName : public QWidget, public Ui::QG_ActiveLayerName +{ + Q_OBJECT +public: + explicit QG_ActiveLayerName(QWidget *parent = 0); + void activeLayerChanged(const QString& name); + +}; + +#endif // QG_ACTIVELAYERNAME_H diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_activelayername.ui librecad-2.0.4/librecad/src/ui/forms/qg_activelayername.ui --- librecad-2.0.3/librecad/src/ui/forms/qg_activelayername.ui 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_activelayername.ui 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,121 @@ + + + QG_ActiveLayerName + + + + 0 + 0 + 112 + 32 + + + + + 0 + 0 + + + + + 112 + 29 + + + + + 240 + 50 + + + + Selection + + + + 0 + + + 0 + + + + + + 46 + 0 + + + + + 120 + 16777215 + + + + + Helvetica + 7 + + + + <html><head/><body> </body></html> + + + QFrame::NoFrame + + + QFrame::Plain + + + Current Layer + + + false + + + + + + + + 120 + 16777215 + + + + + Helvetica + 7 + + + + Qt::ClickFocus + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + + + false + + + 0 + + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_cadtoolbarcircles.cpp librecad-2.0.4/librecad/src/ui/forms/qg_cadtoolbarcircles.cpp --- librecad-2.0.3/librecad/src/ui/forms/qg_cadtoolbarcircles.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_cadtoolbarcircles.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -101,6 +101,12 @@ } } +void QG_CadToolBarCircles::drawCircle2PR() { + if (cadToolBar!=NULL && actionHandler!=NULL) { + actionHandler->slotDrawCircle2PR(); + } +} + void QG_CadToolBarCircles::drawCircle3P() { if (cadToolBar!=NULL && actionHandler!=NULL) { actionHandler->slotDrawCircle3P(); @@ -159,6 +165,10 @@ actionHandler->slotDrawCircle2P(); return; } + if ( bCircle2PR ->isChecked() ) { + actionHandler->slotDrawCircle2PR(); + return; + } if ( bCircle3P ->isChecked() ) { actionHandler->slotDrawCircle3P(); return; @@ -211,6 +221,9 @@ case RS2::ActionDrawCircle2P: bCircle2P->setChecked(true); return; + case RS2::ActionDrawCircle2PR: + bCircle2PR->setChecked(true); + return; case RS2::ActionDrawCircle3P: bCircle3P->setChecked(true); return; diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_cadtoolbarcircles.h librecad-2.0.4/librecad/src/ui/forms/qg_cadtoolbarcircles.h --- librecad-2.0.3/librecad/src/ui/forms/qg_cadtoolbarcircles.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_cadtoolbarcircles.h 2014-05-30 03:54:17.000000000 +0000 @@ -48,6 +48,7 @@ virtual void drawCircle(); virtual void drawCircleCR(); virtual void drawCircle2P(); + virtual void drawCircle2PR(); virtual void drawCircle3P(); virtual void drawCircle1_2P(); virtual void drawCircle2_1P(); diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_cadtoolbarcircles.ui librecad-2.0.4/librecad/src/ui/forms/qg_cadtoolbarcircles.ui --- librecad-2.0.3/librecad/src/ui/forms/qg_cadtoolbarcircles.ui 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_cadtoolbarcircles.ui 2014-05-30 03:54:17.000000000 +0000 @@ -174,8 +174,8 @@ - 33 - 54 + 0 + 87 32 32 @@ -212,7 +212,7 @@ - 0 + 33 87 32 32 @@ -284,8 +284,8 @@ - 33 - 87 + 0 + 120 32 32 @@ -326,7 +326,7 @@ - 0 + 33 120 32 32 @@ -368,8 +368,8 @@ - 33 - 153 + 0 + 186 32 32 @@ -410,7 +410,7 @@ - 0 + 33 153 32 32 @@ -452,8 +452,8 @@ - 33 - 120 + 0 + 153 32 32 @@ -491,6 +491,44 @@ true + + + + 33 + 54 + 32 + 32 + + + + + 32 + 32 + + + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + + + + + + :/extui/circle2pr.png:/extui/circle2pr.png + + + + 32 + 32 + + + + true + + + true + + @@ -661,6 +699,22 @@ 32 + 167 + + + + + bCircle2PR + clicked() + QG_CadToolBarCircles + drawCircle2PR() + + + 48 + 69 + + + 32 167 diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_cadtoolbarmodify.ui librecad-2.0.4/librecad/src/ui/forms/qg_cadtoolbarmodify.ui --- librecad-2.0.3/librecad/src/ui/forms/qg_cadtoolbarmodify.ui 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_cadtoolbarmodify.ui 2014-05-30 03:54:17.000000000 +0000 @@ -377,7 +377,7 @@ - Trim by amount + Lengthen diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_circleoptions.cpp librecad-2.0.4/librecad/src/ui/forms/qg_circleoptions.cpp --- librecad-2.0.3/librecad/src/ui/forms/qg_circleoptions.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_circleoptions.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -63,8 +63,8 @@ } void QG_CircleOptions::setAction(RS_ActionInterface* a, bool update) { - if (a!=NULL && a->rtti()==RS2::ActionDrawCircleCR) { - action = (RS_ActionDrawCircleCR*)a; + if (a!=NULL && ( a->rtti()==RS2::ActionDrawCircleCR || a->rtti()==RS2::ActionDrawCircle2PR) ) { + action = static_cast(a); QString sr; if (update) { diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_commandwidget.cpp librecad-2.0.4/librecad/src/ui/forms/qg_commandwidget.cpp --- librecad-2.0.3/librecad/src/ui/forms/qg_commandwidget.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_commandwidget.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -40,6 +40,14 @@ setupUi(this); init(); + teHistory->setContextMenuPolicy(Qt::ActionsContextMenu); + + QAction* action=new QAction(tr("&Copy"), teHistory); + connect(action, SIGNAL(triggered()), teHistory, SLOT(copy())); + teHistory->addAction(action); + action=new QAction(tr("select&All"), teHistory); + connect(action, SIGNAL(triggered()), teHistory, SLOT(selectAll())); + teHistory->addAction(action); } /* diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_layerdialog.cpp librecad-2.0.4/librecad/src/ui/forms/qg_layerdialog.cpp --- librecad-2.0.3/librecad/src/ui/forms/qg_layerdialog.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_layerdialog.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -69,7 +69,7 @@ layerName = layer->getName(); leName->setText(layerName); wPen->setPen(layer->getPen(), false, false, tr("Default Pen")); - cbHelpLayer->setChecked(l->isHelpLayer()); + cbConstructionLayer->setChecked(l->isConstructionLayer()); if (layer->getName()=="0") { leName->setEnabled(false); @@ -79,7 +79,7 @@ void QG_LayerDialog::updateLayer() { layer->setName(leName->text()); layer->setPen(wPen->getPen()); - layer->setHelpLayer(cbHelpLayer->isChecked()); + layer->setConstructionLayer(cbConstructionLayer->isChecked()); } void QG_LayerDialog::validate() { diff -Nru librecad-2.0.3/librecad/src/ui/forms/qg_layerdialog.ui librecad-2.0.4/librecad/src/ui/forms/qg_layerdialog.ui --- librecad-2.0.3/librecad/src/ui/forms/qg_layerdialog.ui 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/forms/qg_layerdialog.ui 2014-05-30 03:54:17.000000000 +0000 @@ -24,13 +24,13 @@ - + - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer diff -Nru librecad-2.0.3/librecad/src/ui/qg_actionfactory.cpp librecad-2.0.4/librecad/src/ui/qg_actionfactory.cpp --- librecad-2.0.3/librecad/src/ui/qg_actionfactory.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/qg_actionfactory.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -50,6 +50,7 @@ #include "rs_actiondrawarctangential.h" #include "rs_actiondrawcircle.h" #include "rs_actiondrawcircle2p.h" +#include "lc_actiondrawcircle2pr.h" #include "rs_actiondrawcircle3p.h" #include "rs_actiondrawcirclecr.h" #include "rs_actiondrawcircleinscribe.h" @@ -681,6 +682,12 @@ obj, SLOT(slotDrawCircle2P())); break; + case RS2::ActionDrawCircle2PR: + action = LC_ActionDrawCircle2PR::createGUIAction(id, mw); + connect(action, SIGNAL(triggered()), + obj, SLOT(slotDrawCircle2PR())); + break; + case RS2::ActionDrawCircle3P: action = RS_ActionDrawCircle3P::createGUIAction(id, mw); connect(action, SIGNAL(triggered()), diff -Nru librecad-2.0.3/librecad/src/ui/qg_actionhandler.cpp librecad-2.0.4/librecad/src/ui/qg_actionhandler.cpp --- librecad-2.0.3/librecad/src/ui/qg_actionhandler.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/qg_actionhandler.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -51,6 +51,7 @@ #include "rs_actiondrawarctangential.h" #include "rs_actiondrawcircle.h" #include "rs_actiondrawcircle2p.h" +#include "lc_actiondrawcircle2pr.h" #include "rs_actiondrawcircle3p.h" #include "rs_actiondrawcircletan1_2p.h" #include "rs_actiondrawcircletan2_1p.h" @@ -495,6 +496,9 @@ case RS2::ActionDrawCircle2P: a = new RS_ActionDrawCircle2P(*doc, *gv); break; + case RS2::ActionDrawCircle2PR: + a = new LC_ActionDrawCircle2PR(*doc, *gv); + break; case RS2::ActionDrawCircle3P: a = new RS_ActionDrawCircle3P(*doc, *gv); break; @@ -1370,6 +1374,10 @@ setCurrentAction(RS2::ActionDrawCircle2P); } +void QG_ActionHandler::slotDrawCircle2PR() { + setCurrentAction(RS2::ActionDrawCircle2PR); +} + void QG_ActionHandler::slotDrawCircle3P() { setCurrentAction(RS2::ActionDrawCircle3P); } @@ -1590,21 +1598,21 @@ // if ( snapFree == NULL) return; // disableSnaps(); RS_SnapMode s=getSnaps(); - s.snapFree = true; + s.snapFree = !s.snapFree; slotSetSnaps(s); } void QG_ActionHandler::slotSnapGrid() { // if(snapGrid==NULL) return; RS_SnapMode s=getSnaps(); - s.snapGrid = true; + s.snapGrid = !s.snapGrid; slotSetSnaps(s); } void QG_ActionHandler::slotSnapEndpoint() { // if(snapEndpoint==NULL) return; RS_SnapMode s=getSnaps(); - s.snapEndpoint = true; + s.snapEndpoint = !s.snapEndpoint; slotSetSnaps(s); } @@ -1612,7 +1620,7 @@ void QG_ActionHandler::slotSnapOnEntity() { // if(snapOnEntity==NULL) return; RS_SnapMode s=getSnaps(); - s.snapOnEntity = true; + s.snapOnEntity = !s.snapOnEntity; slotSetSnaps(s); } @@ -1621,27 +1629,27 @@ // std::cout<<" QG_ActionHandler::slotSnapCenter(): start"<modifiers()==Qt::ControlModifier) { scroll = true; - if (e->delta()>0) { - direction = RS2::Up; - } else { - direction = RS2::Down; + switch(e->orientation()){ + case Qt::Horizontal: + direction=(e->delta()>0)?RS2::Left:RS2::Right; + break; + default: + case Qt::Vertical: + direction=(e->delta()>0)?RS2::Up:RS2::Down; } } // scroll left / right: else if (e->modifiers()==Qt::ShiftModifier) { scroll = true; - if (e->delta()>0) { - direction = RS2::Right; - } else { - direction = RS2::Left; + switch(e->orientation()){ + case Qt::Horizontal: + direction=(e->delta()>0)?RS2::Up:RS2::Down; + break; + default: + case Qt::Vertical: + direction=(e->delta()>0)?RS2::Left:RS2::Right; } } @@ -732,6 +738,22 @@ } } +void QG_GraphicView::layerActivated(RS_Layer *layer) { + RS_EntityContainer *container = this->getContainer(); + RS_Entity *entity = container->firstEntity(); + + while (entity != NULL) { + if (entity->isSelected()) { + entity->setLayer(layer); + } + + entity = container->nextEntity(); + } + + container->setSelected(false); + redraw(RS2::RedrawDrawing); +} + /** * Handles paint events by redrawing the graphic in this view. diff -Nru librecad-2.0.3/librecad/src/ui/qg_graphicview.h librecad-2.0.4/librecad/src/ui/qg_graphicview.h --- librecad-2.0.3/librecad/src/ui/qg_graphicview.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/qg_graphicview.h 2014-05-30 03:54:17.000000000 +0000 @@ -75,6 +75,7 @@ virtual void layerToggled(RS_Layer*) { redraw(RS2::RedrawDrawing); } + virtual void layerActivated(RS_Layer *); /** * @brief setOffset * @param ox, offset X diff -Nru librecad-2.0.3/librecad/src/ui/qg_layerwidget.cpp librecad-2.0.4/librecad/src/ui/qg_layerwidget.cpp --- librecad-2.0.3/librecad/src/ui/qg_layerwidget.cpp 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/qg_layerwidget.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -35,13 +35,14 @@ #include #include #include "qg_actionhandler.h" +#include "qc_applicationwindow.h" QG_LayerModel::QG_LayerModel(QObject * parent) : QAbstractTableModel(parent) { layerVisible = QIcon(":/ui/visibleblock.png"); layerHidden = QIcon(":/ui/hiddenblock.png"); layerDefreeze = QIcon(":/ui/unlockedlayer.png"); layerFreeze = QIcon(":/ui/lockedlayer.png"); - helpLayer = QIcon(":/ui/fileprint.png"); + constructionLayer = QIcon(":/ui/fileprint.png"); } QG_LayerModel::~QG_LayerModel() { @@ -62,10 +63,6 @@ return createIndex ( row, column); } -bool layerLessThan(const RS_Layer *s1, const RS_Layer *s2) { - return s1->getName() < s2->getName(); -} - void QG_LayerModel::setLayerList(RS_LayerList* ll) { /* since 4.6 the recomended way is to use begin/endResetModel() * TNick @@ -85,7 +82,9 @@ for (unsigned i=0; i < ll->count(); ++i) { listLayer.append(ll->at(i)); } - std::sort( listLayer.begin(), listLayer.end(), layerLessThan ); + std::sort( listLayer.begin(), listLayer.end(), [](const RS_Layer *s1, const RS_Layer *s2)-> bool{ + return s1->getName() < s2->getName(); + } ); //called to force redraw #if QT_VERSION >= 0x040600 endResetModel(); @@ -128,8 +127,8 @@ } else { return layerFreeze; } - case HelpLayer: - return helpLayer.pixmap(QSize(20,20),lay->isHelpLayer() ? + case ConstructionLayer: + return constructionLayer.pixmap(QSize(20,20),lay->isConstructionLayer() ? QIcon::Disabled: QIcon::Normal, QIcon::On); @@ -169,7 +168,7 @@ layerView->setMinimumHeight(140); layerView->setColumnWidth(QG_LayerModel::VISIBLE, 16); layerView->setColumnWidth(QG_LayerModel::LOCKED, 16); - layerView->setColumnWidth(QG_LayerModel::HelpLayer, 20); + layerView->setColumnWidth(QG_LayerModel::ConstructionLayer, 20); layerView->verticalHeader()->hide(); layerView->horizontalHeader()->setStretchLastSection(true); layerView->horizontalHeader()->hide(); @@ -263,6 +262,19 @@ update(); } +/** + * @brief getActiveName + * @return the name of the active layer + */ +QString QG_LayerWidget::getActiveName() const +{ + if(layerList){ + RS_Layer* p=layerList->getActive(); + if(p) return p->getName(); + } + return QString(); +} + /** @@ -303,18 +315,26 @@ * Activates the given layer and makes it the active * layer in the layerlist. */ -void QG_LayerWidget::activateLayer(RS_Layer* layer) { +void QG_LayerWidget::activateLayer(RS_Layer* layer, bool updateScroll) { RS_DEBUG->print("QG_LayerWidget::activateLayer() begin"); if (layer==NULL || layerList==NULL) { return; } + int yPos = layerView->verticalScrollBar()->value(); + layerList->activate(layer); layerList->activate(layer); QModelIndex idx = layerModel->getIndex (layer); + layerView->setCurrentIndex ( idx ); + if(updateScroll==false) + layerView->verticalScrollBar()->setValue(yPos); + + //update active layer name in mainwindow status bar + QC_ApplicationWindow::getAppWindow()->slotUpdateActiveLayer(); RS_DEBUG->print("QG_LayerWidget::activateLayer() end"); } @@ -335,12 +355,12 @@ lastLayer = layerList->getActive(); layerList->activate(lay); lastLayer = layerList->getActive(); - layerList->activate(lay); + layerList->activate(lay, true); return; } RS_Layer* l = layerList->getActive(); - layerList->activate(lay); + layerList->activate(lay, true); switch(layerIdx.column()){ case QG_LayerModel::VISIBLE: actionHandler->slotLayersToggleView(); @@ -348,14 +368,14 @@ case QG_LayerModel::LOCKED: actionHandler->slotLayersToggleLock(); break; - case QG_LayerModel::HelpLayer: + case QG_LayerModel::ConstructionLayer: actionHandler->slotLayersTogglePrint(); break; default: - break; + activateLayer(l); + return; } - - activateLayer(l); + activateLayer(l, false); } /** diff -Nru librecad-2.0.3/librecad/src/ui/qg_layerwidget.h librecad-2.0.4/librecad/src/ui/qg_layerwidget.h --- librecad-2.0.3/librecad/src/ui/qg_layerwidget.h 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/src/ui/qg_layerwidget.h 2014-05-30 03:54:17.000000000 +0000 @@ -46,7 +46,7 @@ enum { VISIBLE, LOCKED, - HelpLayer, + ConstructionLayer, NAME, LAST }; @@ -69,7 +69,7 @@ QIcon layerHidden; QIcon layerDefreeze; QIcon layerFreeze; - QIcon helpLayer; + QIcon constructionLayer; }; @@ -88,7 +88,7 @@ void setLayerList(RS_LayerList* layerList, bool showByBlock); void update(); - void activateLayer(RS_Layer* layer); + void activateLayer(RS_Layer* layer, bool updateScroll=true); virtual void layerActivated(RS_Layer* layer) { activateLayer(layer); @@ -117,6 +117,11 @@ QLineEdit* getMatchLayerName() { return matchLayerName; } + /** + * @brief getActiveName + * @return the name of the active layer + */ + QString getActiveName() const; signals: void escape(); diff -Nru librecad-2.0.3/librecad/support/librecad.appdata.xml.in librecad-2.0.4/librecad/support/librecad.appdata.xml.in --- librecad-2.0.3/librecad/support/librecad.appdata.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/librecad/support/librecad.appdata.xml.in 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,17 @@ + + + + librecad.desktop + CC0 + GPL-2.0 and GPL-2.0+ and Apache-2.0 and MIT + + <_p> + LibreCAD is a 2D CAD drawing tool based on the community edition of QCAD (www.qcad.org). LibreCAD has been re-structured and ported to Qt version 4 and works natively cross platform between OS/X, Windows and Linux. See http://www.librecad.org + + + + https://sourceforge.net/p/librecad/screenshot/t.png + + http://librecad.org/cms/home.html + dongxuli2011_at_gmail.com + diff -Nru librecad-2.0.3/librecad/ts/librecad_ca.ts librecad-2.0.4/librecad/ts/librecad_ca.ts --- librecad-2.0.3/librecad/ts/librecad_ca.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_ca.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especifiqueu el primer punt + + + Cancel + Cancel·la + + + Specify second point + Especifiqueu el segon punt + + + Back + Enrere + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -551,6 +587,29 @@ + QG_ActiveLayerName + + Selection + Selecció + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -865,6 +924,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1185,7 +1248,7 @@ Trim by amount - Redueix o estén una quantitat + Redueix o estén una quantitat Trim / Extend two @@ -1235,6 +1298,10 @@ Revert direction + + Lengthen + + QG_CadToolBarPoints @@ -1514,6 +1581,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Copia + + + select&All + + QG_CoordinateWidget @@ -1545,7 +1620,7 @@ ø - ø + ø ° @@ -1557,7 +1632,7 @@ ¶ - ¶ + ¶ × @@ -1571,6 +1646,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1592,7 +1675,7 @@ ø (Diameter) - ø (Diametre) + ø (Diametre) ° (Degree) @@ -1604,7 +1687,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -1614,6 +1697,14 @@ ÷ (Division) ÷ (Divisió) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -2224,7 +2315,7 @@ Diameter (ø) - Diàmetre (ø) + Diàmetre (ø) Degree (°) @@ -2722,6 +2813,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Àrea d'ús privat suplementari-B + + Diameter (⌀) + + QG_DlgMirror @@ -3940,7 +4035,7 @@ Diameter (ø) - Diàmetre (ø) + Diàmetre (ø) Degree (°) @@ -4514,6 +4609,10 @@ Middle Mig + + Diameter (⌀) + + QG_ExitDialog @@ -4888,12 +4987,21 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - Una capa d'ajuda conté entitats d'infinites línies rectes destinades a usar-se en la construcció geomètrica. + Una capa d'ajuda conté entitats d'infinites línies rectes destinades a usar-se en la construcció geomètrica. El contingut d'una capa d'ajuda no apareixerà en la impressió. Help Layer - Capa d'ajuda + Capa d'ajuda + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + Construction Layer + @@ -6177,6 +6285,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -6729,6 +6841,10 @@ Back Enrere + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -7063,6 +7179,10 @@ Specify the fourth line Especifiqueu la quarta línia + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -9993,5 +10113,41 @@ modify - revert direction + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_cs.ts librecad-2.0.4/librecad/ts/librecad_cs.ts --- librecad-2.0.3/librecad/ts/librecad_cs.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_cs.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + Zrušit + + + Specify second point + Zadejte druhý bod + + + Back + Zpět + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2070,6 +2106,29 @@ + QG_ActiveLayerName + + Selection + Výběr + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2384,6 +2443,10 @@ </style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> Kreslit kružnici vepsanou trojúhelníku, tj. tečnou ke třem úsečkám. Použijte místo tohoto novější možnost "Tečná kružnice 3".</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2760,7 +2823,7 @@ Trim by amount - Zkrátit o hodnotu + Zkrátit o hodnotu Trim / Extend two @@ -2814,6 +2877,10 @@ Revert direction Obrátit směr + + Lengthen + Prodloužit + QG_CadToolBarPoints @@ -3164,6 +3231,14 @@ <html><head/><body>type in coordinates or commands</body></html> <html><head/><body>zadejte souřadnice nebo příkazy</body></html> + + &Copy + &Kopírovat + + + select&All + + QG_CoordinateWidget @@ -3195,7 +3270,7 @@ ø - ø + ø ° @@ -3207,7 +3282,7 @@ ¶ - ¶ + ¶ × @@ -3221,6 +3296,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3242,7 +3325,7 @@ ø (Diameter) - ø (průměr) + ø (průměr) ° (Degree) @@ -3254,7 +3337,7 @@ ¶ (Pi) - ¶ (pí) + ¶ (pí) × (Times) @@ -3264,6 +3347,14 @@ ÷ (Division) ÷ (děleno) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3886,7 +3977,7 @@ Diameter (ø) - Průměr (ø) + Průměr (ø) Degree (°) @@ -4384,6 +4475,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Doplňkové místo pro vlastní znaky B + + Diameter (⌀) + + QG_DlgMirror @@ -5661,7 +5756,7 @@ Diameter (ø) - Průměr (ø) + Průměr (ø) Degree (°) @@ -6239,6 +6334,10 @@ Middle Uprostřed + + Diameter (⌀) + + QG_ExitDialog @@ -6633,12 +6732,21 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - Pomocná hladina obsahuje pomocné přímky pro geometrické konstrukce. + Pomocná hladina obsahuje pomocné přímky pro geometrické konstrukce. Obsah pomocné hladiny se nezobrazí ve výstupu. Help Layer - Pomocná hladina + Pomocná hladina + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + Construction Layer + @@ -7962,6 +8070,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 Soubor na disku byl změněn. Abyste zabránili ztrátě dat, uložte výkres do jiného souboru! Změněný soubor: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8702,6 +8814,10 @@ Draw circles with center and radius Kreslí kružnice zadané středem a poloměrem + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9040,6 +9156,10 @@ Specify the fourth line Zadejte čtvrtou úsečku + + Can not determine uniquely an ellipse + Elipsu nelze jednoznačně určit + RS_ActionDrawHatch @@ -12941,5 +13061,41 @@ modify - revert direction obd + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_da.ts librecad-2.0.4/librecad/ts/librecad_da.ts --- librecad-2.0.3/librecad/ts/librecad_da.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_da.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,36 +32,72 @@ - QC_ActionGetEnt + LC_ActionDrawCircle2PR - Select object: + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + Select from two possible circle centers + + + + Specify first point + Angiv første punkt + + Cancel Afbryd + + Specify second point + Angiv det andet punkt + + + Back + Tilbage + + + Select circle center + + + + + QC_ActionGetEnt + + Select object: + Vælg objekt: + + + Cancel + Afbryd + QC_ActionGetPoint Specify a point - + Angiv et punkt Cancel - Afbryd + Afbryd QC_ActionGetSelect Select objects: - + Vælg objekter: Cancel - Afbryd + Afbryd @@ -72,7 +108,7 @@ File - Fil + Fil &Edit @@ -80,7 +116,7 @@ Edit - Rediger + Rediger Vie&ws @@ -96,15 +132,15 @@ Focus on &Command Line - Brug &komandolinie + Brug &Kommandolinje &View - V&is + &View View - Vis + View &Select @@ -116,11 +152,11 @@ &Line - &Linie + &Linje &Arc - &Bue + &Cirkelbue &Circle @@ -164,7 +200,7 @@ Tool Options - Vælg Værktøj + Vælg Værktøj About @@ -228,7 +264,7 @@ Loaded document: - Henter dokument: + Hentet dokument: Opening aborted @@ -388,50 +424,50 @@ Running script '%1' - + Udfører script '%1' Inserting block '%1' - + Indsætter blok '%1' &Polyline - &Polylinie + &Polylinje Insert Image - + Indsæt billede Auto-saving drawing... - + Tegning gemmes automatisk... Auto-saved drawing - + Automatisk gemt tegning Cannot auto-save the file %1 Please check the permissions. Auto-save disabled. - + Arkivering nægtet. Kontroller venligst rettigheder Help - + Hjælp Bugger, I couldn't find the helpfiles on the filesystem. - + Pokkers, kan ikke finde hjælpefilerne på filsystemet. Import - + Import &Toolbars - + &Værktøjslinjer Compiled on: %1 @@ -439,15 +475,15 @@ Program Icons Supplied by - + Programikoner leveret af Splash and Logo supplied by - + Startbillede og logo leveret af Main Website : - + Hjemmeside: Version: %1 @@ -455,27 +491,27 @@ SCM Revision: %1 - + SCM Revision: %1 &%1 %2 - + &%1 %2 Warning: File already opened : - + Advarsel: filen er allerede åben : Cannot save the file - + Kan ikke gemme filen , please check the filename and permissions. - + Kontroller venligst filnavnet og rettigheder Please consider donating to LibreCAD to help maintain the source code and website. - + Overvej venligst pengegave til LibreCAD til hjælp med vedligeholdelse af kildekode og hjemmeside. Su&b-Window mode @@ -495,19 +531,19 @@ New document from template: - + Nyt dokument fra skabelon: Select Template aborted - + Valg af skabelon afbrudt Auto-saving failed - + Sikkerhedskopiering mislykkedes Pen Selection - + Stregtykkelse Snap Selection @@ -515,11 +551,11 @@ CAD Tools - CAD værktøjer + CAD værktøjer Export as - + Eksporter som Compiler: Clang %1.%2.%3 @@ -539,7 +575,7 @@ Help files not found - + Hjælpefil ikke fundet @@ -1043,7 +1079,7 @@ &Draft - S&kitse + &Skitse Enables/disables the draft mode @@ -1095,7 +1131,7 @@ CTRL-G - + CTRL-G &Selection pointer @@ -1103,6 +1139,29 @@ + QG_ActiveLayerName + + Selection + Valgte + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -1118,14 +1177,14 @@ Counterclockwise - + Mod uret QG_ArcTangentialOptions Tangential Arc Options - + Tangerende graf Radius: @@ -1133,7 +1192,7 @@ Radius of the tangential arc - + Grafens radius i tangentpunktet Total subtending angle of the tangential arc @@ -1142,12 +1201,12 @@ Radius Draw Tangential Arc by the given radius - + Radius Angle Draw Tangential Arc by the given radius - Vinkel + Vinkel @@ -1282,15 +1341,15 @@ Create Block - Lav blok + Lav en blok Add an empty block - + Tilføj en tom blok save the active block to a file - + Gem den aktive blok i en fil @@ -1397,6 +1456,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1426,7 +1489,7 @@ Linear Dimension - Målsæt liniært + Målsæt lineært Aligned Dimension @@ -1555,7 +1618,7 @@ Bisectors - Vinkledelinger + Vinkeldelinger Parallels with distance @@ -1698,7 +1761,7 @@ Insert Image - + Indsæt billede Show toolbar "Modify" @@ -1757,7 +1820,7 @@ Trim by amount - Trim udfra given størrelse + Trim udfra given størrelse Trim / Extend two @@ -1819,6 +1882,10 @@ Revert direction + + Lengthen + Forlænger + QG_CadToolBarPoints @@ -1934,7 +2001,7 @@ Continue action - Forsæt opgaven + Fortsæt opgaven @@ -2169,6 +2236,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Kopier + + + select&All + + QG_CoordinateWidget @@ -2181,7 +2256,7 @@ QG_DimLinearOptions Linear Dimension Options - Valg for liniær målsætning + Valg for lineær målsætning Angle: @@ -2200,7 +2275,7 @@ ø - ø + ø ° @@ -2212,7 +2287,7 @@ ¶ - ¶ + ¶ × @@ -2226,6 +2301,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -2247,7 +2330,7 @@ ø (Diameter) - ø (Diameter) + ø (Diameter) ° (Degree) @@ -2259,7 +2342,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -2269,6 +2352,14 @@ ÷ (Division) ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -2399,7 +2490,7 @@ QG_DlgDimLinear Linear Dimension - Målsæt liniært + Målsæt lineært Layer: @@ -2891,7 +2982,7 @@ Diameter (ø) - Diameter (ø) + Diameter (ø) Degree (°) @@ -3389,6 +3480,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -3567,7 +3662,7 @@ linear - Liniær + Lineær Angle @@ -4650,7 +4745,7 @@ Diameter (ø) - Diameter (ø) + Diameter (ø) Degree (°) @@ -5228,6 +5323,10 @@ Middle Midte + + Diameter (⌀) + + QG_ExitDialog @@ -5620,12 +5719,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -6942,6 +7041,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7308,7 +7411,7 @@ &Linear - &Liniær + &Lineær Linear Dimension @@ -7682,6 +7785,10 @@ Back Tilbage + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -8020,6 +8127,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -9113,11 +9224,11 @@ Lines are parallel - Linierne er parallele + Linjerne er parallelle Specify first line - Angiv første linie + Angiv første linje Cancel @@ -9125,7 +9236,7 @@ Specify second line - Angiv den anden linie + Angiv den anden linje Back @@ -9152,7 +9263,7 @@ Circumference: %1 - + Omkreds: %1 Point: %1/%2 @@ -9160,15 +9271,15 @@ Specify first point of polygon - + Angiv første punkt af polygon Cancel - Afbryd + Afbryd Specify next point of polygon - + Angiv næste polygonpunkt Polygonal &Area @@ -9486,7 +9597,7 @@ &Attributes - &Atributer + &Attributter Modify Entity Attributes @@ -10621,7 +10732,7 @@ Deselect Intersected Entities - Fra vælg krydsede enheder + Fravælg krydsede enheder Deselect Inte&rsected Entities @@ -11885,5 +11996,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_de.ts librecad-2.0.4/librecad/ts/librecad_de.ts --- librecad-2.0.3/librecad/ts/librecad_de.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_de.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,43 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + 2 Punkte, Radius + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + Radius=%1 ist zu klein für die gewählten Punkte +Abstand zwischen den Punkten=%2 ist größer als der Durchmesser=%3 + + + Select from two possible circle centers + Einen der beiden möglichen Mittelpunkte auswählen + + + Specify first point + Ersten Punkt angeben + + + Cancel + Abbrechen + + + Specify second point + Zweiten Punkt angeben + + + Back + Zurück + + + Select circle center + Mittelpunkt auswählen + + + QC_ActionGetEnt Select object: @@ -2288,6 +2325,33 @@ + QG_ActiveLayerName + + Selection + Auswahl + + + <html><head/><body> </body></html> + <html><head/><body> </body></html> + + + Current Layer + aktuelle Ebene + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name der aktiven Ebene</body></html> + + + QG_ArcOptions Arc Options @@ -2610,6 +2674,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> Zeichne Kreis in einem Dreieck, d.h. tangential zu den drei Seiten. Bitte die neuere Funktion "Kreis tangential 3" benutzen. + + <html><head/><body>Circle with 2 Points and Radius</body></html> + <html><head/><body>Kreis mit 2 Punkten und Radius</body></html> + QG_CadToolBarDim @@ -2998,7 +3066,7 @@ Trim by amount - Trimmen nach Maß + Trimmen nach Maß Trim / Extend two @@ -3052,6 +3120,10 @@ Revert direction Richtung umkehren + + Lengthen + Verlängern + QG_CadToolBarPoints @@ -3402,6 +3474,14 @@ <html><head/><body>type in coordinates or commands</body></html> <html><head/><body>Koordinaten oder Kommando eingeben</body></html> + + &Copy + &Kopieren + + + select&All + &Alles auswählen + QG_CoordinateWidget @@ -3433,7 +3513,7 @@ ø - ø + ø ° @@ -3445,7 +3525,7 @@ ¶ - ¶ + ¶ × @@ -3459,6 +3539,14 @@ ... ... + + ⌀ + ⌀ + + + π + π + QG_DimensionLabelEditor @@ -3480,7 +3568,7 @@ ø (Diameter) - ø (Durchmesser) + ø (Durchmesser) ° (Degree) @@ -3492,7 +3580,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3502,6 +3590,14 @@ ÷ (Division) ÷ (Geteilt) + + ⌀ (Diameter) + ⌀ (Durchmesser) + + + π (Pi) + π (Pi) + QG_DlgArc @@ -4108,7 +4204,7 @@ Diameter (ø) - Durchmesser (ø) + Durchmesser (ø) Degree (°) @@ -4606,6 +4702,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] private Nutzung, Ergänzung-B + + Diameter (⌀) + Durchmesser (⌀) + QG_DlgMirror @@ -6095,7 +6195,7 @@ Diameter (ø) - Durchmesser (ø) + Durchmesser (ø) Degree (°) @@ -6665,6 +6765,10 @@ Middle Zentriert + + Diameter (⌀) + Durchmesser (⌀) + QG_ExitDialog @@ -7067,12 +7171,22 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - Eine Hilfsebene hat Instanzen von unendlichen geraden Linien, die für die geometrische Konstruktion verwendet werden können. + Eine Hilfsebene hat Instanzen von unendlichen geraden Linien, die für die geometrische Konstruktion verwendet werden können. Der Inhalt einer Hilfsebene ist nicht für den Ausdruck bestimmt. Help Layer - Hilfsebene + Hilfsebene + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + Eine Entwurfsebene enthält Objekte von unendlichen geraden Linien, die für die Konstruktion benutzt werden können. +Der Inhalt von Entwurfsebenen wird nicht ausgedruckt. + + + Construction Layer + Entwurfsebene @@ -8404,6 +8518,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 Datei auf Datenträger verändert! Bitte unter anderem Namen speichern um Datenverlust zu verhindern! Geänderte Datei: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + Schraffur nicht möglich, wegen einer Lücke=%1 zwischen (%2, %3) und (%4, %5) + RS_ActionBlocksAdd @@ -8481,7 +8599,7 @@ Ex&plode - Block aufb&rechen + Aufb&rechen @@ -9246,6 +9364,10 @@ Draw circles with center and radius Kreis mit Zentrum und Radius zeichnen + + radius=%1 is invalid + Radius=%1 ist unzulässig + RS_ActionDrawCircleInscribe @@ -9596,6 +9718,10 @@ Specify the fourth line Vierte Linie auswählen + + Can not determine uniquely an ellipse + Kann keine eindeutige Ellipse festlegen + RS_ActionDrawHatch @@ -13630,5 +13756,41 @@ modify - revert direction um + + rn + restrict - nothing + en + + + rn + en + + + rr + restrict - orthogonal + er + + + rr + er + + + rh + restrict - horizontal + eh + + + rh + eh + + + rv + restrict - vertical + ev + + + rv + ev + diff -Nru librecad-2.0.3/librecad/ts/librecad_el.ts librecad-2.0.4/librecad/ts/librecad_el.ts --- librecad-2.0.3/librecad/ts/librecad_el.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_el.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + Ακύρωση + + + Specify second point + Καθορίστε το δεύτερο σημείο + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2071,6 +2107,29 @@ + QG_ActiveLayerName + + Selection + Επιλογή + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2409,6 +2468,10 @@ </style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> Σχεδίαση κύκλου εγγεγραμμένου σε τρίγωνο, δηλαδή, εφαπτόμενου σε 3 γραμμές. Παρακαλείστε να χρησιμοποιείτε τη νεότερη δυνατότητα "Εφαπτόμενος κύκλος 3" αντί αυτού.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2797,7 +2860,7 @@ Trim by amount - Διευθέτηση κατά ποσό + Διευθέτηση κατά ποσό Trim / Extend two @@ -2851,6 +2914,10 @@ Revert direction Αντιστροφή φοράς + + Lengthen + Επιμήκυνση + QG_CadToolBarPoints @@ -3202,6 +3269,14 @@ <html><head/><body>type in coordinates or commands</body></html> <html><head/><body>πληκτρολογήστε συντεταγμένες ή εντολές</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3233,7 +3308,7 @@ ø - ø + ø ° @@ -3245,7 +3320,7 @@ ¶ - ¶ + ¶ × @@ -3259,6 +3334,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3280,7 +3363,7 @@ ø (Diameter) - ø (Διάμετρος) + ø (Διάμετρος) ° (Degree) @@ -3292,7 +3375,7 @@ ¶ (Pi) - ¶ (π) + ¶ (π) × (Times) @@ -3302,6 +3385,14 @@ ÷ (Division) ÷ (Διαίρεση) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3925,7 +4016,7 @@ Diameter (ø) - Διάμετρος (ø) + Διάμετρος (ø) Degree (°) @@ -4423,6 +4514,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Συμπληρωματικά Ιδιωτικής Χρήσης-Β + + Diameter (⌀) + + QG_DlgMirror @@ -5709,7 +5804,7 @@ Diameter (ø) - Διάμετρος (ø) + Διάμετρος (ø) Degree (°) @@ -6295,6 +6390,10 @@ Middle Μέση + + Diameter (⌀) + + QG_ExitDialog @@ -6689,12 +6788,21 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - Μία βοηθητική στρώση έχει οντότητες από άπειρες ευθείες γραμμές οι οποίες προορίζεται να χρησιμοποιηθούν για γεωμετρική κατασκευή. + Μία βοηθητική στρώση έχει οντότητες από άπειρες ευθείες γραμμές οι οποίες προορίζεται να χρησιμοποιηθούν για γεωμετρική κατασκευή. Τα περιεχόμενα μίας βοηθητικής στρώσης δεν πρέπει να εμφανίζονται στην εκτύπωση. Help Layer - Βοηθητική στρώση + Βοηθητική στρώση + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + Construction Layer + @@ -8018,6 +8126,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 Το αρχείο στο δίσκο έχει τροποποιηθεί. Παρακαλείστε να αποθηκεύσετε σε άλλο αρχείο για την αποφυγή απώλειας δεδομένων! Τροποποιημένο αρχείο: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8770,6 +8882,10 @@ Draw circles with center and radius Σχεδίαση κύκλων με κέντρο και ακτίνα + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9124,6 +9240,10 @@ Specify the fourth line Καθορίστε την τέταρτη γραμμή + + Can not determine uniquely an ellipse + Δεν είναι δυνατό να προσδιοριστεί μονοσήμαντα έλλειψη + RS_ActionDrawHatch @@ -12996,5 +13116,41 @@ modify - revert direction αφ + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_en_au.ts librecad-2.0.4/librecad/ts/librecad_en_au.ts --- librecad-2.0.3/librecad/ts/librecad_en_au.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_en_au.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,51 @@ + LC_ActionDrawCircle2PR + + + 2 Points, Radius + + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + + Select from two possible circle centers + + + + + Specify first point + Specify first point + + + + Cancel + Cancel + + + + Specify second point + Specify second point + + + + + Back + Back + + + + Select circle center + + + + QC_ActionGetEnt @@ -47,42 +92,42 @@ &Plugins - + Running script '%1' Running script '%1' - + Inserting block '%1' Inserting block '%1' - + &File &File - + Import Import - + &Edit &Edit - + &View &View - + &Toolbars - + Focus on &Command Line Focus on &Command Line @@ -91,12 +136,12 @@ CTRL+M - + &Select &Select - + &Draw &Draw @@ -105,22 +150,22 @@ &Point - + &Line &Line - + &Arc &Arc - + &Circle &Circle - + &Ellipse &Ellipse @@ -129,44 +174,44 @@ &Spline - + &Polyline &Polyline - - + + &Dimension &Dimension - + &Modify &Modify - + &Snap &Snap - + &Info &Info - + &Layer &Layer - - + + &Block &Block - + &Scripts &Scripts @@ -175,158 +220,158 @@ &CAM - + About About - + &Manual &Manual - + Insert Image Insert Image - + &Window &Window - + &Help &Help - + De&bugging De&bugging - + Pen Selection - + Snap Selection - + Tool Options - + CAD Tools CAD Tools - + Layer List Layer List - + Block List Block List - + Library Browser Library Browser - + Command line Command line - + &%1 %2 - + Su&b-Window mode - + &Cascade &Cascade - + &Tile &Tile - + Tile &Vertically - + Tile &Horizontally Tile &Horizontally - + Ta&b mode - + Creating new file... Creating new file... - + Block '%1' Block '%1' - + unnamed document %1 unnamed document %1 - + New Drawing created. New Drawing created. - + New document from template: - + Select Template aborted - + Opening recent file... Opening recent file... - + Warning: File already opened : - + Help files not found - - + + Cannot open the file %1 Please check the permissions. @@ -335,38 +380,38 @@ Please check the permissions. - + Loaded document: Loaded document: - + Opening aborted Opening aborted - + Saving drawing... Saving drawing... - - + + Saved drawing: %1 Saved drawing: %1 - + Cannot save the file - + , please check the filename and permissions. - + Cannot save the file %1 Please check the permissions. @@ -375,67 +420,67 @@ Please check the permissions. - + Compiler: Clang %1.%2.%3 - + Compiler: GNU GCC %1.%2.%3 - + Compiler: Microsoft Visual C++ - + Qt Version: %1 - + Please consider donating to LibreCAD to help maintain the source code and website. - + Saving drawing under new filename... Saving drawing under new filename... - + File - + Edit - + Draw &Order - + View - + Auto-saving drawing... Auto-saving drawing... - + Auto-saved drawing Auto-saved drawing - + Cannot auto-save the file %1 Please check the permissions. @@ -446,77 +491,77 @@ Auto-save disabled. - + Auto-saving failed - + Exporting drawing... Exporting drawing... - + Export as - + Exported: %1 Exported: %1 - + Exporting... Exporting... - + Export complete Export complete - + Export failed! Export failed! - + Printing... Printing... - + Printing complete Printing complete - + Print preview for %1 Print preview for %1 - + Exiting application... Exiting application... - + None None - + About... About... - + Version: %1 Version: %1 - + SCM Revision: %1 @@ -529,17 +574,17 @@ SVN Revision: %1 - + Compiled on: %1 - + Program Icons Supplied by - + Splash and Logo supplied by @@ -548,22 +593,22 @@ Date: %1 - + Modules: %1 Modules: %1 - + Main Website : - + Help Help - + Bugger, I couldn't find the helpfiles on the filesystem. 'Strewth, I couldn't find the helpfiles on the filesystem. @@ -591,42 +636,42 @@ QG_ActionFactory - + &Export... &Export... - + &Close &Close - + &Print... &Print... - + &Quit &Quit - + &Grid &Grid - + CTRL-G CTRL-G - + &Draft &Draft - + &Statusbar &Statusbar @@ -635,7 +680,7 @@ &back - + &Selection pointer @@ -684,27 +729,54 @@ Restrict&Vertically - + &Preferences &Preferences - + &Application Preferences &Application Preferences - + Open IDE Open IDE - + Run Script.. Run Script.. + QG_ActiveLayerName + + + Selection + Selection + + + + <html><head/><body> </body></html> + + + + + Current Layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions @@ -1046,6 +1118,11 @@ + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + + Back to main menu Back to main menu @@ -1463,7 +1540,7 @@ Round - Round + Fillet @@ -1471,9 +1548,8 @@ Bevel - Trim by amount - Trim by amount + Trim by amount @@ -1534,6 +1610,11 @@ Trim / Extend two + + Lengthen + + + Offset (Experimental Feature, work in progress) @@ -1965,7 +2046,7 @@ - + Command: Command: @@ -1980,7 +2061,17 @@ - + + &Copy + &Copy + + + + select&All + + + + Unknown command: %1 @@ -2023,9 +2114,8 @@ Label: - ø - ø + ø @@ -2038,9 +2128,18 @@ ± - ¶ - ¶ + ¶ + + + + ⌀ + + + + + π + @@ -2083,8 +2182,17 @@ + ⌀ (Diameter) + + + + + π (Pi) + + + ø (Diameter) - ø (Diameter) + ø (Diameter) @@ -2097,9 +2205,8 @@ ± (Plus / Minus) - ¶ (Pi) - ¶ (Pi) + ¶ (Pi) @@ -2831,9 +2938,13 @@ Insert Symbol - Diameter (ø) - Diameter (ø) + Diameter (ø) + + + + Diameter (⌀) + @@ -5032,9 +5143,13 @@ Insert Symbol - Diameter (ø) - Diameter (ø) + Diameter (ø) + + + + Diameter (⌀) + @@ -6066,7 +6181,7 @@ QG_LayerBox - + - Unchanged - - Unchanged - @@ -6079,22 +6194,22 @@ Layer Settings - - Layer Name: - Layer Name: - - - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer + + Layer Name: + Layer Name: + + &OK &OK @@ -6119,67 +6234,67 @@ QG_LayerWidget - + Show all layers Show all layers - + Hide all layers Hide all layers - + Add a layer Add a layer - + Remove the current layer Remove the current layer - + Modify layer attributes / rename Modify layer attributes / rename - + Looking for matching layer names - + Layer Menu Layer Menu - + &Defreeze all Layers &Defreeze all Layers - + &Freeze all Layers &Freeze all Layers - + &Add Layer &Add Layer - + &Remove Layer &Remove Layer - + &Edit Layer &Edit Layer - + &Toggle Visibility &Toggle Visibility @@ -6782,7 +6897,7 @@ Round Options - Round Options + Fillet Options @@ -6792,7 +6907,7 @@ Check to trim both edges to the rounding - Check to trim both edges to the rounding + Check to trim both edges to the filleting @@ -7269,10 +7384,10 @@ QMessageBox - - - - + + + + Warning Warning @@ -7447,12 +7562,12 @@ Parsec - + Loading.. Loading.. - + Loading... @@ -7461,7 +7576,7 @@ Loading Library Paths.. - + Loading File %1.. Loading File %1.. @@ -7485,112 +7600,112 @@ Open Image - + Windows Bitmap Windows Bitmap - + Joint Photographic Experts Group Joint Photographic Experts Group - + Graphics Interchange Format Graphics Interchange Format - + Multiple-image Network Graphics Multiple-image Network Graphics - + Portable Bit Map Portable Bit Map - + Portable Grey Map Portable Grey Map - + Portable Network Graphic Portable Network Graphic - + Portable Pixel Map Portable Pixel Map - + X Bitmap Format X Bitmap Format - + X Pixel Map X Pixel Map - + Scalable Vector Graphics - + SGI Black & White - + Encapsulated PostScript - + Encapsulated PostScript Format - + Encapsulated PostScript Interchange - + Windows Icon - + JPEG 2000 - + ZSoft Paintbrush - + PC Paint - + SGI-Bilddatei - + Targa Image File - + Tagged Image File Format @@ -7729,6 +7844,11 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8412,27 +8532,32 @@ Centre, &Radius - + + radius=%1 is invalid + + + + Not a valid expression Not a valid expression - + Specify circle center Specify circle centre - + Cancel Cancel - + Specify circle radius Specify circle radius - + Back Back @@ -8819,34 +8944,39 @@ - + + Can not determine uniquely an ellipse + + + + Specify the first line - + Cancel Cancel - + Specify the second line - - - + + + Back Back - + Specify the third line - + Specify the fourth line @@ -9625,38 +9755,38 @@ RS_ActionDrawSpline - + &Spline &Spline - + Specify first control point Specify first control point - + Cancel Cancel - + Specify next control point or [%1] Specify next control point or [%1] - - + + Back Back - + Specify next control point Specify next control point - + Cannot undo: Not enough entities defined yet. Cannot undo: Not enough entities defined yet. @@ -10561,7 +10691,7 @@ &Round - &Round + &Fillet @@ -11604,20 +11734,20 @@ RS_Commands - - + + point point - - + + po po - - + + line line @@ -11626,31 +11756,31 @@ ln - + l l - - + + polyline polyline - - + + offset offset - + o offset o - - + + parallel parallel @@ -11660,351 +11790,351 @@ par - - + + arc arc - + a a - - + + circle circle - - + + ci ci - - + + rectangle rectangle - + rec rec - + rectang rectang - - - + + + text text - - + + regen regen - + rg zoom - redraw rg - + zr zoom - redraw zr - + zw zoom - window zw - + za zoom - auto za - + zp zoom - pan zp - + zv zoom - previous zv - - + + kill kill - - + + k k - - - + + + undo undo - - + + u undo u - - - + + + redo redo - - + + r r - + da dimension - aligned da - - + + da da - + dh dimension - horizontal dh - - + + dh dh - + dr dimension - linear dr - - + + dr dr - + dv dimension - vertical dv - - + + dv dv - + ld dimension - leader ld - - + + ld ld - - + + dimregen dimregen - + tm modify - multi trim (extend) tm - - + + tm tm - + xt modify - trim (extend) xt - - + + xt xt - + rm modify - trim rm - - + + rm rm - + mv modify - move mv - - + + mv mv - + ch modify - bevel (chamfer) ch - - + + ch ch - + mi modify - mirror mi - - + + mi mi - + ro modify - rotate ro - - + + ro ro - + sz modify - scale sz - - + + sz sz - + ss modify - stretch ss - - + + ss ss - + er modify - delete (erase) er - - + + er er - + oo modify - undo (oops) oo - - + + oo oo - + uu modify - redo uu - - + + uu uu - + xp modify - explode xp - - + + xp xp @@ -12014,43 +12144,43 @@ os - + os os - + sg snap - grid sg - - + + sg sg - + se snap - end se - - + + se se - + si snap - intersection si - - + + si si @@ -12060,55 +12190,55 @@ sn - - + + sn sn - + sm snap - middle sm - - + + sm sm - + sn snap - nearest sn - + np snap - nearest point np - - + + np np - + tn Deselect all tn - - + + tn tn - + Command: %1 Command: %1 @@ -12123,7 +12253,7 @@ li - + pa parallel pa @@ -12209,444 +12339,492 @@ ex - - + + angle angle - - + + close close - - + + chord length chord length - - + + columns columns - + columnspacing columnspacing - - + + factor factor - + length length - + length1 length1 - + length2 length2 - + number number - - + + radius radius - + rows rows - + rowspacing rowspacing - - + + through through - + trim trim - + reversed reversed reversed - + rev reversed rev - + r reversed r - + row - + r row r - + r redo r - + back back - + ang angle ang - - + + li li - - + + pl - + pa pa - - + + ar ar - - + + rect - - + + mtext - - + + redraw - + zr zr - + zw zw - + za za - + zp zp - + zv zv - + u u - - + + + rn + restrict - nothing + + + + + rn + + + + + + rr + restrict - orthogonal + + + + + rr + + + + + + rh + restrict - horizontal + + + + + rh + + + + + + rv + restrict - vertical + + + + + rv + + + + + re re - + re modify - revert direction re - - + + os snap - free os - - + + sc - + sc snap - center - - + + sd - + sd snap - distance - - + + sf - + sf snap - free - - + + sa - + sa Select all - + dpi - + a angle a - + center centre - + cen center cen - + c center c - + length chord length length - + l chord length l - + c close c - + cols columns cols - + c columns c - + columnspacing columnspacing for inserts columnspacing - + colspacing columnspacing for inserts colspacing - + cs columnspacing for inserts cs - + fact factor fact - + f factor f - + help help - + ? help ? - + length length length - + len length len - + l length l - + length1 length1 length1 - + len1 length1 len1 - + l1 length1 l1 - + length2 length2 length2 - + len2 length2 len2 - + l2 length2 l2 - + number number number - + num number num - + n number n - + r radius r @@ -12672,48 +12850,48 @@ r - + rowspacing rowspacing for inserts rowspacing - + rs rowspacing for inserts rs - + t text t - + t through t - + b back b - - + + Command not found: %1 - + Accepted keycode: %1 - + Available commands: Available commands: diff -Nru librecad-2.0.3/librecad/ts/librecad_en.ts librecad-2.0.4/librecad/ts/librecad_en.ts --- librecad-2.0.3/librecad/ts/librecad_en.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_en.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + + + + Specify second point + + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -496,6 +532,29 @@ + QG_ActiveLayerName + + Selection + + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -761,6 +820,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1072,10 +1135,6 @@ - Trim by amount - - - Trim / Extend two @@ -1123,6 +1182,10 @@ Revert direction + + Lengthen + + QG_CadToolBarPoints @@ -1402,6 +1465,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -1432,10 +1503,6 @@ - ø - - - ° @@ -1444,10 +1511,6 @@ - ¶ - - - × @@ -1459,6 +1522,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1479,27 +1550,27 @@ - ø (Diameter) + ° (Degree) - ° (Degree) + ± (Plus / Minus) - ± (Plus / Minus) + × (Times) - ¶ (Pi) + ÷ (Division) - × (Times) + ⌀ (Diameter) - ÷ (Division) + π (Pi) @@ -1955,10 +2026,6 @@ - Diameter (ø) - - - Degree (°) @@ -2454,6 +2521,10 @@ [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -3331,10 +3402,6 @@ - Diameter (ø) - - - Degree (°) @@ -3886,6 +3953,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -4138,12 +4209,12 @@ - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -5403,6 +5474,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -5947,6 +6022,10 @@ Back + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -6265,6 +6344,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -9106,5 +9189,41 @@ modify - revert direction + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_ar.ts librecad-2.0.4/librecad/ts/librecad_es_ar.ts --- librecad-2.0.3/librecad/ts/librecad_es_ar.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_ar.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_bo.ts librecad-2.0.4/librecad/ts/librecad_es_bo.ts --- librecad-2.0.3/librecad/ts/librecad_es_bo.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_bo.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_cl.ts librecad-2.0.4/librecad/ts/librecad_es_cl.ts --- librecad-2.0.3/librecad/ts/librecad_es_cl.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_cl.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_co.ts librecad-2.0.4/librecad/ts/librecad_es_co.ts --- librecad-2.0.3/librecad/ts/librecad_es_co.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_co.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_cr.ts librecad-2.0.4/librecad/ts/librecad_es_cr.ts --- librecad-2.0.3/librecad/ts/librecad_es_cr.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_cr.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_do.ts librecad-2.0.4/librecad/ts/librecad_es_do.ts --- librecad-2.0.3/librecad/ts/librecad_es_do.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_do.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_ec.ts librecad-2.0.4/librecad/ts/librecad_es_ec.ts --- librecad-2.0.3/librecad/ts/librecad_es_ec.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_ec.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_gt.ts librecad-2.0.4/librecad/ts/librecad_es_gt.ts --- librecad-2.0.3/librecad/ts/librecad_es_gt.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_gt.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_hn.ts librecad-2.0.4/librecad/ts/librecad_es_hn.ts --- librecad-2.0.3/librecad/ts/librecad_es_hn.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_hn.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_mx.ts librecad-2.0.4/librecad/ts/librecad_es_mx.ts --- librecad-2.0.3/librecad/ts/librecad_es_mx.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_mx.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2729,7 +2792,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2783,6 +2846,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3133,6 +3200,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3164,7 +3239,7 @@ ø - ø + ø ° @@ -3176,7 +3251,7 @@ ¶ - ¶ + ¶ × @@ -3190,6 +3265,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3211,7 +3294,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3223,7 +3306,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3237,6 +3320,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3859,7 +3950,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4357,6 +4448,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5635,7 +5730,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6209,6 +6304,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6597,12 +6696,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7923,6 +8022,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8676,6 +8779,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9014,6 +9121,10 @@ Specify the fourth line Especifique la cuarta línea + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12916,5 +13027,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_ni.ts librecad-2.0.4/librecad/ts/librecad_es_ni.ts --- librecad-2.0.3/librecad/ts/librecad_es_ni.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_ni.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_pa.ts librecad-2.0.4/librecad/ts/librecad_es_pa.ts --- librecad-2.0.3/librecad/ts/librecad_es_pa.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_pa.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_pe.ts librecad-2.0.4/librecad/ts/librecad_es_pe.ts --- librecad-2.0.3/librecad/ts/librecad_es_pe.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_pe.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_pr.ts librecad-2.0.4/librecad/ts/librecad_es_pr.ts --- librecad-2.0.3/librecad/ts/librecad_es_pr.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_pr.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_py.ts librecad-2.0.4/librecad/ts/librecad_es_py.ts --- librecad-2.0.3/librecad/ts/librecad_es_py.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_py.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_sv.ts librecad-2.0.4/librecad/ts/librecad_es_sv.ts --- librecad-2.0.3/librecad/ts/librecad_es_sv.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_sv.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es.ts librecad-2.0.4/librecad/ts/librecad_es.ts --- librecad-2.0.3/librecad/ts/librecad_es.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + Atrás + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2090,6 +2126,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2396,6 +2455,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2784,7 +2847,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2838,6 +2901,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3188,6 +3255,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3219,7 +3294,7 @@ ø - ø + ø ° @@ -3231,7 +3306,7 @@ ¶ - ¶ + ¶ × @@ -3245,6 +3320,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3266,7 +3349,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3278,7 +3361,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3292,6 +3375,14 @@ ÷ (Division) ÷ (División) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3914,7 +4005,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4412,6 +4503,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5713,7 +5808,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6291,6 +6386,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6687,12 +6786,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -8021,6 +8120,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8774,6 +8877,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9112,6 +9219,10 @@ Specify the fourth line Indicar la cuarta línea + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -13039,5 +13150,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_us.ts librecad-2.0.4/librecad/ts/librecad_es_us.ts --- librecad-2.0.3/librecad/ts/librecad_es_us.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_us.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_uy.ts librecad-2.0.4/librecad/ts/librecad_es_uy.ts --- librecad-2.0.3/librecad/ts/librecad_es_uy.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_uy.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_es_ve.ts librecad-2.0.4/librecad/ts/librecad_es_ve.ts --- librecad-2.0.3/librecad/ts/librecad_es_ve.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_es_ve.ts 2014-05-30 03:54:17.000000000 +0000 @@ -28,6 +28,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Especificar primer punto + + + Cancel + Cancelar + + + Specify second point + Especificar segundo punto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2055,6 +2091,29 @@ + QG_ActiveLayerName + + Selection + Selección + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2349,6 +2408,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2725,7 +2788,7 @@ Trim by amount - Recortar un segmento + Recortar un segmento Trim / Extend two @@ -2779,6 +2842,10 @@ Revert direction + + Lengthen + Alargar + QG_CadToolBarPoints @@ -3129,6 +3196,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -3160,7 +3235,7 @@ ø - ø + ø ° @@ -3172,7 +3247,7 @@ ¶ - ¶ + ¶ × @@ -3186,6 +3261,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3207,7 +3290,7 @@ ø (Diameter) - ø (Diámetro) + ø (Diámetro) ° (Degree) @@ -3219,7 +3302,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3233,6 +3316,14 @@ ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3855,7 +3946,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -4353,6 +4444,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5631,7 +5726,7 @@ Diameter (ø) - Diámetro (ø) + Diámetro (ø) Degree (°) @@ -6205,6 +6300,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6589,12 +6688,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7911,6 +8010,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8664,6 +8767,10 @@ Back Atrás + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9002,6 +9109,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12904,5 +13015,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_et.ts librecad-2.0.4/librecad/ts/librecad_et.ts --- librecad-2.0.3/librecad/ts/librecad_et.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_et.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Määra esimene punkt + + + Cancel + Loobu + + + Specify second point + Määra teine punkt + + + Back + Tagasi + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -1094,6 +1130,29 @@ + QG_ActiveLayerName + + Selection + Valik + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -1387,6 +1446,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1763,7 +1826,7 @@ Trim by amount - Trimmi koguse võrra + Trimmi koguse võrra Trim / Extend two @@ -1817,6 +1880,10 @@ Revert direction + + Lengthen + Pikenda + QG_CadToolBarPoints @@ -2167,6 +2234,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Kopeeri + + + select&All + + QG_CoordinateWidget @@ -2198,7 +2273,7 @@ ø - ø + ø ° @@ -2210,7 +2285,7 @@ ¶ - ¶ + ¶ × @@ -2224,6 +2299,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -2245,7 +2328,7 @@ ø (Diameter) - ø (Diameeter) + ø (Diameeter) ° (Degree) @@ -2257,7 +2340,7 @@ ¶ (Pi) - ¶ (Pii) + ¶ (Pii) × (Times) @@ -2267,6 +2350,14 @@ ÷ (Division) ÷ (Jagamine) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -2889,7 +2980,7 @@ Diameter (ø) - Diameeter (ø) + Diameeter (ø) Degree (°) @@ -3387,6 +3478,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -4648,7 +4743,7 @@ Diameter (ø) - Diameeter (ø) + Diameeter (ø) Degree (°) @@ -5226,6 +5321,10 @@ Middle Keskkoht + + Diameter (⌀) + + QG_ExitDialog @@ -5618,12 +5717,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -6940,6 +7039,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7681,6 +7784,10 @@ Back Tagasi + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -8019,6 +8126,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -11915,5 +12026,41 @@ modify - revert direction ri + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_fi.ts librecad-2.0.4/librecad/ts/librecad_fi.ts --- librecad-2.0.3/librecad/ts/librecad_fi.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_fi.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,51 @@ + LC_ActionDrawCircle2PR + + + 2 Points, Radius + + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + + Select from two possible circle centers + + + + + Specify first point + + + + + Cancel + Peruuta + + + + Specify second point + + + + + + Back + Takaisin + + + + Select circle center + + + + QC_ActionGetEnt @@ -47,42 +92,42 @@ &Lisäosat - + Running script '%1' Suoritetaan skriptiä ’%1’ - + Inserting block '%1' - + &File &Tiedosto - + Import Tuo - + &Edit &Muokkaa - + &View &Näytä - + &Toolbars &Työkalupalkit - + Focus on &Command Line &Tarkenna komentoriville @@ -91,250 +136,250 @@ CTRL + M - + &Select &Valitse - + &Draw &Piirrä - + &Line &Viiva - + &Arc &Kaari - + &Circle &Ympyrä - + &Ellipse &Ellipsi - + &Polyline - - + + &Dimension &Mitoitus - + &Modify &Muuta - + &Snap &Tartu - + &Info &Info - + &Layer &Taso - - + + &Block - + File - + Edit - + Draw &Order - + View - + &Scripts &Skriptit - + About Tietoa ohjelmasta - + &Manual - + Insert Image Lisää kuva - + &Window &Ikkuna - + &Help &Ohje - + De&bugging &Virheenetsintä - + Pen Selection - + Snap Selection - + Tool Options - + CAD Tools - + Layer List Tasolista - + Block List - + Library Browser - + Command line Komentorivi - + &%1 %2 &%1 %2 - + Su&b-Window mode - + &Cascade - + &Tile - + Tile &Vertically - + Tile &Horizontally - + Ta&b mode - + Creating new file... Luodaan uutta tiedostoa... - + Block '%1' - + unnamed document %1 nimetön dokumentti %1 - + New Drawing created. Uusi piirros luotu. - + New document from template: Uusi dokumentti mallista: - + Select Template aborted Mallin valinta keskeytetty - + Opening recent file... Avaa viimeaikainen tiedosto - + Warning: File already opened : Varoitus: Tiedosto on jo avattu: - + Help files not found - - + + Cannot open the file %1 Please check the permissions. @@ -343,38 +388,38 @@ Tiedoston oikeudet saattavat olla väärin. - + Loaded document: Dokumentti avattu: - + Opening aborted Avaaminen keskeytetty - + Saving drawing... Tallennetaan piirrosta... - - + + Saved drawing: %1 Piirros %1 tallennettu. - + Cannot save the file - + , please check the filename and permissions. - + Cannot save the file %1 Please check the permissions. @@ -383,27 +428,27 @@ Ei voitu tallentaa. Tiedoston oikeudet voivat olla väärin. - + Please consider donating to LibreCAD to help maintain the source code and website. - + Saving drawing under new filename... Tallennetaan piirrosta toisella tiedostonimellä... - + Auto-saving drawing... Automaattitallennetaan piirrosta... - + Auto-saved drawing Piirros automaattitallennettu - + Cannot auto-save the file %1 Please check the permissions. @@ -414,132 +459,132 @@ Automaattitallennus otettu pois käytöstä. - + Auto-saving failed - + Exporting drawing... Viedään piirrosta.... - + Export as - + Exported: %1 Viedään: %1 - + Exporting... Viedään... - + Export complete Vienti valmis - + Export failed! Vienti epäonnistui! - + Printing... Tulostetaan... - + Printing complete Tulostettu - + Print preview for %1 Tulostuksen %1 esikatselu - + Exiting application... Suljetaan ohjelmaa... - + None - + About... Tietoja... - + Version: %1 Versio: %1 - + SCM Revision: %1 SCM Revisio: %1 - + Compiler: Clang %1.%2.%3 - + Compiler: GNU GCC %1.%2.%3 - + Compiler: Microsoft Visual C++ - + Qt Version: %1 - + Compiled on: %1 Käännetty: %1 - + Program Icons Supplied by Sovelluksen kuvakkeet: - + Splash and Logo supplied by Käynnistysruutu ja logo: - + Modules: %1 Moduulit: %1 - + Main Website : Verkkosivusto: - + Help Ohje - + Bugger, I couldn't find the helpfiles on the filesystem. Valitettavasti tietokoneelta ei löytynyt tarvittavia ohjetiedostoja. @@ -567,72 +612,99 @@ QG_ActionFactory - + &Export... &Vie... - + &Close &Sulje - + &Print... &Tulosta... - + &Quit &Lopeta - + &Grid - + CTRL-G - + &Draft - + &Statusbar - + &Selection pointer - + &Preferences - + &Application Preferences - + Open IDE - + Run Script.. + QG_ActiveLayerName + + + Selection + + + + + <html><head/><body> </body></html> + + + + + Current Layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions @@ -945,6 +1017,11 @@ + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + + Back to main menu @@ -1314,11 +1391,6 @@ - - Trim by amount - - - Trim / Extend @@ -1369,6 +1441,11 @@ + + Lengthen + + + Offset (Experimental Feature, work in progress) @@ -1729,7 +1806,7 @@ - + Command: @@ -1744,7 +1821,17 @@ - + + &Copy + + + + + select&All + + + + Unknown command: %1 @@ -1787,11 +1874,6 @@ - - ø - - - ° @@ -1802,8 +1884,13 @@ + + ⌀ + + + - ¶ + π @@ -1847,7 +1934,12 @@ - ø (Diameter) + ⌀ (Diameter) + + + + + π (Pi) @@ -1861,11 +1953,6 @@ - - ¶ (Pi) - - - × (Times) @@ -2432,7 +2519,7 @@ - Diameter (ø) + Diameter (⌀) @@ -4234,7 +4321,7 @@ - Diameter (ø) + Diameter (⌀) @@ -5143,7 +5230,7 @@ QG_LayerBox - + - Unchanged - @@ -5156,19 +5243,19 @@ - - Layer Name: + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + + Construction Layer - - Help Layer + + Layer Name: @@ -5180,67 +5267,67 @@ QG_LayerWidget - + Show all layers - + Hide all layers - + Add a layer - + Remove the current layer - + Modify layer attributes / rename - + Looking for matching layer names - + Layer Menu - + &Defreeze all Layers - + &Freeze all Layers - + &Add Layer - + &Remove Layer - + &Edit Layer - + &Toggle Visibility @@ -6302,10 +6389,10 @@ QMessageBox - - - - + + + + Warning @@ -6480,17 +6567,17 @@ - + Loading.. - + Loading... - + Loading File %1.. @@ -6510,112 +6597,112 @@ - + Windows Bitmap - + Joint Photographic Experts Group - + Graphics Interchange Format - + Multiple-image Network Graphics - + Portable Bit Map - + Portable Grey Map - + Portable Network Graphic - + Portable Pixel Map - + X Bitmap Format - + X Pixel Map - + Scalable Vector Graphics - + SGI Black & White - + Encapsulated PostScript - + Encapsulated PostScript Format - + Encapsulated PostScript Interchange - + Windows Icon - + JPEG 2000 - + ZSoft Paintbrush - + PC Paint - + SGI-Bilddatei - + Targa Image File - + Tagged Image File Format @@ -6753,6 +6840,11 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7408,27 +7500,32 @@ - + + radius=%1 is invalid + + + + Not a valid expression - + Specify circle center - + Cancel Peruuta - + Specify circle radius - + Back Takaisin @@ -7811,34 +7908,39 @@ - + + Can not determine uniquely an ellipse + + + + Specify the first line - + Cancel Peruuta - + Specify the second line - - - + + + Back Takaisin - + Specify the third line - + Specify the fourth line @@ -8527,38 +8629,38 @@ RS_ActionDrawSpline - + &Spline - + Specify first control point - + Cancel Peruuta - + Specify next control point or [%1] - - + + Back Takaisin - + Specify next control point - + Cannot undo: Not enough entities defined yet. @@ -10430,987 +10532,1035 @@ RS_Commands - - + + point - - + + po - - + + line - + l - - + + polyline - - + + offset - + o offset - - + + parallel - - + + arc - + a - - + + circle - - + + ci - - + + rectangle - + rec - + rectang - - - + + + text - - + + regen - + rg zoom - redraw - + zr zoom - redraw - + zw zoom - window - + za zoom - auto - + zp zoom - pan - + zv zoom - previous - - + + kill - - + + k - - - + + + undo - - + + u undo - - - + + + redo - - + + r - + da dimension - aligned - - + + da - + dh dimension - horizontal - - + + dh - + dr dimension - linear - - + + dr - + dv dimension - vertical - - + + dv - + ld dimension - leader - - + + ld - - + + dimregen - + tm modify - multi trim (extend) - - + + tm - + xt modify - trim (extend) - - + + xt - + rm modify - trim - - + + rm - + mv modify - move - - + + mv - + ch modify - bevel (chamfer) - - + + ch - + mi modify - mirror - - + + mi - + ro modify - rotate - - + + ro - + sz modify - scale - - + + sz - + ss modify - stretch - - + + ss - + er modify - delete (erase) - - + + er - + oo modify - undo (oops) - - + + oo - + uu modify - redo - - + + uu - + xp modify - explode - - + + xp - + os - + sg snap - grid - - + + sg - + se snap - end - - + + se - + si snap - intersection - - + + si - - + + sn - + sm snap - middle - - + + sm - + sn snap - nearest - + np snap - nearest point - - + + np - + tn Deselect all - - + + tn - + Command: %1 - + pa parallel - - + + angle - - + + close - - + + chord length - - + + columns - + columnspacing - - + + factor - + length - + length1 - + length2 - + number - - + + radius - + rows - + rowspacing - - + + through - + trim - + reversed reversed - + rev reversed - + r reversed - + row - + r row - + r redo - + back - + ang angle - - + + li - - + + pl - + pa - - + + ar - - + + rect - - + + mtext - - + + redraw - + zr - + zw - + za - + zp - + zv - + u - - + + + rn + restrict - nothing + + + + + rn + + + + + + rr + restrict - orthogonal + + + + + rr + + + + + + rh + restrict - horizontal + + + + + rh + + + + + + rv + restrict - vertical + + + + + rv + + + + + re - + re modify - revert direction - - + + os snap - free - - + + sc - + sc snap - center - - + + sd - + sd snap - distance - - + + sf - + sf snap - free - - + + sa - + sa Select all - + dpi - + a angle - + center - + cen center - + c center - + length chord length - + l chord length - + c close - + cols columns - + c columns - + columnspacing columnspacing for inserts - + colspacing columnspacing for inserts - + cs columnspacing for inserts - + fact factor - + f factor - + help - + ? help - + length length - + len length - + l length - + length1 length1 - + len1 length1 - + l1 length1 - + length2 length2 - + len2 length2 - + l2 length2 - + number number - + num number - + n number - + r radius - + rowspacing rowspacing for inserts - + rs rowspacing for inserts - + t text - + t through - + b back - - + + Command not found: %1 - + Accepted keycode: %1 - + Available commands: diff -Nru librecad-2.0.3/librecad/ts/librecad_fr.ts librecad-2.0.4/librecad/ts/librecad_fr.ts --- librecad-2.0.3/librecad/ts/librecad_fr.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_fr.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Indiquer premier point + + + Cancel + Annuler + + + Specify second point + Indiquer deuxième point + + + Back + Précédent + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -809,6 +845,29 @@ + QG_ActiveLayerName + + Selection + Sélection + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -1102,6 +1161,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1482,7 +1545,7 @@ Trim by amount - Ajuster par quantité + Ajuster par quantité Trim / Extend two @@ -1536,6 +1599,10 @@ Revert direction + + Lengthen + Longueur + QG_CadToolBarPoints @@ -1886,6 +1953,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Copier + + + select&All + + QG_CoordinateWidget @@ -1917,7 +1992,7 @@ ø - ø + ø ° @@ -1929,7 +2004,7 @@ ¶ - ¶ + ¶ × @@ -1943,6 +2018,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1964,7 +2047,7 @@ ø (Diameter) - ø (Diamètre) + ø (Diamètre) ° (Degree) @@ -1984,7 +2067,15 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) + + + ⌀ (Diameter) + + + + π (Pi) + @@ -2608,7 +2699,7 @@ Diameter (ø) - Diamètre (ø) + Diamètre (ø) Degree (°) @@ -3106,6 +3197,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Zone supplémentaire B à usage privé + + Diameter (⌀) + + QG_DlgMirror @@ -4379,7 +4474,7 @@ Diameter (ø) - Diamètre (ø) + Diamètre (ø) Degree (°) @@ -4953,6 +5048,10 @@ Middle Milieu + + Diameter (⌀) + + QG_ExitDialog @@ -5337,12 +5436,12 @@ Échap - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -6655,6 +6754,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7399,6 +7502,10 @@ Draw circles with center and radius Dessine Cercle à partir d'un centre et un rayon + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -7737,6 +7844,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -11577,5 +11688,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_hi.ts librecad-2.0.4/librecad/ts/librecad_hi.ts --- librecad-2.0.3/librecad/ts/librecad_hi.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_hi.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,51 @@ + LC_ActionDrawCircle2PR + + + 2 Points, Radius + + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + + Select from two possible circle centers + + + + + Specify first point + + + + + Cancel + + + + + Specify second point + + + + + + Back + + + + + Select circle center + + + + QC_ActionGetEnt @@ -43,345 +88,345 @@ QC_ApplicationWindow - + Running script '%1' - + Inserting block '%1' - + &File - + File - + Import - - + + &Block - + &Edit - + Edit - + Draw &Order - + &View - + View - + &Toolbars - + Focus on &Command Line - + &Select - + &Draw - + &Line - + &Arc - + &Circle - + &Ellipse - + &Polyline - - + + &Dimension - + &Modify - + &Snap - + &Info - + &Layer - + &Scripts - + About - + &Manual - + Insert Image - + &Window - + &Help - + De&bugging - + Pen Selection - + Snap Selection - + Tool Options - + CAD Tools - + Layer List - + Block List - + Library Browser - + Command line - + &%1 %2 - + Su&b-Window mode - + &Cascade - + &Tile - + Tile &Vertically - + Tile &Horizontally - + Ta&b mode - + Creating new file... - + Block '%1' - + unnamed document %1 - + New Drawing created. - + New document from template: - + Select Template aborted - - + + Cannot open the file %1 Please check the permissions. - + Opening recent file... - + Warning: File already opened : - + Loaded document: - + Opening aborted - + Saving drawing... - - + + Saved drawing: %1 - + Cannot save the file - + , please check the filename and permissions. - + Saving drawing under new filename... - + Cannot save the file %1 Please check the permissions. - + Auto-saving drawing... - + Auto-saved drawing - + Cannot auto-save the file %1 Please check the permissions. @@ -389,142 +434,142 @@ - + Auto-saving failed - + Exporting drawing... - + Export as - + Exported: %1 - + Exporting... - + Export complete - + Export failed! - + Printing... - + Printing complete - + Print preview for %1 - + Exiting application... - + None - + About... - + Version: %1 - + SCM Revision: %1 - + Compiler: Clang %1.%2.%3 - + Compiler: GNU GCC %1.%2.%3 - + Compiler: Microsoft Visual C++ - + Qt Version: %1 - + Compiled on: %1 - + Program Icons Supplied by - + Splash and Logo supplied by - + Modules: %1 - + Main Website : - + Please consider donating to LibreCAD to help maintain the source code and website. - + Help - + Help files not found - + Bugger, I couldn't find the helpfiles on the filesystem. @@ -551,72 +596,99 @@ QG_ActionFactory - + &Export... - + &Close - + &Print... - + &Quit - + &Grid - + CTRL-G - + &Draft - + &Statusbar - + &Selection pointer - + &Preferences - + &Application Preferences - + Open IDE - + Run Script.. + QG_ActiveLayerName + + + Selection + + + + + <html><head/><body> </body></html> + + + + + Current Layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions @@ -939,6 +1011,11 @@ Draw a tangential Circle of two circles, passing a given point</body></html> + + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1324,7 +1401,7 @@ - Trim by amount + Lengthen @@ -1713,7 +1790,7 @@ - + Command: @@ -1728,7 +1805,17 @@ - + + &Copy + + + + + select&All + + + + Unknown command: %1 @@ -1771,11 +1858,6 @@ - - ø - - - ° @@ -1786,8 +1868,13 @@ + + ⌀ + + + - ¶ + π @@ -1831,7 +1918,12 @@ - ø (Diameter) + ⌀ (Diameter) + + + + + π (Pi) @@ -1845,11 +1937,6 @@ - - ¶ (Pi) - - - × (Times) @@ -2416,7 +2503,7 @@ - Diameter (ø) + Diameter (⌀) @@ -4218,7 +4305,7 @@ - Diameter (ø) + Diameter (⌀) @@ -5127,7 +5214,7 @@ QG_LayerBox - + - Unchanged - @@ -5141,13 +5228,13 @@ - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -5164,67 +5251,67 @@ QG_LayerWidget - + Show all layers - + Hide all layers - + Add a layer - + Remove the current layer - + Modify layer attributes / rename - + Looking for matching layer names - + Layer Menu - + &Defreeze all Layers - + &Freeze all Layers - + &Add Layer - + &Remove Layer - + &Edit Layer - + &Toggle Visibility @@ -6286,10 +6373,10 @@ QMessageBox - - - - + + + + Warning @@ -6541,17 +6628,17 @@ - + Loading.. - + Loading... - + Loading File %1.. @@ -6571,112 +6658,112 @@ - + Windows Bitmap - + Joint Photographic Experts Group - + Graphics Interchange Format - + Multiple-image Network Graphics - + Portable Bit Map - + Portable Grey Map - + Portable Network Graphic - + Portable Pixel Map - + X Bitmap Format - + X Pixel Map - + Scalable Vector Graphics - + SGI Black & White - + Encapsulated PostScript - + Encapsulated PostScript Format - + Encapsulated PostScript Interchange - + Windows Icon - + JPEG 2000 - + ZSoft Paintbrush - + PC Paint - + SGI-Bilddatei - + Targa Image File - + Tagged Image File Format @@ -6737,6 +6824,11 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7392,27 +7484,32 @@ - + + radius=%1 is invalid + + + + Not a valid expression - + Specify circle center - + Cancel - + Specify circle radius - + Back @@ -7795,34 +7892,39 @@ - + + Can not determine uniquely an ellipse + + + + Specify the first line - + Cancel - + Specify the second line - - - + + + Back - + Specify the third line - + Specify the fourth line @@ -8511,38 +8613,38 @@ RS_ActionDrawSpline - + &Spline - + Specify first control point - + Cancel - + Specify next control point or [%1] - - + + Back - + Specify next control point - + Cannot undo: Not enough entities defined yet. @@ -10414,987 +10516,1035 @@ RS_Commands - - + + point - - + + po - - + + line - - + + li - + l - - + + polyline - - + + pl - - + + offset - + o offset - - + + parallel - + pa - + pa parallel - - + + arc - - + + ar - + a - - + + circle - - + + ci - - + + rectangle - - + + rect - + rectang - + rec - - + + mtext - - - + + + text - - + + regen - - + + redraw - + rg zoom - redraw - + zr - + zr zoom - redraw - + zw - + zw zoom - window - + za - + za zoom - auto - + zp - + zp zoom - pan - + zv - + zv zoom - previous - - + + kill - - + + k - - - + + + undo - + u - - + + u undo - - - + + + redo - - + + r - - + + da - + da dimension - aligned - - + + dh - + dh dimension - horizontal - - + + dr - + dr dimension - linear - - + + dv - + dv dimension - vertical - - + + ld - + ld dimension - leader - - + + dimregen - - + + + rn + restrict - nothing + + + + + rn + + + + + + rr + restrict - orthogonal + + + + + rr + + + + + + rh + restrict - horizontal + + + + + rh + + + + + + rv + restrict - vertical + + + + + rv + + + + + tm - + tm modify - multi trim (extend) - - + + xt - + xt modify - trim (extend) - - + + rm - + rm modify - trim - - + + mv - + mv modify - move - - + + ch - + ch modify - bevel (chamfer) - - + + mi - + mi modify - mirror - - + + re - + re modify - revert direction - - + + ro - + ro modify - rotate - - + + sz - + sz modify - scale - - + + ss - + ss modify - stretch - - + + er - + er modify - delete (erase) - - + + oo - + oo modify - undo (oops) - - + + uu - + uu modify - redo - - + + xp - + xp modify - explode - - + + os snap - free - + os - - + + sc - + sc snap - center - - + + sd - + sd snap - distance - - + + se - + se snap - end - - + + sf - + sf snap - free - - + + sg - + sg snap - grid - - + + si - + si snap - intersection - - + + sm - + sm snap - middle - - + + sn - + sn snap - nearest - - + + np - + np snap - nearest point - - + + sa - + sa Select all - - + + tn - + tn Deselect all - - + + angle - + dpi - - + + close - - + + chord length - - + + columns - + columnspacing - - + + factor - + length - + length1 - + length2 - + number - - + + radius - + rows - + rowspacing - - + + through - + trim - + ang angle - + a angle - + center - + cen center - + c center - + length chord length - + l chord length - + c close - + cols columns - + c columns - + columnspacing columnspacing for inserts - + colspacing columnspacing for inserts - + cs columnspacing for inserts - + fact factor - + f factor - + help - + ? help - + length length - + len length - + l length - + length1 length1 - + len1 length1 - + l1 length1 - + length2 length2 - + len2 length2 - + l2 length2 - + number number - + num number - + n number - + r radius - + reversed reversed - + rev reversed - + r reversed - + row - + r row - + rowspacing rowspacing for inserts - + rs rowspacing for inserts - + t text - + t through - + r redo - + back - + b back - + Command: %1 - - + + Command not found: %1 - + Accepted keycode: %1 - + Available commands: diff -Nru librecad-2.0.3/librecad/ts/librecad_hu.ts librecad-2.0.4/librecad/ts/librecad_hu.ts --- librecad-2.0.3/librecad/ts/librecad_hu.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_hu.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + Mégsem + + + Specify second point + Második pont + + + Back + Vissza + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2108,6 +2144,29 @@ + QG_ActiveLayerName + + Selection + Kijelölés + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2426,6 +2485,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2810,7 +2873,7 @@ Trim by amount - Vágás megadott értékkel + Vágás megadott értékkel Trim / Extend two @@ -2872,6 +2935,10 @@ Revert direction + + Lengthen + Hosszabbítás + QG_CadToolBarPoints @@ -3222,6 +3289,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Másolás + + + select&All + + QG_CoordinateWidget @@ -3253,7 +3328,7 @@ ø - Ř + Ř ° @@ -3265,7 +3340,7 @@ ¶ - ¶ + ¶ × @@ -3279,6 +3354,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3300,7 +3383,7 @@ ø (Diameter) - ø (Átmérő) + ø (Átmérő) ° (Degree) @@ -3312,7 +3395,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3322,6 +3405,14 @@ ÷ (Division) ÷ (Osztó) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3970,7 +4061,7 @@ Diameter (ø) - Átmérő (Ø) + Átmérő (Ø) Degree (°) @@ -4468,6 +4559,10 @@ [100000-10FFFD] Supplementary Private Use Area-B (100000-10FFFD) Kiegészítő saját terület B + + Diameter (⌀) + + QG_DlgMirror @@ -6017,7 +6112,7 @@ Diameter (ø) - Átmérő (Ø) + Átmérő (Ø) Degree (°) @@ -6595,6 +6690,10 @@ Middle Felező + + Diameter (⌀) + + QG_ExitDialog @@ -7015,12 +7114,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -8345,6 +8444,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -9085,6 +9188,10 @@ Draw circles with center and radius Kör rajzolása középponttal és sugárral + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9423,6 +9530,10 @@ Specify the fourth line Adja meg a negyedik vonalat + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -13352,5 +13463,41 @@ modify - revert direction te + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_id_ID.ts librecad-2.0.4/librecad/ts/librecad_id_ID.ts --- librecad-2.0.3/librecad/ts/librecad_id_ID.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_id_ID.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,51 @@ + LC_ActionDrawCircle2PR + + + 2 Points, Radius + + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + + Select from two possible circle centers + + + + + Specify first point + + + + + Cancel + Batal + + + + Specify second point + + + + + + Back + Mundur + + + + Select circle center + + + + QC_ActionGetEnt @@ -43,42 +88,42 @@ QC_ApplicationWindow - + Running script '%1' Menjalankan skrip %1' - + Inserting block '%1' - + &File &Berkas - + Import Impor - + &Edit &Sunting - + &View - + &Toolbars - + Focus on &Command Line @@ -87,335 +132,335 @@ CTRL+M - + &Select - + &Draw &Gambar - + &Line &Garis - + &Arc - + &Circle &Lingkaran - + &Ellipse &Lonjong - + &Polyline - - + + &Dimension - + &Modify - + &Snap - + &Info - + &Layer - - + + &Block - + File - + Edit - + Draw &Order - + View - + &Scripts &Skrip - + About Tentang - + &Manual &Panduan - + Insert Image Masukkan Gambar - + &Window - + &Help &Bantuan - + De&bugging - + Pen Selection - + Snap Selection - + Tool Options - + CAD Tools - + Layer List - + Block List - + Library Browser - + Command line - + &%1 %2 - + Su&b-Window mode - + &Cascade - + &Tile - + Tile &Vertically - + Tile &Horizontally - + Ta&b mode - + Creating new file... Membuat berkas baru... - + Block '%1' - + unnamed document %1 dokumen tak-bernama %1 - + New Drawing created. - + New document from template: - + Select Template aborted - + Opening recent file... - + Warning: File already opened : - + Help files not found - - + + Cannot open the file %1 Please check the permissions. - + Loaded document: - + Opening aborted - + Saving drawing... - - + + Saved drawing: %1 - + Cannot save the file - + , please check the filename and permissions. - + Cannot save the file %1 Please check the permissions. - + Compiler: Clang %1.%2.%3 - + Compiler: GNU GCC %1.%2.%3 - + Compiler: Microsoft Visual C++ - + Qt Version: %1 - + Please consider donating to LibreCAD to help maintain the source code and website. - + Saving drawing under new filename... - + Auto-saving drawing... - + Auto-saved drawing - + Cannot auto-save the file %1 Please check the permissions. @@ -423,77 +468,77 @@ - + Auto-saving failed - + Exporting drawing... - + Export as - + Exported: %1 - + Exporting... - + Export complete Mengekspor selesai - + Export failed! Mengekspor gagal! - + Printing... Mencetak... - + Printing complete Mencetak selesai - + Print preview for %1 - + Exiting application... Menutup aplikasi... - + None - + About... Tentang... - + Version: %1 Versi: %1 - + SCM Revision: %1 @@ -502,17 +547,17 @@ Versi: %1 %2 - + Compiled on: %1 - + Program Icons Supplied by - + Splash and Logo supplied by @@ -521,22 +566,22 @@ Tanggal: %1 - + Modules: %1 Modul: %1 - + Main Website : - + Help Bantuan - + Bugger, I couldn't find the helpfiles on the filesystem. @@ -563,47 +608,47 @@ QG_ActionFactory - + &Export... &Ekspor... - + &Close &Tutup - + &Print... &Cetak... - + &Quit &Tutup - + &Grid &Kisi-kisi - + CTRL-G CTRL-G - + &Draft - + &Statusbar - + &Selection pointer @@ -620,27 +665,54 @@ &Persilangan - + &Preferences - + &Application Preferences - + Open IDE - + Run Script.. Jalankan Skrip.. + QG_ActiveLayerName + + + Selection + + + + + <html><head/><body> </body></html> + + + + + Current Layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions @@ -969,6 +1041,11 @@ + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + + Back to main menu Kembali ke menu @@ -1362,11 +1439,6 @@ - - Trim by amount - - - Trim / Extend @@ -1417,6 +1489,11 @@ + + Lengthen + + + Offset (Experimental Feature, work in progress) @@ -1784,7 +1861,7 @@ - + Command: @@ -1799,7 +1876,17 @@ - + + &Copy + &Salin + + + + select&All + + + + Unknown command: %1 @@ -1842,9 +1929,8 @@ - ø - ø + ø @@ -1857,9 +1943,18 @@ ± - ¶ - ¶ + ¶ + + + + ⌀ + + + + + π + @@ -1902,8 +1997,17 @@ + ⌀ (Diameter) + + + + + π (Pi) + + + ø (Diameter) - ø (Diameter) + ø (Diameter) @@ -1916,9 +2020,8 @@ - ¶ (Pi) - ¶ (Pi) + ¶ (Pi) @@ -2606,9 +2709,13 @@ Masukkan Simbol - Diameter (ø) - Diameter (ø) + Diameter (ø) + + + + Diameter (⌀) + @@ -4739,9 +4846,13 @@ Masukkan Simbol - Diameter (ø) - Diameter (ø) + Diameter (ø) + + + + Diameter (⌀) + @@ -5757,7 +5868,7 @@ QG_LayerBox - + - Unchanged - @@ -5770,19 +5881,19 @@ - - Layer Name: + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + + Construction Layer - - Help Layer + + Layer Name: @@ -5806,67 +5917,67 @@ QG_LayerWidget - + Show all layers - + Hide all layers - + Add a layer - + Remove the current layer - + Modify layer attributes / rename - + Looking for matching layer names - + Layer Menu - + &Defreeze all Layers - + &Freeze all Layers - + &Add Layer - + &Remove Layer - + &Edit Layer - + &Toggle Visibility @@ -6948,10 +7059,10 @@ QMessageBox - - - - + + + + Warning Peringatan @@ -7126,17 +7237,17 @@ - + Loading.. Memuat.. - + Loading... - + Loading File %1.. Memuat Berkas %1.. @@ -7160,112 +7271,112 @@ Buka Gambar - + Windows Bitmap - + Joint Photographic Experts Group - + Graphics Interchange Format - + Multiple-image Network Graphics - + Portable Bit Map - + Portable Grey Map - + Portable Network Graphic - + Portable Pixel Map - + X Bitmap Format - + X Pixel Map - + Scalable Vector Graphics - + SGI Black & White - + Encapsulated PostScript - + Encapsulated PostScript Format - + Encapsulated PostScript Interchange - + Windows Icon - + JPEG 2000 - + ZSoft Paintbrush - + PC Paint - + SGI-Bilddatei - + Targa Image File - + Tagged Image File Format @@ -7403,6 +7514,11 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8058,27 +8174,32 @@ Pusat, &Jari-jari - + + radius=%1 is invalid + + + + Not a valid expression - + Specify circle center - + Cancel Batal - + Specify circle radius - + Back Mundur @@ -8461,34 +8582,39 @@ - + + Can not determine uniquely an ellipse + + + + Specify the first line - + Cancel Batal - + Specify the second line - - - + + + Back Mundur - + Specify the third line - + Specify the fourth line @@ -9196,38 +9322,38 @@ RS_ActionDrawSpline - + &Spline - + Specify first control point - + Cancel Batal - + Specify next control point or [%1] - - + + Back Mundur - + Specify next control point - + Cannot undo: Not enough entities defined yet. @@ -11115,987 +11241,1035 @@ RS_Commands - - + + point titik - - + + po - - + + line garis - + l - - + + polyline - - + + offset - + o offset - - + + parallel sejajar - - + + arc - + a - - + + circle lingkaran - - + + ci - - + + rectangle persegi panjang - + rec - + rectang - - - + + + text tulisan - - + + regen - + rg zoom - redraw - + zr zoom - redraw - + zw zoom - window - + za zoom - auto - + zp zoom - pan - + zv zoom - previous - - + + kill - - + + k - - - + + + undo - - + + u undo - - - + + + redo - - + + r - + da dimension - aligned - - + + da - + dh dimension - horizontal - - + + dh - + dr dimension - linear - - + + dr - + dv dimension - vertical - - + + dv - + ld dimension - leader - - + + ld - - + + dimregen - + tm modify - multi trim (extend) - - + + tm - + xt modify - trim (extend) - - + + xt - + rm modify - trim - - + + rm - + mv modify - move - - + + mv - + ch modify - bevel (chamfer) - - + + ch - + mi modify - mirror - - + + mi - + ro modify - rotate - - + + ro - + sz modify - scale - - + + sz - + ss modify - stretch - - + + ss - + er modify - delete (erase) - - + + er - + oo modify - undo (oops) - - + + oo - + uu modify - redo - - + + uu - + xp modify - explode - - + + xp - + os - + sg snap - grid - - + + sg - + se snap - end - - + + se - + si snap - intersection - - + + si - - + + sn - + sm snap - middle - - + + sm - + sn snap - nearest - + np snap - nearest point - - + + np - + tn Deselect all - - + + tn - + Command: %1 - + pa parallel - - + + angle sudut - - + + close tutup - - + + chord length - - + + columns kolom - + columnspacing - - + + factor faktor - + length panjang - + length1 panjang1 - + length2 panjang2 - + number - - + + radius jari-jari - + rows baris - + rowspacing - - + + through - + trim - + reversed reversed - + rev reversed - + r reversed - + row - + r row - + r redo - + back mundur - + ang angle - - + + li - - + + pl - + pa - - + + ar - - + + rect - - + + mtext - - + + redraw - + zr - + zw - + za - + zp - + zv - + u - - + + + rn + restrict - nothing + + + + + rn + + + + + + rr + restrict - orthogonal + + + + + rr + + + + + + rh + restrict - horizontal + + + + + rh + + + + + + rv + restrict - vertical + + + + + rv + + + + + re - + re modify - revert direction - - + + os snap - free - - + + sc - + sc snap - center - - + + sd - + sd snap - distance - - + + sf - + sf snap - free - - + + sa - + sa Select all - + dpi - + a angle - + center pusat - + cen center - + c center - + length chord length panjang - + l chord length - + c close - + cols columns - + c columns - + columnspacing columnspacing for inserts - + colspacing columnspacing for inserts - + cs columnspacing for inserts - + fact factor - + f factor - + help bantuan - + ? help ? - + length length panjang - + len length - + l length - + length1 length1 panjang1 - + len1 length1 - + l1 length1 - + length2 length2 panjang2 - + len2 length2 - + l2 length2 - + number number - + num number - + n number - + r radius - + rowspacing rowspacing for inserts - + rs rowspacing for inserts - + t text - + t through - + b back - - + + Command not found: %1 - + Accepted keycode: %1 - + Available commands: diff -Nru librecad-2.0.3/librecad/ts/librecad_it.ts librecad-2.0.4/librecad/ts/librecad_it.ts --- librecad-2.0.3/librecad/ts/librecad_it.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_it.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + Annulla + + + Specify second point + Specificare secondo punto + + + Back + Indietro + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2075,6 +2111,29 @@ + QG_ActiveLayerName + + Selection + Selezione + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2389,6 +2448,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2777,7 +2840,7 @@ Trim by amount - Raccorda in base ad un valore + Raccorda in base ad un valore Trim / Extend two @@ -2831,6 +2894,10 @@ Revert direction + + Lengthen + Allunga + QG_CadToolBarPoints @@ -3181,6 +3248,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Copia + + + select&All + + QG_CoordinateWidget @@ -3212,7 +3287,7 @@ ø - ø + ø ° @@ -3224,7 +3299,7 @@ ¶ - ¶ + ¶ × @@ -3238,6 +3313,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3259,7 +3342,7 @@ ø (Diameter) - ø (Diametro) + ø (Diametro) ° (Degree) @@ -3271,7 +3354,7 @@ ¶ (Pi) - ¶ (Fine paragrafo) + ¶ (Fine paragrafo) × (Times) @@ -3281,6 +3364,14 @@ ÷ (Division) ÷ (Divisione) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3903,7 +3994,7 @@ Diameter (ø) - Diametro (ø) + Diametro (ø) Degree (°) @@ -4401,6 +4492,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Area B ad uso privato supplementare + + Diameter (⌀) + + QG_DlgMirror @@ -5682,7 +5777,7 @@ Diameter (ø) - Diametro (ø) + Diametro (ø) Degree (°) @@ -6260,6 +6355,10 @@ Middle Medio + + Diameter (⌀) + + QG_ExitDialog @@ -6652,12 +6751,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7981,6 +8080,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8734,6 +8837,10 @@ Draw circles with center and radius Disegna cerchio con centro e raggio + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9072,6 +9179,10 @@ Specify the fourth line Specificare la quarta linea + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12985,5 +13096,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_ja.ts librecad-2.0.4/librecad/ts/librecad_ja.ts --- librecad-2.0.3/librecad/ts/librecad_ja.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_ja.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + 中止 + + + Specify second point + + + + Back + 戻る + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -724,6 +760,29 @@ + QG_ActiveLayerName + + Selection + 選択 + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -1017,6 +1076,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1389,7 +1452,7 @@ Trim by amount - 値で調節 + 値で調節 Trim / Extend two @@ -1451,6 +1514,10 @@ Revert direction + + Lengthen + 伸長 + QG_CadToolBarPoints @@ -1805,6 +1872,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + 複写(&C) + + + select&All + + QG_CoordinateWidget @@ -1859,10 +1934,6 @@ / - ø - - - ° @@ -1871,10 +1942,6 @@ - ¶ - - - × @@ -1886,6 +1953,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1930,27 +2005,27 @@ /(割り算) - ø (Diameter) + ° (Degree) - ° (Degree) + ± (Plus / Minus) - ± (Plus / Minus) + × (Times) - ¶ (Pi) + ÷ (Division) - × (Times) + ⌀ (Diameter) - ÷ (Division) + π (Pi) @@ -2559,10 +2634,6 @@ シンボル挿入 - Diameter (ø) - - - Degree (°) @@ -3058,6 +3129,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -4818,10 +4893,6 @@ Alt+D - Diameter (ø) - - - Degree (°) @@ -4913,6 +4984,10 @@ Middle 中点 + + Diameter (⌀) + + QG_ExitDialog @@ -5289,12 +5364,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -6633,6 +6708,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7393,6 +7472,10 @@ Back 戻る + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -7727,6 +7810,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -11575,5 +11662,41 @@ modify - revert direction 矩形 + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_lv.ts librecad-2.0.4/librecad/ts/librecad_lv.ts --- librecad-2.0.3/librecad/ts/librecad_lv.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_lv.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Norādiet pirmo punktu + + + Cancel + Atcelt + + + Specify second point + Norādiet otro punktu + + + Back + Atpakaļ + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -504,6 +540,29 @@ + QG_ActiveLayerName + + Selection + Izvēle + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -796,6 +855,14 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> +Zīmēt apli, kas ir ievilkts trīstūrī, piem.,, perpendikulārs 3 līnijām. Lūdzu, tā vietā izmantojiet jauno iespēju "Aplis perpendikulāri 3".</body></html> + + + <html><head/><body>Circle with 2 Points and Radius</body></html> @@ -1114,7 +1181,7 @@ Trim by amount - Īsināt noteiktu apjomu + Īsināt noteiktu apjomu Trim / Extend two @@ -1162,6 +1229,10 @@ Revert direction + Apgriezt virzienu + + + Lengthen @@ -1443,6 +1514,14 @@ <html><head/><body>type in coordinates or commands</body></html> <html><head/><body>ierakstiet koordinātas vai komandas</body></html> + + &Copy + &Kopēt + + + select&All + + QG_CoordinateWidget @@ -1474,7 +1553,7 @@ ø - ø + ø ° @@ -1486,7 +1565,7 @@ ¶ - ¶ + ¶ × @@ -1500,6 +1579,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1521,7 +1608,7 @@ ø (Diameter) - ø (diametrs) + ø (diametrs) ° (Degree) @@ -1533,7 +1620,7 @@ ¶ (Pi) - ¶ (pī) + ¶ (pī) × (Times) @@ -1543,6 +1630,14 @@ ÷ (Division) ÷ (dalīts) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -2001,7 +2096,7 @@ Diameter (ø) - Diametrs (ø) + Diametrs (ø) Degree (°) @@ -2499,6 +2594,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [F0000-FFFFD] Papildu privātais B lauka lietojums + + Diameter (⌀) + + QG_DlgMirror @@ -3561,7 +3660,7 @@ Diameter (ø) - Diametrs (ø) + Diametrs (ø) Degree (°) @@ -4115,6 +4214,10 @@ Middle Vidū + + Diameter (⌀) + + QG_ExitDialog @@ -4441,12 +4544,21 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - Palīgslānī ir objekti ar bezgalīgi garām taisnām līnijām, kas paredzētas ģeometrisku konstrukciju veidošanai. + Palīgslānī ir objekti ar bezgalīgi garām taisnām līnijām, kas paredzētas ģeometrisku konstrukciju veidošanai. Palīgslāņa saturam nevajadzētu parādīties izdrukā. Help Layer - Palīgslānis + Palīgslānis + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + Construction Layer + @@ -5728,6 +5840,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + Datne uz diska ir modificēta. Lūdzu, saglabājiet citā datnē, lai izvairītos no datu zaudēšanas. Modificētā datne: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) @@ -6270,6 +6386,10 @@ Back Atpakaļ + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -6450,7 +6570,7 @@ Can not determine uniquely an ellipse - + Never unikāli noteikt elipsi. @@ -6588,6 +6708,10 @@ Specify the fourth line Norādiet ceturto līniju + + Can not determine uniquely an ellipse + Never unikāli noteikt elipsi. + RS_ActionDrawHatch @@ -7805,11 +7929,11 @@ RS_ActionModifyRevertDirection Re&vert direction - + Apgriezt &virznienu Ctrl+R - + Ctrl+R @@ -8435,7 +8559,7 @@ Select to revert direction - + Izvēlieties, lai apgrieztu virzienu @@ -9407,11 +9531,47 @@ re - + apg re modify - revert direction + apg + + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv diff -Nru librecad-2.0.3/librecad/ts/librecad_nl.ts librecad-2.0.4/librecad/ts/librecad_nl.ts --- librecad-2.0.3/librecad/ts/librecad_nl.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_nl.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + + + + Specify second point + Specificeer tweede punt + + + Back + Terug + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -479,7 +515,7 @@ &%1 %2 - + &%1 %2 Warning: File already opened : @@ -487,19 +523,19 @@ Cannot save the file - + Bestand kan niet worden opgeslagen , please check the filename and permissions. - + , controleer de bestandsnaam en rechten. Please consider donating to LibreCAD to help maintain the source code and website. - + Doneer alstublieft aan LibreCAD en help mee met het onderhouden van de broncode en de website. Su&b-Window mode - + su&b-Window mode Tile &Vertically @@ -2079,6 +2115,29 @@ + QG_ActiveLayerName + + Selection + Selectie + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2373,6 +2432,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2753,7 +2816,7 @@ Trim by amount - Trim met hoeveelheid + Trim met hoeveelheid Trim / Extend two @@ -2807,6 +2870,10 @@ Revert direction + + Lengthen + Verlengen + QG_CadToolBarPoints @@ -3157,6 +3224,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Kopieer + + + select&All + + QG_CoordinateWidget @@ -3188,7 +3263,7 @@ ø - ø + ø ° @@ -3200,7 +3275,7 @@ ¶ - ¶ + ¶ × @@ -3214,6 +3289,14 @@ ... .... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3235,7 +3318,7 @@ ø (Diameter) - ø (Diameter) + ø (Diameter) ° (Degree) @@ -3247,7 +3330,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3257,6 +3340,14 @@ ÷ (Division) ÷ (Delen) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3875,7 +3966,7 @@ Diameter (ø) - Diameter (ø) + Diameter (ø) Degree (°) @@ -4373,6 +4464,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5666,7 +5761,7 @@ Diameter (ø) - Diameter (ø) + Diameter (ø) Degree (°) @@ -6244,6 +6339,10 @@ Middle Middel + + Diameter (⌀) + + QG_ExitDialog @@ -6636,12 +6735,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7958,6 +8057,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8710,6 +8813,10 @@ Draw circles with center and radius Teken cirkels met center en radius + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9048,6 +9155,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12993,5 +13104,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_no.ts librecad-2.0.4/librecad/ts/librecad_no.ts --- librecad-2.0.3/librecad/ts/librecad_no.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_no.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + + + + Specify second point + + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -508,6 +544,29 @@ + QG_ActiveLayerName + + Selection + + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -773,6 +832,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1076,10 +1139,6 @@ - Trim by amount - - - Trim / Extend two @@ -1135,6 +1194,10 @@ Revert direction + + Lengthen + + QG_CadToolBarPoints @@ -1414,6 +1477,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -1444,10 +1515,6 @@ - ø - - - ° @@ -1456,10 +1523,6 @@ - ¶ - - - × @@ -1471,6 +1534,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1491,27 +1562,27 @@ - ø (Diameter) + ° (Degree) - ° (Degree) + ± (Plus / Minus) - ± (Plus / Minus) + × (Times) - ¶ (Pi) + ÷ (Division) - × (Times) + ⌀ (Diameter) - ÷ (Division) + π (Pi) @@ -1967,10 +2038,6 @@ - Diameter (ø) - - - Degree (°) @@ -2466,6 +2533,10 @@ [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -3343,10 +3414,6 @@ - Diameter (ø) - - - Degree (°) @@ -3898,6 +3965,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -4150,12 +4221,12 @@ - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -5415,6 +5486,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -5959,6 +6034,10 @@ Back + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -6277,6 +6356,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -9118,5 +9201,41 @@ modify - revert direction + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_pa.ts librecad-2.0.4/librecad/ts/librecad_pa.ts --- librecad-2.0.3/librecad/ts/librecad_pa.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_pa.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + ਪਹਿਲਾਂ ਬਿੰਦੂ ਦਿਓ + + + Cancel + ਰੱਦ ਕਰੋ + + + Specify second point + ਦੂਜਾ ਬਿੰਦੂ ਦਿਓ + + + Back + ਪਿੱਛੇ + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -783,6 +819,29 @@ + QG_ActiveLayerName + + Selection + ਚੋਣ + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -1077,6 +1136,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1449,7 +1512,7 @@ Trim by amount - ਮਾਤਰਾ ਨਾਲ ਛਾਂਟੋ + ਮਾਤਰਾ ਨਾਲ ਛਾਂਟੋ Trim / Extend two @@ -1503,6 +1566,10 @@ Revert direction + + Lengthen + Lengthen + QG_CadToolBarPoints @@ -1853,6 +1920,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + ਨਕਲ(&C) + + + select&All + + QG_CoordinateWidget @@ -1884,7 +1959,7 @@ ø - ø + ø ° @@ -1896,7 +1971,7 @@ ¶ - ¶ + ¶ × @@ -1910,6 +1985,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1931,7 +2014,7 @@ ø (Diameter) - ø (ਵਿਆਸ) + ø (ਵਿਆਸ) ° (Degree) @@ -1943,7 +2026,7 @@ ¶ (Pi) - ¶ (ਪਾਈ) + ¶ (ਪਾਈ) × (Times) @@ -1953,6 +2036,14 @@ ÷ (Division) ÷ (ਭਾਗ) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -2571,7 +2662,7 @@ Diameter (ø) - ਵਿਆਸ (ø) + ਵਿਆਸ (ø) Degree (°) @@ -3069,6 +3160,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -4318,7 +4413,7 @@ Diameter (ø) - ਵਿਆਸ (ø) + ਵਿਆਸ (ø) Degree (°) @@ -4892,6 +4987,10 @@ Middle ਮੱਧ + + Diameter (⌀) + + QG_ExitDialog @@ -5272,12 +5371,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -6590,6 +6689,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7342,6 +7445,10 @@ Back ਪਿੱਛੇ + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -7680,6 +7787,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -11723,5 +11834,41 @@ ਚਤੁਰਭੁਜ + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_pl.ts librecad-2.0.4/librecad/ts/librecad_pl.ts --- librecad-2.0.3/librecad/ts/librecad_pl.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_pl.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Wskaż pierwszy punkt + + + Cancel + Anuluj + + + Specify second point + Wskaż drugi punkt + + + Back + Wstecz + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2079,6 +2115,29 @@ + QG_ActiveLayerName + + Selection + Zaznaczenie + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2385,6 +2444,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -2769,7 +2832,7 @@ Trim by amount - Przytnij o wartość + Przytnij o wartość Trim / Extend two @@ -2823,6 +2886,10 @@ Revert direction + + Lengthen + Wydłuż + QG_CadToolBarPoints @@ -3173,6 +3240,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Kopiuj + + + select&All + + QG_CoordinateWidget @@ -3204,7 +3279,7 @@ ø - ø + ø ° @@ -3216,7 +3291,7 @@ ¶ - ¶ + ¶ × @@ -3230,6 +3305,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3251,7 +3334,7 @@ ø (Diameter) - ø (Średnica) + ø (Średnica) ° (Degree) @@ -3263,7 +3346,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -3273,6 +3356,14 @@ ÷ (Division) ÷ (Dzielenie) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3895,7 +3986,7 @@ Diameter (ø) - Średnica (ø) + Średnica (ø) Degree (°) @@ -4393,6 +4484,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5690,7 +5785,7 @@ Diameter (ø) - Średnica (ø) + Średnica (ø) Degree (°) @@ -6268,6 +6363,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -6660,12 +6759,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -7982,6 +8081,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8734,6 +8837,10 @@ Draw circles with center and radius Rysuje okręgi ze środkiem i promieniem + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9072,6 +9179,10 @@ Specify the fourth line Zdefiniuj czwartą linię + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -13005,5 +13116,41 @@ modify - revert direction pr + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_pt_br.ts librecad-2.0.4/librecad/ts/librecad_pt_br.ts --- librecad-2.0.3/librecad/ts/librecad_pt_br.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_pt_br.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + + + + Specify second point + Especifique o segundo ponto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -82,7 +118,7 @@ &Info - &Informações + &Medidas e Dimensões &Line @@ -126,7 +162,7 @@ &Dimension - &Dimensão + &Cota Version: %1 @@ -396,7 +432,7 @@ Compiled on: %1 - Compilado no: %1 + Compilado em: %1 Program Icons Supplied by @@ -635,6 +671,29 @@ + QG_ActiveLayerName + + Selection + Seleção + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Clockwise @@ -673,7 +732,7 @@ Total subtending angle of the tangential arc - Ângulo total subtendendo no arco tangente + Ângulo total subtendido no arco tangente Radius @@ -965,6 +1024,10 @@ </style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> Desenhar círculo inscritono triângulo, i.e., tangencial para 3 linhas. Favor utilizar o recurso mais recente "Círcle Tangentel 3" ao invés disso.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -974,7 +1037,7 @@ Dimensions - Dimensões + Cotas Back to main menu @@ -982,31 +1045,31 @@ Aligned Dimension - Dimensão alinhada + Cota alinhada Linear Dimension - Dimensão linear + Cota linear Horizontal Dimension - Dimensão horizontal + Cota horizontal Vertical Dimension - Dimensão vertical + Cota vertical Radial Dimension - Dimensão do raio + Cota do raio Diametric Dimension - Dimensão do diâmetro + Cota do diâmetro Angular Dimension - Dimensão angular + Cota angular Leader @@ -1068,7 +1131,7 @@ QG_CadToolBarInfo Info - Informações + Medidas e Dimensões Distance (Point, Point) @@ -1254,7 +1317,7 @@ Show toolbar "Dimensions" - Mostrar barra de ferramenta "Dimensões" + Mostrar barra de ferramenta "Cotas" Create Hatch @@ -1270,7 +1333,7 @@ Show toolbar "Info" - Mostrar barra de ferramenta "Informações" + Mostrar barra de ferramenta "Medidas e Dimensões" Show toolbar "Select" @@ -1305,7 +1368,7 @@ Trim by amount - Aparar em quantidade + Aparar em quantidade Trim / Extend @@ -1373,7 +1436,11 @@ Revert direction - Reverter direção + Inverter seleção da entidade + + + Lengthen + @@ -1681,6 +1748,14 @@ <html><head/><body>type in coordinates or commands</body></html> <html><head/><body>tipo nas coordenadas ou comandos</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -1740,7 +1815,7 @@ Linear Dimension Options - Opções de dimensão linear + Opções de cota linear @@ -1771,11 +1846,11 @@ Dimension Options - Opções de dimensão + Opções da cota ø - ø + ø ° @@ -1787,7 +1862,7 @@ ¶ - ¶ + ¶ × @@ -1801,16 +1876,24 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor Dimension Label Editor - Editor de rótulo de dimensão + Editor de rótulo da cota Dimension Label: - Rótulo de dimensão: + Rótulo da cota: Label: @@ -1822,7 +1905,7 @@ ø (Diameter) - ø (Diâmetro) + ø (Diâmetro) ° (Degree) @@ -1834,7 +1917,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -1844,6 +1927,14 @@ ÷ (Division) ÷ (Divisão) + + ⌀ (Diameter) + + + + π (Pi) + + QG_Divide2Options @@ -2021,7 +2112,7 @@ Linear Dimension - Dimensão linear + Cota linear Geometry @@ -2048,7 +2139,7 @@ Dimension - Dimensão + Cota Cancel @@ -2672,7 +2763,7 @@ Diameter (ø) - Diâmetro (ø) + Diâmetro (ø) Degree (°) @@ -3170,6 +3261,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Área-B de Uso Privado Suplementar + + Diameter (⌀) + + QG_DlgMirror @@ -3527,7 +3622,7 @@ Dimension line gap: - Dimensão da diferença da linha: + Cota entre linhas: Paper Format @@ -3679,7 +3774,7 @@ &Dimensions - &Dimensões + &Cotas Extension line extension: @@ -3851,7 +3946,7 @@ <html><head/><body>Dimension Tick size. Set it to 0 will disable the dimension tick. Dimension arrow won't be drawn when dimension tick is enabled.</body></html> - <html><head/><body>Dimensão da linha de grade. Configurar para 0 desabilitará a dimensão da linha da grade. A seta de dimensão não será desenhada quando a dimensão da linha de grade estiver habilitada.</body></html> + <html><head/><body>Cota da linha de grade. Configurar para 0 desabilitará a cota da linha da grade. A seta de cota não será desenhada quando a cota da linha de grade estiver habilitada.</body></html> 0 @@ -3867,7 +3962,7 @@ Dimension Aligned - Dimensão alinhada + Cota alinhada Horizontal @@ -3879,7 +3974,7 @@ <html><head/><body>Scale to multiply all dimension values.</body></html> - <html><head/><body>Escalonar para multiplicar todos os valores das dimensões.</body></html> + <html><head/><body>Escalonar para multiplicar todos os valores das cotas.</body></html> 0.5 @@ -5450,7 +5545,7 @@ Diameter (ø) - Diâmetro (ø) + Diâmetro (ø) Degree (°) @@ -5986,12 +6081,16 @@ Aligned - Alinhado + Alinhada Middle Meio + + Diameter (⌀) + + QG_EditPasteOptions @@ -6452,12 +6551,21 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - A camada de ajuda possui entidades com linhas retas infinitas detinadas a serem utilizadas para construções geométricas. + A camada de ajuda possui entidades com linhas retas infinitas detinadas a serem utilizadas para construções geométricas. O conteúdo de uma camada de ajuda não aparecerá na impressão. Help Layer - Camada de ajuda + Camada de ajuda + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + Construction Layer + @@ -8647,6 +8755,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 Arquivo modificado no disco. Favor salvar em outro arquivo para evitar a perda de dados! Arquivo modificado: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + QtBoolPropertyManager @@ -8921,7 +9033,7 @@ Specify dimension line location - Especifique a dimensão da linha de localização + Especifique a cota da linha de localização Cancel @@ -8933,11 +9045,11 @@ &Aligned - &Alinhado + &Alinhada Enter dimension text: - Insira a dimensão do texto: + Insira o texto na cota: Specify first extension line origin @@ -8968,11 +9080,11 @@ Enter dimension text: - Insira a dimensão do texto: + Insira o texto na cota: Specify dimension arc line location - Especifique a dimensão do arco da linha de localização + Especificar a cota do arco na linha de localização Select first line @@ -8995,7 +9107,7 @@ Specify dimension line location - Indicar a dimensão da localização de linha + Indicar a cota no local da linha Cancel @@ -9007,11 +9119,11 @@ &Diametric - &Diamétrico + &Diamétrica Enter dimension text: - Insira a dimensão do texto: + Insira o texto na cota: @@ -9068,7 +9180,7 @@ Specify dimension line location - Especifique a dimensão da linha de localização + Especificar a cota no local da linha Cancel @@ -9080,7 +9192,7 @@ Enter dimension text: - Entre com a dimensão do texto: + Insira o texto na cota: &Linear @@ -9092,7 +9204,7 @@ Enter dimension line angle: - Entre com o ângulo da linha de dimensão: + Entre com a cota do ângulo: &Horizontal @@ -9146,7 +9258,7 @@ Specify dimension line position or enter angle: - Especifique a dimensão da linha de posicionamento ou entre com o ângulo: + Especifique a cota na posição da linha ou entre com o ângulo: Cancel @@ -9158,7 +9270,7 @@ Enter dimension text: - Especifique a dimensão do texto: + Insira o texto na cota: &Radial @@ -9447,6 +9559,10 @@ Center, &Radius Centro, &Raio + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9795,6 +9911,10 @@ Specify the fourth line Especifique a quarta linha + + Can not determine uniquely an ellipse + Não é possível determinar uma elipse única + RS_ActionDrawHatch @@ -10954,7 +11074,7 @@ An&gle between two lines - Ân&gulo entre duas linhas + Ân&gulo Angle: %1 @@ -11005,7 +11125,7 @@ Polygonal &Area - &Área poligonal + &Área do polígono Closing Point: %1/%2 @@ -11032,7 +11152,7 @@ &Distance Point to Point - &Distância ponto a ponto + &Régua Cancel @@ -11475,7 +11595,7 @@ Pick entity to delete - Selecione as entidades para apagar + Selecionar as entidades para apagar @@ -12624,7 +12744,7 @@ Select entities to order - Selecione as entidades para ordenar + Selecionar as entidades para ordenar Select to explode block @@ -12632,7 +12752,7 @@ Select to revert direction - Selecionar para reverter direção + Selecione para inverter a entidade @@ -13022,11 +13142,11 @@ Regenerated %1 dimension entities - Foram regeneradas %1 entidades de dimensão + Foram regeneradas %1 entidades das cotas No dimension entities found - Nenhuma entidade de dimensão encontrada + Nenhuma entidade de cota encontrada &Regenerate Dimension Entities @@ -13034,7 +13154,7 @@ Regenerate Dimension Entities - Regenerar dimensão de entidades + Regenerar cota de entidades @@ -13082,7 +13202,7 @@ RS_ActionZoomAuto &Auto Zoom - Zoom &automático + Enquadrar Zooms automatic @@ -13966,5 +14086,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_pt_pt.ts librecad-2.0.4/librecad/ts/librecad_pt_pt.ts --- librecad-2.0.3/librecad/ts/librecad_pt_pt.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_pt_pt.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + + + + Specify second point + Indique o segundo ponto + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -634,6 +670,29 @@ + QG_ActiveLayerName + + Selection + Seleção + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Clockwise @@ -931,6 +990,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1266,10 +1329,6 @@ - Trim by amount - - - Trim / Extend @@ -1337,6 +1396,10 @@ Revert direction + + Lengthen + + QG_CadToolBarPoints @@ -1643,6 +1706,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + Co&pie + + + select&All + + QG_CoordinateWidget @@ -1736,10 +1807,6 @@ - ø - - - ° @@ -1748,10 +1815,6 @@ - ¶ - - - × @@ -1763,6 +1826,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1783,27 +1854,27 @@ Insere: - ø (Diameter) + ° (Degree) - ° (Degree) + ± (Plus / Minus) - ± (Plus / Minus) + × (Times) - ¶ (Pi) + ÷ (Division) - × (Times) + ⌀ (Diameter) - ÷ (Division) + π (Pi) @@ -2629,10 +2700,6 @@ Insere Símbolo - Diameter (ø) - - - Degree (°) @@ -3128,6 +3195,10 @@ [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -5391,10 +5462,6 @@ Alinhamento - Diameter (ø) - - - Degree (°) @@ -5934,6 +6001,10 @@ Middle Meio + + Diameter (⌀) + + QG_EditPasteOptions @@ -6392,12 +6463,12 @@ - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -8579,6 +8650,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + QtBoolPropertyManager @@ -9379,6 +9454,10 @@ Center, &Radius Centro, &Raio + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9727,6 +9806,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -13898,5 +13981,41 @@ modify - revert direction + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_ro_ro.ts librecad-2.0.4/librecad/ts/librecad_ro_ro.ts --- librecad-2.0.3/librecad/ts/librecad_ro_ro.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_ro_ro.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Specificati primul punct + + + Cancel + Renuntare + + + Specify second point + Specificati al doilea punct + + + Back + Inapoi + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -817,6 +853,29 @@ + QG_ActiveLayerName + + Selection + Selectie + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -1123,6 +1182,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1514,7 +1577,7 @@ Trim by amount - Ajustare cu o valoare + Ajustare cu o valoare Trim / Extend two @@ -1568,6 +1631,10 @@ Revert direction + + Lengthen + Lungime + QG_CadToolBarPoints @@ -1918,6 +1985,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Copiere + + + select&All + + QG_CoordinateWidget @@ -1949,7 +2024,7 @@ ø - ø + ø ° @@ -1961,7 +2036,7 @@ ¶ - ¶ + ¶ × @@ -1975,6 +2050,14 @@ ... ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1996,7 +2079,7 @@ ø (Diameter) - ø (Diametru) + ø (Diametru) ° (Degree) @@ -2016,7 +2099,15 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) + + + ⌀ (Diameter) + + + + π (Pi) + @@ -2624,7 +2715,7 @@ Diameter (ø) - Diametru (ø) + Diametru (ø) Degree (°) @@ -3122,6 +3213,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Zona suplimentara B pentru folosire privata + + Diameter (⌀) + + QG_DlgMirror @@ -4399,7 +4494,7 @@ Diameter (ø) - Diametru (ø) + Diametru (ø) Degree (°) @@ -4973,6 +5068,10 @@ Middle Mijloc + + Diameter (⌀) + + QG_ExitDialog @@ -5367,12 +5466,21 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - Un strat de ajutor contine ca entitati linii drepte infinite ca lungime pentru a fi folosite pentru constructia geometrica. + Un strat de ajutor contine ca entitati linii drepte infinite ca lungime pentru a fi folosite pentru constructia geometrica. Continutul stratului de ajutor nu apare la listare. Help Layer - Strat de ajutor + Strat de ajutor + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + Construction Layer + @@ -6704,6 +6812,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7448,6 +7560,10 @@ Draw circles with center and radius Desenare cercuri cu centru si raza + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -7786,6 +7902,10 @@ Specify the fourth line Specificati a patra linie + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -11631,5 +11751,41 @@ modify - revert direction re + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_ru.ts librecad-2.0.4/librecad/ts/librecad_ru.ts --- librecad-2.0.3/librecad/ts/librecad_ru.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_ru.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Укажите первую точку + + + Cancel + Отмена + + + Specify second point + Укажите вторую точку + + + Back + Назад + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -2078,6 +2114,29 @@ + QG_ActiveLayerName + + Selection + Выбор + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2133,11 +2192,11 @@ Trim - Усечь + Отсечь Check to trim both entities to the bevel - Установите, чтобы усечь оба базовых объекта + Установите, чтобы отсечь оба базовых объекта Length 1: @@ -2310,7 +2369,7 @@ Circle with two opposite points - Окружность по двум противоположным точкам + Окружность по двум точкам диаметра Circle with center and radius @@ -2410,6 +2469,14 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> +Начертить окружность, вписанную втреугольник, т.е., касательную к трём отрезкам. Лучше вместо этогоиспользуйте функцию «Окружность → По трём касательным».</body></html> + + + <html><head/><body>Circle with 2 Points and Radius</body></html> @@ -2792,7 +2859,7 @@ Trim by amount - Обрезать на величину + Обрезать на величину Trim / Extend two @@ -2846,6 +2913,10 @@ Revert direction Обратить направление + + Lengthen + Удлиннить + QG_CadToolBarPoints @@ -2866,7 +2937,7 @@ QG_CadToolBarPolylines Polylines - Ломаные + Полилинии Back to main menu @@ -2874,7 +2945,7 @@ Create Polyline - Создать ломаную + Создать полилинию Delete between two nodes @@ -3196,6 +3267,14 @@ <html><head/><body>type in coordinates or commands</body></html> <html><head/><body>Введите координаты или команду</body></html> + + &Copy + &Копировать + + + select&All + + QG_CoordinateWidget @@ -3227,7 +3306,7 @@ ø - ø + ø ° @@ -3239,7 +3318,7 @@ ¶ - ¶ + ¶ × @@ -3253,6 +3332,14 @@ ... … + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3274,7 +3361,7 @@ ø (Diameter) - ø (диаметр) + ø (диаметр) ° (Degree) @@ -3286,7 +3373,7 @@ ¶ (Pi) - ¶ (число Пи) + ¶ («пи») × (Times) @@ -3296,6 +3383,14 @@ ÷ (Division) ÷ (знак деления) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3918,7 +4013,7 @@ Diameter (ø) - ⌀ (диаметр) + ⌀ (диаметр) Degree (°) @@ -3954,7 +4049,7 @@ Pi (π) - π (Пи) + π («пи») Pound (£) @@ -4416,6 +4511,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Дополнительная частная плоскость B + + Diameter (⌀) + + QG_DlgMirror @@ -4433,11 +4532,11 @@ &Delete Original - У&далить оригинал + &Удалить оригинал &Keep Original - С&охранить оригинал + &Сохранить оригинал Use current &attributes @@ -4555,7 +4654,7 @@ &Delete Original - У&далить оригинал + &Удалить оригинал &Keep Original @@ -4710,11 +4809,11 @@ Paper &Height: - Высо&та бумаги: + &Высота бумаги: Paper &Width: - Ширина &бумаги: + &Ширина бумаги: &Units @@ -4722,7 +4821,7 @@ &Main drawing unit: - &Основаная единица измерения чертежа: + &Основная единица измерения чертежа: &Format: @@ -4782,7 +4881,7 @@ &Grid - &По сетке + &Сетка Splines @@ -4902,7 +5001,7 @@ <html><head/><body>Scale to multiply all dimension values.</body></html> - <html><head/><body>Масштабный множитель всех значений параметров размера.</body></html> + <html><head/><body>Масштабный множитель всех параметров размера.</body></html> 0.5 @@ -4954,7 +5053,7 @@ <html><head/><body>Scale to multiply all dimension geometries.</body></html> - + <html><head/><body>Масштабный коэффициент размеров.</body></html> <html><head/><body>Text alignment.</body></html> @@ -5193,7 +5292,7 @@ Please restart the application to apply all changes. - Пожалуйста перезапустите приложение для того, чтобы настройки подействовали. + Пожалуйста перезапустите приложение для изменения настроек. Alt+S @@ -5428,7 +5527,7 @@ QG_DlgRotate2 Rotate Two Options - Параметры поворота вокруг двух центров + Параметры вращения вокруг двух центров Cancel @@ -5511,11 +5610,11 @@ &Delete Original - У&далить оригинал + &Удалить оригинал &Keep Original - С&охранить оригинал + &Сохранить оригинал &Multiple Copies @@ -5527,7 +5626,7 @@ Scale by the same factor at both x- and y- directions - Одинаковый коэффициент масштабирования в x- и y- направлении + Одинаковый коэффициент масштабирования в направлении x и y Isotropic Scaling @@ -5689,7 +5788,7 @@ Diameter (ø) - Диаметр (ø) + Диаметр (ø) Degree (°) @@ -5729,11 +5828,11 @@ Pound (£) - Английский фунт (£) + £ (фунт стерлингов) Yen (¥) - Японская йена (¥) + ¥ (йена) Times (×) @@ -6189,7 +6288,7 @@ &Height: - Высо&та: + &Высота: Line &spacing: @@ -6267,6 +6366,10 @@ Middle Середина + + Diameter (⌀) + + QG_ExitDialog @@ -6661,12 +6764,21 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - На вспомогательном слое располагаются неограниченное количество линий, применяемых для геометрических построений. + На вспомогательном слое располагаются неограниченное количество линий, применяемых для геометрических построений. Содержимое вспомогательного слоя не выводится на печать. Help Layer - Вспомогательный слой + Вспомогательный слой + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + Construction Layer + @@ -7194,7 +7306,7 @@ Toggle Black / White mode - Переключить режим черный / белый + Переключить чёрно-белый режим Center to page @@ -7990,6 +8102,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8730,6 +8846,10 @@ Draw circles with center and radius Начертить окружность по центру и радиусу + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -9068,6 +9188,10 @@ Specify the fourth line Укажите четвёртую линию + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -12767,5 +12891,41 @@ modify - revert direction + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_sk.ts librecad-2.0.4/librecad/ts/librecad_sk.ts --- librecad-2.0.3/librecad/ts/librecad_sk.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_sk.ts 2014-05-30 03:54:17.000000000 +0000 @@ -32,6 +32,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Zvoľte prvý bod + + + Cancel + Zrušiť + + + Specify second point + Zvoľte druhý bod + + + Back + Späť + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -1095,6 +1131,29 @@ + QG_ActiveLayerName + + Selection + Označenie + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -1389,6 +1448,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1757,7 +1820,7 @@ Trim by amount - Orež o hodnotu + Orež o hodnotu Trim / Extend two @@ -1811,6 +1874,10 @@ Revert direction + + Lengthen + Predĺženie + QG_CadToolBarPoints @@ -2161,6 +2228,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Kópíruj + + + select&All + + QG_CoordinateWidget @@ -2192,7 +2267,7 @@ ø - ø + ø ° @@ -2204,7 +2279,7 @@ ¶ - ¶ + ¶ × @@ -2218,6 +2293,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -2239,7 +2322,7 @@ ø (Diameter) - ø (Polomer) + ø (Polomer) ° (Degree) @@ -2251,7 +2334,7 @@ ¶ (Pi) - ¶ (Pí) + ¶ (Pí) × (Times) @@ -2261,6 +2344,14 @@ ÷ (Division) ÷ (Delenie) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -2883,7 +2974,7 @@ Diameter (ø) - Priemer (ø) + Priemer (ø) Degree (°) @@ -3381,6 +3472,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Dodatočná užívateľská oblasť B + + Diameter (⌀) + + QG_DlgMirror @@ -4642,7 +4737,7 @@ Diameter (ø) - Priemer (ø) + Priemer (ø) Degree (°) @@ -5216,6 +5311,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -5600,12 +5699,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -6922,6 +7021,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7662,6 +7765,10 @@ Back Späť + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -8000,6 +8107,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -11865,5 +11976,41 @@ modify - revert direction obdlznik + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_sl.ts librecad-2.0.4/librecad/ts/librecad_sl.ts --- librecad-2.0.3/librecad/ts/librecad_sl.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_sl.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + Prekliči + + + Specify second point + + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -504,6 +540,29 @@ + QG_ActiveLayerName + + Selection + + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -770,6 +829,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1081,10 +1144,6 @@ - Trim by amount - - - Trim / Extend two @@ -1132,6 +1191,10 @@ Revert direction + + Lengthen + + QG_CadToolBarPoints @@ -1411,6 +1474,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + + + + select&All + + QG_CoordinateWidget @@ -1441,10 +1512,6 @@ - ø - - - ° @@ -1453,10 +1520,6 @@ - ¶ - - - × @@ -1468,6 +1531,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1488,27 +1559,27 @@ - ø (Diameter) + ° (Degree) - ° (Degree) + ± (Plus / Minus) - ± (Plus / Minus) + × (Times) - ¶ (Pi) + ÷ (Division) - × (Times) + ⌀ (Diameter) - ÷ (Division) + π (Pi) @@ -1964,10 +2035,6 @@ - Diameter (ø) - - - Degree (°) @@ -2463,6 +2530,10 @@ [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -3340,10 +3411,6 @@ - Diameter (ø) - - - Degree (°) @@ -3895,6 +3962,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -4147,12 +4218,12 @@ - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -5412,6 +5483,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -5956,6 +6031,10 @@ Back + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -6274,6 +6353,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -9115,5 +9198,41 @@ modify - revert direction + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_sq_al.ts librecad-2.0.4/librecad/ts/librecad_sq_al.ts --- librecad-2.0.3/librecad/ts/librecad_sq_al.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_sq_al.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,51 @@ + LC_ActionDrawCircle2PR + + + 2 Points, Radius + + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + + Select from two possible circle centers + + + + + Specify first point + + + + + Cancel + + + + + Specify second point + + + + + + Back + + + + + Select circle center + + + + QC_ActionGetEnt @@ -43,42 +88,42 @@ QC_ApplicationWindow - + Running script '%1' - + Inserting block '%1' - + &File - + Import Importo - + &Edit Edito - + &View - + &Toolbars - + Focus on &Command Line @@ -87,12 +132,12 @@ Ctrl+M - + &Select - + &Draw &Vizato @@ -101,64 +146,64 @@ &Pikë - + &Line - + &Arc &Hark - + &Circle &Rreth - + &Ellipse &Elips - + &Polyline &Polivizë - - + + &Dimension &Dimension - + &Modify &Modifiko - + &Snap &Ngjit - + &Info &Info - + &Layer - - + + &Block &Bllok - + &Scripts @@ -167,233 +212,233 @@ &CAM - + About - + &Manual &Manuali - + Insert Image Vendos Imazh - + &Window &Dritare - + &Help &Ndihmë - + De&bugging - + Layer List - + Block List Lista e Blloqeve - + Library Browser - + Command line - + &Cascade - + &Tile - + Tile &Horizontally - + Creating new file... - + Block '%1' - + unnamed document %1 dokument i paemërtuar %1 - + New Drawing created. U krijua vizatim i ri. - + Opening recent file... - - + + Cannot open the file %1 Please check the permissions. - + Loaded document: - + Opening aborted - + Saving drawing... Duke ruajtur vizatimin... - - + + Saved drawing: %1 Vizatimi i ruajtur: %1 - + Cannot save the file %1 Please check the permissions. - + Saving drawing under new filename... - + File - + Edit - + Draw &Order - + View - + Pen Selection - + Snap Selection - + Tool Options - + CAD Tools Veglat CAD - + &%1 %2 - + Su&b-Window mode - + Tile &Vertically - + Ta&b mode - + New document from template: - + Select Template aborted - + Warning: File already opened : - + Cannot save the file - + , please check the filename and permissions. - + Auto-saving drawing... - + Auto-saved drawing - + Cannot auto-save the file %1 Please check the permissions. @@ -401,133 +446,133 @@ - + Auto-saving failed - + Exporting drawing... Duke eksportuar vizatimin... - + Export as - + Exported: %1 Eksportuar: %1 - + Exporting... Duke eksportuar... - + Export complete Eksporti përfundoi - + Export failed! Eksportimi dështoi! - + Printing... Në printim... - + Printing complete Printimi përfundoi - + Print preview for %1 - + Exiting application... Duke mbyllur programin... - + None - + About... Rreth... - + Version: %1 Versioni: %1 - + SCM Revision: %1 - + Compiler: Clang %1.%2.%3 - + Compiler: GNU GCC %1.%2.%3 - + Compiler: Microsoft Visual C++ - + Qt Version: %1 - + Compiled on: %1 - + Program Icons Supplied by - + Splash and Logo supplied by - + Modules: %1 - + Main Website : Faqja Web Kryesore : - + Please consider donating to LibreCAD to help maintain the source code and website. - + Help files not found @@ -536,12 +581,12 @@ Të lutem dhuro për LibreCAD'in në mënyrë që të ndihmosh në mirëmbajtjen e kodit programor dhe faqes së saj web. - + Help Ndihmë - + Bugger, I couldn't find the helpfiles on the filesystem. @@ -568,72 +613,99 @@ QG_ActionFactory - + &Export... - + &Close - + &Print... - + &Quit - + &Grid - + CTRL-G - + &Draft - + &Statusbar - + &Selection pointer - + &Preferences - + &Application Preferences - + Open IDE - + Run Script.. + QG_ActiveLayerName + + + Selection + + + + + <html><head/><body> </body></html> + + + + + Current Layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions @@ -946,6 +1018,11 @@ + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + + Back to main menu @@ -1315,11 +1392,6 @@ - - Trim by amount - - - Trim / Extend @@ -1370,6 +1442,11 @@ + + Lengthen + + + Offset (Experimental Feature, work in progress) @@ -1730,7 +1807,7 @@ - + Command: @@ -1745,7 +1822,17 @@ - + + &Copy + + + + + select&All + + + + Unknown command: %1 @@ -1788,11 +1875,6 @@ - - ø - - - ° @@ -1803,8 +1885,13 @@ + + ⌀ + + + - ¶ + π @@ -1848,7 +1935,12 @@ - ø (Diameter) + ⌀ (Diameter) + + + + + π (Pi) @@ -1862,11 +1954,6 @@ - - ¶ (Pi) - - - × (Times) @@ -2433,7 +2520,7 @@ - Diameter (ø) + Diameter (⌀) @@ -4235,7 +4322,7 @@ - Diameter (ø) + Diameter (⌀) @@ -5144,7 +5231,7 @@ QG_LayerBox - + - Unchanged - @@ -5157,19 +5244,19 @@ - - Layer Name: + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + + Construction Layer - - Help Layer + + Layer Name: @@ -5181,67 +5268,67 @@ QG_LayerWidget - + Show all layers - + Hide all layers - + Add a layer - + Remove the current layer - + Modify layer attributes / rename - + Looking for matching layer names - + Layer Menu - + &Defreeze all Layers - + &Freeze all Layers - + &Add Layer - + &Remove Layer - + &Edit Layer - + &Toggle Visibility @@ -6303,10 +6390,10 @@ QMessageBox - - - - + + + + Warning @@ -6503,17 +6590,17 @@ - + Loading.. - + Loading... - + Loading File %1.. @@ -6533,112 +6620,112 @@ - + Windows Bitmap - + Joint Photographic Experts Group - + Graphics Interchange Format - + Multiple-image Network Graphics - + Portable Bit Map - + Portable Grey Map - + Portable Network Graphic - + Portable Pixel Map - + X Bitmap Format - + X Pixel Map - + Scalable Vector Graphics - + SGI Black & White - + Encapsulated PostScript - + Encapsulated PostScript Format - + Encapsulated PostScript Interchange - + Windows Icon - + JPEG 2000 - + ZSoft Paintbrush - + PC Paint - + SGI-Bilddatei - + Targa Image File - + Tagged Image File Format @@ -6754,6 +6841,11 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7409,27 +7501,32 @@ - + + radius=%1 is invalid + + + + Not a valid expression - + Specify circle center - + Cancel - + Specify circle radius - + Back @@ -7812,34 +7909,39 @@ - + + Can not determine uniquely an ellipse + + + + Specify the first line - + Cancel - + Specify the second line - - - + + + Back - + Specify the third line - + Specify the fourth line @@ -8528,38 +8630,38 @@ RS_ActionDrawSpline - + &Spline - + Specify first control point - + Cancel - + Specify next control point or [%1] - - + + Back - + Specify next control point - + Cannot undo: Not enough entities defined yet. @@ -10431,987 +10533,1035 @@ RS_Commands - - + + point - - + + po - - + + line - + l - - + + polyline - - + + offset - + o offset - - + + parallel - - + + arc - + a - - + + circle - - + + ci - - + + rectangle - + rec - + rectang - - - + + + text - - + + regen - + rg zoom - redraw - + zr zoom - redraw - + zw zoom - window - + za zoom - auto - + zp zoom - pan - + zv zoom - previous - - + + kill - - + + k - - - + + + undo - - + + u undo - - - + + + redo - - + + r - + da dimension - aligned - - + + da - + dh dimension - horizontal - - + + dh - + dr dimension - linear - - + + dr - + dv dimension - vertical - - + + dv - + ld dimension - leader - - + + ld - - + + dimregen - + tm modify - multi trim (extend) - - + + tm - + xt modify - trim (extend) - - + + xt - + rm modify - trim - - + + rm - + mv modify - move - - + + mv - + ch modify - bevel (chamfer) - - + + ch - + mi modify - mirror - - + + mi - + ro modify - rotate - - + + ro - + sz modify - scale - - + + sz - + ss modify - stretch - - + + ss - + er modify - delete (erase) - - + + er - + oo modify - undo (oops) - - + + oo - + uu modify - redo - - + + uu - + xp modify - explode - - + + xp - + os - + sg snap - grid - - + + sg - + se snap - end - - + + se - + si snap - intersection - - + + si - - + + sn - + sm snap - middle - - + + sm - + sn snap - nearest - + np snap - nearest point - - + + np - + tn Deselect all - - + + tn - + Command: %1 - + pa parallel - - + + angle - - + + close - - + + chord length - - + + columns - + columnspacing - - + + factor - + length - + length1 - + length2 - + number - - + + radius - + rows - + rowspacing - - + + through - + trim - + reversed reversed - + rev reversed - + r reversed - + row - + r row - + r redo - + back - + ang angle - - + + li - - + + pl - + pa - - + + ar - - + + rect - - + + mtext - - + + redraw - + zr - + zw - + za - + zp - + zv - + u - - + + + rn + restrict - nothing + + + + + rn + + + + + + rr + restrict - orthogonal + + + + + rr + + + + + + rh + restrict - horizontal + + + + + rh + + + + + + rv + restrict - vertical + + + + + rv + + + + + re - + re modify - revert direction - - + + os snap - free - - + + sc - + sc snap - center - - + + sd - + sd snap - distance - - + + sf - + sf snap - free - - + + sa - + sa Select all - + dpi - + a angle - + center - + cen center - + c center - + length chord length - + l chord length - + c close - + cols columns - + c columns - + columnspacing columnspacing for inserts - + colspacing columnspacing for inserts - + cs columnspacing for inserts - + fact factor - + f factor - + help - + ? help - + length length - + len length - + l length - + length1 length1 - + len1 length1 - + l1 length1 - + length2 length2 - + len2 length2 - + l2 length2 - + number number - + num number - + n number - + r radius - + rowspacing rowspacing for inserts - + rs rowspacing for inserts - + t text - + t through - + b back - - + + Command not found: %1 - + Accepted keycode: %1 - + Available commands: diff -Nru librecad-2.0.3/librecad/ts/librecad_sv.ts librecad-2.0.4/librecad/ts/librecad_sv.ts --- librecad-2.0.3/librecad/ts/librecad_sv.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_sv.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + + + + Cancel + Avbryt + + + Specify second point + + + + Back + + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -579,6 +615,29 @@ + QG_ActiveLayerName + + Selection + + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -868,6 +927,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1187,10 +1250,6 @@ - Trim by amount - - - Trim / Extend two @@ -1238,6 +1297,10 @@ Revert direction + + Lengthen + + QG_CadToolBarPoints @@ -1524,6 +1587,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Kopiera + + + select&All + + QG_CoordinateWidget @@ -1555,7 +1626,7 @@ ø - ø + ø ° @@ -1567,7 +1638,7 @@ ¶ - ¶ + ¶ × @@ -1581,6 +1652,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1602,7 +1681,7 @@ ø (Diameter) - ø (Diameter) + ø (Diameter) ° (Degree) @@ -1614,7 +1693,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -1624,6 +1703,14 @@ ÷ (Division) ÷ (Division) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -2234,7 +2321,7 @@ Diameter (ø) - Diameter (ø) + Diameter (ø) Degree (°) @@ -2732,6 +2819,10 @@ [100000-10FFFD] Supplementary Private Use Area-B + + Diameter (⌀) + + QG_DlgMirror @@ -3965,7 +4056,7 @@ Diameter (ø) - Diameter (ø) + Diameter (ø) Degree (°) @@ -4531,6 +4622,10 @@ Middle + + Diameter (⌀) + + QG_ExitDialog @@ -4911,12 +5006,12 @@ Esc - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -6221,6 +6316,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -6789,6 +6888,10 @@ Back + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -7107,6 +7210,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -10091,5 +10198,41 @@ modify - revert direction + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_tr.ts librecad-2.0.4/librecad/ts/librecad_tr.ts --- librecad-2.0.3/librecad/ts/librecad_tr.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_tr.ts 2014-05-30 03:54:17.000000000 +0000 @@ -17,6 +17,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + İlk noktayı belirtin + + + Cancel + İptal + + + Specify second point + İkinci noktayı belirtin + + + Back + Geri + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -800,6 +836,29 @@ + QG_ActiveLayerName + + Selection + Seçim + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -1095,6 +1154,10 @@ Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + QG_CadToolBarDim @@ -1439,7 +1502,7 @@ Trim by amount - Uçtan kırp + Uçtan kırp Trim / Extend @@ -1517,6 +1580,10 @@ Revert direction + + Lengthen + Kısalt + QG_CadToolBarPoints @@ -1867,6 +1934,14 @@ <html><head/><body>type in coordinates or commands</body></html> + + &Copy + &Kopyala + + + select&All + + QG_CoordinateWidget @@ -1898,7 +1973,7 @@ ø - ø + ø ° @@ -1910,7 +1985,7 @@ ¶ - ¶ + ¶ × @@ -1924,6 +1999,14 @@ ... + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -1945,7 +2028,7 @@ ø (Diameter) - ø (Çap) + ø (Çap) ° (Degree) @@ -1957,7 +2040,7 @@ ¶ (Pi) - ¶ (Pi) + ¶ (Pi) × (Times) @@ -1967,6 +2050,14 @@ ÷ (Division) ÷ (Bölü) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -2589,7 +2680,7 @@ Diameter (ø) - Çap (ø) + Çap (ø) Degree (°) @@ -3087,6 +3178,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Bütünleyici Özel Kullanım Alan-B + + Diameter (⌀) + + QG_DlgMirror @@ -4348,7 +4443,7 @@ Diameter (ø) - Çap (ø) + Çap (ø) Degree (°) @@ -4914,6 +5009,10 @@ Middle Orta + + Diameter (⌀) + + QG_ExitDialog @@ -5302,12 +5401,12 @@ Öntanımlı Kalem - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. -The contents of a Help Layer should not appear in printout. + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. - Help Layer + Construction Layer @@ -6623,6 +6722,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -7359,6 +7462,10 @@ Back Geri + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -7697,6 +7804,10 @@ Specify the fourth line + + Can not determine uniquely an ellipse + + RS_ActionDrawHatch @@ -11538,5 +11649,41 @@ modify - revert direction 4 + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_uk.ts librecad-2.0.4/librecad/ts/librecad_uk.ts --- librecad-2.0.3/librecad/ts/librecad_uk.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_uk.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,42 @@ + LC_ActionDrawCircle2PR + + 2 Points, Radius + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + Select from two possible circle centers + + + + Specify first point + Вкажіть першу точку + + + Cancel + + + + Specify second point + Вкажіть другу точку + + + Back + Назад + + + Select circle center + + + + QC_ActionGetEnt Select object: @@ -16,7 +52,7 @@ QC_ActionGetPoint Specify a point - Вкажіть точку + Визначити точку Cancel @@ -50,7 +86,7 @@ &Edit - &Редагування + Редагувати Focus on &Command Line @@ -98,7 +134,7 @@ &Draw - &Креслення + &Накреслити &Dimension @@ -114,7 +150,7 @@ &Info - &Інфо + &Інформація &Layer @@ -174,7 +210,7 @@ &Cascade - &Уступами + &Каскадом &Tile @@ -253,10 +289,10 @@ %1 Please check the permissions. Auto-save disabled. - Неможливо автоматично зберегти файл + Неможливо авто-зберегти файл %1 -Будь ласка, перевірте права доступу. -Автозбереження вимкнуте. +Перевірте, будь ласка, права доступу. +Авто-збереження відключене. Exporting drawing... @@ -264,7 +300,7 @@ Exported: %1 - Експортовано: %1 + Експортування: %1 Exporting... @@ -292,7 +328,7 @@ Exiting application... - Вихід з програми… + Закриття програми… None @@ -328,7 +364,7 @@ Compiled on: %1 - Скомпільовано на дату: %1 + Скомпільовано: %1 Program Icons Supplied by @@ -340,7 +376,7 @@ Main Website : - Основний веб-сайт: + Інтернет-сайт: Version: %1 @@ -416,11 +452,11 @@ Pen Selection - + Вибір пера Snap Selection - + Вибір прив’язки Tool Options @@ -459,12 +495,12 @@ QC_MDIWindow Do you really want to close the drawing? - Ви справді хочете закрити це креслення? + Ви дійсно бажаєте закрити креслення? Do you really want to close the file %1? - Ви справді бажаєте закрити файл + Ви дійсно хочете закрити файл? %1? @@ -1308,7 +1344,7 @@ &Grid - &За сіткою + &Сітка Grid positioning @@ -1984,6 +2020,29 @@ + QG_ActiveLayerName + + Selection + Вибір + + + <html><head/><body> </body></html> + + + + Current Layer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions Arc Options @@ -2316,6 +2375,14 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> Draw Circle inscribed in a triangle, i.e., tangential to 3 lines. Please use the newer feature "Circle Tangential 3" instead.</body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> +Накреслити коло, вписане в трикутник, тобто, дотичне до 3 ліній. Будь ласка, натомість використовуйте нову функцію "Коло дотичне трьом".</body></html> + + + <html><head/><body>Circle with 2 Points and Radius</body></html> @@ -2711,7 +2778,7 @@ Trim by amount - Усікти на величину + Усікти на величину Trim / Extend two @@ -2763,7 +2830,11 @@ Revert direction - + Повернути напрямок + + + Lengthen + Подовжити @@ -2987,7 +3058,7 @@ QG_CircleTan2Options Circle Tangential2 Options - + Параметри кола, дотичного до двох об’єктів <html><head/><body>Radius of the tangential circle to draw</body></html> @@ -3116,6 +3187,14 @@ <html><head/><body>type in coordinates or commands</body></html> + <html><head/><body>ввести координати або команди</body></html> + + + &Copy + &Копіювати + + + select&All @@ -3149,7 +3228,7 @@ ø - ø + ø ° @@ -3161,7 +3240,7 @@ ¶ - ¶ + ¶ × @@ -3175,6 +3254,14 @@ ... … + + ⌀ + + + + π + + QG_DimensionLabelEditor @@ -3196,7 +3283,7 @@ ø (Diameter) - ø (діаметр) + ø (діаметр) ° (Degree) @@ -3208,7 +3295,7 @@ ¶ (Pi) - Число Пі (¶) + Число Пі (¶) × (Times) @@ -3218,6 +3305,14 @@ ÷ (Division) Знак ділення (÷) + + ⌀ (Diameter) + + + + π (Pi) + + QG_DlgArc @@ -3541,7 +3636,7 @@ insert (x): - + Положення (x): Scale: @@ -3557,7 +3652,7 @@ insert (y): - + Положення (y): Angle: @@ -3845,7 +3940,7 @@ Diameter (ø) - ⌀ (діаметр) + ⌀ (діаметр) Degree (°) @@ -4343,6 +4438,10 @@ [100000-10FFFD] Supplementary Private Use Area-B [100000-10FFFD] Додаткова область приватного користування -B + + Diameter (⌀) + + QG_DlgMirror @@ -4834,7 +4933,7 @@ <html><head/><body>Scale to multiply all dimension values.</body></html> - + <html><head/><body>Множник, що масштабує усі значення розмірів.</body></html> 0.5 @@ -4854,7 +4953,7 @@ General Factor: - + Загальний коефіцієнт: 0.2 @@ -4886,11 +4985,11 @@ <html><head/><body>Scale to multiply all dimension geometries.</body></html> - + <html><head/><body>Множник, що масштабує усі геометричні розміри.</body></html> <html><head/><body>Text alignment.</body></html> - + <html><head/><body>Вирівнювання тексту.</body></html> @@ -5221,15 +5320,15 @@ St&art Handle Color: - + Колір &початку вибраного: &Handle Color: - + &Колір вибраного: &End Handle Color: - + &Колір кінця вибраного: @@ -5653,7 +5752,7 @@ Diameter (ø) - Діаметр (ø) + Діаметр (ø) Degree (°) @@ -6197,7 +6296,7 @@ Oblique: - + Нахил: Width factor: @@ -6235,6 +6334,10 @@ Middle Середина + + Diameter (⌀) + + QG_ExitDialog @@ -6629,12 +6732,21 @@ A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - На допоміжному шарі розташовується необмежена кількість ліній, застосовуваних для геометричних побудов. + На допоміжному шарі розташовується необмежена кількість ліній, застосовуваних для геометричних побудов. Вміст допоміжного шару не виводиться на друк. Help Layer - Допоміжний шар + Допоміжний шар + + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + Construction Layer + @@ -7949,6 +8061,10 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + Файл на диску змінено. Будь ласка, збережіть в інший файл, щоб уникнути втрати даних! Змінений файл: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) @@ -8339,7 +8455,7 @@ Specify end angle or [angle/chord length] - + Вкажіть кінцевий кут або [кут/довжину хорди] @@ -8374,7 +8490,7 @@ Specify startpoint or [center] - + Вкажіть початкову точку або [центр] @@ -8519,6 +8635,10 @@ Back Назад + + radius=%1 is invalid + + RS_ActionDrawCircleInscribe @@ -8699,7 +8819,7 @@ Can not determine uniquely an ellipse - + Неможливо визначити однозначно еліпс @@ -8841,6 +8961,10 @@ Specify the fourth line Вкажіть четверту лінію + + Can not determine uniquely an ellipse + Неможливо визначити однозначно еліпс + RS_ActionDrawHatch @@ -8858,23 +8982,23 @@ Hatch Error: Invalid contour found! - + Зловлена помилка: знайдений неправильний контур! Hatch Error: Pattern not found! - + Зловлена помилка: шаблон не знайдено! Hatch Error: Contour or pattern too small! - + Зловлена помилка: контур чи шаблон занадто малий! Hatch Error: Contour too big! - + Зловлена помилка: контур занадто великий! Hatch Error: Undefined Error! - + Зловлена помилка: на жаль, не визначена помилка! @@ -8952,7 +9076,7 @@ Cannot redo: Not previous line segment defined. - + Не вдається повторити: не визначено попереднього сегмента лінії. @@ -10198,11 +10322,11 @@ RS_ActionModifyRevertDirection Re&vert direction - + Звернути напрямок Ctrl+R - + Ctrl+R @@ -10582,7 +10706,7 @@ Deleting point is invalid. - + Вилучувана точка є недійсна. Deleting point is not on entity. @@ -10641,7 +10765,7 @@ Deleting point is invalid. - + Вилучувана точка є недійсна. @@ -10771,7 +10895,7 @@ RS_ActionSelect Select to modify attributes - + Виберіть для зміни атрибутів Cancel @@ -10823,7 +10947,7 @@ Select to cut - + Виберіть об'єкти для вирізання No entity selected! @@ -10843,7 +10967,7 @@ Select to revert direction - + Виберіть об’єкти для обернення напрямку @@ -10950,7 +11074,7 @@ Click and drag for the selection window - + Натисніть та перетягніть, щоб вибрати вікном @@ -11003,7 +11127,7 @@ No dimension entities found - Не знайдені елементи розмірів + Не знайдено елементи розмірів @@ -11073,15 +11197,15 @@ Specify first edge - Вкажіть перший край + Зазначте першу межу Cancel - Відміна + Скасувати Specify second edge - Вкажіть другий край + Зазначте другу межу Back @@ -11158,7 +11282,7 @@ rectang - + прямокутні text @@ -11748,7 +11872,7 @@ redraw - + перерисувати zr @@ -11837,7 +11961,7 @@ row - + рядок r @@ -11874,5 +11998,41 @@ modify - revert direction + + rn + restrict - nothing + + + + rn + + + + rr + restrict - orthogonal + + + + rr + + + + rh + restrict - horizontal + + + + rh + + + + rv + restrict - vertical + + + + rv + + diff -Nru librecad-2.0.3/librecad/ts/librecad_zh_cn.ts librecad-2.0.4/librecad/ts/librecad_zh_cn.ts --- librecad-2.0.3/librecad/ts/librecad_zh_cn.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_zh_cn.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,51 @@ + LC_ActionDrawCircle2PR + + + 2 Points, Radius + + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + + Select from two possible circle centers + + + + + Specify first point + + + + + Cancel + 取消 + + + + Specify second point + 指定第二点 + + + + + Back + 返回 + + + + Select circle center + + + + QC_ActionGetEnt @@ -47,42 +92,42 @@ 插件(&P) - + Running script '%1' 运行脚本 '%1' - + Inserting block '%1' 插入图块 '%1' - + &File 文件(&F) - + Import 导入 - + &Edit 编辑(&E) - + &View 视图(&V) - + &Toolbars 工具栏(&T) - + Focus on &Command Line 聚焦命令行(&C) @@ -91,12 +136,12 @@ CTRL+M - + &Select 选择(&S) - + &Draw 绘图(&D) @@ -105,22 +150,22 @@ 点(&P) - + &Line 直线(&L) - + &Arc 圆弧(&A) - + &Circle 圆(&C) - + &Ellipse 椭圆(&E) @@ -129,44 +174,44 @@ 样条曲线(&S) - + &Polyline 多段线(&P) - - + + &Dimension 标注(&D) - + &Modify 修改(&M) - + &Snap 捕捉(&S) - + &Info 查询(&I) - + &Layer 图层(&L) - - + + &Block 图块(&B) - + &Scripts 脚本(&S) @@ -175,159 +220,159 @@ &CAM - + About 关于 - + &Manual 手册(&M) - + Insert Image 插入图像 - + &Window 窗口(&W) - + &Help 帮助(&H) - + De&bugging 调试(&b) - + Pen Selection 选择画笔 - + Snap Selection 选择捕捉点方式 - + Tool Options 工具选项 - + CAD Tools submitted CAD 工具 - + Layer List 图层列表 - + Block List 图块列表 - + Library Browser 库浏览器 - + Command line 命令行 - + &%1 %2 &%1 %2 - + Su&b-Window mode 子窗口模式 - + &Cascade 层叠(&C) - + &Tile 平铺(&T) - + Tile &Vertically 纵向平铺(&V) - + Tile &Horizontally 水平平铺(&H) - + Ta&b mode 标签模式(&b) - + Creating new file... 新建文件... - + Block '%1' 图块 '%1' - + unnamed document %1 未命名文档 %1 - + New Drawing created. 新图纸已创建. - + New document from template: 从模板新建文档: - + Select Template aborted 退出选择模板 - + Opening recent file... 最近打开文件... - + Warning: File already opened : 警告: 文件已被打开. - + Help files not found 找不到帮助文件 - - + + Cannot open the file %1 Please check the permissions. @@ -336,38 +381,38 @@ 请检查权限. - + Loaded document: 已加载文档: - + Opening aborted 打开中止 - + Saving drawing... 保存图纸... - - + + Saved drawing: %1 已保存图纸: %1 - + Cannot save the file 无法保存文件 - + , please check the filename and permissions. , 请检查文件名及操作权限. - + Cannot save the file %1 Please check the permissions. @@ -376,67 +421,67 @@ 请检查权限. - + Compiler: Clang %1.%2.%3 编译器：Clang %1.%2.%3 - + Compiler: GNU GCC %1.%2.%3 编译器： GNU GCC %1.%2.%d - + Compiler: Microsoft Visual C++ 编译器：微软 Visual C++ - + Qt Version: %1 Qt版本：%1 - + Please consider donating to LibreCAD to help maintain the source code and website. 请资助LibreCAD项目以维护代码及网站 - + Saving drawing under new filename... 使用新文件名保存图纸... - + File 文件 - + Edit 编辑 - + Draw &Order 绘图&图层顺序 - + View 视图 - + Auto-saving drawing... 自动保存图纸... - + Auto-saved drawing 自动保存的图纸 - + Cannot auto-save the file %1 Please check the permissions. @@ -447,77 +492,77 @@ 自动保存已禁用. - + Auto-saving failed 自动保存失败 - + Exporting drawing... 导出图纸... - + Export as 导出为 - + Exported: %1 导出: %1 - + Exporting... 导出... - + Export complete 导出所有 - + Export failed! 导出失败! - + Printing... 打印... - + Printing complete 打印所有 - + Print preview for %1 %1 打印预览 - + Exiting application... 退出程序... - + None 无 - + About... 关于... - + Version: %1 版本: %1 - + SCM Revision: %1 SCM 版本: %1 @@ -530,17 +575,17 @@ SVN修订: %1 - + Compiled on: %1 编译时间: %1 - + Program Icons Supplied by 程序图标提供者 - + Splash and Logo supplied by 启动界面及标识提供者 @@ -549,12 +594,12 @@ 日期: %1 - + Modules: %1 模块: %1 - + Main Website : 主页: @@ -563,12 +608,12 @@ 请捐助LibreCAD项目以帮助维护源码和网站. - + Help 帮助 - + Bugger, I couldn't find the helpfiles on the filesystem. 故障，文件系统中找不到帮助文件 @@ -596,42 +641,42 @@ QG_ActionFactory - + &Export... 导出(&E)... - + &Close 关闭(&C) - + &Print... 打印(&P)... - + &Quit 退出(&Q) - + &Grid 网格(&G) - + CTRL-G CTRL-G - + &Draft 草图(&D) - + &Statusbar 状态栏(&S) @@ -652,7 +697,7 @@ 返回(&b) - + &Selection pointer 选择鼠标 @@ -701,27 +746,54 @@ 垂直约束(&V) - + &Preferences 选项(&P) - + &Application Preferences 应用程序选项(&A) - + Open IDE 打开IDE - + Run Script.. 运行脚本.. + QG_ActiveLayerName + + + Selection + 选择 + + + + <html><head/><body> </body></html> + + + + + Current Layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions @@ -1027,6 +1099,11 @@ 三线公切圆。请使用新的“公切圆 3”功能来替代。 + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1520,9 +1597,8 @@ 倒角 - Trim by amount - 定值修剪 + 定值修剪 @@ -1583,6 +1659,11 @@ 修剪/延伸两实体 + + Lengthen + + + Offset (Experimental Feature, work in progress) 偏移(试验功能) @@ -2014,7 +2095,7 @@ - + Command: 命令: @@ -2029,7 +2110,17 @@ 清理 - + + &Copy + 复制(&C) + + + + select&All + + + + Unknown command: %1 未知命令: %1 @@ -2072,9 +2163,8 @@ 标签: - ø - ø + ø @@ -2087,9 +2177,18 @@ ± - ¶ - ¶ + ¶ + + + + ⌀ + + + + + π + @@ -2132,8 +2231,17 @@ + ⌀ (Diameter) + + + + + π (Pi) + + + ø (Diameter) - ø (直径) + ø (直径) @@ -2146,9 +2254,8 @@ ±(正/负) - ¶ (Pi) - ¶ (圆周率) + ¶ (圆周率) @@ -2880,9 +2987,13 @@ 插入符号 - Diameter (ø) - 直径 (ø) + 直径 (ø) + + + + Diameter (⌀) + @@ -5089,9 +5200,13 @@ 插入符号 - Diameter (ø) - 直径 (ø) + 直径 (ø) + + + + Diameter (⌀) + @@ -6127,7 +6242,7 @@ QG_LayerBox - + - Unchanged - - 无变化 - @@ -6140,20 +6255,29 @@ 图层设置 + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + + Construction Layer + + + Layer Name: 图层名称: - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - 辅助图层上的直线均为无限长用以辅助作图。辅助图层内容在打印时将被忽略而不出现在打印结果上。 + 辅助图层上的直线均为无限长用以辅助作图。辅助图层内容在打印时将被忽略而不出现在打印结果上。 - Help Layer - 辅助图层 + 辅助图层 &OK @@ -6180,67 +6304,67 @@ QG_LayerWidget - + Show all layers 显示所有图层 - + Hide all layers 隐藏所有图层 - + Add a layer 添加图层 - + Remove the current layer 删除当前图层 - + Modify layer attributes / rename 修改图层属性/重命名 - + Looking for matching layer names 查找匹配图层名 - + Layer Menu 图层菜单 - + &Defreeze all Layers 解冻所有图层(&D) - + &Freeze all Layers 冻结所有图层(&F) - + &Add Layer 添加图层(&A) - + &Remove Layer 删除图层(&R) - + &Edit Layer 编辑图层(&E) - + &Toggle Visibility 切换可见性(&T) @@ -7338,10 +7462,10 @@ QMessageBox - - - - + + + + Warning 警告 @@ -7516,12 +7640,12 @@ 秒差距 - + Loading.. 加载.. - + Loading... 加载... @@ -7530,7 +7654,7 @@ 库加载路径.. - + Loading File %1.. 加载文件 %1.. @@ -7554,112 +7678,112 @@ 打开图像 - + Windows Bitmap Windows位图 - + Joint Photographic Experts Group 联合图像专家组 - + Graphics Interchange Format 图形交换格式 - + Multiple-image Network Graphics 多重图像网络图形 - + Portable Bit Map 便携式位图 - + Portable Grey Map 便携式灰度图 - + Portable Network Graphic 便携式网络图形 - + Portable Pixel Map 便携式像素图 - + X Bitmap Format X位图格式 - + X Pixel Map X像素图 - + Scalable Vector Graphics 可縮放向量圖形(SVG) - + SGI Black & White SGI黑白图像 - + Encapsulated PostScript EPS - + Encapsulated PostScript Format EPS格式 - + Encapsulated PostScript Interchange EPSI - + Windows Icon 窗口图标 - + JPEG 2000 JPEG2000 - + ZSoft Paintbrush PCX - + PC Paint PC Paint .PIC 图形文件 - + SGI-Bilddatei SGI .rgb文件格式 - + Targa Image File TGA格式 - + Tagged Image File Format TIFF格式 @@ -7802,6 +7926,11 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8485,27 +8614,32 @@ 中心, 半径(&R) - + + radius=%1 is invalid + + + + Not a valid expression 无效表达式 - + Specify circle center 指定圆心 - + Cancel 取消 - + Specify circle radius 指定半径 - + Back 返回 @@ -8904,34 +9038,39 @@ 内切椭圆 (&I) - + + Can not determine uniquely an ellipse + 不能唯一确定椭圆 + + + Specify the first line 指定第一根直线 - + Cancel 取消 - + Specify the second line 指定第二根直线 - - - + + + Back 返回 - + Specify the third line 指定第三根直线 - + Specify the fourth line 指定第四根直线 @@ -9710,38 +9849,38 @@ RS_ActionDrawSpline - + &Spline 样条曲线(&P) - + Specify first control point 指定第一控制点 - + Cancel 取消 - + Specify next control point or [%1] 指定下一控制点或[%1] - - + + Back 返回 - + Specify next control point 指定下一控制点 - + Cannot undo: Not enough entities defined yet. 无法撤消: 实体数目尚不足. @@ -11689,20 +11828,20 @@ RS_Commands - - + + point point - - + + po po - - + + line line @@ -11711,31 +11850,31 @@ ln - + l l - - + + polyline polyline - - + + offset offset - + o offset o - - + + parallel parallel @@ -11745,351 +11884,351 @@ par - - + + arc arc - + a a - - + + circle circle - - + + ci ci - - + + rectangle rectangle - + rec rec - + rectang rectang - - - + + + text text - - + + regen regen - + rg zoom - redraw rg - + zr zoom - redraw zr - + zw zoom - window zw - + za zoom - auto za - + zp zoom - pan zp - + zv zoom - previous zv - - + + kill kill - - + + k k - - - + + + undo undo - - + + u undo u - - - + + + redo redo - - + + r r - + da dimension - aligned da - - + + da da - + dh dimension - horizontal dh - - + + dh dh - + dr dimension - linear dr - - + + dr dr - + dv dimension - vertical dv - - + + dv dv - + ld dimension - leader ld - - + + ld ld - - + + dimregen dimregen - + tm modify - multi trim (extend) tm - - + + tm tm - + xt modify - trim (extend) xt - - + + xt xt - + rm modify - trim rm - - + + rm rm - + mv modify - move mv - - + + mv mv - + ch modify - bevel (chamfer) ch - - + + ch ch - + mi modify - mirror mi - - + + mi mi - + ro modify - rotate ro - - + + ro ro - + sz modify - scale sz - - + + sz sz - + ss modify - stretch ss - - + + ss ss - + er modify - delete (erase) er - - + + er er - + oo modify - undo (oops) oo - - + + oo oo - + uu modify - redo uu - - + + uu uu - + xp modify - explode xp - - + + xp xp @@ -12099,43 +12238,43 @@ os - + os os - + sg snap - grid sg - - + + sg sg - + se snap - end se - - + + se se - + si snap - intersection si - - + + si si @@ -12145,55 +12284,55 @@ sn - - + + sn sn - + sm snap - middle sm - - + + sm sm - + sn snap - nearest sn - + np snap - nearest point np - - + + np np - + tn Deselect all tn - - + + tn tn - + Command: %1 命令: %1 @@ -12208,7 +12347,7 @@ li - + pa parallel pa @@ -12299,444 +12438,492 @@ ex - - + + angle 角度 - - + + close 闭合 - - + + chord length 弦长 - - + + columns 列数 - + columnspacing 列距 - - + + factor 因子 - + length 长度 - + length1 长度1 - + length2 长度2 - + number 数值 - - + + radius 半径 - + rows 行数 - + rowspacing 行距 - - + + through 通过 - + trim 修剪 - + reversed reversed 反向的 - + rev reversed rev - + r reversed r - + row row - + r row r - + r redo r - + back 返回 - + ang angle ang - - + + li li - - + + pl pl - + pa pa - - + + ar ar - - + + rect rect - - + + mtext mtext - - + + redraw redraw - + zr zr - + zw zw - + za za - + zp zp - + zv zv - + u u - - + + + rn + restrict - nothing + + + + + rn + + + + + + rr + restrict - orthogonal + + + + + rr + + + + + + rh + restrict - horizontal + + + + + rh + + + + + + rv + restrict - vertical + + + + + rv + + + + + re re - + re modify - revert direction re - - + + os snap - free os - - + + sc sc - + sc snap - center sc - - + + sd sd - + sd snap - distance sd - - + + sf sf - + sf snap - free sf - - + + sa sa - + sa Select all sa - + dpi dpi - + a angle a - + center center - + cen center cen - + c center c - + length chord length length - + l chord length l - + c close c - + cols columns cols - + c columns c - + columnspacing columnspacing for inserts columnspacing - + colspacing columnspacing for inserts colspacing - + cs columnspacing for inserts cs - + fact factor fact - + f factor f - + help 帮助 - + ? help ? - + length length length - + len length len - + l length l - + length1 length1 length1 - + len1 length1 len1 - + l1 length1 l1 - + length2 length2 length2 - + len2 length2 len2 - + l2 length2 l2 - + number number 数值 - + num number num - + n number n - + r radius r @@ -12762,48 +12949,48 @@ r - + rowspacing rowspacing for inserts rowspacing - + rs rowspacing for inserts rs - + t text t - + t through t - + b back b - - + + Command not found: %1 命令未找到：%1 - + Accepted keycode: %1 已接受命令：％1 - + Available commands: 可用命令: diff -Nru librecad-2.0.3/librecad/ts/librecad_zh_tw.ts librecad-2.0.4/librecad/ts/librecad_zh_tw.ts --- librecad-2.0.3/librecad/ts/librecad_zh_tw.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/librecad/ts/librecad_zh_tw.ts 2014-05-30 03:54:17.000000000 +0000 @@ -2,6 +2,51 @@ + LC_ActionDrawCircle2PR + + + 2 Points, Radius + + + + + radius=%1 is too small for points selected +distance between points=%2 is larger than diameter=%3 + + + + + Select from two possible circle centers + + + + + Specify first point + 指定第一個點 + + + + Cancel + 取消 + + + + Specify second point + 指定第二個點 + + + + + Back + 返回 + + + + Select circle center + + + + QC_ActionGetEnt @@ -47,42 +92,42 @@ 外掛程式(&P) - + Running script '%1' 執行腳本 '%1' - + Inserting block '%1' 插入圖塊 '%1' - + &File 檔案(&F) - + Import 匯入 - + &Edit 編輯(&E) - + &View 檢視(&V) - + &Toolbars 工具列(&T) - + Focus on &Command Line 進入指令列(&C) @@ -91,12 +136,12 @@ CTRL+M - + &Select 選取(&S) - + &Draw 繪圖(&D) @@ -106,22 +151,22 @@ 點(&P) - + &Line 線(&L) - + &Arc 弧(&A) - + &Circle 圓(&C) - + &Ellipse 橢圓(&E) @@ -130,44 +175,44 @@ 雲形線(&S) - + &Polyline 聚合線(&P) - - + + &Dimension 標註(&D) - + &Modify 修改(&M) - + &Snap 貼齊(&S) - + &Info 資訊(&I) - + &Layer 圖層(&L) - - + + &Block 圖塊(&B) - + &Scripts 腳本(&S) @@ -176,158 +221,158 @@ &CAM - + About 關於 - + &Manual 手冊(&M) - + Insert Image 插入影像 - + &Window 視窗(&W) - + &Help 說明(&H) - + De&bugging 除錯(&B) - + Pen Selection 選擇繪圖筆 - + Snap Selection 選擇捕捉 - + Tool Options 工具選項 - + CAD Tools CAD 工具 - + Layer List 圖層清單 - + Block List 圖塊清單 - + Library Browser 資料庫瀏覽器 - + Command line 指令列 - + &%1 %2 &%1 %2 - + Su&b-Window mode 子視窗模式(&b) - + &Cascade 重疊顯示(&C) - + &Tile 並排(&T) - + Tile &Vertically 垂直並排(&V) - + Tile &Horizontally 水平並排(&H) - + Ta&b mode 分頁模式(&b) - + Creating new file... 新建圖檔... - + Block '%1' 圖塊 '%1' - + unnamed document %1 未命名文件 %1 - + New Drawing created. 新繪圖已建立。 - + New document from template: 從模版新建檔案 - + Select Template aborted 選擇模板中止 - + Opening recent file... 開啟最近的檔案... - + Warning: File already opened : 警告：檔案已開啟： - + Help files not found 未找到幫助資料檔案 - - + + Cannot open the file %1 Please check the permissions. @@ -336,38 +381,38 @@ 請檢查檔案權限。 - + Loaded document: 載入的文件： - + Opening aborted 已中止開啟 - + Saving drawing... 繪圖儲存中... - - + + Saved drawing: %1 已儲存繪圖: %1 - + Cannot save the file 無法儲存檔案 - + , please check the filename and permissions. ，請檢查檔案名和權限。 - + Cannot save the file %1 Please check the permissions. @@ -376,67 +421,67 @@ 請檢查檔案權限。 - + Compiler: Clang %1.%2.%3 編譯器: Clang %1.%2.%3 - + Compiler: GNU GCC %1.%2.%3 編譯器: GNU GCC %1.%2.%3 - + Compiler: Microsoft Visual C++ 編譯器: 微软 MSVC++ - + Qt Version: %1 Qt版本: %1 - + Please consider donating to LibreCAD to help maintain the source code and website. 請考慮捐贈給LibreCAD以幫助保持源代碼和網站。 - + Saving drawing under new filename... 以新檔名儲存繪圖... - + File 檔案 - + Edit 編輯 - + Draw &Order 同層物件次序 - + View 視圖 - + Auto-saving drawing... 繪圖自動儲存中... - + Auto-saved drawing 繪圖已自動儲存 - + Cannot auto-save the file %1 Please check the permissions. @@ -447,77 +492,77 @@ 無法自動儲存。 - + Auto-saving failed 自動保存失敗 - + Exporting drawing... 正在匯出繪圖... - + Export as 導出為 - + Exported: %1 已匯出: %1 - + Exporting... 匯出... - + Export complete 匯出完成 - + Export failed! 匯出失敗！ - + Printing... 列印... - + Printing complete 列印完成 - + Print preview for %1 預覽列印 %1 - + Exiting application... 退出程式... - + None 無 - + About... 關於... - + Version: %1 版本: %1 - + SCM Revision: %1 SCM 版本: %1 @@ -530,17 +575,17 @@ SVN 修訂: %1 - + Compiled on: %1 編譯: %1 - + Program Icons Supplied by 程式圖示提供 - + Splash and Logo supplied by 登入畫面與標誌提供 @@ -549,12 +594,12 @@ 日期: %1 - + Modules: %1 模組: %1 - + Main Website : 主網站： @@ -563,12 +608,12 @@ 請捐贈 LibreCAD，以幫助維持源碼與其網站。 - + Help 求助 - + Bugger, I couldn't find the helpfiles on the filesystem. 報錯，我在檔案系統上無法找到說明文件。 @@ -596,42 +641,42 @@ QG_ActionFactory - + &Export... 匯出(&E)... - + &Close 關閉(&C) - + &Print... 列印(&P)... - + &Quit &離開 - + &Grid 格點(&G) - + CTRL-G CTRL-G - + &Draft 草圖(&D) - + &Statusbar 狀態列(&S) @@ -652,7 +697,7 @@ 返回(&b) - + &Selection pointer 選擇指向 @@ -701,27 +746,54 @@ 垂直限制(&V) - + &Preferences 偏好設定(&P) - + &Application Preferences 應用程式偏好設定(&A) - + Open IDE 開啟 IDE - + Run Script.. 執行腳本.. + QG_ActiveLayerName + + + Selection + 選取 + + + + <html><head/><body> </body></html> + + + + + Current Layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Helvetica'; font-size:7pt; font-weight:400; font-style:normal;"> +Name of Current Active Layer</body></html> + + + + QG_ArcOptions @@ -1075,6 +1147,11 @@ 通過一個點，繪製兩個指定圓的切圓 + + <html><head/><body>Circle with 2 Points and Radius</body></html> + + + Back to main menu 回到主選單 @@ -1508,9 +1585,8 @@ 倒角 - Trim by amount - 依值修剪 + 依值修剪 @@ -1571,6 +1647,11 @@ 修剪 / 延伸 (兩條線) + + Lengthen + + + Offset (Experimental Feature, work in progress) 偏移(试验中功能） @@ -2002,7 +2083,7 @@ - + Command: 指令： @@ -2017,7 +2098,17 @@ 清除 - + + &Copy + 複製(&C) + + + + select&All + + + + Unknown command: %1 未知指令： %1 @@ -2060,9 +2151,8 @@ 記號： - ø - ø + ø @@ -2075,9 +2165,18 @@ ± - ¶ - ¶ + ¶ + + + + ⌀ + + + + + π + @@ -2120,8 +2219,17 @@ + ⌀ (Diameter) + + + + + π (Pi) + + + ø (Diameter) - ø (直徑) + ø (直徑) @@ -2134,9 +2242,8 @@ ± (正 / 負) - ¶ (Pi) - π (圓周率) + π (圓周率) @@ -2868,9 +2975,13 @@ 插入符號 - Diameter (ø) - 直徑 (ø) + 直徑 (ø) + + + + Diameter (⌀) + @@ -5073,9 +5184,13 @@ 插入符號 - Diameter (ø) - 直徑 (ø) + 直徑 (ø) + + + + Diameter (⌀) + @@ -6111,7 +6226,7 @@ QG_LayerBox - + - Unchanged - - 未變更 - @@ -6124,20 +6239,29 @@ 圖層設定 + + A Construction Layer has entities of infinite straight lines intended to be used for geometric construction. +The contents of a Construction Layer should not appear in printout. + + + + + Construction Layer + + + Layer Name: 圖層名稱： - A Help Layer has entities of infinite straight lines intended to be used for geometric construction. The contents of a Help Layer should not appear in printout. - 幫助層直線無限長幫助幾何構造。幫助層的內容，不會出現在列印輸出。 + 幫助層直線無限長幫助幾何構造。幫助層的內容，不會出現在列印輸出。 - Help Layer - 幫助層 + 幫助層 &OK @@ -6164,67 +6288,67 @@ QG_LayerWidget - + Show all layers 顯示全部圖層 - + Hide all layers 隱藏全部圖層 - + Add a layer 新增圖層 - + Remove the current layer 移除目前圖層 - + Modify layer attributes / rename 修改圖層屬性 / 重新命名 - + Looking for matching layer names 尋找匹配層名 - + Layer Menu 圖層選單 - + &Defreeze all Layers 解除凍結全部圖層(&D) - + &Freeze all Layers 凍結全部圖層(&F) - + &Add Layer 新增圖層(&A) - + &Remove Layer 移除圖層(&R) - + &Edit Layer 編輯圖層(&E) - + &Toggle Visibility 切換可見性(&T) @@ -7314,10 +7438,10 @@ QMessageBox - - - - + + + + Warning 警告 @@ -7492,12 +7616,12 @@ 秒差距 - + Loading.. 正在載入.. - + Loading... 正在載入... @@ -7506,7 +7630,7 @@ 載入資料庫路徑.. - + Loading File %1.. 正在載入檔案 %1.. @@ -7530,112 +7654,112 @@ 開啟影像 - + Windows Bitmap Windows 點陣圖 - + Joint Photographic Experts Group 聯合影像專業組織 - + Graphics Interchange Format 圖形交換格式 - + Multiple-image Network Graphics 多重影像網路圖形 - + Portable Bit Map 可攜式點陣圖 - + Portable Grey Map 可攜式灰階圖 - + Portable Network Graphic 可攜式網路圖形 - + Portable Pixel Map 可攜式像素圖 - + X Bitmap Format X 點陣圖格式 - + X Pixel Map X像素圖 - + Scalable Vector Graphics 可縮放向量圖形 - + SGI Black & White SGI黑白图像 - + Encapsulated PostScript EPS 封裝PostScript檔 - + Encapsulated PostScript Format EPS 封裝PostScript檔 - + Encapsulated PostScript Interchange EPSI 封裝PostScript檔 - + Windows Icon ICO，图标格式 - + JPEG 2000 JPEG 2000 - + ZSoft Paintbrush PIC PCPaint格式 - + PC Paint PC Paint - + SGI-Bilddatei RGB, SGI圖像格式 - + Targa Image File TGA Truevison圖像格式 - + Tagged Image File Format TIFF 圖像格式 @@ -7778,6 +7902,11 @@ File on disk modified. Please save to another file to avoid data loss! File modified: %1 + + + Hatch failed due to a gap=%1 between (%2, %3) and (%4, %5) + + RS_ActionBlocksAdd @@ -8461,27 +8590,32 @@ 圓心, 半徑(&R) - + + radius=%1 is invalid + + + + Not a valid expression 不正確的表示式 - + Specify circle center 指定圓心 - + Cancel 取消 - + Specify circle radius 指定半徑 - + Back 返回 @@ -8868,34 +9002,39 @@ 內切橢圓 (&I) - + + Can not determine uniquely an ellipse + 不能唯一確定橢圓 + + + Specify the first line 指定第一條直線 - + Cancel 取消 - + Specify the second line 指定第二條直線 - - - + + + Back 返回 - + Specify the third line 指定的第三條直線 - + Specify the fourth line 指定第四條直線 @@ -9674,38 +9813,38 @@ RS_ActionDrawSpline - + &Spline 雲形線(&S) - + Specify first control point 指定第一個控制點 - + Cancel 取消 - + Specify next control point or [%1] 指定下一個控制點或 [%1] - - + + Back 返回 - + Specify next control point 指定下一個控制點 - + Cannot undo: Not enough entities defined yet. 無法復原: 物件定義值不足。 @@ -11653,20 +11792,20 @@ RS_Commands - - + + point 點 - - + + po po - - + + line 線 @@ -11675,31 +11814,31 @@ ln - + l l - - + + polyline 聚合線 - - + + offset 偏移複製 - + o offset o - - + + parallel 平行 @@ -11709,354 +11848,354 @@ par - - + + arc 弧 - + a a - - + + circle 圓~~沿用自AutoCAD，更簡短。圓 - - + + ci ci - - + + rectangle 矩形 - + rec rec - + rectang 矩形 - - - + + + text 文字 - - + + regen 重生~~沿用自AutoCAD 重生 - + rg zoom - redraw rg - + zr zoom - redraw zr - + zw zoom - window zw - + za zoom - auto za - + zp zoom - pan zp - + zv zoom - previous zv - - + + kill kill - - + + k k - - - + + + undo 復原 - - + + u undo u - - - + + + redo 重作~~沿用自AutoCAD中文版重作 - - + + r r - + da dimension - aligned da - - + + da da - + dh dimension - horizontal dh - - + + dh dh - + dr dimension - linear dr - - + + dr dr - + dv dimension - vertical dv - - + + dv dv - + ld dimension - leader ld - - + + ld ld - - + + dimregen dimregen - + tm modify - multi trim (extend) tm - - + + tm tm - + xt modify - trim (extend) xt - - + + xt xt - + rm modify - trim rm - - + + rm rm - + mv modify - move mv - - + + mv mv - + ch modify - bevel (chamfer) ch - - + + ch ch - + mi modify - mirror mi - - + + mi mi - + ro modify - rotate ro - - + + ro ro - + sz modify - scale sz - - + + sz sz - + ss modify - stretch ss - - + + ss ss - + er modify - delete (erase) er - - + + er er - + oo modify - undo (oops) oo - - + + oo oo - + uu modify - redo uu - - + + uu uu - + xp modify - explode xp - - + + xp xp @@ -12066,43 +12205,43 @@ os - + os os - + sg snap - grid sg - - + + sg sg - + se snap - end se - - + + se se - + si snap - intersection si - - + + si si @@ -12112,55 +12251,55 @@ sn - - + + sn sn - + sm snap - middle sm - - + + sm sm - + sn snap - nearest sn - + np snap - nearest point np - - + + np np - + tn Deselect all tn - - + + tn tn - + Command: %1 指令: %1 @@ -12175,7 +12314,7 @@ li - + pa parallel pa @@ -12266,445 +12405,493 @@ ex - - + + angle 角度 - - + + close 關閉 - - + + chord length 弦長 - - + + columns 欄 - + columnspacing 欄寬~~沿用Excel稱呼欄寬 - - + + factor 係數 - + length 長度 - + length1 長度1 - + length2 長度2 - + number 數字 - - + + radius 半徑 - + rows 列 - + rowspacing 列高 - - + + through 通過 - + trim 修剪 - + reversed reversed 反轉 - + rev reversed rev - + r reversed r - + row 行 - + r row r - + r redo r - + back 返回 - + ang angle ang - - + + li li - - + + pl pl - + pa pa - - + + ar ar - - + + rect rect - - + + mtext mtext - - + + redraw redraw - + zr zr - + zw zw - + za za - + zp zp - + zv zv - + u u - - + + + rn + restrict - nothing + + + + + rn + + + + + + rr + restrict - orthogonal + + + + + rr + + + + + + rh + restrict - horizontal + + + + + rh + + + + + + rv + restrict - vertical + + + + + rv + + + + + re re - + re modify - revert direction re - - + + os snap - free os - - + + sc sc - + sc snap - center sc - - + + sd sd - + sd snap - distance sd - - + + sf sf - + sf snap - free sf - - + + sa sa - + sa Select all sa - + dpi dpi - + a angle a - + center 中心 - + cen center cen - + c center c - + length chord length 長度 - + l chord length l - + c close c - + cols columns cols - + c columns c - + columnspacing columnspacing for inserts 欄寬 - + colspacing columnspacing for inserts 欄寬 - + cs columnspacing for inserts cs - + fact factor fact - + f factor f - + help 說明 - + ? help ? - + length length 長度 - + len length len - + l length l - + length1 length1 長度1 - + len1 length1 len1 - + l1 length1 l1 - + length2 length2 長度2 - + len2 length2 len2 - + l2 length2 l2 - + number number 數字 - + num number num - + n number n - + r radius r @@ -12730,48 +12917,48 @@ r - + rowspacing rowspacing for inserts 列高 - + rs rowspacing for inserts rs - + t text t - + t through t - + b back b - - + + Command not found: %1 命令未找到: %1 - + Accepted keycode: %1 接受鍵碼: %1 - + Available commands: 可用的指令： diff -Nru librecad-2.0.3/plugins/picfile/picfile.cpp librecad-2.0.4/plugins/picfile/picfile.cpp --- librecad-2.0.3/plugins/picfile/picfile.cpp 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/picfile/picfile.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,329 @@ +/*****************************************************************************/ +/* PicFile.cpp - ascii file importer */ +/* */ +/* Copyright (C) 2011 Rallaz, rallazz@gmail.com */ +/* Copyright (C) 2014 cgrzemba, cgrzemba@opencsw.org */ +/* */ +/* This library is free software, licensed under the terms of the GNU */ +/* General Public License as published by the Free Software Foundation, */ +/* either version 2 of the License, or (at your option) any later version. */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/*****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#if QT_VERSION >= 0x040400 +#include +#endif +#include +#include +#include +#include + +#include + +#include "document_interface.h" +#include "picfile.h" + +PluginCapabilities PicFile::getCapabilities() const +{ + PluginCapabilities pluginCapabilities; + pluginCapabilities.menuEntryPoints + << PluginMenuLocation("File/Import", tr("Read PIC file")); + return pluginCapabilities; +} + +QString PicFile::name() const + { + return (tr("import PIC file")); + } + +void PicFile::execComm(Document_Interface *doc, + QWidget *parent, QString cmd) +{ + Q_UNUSED(cmd); + picPunto pdt(parent); + int result = pdt.exec(); + if (result == QDialog::Accepted) + pdt.processFile(doc); +} + +/*****************************/ + +picPunto::picPunto(QWidget *parent) : QDialog(parent) +{ + cnt = 0; + QStringList txtformats; + + QGridLayout *mainLayout = new QGridLayout; +//readSettings(); + + QPushButton *filebut = new QPushButton(tr("File...")); + fileedit = new QLineEdit(); + + QDoubleValidator *val = new QDoubleValidator(0); + val->setBottom ( 0.0 ); + scaleedit = new QLineEdit(); + scaleedit->setValidator(val); + + QFormLayout *flo = new QFormLayout; + flo->addRow( filebut, fileedit); + flo->addRow( tr("Scale:"), scaleedit); + mainLayout->addLayout(flo, 0, 0); + + QHBoxLayout *loacceptcancel = new QHBoxLayout; + QPushButton *acceptbut = new QPushButton(tr("Accept")); + loacceptcancel->addStretch(); + loacceptcancel->addWidget(acceptbut); + + QPushButton *cancelbut = new QPushButton(tr("Cancel")); + loacceptcancel->addWidget(cancelbut); + mainLayout->addLayout(loacceptcancel, 1, 0); + + setLayout(mainLayout); + readSettings(); + + connect(cancelbut, SIGNAL(clicked()), this, SLOT(reject())); + connect(acceptbut, SIGNAL(clicked()), this, SLOT(checkAccept())); + + connect(filebut, SIGNAL(clicked()), this, SLOT(dptFile())); +} + +void picPunto::checkAccept() +{ + + errmsg.clear(); + if (failGUI(&errmsg)) { + QMessageBox::critical ( this, "Pic file read plugin", errmsg ); + errmsg.clear(); + return; + } + writeSettings(); + accept(); +} + +void picPunto::dptFile() +{ + QString fileName = QFileDialog::getOpenFileName(this, tr("Select file")); + fileedit->setText(fileName); +} + +bool picPunto::failGUI(QString *msg) +{ + double val = scaleedit->text().toDouble(); + if ( val == 0 ) { + msg->insert(0, tr("Scale Factor is empty or invalid")); + return true; + } + return false; +} + +void picPunto::processFile(Document_Interface *doc) +{ + QString sep = " "; + currDoc = doc; + scale = (scaleedit->text()).toDouble(); + + if (!QFile::exists(fileedit->text()) ) { + QMessageBox::critical ( this, "picPunto", QString(tr("The file %1 not exist")).arg(fileedit->text()) ); + return; + } + QFile infile(fileedit->text()); + if (!infile.open(QIODevice::ReadOnly | QIODevice::Text)) { + QMessageBox::critical ( this, "picPunto", QString(tr("Can't open the file %1")).arg(fileedit->text()) ); + return; + } + QString currlay = currDoc->getCurrentLayer(); + processFilePic(&infile); + infile.close (); + + QMessageBox::information(this, "Info", QString(tr("%1 objects imported")).arg(cnt) ); + currDoc = NULL; +} + +double picPunto::getPValue(QString p) +{ + return (p.toDouble() * scale); +} + +void picPunto::drawLine() +{ + QPointF prevP, nextP; + int i; + + for (i = 0; i < dataList.size(); ++i) { + pointData *pd = dataList.at(i); + if (!pd->x.isEmpty() && !pd->y.isEmpty()){ + prevP.setX(getPValue(pd->x)); + prevP.setY(getPValue(pd->y)); + i++; + break; + } else { + QMessageBox::information(this, "Info", QString(tr("picPunto drawLine: first point is empty %1")).arg(i)); + } + } + for (; i < dataList.size(); ++i) { + pointData *pd = dataList.at(i); + if (!pd->x.isEmpty() && !pd->y.isEmpty()){ + nextP.setX(getPValue(pd->x)); + nextP.setY(getPValue(pd->y)); + currDoc->addLine(&prevP, &nextP); + // QMessageBox::information(this, "Info", QString(tr("picPunto drawLine: addLine %1 %2,%3 %4,%5")).arg(i).arg(prevP.x()).arg(prevP.y()).arg(nextP.x()).arg(nextP.y())); + prevP = nextP; + cnt++; + } else { + QMessageBox::information(this, "Info", QString(tr("picPunto drawLine: next point is empty %1")).arg(i)); + } + } + while (!dataList.isEmpty()) + delete dataList.takeFirst(); +} + +void picPunto::drawCircle(QString x, QString y, QString radius) +{ + QPointF center; + qreal rad; + + center.setX(getPValue(x)); + center.setY(getPValue(y)); + rad = getPValue(radius); + currDoc->addCircle(¢er, rad); + cnt++; +} + +void picPunto::drawText(QString x, QString y, QString txt, QString align) +{ + DPI::VAlign va = DPI::VAlignBottom; + DPI::HAlign ha; + QString sty = "txt"; + double height = 0.05 * scale; + + ha = (align == "ljust") ? DPI::HAlignLeft : (align == "rjust") ? DPI::HAlignRight : DPI::HAlignCenter; + QPointF pt(getPValue(x), getPValue(y)); + currDoc->addText(txt, sty, &pt, height, 0.0, ha, va); + cnt++; +} + +void picPunto::drawBox(QString posx, QString posy, QString width, QString height) +{ + QPointF prevP, nextP; + + prevP.setX(getPValue(posx)); + prevP.setY(getPValue(posy)); + nextP.setX(getPValue(posx)+getPValue(width)); + nextP.setY(prevP.y()); + currDoc->addLine(&prevP, &nextP); + prevP=nextP; + nextP.setY(prevP.y()+getPValue(height)); + currDoc->addLine(&prevP, &nextP); + prevP=nextP; + nextP.setX(getPValue(posx)); + currDoc->addLine(&prevP, &nextP); + prevP=nextP; + nextP.setY(getPValue(posy)); + currDoc->addLine(&prevP, &nextP); + cnt++; +} + +void picPunto::processFilePic(QFile* file) +{ + // QString outname, sep; + QString sep = " "; + QString::SplitBehavior skip = QString::KeepEmptyParts; + QStringList data; + QString cmd; + pointData *pd; + while (!file->atEnd()) { + int i = 2; + QString line = file->readLine(); + line.remove ( line.size()-1, 1); + // printf("process line: %s\n",line.toStdString().c_str() ); + data = line.split(sep, skip); + if (data.size() < 4 ) continue; + cmd = data.at(0); + if (cmd == "line" ) { + if (data.at(2) == "from"){ + i++; // dashed line + } + for (;i < data.size(); i += 2) { + pd = new pointData; + pd->x = data.at(i).split(',').at(0); + pd->y = data.at(i).split(',').at(1); + dataList.append(pd); + if ( i < data.size()-1 and data.at(i+1) != "to") { + QMessageBox::critical ( this, "picPunto", QString(tr("format error in %1")).arg(line) ); + return; + } + } + if (dataList.size() > 0 ) + drawLine(); + } else { + if (cmd == "circle") { // circle at 7.935,3.643 rad 0.035 + if ( data.size() != 5 ) { + QMessageBox::critical ( this, "picPunto", QString(tr("format error in %1")).arg(line) ); + return; + } + drawCircle(data.at(2).split(',').at(0), data.at(2).split(',').at(1), data.at(4)); + } else { + if (cmd == "box") { // box invis fill 0.000 with .sw at (7.480,6.917) width 0.079 height 0.157 + if ( data.size() < 11 ) { + // QMessageBox::critical ( this, "picPunto", QString(tr("format error in %1")).arg(line) ); + continue; + } + QString posx = data.at(7).split(',').at(0); + QString posy = data.at(7).split(',').at(1); + drawBox(posx.remove(0,1), posy.remove(posy.size()-1,1), data.at(9), data.at(11)); + } else { + if ( cmd.startsWith("\"\\s") and data.size() > 3 ) { // "\s5\fRAbstell fl�che\fP" at 8.132,7.456 ljust + QString txt = line.split("\"", skip).at(1); + QStringList rline = line.split("\"", skip).at(2).split(" ",skip); + txt.remove ( txt.size()-3, 3); + txt.remove (QRegExp("^.*fR")); + // printf("process line: %s: %s\n",rline.at(2).toStdString().c_str(),txt.toStdString().c_str() ); + drawText(rline.at(2).split(',').at(0), rline.at(2).split(',').at(1), txt, rline.at(3)); + } + } + } + } + } +} + +picPunto::~picPunto() +{ + while (!dataList.isEmpty()) + delete dataList.takeFirst(); +} + +void picPunto::readSettings() + { + QString str; + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "LibreCAD", "picfile"); + QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); + QSize size = settings.value("size", QSize(400,50)).toSize(); + str = settings.value("lastfile").toString(); + fileedit->setText(str); + str = settings.value("lastscale","1.0").toString(); + scaleedit->setText(str); + + resize(size); + move(pos); + } + +void picPunto::writeSettings() + { + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "LibreCAD", "picfile"); + settings.setValue("pos", pos()); + settings.setValue("size", size()); + settings.setValue("lastfile", fileedit->text()); + settings.setValue("lastscale", scaleedit->text()); + } + +#if QT_VERSION < 0x050000 +Q_EXPORT_PLUGIN2(picfile, PicFile); +#endif diff -Nru librecad-2.0.3/plugins/picfile/picfile.h librecad-2.0.4/plugins/picfile/picfile.h --- librecad-2.0.3/plugins/picfile/picfile.h 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/picfile/picfile.h 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,93 @@ +/*****************************************************************************/ +/* PICfile.h - pic file importer */ +/* */ +/* Copyright (C) 2011 Rallaz, rallazz@gmail.com */ +/* Copyright (C) 2014 cgrzemba, cgrzemba@opencsw.org */ +/* */ +/* This library is free software, licensed under the terms of the GNU */ +/* General Public License as published by the Free Software Foundation, */ +/* either version 2 of the License, or (at your option) any later version. */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/*****************************************************************************/ + +#ifndef PICFILE_H +#define PICFILE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include "qc_plugininterface.h" +#include "document_interface.h" + +class pointBox; +class textBox; +class pointData; +class QVBoxLayout; + +class PicFile : public QObject, QC_PluginInterface +{ + Q_OBJECT + Q_INTERFACES(QC_PluginInterface) +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.librecad.picfile" FILE "picfile.json") +#endif + + public: + virtual PluginCapabilities getCapabilities() const; + virtual QString name() const; + virtual void execComm(Document_Interface *doc, + QWidget *parent, QString cmd); +}; + + + +class picPunto : public QDialog +{ + Q_OBJECT + + public: + explicit picPunto(QWidget *parent = 0); + ~picPunto(); + void SetupUI(QWidget *parent); + + public slots: + void dptFile(); + void processFile(Document_Interface *doc); + void checkAccept(); + + private: + void readSettings(); + void writeSettings(); + void processFilePic(QFile* file); + void drawLine(); + void drawCircle(QString x, QString y, QString rad); + void drawText(QString x, QString y, QString txt, QString align); + void drawBox(QString posx, QString posy, QString width, QString height); + bool failGUI(QString *msg); + double getPValue(QString posxy); + + private: + QString errmsg; + QLineEdit *fileedit; + QLineEdit *scaleedit; + QList dataList; + + Document_Interface *currDoc; + int cnt; + double scale; +}; + +class pointData +{ +public: + QString x; + QString y; +}; + +#endif // PICFILE_H diff -Nru librecad-2.0.3/plugins/picfile/picfile.json librecad-2.0.4/plugins/picfile/picfile.json --- librecad-2.0.3/plugins/picfile/picfile.json 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/picfile/picfile.json 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1 @@ + { "Keys": [ ] } diff -Nru librecad-2.0.3/plugins/picfile/picfile.pro librecad-2.0.4/plugins/picfile/picfile.pro --- librecad-2.0.3/plugins/picfile/picfile.pro 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/picfile/picfile.pro 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,34 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2011-03-22T19:33:11 +# +#------------------------------------------------- + +QT += gui +TEMPLATE = lib +CONFIG += plugin +VERSION = 1.0.0 +PLUGIN_NAME=picfile + +GENERATED_DIR = ../../generated/plugin/picfile +# Use common project definitions. +include(../../common.pri) + +# For plugins +INCLUDEPATH += ../../librecad/src/plugins + +SOURCES += picfile.cpp +HEADERS += picfile.h + +win32 { + DLLDESTDIR = ../../windows/resources/plugins + TARGET = $$PLUGIN_NAME +} +unix { + macx { + TARGET = ../../LibreCAD.app/Contents/Resources/plugins/$$PLUGIN_NAME + } + else { + TARGET = ../../unix/resources/plugins/$$PLUGIN_NAME + } +} diff -Nru librecad-2.0.3/plugins/picfile/README librecad-2.0.4/plugins/picfile/README --- librecad-2.0.3/plugins/picfile/README 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/picfile/README 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,8 @@ +With this plugins you can import drawings in PIC file format. +These can generated with transfig/fig2dev: + +$ fig2dev -L pic drawing.fig + +so you are able to migrated Xfig drawings to LireCAD. + +cgrzemba, 2014 diff -Nru librecad-2.0.3/plugins/plotequation/plot.cpp librecad-2.0.4/plugins/plotequation/plot.cpp --- librecad-2.0.3/plugins/plotequation/plot.cpp 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/plotequation/plot.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,127 @@ +//This plugin allows the user to plot mathematical equations. +//It uses muParser for parsing the mathematical equations. +// +//ToDo: *set max and min value for step size? + + + +#include "document_interface.h" +#include "plot.h" +#include "plotdialog.h" +#include + +plot::plot(QObject *parent) : + QObject(parent) +{ +} + +QString plot::name() const + { + return (tr("Plot plugin")); + } + +PluginCapabilities plot::getCapabilities() const +{ + PluginCapabilities pluginCapabilities; + pluginCapabilities.menuEntryPoints + << PluginMenuLocation(tr("Draw"), tr("Plot plugin")); + return pluginCapabilities; +} + +void plot::execComm(Document_Interface *doc, QWidget *parent, QString cmd) +{ + Q_UNUSED(doc); + Q_UNUSED(cmd); + + QString equation1; + QString equation2; + QString startValue; + QString endValue; + double stepSize; + + QList xValues; + QList yValues1; + QList yValues2; + QList points; + QPointF startPoint; + QPointF endPoint; + unsigned int pointAmount; + + plotDialog plotDlg(parent); + int result = plotDlg.exec(); + if (result == QDialog::Accepted) + { + double equationVariable = 0.0; + double startVal = 0.0; + double endVal = 0.0; + plotDlg.getValues(equation1, equation2, startValue, endValue, stepSize); + + try{ + mu::Parser p; + p.DefineConst("pi",M_PI); + p.DefineConst("e",M_E); + p.DefineVar("x", &equationVariable); + p.DefineVar("t", &equationVariable); + p.SetExpr(startValue.toStdString()); + startVal = p.Eval(); + + p.SetExpr(endValue.toStdString()); + endVal = p.Eval(); + + p.SetExpr(equation1.toStdString()); + + for(equationVariable = startVal; equationVariable < endVal; equationVariable += stepSize)//end value is not used! + {//calculate the values of the first equation + xValues.append(equationVariable); + yValues1.append(p.Eval()); + } + + if(!equation2.isEmpty()) + {//calculate the values of the second equation + p.SetExpr(equation2.toStdString()); + for(int i = 0; i < xValues.size(); ++i) + { + equationVariable = xValues.at(i); + yValues2.append(p.Eval()); + } + } + } + catch (mu::Parser::exception_type &e) + { + std::cout << e.GetMsg() << std::endl; + } + + pointAmount = xValues.size(); + + if(equation2.isEmpty()) + {//use first equation for drawing (explicit) + for(size_t i = 0; i < pointAmount -1; ++i) + { + startPoint.setX(xValues.at(i)); + startPoint.setY(yValues1.at(i)); + + endPoint.setX(xValues.at(i+1)); + endPoint.setY(yValues1.at(i+1)); + doc->addLine(&startPoint, &endPoint); + } + + } + else + {//use first and second equation for drawing (parametric) + for(size_t i = 0; i < pointAmount -1; ++i) + { + startPoint.setX(yValues1.at(i)); + startPoint.setY(yValues2.at(i)); + + endPoint.setX(yValues1.at(i+1)); + endPoint.setY(yValues2.at(i+1)); + doc->addLine(&startPoint, &endPoint); + } + } + } + +} + +#if QT_VERSION < 0x050000 +Q_EXPORT_PLUGIN2(plotequation, plot); +#endif diff -Nru librecad-2.0.3/plugins/plotequation/plotdialog.cpp librecad-2.0.4/plugins/plotequation/plotdialog.cpp --- librecad-2.0.3/plugins/plotequation/plotdialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/plotequation/plotdialog.cpp 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,138 @@ +#include "plotdialog.h" + +plotDialog::plotDialog(QWidget *parent) : + QDialog(parent) +{ + setWindowTitle(tr("Plot equation")); + mainLayout = new QGridLayout; + buttonLayout = new QHBoxLayout; + description = new QLabel(tr("This plugin allows you to plot mathematical equations.\n" + "If you don't want to use the parametric form, just leave out \"Equation2\".\n" + "You can use pi when you need the value of pi (i.e. (3*pi)).\n" + "Use t or x in your equation as a variable/parameter.\n")); + lblEquasion1 = new QLabel(tr("Equation 1:")); + lblEquasion2 = new QLabel(tr("Equation 2:")); + lnedEquasion1 = new QLineEdit; + lnedEquasion2 = new QLineEdit; + lblStartValue = new QLabel(tr("start value:")); + lblEndValue = new QLabel(tr("end value:")); + lblStepSize = new QLabel(tr("step size:")); + lnedStartValue = new QLineEdit; + lnedEndValue = new QLineEdit; + lnedStepSize = new QLineEdit; + btnAccept = new QPushButton(tr("Draw")); + btnCancel = new QPushButton(tr("Cancel")); + space = new QSpacerItem(0, 20); + + + lnedStartValue->setMaximumWidth(50); + lnedEndValue->setMaximumWidth(50); + lnedStepSize->setMaximumWidth(50); + + mainLayout->addWidget(description, 0, 0, 1, -1); + + mainLayout->addItem(space, 1, 0); + + mainLayout->addWidget(lblEquasion1, 2, 0); + mainLayout->addWidget(lnedEquasion1, 2, 1); + + mainLayout->addWidget(lblEquasion2, 3, 0); + mainLayout->addWidget(lnedEquasion2, 3, 1); + + mainLayout->addWidget(lblStartValue, 4, 0); + mainLayout->addWidget(lblEndValue, 5, 0); + mainLayout->addWidget(lblStepSize, 6, 0); + + mainLayout->addWidget(lnedStartValue, 4, 1); + mainLayout->addWidget(lnedEndValue, 5, 1); + mainLayout->addWidget(lnedStepSize, 6, 1); + + buttonLayout->addWidget(btnAccept); + buttonLayout->addWidget(btnCancel); + + mainLayout->addLayout(buttonLayout, 7, 1); + + setLayout(mainLayout); + + connect(btnAccept, SIGNAL(clicked()), this, SLOT(slotDrawButtonClicked())); + connect(btnCancel, SIGNAL(clicked()), this, SLOT(reject())); + + +} + +//get the valuew that the user entered +void plotDialog::getValues(QString& eq1, QString& eq2, QString& start, QString& end, double& step) const +{ + eq1 = equation1; + eq2 = equation2; + start = startValue; + end = endValue; + step = stepSize; +} + +//accept the dialog when input is ok otherwise reject +void plotDialog::slotDrawButtonClicked() +{ + if(readInput()) + { + accept(); + } + else + { + done(QDialog::Rejected); + } +} + +//read the input from the user (equation1, equation2, starvalue, endvalue, stepsize) +bool plotDialog::readInput() +{ + bool conv; + + //get equations + equation1 = lnedEquasion1->text(); + equation2 = lnedEquasion2->text(); + + if(equation1.isEmpty()) + { + qDebug("no equation1 given"); + return false; + } + else + { + equation1 = equation1.replace(" ", ""); + } + + if(equation2.isEmpty()) + { + qDebug( "no equation2 given"); + } + else + { + equation2 = equation2.replace(" ", ""); + } + + //get start/end value + startValue = lnedStartValue->text(); + if(startValue.isEmpty()) + { + qDebug("no start point given"); + return false; + } + + endValue = lnedEndValue->text(); + if(endValue.isEmpty()) + { + qDebug("no end point given"); + return false; + } + + //get step size + stepSize = lnedStepSize->text().toDouble(&conv); + if(!conv) + { + qDebug("could not convert step size"); + return false; + } + + return true; +} diff -Nru librecad-2.0.3/plugins/plotequation/plotdialog.h librecad-2.0.4/plugins/plotequation/plotdialog.h --- librecad-2.0.3/plugins/plotequation/plotdialog.h 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/plotequation/plotdialog.h 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,51 @@ +#ifndef PLOTDIALOG_H +#define PLOTDIALOG_H + +#include +#include +#include +#include +#include + + +class plotDialog : public QDialog +{ + Q_OBJECT +public: + explicit plotDialog(QWidget *parent = 0); + void getValues(QString& eq1, QString& eq2, QString &start, QString &end, double& step) const; + +signals: + +public slots: + void slotDrawButtonClicked(); + +private: + QString equation1; + QString equation2; + QString startValue; + QString endValue; + double stepSize; + QGridLayout *mainLayout; + QHBoxLayout* buttonLayout; + QLabel* description; + QLabel* lblEquasion1; + QLabel* lblEquasion2; + QLineEdit* lnedEquasion1; + QLineEdit* lnedEquasion2; + QLabel* lblStartValue; + QLabel* lblEndValue; + QLabel* lblStepSize; + QLineEdit* lnedStartValue; + QLineEdit* lnedEndValue; + QLineEdit* lnedStepSize; + QPushButton* btnAccept; + QPushButton* btnCancel; + QSpacerItem* space; + + bool readInput(); + + +}; + +#endif // PLOTDIALOG_H diff -Nru librecad-2.0.3/plugins/plotequation/plotequation.json librecad-2.0.4/plugins/plotequation/plotequation.json --- librecad-2.0.3/plugins/plotequation/plotequation.json 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/plotequation/plotequation.json 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1 @@ + { "Keys": [ ] } diff -Nru librecad-2.0.3/plugins/plotequation/plotequation.pro librecad-2.0.4/plugins/plotequation/plotequation.pro --- librecad-2.0.3/plugins/plotequation/plotequation.pro 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/plotequation/plotequation.pro 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,37 @@ +QT += gui +TEMPLATE = lib +CONFIG += plugin +VERSION = 1.0.1 +PLUGIN_NAME=plotequation + +GENERATED_DIR = ../../generated/plugin/plotequation +# Use common project definitions. +include(../../common.pri) +include(../../librecad/src/muparser.pri) + +# For plugins +INCLUDEPATH += ../../librecad/src/plugins +INCLUDEPATH += $$DEPENDPATH + +SOURCES += \ + plot.cpp \ + plotdialog.cpp + +HEADERS += \ + plotdialog.h \ + plot.h + + +# DLLDESTDIR = ../../unix/resources/plugins/ +win32 { + DLLDESTDIR = ../../windows/resources/plugins + TARGET = $$PLUGIN_NAME +} +unix { + macx { + TARGET = ../../LibreCAD.app/Contents/Resources/plugins/$$PLUGIN_NAME + } + else { + TARGET = ../../unix/resources/plugins/$$PLUGIN_NAME + } +} diff -Nru librecad-2.0.3/plugins/plotequation/plot.h librecad-2.0.4/plugins/plotequation/plot.h --- librecad-2.0.3/plugins/plotequation/plot.h 1970-01-01 00:00:00.000000000 +0000 +++ librecad-2.0.4/plugins/plotequation/plot.h 2014-05-30 03:54:17.000000000 +0000 @@ -0,0 +1,28 @@ +#ifndef PLOT_H +#define PLOT_H + +#include +#include "qc_plugininterface.h" + +class plot : public QObject, QC_PluginInterface +{ + Q_OBJECT + Q_INTERFACES(QC_PluginInterface) +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.librecad.plotequation" FILE "plotequation.json") +#endif + +public: + explicit plot(QObject *parent = 0); + + virtual QString name() const; + virtual PluginCapabilities getCapabilities() const; + virtual void execComm(Document_Interface *doc, QWidget *parent, QString cmd); + +signals: + +public slots: + +}; + +#endif // PLOT_H diff -Nru librecad-2.0.3/plugins/plugins.pro librecad-2.0.4/plugins/plugins.pro --- librecad-2.0.3/plugins/plugins.pro 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/plugins.pro 2014-05-30 03:54:17.000000000 +0000 @@ -15,7 +15,8 @@ list \ sameprop \ importshp \ - sample + sample \ + plotequation TRANSLATIONS = ./ts/plugins_ca.ts \ ./ts/plugins_cs.ts \ diff -Nru librecad-2.0.3/plugins/ts/plugins_ca.ts librecad-2.0.4/plugins/ts/plugins_ca.ts --- librecad-2.0.3/plugins/ts/plugins_ca.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_ca.ts 2014-05-30 03:54:17.000000000 +0000 @@ -757,6 +757,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_cs.ts librecad-2.0.4/plugins/ts/plugins_cs.ts --- librecad-2.0.3/plugins/ts/plugins_cs.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_cs.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + Zrušit + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_da.ts librecad-2.0.4/plugins/ts/plugins_da.ts --- librecad-2.0.3/plugins/ts/plugins_da.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_da.ts 2014-05-30 03:54:17.000000000 +0000 @@ -1,13 +1,13 @@ - + AsciiFile Read ascii points - + Importer ASCII punkter @@ -15,7 +15,7 @@ Import ESRI Shapefile - + Importer ESRI Shapefil @@ -24,27 +24,27 @@ Align - + Tilpas first base point: - + Første udgangspunkt: first target point: - + Første slutpunkt: second base point: - + Andet udgangspunkt: second target point: - + Andet slutpunkt: @@ -53,89 +53,89 @@ List entities - + Vis objekter n - + n Empty Entity - + Slet objekt X - + X Y - + Y Layer - + Lag Color - + Farve Line type - + Linjetype Line thickness - + Linjetykkelse ID - + ID POINT - + UDPEG in point - + aktuelle objekt LINE - + LINJE from point - + startpunkt to point - + slutpunkt length - + længde Angle in XY plane - + Vinkel i XY-plan @@ -145,25 +145,25 @@ ARC - + CIRKELBUE center point - + centrum radius - + radius initial angle - + udgangsvinkel @@ -173,32 +173,32 @@ CIRCLE - + cirkel circumference - + omkreds area - + areal ELLIPSE - + ellipse major axis - + hovedakse CONSTRUCTIONLINE - + hjælpelinje @@ -208,27 +208,27 @@ SOLID - + massiv MTEXT - + TEKSTAFSNIT TEXT - + TEKST INSERT - + INDSÆT Name - + Navn @@ -243,7 +243,7 @@ Closed - + Lukket @@ -253,7 +253,7 @@ Yes - + Ja @@ -263,7 +263,7 @@ curvature - + krumning @@ -273,12 +273,12 @@ SPLINE - + KURVE HATCH - + SKRAVER @@ -308,12 +308,12 @@ DIMANGULAR - + VINKELMÅL UNKNOWN - + UKENDT @@ -327,12 +327,12 @@ select original entity: - + vælg oprindelige helhed: select entities to change - + Vægl helheder at ændre @@ -349,7 +349,7 @@ Read ascii points - + Importer ASCII punkter @@ -537,12 +537,12 @@ Layer - + Lag Import ESRI Shapefile - + Importer ESRI Shapefil @@ -569,12 +569,12 @@ Color - + Farve Line type - + Linjetype @@ -688,7 +688,7 @@ List entities - + Vis objekter @@ -754,6 +754,72 @@ + + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_de.ts librecad-2.0.4/plugins/ts/plugins_de.ts --- librecad-2.0.3/plugins/ts/plugins_de.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_de.ts 2014-05-30 03:54:17.000000000 +0000 @@ -859,6 +859,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + Abbrechen + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_el.ts librecad-2.0.4/plugins/ts/plugins_el.ts --- librecad-2.0.3/plugins/ts/plugins_el.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_el.ts 2014-05-30 03:54:17.000000000 +0000 @@ -775,6 +775,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + Ακύρωση + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_en_au.ts librecad-2.0.4/plugins/ts/plugins_en_au.ts --- librecad-2.0.3/plugins/ts/plugins_en_au.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_en_au.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_en.ts librecad-2.0.4/plugins/ts/plugins_en.ts --- librecad-2.0.3/plugins/ts/plugins_en.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_en.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_ar.ts librecad-2.0.4/plugins/ts/plugins_es_ar.ts --- librecad-2.0.3/plugins/ts/plugins_es_ar.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_ar.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_bo.ts librecad-2.0.4/plugins/ts/plugins_es_bo.ts --- librecad-2.0.3/plugins/ts/plugins_es_bo.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_bo.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_cl.ts librecad-2.0.4/plugins/ts/plugins_es_cl.ts --- librecad-2.0.3/plugins/ts/plugins_es_cl.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_cl.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_co.ts librecad-2.0.4/plugins/ts/plugins_es_co.ts --- librecad-2.0.3/plugins/ts/plugins_es_co.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_co.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_cr.ts librecad-2.0.4/plugins/ts/plugins_es_cr.ts --- librecad-2.0.3/plugins/ts/plugins_es_cr.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_cr.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_do.ts librecad-2.0.4/plugins/ts/plugins_es_do.ts --- librecad-2.0.3/plugins/ts/plugins_es_do.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_do.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_ec.ts librecad-2.0.4/plugins/ts/plugins_es_ec.ts --- librecad-2.0.3/plugins/ts/plugins_es_ec.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_ec.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_gt.ts librecad-2.0.4/plugins/ts/plugins_es_gt.ts --- librecad-2.0.3/plugins/ts/plugins_es_gt.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_gt.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_hn.ts librecad-2.0.4/plugins/ts/plugins_es_hn.ts --- librecad-2.0.3/plugins/ts/plugins_es_hn.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_hn.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_mx.ts librecad-2.0.4/plugins/ts/plugins_es_mx.ts --- librecad-2.0.3/plugins/ts/plugins_es_mx.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_mx.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_ni.ts librecad-2.0.4/plugins/ts/plugins_es_ni.ts --- librecad-2.0.3/plugins/ts/plugins_es_ni.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_ni.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_pa.ts librecad-2.0.4/plugins/ts/plugins_es_pa.ts --- librecad-2.0.3/plugins/ts/plugins_es_pa.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_pa.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_pe.ts librecad-2.0.4/plugins/ts/plugins_es_pe.ts --- librecad-2.0.3/plugins/ts/plugins_es_pe.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_pe.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_pr.ts librecad-2.0.4/plugins/ts/plugins_es_pr.ts --- librecad-2.0.3/plugins/ts/plugins_es_pr.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_pr.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_py.ts librecad-2.0.4/plugins/ts/plugins_es_py.ts --- librecad-2.0.3/plugins/ts/plugins_es_py.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_py.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_sv.ts librecad-2.0.4/plugins/ts/plugins_es_sv.ts --- librecad-2.0.3/plugins/ts/plugins_es_sv.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_sv.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es.ts librecad-2.0.4/plugins/ts/plugins_es.ts --- librecad-2.0.3/plugins/ts/plugins_es.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_us.ts librecad-2.0.4/plugins/ts/plugins_es_us.ts --- librecad-2.0.3/plugins/ts/plugins_es_us.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_us.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_uy.ts librecad-2.0.4/plugins/ts/plugins_es_uy.ts --- librecad-2.0.3/plugins/ts/plugins_es_uy.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_uy.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_es_ve.ts librecad-2.0.4/plugins/ts/plugins_es_ve.ts --- librecad-2.0.3/plugins/ts/plugins_es_ve.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_es_ve.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_et.ts librecad-2.0.4/plugins/ts/plugins_et.ts --- librecad-2.0.3/plugins/ts/plugins_et.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_et.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_fi.ts librecad-2.0.4/plugins/ts/plugins_fi.ts --- librecad-2.0.3/plugins/ts/plugins_fi.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_fi.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_fr.ts librecad-2.0.4/plugins/ts/plugins_fr.ts --- librecad-2.0.3/plugins/ts/plugins_fr.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_fr.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_hi.ts librecad-2.0.4/plugins/ts/plugins_hi.ts --- librecad-2.0.3/plugins/ts/plugins_hi.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_hi.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_hu.ts librecad-2.0.4/plugins/ts/plugins_hu.ts --- librecad-2.0.3/plugins/ts/plugins_hu.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_hu.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_id_ID.ts librecad-2.0.4/plugins/ts/plugins_id_ID.ts --- librecad-2.0.3/plugins/ts/plugins_id_ID.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_id_ID.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_it.ts librecad-2.0.4/plugins/ts/plugins_it.ts --- librecad-2.0.3/plugins/ts/plugins_it.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_it.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_ja.ts librecad-2.0.4/plugins/ts/plugins_ja.ts --- librecad-2.0.3/plugins/ts/plugins_ja.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_ja.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_lv.ts librecad-2.0.4/plugins/ts/plugins_lv.ts --- librecad-2.0.3/plugins/ts/plugins_lv.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_lv.ts 2014-05-30 03:54:17.000000000 +0000 @@ -609,6 +609,60 @@ + plot + + Plot plugin + + + + Draw + + + + + plotDialog + + Plot equation + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + Equation 1: + + + + Equation 2: + + + + start value: + + + + end value: + + + + step size: + + + + Draw + + + + Cancel + Atcelt + + + pointBox Layer: diff -Nru librecad-2.0.3/plugins/ts/plugins_nl.ts librecad-2.0.4/plugins/ts/plugins_nl.ts --- librecad-2.0.3/plugins/ts/plugins_nl.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_nl.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_no.ts librecad-2.0.4/plugins/ts/plugins_no.ts --- librecad-2.0.3/plugins/ts/plugins_no.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_no.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_pa.ts librecad-2.0.4/plugins/ts/plugins_pa.ts --- librecad-2.0.3/plugins/ts/plugins_pa.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_pa.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_pl.ts librecad-2.0.4/plugins/ts/plugins_pl.ts --- librecad-2.0.3/plugins/ts/plugins_pl.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_pl.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_pt_br.ts librecad-2.0.4/plugins/ts/plugins_pt_br.ts --- librecad-2.0.3/plugins/ts/plugins_pt_br.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_pt_br.ts 2014-05-30 03:54:17.000000000 +0000 @@ -767,6 +767,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + Cancelar + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_pt_pt.ts librecad-2.0.4/plugins/ts/plugins_pt_pt.ts --- librecad-2.0.3/plugins/ts/plugins_pt_pt.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_pt_pt.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_ro_ro.ts librecad-2.0.4/plugins/ts/plugins_ro_ro.ts --- librecad-2.0.3/plugins/ts/plugins_ro_ro.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_ro_ro.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_ru.ts librecad-2.0.4/plugins/ts/plugins_ru.ts --- librecad-2.0.3/plugins/ts/plugins_ru.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_ru.ts 2014-05-30 03:54:17.000000000 +0000 @@ -62,7 +62,7 @@ n - + № @@ -72,12 +72,12 @@ X - + X Y - + Y @@ -102,23 +102,23 @@ ID - Идент. + Идентификатор POINT - + ТОЧКА in point - + в точке LINE - + ЛИНИЯ @@ -134,12 +134,12 @@ length - длинна + длина Angle in XY plane - Угол в плоскости XY + угол в плоскости XY @@ -149,7 +149,7 @@ ARC - + ДУГА @@ -177,7 +177,7 @@ CIRCLE - + ОКРУЖНОСТЬ @@ -192,7 +192,7 @@ ELLIPSE - + ЭЛЛИПС @@ -217,22 +217,22 @@ MTEXT - + МНОГОСТРОЧНЫЙ ТЕКСТ TEXT - + ТЕКСТ INSERT - + ВСТАВКА Name - + Имя @@ -242,12 +242,12 @@ POLYLINE - + ЛОМАНАЯ ЛИНИЯ Closed - + Замкнута @@ -262,62 +262,62 @@ Vertices - + Вершины curvature - + кривизна IMAGE - + ИЗОБРАЖЕНИЕ SPLINE - + СПЛАЙН HATCH - + ШТРИХОВКА DIMLEADER - + РАЗМЕР-ВЫНОСКА DIMALIGNED - + РАЗМЕР ВЫРОВНЕННЫЙ DIMLINEAR - + РАЗМЕР ЛИНЕЙНЫЙ DIMRADIAL - + РАЗМЕР РАДИАЛЬНЫЙ DIMDIAMETRIC - + РАЗМЕР ДИАМЕТРАЛЬНЫЙ DIMANGULAR - + РАЗМЕР УГЛОВОЙ UNKNOWN - + НЕИЗВЕСТНО @@ -759,6 +759,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + Отмена + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_sk.ts librecad-2.0.4/plugins/ts/plugins_sk.ts --- librecad-2.0.3/plugins/ts/plugins_sk.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_sk.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_sl.ts librecad-2.0.4/plugins/ts/plugins_sl.ts --- librecad-2.0.3/plugins/ts/plugins_sl.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_sl.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + Prekliči + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_sq_al.ts librecad-2.0.4/plugins/ts/plugins_sq_al.ts --- librecad-2.0.3/plugins/ts/plugins_sq_al.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_sq_al.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_sv.ts librecad-2.0.4/plugins/ts/plugins_sv.ts --- librecad-2.0.3/plugins/ts/plugins_sv.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_sv.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_tr.ts librecad-2.0.4/plugins/ts/plugins_tr.ts --- librecad-2.0.3/plugins/ts/plugins_tr.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_tr.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_uk.ts librecad-2.0.4/plugins/ts/plugins_uk.ts --- librecad-2.0.3/plugins/ts/plugins_uk.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_uk.ts 2014-05-30 03:54:17.000000000 +0000 @@ -7,7 +7,7 @@ Read ascii points - + Точки в форматі ASCII @@ -24,27 +24,27 @@ Align - + Вирівняти first base point: - + Перша базова точка: first target point: - + Перша цільова точка: second base point: - + Друга базова точка: second target point: - + Друга цільова точка: @@ -53,7 +53,7 @@ List entities - + Перелік елементів @@ -63,22 +63,22 @@ Empty Entity - + Порожній об’єкт X - + X Y - + Y Layer - Шар + Шар @@ -88,17 +88,17 @@ Line type - Тип лінії + Тип лінії Line thickness - + Товщина лінії ID - + Ідент. @@ -119,23 +119,23 @@ from point - + від точки to point - + до точки length - + довжина Angle in XY plane - + Кут в площині XY @@ -152,23 +152,23 @@ center point - + центральна точка radius - + радіус initial angle - + початковий кут final angle - + кінцевий кут @@ -178,12 +178,12 @@ circumference - + периметр area - + площа @@ -193,7 +193,7 @@ major axis - + головні осі @@ -233,7 +233,7 @@ Insertion point - + Точка вставки @@ -253,17 +253,17 @@ Yes - + Так Vertices - + Вершини curvature - + кривизна @@ -374,17 +374,17 @@ Same properties - + Однакові властивості select original entity: - + Виберіть вихідний об’єкт select entities to change - + Виберіть об’єкти для зміни @@ -393,7 +393,7 @@ Sample plugin - + Приклад додатку @@ -401,7 +401,7 @@ Read ascii points - + Точки в форматі ASCII @@ -416,32 +416,32 @@ Space Separator - + Поділ пробілами Tab Separator - + Поділ табуляцією Comma Separator - + Поділ комою Space in Columns - + Пробіли в стовпцях *.odb for Psion 2 - + *.odb для Psion 2 Connect points - + З’єднати точки @@ -466,12 +466,12 @@ Point Number - + Номер точки Draw point number - + Нумерувати точки @@ -536,7 +536,7 @@ Point number layer is empty - + Шар нумерації точок порожній @@ -566,12 +566,12 @@ The file %1 not exist - + Не існує файл %1 Can't open the file %1 - + Неможливо відкрити файл %1 @@ -594,13 +594,13 @@ Import ESRI Shapefile - Імпорт shape-файлу ESRI + Імпорт shape-файлу ESRI Unknown - + Невідомо @@ -608,7 +608,7 @@ Current - + Поточний @@ -616,7 +616,7 @@ From data: - + З даних: @@ -642,27 +642,27 @@ as Point - + Як точка as Label: - + Як мітка: Accept - Застосувати + Прийняти Cancel - Відміна + Відміна Select file - Виберіть файл + Виберіть файл @@ -707,7 +707,7 @@ Polygon - + Багатокутник @@ -727,12 +727,12 @@ The file %1 not have extension .shp - + У файлу %1 розширення не .shp The file %1 not exist - + Не існує файлу %1 @@ -740,7 +740,7 @@ List entities - + Перелік елементів @@ -748,63 +748,129 @@ Draw line - + Накреслити лінію Start X: - + Початок X: Start Y: - + Початок Y: End X: - + Кінець X: End Y: - + Кінець Y: Accept - Застосувати + Прийняти Cancel - Відміна + Відміна Start X is empty - + Порожня початкова X-координата Start Y is empty - + Порожня початкова Y-координата End X is empty - + Порожня кінцева X-координата End Y is empty - + Порожня кінцева Y-координата Sample plugin + Зразок додатку + + + + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + Відміна + pointBox @@ -824,7 +890,7 @@ Height: - + Висота: Heigth: @@ -833,7 +899,7 @@ Separation - + Поділ diff -Nru librecad-2.0.3/plugins/ts/plugins_zh_cn.ts librecad-2.0.4/plugins/ts/plugins_zh_cn.ts --- librecad-2.0.3/plugins/ts/plugins_zh_cn.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_zh_cn.ts 2014-05-30 03:54:17.000000000 +0000 @@ -759,6 +759,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + 取消 + + + pointBox diff -Nru librecad-2.0.3/plugins/ts/plugins_zh_tw.ts librecad-2.0.4/plugins/ts/plugins_zh_tw.ts --- librecad-2.0.3/plugins/ts/plugins_zh_tw.ts 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/plugins/ts/plugins_zh_tw.ts 2014-05-30 03:54:17.000000000 +0000 @@ -755,6 +755,72 @@ + plot + + + + Plot plugin + + + + + Draw + + + + + plotDialog + + + Plot equation + + + + + This plugin allows you to plot mathematical equations. +If you don't want to use the parametric form, just leave out "Equation2". +You can use pi when you need the value of pi (i.e. (3*pi)). +Use t or x in your equation as a variable/parameter. + + + + + + Equation 1: + + + + + Equation 2: + + + + + start value: + + + + + end value: + + + + + step size: + + + + + Draw + + + + + Cancel + 取消 + + + pointBox diff -Nru librecad-2.0.3/README.md librecad-2.0.4/README.md --- librecad-2.0.3/README.md 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/README.md 2014-05-30 03:54:17.000000000 +0000 @@ -34,7 +34,7 @@ source ~/.bashrc gcc --version # make sure it's 4.8. if it's not, ~/bin might not be on your path -brew install boost muparser qt +brew install boost qt # Unzip or checkout a version of LibreCAD into a directory. cd LibreCAD @@ -55,8 +55,8 @@ Install QT and a new gcc, which should version 4.4 or later. -Install a version of Qt, boost and muparser, for example -`$ sudo port install gcc46 qt4-creator-mac qt4-mac boost muparser` +Install a version of Qt and boost, for example +`$ sudo port install gcc46 qt4-creator-mac qt4-mac boost` Select the right compiler, as LibreCAD doesn't build with the default llvm-gcc42, `$ sudo port select --set gcc mp-gcc46` @@ -116,27 +116,9 @@ FreeBSD users ------------- -Make sure you have the following ports installed: +See scripts/build-freebsd.sh for the list of ports that need to be installed. -``` -x11-toolkits/qt4-gui devel/qt4-linguist devel/qt4-help-tools graphics/qt4-svg devel/boost-libs math/muparser -``` - -LibreCAD requires a C++11-capable compiler to build, Currently this means that one of - -``` -lang/gcc47, lang/gcc48, lang/gcc49 or lang/clang33 -``` - -must be used. - -Once these pre-requisites are satisfied, run the provided - -``` -scripts/build-freebsd.sh -``` - -See the script itself for some more options. Clang 3.3 does not yet work. +Use the script itself to build LibreCAD. Windows Users ------------- @@ -152,20 +134,7 @@ - Download boost, from https://sourceforge.net/projects/boost/files/boost/ - unzip into C:\boost\, for example C:\boost\1_53_0 (in this directory you will find boost root directory, INSTALL, index, Jamroot etc.. etc). -- Download muParser 2.2.2 or later from http://sourceforge.net/projects/muparser/files/muparser/ -- Create a directory named "muparser" in `C:\` -- Unzip muparser_v2_2_2.zip into `C:\muparser\` - -Notes: At this point you will have the following directory structure: C:\muparser\muparser_v2_2_2\ (assuming you are using muparser-2.2.2). If you prefer to keep muParser in other locations, you should specify the directiory location with a custom.pro file in LibreCAD source folder, for example, the following setting is equivalent to the default muparser path in common.pro: - -`MUPARSER_DIR = /muparser/muparser_v2_2_2` - -- Start Qt Desktop using "Qt 4.8.4 for Desktop (MinGW)" shortcut. -- In Qt Desktop console, navigate to muParser build directory (C:\muparser\muparser_v2_2_2\build\), then type the following command to built muParser library: - `mingw32-make -fmakefile.mingw` - -After installation, start Qt Creator and load LibreCAD.pro, -from the build menu select "Build All". +Start Qt Creator and load LibreCAD.pro, from the build menu select "Build All". Generic Unix Users ------------------ diff -Nru librecad-2.0.3/scripts/build-freebsd.sh librecad-2.0.4/scripts/build-freebsd.sh --- librecad-2.0.3/scripts/build-freebsd.sh 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/scripts/build-freebsd.sh 2014-05-30 03:54:17.000000000 +0000 @@ -7,31 +7,34 @@ # # x11-toolkits/qt4-gui devel/qt4-linguist devel/qt4-help-tools # graphics/qt4-svg databases/qt4-sql(?) textproc/qt4-clucene(?) -# devel/boost-libs math/muparser +# devel/binutils devel/boost-libs math/muparser # # lang/gcc4{7,8,9} # or -# lang/clang33 and devel/llvm33 and devel/libc++ +# lang/clang3{3,4} and devel/llvm3{3,4} and devel/libc++ scriptpath="$( readlink -f "${0}" )" scriptpath="${scriptpath%/*}" if [ -z "${use_cxx}" ] then - if [ "$( which g++47 )" ] + if [ "$( which g++49 )" ] then - use_cxx="g++47" + use_cxx="g++49" elif [ "$( which g++48 )" ] then use_cxx="g++48" - elif [ "$( which g++49 )" ] + elif [ "$( which g++47 )" ] then - use_cxx="g++49" + use_cxx="g++47" + elif [ "$( which clang++34 )" ] + then + use_cxx="clang++34" elif [ "$( which clang++33 )" ] then use_cxx="clang++33" else - echo "No supported compiler found. Install one of lang/{gcc4{7,8,9},clang33}" >&2 + echo "No supported compiler found. Install one of lang/{gcc4{7,8,9},clang3{3,4}}" >&2 exit 1 fi elif [ -z "$( which ${use_cxx} )" ] @@ -41,27 +44,39 @@ fi rpath= -spec= cxxflags= libs= +compiler= +extra= +local_base="$( make -f /usr/share/mk/bsd.port.mk -V LOCALBASE )" compiler_version=${use_cxx##*++} case "${use_cxx}" in 'g++'*) - rpath="$( make -C /usr/ports/lang/gcc${compiler_version} -V LOCALBASE )"/lib/gcc${compiler_version} + rpath="${local_base}/lib/gcc${compiler_version}" + compiler="g++" ;; 'clang++'*) - if [ ! -e "$( make -C /usr/ports/lang/clang${compiler_version} -V LOCALBASE )"/lib/libc++.so ] + if [ ! -e "${local_base}/lib/libc++.so" ] then echo "Install devel/libc++" >&2 exit 1 fi - cxxflags="-I /usr/local/include/c++/v1" + cxxflags="-I${local_base}/include/c++/v1" libs="-stdlib=libc++" + compiler="clang" + extra="build_muparser=true" ;; esac -spec="freebsd-${use_cxx}" cd "${scriptpath}/.." -qmake-qt4 librecad.pro ${spec:+-spec ${spec}} "${rpath:+QMAKE_RPATHDIR=\"${rpath}\"}" "${cxxflags:+QMAKE_CXXFLAGS=\"${cxxflags}\"}" "${libs:+QMAKE_LIBS=\"${libs}\"}" + +qmake-qt4 librecad.pro \ + ${compiler:+QMAKE_COMPILER=${compiler}} \ + QMAKE_CXX=${use_cxx} \ + QMAKE_LINK=${use_cxx} \ + ${rpath:+QMAKE_RPATHDIR=\"${rpath}\"} \ + ${cxxflags:+QMAKE_CXXFLAGS=\"${cxxflags}\"} \ + ${libs:+QMAKE_LIBS=\"${libs}\"} ${extra:+${extra}} + make -j$( /sbin/sysctl -n hw.ncpu ) diff -Nru librecad-2.0.3/scripts/build-osx.sh librecad-2.0.4/scripts/build-osx.sh --- librecad-2.0.3/scripts/build-osx.sh 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/scripts/build-osx.sh 2014-05-30 03:54:17.000000000 +0000 @@ -14,9 +14,15 @@ # have to clean up any existing binary files to avoid crashes of bug#422 rm -rf LibreCAD.app -$QMAKE_CMD -r -spec macx-clang "build_muparser = true" +$QMAKE_CMD -r -spec macx-clang make distclean -$QMAKE_CMD -r -spec macx-clang "build_muparser = true" +$QMAKE_CMD -r -spec macx-clang +#undefined symbol x86_64: https://qt-project.org/forums/viewthread/35646 +find . -iname makefile -exec sed -i '' \ + -e 's:mmacosx-version-min=10.[1-8]:mmacosx-version-min=10.9:g' \ + -e 's:MacOSX10.[1-8].sdk:MacOSX10.9.sdk:g' \ + '{}' ';' + make -j4 rm -f LibreCAD.dmg macdeployqt LibreCAD.app -verbose=2 -dmg diff -Nru librecad-2.0.3/scripts/postprocess-windows/nsis-5.2.nsi librecad-2.0.4/scripts/postprocess-windows/nsis-5.2.nsi --- librecad-2.0.3/scripts/postprocess-windows/nsis-5.2.nsi 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/scripts/postprocess-windows/nsis-5.2.nsi 2014-05-30 03:54:17.000000000 +0000 @@ -169,7 +169,7 @@ ; create add/remove software entries WriteRegStr HKLM "${UNINSTKEY}" "DisplayName" "${APPNAME}" WriteRegStr HKLM "${UNINSTKEY}" "DisplayIcon" "$INSTDIR\LibreCAD.exe" - WriteRegStr HKLM "${UNINSTKEY}" "DisplayVersion" "2.0.3" + WriteRegStr HKLM "${UNINSTKEY}" "DisplayVersion" "2.0.4" WriteRegStr HKLM "${UNINSTKEY}" "Publisher" "LibreCAD Team" WriteRegStr HKLM "${UNINSTKEY}" "Version" "2.0" WriteRegStr HKLM "${UNINSTKEY}" "HelpLink" "http://librecad.org/cms/home/get-help/forum.html" diff -Nru librecad-2.0.3/tools/tools.pro librecad-2.0.4/tools/tools.pro --- librecad-2.0.3/tools/tools.pro 2014-03-22 11:34:31.000000000 +0000 +++ librecad-2.0.4/tools/tools.pro 2014-05-30 03:54:17.000000000 +0000 @@ -9,7 +9,11 @@ TEMPLATE = subdirs unix { - SUBDIRS = ttf2lff + packagesExist(freetype2){ + SUBDIRS = ttf2lff + } else{ + message( "package freetype2 is not found. Ignoring ttf2lff") + } } win32 {