aw/valentina
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++); optionsIndex.insert(LONG_OPTION_SHIFTLENGTH, index++);
options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_SHIFTLENGTH << LONG_OPTION_SHIFTLENGTH, options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_SHIFTLENGTH << LONG_OPTION_SHIFTLENGTH,
translate("VCommandLine", "Shift layout length measured in layout units " translate("VCommandLine", "Shift/Offset layout length measured in layout "
"(export mode). The option show how many points along edge will " "units (export mode). The option show how many points along edge "
"be used in creating a layout."), "will be used in creating a layout."),
translate("VCommandLine", "Shift length"))); translate("VCommandLine", "Shift/Offset length")));
optionsIndex.insert(LONG_OPTION_GAPWIDTH, index++); optionsIndex.insert(LONG_OPTION_GAPWIDTH, index++);
options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_GAPWIDTH << LONG_OPTION_GAPWIDTH, options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_GAPWIDTH << LONG_OPTION_GAPWIDTH,
@ -288,7 +288,8 @@ VLayoutGeneratorPtr VCommandLine::DefaultGenerator() const
if ((a || b) && !(a && b)) 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); 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())); const QString unit = qvariant_cast<QString>(this->unitCombo->itemData(this->unitCombo->currentIndex()));
settings->SetUnit(unit); settings->SetUnit(unit);
this->unitChanged = false; 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); QMessageBox::information(this, QApplication::applicationName(), text);
} }
if (labelLangChanged) if (labelLangChanged)
@ -333,7 +334,7 @@ QGroupBox *ConfigurationPage::SendGroup()
sendReportCheck = new QCheckBox(tr("Send crash reports (recommended)")); sendReportCheck = new QCheckBox(tr("Send crash reports (recommended)"));
sendReportCheck->setChecked(qApp->ValentinaSettings()->GetSendReportState()); 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 " "problem. We do not collect any personal information. Find more about what "
"<a href=\"https://bitbucket.org/dismine/valentina/wiki/manual/" "<a href=\"https://bitbucket.org/dismine/valentina/wiki/manual/"
"Crash_reports\">kind of information</a> we collect.")); "Crash_reports\">kind of information</a> we collect."));
@ -475,7 +476,7 @@ void ConfigurationPage::RetranslateUi()
sendGroup->setTitle(tr("Send crash reports")); sendGroup->setTitle(tr("Send crash reports"));
sendReportCheck->setText(tr("Send crash reports (recommended)")); 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 " "problem. We do not collect any personal information. Find more about what "
"<a href=\"https://bitbucket.org/dismine/valentina/wiki/manual/" "<a href=\"https://bitbucket.org/dismine/valentina/wiki/manual/"
"Crash_reports\">kind of information</a> we collect.")); "Crash_reports\">kind of information</a> we collect."));

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

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

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

@ -294,7 +294,7 @@
<item row="4" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="checkBox_Apply_Changes"> <widget class="QCheckBox" name="checkBox_Apply_Changes">
<property name="text"> <property name="text">
<string>Immediate apply</string> <string>Immediately apply</string>
</property> </property>
<property name="tristate"> <property name="tristate">
<bool>false</bool> <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->actionAbout_Valentina, &QAction::triggered, this, &MainWindow::About);
connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close); connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close);
connect(ui->actionPreferences, &QAction::triggered, this, &MainWindow::Preferences); 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->actionOnlineHelp, &QAction::triggered, this, &MainWindow::OnlineHelp);
connect(ui->actionLast_tool, &QAction::triggered, this, &MainWindow::LastUsedTool); connect(ui->actionLast_tool, &QAction::triggered, this, &MainWindow::LastUsedTool);
connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties); connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties);

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

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

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

@ -29,7 +29,7 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <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>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>