Commit d3eddd32 authored by Leena Miettinen's avatar Leena Miettinen
Browse files

UI text: fixed FakeVim messages



Fixed capitalization and punctualization.

Change-Id: Ib99f8a8cef9f1b92789531aa46e964e0828eaea1
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
Reviewed-by: default avatarLukas Holecek <hluk@email.cz>
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
parent 6c031216
......@@ -808,7 +808,7 @@ static bool startsWithWhitespace(const QString &str, int col)
inline QString msgMarkNotSet(const QString &text)
{
return FakeVimHandler::tr("Mark '%1' not set").arg(text);
return FakeVimHandler::tr("Mark '%1' not set.").arg(text);
}
class Input
......@@ -2381,7 +2381,7 @@ void FakeVimHandler::Private::handleMappedKeys()
}
if (maxMapDepth <= 0) {
showMessage(MessageError, tr("recursive mapping"));
showMessage(MessageError, tr("Recursive mapping"));
g.pendingInput.remove(0, g.currentMap.mapLength() + invalidCount);
} else {
const Inputs &inputs = g.currentMap.inputs();
......@@ -2925,7 +2925,7 @@ void FakeVimHandler::Private::showMessage(MessageLevel level, const QString &msg
void FakeVimHandler::Private::notImplementedYet()
{
qDebug() << "Not implemented in FakeVim";
showMessage(MessageError, FakeVimHandler::tr("Not implemented in FakeVim"));
showMessage(MessageError, FakeVimHandler::tr("Not implemented in FakeVim."));
}
void FakeVimHandler::Private::passShortcuts(bool enable)
......@@ -3524,7 +3524,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input)
finishMovement();
} else if (input.isControl('c')) {
if (isNoVisualMode())
showMessage(MessageInfo, tr("Type Alt-v,Alt-v to quit FakeVim mode"));
showMessage(MessageInfo, tr("Type Alt-v,Alt-v to quit FakeVim mode."));
else
leaveVisualMode();
} else if ((input.is('d') || input.is('x') || input.isKey(Key_Delete))
......@@ -4985,7 +4985,7 @@ bool FakeVimHandler::Private::handleExMoveCommand(const ExCommand &cmd)
int targetLine = lineCode == _("0") ? -1 : parseLineAddress(&lineCode);
if (targetLine >= startLine && targetLine < endLine) {
showMessage(MessageError, FakeVimHandler::tr("Move lines into themselves"));
showMessage(MessageError, FakeVimHandler::tr("Move lines into themselves."));
return true;
}
......@@ -5029,7 +5029,7 @@ bool FakeVimHandler::Private::handleExMoveCommand(const ExCommand &cmd)
setMark(QLatin1Char('>'), lastPosition);
if (lines > 2)
showMessage(MessageInfo, FakeVimHandler::tr("%n lines moved", 0, lines));
showMessage(MessageInfo, FakeVimHandler::tr("%n lines moved.", 0, lines));
return true;
}
......@@ -5109,7 +5109,7 @@ bool FakeVimHandler::Private::handleExWriteCommand(const ExCommand &cmd)
QFile file3(fileName);
file3.open(QIODevice::ReadOnly);
QByteArray ba = file3.readAll();
showMessage(MessageInfo, FakeVimHandler::tr("\"%1\" %2 %3L, %4C written")
showMessage(MessageInfo, FakeVimHandler::tr("\"%1\" %2 %3L, %4C written.")
.arg(fileName).arg(exists ? _(" ") : tr(" [New] "))
.arg(ba.count('\n')).arg(ba.size()));
//if (quitAll)
......@@ -5173,7 +5173,7 @@ bool FakeVimHandler::Private::handleExBangCommand(const ExCommand &cmd) // :!
endEditBlock();
leaveVisualMode();
//qDebug() << "FILTER: " << command;
showMessage(MessageInfo, FakeVimHandler::tr("%n lines filtered", 0,
showMessage(MessageInfo, FakeVimHandler::tr("%n lines filtered.", 0,
text.count(QLatin1Char('\n'))));
}
return true;
......@@ -5450,14 +5450,14 @@ QTextCursor FakeVimHandler::Private::search(const SearchData &sd, int startPos,
}
} else if (showMessages) {
QString msg = sd.forward
? FakeVimHandler::tr("search hit BOTTOM, continuing at TOP")
: FakeVimHandler::tr("search hit TOP, continuing at BOTTOM");
? FakeVimHandler::tr("Search hit BOTTOM, continuing at TOP.")
: FakeVimHandler::tr("Search hit TOP, continuing at BOTTOM.");
showMessage(MessageWarning, msg);
}
} else if (showMessages) {
QString msg = sd.forward
? FakeVimHandler::tr("search hit BOTTOM without match for: %1")
: FakeVimHandler::tr("search hit TOP without match for: %1");
? FakeVimHandler::tr("Search hit BOTTOM without match for: %1")
: FakeVimHandler::tr("Search hit TOP without match for: %1");
showMessage(MessageError, msg.arg(sd.needle));
}
}
......@@ -5555,7 +5555,7 @@ void FakeVimHandler::Private::indentSelectedText(QChar typedChar)
const int lines = endLine - beginLine + 1;
if (lines > 2)
showMessage(MessageInfo, FakeVimHandler::tr("%n lines indented", 0, lines));
showMessage(MessageInfo, FakeVimHandler::tr("%n lines indented.", 0, lines));
}
void FakeVimHandler::Private::indentText(const Range &range, QChar typedChar)
......@@ -5608,7 +5608,7 @@ void FakeVimHandler::Private::shiftRegionRight(int repeat)
const int lines = endLine - beginLine + 1;
if (lines > 2) {
showMessage(MessageInfo,
FakeVimHandler::tr("%n lines %1ed %2 time", 0, lines)
FakeVimHandler::tr("%n lines %1ed %2 time.", 0, lines)
.arg(repeat > 0 ? '>' : '<').arg(qAbs(repeat)));
}
}
......@@ -6088,7 +6088,7 @@ void FakeVimHandler::Private::yankText(const Range &range, int reg)
const int lines = document()->findBlock(range.endPos).blockNumber()
- document()->findBlock(range.beginPos).blockNumber() + 1;
if (lines > 2)
showMessage(MessageInfo, FakeVimHandler::tr("%n lines yanked", 0, lines));
showMessage(MessageInfo, FakeVimHandler::tr("%n lines yanked.", 0, lines));
}
void FakeVimHandler::Private::transformText(const Range &range,
......@@ -6622,8 +6622,8 @@ void FakeVimHandler::Private::undoRedo(bool undo)
stack.pop();
if (current == rev) {
const QString msg = undo ? FakeVimHandler::tr("Already at oldest change")
: FakeVimHandler::tr("Already at newest change");
const QString msg = undo ? FakeVimHandler::tr("Already at oldest change.")
: FakeVimHandler::tr("Already at newest change.");
showMessage(MessageInfo, msg);
return;
}
......
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