palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-07-04 18:18:13 +02:00
Code Issues Projects Releases Wiki Activity

Merge

Browse source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-01-07 12:05:02 +02:00
parent 3b0a485653 dad7a045e2
commit bc25721ffa
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
share/translations/valentina_de.ts
View file

@ -933,7 +933,7 @@
<location filename="../../src/dialogs/dialogincrements.ui" line="163"/> <location filename="../../src/dialogs/dialogincrements.ui" line="163"/>
<location filename="../../src/dialogs/dialogincrements.cpp" line="519"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="519"/>
<location filename="../../src/dialogs/dialogincrements.cpp" line="530"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="530"/>
<source>Denotation</source> <source>Name</source>
<translation>Bezeichnung</translation> <translation>Bezeichnung</translation>
</message> </message>
<message> <message>
@ -1040,7 +1040,7 @@
</message> </message>
<message> <message>
<location filename="../../src/dialogs/dialogincrements.cpp" line="319"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="319"/>
<source>Denotation %1</source> <source>Name %1</source>
<translation>Bezeichnung %1</translation> <translation>Bezeichnung %1</translation>
</message> </message>
<message> <message>

4
share/translations/valentina_ru.ts
View file

@ -949,7 +949,7 @@
<location filename="../../src/dialogs/dialogincrements.ui" line="163"/> <location filename="../../src/dialogs/dialogincrements.ui" line="163"/>
<location filename="../../src/dialogs/dialogincrements.cpp" line="519"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="519"/>
<location filename="../../src/dialogs/dialogincrements.cpp" line="530"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="530"/>
<source>Denotation</source> <source>Name</source>
<translation>Обозначение</translation> <translation>Обозначение</translation>
</message> </message>
<message> <message>
@ -1056,7 +1056,7 @@
</message> </message>
<message> <message>
<location filename="../../src/dialogs/dialogincrements.cpp" line="319"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="319"/>
<source>Denotation %1</source> <source>Name %1</source>
<translation>Обозначение %1</translation> <translation>Обозначение %1</translation>
</message> </message>
<message> <message>

4
share/translations/valentina_uk.ts
View file

@ -949,7 +949,7 @@
<location filename="../../src/dialogs/dialogincrements.ui" line="163"/> <location filename="../../src/dialogs/dialogincrements.ui" line="163"/>
<location filename="../../src/dialogs/dialogincrements.cpp" line="519"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="519"/>
<location filename="../../src/dialogs/dialogincrements.cpp" line="530"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="530"/>
<source>Denotation</source> <source>Name</source>
<translation>Позначення</translation> <translation>Позначення</translation>
</message> </message>
<message> <message>
@ -1056,7 +1056,7 @@
</message> </message>
<message> <message>
<location filename="../../src/dialogs/dialogincrements.cpp" line="319"/> <location filename="../../src/dialogs/dialogincrements.cpp" line="319"/>
<source>Denotation %1</source> <source>Name %1</source>
<translation>Позначення %1</translation> <translation>Позначення %1</translation>
</message> </message>
<message> <message>

6
src/dialogs/dialogincrements.cpp
View file

@ -316,7 +316,7 @@ void DialogIncrements::clickedToolButtonAdd()
QString name; QString name;
do do
{ {
name = QString(tr("Denotation %1")).arg(num); name = QString(tr("Name %1")).arg(num);
num++; num++;
} while (data->IncrementTableContains(name)); } while (data->IncrementTableContains(name));
@ -516,7 +516,7 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column )
void DialogIncrements::InitialStandartTable() void DialogIncrements::InitialStandartTable()
{ {
ui->tableWidgetStandart->setSortingEnabled(false); ui->tableWidgetStandart->setSortingEnabled(false);
ui->tableWidgetStandart->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Denotation"))); ui->tableWidgetStandart->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Name")));
ui->tableWidgetStandart->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Calculated value"))); ui->tableWidgetStandart->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Calculated value")));
ui->tableWidgetStandart->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Base value"))); ui->tableWidgetStandart->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Base value")));
ui->tableWidgetStandart->setHorizontalHeaderItem(3, new QTableWidgetItem(tr("In size"))); ui->tableWidgetStandart->setHorizontalHeaderItem(3, new QTableWidgetItem(tr("In size")));
@ -527,7 +527,7 @@ void DialogIncrements::InitialStandartTable()
void DialogIncrements::InitialIncrementTable() void DialogIncrements::InitialIncrementTable()
{ {
ui->tableWidgetIncrement->setSortingEnabled(false); ui->tableWidgetIncrement->setSortingEnabled(false);
ui->tableWidgetIncrement->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Denotation"))); ui->tableWidgetIncrement->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Name")));
ui->tableWidgetIncrement->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Calculated value"))); ui->tableWidgetIncrement->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Calculated value")));
ui->tableWidgetIncrement->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Base value"))); ui->tableWidgetIncrement->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Base value")));
ui->tableWidgetIncrement->setHorizontalHeaderItem(3, new QTableWidgetItem(tr("In size"))); ui->tableWidgetIncrement->setHorizontalHeaderItem(3, new QTableWidgetItem(tr("In size")));

4
src/dialogs/dialogincrements.ui
View file

@ -80,7 +80,7 @@
</attribute> </attribute>
<column> <column>
<property name="text"> <property name="text">
<string>Denotation</string> <string>Name</string>
</property> </property>
</column> </column>
<column> <column>
@ -160,7 +160,7 @@
</attribute> </attribute>
<column> <column>
<property name="text"> <property name="text">
<string>Denotation</string> <string>Name</string>
</property> </property>
</column> </column>
<column> <column>