feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes in translated strings

Browse Source 
Change-Id: I4b554d925102fcd7c503276c1e085e8f438b0e3c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Robert Loehning
2012-08-01 15:34:35 +02:00
committed by Friedemann Kleint
parent b9c7456486
commit 7dd051ecce
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/zeroconf/servicebrowser.cpp
View File

@@ -1951,8 +1951,9 @@ void MainConnection::handleEvents()
QString browsersNames = (m_browsers.isEmpty() ? QString() : m_browsers.at(0)->serviceType) QString browsersNames = (m_browsers.isEmpty() ? QString() : m_browsers.at(0)->serviceType)
+ ((m_browsers.count() > 1) ? QString::fromLatin1(",...") : QString()); + ((m_browsers.count() > 1) ? QString::fromLatin1(",...") : QString());
if (isOk()) if (isOk())
appendError(ErrorMessage::FailureLevel, tr("Zeroconf for [%1] accumulated %2 consecutive errors, aborting.") appendError(ErrorMessage::FailureLevel,
.arg(browsersNames).arg(m_nErrs)); tr("Zeroconf for [%1] accumulated %n consecutive errors, aborting.", 0, m_nErrs)
.arg(browsersNames));
} }
increaseStatusTo(Stopped); increaseStatusTo(Stopped);
} }

2
src/plugins/android/androidcreatekeystorecertificate.ui
View File

@@ -203,7 +203,7 @@
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Certificate Distinguished Names</string> <string>Certificate Distinguished Names</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">