KUIT adaptions (applied i18ncheckarg - everything should be OK now)

CCMAIL: caslav.ilic@gmx.net

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

diff --git a/src/dolphin_columnmodesettings.kcfg b/src/dolphin_columnmodesettings.kcfg
index a7b8c7915b1efc6c4d01d16b3f43405594a4c3fb..cf41c3fd1326bf99cd176fc8b0b89de1fe969265 100644 (file)
--- a/src/dolphin_columnmodesettings.kcfg
+++ b/src/dolphin_columnmodesettings.kcfg
@@ -6,23 +6,23 @@
     <include>kglobalsettings.h</include>
     <group name="ColumnMode">
         <entry name="FontFamily" type="String">
-            <label>Font family</label>
+            <label context="@label">Font family</label>
             <default code="true">KGlobalSettings::generalFont().family()</default>
         </entry>
         <entry name="FontSize" type="Int">
-            <label>Font size</label>
+            <label context="@label">Font size</label>
             <default code="true">KGlobalSettings::generalFont().pointSize()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
-            <label>Italic</label>
+            <label context="@label">Italic</label>
             <default>false</default>
         </entry>
         <entry name="BoldFont" type="Bool">
-            <label>Bold</label>
+            <label context="@label">Bold</label>
             <default>false</default>
         </entry>
         <entry name="IconSize" type="Int">
-            <label>Icon size</label>
+            <label context="@label">Icon size</label>
             <default code="true">K3Icon::SizeSmall</default>
         </entry>
     </group>

diff --git a/src/dolphin_detailsmodesettings.kcfg b/src/dolphin_detailsmodesettings.kcfg
index 7c76893fcb9a2cd324f4f99bd6c0a32497fba017..b00297f11180ef0c859d4b39d4f09e105338102f 100644 (file)
--- a/src/dolphin_detailsmodesettings.kcfg
+++ b/src/dolphin_detailsmodesettings.kcfg
@@ -6,47 +6,47 @@
     <include>kglobalsettings.h</include>
     <group name="DetailsMode">
         <entry name="FontFamily" type="String">
-            <label>Font family</label>
+            <label context="@label">Font family</label>
             <default code="true">KGlobalSettings::generalFont().family()</default>
         </entry>
         <entry name="FontSize" type="Int">
-            <label>Font size</label>
+            <label context="@label">Font size</label>
             <default code="true">KGlobalSettings::generalFont().pointSize()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
-            <label>Italic</label>
+            <label context="@label">Italic</label>
             <default>false</default>
         </entry>
         <entry name="BoldFont" type="Bool">
-            <label>Bold</label>
+            <label context="@label">Bold</label>
             <default>false</default>
         </entry>
         <entry name="IconSize" type="Int">
-            <label>Icon size</label>
+            <label context="@label">Icon size</label>
             <default code="true">K3Icon::SizeSmall</default>
         </entry>
         <entry name="ShowDate" type="Bool">
-            <label>Show date</label>
+            <label context="@label">Show date</label>
             <default>true</default>
         </entry>
         <entry name="ShowGroup" type="Bool">
-            <label>Show group</label>
+            <label context="@label">Show group</label>
             <default>false</default>
         </entry>
         <entry name="ShowOwner" type="Bool">
-            <label>Show owner</label>
+            <label context="@label">Show owner</label>
             <default>false</default>
         </entry>
         <entry name="ShowPermissions" type="Bool">
-            <label>Show permissions</label>
+            <label context="@label">Show permissions</label>
             <default>false</default>
         </entry>
         <entry name="ShowSize" type="Bool">
-            <label>Show size</label>
+            <label context="@label">Show size</label>
             <default>false</default>
         </entry>
         <entry name="ShowType" type="Bool">
-            <label>Show type</label>
+            <label context="@label">Show type</label>
             <default>false</default>
         </entry>
     </group>

diff --git a/src/dolphin_directoryviewpropertysettings.kcfg b/src/dolphin_directoryviewpropertysettings.kcfg
index 7b192f54950cb07820237b2d6daa67ef58610f1d..14173df38ff69701426f537b44146accf4e65c09 100644 (file)
--- a/src/dolphin_directoryviewpropertysettings.kcfg
+++ b/src/dolphin_directoryviewpropertysettings.kcfg
@@ -8,56 +8,56 @@
 <kcfgfile arg="true" />
     <group name="Settings">
         <entry name="ShowHiddenFiles" key="ShowDotFiles" type="Bool" >
-            <label>Show hidden files</label>
-            <whatsthis>When this option is enabled hidden files, such as those starting with a '.', will be shown in the file view.</whatsthis>
+            <label context="@label">Show hidden files</label>
+            <whatsthis context="@info">When this option is enabled hidden files, such as those starting with a '.', will be shown in the file view.</whatsthis>
             <default>false</default>
         </entry>
     </group>
 
     <group name="Dolphin">
         <entry name="ViewMode" type="Int" >
-            <label>View Mode</label>
-            <whatsthis>This option controls the style of the view. Currently supported values include icons (0), details (1) and column (2) views.</whatsthis>
+            <label context="@label">View Mode</label>
+            <whatsthis context="@info">This option controls the style of the view. Currently supported values include icons (0), details (1) and column (2) views.</whatsthis>
             <default>DolphinView::IconsView</default>
             <min>0</min>
             <max code="true">DolphinView::MaxModeEnum</max>
         </entry>
 
         <entry name="ShowPreview" type="Bool" >
-            <label>Show preview</label>
-            <whatsthis>When this option is enabled, a preview of the file content is shown as icon.</whatsthis>
+            <label context="@label">Show preview</label>
+            <whatsthis context="@info">When this option is enabled, a preview of the file content is shown as icon.</whatsthis>
             <default>false</default>
         </entry>
 
         <entry name="CategorizedSorting" type="Bool" >
-            <label>Categorized Sorting</label>
-            <whatsthis>When this option is enabled, the sorted items get summarized by their category.</whatsthis>
+            <label context="@label">Categorized Sorting</label>
+            <whatsthis context="@info">When this option is enabled, the sorted items get summarized by their category.</whatsthis>
             <default>false</default>
         </entry>
 
         <entry name="Sorting" type="Int" >
-            <label>Sort files by</label>
-            <whatsthis>This option defines which attribute (name, size, date, etc) sorting is performed on.</whatsthis>
+            <label context="@label">Sort files by</label>
+            <whatsthis context="@info">This option defines which attribute (name, size, date, etc) sorting is performed on.</whatsthis>
             <default code="true">DolphinView::SortByName</default>
             <min>0</min>
             <max code="true">DolphinView::MaxSortEnum</max>
         </entry>
 
         <entry name="SortOrder" type="Int" >
-            <label>Order to sort files in</label>
+            <label context="@label">Order to sort files in</label>
             <default code="true">Qt::AscendingOrder</default>
             <min code="true">Qt::AscendingOrder</min>
             <max code="true">Qt::DescendingOrder</max>
         </entry>
 
         <entry name="AdditionalInfo" type="Int">
-            <label>Additional information</label>
+            <label context="@label">Additional information</label>
             <default code="true">KFileItemDelegate::NoInformation</default>
         </entry>
 
         <entry name="Timestamp" type="DateTime" >
-            <label>Properties last changed</label>
-            <whatsthis>The last time these properties were changed by the user.</whatsthis>
+            <label context="@label">Properties last changed</label>
+            <whatsthis context="@info">The last time these properties were changed by the user.</whatsthis>
         </entry>
     </group>
 </kcfg>

diff --git a/src/dolphin_generalsettings.kcfg b/src/dolphin_generalsettings.kcfg
index ba457fb164bcacdce4431a03ab073497c9ee0de7..33243026a1f8fbeaf420060275d8b6cdab2887eb 100644 (file)
--- a/src/dolphin_generalsettings.kcfg
+++ b/src/dolphin_generalsettings.kcfg
@@ -4,31 +4,31 @@
     <kcfgfile name="dolphinrc"/>
     <group name="General">
         <entry name="EditableUrl" type="Bool">
-            <label>Should the URL be editable for the user</label>
+            <label context="@label">Should the URL be editable for the user</label>
             <default>false</default>
         </entry>
         <entry name="FirstRun" type="Bool">
-            <label>Is the application started the first time</label>
+            <label context="@label">Is the application started the first time</label>
             <default>true</default>
         </entry>
         <entry name="HomeUrl" type="String">
-            <label>Home URL</label>
+            <label context="@label">Home URL</label>
             <default>~</default>
         </entry>
         <entry name="SplitView" type="Bool">
-            <label>Split the view into two panes</label>
+            <label context="@label">Split the view into two panes</label>
             <default>false</default>
         </entry>
         <entry name="FilterBar" type="Bool">
-            <label>Should the filter bar be shown</label>
+            <label context="@label">Should the filter bar be shown</label>
             <default>false</default>
         </entry>
         <entry name="GlobalViewProps" type="Bool">
-            <label>Should the view properties used for all directories</label>
+            <label context="@label">Should the view properties used for all directories</label>
             <default>false</default>
         </entry>
         <entry name="ViewPropsTimestamp" type="DateTime" >
-            <label>Timestamp since when the view properties are valid</label>
+            <label context="@label">Timestamp since when the view properties are valid</label>
         </entry>
     </group>
 </kcfg>
\ No newline at end of file

diff --git a/src/dolphin_iconsmodesettings.kcfg b/src/dolphin_iconsmodesettings.kcfg
index d01c11a14366e3a03c40c3ee15f9c0e3734421c6..1a89fe35d554864c47c8759f6bab8b7c1d9be539 100644 (file)
--- a/src/dolphin_iconsmodesettings.kcfg
+++ b/src/dolphin_iconsmodesettings.kcfg
@@ -7,27 +7,27 @@
     <include>QListView</include>
     <group name="IconsMode">
         <entry name="Arrangement" type="Int">
-            <label>Arrangement</label>
+            <label context="@label">Arrangement</label>
             <default code="true">QListView::TopToBottom</default>
         </entry>
         <entry name="FontFamily" type="String">
-            <label>Font family</label>
+            <label context="@label">Font family</label>
             <default code="true">KGlobalSettings::generalFont().family()</default>
         </entry>
         <entry name="FontSize" type="Int">
-            <label>Font size</label>
+            <label context="@label">Font size</label>
             <default code="true">KGlobalSettings::generalFont().pointSize()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
-            <label>Italic</label>
+            <label context="@label">Italic</label>
             <default>false</default>
         </entry>
          <entry name="BoldFont" type="Bool">
-            <label>Bold</label>
+            <label context="@label">Bold</label>
             <default>false</default>
         </entry>
        <entry name="ItemHeight" type="Int">
-            <label>Item height</label>
+            <label context="@label">Item height</label>
             <!--
                  check 'void IconsViewSettingsPage::applySettings()' as reference (iconsviewsettingspage.cpp):
                  itemHeight += fontHeight * numberOfTextlines + 16;
@@ -35,7 +35,7 @@
             <default code="true">K3Icon::SizeMedium + (QFontMetrics(KGlobalSettings::generalFont()).height() * 2) + 16</default>
         </entry>
         <entry name="ItemWidth" type="Int">
-            <label>Item width</label>
+            <label context="@label">Item width</label>
             <!--
                  check 'void IconsViewSettingsPage::applySettings()' as reference (iconsviewsettingspage.cpp):
                  itemWidth = TopToBottomBase + textSizeIndex * TopToBottomInc;
@@ -43,19 +43,19 @@
             <default>96</default>
         </entry>
         <entry name="GridSpacing" type="Int">
-            <label>Grid spacing</label>
+            <label context="@label">Grid spacing</label>
             <default>8</default>
         </entry>
         <entry name="IconSize" type="Int">
-            <label>Icon size</label>
+            <label context="@label">Icon size</label>
             <default code="true">K3Icon::SizeMedium</default>
         </entry>
         <entry name="NumberOfTextlines" type="Int">
-            <label>Number of textlines</label>
+            <label context="@label">Number of textlines</label>
             <default>2</default>
         </entry>
         <entry name="PreviewSize" type="Int">
-            <label>Preview size</label>
+            <label context="@label">Preview size</label>
             <default code="true">K3Icon::SizeHuge</default>
         </entry>
     </group>

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index c0d807910b37875ee15fde3608e41ff97fe0a16f..a6ce985956fe875658a871e180d543284d5223d0 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -94,7 +94,7 @@ DolphinPart::~DolphinPart()
 
 KAboutData* DolphinPart::createAboutData()
 {
-    return new KAboutData("dolphinpart", 0, ki18n( "Dolphin Part" ), "0.1");
+    return new KAboutData("dolphinpart", 0, ki18nc("@info", "Dolphin Part"), "0.1");
 }
 
 bool DolphinPart::openUrl(const KUrl& url)

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index a7ecc78ed206621125112119fa91ccb892cd61a2..8b51f11843eaec3200b9e57e3674b3f6f019af8d 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -17,13 +17,13 @@
   </Menu>
   <Menu name="view">
    <Menu name="view_mode" >
-    <text>View Mode</text>
+    <text context="@title:menu">View Mode</text>
     <Action name="icons" />
     <Action name="details" />
     <Action name="columns" />
    </Menu>
    <Menu name="sort">
-    <text>Sort</text>
+    <text context="@title:menu">Sort</text>
     <Action name="by_name" />
     <Action name="by_size" />
     <Action name="by_date" />
@@ -37,7 +37,7 @@
     <Action name="descending" />
    </Menu>
    <Menu name="additional_info">
-    <text>Additional Information</text>
+    <text context="@title:menu">Additional Information</text>
     <Action name="clear_info" />
     <Action name="show_mime_info" />
     <Action name="show_size_info" />
@@ -52,14 +52,14 @@
    <Action name="stop" />
    <Separator/>
    <Menu name="panels">
-    <text>Panels</text>
+    <text context="@title:menu">Panels</text>
     <Action name="show_places_panel" />
     <Action name="show_info_panel" />
     <Action name="show_folders_panel" />
     <Action name="show_terminal_panel" />
    </Menu>
    <Menu name="navigation_bar">
-    <text>Navigation Bar</text>
+    <text context="@title:menu">Navigation Bar</text>
     <Action name="editable_location" />
     <Action name="edit_location" />
    </Menu>
@@ -110,7 +110,7 @@
   </disable>
  </State>
  <ToolBar noMerge="1" name="mainToolBar" >
-  <text>Main Toolbar</text>
+  <text context="@title:menu">Main Toolbar</text>
   <Action name="go_back" />
   <Action name="go_forward" />
   <Separator name="separator_1" />

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 72af5a25b77fa42914dcbb0f2d80195ff65f9ac0..c53b77818d5a4c9da4f01e7c10c5db6ac2c69be4 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -279,7 +279,7 @@ 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());
-        const QString loadingText(i18nc("@status:progress", "Loading folder..."));
+        const QString loadingText(i18nc("@info:progress", "Loading folder..."));
         m_showProgress = progressText.isEmpty() || (progressText == loadingText);
         if (m_showProgress) {
             m_statusBar->setProgressText(loadingText);

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 9fa69330cadcc5456ab49d8fdc21b4e6a6fb69f6..8f9863b7906dde0071e1fecec327a10d9ce727eb 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("@label:inrange Size", "Small"), iconSizeHBox);
+    new QLabel(i18nc("@item: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:inrange Size", "Large"), iconSizeHBox);
+    new QLabel(i18nc("@item: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:inrange Size", "Small"), previewSizeHBox);
+    new QLabel(i18nc("@item: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:inrange Size", "Large"), previewSizeHBox);
+    new QLabel(i18nc("@item:inrange 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 85c005412ea80903a14676457c49ac6297a74a0e..6154786272d2b2395b31ec14e9906c242642a7de 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -76,9 +76,9 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     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"));
-    m_textWidthBox->addItem(i18nc("Text width", "Large"));
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
 
     QGridLayout* textGroupLayout = new QGridLayout(textGroup);
     textGroupLayout->addWidget(fontLabel, 0, 0);

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 83602ef7759273b50eaa0a2fdbfe8904e31a36c2..b7490625fb861deb97574bfa17b95e14020b09ed 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -178,7 +178,7 @@ void InfoSidebarPage::showItemInfo()
                                            K3Icon::NoGroup,
                                            K3Icon::SizeEnormous);
         m_preview->setPixmap(icon);
-        m_nameLabel->setText(i18np("%1 item selected", "%1 items selected", selectedItems.count()));
+        m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count()));
     } else if (!applyBookmark(file)) {
         // try to get a preview pixmap from the item...
         KUrl::List list;

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 330fbd643598931f99be7f766c5a7b785912fbc6..d65330cddad1231db499a2e723f4a375cbabcf7c 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -58,8 +58,9 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
                                page);
     } else {
         m_newName = i18nc("@info:status", "New name #");
-        editLabel = new QLabel(i18np("Rename the %1 selected item to:",
-                                     "Rename the %1 selected items to:", itemCount),
+        editLabel = new QLabel(i18ncp("@label:textbox",
+                                      "Rename the %1 selected item to:",
+                                      "Rename the %1 selected items to:", itemCount),
                                page);
     }