SVN commit 933438 by coles:
Proof-reading changes, and use of i18n plural form in one case where needed.
M +6 -4 FractionRingWidget.cpp
M +5 -5 exercisecompare.cpp
M +1 -1 exerciseconvert.cpp
M +2 -2 kbruch.kcfg
M +3 -3 mainqtwidget.cpp
--- trunk/KDE/kdeedu/kbruch/src/FractionRingWidget.cpp #933437:933438
@@ -454,10 +454,12 @@
// NOTE: Inserting denominator as %1, as first number is used to determine plural form,
// and in these messages that should be the number next to "...painted parts".
- QString insert1 = i18nc("Inserted as %1 in the message below.",
- "%2 of %1 painted parts.", rLeft.denominator(), rLeft.numerator());
- QString insert2 = i18nc("Inserted as %2 in the message below.",
- "%2 of %1 painted parts.", rRight.denominator(), rRight.numerator());
+ QString insert1 = i18ncp("Inserted as %1 in the message below.",
+ "%2 of 1 painted part.", "%2 of %1 painted parts.",
+ rLeft.denominator(), rLeft.numerator());
+ QString insert2 = i18ncp("Inserted as %2 in the message below.",
+ "%2 of 1 painted part.", "%2 of %1 painted parts.",
+ rRight.denominator(), rRight.numerator());
QString msg = i18nc("%1 and %2 are the two messages translated above.",
"The outside ring represents the left fraction. %1\n\n"
"The inside ring represents the right fraction. %2\n\n"
--- trunk/KDE/kdeedu/kbruch/src/exercisecompare.cpp #933437:933438
@@ -100,7 +100,7 @@
m_moreButton->setFixedSize(74,30);
m_moreButton->setFont(defaultFont);
QObject::connect(m_moreButton, SIGNAL(clicked()), this, SLOT(slotMoreButtonClicked()));
- m_moreButton->setToolTip(i18n("Click on this button to select the more sign."));
+ m_moreButton->setToolTip(i18n("Click on this button to select the 'greater than' sign."));
taskLayout->addWidget(m_moreButton, 1, 2);
m_minorButton = new QPushButton(taskWidget);
@@ -109,7 +109,7 @@
m_minorButton->setFixedSize(74,30);
m_minorButton->setFont(defaultFont);
QObject::connect(m_minorButton, SIGNAL(clicked()), this, SLOT(slotMinorButtonClicked()));
- m_minorButton->setToolTip(i18n("Click on this button to select the minor sign."));
+ m_minorButton->setToolTip(i18n("Click on this button to select the 'less than' sign."));
taskLayout->addWidget(m_minorButton, 2, 2);
m_equalButton = new QPushButton(taskWidget);
@@ -118,7 +118,7 @@
m_equalButton->setFixedSize(74,30);
m_equalButton->setFont(defaultFont);
QObject::connect(m_equalButton, SIGNAL(clicked()), this, SLOT(slotEqualButtonClicked()));
- m_equalButton->setToolTip(i18n("Click on this button to select the equal sign."));
+ m_equalButton->setToolTip(i18n("Click on this button to select the 'equals' sign."));
taskLayout->addWidget(m_equalButton, 3, 2);
// Create Skip and Check buttons
@@ -146,8 +146,8 @@
checkWidget->setLayout(checkLayout);
// add tooltip and qwhatsthis help to the widget
- setToolTip(i18n("In this exercise you have to compare 2 given fractions."));
- setWhatsThis( i18n("In this exercise you have to compare 2 given fractions by choosing the correct comparison sign."));
+ setToolTip(i18n("In this exercise you have to compare two given fractions."));
+ setWhatsThis( i18n("In this exercise you have to compare two given fractions and choose the correct comparison sign."));
// that the user can start typing without moving the focus
m_equalButton->setFocus();
--- trunk/KDE/kdeedu/kbruch/src/exerciseconvert.cpp #933437:933438
@@ -163,7 +163,7 @@
// add tooltip and qwhatsthis help to the widget
setToolTip(i18n("In this exercise you have to convert a number into a fraction."));
- setWhatsThis( i18n("In this exercise you have to convert a given number into a fraction by entering numerator and denominator. Do not forget to reduce the result."));
+ setWhatsThis( i18n("In this exercise you have to convert a given number into a fraction by entering a numerator and denominator. Do not forget to reduce the result."));
}
/* destructor */
--- trunk/KDE/kdeedu/kbruch/src/kbruch.kcfg #933437:933438
@@ -62,12 +62,12 @@
- Set if the fractions will need answer in mixed form or not on solution.
+ Set if the fractions will need answers in mixed form or not on solution.true
- Set if the fractions will appear in mixed form or not on solution.
+ Set if the fractions will appear in mixed form or not in questions.true
--- trunk/KDE/kdeedu/kbruch/src/mainqtwidget.cpp #933437:933438
@@ -182,7 +182,7 @@
m_OptionsLabel->setFont(defaultFont);
m_QuestionMixedLabel = new QLabel(i18n("Mixed number:"), pageOptions);
- m_QuestionMixedLabel->setToolTip(i18n("Set if the fractions will appear in mixed number or not in the question expression ( mixed number example: 1 5/4 = 9/4 )."));
+ m_QuestionMixedLabel->setToolTip(i18n("Set if the fractions will appear as mixed numbers or not in the question expression (mixed number example: 1 5/4 = 9/4 )."));
m_QuestionMixedLabel->setObjectName("QuestionMixedLabel");
m_QuestionMixedLabel->setAlignment(Qt::AlignRight);
@@ -193,7 +193,7 @@
QObject::connect(m_QuestionMixedCheck, SIGNAL(stateChanged(int)), this, SLOT(QuestionMixedCheckSlot()));
m_AnswerMixedLabel = new QLabel(i18n("Mixed number:"), pageOptions);
- m_AnswerMixedLabel->setToolTip(i18n("Set if the fractions will appear in mixed number or not in the answer ( mixed number example: 1 5/4 = 9/4 )."));
+ m_AnswerMixedLabel->setToolTip(i18n("Set if the fractions will appear as mixed numbers or not in the answer (mixed number example: 1 5/4 = 9/4 )."));
m_AnswerMixedLabel->setObjectName("AnswerMixedLabel");
m_AnswerMixedLabel->setAlignment(Qt::AlignRight);
@@ -204,7 +204,7 @@
QObject::connect(m_AnswerMixedCheck, SIGNAL(stateChanged(int)), this, SLOT(AnswerMixedCheckSlot()));
m_SolutionMixedLabel = new QLabel(i18n("Mixed number:"), pageOptions);
- m_SolutionMixedLabel->setToolTip(i18n("Set if the fractions will appear in mixed number or not in the solution ( mixed number example: 1 5/4 = 9/4 )."));
+ m_SolutionMixedLabel->setToolTip(i18n("Set if the fractions will appear as mixed numbers or not in the solution (mixed number example: 1 5/4 = 9/4 )."));
m_SolutionMixedLabel->setObjectName("SolutionMixedLabel");
m_SolutionMixedLabel->setAlignment(Qt::AlignRight);