KUIT adaptions

svn path=/trunk/KDE/kdebase/apps/; revision=685763

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index f60d59298feec5c39c755d2f8d73a7ad671b0d58..140a4568eed8eb2619036c5ebe777e78e882e727 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -101,7 +101,7 @@ void DolphinContextMenu::openTrashContextMenu()
 
     KMenu* popup = new KMenu(m_mainWindow);
 
-    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18n("Empty Trash"), popup);
+    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18nc("@action:inmenu", "Empty Trash"), popup);
     KConfig trashConfig("trashrc", KConfig::OnlyLocal);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     popup->addAction(emptyTrashAction);
@@ -110,11 +110,12 @@ void DolphinContextMenu::openTrashContextMenu()
     popup->addAction(propertiesAction);
 
     if (popup->exec(QCursor::pos()) == emptyTrashAction) {
-        const QString text(i18n("Do you really want to empty the Trash? All items will get deleted."));
+        const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will get deleted."));
         const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
                                                             text,
                                                             QString(),
-                                                            KGuiItem(i18n("Empty Trash"), KIcon("user-trash"))
+                                                            KGuiItem(i18nc("@action:button", "Empty Trash"),
+                                                                     KIcon("user-trash"))
                                                            ) == KMessageBox::Continue;
         if (del) {
             KonqOperations::emptyTrash(m_mainWindow);
@@ -131,7 +132,7 @@ void DolphinContextMenu::openTrashItemContextMenu()
 
     KMenu* popup = new KMenu(m_mainWindow);
 
-    QAction* restoreAction = new QAction(i18n("Restore"), m_mainWindow);
+    QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
     popup->addAction(restoreAction);
 
     QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");
@@ -159,7 +160,8 @@ void DolphinContextMenu::openItemContextMenu()
     // insert 'Bookmark This Folder' entry if exactly one item is selected
     QAction* bookmarkAction = 0;
     if (m_fileInfo->isDir() && (m_selectedUrls.count() == 1)) {
-        bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark Folder..."));
+        bookmarkAction = popup->addAction(KIcon("bookmark-folder"),
+                                          i18nc("@action:inmenu", "Bookmark Folder..."));
     }
 
     // Insert 'Open With...' sub menu
@@ -220,7 +222,7 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->addAction(pasteAction);
 
     // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu(i18n("View Mode"));
+    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"));
 
     QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
     viewModeMenu->addAction(iconsMode);
@@ -238,15 +240,16 @@ void DolphinContextMenu::openViewportContextMenu()
 
     QAction* toggleViewsAction = 0;
     if (m_mainWindow->isSplit()) {
-        toggleViewsAction = popup->addAction(i18n("Toggle Views"));
+        toggleViewsAction = popup->addAction(i18nc("@action:inmenu", "Toggle Views"));
     }
 
     popup->addSeparator();
 
-    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark This Folder..."));
+    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"),
+                                               i18nc("@action:inmenu", "Bookmark This Folder..."));
     popup->addSeparator();
 
-    QAction* propertiesAction = popup->addAction(i18n("Properties"));
+    QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
 
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
@@ -332,7 +335,7 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
                                 "Type == 'Application'");
         if (offers.count() > 0) {
             KService::List::Iterator it;
-            KMenu* openWithMenu = new KMenu(i18n("Open With"));
+            KMenu* openWithMenu = new KMenu(i18nc("@title:menu", "Open With"));
             for (it = offers.begin(); it != offers.end(); ++it) {
                 // The offer list from the KTrader returns duplicate
                 // application entries. Although this seems to be a configuration
@@ -348,7 +351,7 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
             }
 
             openWithMenu->addSeparator();
-            QAction* action = openWithMenu->addAction(i18n("&Other..."));
+            QAction* action = openWithMenu->addAction(i18nc("@action:inmenu Open With", "&Other..."));
 
             openWithActions << action;
             popup->addMenu(openWithMenu);
@@ -356,13 +359,13 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
             // No applications are registered, hence just offer
             // a "Open With..." item instead of a sub menu containing
             // only one entry.
-            QAction* action = popup->addAction(i18n("Open With..."));
+            QAction* action = popup->addAction(i18nc("@title:menu", "Open With..."));
             openWithActions << action;
         }
     } else {
         // At least one of the selected items has a different MIME type. In this case
         // just show a disabled "Open With..." entry.
-        QAction* action = popup->addAction(i18n("Open With..."));
+        QAction* action = popup->addAction(i18nc("@title:menu", "Open With..."));
         action->setEnabled(false);
     }
 
@@ -377,7 +380,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
     // libqonq/konq_operations.h of Konqueror.
     // (Copyright (C) 2000  David Faure <faure@kde.org>)
 
-    KMenu* actionsMenu = new KMenu(i18n("Actions"));
+    KMenu* actionsMenu = new KMenu(i18nc("@title:menu", "Actions"));
 
     QList<QAction*> serviceActions;
 

diff --git a/src/dolphinitemcategorizer.cpp b/src/dolphinitemcategorizer.cpp
index e72edd3006d174c425a71060f722071cbdad3ccb..e51f5f52fcfa520bddb215c52a72f58fb913a91e 100644 (file)
--- a/src/dolphinitemcategorizer.cpp
+++ b/src/dolphinitemcategorizer.cpp
@@ -91,7 +91,7 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
                     retString = data.toString().toUpper().at(1);
                 else if (item->isHidden() && data.toString().at(0) == '.' &&
                          !data.toString().at(1).isLetter())
-                    retString = i18n("Others");
+                    retString = i18nc("@title:group Name", "Others");
                 else if (item->isHidden() && data.toString().at(0) != '.')
                     retString = data.toString().toUpper().at(0);
                 else if (item->isHidden())
@@ -106,13 +106,13 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
                         if (currA->isLetter())
                             validCategory = true;
                         else if (currA->isDigit())
-                            return i18n("Others");
+                            return i18nc("@title:group", "Others");
                         else
                             ++currA;
                     }
 
                     if (!validCategory)
-                        retString = i18n("Others");
+                        retString = i18nc("@title:group Name", "Others");
                     else
                         retString = *currA;
                 }
@@ -127,17 +127,17 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
             modifiedTime = modifiedTime.toLocalZone();
 
             if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 0)
-                retString = i18n("Today");
+                retString = i18nc("@title:group Date", "Today");
             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 1)
-                retString = i18n("Yesterday");
+                retString = i18nc("@title:group Date", "Yesterday");
             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 7)
-                retString = i18n("Less than a week");
+                retString = i18nc("@title:group Date", "Less than a week");
             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 31)
-                retString = i18n("Less than a month");
+                retString = i18nc("@title:group Date", "Less than a month");
             else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 365)
-                retString = i18n("Less than a year");
+                retString = i18nc("@title:group Date", "Less than a year");
             else
-                retString = i18n("More than a year");
+                retString = i18nc("@title:group Date", "More than a year");
             break;
         }
 
@@ -156,13 +156,13 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
         case DolphinView::SortBySize: {
             const int fileSize = item ? item->size() : -1;
             if (item && item->isDir()) {
-                retString = i18n("Folders");
+                retString = i18nc("@title:group Size", "Folders");
             } else if (fileSize < 5242880) {
-                retString = i18nc("Size", "Small");
+                retString = i18nc("@title:group Size", "Small");
             } else if (fileSize < 10485760) {
-                retString = i18nc("Size", "Medium");
+                retString = i18nc("@title:group Size", "Medium");
             } else {
-                retString = i18nc("Size", "Big");
+                retString = i18nc("@title:group Size", "Big");
             }
             break;
         }
@@ -183,7 +183,7 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
             retString = DolphinSortFilterProxyModel::tagsForIndex(index);
 
             if (retString.isEmpty())
-                retString = i18n("Not yet tagged");
+                retString = i18nc("@title:group Tags", "Not yet tagged");
 
             break;
         }

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 998f6b4d26cd3c7a750528c9b20a749893ef97e0..45ac393a7c492ce0153fcc71928bccba7e10e68e 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -37,16 +37,18 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
     setMinimumSize(QSize(512, minSize.height()));
 
     setFaceType(List);
-    setCaption(i18n("Dolphin Preferences"));
+    setCaption(i18nc("@title:window", "Dolphin Preferences"));
     setButtons(Ok | Apply | Cancel | Default);
     setDefaultButton(Ok);
 
     m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
-    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage, i18n("General"));
+    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage,
+                                                    i18nc("@title:group", "General"));
     generalSettingsFrame->setIcon(KIcon("exec"));
 
     m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
-    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes"));
+    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage,
+                                                 i18nc("@title:group", "View Modes"));
     viewSettingsFrame->setIcon(KIcon("view-choose"));
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
@@ -64,7 +66,7 @@ void DolphinSettingsDialog::slotButtonClicked(int button)
     if ((button == Ok) || (button == Apply)) {
         applySettings();
     } else if (button == Default) {
-        const QString text(i18n("All settings will be reset to default values. Do you want to continue?"));
+        const QString text(i18nc("@info", "All settings will be reset to default values. Do you want to continue?"));
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::Yes) {
             restoreDefaults();
         }

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index e0b8381aa5122ce90c519c15622221a2926c7665..4ba0e6b08900c6d2ace647e11cfe9e9d29f3ba01 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -72,10 +72,10 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     KHBox* buttonBox = new KHBox(homeBox);
     buttonBox->setSpacing(spacing);
 
-    QPushButton* useCurrentButton = new QPushButton(i18n("Use Current Location"), buttonBox);
+    QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location"), buttonBox);
     connect(useCurrentButton, SIGNAL(clicked()),
             this, SLOT(useCurrentLocation()));
-    QPushButton* useDefaultButton = new QPushButton(i18n("Use Default Location"), buttonBox);
+    QPushButton* useDefaultButton = new QPushButton(i18nc("@action:button", "Use Default Location"), buttonBox);
     connect(useDefaultButton, SIGNAL(clicked()),
             this, SLOT(useDefaultLocation()));
 

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 6b406202c43abf2addbb3c90e598da8124dffdcb..9fa69330cadcc5456ab49d8fdc21b4e6a6fb69f6 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -49,7 +49,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
 
     const int spacing = KDialog::spacingHint();
 
-    setCaption(i18n("Change Icon & Preview Size"));
+    setCaption(i18nc("@title:window", "Change Icon & Preview Size"));
     setButtons(Ok | Cancel);
     setDefaultButton(Ok);
 

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index d7b7e0a015ca3e85445dc26377a0043087c0c6b3..85c005412ea80903a14676457c49ac6297a74a0e 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -59,7 +59,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
-    m_iconSizeButton = new QPushButton(i18n("Change Icon && Preview Size..."), this);
+    m_iconSizeButton = new QPushButton(i18nc("@action:button", "Change Icon && Preview Size..."), this);
     connect(m_iconSizeButton, SIGNAL(clicked()),
             this, SLOT(openIconSizeDialog()));
 
@@ -94,14 +94,14 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     QLabel* arrangementLabel = new QLabel(i18nc("@label:listbox", "Arrangement:"), gridGroup);
     m_arrangementBox = new QComboBox(gridGroup);
-    m_arrangementBox->addItem(i18n("Left to Right"));
-    m_arrangementBox->addItem(i18n("Top to Bottom"));
+    m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Left to Right"));
+    m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Top to Bottom"));
 
     QLabel* gridSpacingLabel = new QLabel(i18nc("@label:listbox", "Grid spacing:"), gridGroup);
     m_gridSpacingBox = new QComboBox(gridGroup);
-    m_gridSpacingBox->addItem(i18nc("Grid spacing", "Small"));
-    m_gridSpacingBox->addItem(i18nc("Grid spacing", "Medium"));
-    m_gridSpacingBox->addItem(i18nc("Grid spacing", "Large"));
+    m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Small"));
+    m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Medium"));
+    m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Large"));
 
     QGridLayout* gridGroupLayout = new QGridLayout(gridGroup);
     gridGroupLayout->addWidget(arrangementLabel, 0, 0);

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index d1f88524d18423c65f62d81585a56888df52ca69..83602ef7759273b50eaa0a2fdbfe8904e31a36c2 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -272,13 +272,13 @@ void InfoSidebarPage::showMetaInfo()
         fileItem.refresh();
 
         if (fileItem.isDir()) {
-            addInfoLine(text, i18n("Type:"), i18n("Folder"));
+            addInfoLine(text, i18nc("@label", "Type:"), i18nc("@info", "Folder"));
         } else {
-            addInfoLine(text, i18n("Type:"), fileItem.mimeComment());
+            addInfoLine(text, i18nc("@label", "Type:"), fileItem.mimeComment());
 
             QString sizeText(KIO::convertSize(fileItem.size()));
-            addInfoLine(text, i18n("Size:"), sizeText);
-            addInfoLine(text, i18n("Modified:"), fileItem.timeString());
+            addInfoLine(text, i18nc("@label", "Size:"), sizeText);
+            addInfoLine(text, i18nc("@label", "Modified:"), fileItem.timeString());
 
             // TODO: See convertMetaInfo below, find a way to display only interesting information
             // in a readable way
@@ -313,7 +313,7 @@ void InfoSidebarPage::showMetaInfo()
             // item->size() does not return the size of the content : not very instinctive for users
             totalSize += item->size();
         }
-        addInfoLine(text, i18n("Total size:"), KIO::convertSize(totalSize));
+        addInfoLine(text, i18nc("@label", "Total size:"), KIO::convertSize(totalSize));
     }
     m_infoLabel->setText(text);
 }

diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index ba59289120f0e2ebf7b26a4ccc7310565113057b..0ecba4390d2502d285b34ead3ddc309ca92e9d3e 100644 (file)
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -67,7 +67,7 @@ void MetaDataWidget::Private::loadComment(const QString& comment)
     editComment->blockSignals(true);
     if (comment.isEmpty()) {
         editComment->setFontItalic(true);
-        editComment->setText(i18n("Click to add comment..."));
+        editComment->setText(i18nc("@info:tooltip", "Click to add comment..."));
     } else {
         editComment->setFontItalic(false);
         editComment->setText(comment);

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 32112b38839738f7e16a95cc5b4bbd214c0f446f..330fbd643598931f99be7f766c5a7b785912fbc6 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -36,11 +36,13 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     Q_ASSERT(itemCount >= 1);
     m_renameOneItem = (itemCount == 1);
 
-    setCaption(m_renameOneItem ? i18n("Rename Item") : i18n("Rename Items"));
+    setCaption(m_renameOneItem ?
+               i18nc("@title:window", "Rename Item") :
+               i18nc("@title:window", "Rename Items"));
     setButtons(Ok | Cancel);
     setDefaultButton(Ok);
 
-    setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "dialog-apply"));
+    setButtonGuiItem(Ok, KGuiItem(i18nc("@action:button", "Rename"), "dialog-apply"));
 
     QWidget* page = new QWidget(this);
     setMainWidget(page);
@@ -111,10 +113,11 @@ void RenameDialog::slotButtonClicked(int button)
     if (button == Ok) {
         m_newName = m_lineEdit->text();
         if (m_newName.isEmpty()) {
-            m_errorString = i18n("The new name is empty. A name with at least one character must be entered.");
+            m_errorString = i18nc("@info:status",
+                                  "The new name is empty. A name with at least one character must be entered.");
         } else if (!m_renameOneItem && m_newName.contains('#') != 1) {
             m_newName.truncate(0);
-            m_errorString = i18n("The name must contain exactly one # character.");
+            m_errorString = i18nc("@info:status", "The name must contain exactly one # character.");
         }
     }
 

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 49d3b2750d2a317e3bf4f0ee5f6368a8ffe743fc..320f427b7df33bb983a7fe184c8baf8a4e640439 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -52,7 +52,7 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     connect(m_timer, SIGNAL(timeout()),
             this, SLOT(timerDone()));
 
-    m_closeButton = new QPushButton(i18n("Close"), this);
+    m_closeButton = new QPushButton(i18nc("@action:button", "Close"), this);
     m_closeButton->hide();
     connect(m_closeButton, SIGNAL(clicked()),
             this, SLOT(closeErrorMessage()));

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index ec6d322008b5e98e66f14e2f86e6fd16111cfdb4..e9963073f99662a1a7789cdb37f65896f9c4a9ad 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -51,13 +51,13 @@ void TreeViewContextMenu::open()
     KMenu* popup = new KMenu(m_parent);
 
     // insert 'Cut', 'Copy' and 'Paste'
-    QAction* cutAction   = new QAction(KIcon("edit-cut"), i18n("Cut"), this);
+    QAction* cutAction   = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
     connect(cutAction, SIGNAL(triggered()), this, SLOT(cut()));
 
-    QAction* copyAction  = new QAction(KIcon("edit-copy"), i18n("Copy"), this);
+    QAction* copyAction  = new QAction(KIcon("edit-copy"), i18nc("@action:inmenu", "Copy"), this);
     connect(copyAction, SIGNAL(triggered()), this, SLOT(copy()));
 
-    QAction* pasteAction = new QAction(KIcon("edit-paste"), i18n("Paste"), this);
+    QAction* pasteAction = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste"), this);
     const QMimeData* mimeData = QApplication::clipboard()->mimeData();
     const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData);
     pasteAction->setEnabled(!pasteData.isEmpty());
@@ -69,7 +69,7 @@ void TreeViewContextMenu::open()
     popup->addSeparator();
 
     // insert 'Rename'
-    QAction* renameAction = new QAction(i18n("Rename..."), this);
+    QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
     connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
     popup->addAction(renameAction);
 
@@ -79,7 +79,8 @@ void TreeViewContextMenu::open()
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     const KUrl& url = m_fileInfo->url();
     if (url.isLocalFile()) {
-        QAction* moveToTrashAction = new QAction(KIcon("edit-trash"), i18n("Move To Trash"), this);
+        QAction* moveToTrashAction = new QAction(KIcon("edit-trash"),
+                                                 i18nc("@action:inmenu", "Move To Trash"), this);
         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);
     } else {
@@ -87,7 +88,7 @@ void TreeViewContextMenu::open()
     }
 
     if (showDeleteCommand) {
-        QAction* deleteAction = new QAction(KIcon("edit-delete"), i18n("Delete"), this);
+        QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
         connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItem()));
         popup->addAction(deleteAction);
     }
@@ -95,7 +96,7 @@ void TreeViewContextMenu::open()
     popup->addSeparator();
 
     // insert 'Properties' entry
-    QAction* propertiesAction = new QAction(i18n("Properties"), this);
+    QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
     connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));
     popup->addAction(propertiesAction);
 

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 153e4b5f801308cb6286d9447a02a272e239dcc8..3f5197076c06023979604540532250e8d4d3f69c 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -70,7 +70,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     Q_ASSERT(dolphinView != 0);
     const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();
 
-    setCaption(i18n("View Properties"));
+    setCaption(i18nc("@title:window", "View Properties"));
     setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
 
     const KUrl& url = dolphinView->url();
@@ -88,9 +88,9 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsBox);
     m_viewMode = new QComboBox(propsBox);
-    m_viewMode->addItem(KIcon("fileview-icon"), i18n("Icons"));
-    m_viewMode->addItem(KIcon("fileview-detailed"), i18n("Details"));
-    m_viewMode->addItem(KIcon("fileview-column"), i18n("Column"));
+    m_viewMode->addItem(KIcon("fileview-icon"), i18nc("@item:inlistbox", "Icons"));
+    m_viewMode->addItem(KIcon("fileview-detailed"), i18nc("@item:inlistbox", "Details"));
+    m_viewMode->addItem(KIcon("fileview-column"), i18nc("@item:inlistbox", "Column"));
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
     const bool iconsViewEnabled = (index == DolphinView::IconsView);
@@ -99,23 +99,23 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QWidget* sortingBox = new QWidget(propsBox);
 
     m_sortOrder = new QComboBox(sortingBox);
-    m_sortOrder->addItem(i18n("Ascending"));
-    m_sortOrder->addItem(i18n("Descending"));
+    m_sortOrder->addItem(i18nc("@item:inlistbox", "Ascending"));
+    m_sortOrder->addItem(i18nc("@item:inlistbox", "Descending"));
     const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIndex);
 
     m_sorting = new QComboBox(sortingBox);
-    m_sorting->addItem(i18n("By Name"));
-    m_sorting->addItem(i18n("By Size"));
-    m_sorting->addItem(i18n("By Date"));
-    m_sorting->addItem(i18n("By Permissions"));
-    m_sorting->addItem(i18n("By Owner"));
-    m_sorting->addItem(i18n("By Group"));
-    m_sorting->addItem(i18n("By Type"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Size"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Date"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Permissions"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Owner"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Group"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Type"));
 #ifdef HAVE_NEPOMUK
     if (!Nepomuk::ResourceManager::instance()->init()) {
-        m_sorting->addItem(i18n("By Rating"));
-        m_sorting->addItem(i18n("By Tags"));
+        m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Rating"));
+        m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Tags"));
     }
 #endif
     m_sorting->setCurrentIndex(m_viewProps->sorting());
@@ -128,10 +128,14 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     QLabel* additionalInfoLabel = new QLabel(i18nc("@label:listbox", "Additional information:"), propsBox);
     m_additionalInfo = new QComboBox(propsBox);
-    m_additionalInfo->addItem(i18n("No Information"), KFileItemDelegate::NoInformation);
-    m_additionalInfo->addItem(i18n("Type"), KFileItemDelegate::FriendlyMimeType);
-    m_additionalInfo->addItem(i18n("Size"), KFileItemDelegate::Size);
-    m_additionalInfo->addItem(i18n("Date"), KFileItemDelegate::ModificationTime);
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "No Information"),
+                              KFileItemDelegate::NoInformation);
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Type"),
+                              KFileItemDelegate::FriendlyMimeType);
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Size"),
+                              KFileItemDelegate::Size);
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Date"),
+                              KFileItemDelegate::ModificationTime);
     const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo());
     m_additionalInfo->setCurrentIndex(addInfoIndex);
     m_additionalInfo->setEnabled(iconsViewEnabled);
@@ -313,7 +317,7 @@ void ViewPropertiesDialog::applyViewProperties()
                                    (m_applyToSubFolders != 0) &&
                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
-        const QString text(i18n("The view properties of all sub folders will be changed. Do you want to continue?"));
+        const QString text(i18nc("@info", "The view properties of all sub folders will be changed. Do you want to continue?"));
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
             return;
         }
@@ -329,7 +333,7 @@ void ViewPropertiesDialog::applyViewProperties()
                                    (m_applyToAllFolders != 0) &&
                                    m_applyToAllFolders->isChecked();
     if (applyToAllFolders) {
-        const QString text(i18n("The view properties of all folders will be changed. Do you want to continue?"));
+        const QString text(i18nc("@info", "The view properties of all folders will be changed. Do you want to continue?"));
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
             return;
         }

diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index 02e7fcaee3cc71739f0338a27cd01f418825bcaf..5c848bb00fd4be7d29ec2e29f9d96f76f96960b5 100644 (file)
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -46,7 +46,7 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(320, minSize.height()));
 
-    setCaption(i18n("Applying View Properties"));
+    setCaption(i18nc("@title:window", "Applying View Properties"));
     setButtons(KDialog::Cancel);
 
     m_viewProps = new ViewProperties(dir);
@@ -106,7 +106,7 @@ void ViewPropsProgressInfo::updateProgress()
 {
     if (m_dirSizeJob != 0) {
         const int subdirs = m_dirSizeJob->totalSubdirs();
-        m_label->setText(i18n("Counting folders: %1", subdirs));
+        m_label->setText(i18nc("@info:progress", "Counting folders: %1", subdirs));
     }
 
     if (m_applyViewPropsJob != 0) {
@@ -122,7 +122,7 @@ void ViewPropsProgressInfo::applyViewProperties()
     }
 
     const int subdirs = m_dirSizeJob->totalSubdirs();
-    m_label->setText(i18n("Folders: %1", subdirs));
+    m_label->setText(i18nc("@info:progress", "Folders: %1", subdirs));
     m_progressBar->setMaximum(subdirs);
 
     m_dirSizeJob = 0;

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index c98ba75d61d0f781f0254f81ff2a669c95b9fb9d..3903094b906650fec09933d108a2c7a336503580 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -50,19 +50,19 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
 
     // initialize 'General' tab
     m_generalPage = new GeneralViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_generalPage, KIcon("view-choose"), i18n("General"));
+    tabWidget->addTab(m_generalPage, KIcon("view-choose"), i18nc("@title:tab", "General"));
 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_iconsPage, KIcon("fileview-icon"), i18n("Icons"));
+    tabWidget->addTab(m_iconsPage, KIcon("fileview-icon"), i18nc("@title:tab", "Icons"));
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_detailsPage, KIcon("fileview-detailed"), i18n("Details"));
+    tabWidget->addTab(m_detailsPage, KIcon("fileview-detailed"), i18nc("@title:tab", "Details"));
 
     // initialize 'Column' tab
     m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_columnPage, KIcon("fileview-column"), i18n("Column"));
+    tabWidget->addTab(m_columnPage, KIcon("fileview-column"), i18nc("@title:tab", "Column"));
 
     topLayout->addWidget(tabWidget, 0, 0);
 }