first complete german translation and improved english version. In some cases i'm unsure and can't test functionality, so wording might be changed later.

--HG--
branch : develop
This commit is contained in:
cosina 2013-12-30 12:54:38 +01:00
parent b7c60fc31e
commit 26c99ccb65
17 changed files with 2132 additions and 1235 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -80,6 +80,26 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert variable into the formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip">
@ -183,26 +203,6 @@
<item>
<widget class="QLineEdit" name="lineEditNamePoint"/>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert variable into the formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -271,7 +271,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>
@ -365,7 +365,6 @@
<tabstop>radioButtonLengthArc</tabstop>
<tabstop>radioButtonLengthSpline</tabstop>
<tabstop>listWidget</tabstop>
<tabstop>toolButtonPutHere</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>

View file

@ -448,7 +448,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>

View file

@ -310,7 +310,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>

View file

@ -75,14 +75,31 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Formula calculation of length of curve</string>
<string>Formula for the calculation of the spline</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip">
<string>Calculate formula</string>
<string>Calculate value</string>
</property>
<property name="text">
<string>...</string>
@ -149,23 +166,6 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -216,7 +216,7 @@
</palette>
</property>
<property name="text">
<string>Name new point</string>
<string>Point label</string>
</property>
</widget>
</item>
@ -237,7 +237,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>
@ -247,7 +247,7 @@
<item>
<widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text">
<string>Standart table</string>
<string>Standard table</string>
</property>
</widget>
</item>
@ -295,7 +295,7 @@
<item>
<widget class="QListWidget" name="listWidget">
<property name="toolTip">
<string>Variables. Click twice to select.</string>
<string>Variables - Click twice to insert into formula</string>
</property>
</widget>
</item>

View file

@ -75,14 +75,31 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Formula calculation of length of curve</string>
<string>Formula for the calculation of the curve length</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip">
<string>Calculate formula</string>
<string>Calculate value</string>
</property>
<property name="text">
<string>...</string>
@ -149,23 +166,6 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -216,7 +216,7 @@
</palette>
</property>
<property name="text">
<string>Name new point</string>
<string>Point label</string>
</property>
</widget>
</item>
@ -237,7 +237,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>
@ -247,7 +247,7 @@
<item>
<widget class="QRadioButton" name="radioButtonStandartTable">
<property name="text">
<string>Standart table</string>
<string>Standard table</string>
</property>
</widget>
</item>
@ -295,7 +295,7 @@
<item>
<widget class="QListWidget" name="listWidget">
<property name="toolTip">
<string>Variables. Click twice to select.</string>
<string>Variables - Click twice to insert into formula</string>
</property>
</widget>
</item>

View file

@ -86,6 +86,23 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip">
@ -156,23 +173,6 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -466,7 +466,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>
@ -524,7 +524,7 @@
<item>
<widget class="QListWidget" name="listWidget">
<property name="toolTip">
<string>Variables - Click twice to insert in formula</string>
<string>Variables - Click twice to insert into formula</string>
</property>
</widget>
</item>
@ -570,7 +570,6 @@
<tabstop>radioButtonLengthArc</tabstop>
<tabstop>radioButtonLengthSpline</tabstop>
<tabstop>listWidget</tabstop>
<tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>

View file

@ -86,6 +86,26 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert variable into formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip">
@ -189,26 +209,6 @@
<item>
<widget class="QLineEdit" name="lineEditNamePoint"/>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert variable into formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -485,7 +485,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>
@ -590,12 +590,11 @@
<tabstop>radioButtonLengthArc</tabstop>
<tabstop>radioButtonLengthSpline</tabstop>
<tabstop>listWidget</tabstop>
<tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="../icon.qrc"/>
<include location="../../share/resources/icon.qrc"/>
</resources>
<connections>
<connection>

View file

@ -14,7 +14,7 @@
<string>Point of contact</string>
</property>
<property name="windowIcon">
<iconset resource="../icon.qrc">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property>
<property name="locale">
@ -86,6 +86,26 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert variable into formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip">
@ -95,7 +115,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../icon.qrc">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
@ -189,26 +209,6 @@
<item>
<widget class="QLineEdit" name="lineEditNamePoint"/>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert variable into formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -325,7 +325,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>
@ -421,12 +421,11 @@
<tabstop>radioButtonLengthArc</tabstop>
<tabstop>radioButtonLengthSpline</tabstop>
<tabstop>listWidget</tabstop>
<tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="../icon.qrc"/>
<include location="../../share/resources/icon.qrc"/>
</resources>
<connections>
<connection>

View file

@ -14,7 +14,7 @@
<string>Point of shoulder</string>
</property>
<property name="windowIcon">
<iconset resource="../icon.qrc">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property>
<property name="locale">
@ -86,6 +86,26 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert variable into formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButtonEqual">
<property name="toolTip">
@ -95,7 +115,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../icon.qrc">
<iconset resource="../../share/resources/icon.qrc">
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
@ -189,26 +209,6 @@
<item>
<widget class="QLineEdit" name="lineEditNamePoint"/>
</item>
<item>
<widget class="QToolButton" name="toolButtonPutHere">
<property name="toolTip">
<string>Insert variable into formula</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../icon.qrc">
<normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -346,7 +346,7 @@
<item>
<widget class="QRadioButton" name="radioButtonSizeGrowth">
<property name="text">
<string>Size and growth</string>
<string>Size and height</string>
</property>
<property name="checked">
<bool>true</bool>
@ -443,12 +443,11 @@
<tabstop>radioButtonLengthArc</tabstop>
<tabstop>radioButtonLengthSpline</tabstop>
<tabstop>listWidget</tabstop>
<tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="../icon.qrc"/>
<include location="../../share/resources/icon.qrc"/>
</resources>
<connections>
<connection>

View file

@ -477,7 +477,7 @@ void DialogTool::ValChenged(int row)
{
if (item->text()=="Р")
{
QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->growth()).arg(tr("Growth"));
QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->growth()).arg(tr("Height"));
labelDescription->setText(desc);
}
if (item->text()=="Сг")

View file

@ -166,7 +166,7 @@ void MainWindow::ActionNewDraw()
bOk = doc->appendDraw(nameDraw);
if (bOk == false)
{
qCritical()<<tr("Error creating drawing with the name")<<nameDraw<<".";
qCritical()<<tr("Error creating pattern with the name ")<<nameDraw<<".";
return;
}
disconnect(comboBoxDraws, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
@ -598,7 +598,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
void MainWindow::ToolBarOption()
{
QLabel * labelGrowth = new QLabel;
labelGrowth->setText(tr("Growth: "));
labelGrowth->setText(tr("Height: "));
ui->toolBarOption->addWidget(labelGrowth);
QStringList list;

View file

@ -226,7 +226,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool point of height.</string>
<string>Tool to create a point on the foot of a dropped perpendicular.</string>
</property>
<property name="text">
<string>...</string>
@ -325,7 +325,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool line.</string>
<string>Line tool.</string>
</property>
<property name="text">
<string>...</string>
@ -351,7 +351,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool point of line intersection.</string>
<string>Tool to create a point at the intersection of 2 lines.</string>
</property>
<property name="text">
<string>...</string>
@ -401,7 +401,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool curve.</string>
<string>Curve tool.</string>
</property>
<property name="text">
<string>...</string>
@ -427,7 +427,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool path curve.</string>
<string>Tool for path curve.</string>
</property>
<property name="text">
<string>...</string>
@ -453,7 +453,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool cut path curve.</string>
<string>Tool segment a pathed curve.</string>
</property>
<property name="text">
<string>...</string>
@ -479,7 +479,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool cut curve.</string>
<string>Tool for segmenting a curve.</string>
</property>
<property name="text">
<string>...</string>
@ -529,7 +529,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool arc.</string>
<string>Arc tool.</string>
</property>
<property name="text">
<string>...</string>
@ -800,7 +800,7 @@
<string>Details</string>
</property>
<property name="toolTip">
<string>Deatils mode</string>
<string>Details mode</string>
</property>
</action>
<action name="actionArrowTool">
@ -815,10 +815,10 @@
<normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset>
</property>
<property name="text">
<string>Tools pointer</string>
<string>Pointer tools</string>
</property>
<property name="toolTip">
<string>Tools pointer</string>
<string>Pointer tools</string>
</property>
</action>
<action name="actionNewDraw">
@ -839,10 +839,10 @@
<normaloff>:/icon/32x32/option_draw.png</normaloff>:/icon/32x32/option_draw.png</iconset>
</property>
<property name="text">
<string>Change the name of pattern piece</string>
<string>Change the label of pattern piece</string>
</property>
<property name="toolTip">
<string>Change the name of pattern piece</string>
<string>Change the label of pattern piece</string>
</property>
</action>
<action name="actionTable">

View file

@ -39,7 +39,7 @@ TableWindow::TableWindow(QWidget *parent)
indexDetail(0), sceneRect(QRectF())
{
ui->setupUi(this);
numberDetal = new QLabel(tr("Left 0 details."), this);
numberDetal = new QLabel(tr("0 details left."), this);
colission = new QLabel(tr("Collisions not found."), this);
ui->statusBar->addWidget(numberDetal);
ui->statusBar->addWidget(colission);
@ -110,7 +110,7 @@ void TableWindow::AddDetail()
ui->actionSave->setEnabled(true);
}
}
numberDetal->setText(QString(tr("Left %1 details.")).arg(listDetails.count()-indexDetail));
numberDetal->setText(QString(tr("%1 details left.")).arg(listDetails.count()-indexDetail));
}
/*

View file

@ -137,7 +137,7 @@
<string>Enlarge letter</string>
</property>
<property name="toolTip">
<string>Enlarge the length of sheet</string>
<string>Enlarge the length of the sheet</string>
</property>
</action>
<action name="actionRemove">