┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dolphin_columnmodesettings.kcfg2
-rw-r--r--src/dolphin_detailsmodesettings.kcfg2
-rw-r--r--src/dolphin_iconsmodesettings.kcfg2
-rw-r--r--src/dolphincontextmenu.cpp2
-rw-r--r--src/dolphinfontrequester.cpp2
-rw-r--r--src/dolphinmainwindow.cpp6
-rw-r--r--src/dolphinmodel.cpp30
-rw-r--r--src/dolphinsettingsdialog.cpp2
-rw-r--r--src/dolphinview.cpp4
-rw-r--r--src/dolphinviewactionhandler.cpp2
-rw-r--r--src/generalsettingspage.cpp2
-rw-r--r--src/generalviewsettingspage.cpp4
-rw-r--r--src/metatextlabel.cpp2
-rw-r--r--src/startupsettingspage.cpp2
-rw-r--r--src/statusbarspaceinfo.cpp2
-rw-r--r--src/viewpropertiesdialog.cpp4
-rw-r--r--src/viewsettingspage.cpp2
17 files changed, 36 insertions, 36 deletions
diff --git a/src/dolphin_columnmodesettings.kcfg b/src/dolphin_columnmodesettings.kcfg
index abb35344a..6b4482817 100644
--- a/src/dolphin_columnmodesettings.kcfg
+++ b/src/dolphin_columnmodesettings.kcfg
@@ -18,7 +18,7 @@
<default code="true">KGlobalSettings::generalFont().pointSize()</default>
</entry>
<entry name="ItalicFont" type="Bool">
- <label context="@label">Italic</label>
+ <label context="@label Font style">Italic</label>
<default>false</default>
</entry>
<entry name="FontWeight" type="Int">
diff --git a/src/dolphin_detailsmodesettings.kcfg b/src/dolphin_detailsmodesettings.kcfg
index 3e0628af4..2a3d2b373 100644
--- a/src/dolphin_detailsmodesettings.kcfg
+++ b/src/dolphin_detailsmodesettings.kcfg
@@ -18,7 +18,7 @@
<default code="true">KGlobalSettings::generalFont().pointSize()</default>
</entry>
<entry name="ItalicFont" type="Bool">
- <label context="@label">Italic</label>
+ <label context="@label Font style">Italic</label>
<default>false</default>
</entry>
<entry name="FontWeight" type="Int">
diff --git a/src/dolphin_iconsmodesettings.kcfg b/src/dolphin_iconsmodesettings.kcfg
index c49f25bcc..1311f6d20 100644
--- a/src/dolphin_iconsmodesettings.kcfg
+++ b/src/dolphin_iconsmodesettings.kcfg
@@ -23,7 +23,7 @@
<default code="true">KGlobalSettings::generalFont().pointSize()</default>
</entry>
<entry name="ItalicFont" type="Bool">
- <label context="@label">Italic</label>
+ <label context="@label Font style">Italic</label>
<default>false</default>
</entry>
<entry name="FontWeight" type="Int">
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 2dcb916a5..008212bea 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -130,7 +130,7 @@ void DolphinContextMenu::openTrashContextMenu()
} else if (action == addToPlacesAction) {
const KUrl& url = m_mainWindow->activeViewContainer()->url();
if (url.isValid()) {
- DolphinSettings::instance().placesModel()->addPlace(i18n("Trash"), url);
+ DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url);
}
}
diff --git a/src/dolphinfontrequester.cpp b/src/dolphinfontrequester.cpp
index 5295ed939..8e27851e2 100644
--- a/src/dolphinfontrequester.cpp
+++ b/src/dolphinfontrequester.cpp
@@ -40,7 +40,7 @@ DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
connect(m_modeCombo, SIGNAL(activated(int)),
this, SLOT(changeMode(int)));
- m_chooseFontButton = new QPushButton(i18n("Choose..."), this);
+ m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this);
connect(m_chooseFontButton, SIGNAL(clicked()),
this, SLOT(openFontDialog()));
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 69da1b94f..e91e8afec 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -714,7 +714,7 @@ void DolphinMainWindow::setupActions()
// setup 'File' menu
m_newMenu = new DolphinNewMenu(this);
KMenu* menu = m_newMenu->menu();
- menu->setTitle(i18nc("@title:menu", "Create New"));
+ menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
menu->setIcon(KIcon("document-new"));
connect(menu, SIGNAL(aboutToShow()),
this, SLOT(updateNewMenu()));
@@ -867,7 +867,7 @@ void DolphinMainWindow::setupDockWidgets()
// setup "Terminal"
#ifndef Q_OS_WIN
- QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal"));
+ QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
terminalDock->setObjectName("terminalDock");
terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
@@ -875,7 +875,7 @@ void DolphinMainWindow::setupDockWidgets()
connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
- terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
+ terminalDock->toggleViewAction()->setText(i18nc("@title:window Shell terminal", "Terminal"));
terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 1022aeeb6..eab1204bf 100644
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -218,7 +218,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
switch (modifiedDate.daysTo(currentDate)) {
case 0: retString = i18nc("@title:group Date", "Today"); break;
case 1: retString = i18nc("@title:group Date", "Yesterday"); break;
- default: retString = modifiedTime.toString(i18nc("Prints out the week day name: %A", "%A"));
+ default: retString = modifiedTime.toString(i18nc("@title:group The week day name: %A", "%A"));
}
break;
case 1:
@@ -237,7 +237,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
Q_ASSERT(false);
}
} else {
- retString = modifiedTime.toString(i18nc("Prints out the month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
+ retString = modifiedTime.toString(i18nc("@title:group The month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
}
break;
}
@@ -251,41 +251,41 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
// set user string
if (info.permission(QFile::ReadUser)) {
- user = i18n("Read, ");
+ user = i18nc("@item:intext Access permission, concatenated", "Read, ");
}
if (info.permission(QFile::WriteUser)) {
- user += i18n("Write, ");
+ user += i18nc("@item:intext Access permission, concatenated", "Write, ");
}
if (info.permission(QFile::ExeUser)) {
- user += i18n("Execute, ");
+ user += i18nc("@item:intext Access permission, concatenated", "Execute, ");
}
- user = user.isEmpty() ? i18n("Forbidden") : user.mid(0, user.count() - 2);
+ user = user.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : user.mid(0, user.count() - 2);
// set group string
if (info.permission(QFile::ReadGroup)) {
- group = i18n("Read, ");
+ group = i18nc("@item:intext Access permission, concatenated", "Read, ");
}
if (info.permission(QFile::WriteGroup)) {
- group += i18n("Write, ");
+ group += i18nc("@item:intext Access permission, concatenated", "Write, ");
}
if (info.permission(QFile::ExeGroup)) {
- group += i18n("Execute, ");
+ group += i18nc("@item:intext Access permission, concatenated", "Execute, ");
}
- group = group.isEmpty() ? i18n("Forbidden") : group.mid(0, group.count() - 2);
+ group = group.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : group.mid(0, group.count() - 2);
// set permission string
if (info.permission(QFile::ReadOther)) {
- others = i18n("Read, ");
+ others = i18nc("@item:intext Access permission, concatenated", "Read, ");
}
if (info.permission(QFile::WriteOther)) {
- others += i18n("Write, ");
+ others += i18nc("@item:intext Access permission, concatenated", "Write, ");
}
if (info.permission(QFile::ExeOther)) {
- others += i18n("Execute, ");
+ others += i18nc("@item:intext Access permission, concatenated", "Execute, ");
}
- others = others.isEmpty() ? i18n("Forbidden") : others.mid(0, others.count() - 2);
+ others = others.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : others.mid(0, others.count() - 2);
- retString = i18nc("This shows files and folders permissions: user, group and others", "(User: %1) (Group: %2) (Others: %3)", user, group, others);
+ retString = i18nc("@title:group Files and folders by permissions", "(User: %1) (Group: %2) (Others: %3)", user, group, others);
break;
}
diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index d3f387aa9..8aa86df24 100644
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -57,7 +57,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage,
- i18nc("@title:group", "General"));
+ i18nc("@title:group General settings", "General"));
generalSettingsFrame->setIcon(KIcon("system-run"));
const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 9887b9628..257809b67 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1121,8 +1121,8 @@ void DolphinView::paste()
int result = KMessageBox::questionYesNo(window(),
text,
i18nc("@title:window", "Paste into Folder"),
- KGuiItem(i18nc("@label", "Paste"), "dialog-ok"),
- KGuiItem(i18nc("@label", "Cancel"), "dialog-cancel"));
+ KGuiItem(i18nc("@action:button", "Paste"), "dialog-ok"),
+ KGuiItem(i18nc("@action:button", "Cancel"), "dialog-cancel"));
if (result == KMessageBox::No) {
return;
}
diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 87facace1..f382a10c1 100644
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -68,7 +68,7 @@ void DolphinViewActionHandler::createActions()
// This action doesn't appear in the GUI, it's for the shortcut only.
// KNewMenu takes care of the GUI stuff.
KAction* newDirAction = m_actionCollection->addAction("create_dir");
- newDirAction->setText(i18n("Create Folder..."));
+ newDirAction->setText(i18nc("@action", "Create Folder..."));
newDirAction->setShortcut(Qt::Key_F10);
connect(newDirAction, SIGNAL(triggered()), SLOT(slotCreateDir()));
diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 04863c037..2b582e800 100644
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -62,7 +62,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
// create 'Show the command 'Delete' in context menu' checkbox
m_showDeleteCommand = new QCheckBox(i18nc("@option:check", "Show 'Delete' command in context menu"), vBox);
- m_browseThroughArchives = new QCheckBox(i18nc("option:check", "Browse through archives"), vBox);
+ m_browseThroughArchives = new QCheckBox(i18nc("@option:check", "Browse through archives"), vBox);
// Add a dummy widget with no restriction regarding
// a vertical resizing. This assures that the dialog layout
diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index ebf235f2a..ed219db05 100644
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -82,13 +82,13 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
connect(m_spinBox, SIGNAL(valueChanged(int)),
m_maxPreviewSize, SLOT(setValue(int)));
- m_useFileThumbnails = new QCheckBox(i18n("Use thumbnails embedded in files"), previewBox);
+ m_useFileThumbnails = new QCheckBox(i18nc("@option:check", "Use thumbnails embedded in files"), previewBox);
QVBoxLayout* previewBoxLayout = new QVBoxLayout(previewBox);
previewBoxLayout->addWidget(vBox);
previewBoxLayout->addWidget(m_useFileThumbnails);
- m_showSelectionToggle = new QCheckBox(i18nc("option:check", "Show selection toggle"), this);
+ m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection toggle"), this);
// Add a dummy widget with no restriction regarding
// a vertical resizing. This assures that the dialog layout
diff --git a/src/metatextlabel.cpp b/src/metatextlabel.cpp
index eb8a2873c..594c408fc 100644
--- a/src/metatextlabel.cpp
+++ b/src/metatextlabel.cpp
@@ -27,7 +27,7 @@
#include <QLabel>
MetaTextLabel::MetaTextLabel(QWidget* parent) :
- QGroupBox(i18nc("@title:group", "General"), parent),
+ QGroupBox(i18nc("@title:group General metadata", "General"), parent),
m_lines(0),
m_layout(0)
{
diff --git a/src/startupsettingspage.cpp b/src/startupsettingspage.cpp
index d056c91a6..5d85b33d0 100644
--- a/src/startupsettingspage.cpp
+++ b/src/startupsettingspage.cpp
@@ -108,7 +108,7 @@ void StartupSettingsPage::applySettings()
if (url.isValid() && fileItem.isDir()) {
settings->setHomeUrl(url.prettyUrl());
} else {
- KMessageBox::error(this, i18n("The location for the home folder is invalid and will not get applied."));
+ KMessageBox::error(this, i18nc("@info", "The location for the home folder is invalid and will not get applied."));
}
settings->setSplitView(m_splitView->isChecked());
diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 3a2f77aef..8da3dc947 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -72,7 +72,7 @@ void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) ||
(kBAvailable != static_cast<quint64>(maximum()));
if (valuesChanged) {
- m_text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(kBAvailable));
+ m_text = i18nc("@info:status Free disk space", "%1 free", KIO::convertSizeFromKiB(kBAvailable));
setMaximum(kBSize);
setValue(kBUsed);
}
diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 844a2ecf9..c1c987227 100644
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -101,8 +101,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
QWidget* sortingBox = new QWidget(propsGrid);
m_sortOrder = new QComboBox(sortingBox);
- m_sortOrder->addItem(i18nc("@item:inlistbox", "Ascending"));
- m_sortOrder->addItem(i18nc("@item:inlistbox", "Descending"));
+ m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending"));
+ m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));
m_sorting = new QComboBox(sortingBox);
m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name"));
diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 5f5117dae..1b99bc621 100644
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -50,7 +50,7 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
// initialize 'General' tab
m_generalPage = new GeneralViewSettingsPage(mainWindow, tabWidget);
- tabWidget->addTab(m_generalPage, KIcon("view-choose"), i18nc("@title:tab", "General"));
+ tabWidget->addTab(m_generalPage, KIcon("view-choose"), i18nc("@title:tab General settings", "General"));
// initialize 'Icons' tab
m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);