X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Faliasesmodel.cpp;h=4d00d375b19ae588a6cf05694a418d8fd35f7b00;hp=ded0600a48bb21d83f2b6c9b0077fdf6318337ee;hb=66c5feaf7c9f480f06dfb45df2cf54e44c8b487b;hpb=6d32c3e6a04a358789c469948d044715d6fb5aed

diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp
index ded0600a..4d00d375 100644
--- a/src/qtui/settingspages/aliasesmodel.cpp
+++ b/src/qtui/settingspages/aliasesmodel.cpp
@@ -52,11 +52,11 @@ QVariant AliasesModel::data(const QModelIndex &index, int role) const {
   case Qt::ToolTipRole:
     switch(index.column()) {
     case 0:
-      return "<b>The shortcut for the alias</b><br />"
+      return tr("<b>The shortcut for the alias</b><br />"
 	"It can be used as a regular slash command.<br /><br />"
-	"<b>Example:</b> \"foo\" can be used per /foo";
+	"<b>Example:</b> \"foo\" can be used per /foo");
     case 1:
-      return "<b>The string the shortcut will be expanded to</b><br />"
+      return tr("<b>The string the shortcut will be expanded to</b><br />"
 	"<b>special variables:</b><br />"
 	" - <b>$i</b> represents the i'th parameter.<br />"
 	" - <b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br />"
@@ -66,7 +66,7 @@ QVariant AliasesModel::data(const QModelIndex &index, int role) const {
 	" - <b>$nick</b> your current nickname<br />"
 	" - <b>$channel</b> the name of the selected channel<br /><br />"
 	"Multiple commands can be separated with semicolons<br /><br />"
-	"<b>Example:</b> \"Test $1; Test $2; Test All $0\" will be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All 1 2 3\" when called like /test 1 2 3";
+	"<b>Example:</b> \"Test $1; Test $2; Test All $0\" will be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All 1 2 3\" when called like /test 1 2 3");
     default:
       return QVariant();
     }
@@ -226,13 +226,13 @@ void AliasesModel::commit() {
 }
 
 void AliasesModel::initDone() {
-  reset();
   _modelReady = true;
+  reset();
   emit modelReady(true);
 }
 
 void AliasesModel::clientConnected() {
-  connect(Client::aliasManager(), SIGNAL(updated(QVariantMap)), SLOT(revert()));
+  connect(Client::aliasManager(), SIGNAL(updated()), SLOT(revert()));
   if(Client::aliasManager()->isInitialized())
     initDone();
   else
@@ -242,7 +242,7 @@ void AliasesModel::clientConnected() {
 void AliasesModel::clientDisconnected() {
   // clear
   _clonedAliasManager = ClientAliasManager();
-  reset();
   _modelReady = false;
+  reset();
   emit modelReady(false);
 }