aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed typos.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-01-21 16:20:02 +02:00
parent d3d91cfd67
commit 4333b50559
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/valentina/core/vcmdexport.cpp
View File

@ -224,10 +224,10 @@ void VCommandLine::InitOptions(VCommandLineOptions &options, QMap<QString, int>
optionsIndex.insert(LONG_OPTION_SHIFTLENGTH, index++);
options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_SHIFTLENGTH << LONG_OPTION_SHIFTLENGTH,
translate("VCommandLine", "Shift layout length measured in layout units "
"(export mode). The option show how many points along edge will "
"be used in creating a layout."),
translate("VCommandLine", "Shift length")));
translate("VCommandLine", "Shift/Offset layout length measured in layout "
"units (export mode). The option show how many points along edge "
"will be used in creating a layout."),
translate("VCommandLine", "Shift/Offset length")));
optionsIndex.insert(LONG_OPTION_GAPWIDTH, index++);
options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_GAPWIDTH << LONG_OPTION_GAPWIDTH,
@ -288,7 +288,8 @@ VLayoutGeneratorPtr VCommandLine::DefaultGenerator() const
if ((a || b) && !(a && b))
{
qCritical() << translate("VCommandLine", "Shift length must be used together with shift units.") << "\n";
qCritical() << translate("VCommandLine", "Shift/Offset length must be used together with shift units.")
<< "\n";
const_cast<VCommandLine*>(this)->parser.showHelp(V_EX_USAGE);
}
}

7
src/app/valentina/dialogs/configpages/configurationpage.cpp
View File

@ -131,7 +131,8 @@ void ConfigurationPage::Apply()
const QString unit = qvariant_cast<QString>(this->unitCombo->itemData(this->unitCombo->currentIndex()));
settings->SetUnit(unit);
this->unitChanged = false;
const QString text = tr("Default unit updated and will be used the next pattern creation");
const QString text = tr("The Default unit has been updated and will be used as the default for the next "
"pattern you create.");
QMessageBox::information(this, QApplication::applicationName(), text);
}
if (labelLangChanged)
@ -333,7 +334,7 @@ QGroupBox *ConfigurationPage::SendGroup()
sendReportCheck = new QCheckBox(tr("Send crash reports (recommended)"));
sendReportCheck->setChecked(qApp->ValentinaSettings()->GetSendReportState());
description = new QLabel(tr("After each crash Valentina collect information that may help us fix a "
description = new QLabel(tr("After each crash Valentina collects information that may help us fix the "
"problem. We do not collect any personal information. Find more about what "
"<a href=\"https://bitbucket.org/dismine/valentina/wiki/manual/"
"Crash_reports\">kind of information</a> we collect."));
@ -475,7 +476,7 @@ void ConfigurationPage::RetranslateUi()
sendGroup->setTitle(tr("Send crash reports"));
sendReportCheck->setText(tr("Send crash reports (recommended)"));
description->setText(tr("After each crash Valentina collect information that may help us fix a "
description->setText(tr("After each crash Valentina collects information that may help us fix the "
"problem. We do not collect any personal information. Find more about what "
"<a href=\"https://bitbucket.org/dismine/valentina/wiki/manual/"
"Crash_reports\">kind of information</a> we collect."));

8
src/app/valentina/dialogs/dialoglayoutsettings.ui
View File

@ -281,7 +281,7 @@
<item>
<widget class="QGroupBox" name="groupBoxCreationOptions">
<property name="title">
<string>Creation options</string>
<string>Layout options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
@ -315,7 +315,7 @@
<item row="1" column="0">
<widget class="QLabel" name="labelShiftLength">
<property name="text">
<string>Shift length:</string>
<string>Shift/Offset length:</string>
</property>
</widget>
</item>
@ -520,7 +520,7 @@
<item>
<widget class="QGroupBox" name="groupBoxCase">
<property name="title">
<string>Principle of choosing the next workpiece</string>
<string>Rule for choosing the next workpiece</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
@ -642,7 +642,7 @@
</connection>
</connections>
<buttongroups>
<buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroupPrinciple"/>
<buttongroup name="buttonGroup"/>
</buttongroups>
</ui>

2
src/app/valentina/dialogs/dialogpatternxmledit.ui
View File

@ -294,7 +294,7 @@
<item row="4" column="0">
<widget class="QCheckBox" name="checkBox_Apply_Changes">
<property name="text">
<string>Immediate apply</string>
<string>Immediately apply</string>
</property>
<property name="tristate">
<bool>false</bool>

2
src/app/valentina/mainwindow.cpp
View File

@ -3332,7 +3332,7 @@ void MainWindow::CreateActions()
connect(ui->actionAbout_Valentina, &QAction::triggered, this, &MainWindow::About);
connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close);
connect(ui->actionPreferences, &QAction::triggered, this, &MainWindow::Preferences);
connect(ui->actionRepotBug, &QAction::triggered, this, &MainWindow::RepotBug);
connect(ui->actionReportBug, &QAction::triggered, this, &MainWindow::RepotBug);
connect(ui->actionOnlineHelp, &QAction::triggered, this, &MainWindow::OnlineHelp);
connect(ui->actionLast_tool, &QAction::triggered, this, &MainWindow::LastUsedTool);
connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties);

18
src/app/valentina/mainwindow.ui
View File

@ -375,7 +375,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>130</width>
<width>100</width>
<height>58</height>
</rect>
</property>
@ -461,7 +461,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>130</width>
<width>100</width>
<height>156</height>
</rect>
</property>
@ -625,7 +625,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>130</width>
<width>100</width>
<height>196</height>
</rect>
</property>
@ -867,7 +867,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>130</width>
<width>100</width>
<height>58</height>
</rect>
</property>
@ -953,8 +953,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>130</width>
<height>386</height>
<width>98</width>
<height>58</height>
</rect>
</property>
<attribute name="icon">
@ -1066,7 +1066,7 @@
<string>&amp;Help</string>
</property>
<addaction name="actionOnlineHelp"/>
<addaction name="actionRepotBug"/>
<addaction name="actionReportBug"/>
<addaction name="actionAbout_Qt"/>
<addaction name="actionAbout_Valentina"/>
</widget>
@ -1800,9 +1800,9 @@
<string notr="true"/>
</property>
</action>
<action name="actionRepotBug">
<action name="actionReportBug">
<property name="text">
<string>Repot Bug...</string>
<string>Report Bug...</string>
</property>
<property name="toolTip">
<string>Report bug</string>

2
src/libs/vtools/dialogs/support/dialogundo.ui
View File

@ -29,7 +29,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Error while calculation formula. You can try undo last operation or fix broken formula.</string>
<string>Error while calculation formula. You can try to undo last operation or fix broken formula.</string>
</property>
<property name="wordWrap">
<bool>true</bool>