KUIT adapations for labels

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

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index a03728ed71d1c35596042ca5d477dc3bdcbb7180..3b9de5706c4df862d2523e3534dcde093bcd428d 100644 (file)
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -73,7 +73,7 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
     textBox->setSizePolicy(sizePolicy);
 
-    QLabel* fontLabel = new QLabel(i18n("Font:"), textBox);
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox);
     m_fontRequester = new KFontRequester(textBox);
 
     QHBoxLayout* textLayout = new QHBoxLayout(textBox);

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index f88033e475bad5331b9a5b515d4a8506822f50e4..be94f6a458e20468a20202048854062bd7dee2a0 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -94,7 +94,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
     textBox->setSizePolicy(sizePolicy);
 
-    QLabel* fontLabel = new QLabel(i18n("Font:"), textBox);
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox);
     m_fontRequester = new KFontRequester(textBox);
 
     QHBoxLayout* textLayout = new QHBoxLayout(textBox);

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 50788a37f5855353d8ab8a20a86e78d00cfafd13..6fc98f6fe7b61492de082a2013a10ecee17b1199 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -44,7 +44,7 @@ FilterBar::FilterBar(QWidget* parent) :
     hLayout->setMargin(0);
     hLayout->addSpacing(gap);
 
-    m_filter = new QLabel(i18n("Filter:"), this);
+    m_filter = new QLabel(i18nc("@label:textbox", "Filter:"), this);
     hLayout->addWidget(m_filter);
     hLayout->addSpacing(KDialog::spacingHint());
 

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 85f7a00be3df35b9b1e3852946986127ba7f93f6..e0b8381aa5122ce90c519c15622221a2926c7665 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -62,7 +62,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     KHBox* homeUrlBox = new KHBox(homeBox);
     homeUrlBox->setSpacing(spacing);
 
-    new QLabel(i18n("Location:"), homeUrlBox);
+    new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);
     m_homeUrl = new QLineEdit(homeUrlBox);
 
     QPushButton* selectHomeUrlButton = new QPushButton(KIcon("folder-open"), QString(), homeUrlBox);

diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index 61439d323e1eb49c1d5c68b3508b31d91bea50e0..71b1f632665f3f3cf7d29823612d97dd7b6328f0 100644 (file)
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -66,7 +66,7 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
     // create 'File Previews' box
     QGroupBox* previewBox = new QGroupBox(i18nc("@title:group", "File Previews"), this);
 
-    QLabel* maxFileSize = new QLabel(i18n("Maximum file size:"), previewBox);
+    QLabel* maxFileSize = new QLabel(i18nc("@label:slider", "Maximum file size:"), previewBox);
 
     KHBox* vBox = new KHBox(previewBox);
     vBox->setSpacing(spacing);

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index c79c0f28eb587370625ee1b313e3532db54f8b66..4f998ba83a40347ad43cddc3b0896b0a6cb304dc 100644 (file)
--- 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("Size", "Small"), iconSizeHBox);
+    new QLabel(i18nc("@label:slider 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("Size", "Large"), iconSizeHBox);
+    new QLabel(i18nc("@label:slider 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("Size", "Small"), previewSizeHBox);
+    new QLabel(i18nc("@label:slider 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("Size", "Large"), previewSizeHBox);
+    new QLabel(i18nc("@label:slider Size", "Large"), previewSizeHBox);
 
     m_previewSizeViewer = new PixmapViewer(previewSizeBox, PixmapViewer::SizeTransition);
     m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index f2f55222c22a1413fc1647d2b05b037c50410ad2..d7b7e0a015ca3e85445dc26377a0043087c0c6b3 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -68,13 +68,13 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);
     textGroup->setSizePolicy(sizePolicy);
 
-    QLabel* fontLabel = new QLabel(i18n("Font:"), textGroup);
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup);
     m_fontRequester = new KFontRequester(textGroup);
 
-    QLabel* textlinesCountLabel = new QLabel(i18n("Number of lines:"), textGroup);
+    QLabel* textlinesCountLabel = new QLabel(i18nc("@label:textbox", "Number of lines:"), textGroup);
     m_textlinesCountBox = new QSpinBox(1, 5, 1, textGroup);
 
-    QLabel* textWidthLabel = new QLabel(i18n("Text width:"), textGroup);
+    QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
     m_textWidthBox = new QComboBox(textGroup);
     m_textWidthBox->addItem(i18nc("Text width", "Small"));
     m_textWidthBox->addItem(i18nc("Text width", "Medium"));
@@ -92,12 +92,12 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     QGroupBox* gridGroup = new QGroupBox(i18nc("@title:group", "Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
 
-    QLabel* arrangementLabel = new QLabel(i18n("Arrangement:"), gridGroup);
+    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"));
 
-    QLabel* gridSpacingLabel = new QLabel(i18n("Grid spacing:"), gridGroup);
+    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"));

diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index c8fe1e438d18f5483ed792e5898b3da2d5270965..ba59289120f0e2ebf7b26a4ccc7310565113057b 100644 (file)
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -91,13 +91,13 @@ MetaDataWidget::MetaDataWidget(QWidget* parent) :
     QVBoxLayout* lay = new QVBoxLayout(this);
     lay->setMargin(0);
     QHBoxLayout* hbox = new QHBoxLayout;
-    hbox->addWidget(new QLabel(i18n("Rating:"), this));
+    hbox->addWidget(new QLabel(i18nc("@label:slider", "Rating:"), this));
     hbox->addStretch(1);
     hbox->addWidget(d->ratingWidget);
     lay->addLayout(hbox);
     lay->addWidget(d->editComment);
     hbox = new QHBoxLayout;
-    hbox->addWidget(new QLabel(i18n("Tags:"), this));
+    hbox->addWidget(new QLabel(i18nc("@label:textbox", "Tags:"), this));
     hbox->addWidget(d->tagWidget, 1);
     lay->addLayout(hbox);
 

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 681a5845a4d0c276b31b8a3a9397e0c31aa020e8..32112b38839738f7e16a95cc5b4bbd214c0f446f 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -52,10 +52,10 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     if (m_renameOneItem) {
         const KUrl& url = items.first();
         m_newName = url.fileName();
-        editLabel = new QLabel(i18n("Rename the item '%1' to:", m_newName),
+        editLabel = new QLabel(i18nc("@label:textbox", "Rename the item <filename>%1</filename> to:", m_newName),
                                page);
     } else {
-        m_newName = i18n("New name #");
+        m_newName = i18nc("@info:status", "New name #");
         editLabel = new QLabel(i18np("Rename the %1 selected item to:",
                                      "Rename the %1 selected items to:", itemCount),
                                page);
@@ -98,7 +98,7 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     topLayout->addWidget(m_lineEdit);
 
     if (!m_renameOneItem) {
-        QLabel* infoLabel = new QLabel(i18n("(# will be replaced by ascending numbers)"), page);
+        QLabel* infoLabel = new QLabel(i18nc("@info", "(# will be replaced by ascending numbers)"), page);
         topLayout->addWidget(infoLabel);
     }
 }

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 4dc985225938ad92562b7eea535534bcb094c2bd..153e4b5f801308cb6286d9447a02a272e239dcc8 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -86,7 +86,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
         propsBox = new QGroupBox(i18nc("@title:group", "Properties"), main);
     }
 
-    QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
+    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"));
@@ -95,7 +95,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_viewMode->setCurrentIndex(index);
     const bool iconsViewEnabled = (index == DolphinView::IconsView);
 
-    QLabel* sortingLabel = new QLabel(i18n("Sorting:"), propsBox);
+    QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsBox);
     QWidget* sortingBox = new QWidget(propsBox);
 
     m_sortOrder = new QComboBox(sortingBox);
@@ -126,7 +126,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     sortingLayout->addWidget(m_sorting);
     sortingBox->setLayout(sortingLayout);
 
-    QLabel* additionalInfoLabel = new QLabel(i18n("Additional information:"), propsBox);
+    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);

diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index 8011dd301ed58f16bc9a5dfcece4cbfffd960375..02e7fcaee3cc71739f0338a27cd01f418825bcaf 100644 (file)
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -59,7 +59,7 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
     QWidget* main = new QWidget();
     QVBoxLayout* topLayout = new QVBoxLayout();
 
-    m_label = new QLabel(i18n("Counting folders: %1", 0), main);
+    m_label = new QLabel(i18nc("@info:progress", "Counting folders: %1", 0), main);
     m_progressBar = new QProgressBar(main);
     m_progressBar->setMinimum(0);
     m_progressBar->setMaximum(0);