# # # patch "src/GuitoneDriver.cpp" # from [9570f67e85087c5ee44715b87e0ea41ba46ab265] # to [c2abbc62e7bb776894ccc438b3ac6b44c425bbf3] # # patch "src/monotone/MonotoneHandle.cpp" # from [db0571759f09af119d85fe03baef6727a8122cab] # to [8cbe6f6edabb580809be75273edf9c073fbabb26] # ============================================================ --- src/GuitoneDriver.cpp 9570f67e85087c5ee44715b87e0ea41ba46ab265 +++ src/GuitoneDriver.cpp c2abbc62e7bb776894ccc438b3ac6b44c425bbf3 @@ -72,7 +72,7 @@ void GuitoneDriver::processCommands() catch (GuitoneException & e) { msg( - QString("path '%1' could not be loaded: %2") + QString("Path / URI '%1' could not be loaded: %2") .arg(path).arg(e.what()) ); QCoreApplication::exit(1); ============================================================ --- src/monotone/MonotoneHandle.cpp db0571759f09af119d85fe03baef6727a8122cab +++ src/monotone/MonotoneHandle.cpp 8cbe6f6edabb580809be75273edf9c073fbabb26 @@ -161,14 +161,15 @@ void MonotoneHandle::validatePrivateKey( if (possibleKeys.size() == 0) { throw GuitoneException( - QObject::tr("no private key for fragment '%1' found").arg(keyFragment) + QObject::tr("no private key for key fragment '%1' found") + .arg(keyFragment) ); } if (possibleKeys.size() > 1) { throw GuitoneException( - QObject::tr("multiple private keys for fragment '%1' found:\n\t%2") + QObject::tr("multiple private keys for key fragment '%1' found:\n\t%2") .arg(keyFragment) .arg(QStringList(possibleKeys.values()).join("\n\t")) );