┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dolphinmainwindow.cpp11
-rw-r--r--src/dolphinview.cpp4
-rw-r--r--src/dolphinviewcontainer.cpp10
-rw-r--r--src/filterbar.cpp2
-rw-r--r--src/iconsizedialog.cpp8
-rw-r--r--src/statusbarspaceinfo.cpp4
6 files changed, 21 insertions, 18 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 6e1beb6a5..9a4385b13 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -176,17 +176,20 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
QString seq = QKeySequence(Qt::ShiftModifier).toString();
seq.chop(1); // chop superfluous '+'
QAction* moveAction = popup.addAction(KIcon("goto-page"),
- i18nc("@action:inmenu", "&Move Here") + '\t' + seq);
+ i18nc("@action:inmenu",
+ "&Move Here\t<shortcut>%1</shortcut>", seq));
seq = QKeySequence(Qt::ControlModifier).toString();
seq.chop(1);
QAction* copyAction = popup.addAction(KIcon("edit-copy"),
- i18nc("@action:inmenu", "&Copy Here") + '\t' + seq);
+ i18nc("@action:inmenu",
+ "&Copy Here\t<shortcut>%1</shortcut>", seq));
seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
seq.chop(1);
QAction* linkAction = popup.addAction(KIcon("www"),
- i18nc("@action:inmenu", "&Link Here") + '\t' + seq);
+ i18nc("@action:inmenu",
+ "&Link Here\t<shortcut>%1</shortcut>", seq));
popup.addSeparator();
popup.addAction(KIcon("process-stop"), i18nc("@action:inmenu", "Cancel"));
@@ -649,7 +652,7 @@ void DolphinMainWindow::updatePasteAction()
if (!urls.isEmpty()) {
pasteAction->setEnabled(true);
- pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count()));
+ pasteAction->setText(i18ncp("@action:inmenu", "Paste One File", "Paste %1 Files", urls.count()));
} else {
pasteAction->setEnabled(false);
pasteAction->setText(i18nc("@action:inmenu", "Paste"));
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 4895f199c..876e037f5 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -541,9 +541,9 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
if (!url.isValid()) {
const QString location(url.pathOrUrl());
if (location.isEmpty()) {
- emit errorMessage(i18n("The location is empty."));
+ emit errorMessage(i18nc("@info:status", "The location is empty."));
} else {
- emit errorMessage(i18n("The location '%1' is invalid.", location));
+ emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location));
}
return;
}
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 568cba93a..72af5a25b 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -279,10 +279,10 @@ void DolphinViewContainer::updateProgress(int percent)
// not contain another progress information. This means that
// the directory loading progress information has the lowest priority.
const QString progressText(m_statusBar->progressText());
- m_showProgress = progressText.isEmpty() ||
- (progressText == i18n("Loading folder..."));
+ const QString loadingText(i18nc("@status:progress", "Loading folder..."));
+ m_showProgress = progressText.isEmpty() || (progressText == loadingText);
if (m_showProgress) {
- m_statusBar->setProgressText(i18n("Loading folder..."));
+ m_statusBar->setProgressText(loadingText);
m_statusBar->setProgress(0);
}
}
@@ -382,7 +382,7 @@ QString DolphinViewContainer::selectionStatusBarText() const
}
if (folderCount > 0) {
- text = i18np("1 Folder selected", "%1 Folders selected", folderCount);
+ text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
if (fileCount > 0) {
text += ", ";
}
@@ -390,7 +390,7 @@ QString DolphinViewContainer::selectionStatusBarText() const
if (fileCount > 0) {
const QString sizeText(KIO::convertSize(byteSize));
- text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
+ text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
}
return text;
diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 6fc98f6fe..810baabc8 100644
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -55,7 +55,7 @@ FilterBar::FilterBar(QWidget* parent) :
m_close = new QToolButton(this);
m_close->setAutoRaise(true);
m_close->setIcon(KIcon("dialog-close"));
- m_close->setToolTip(i18n("Hide Filter Bar"));
+ m_close->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
hLayout->addWidget(m_close);
hLayout->addSpacing(gap);
diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 4f998ba83..6b406202c 100644
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -63,13 +63,13 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
KHBox* iconSizeHBox = new KHBox(iconSizeBox);
iconSizeHBox->setSpacing(spacing);
- new QLabel(i18nc("@label:slider Size", "Small"), iconSizeHBox);
+ new QLabel(i18nc("@label:inrange Size", "Small"), iconSizeHBox);
m_iconSizeSlider = new QSlider(0, 5, 1, 0, Qt::Horizontal, iconSizeHBox);
m_iconSizeSlider->setValue(sliderValue(settings->iconSize()));
m_iconSizeSlider->setTickmarks(QSlider::TicksBelow);
connect(m_iconSizeSlider, SIGNAL(valueChanged(int)),
this, SLOT(updateIconSize(int)));
- new QLabel(i18nc("@label:slider Size", "Large"), iconSizeHBox);
+ new QLabel(i18nc("@label:inrange Size", "Large"), iconSizeHBox);
m_iconSizeViewer = new PixmapViewer(iconSizeBox, PixmapViewer::SizeTransition);
m_iconSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
@@ -86,13 +86,13 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
KHBox* previewSizeHBox = new KHBox(previewSizeBox);
previewSizeHBox->setSpacing(spacing);
- new QLabel(i18nc("@label:slider Size", "Small"), previewSizeHBox);
+ new QLabel(i18nc("@label:inrange Size", "Small"), previewSizeHBox);
m_previewSizeSlider = new QSlider(0, 5, 1, 0, Qt::Horizontal, previewSizeHBox);
m_previewSizeSlider->setValue(sliderValue(settings->previewSize()));
m_previewSizeSlider->setTickmarks(QSlider::TicksBelow);
connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
this, SLOT(updatePreviewSize(int)));
- new QLabel(i18nc("@label:slider Size", "Large"), previewSizeHBox);
+ new QLabel(i18nc("@label:inrange Size", "Large"), previewSizeHBox);
m_previewSizeViewer = new PixmapViewer(previewSizeBox, PixmapViewer::SizeTransition);
m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index eb546831b..ef65149bd 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -93,10 +93,10 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
}
painter.drawRect(QRect(left, barTop + 2, right, barHeight - 1));
- text = i18n("%1 free", KIO::convertSizeFromKiB(m_kBAvailable));
+ text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(m_kBAvailable));
} else {
if (m_gettingSize) {
- text = i18n("Getting size...");
+ text = i18nc("@info:status", "Getting size...");
} else {
text = QString();
QTimer::singleShot(0, this, SLOT(hide()));