Commit 09498c59 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Fixed further translation glitches.

parent 9a79a069
......@@ -96,8 +96,8 @@ QDebug operator<<(QDebug dgb, const WelcomeMode::WelcomePageData &d)
return dgb;
}
// Format a title + ruler for projects/session labels
static inline QString devTitleLabel(const QString &text)
// Format a title + ruler for title labels
static inline QString titleLabel(const QString &text)
{
QString rc = QLatin1String(
"<html><head><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head>"
......@@ -121,8 +121,13 @@ WelcomeMode::WelcomeMode() :
m_d->rssFetcher = new RSSFetcher(8, this);
m_d->m_welcomePage = new QWidget(m_d->m_widget);
m_d->ui.setupUi(m_d->m_welcomePage);
m_d->ui.projTitleLabel->setText(devTitleLabel(tr("Projects")));
m_d->ui.titleLabel->setText(devTitleLabel(tr("Sessions")));
m_d->ui.projTitleLabel->setText(titleLabel(tr("Projects")));
m_d->ui.recentSessionsTitleLabel->setText(titleLabel(tr("Sessions")));
m_d->ui.tutorialsTitleLabel->setText(titleLabel(tr("Tutorials")));
m_d->ui.demoTitleLabel->setText(titleLabel(tr("Qt Demos and Examples")));
m_d->ui.didYouKnowTitleLabel->setText(titleLabel(tr("Did you know?")));
m_d->ui.labsTitleLabel->setText(titleLabel(tr("News from the Qt Labs")));
m_d->ui.sitesTitleLabel->setText(titleLabel(tr("Qt Websites")));
m_d->ui.sessTreeWidget->viewport()->setAutoFillBackground(false);
m_d->ui.projTreeWidget->viewport()->setAutoFillBackground(false);
m_d->ui.newsTreeWidget->viewport()->setAutoFillBackground(false);
......
......@@ -202,7 +202,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>1</number>
<number>2</number>
</property>
<widget class="QWidget" name="gettingStartedPage">
<layout class="QGridLayout" name="gridLayout_9">
......@@ -213,7 +213,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
<number>24</number>
</property>
<item row="0" column="0" rowspan="2">
<widget class="QFrame" name="recentProjectsFrame_2">
<widget class="QFrame" name="tutorialsFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
......@@ -231,15 +231,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QLabel" name="projTitleLabel_2">
<property name="text">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:x-large; color:#555555;&quot;&gt;Tutorials&lt;/span&gt;&lt;/p&gt;
&lt;hr /&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<widget class="QLabel" name="tutorialsTitleLabel">
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
......@@ -302,7 +294,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="0" column="1">
<widget class="QFrame" name="recentProjectsFrame_4">
<widget class="QFrame" name="demosExamplesFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
......@@ -320,15 +312,7 @@ p, li { white-space: pre-wrap; }
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="projTitleLabel_4">
<property name="text">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:x-large; color:#555555;&quot;&gt;Qt Demos and Examples&lt;/span&gt;&lt;/p&gt;
&lt;hr /&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<widget class="QLabel" name="demoTitleLabel">
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
......@@ -361,7 +345,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="1" column="1">
<widget class="QFrame" name="recentProjectsFrame_3">
<widget class="QFrame" name="didyouKnowFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
......@@ -379,21 +363,13 @@ p, li { white-space: pre-wrap; }
</property>
<layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="0">
<widget class="QLabel" name="projTitleLabel_3">
<widget class="QLabel" name="didYouKnowTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:x-large; color:#555555;&quot;&gt;Did you know?&lt;/span&gt;&lt;/p&gt;
&lt;hr /&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
......@@ -474,7 +450,7 @@ p, li { white-space: pre-wrap; }
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="titleLabel">
<widget class="QLabel" name="recentSessionsTitleLabel">
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
......@@ -661,7 +637,7 @@ p, li { white-space: pre-wrap; }
<number>24</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame">
<widget class="QFrame" name="labsFrame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
......@@ -670,21 +646,13 @@ p, li { white-space: pre-wrap; }
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="titleLabel_2">
<widget class="QLabel" name="labsTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:x-large; color:#555555;&quot;&gt;News from the Qt Labs&lt;/span&gt;&lt;/p&gt;
&lt;hr /&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
......@@ -747,7 +715,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="0" column="1">
<widget class="QFrame" name="frame_2">
<widget class="QFrame" name="sitesFrame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
......@@ -756,21 +724,13 @@ p, li { white-space: pre-wrap; }
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="titleLabel_3">
<widget class="QLabel" name="sitesTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:x-large; color:#555555;&quot;&gt;Qt Websites&lt;/span&gt;&lt;/p&gt;
&lt;hr /&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
......@@ -908,7 +868,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="2" column="1">
<spacer name="verticalSpacer">
<spacer name="bottomVerticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
......@@ -924,7 +884,7 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item row="0" column="1">
<spacer name="verticalSpacer_2">
<spacer name="topVerticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
......
......@@ -2834,6 +2834,11 @@ bool GdbEngine::hasDebuggingHelperForType(const QString &type) const
return m_dumperHelper.type(type) != QtDumperHelper::UnknownType;
}
static inline QString msgRetrievingWatchData(int pending)
{
return GdbEngine::tr("Retrieving data for watch view (%n requests pending)...", 0, pending);
}
void GdbEngine::runDirectDebuggingHelper(const WatchData &data, bool dumpChildren)
{
Q_UNUSED(dumpChildren);
......@@ -2849,9 +2854,7 @@ void GdbEngine::runDirectDebuggingHelper(const WatchData &data, bool dumpChildre
var.setValue(data);
postCommand(cmd, WatchUpdate, CB(handleDebuggingHelperValue3), var);
q->showStatusMessage(
tr("Retrieving data for watch view (%1 requests pending)...")
.arg(m_pendingRequests + 1), 10000);
q->showStatusMessage(msgRetrievingWatchData(m_pendingRequests + 1), 10000);
}
void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
......@@ -2891,9 +2894,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
var.setValue(data);
postCommand(cmd, WatchUpdate | EmbedToken, CB(handleDebuggingHelperValue1), var);
q->showStatusMessage(
tr("Retrieving data for watch view (%1 requests pending)...")
.arg(m_pendingRequests + 1), 10000);
q->showStatusMessage(msgRetrievingWatchData(m_pendingRequests + 1), 10000);
// retrieve response
postCommand(_("p (char*)&qDumpOutBuffer"), WatchUpdate,
......@@ -3165,8 +3166,7 @@ void GdbEngine::handleQueryDebuggingHelper(const GdbResultRecord &record, const
// );
} else {
m_debuggingHelperState = DebuggingHelperAvailable;
q->showStatusMessage(tr("%1 custom dumpers found.")
.arg(m_dumperHelper.typeCount()));
q->showStatusMessage(tr("%n custom dumpers found.", 0, m_dumperHelper.typeCount()));
}
//qDebug() << m_dumperHelper.toString(true);
//qDebug() << m_availableSimpleDebuggingHelpers << "DATA DUMPERS AVAILABLE";
......@@ -3448,7 +3448,7 @@ void GdbEngine::handleDebuggingHelperValue3(const GdbResultRecord &record,
} else {
int l = list.size();
//: In string list
data.setValue(tr("<%1 items>").arg(l));
data.setValue(tr("<%n items>", 0, l));
data.setChildCount(list.size());
data.setAllUnneeded();
insertData(data);
......
......@@ -525,21 +525,21 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mproject->addMenu(mpo, Constants::G_PROJECT_BUILD);
// build action
m_buildProjectOnlyAction = new QAction(tr("Build Project Only"), this);
m_buildProjectOnlyAction = new QAction(tr("Build"), this);
cmd = am->registerAction(m_buildProjectOnlyAction, Constants::BUILDPROJECTONLY, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_buildProjectOnlyAction->text());
mpo->addAction(cmd);
// rebuild action
m_rebuildProjectOnlyAction = new QAction(tr("Rebuild Project only"), this);
m_rebuildProjectOnlyAction = new QAction(tr("Rebuild"), this);
cmd = am->registerAction(m_rebuildProjectOnlyAction, Constants::REBUILDPROJECTONLY, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_rebuildProjectOnlyAction->text());
mpo->addAction(cmd);
// clean action
m_cleanProjectOnlyAction = new QAction(tr("Clean Project only"), this);
m_cleanProjectOnlyAction = new QAction(tr("Clean"), this);
cmd = am->registerAction(m_cleanProjectOnlyAction, Constants::CLEANPROJECTONLY, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_cleanProjectOnlyAction->text());
......@@ -1276,16 +1276,10 @@ void ProjectExplorerPlugin::updateActions()
m_unloadAction->setEnabled(m_currentProject != 0);
if (m_currentProject == 0) {
m_unloadAction->setText(tr("Close Project"));
m_buildProjectOnlyMenu->setTitle(tr("Project only"));
m_buildProjectOnlyAction->setText(tr("Build Project only"));
m_rebuildProjectOnlyAction->setText(tr("Rebuild Project only"));
m_cleanProjectOnlyAction->setText(tr("Clean Project only"));
m_buildProjectOnlyMenu->setTitle(tr("Current Project"));
} else {
m_unloadAction->setText(tr("Close Project \"%1\"").arg(m_currentProject->name()));
m_buildProjectOnlyMenu->setTitle(tr("Project \"%1\" only").arg(m_currentProject->name()));
m_buildProjectOnlyAction->setText(tr("Build Project \"%1\" only").arg(m_currentProject->name()));
m_rebuildProjectOnlyAction->setText(tr("Rebuild Project \"%1\" only").arg(m_currentProject->name()));
m_cleanProjectOnlyAction->setText(tr("Clean Project \"%1\" only").arg(m_currentProject->name()));
m_buildProjectOnlyMenu->setTitle(tr("Project \"%1\"").arg(m_currentProject->name()));
}
m_buildAction->setEnabled(enableBuildActions);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment