From 7dd051ecce50bfc6331bcbb809d0fd0faf670d30 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Wed, 1 Aug 2012 15:34:35 +0200
Subject: [PATCH] Fixes in translated strings
Change-Id: I4b554d925102fcd7c503276c1e085e8f438b0e3c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
src/libs/zeroconf/servicebrowser.cpp | 5 +++--
src/plugins/android/androidcreatekeystorecertificate.ui | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/libs/zeroconf/servicebrowser.cpp b/src/libs/zeroconf/servicebrowser.cpp
index 4e3c04bd778..fff6069df32 100644
--- a/src/libs/zeroconf/servicebrowser.cpp
+++ b/src/libs/zeroconf/servicebrowser.cpp
@@ -1951,8 +1951,9 @@ void MainConnection::handleEvents()
QString browsersNames = (m_browsers.isEmpty() ? QString() : m_browsers.at(0)->serviceType)
+ ((m_browsers.count() > 1) ? QString::fromLatin1(",...") : QString());
if (isOk())
- appendError(ErrorMessage::FailureLevel, tr("Zeroconf for [%1] accumulated %2 consecutive errors, aborting.")
- .arg(browsersNames).arg(m_nErrs));
+ appendError(ErrorMessage::FailureLevel,
+ tr("Zeroconf for [%1] accumulated %n consecutive errors, aborting.", 0, m_nErrs)
+ .arg(browsersNames));
}
increaseStatusTo(Stopped);
}
diff --git a/src/plugins/android/androidcreatekeystorecertificate.ui b/src/plugins/android/androidcreatekeystorecertificate.ui
index ab92627dc79..553cdba0f66 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.ui
+++ b/src/plugins/android/androidcreatekeystorecertificate.ui
@@ -203,7 +203,7 @@
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
- <string>Certificate Distinguished Names</string>
+ <string>Certificate Distinguished Names</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
--
GitLab