i18n fixes.

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

diff --git a/src/commenteditwidget.cpp b/src/commenteditwidget.cpp
index 29c4ce67513ed1061d0f13fa0f5dc84fcbc2d466..e1069a92931187cf7bb72f96ac5ab69451981e46 100644 (file)
--- a/src/commenteditwidget.cpp
+++ b/src/commenteditwidget.cpp
@@ -126,8 +126,8 @@ CommentEditWidget::CommentEditWidget( QWidget* parent )
     d->buttonCancel->setAutoRaise( true );
     d->buttonSave->setIcon( KIcon( "document-save" ) );
     d->buttonCancel->setIcon( KIcon( "edit-delete" ) );
     d->buttonCancel->setAutoRaise( true );
     d->buttonSave->setIcon( KIcon( "document-save" ) );
     d->buttonCancel->setIcon( KIcon( "edit-delete" ) );

-    d->buttonSave->setText( i18n( "Save" ) );
-    d->buttonCancel->setText( i18n( "Cancel" ) );
+    d->buttonSave->setText( i18nc( "@action:button", "Save" ) );
+    d->buttonCancel->setText( i18nc( "@action:button", "Cancel" ) );

 
     QFont fnt( font() );
     fnt.setPointSize( fnt.pointSize()-2 );
 
     QFont fnt( font() );
     fnt.setPointSize( fnt.pointSize()-2 );

diff --git a/src/commentwidget.cpp b/src/commentwidget.cpp
index 4d784e5e55bf1434a6a38a8c159ca2909e0c5292..e4bd6e941b04b2932f17935c41d8d14549fec4d3 100644 (file)
--- a/src/commentwidget.cpp
+++ b/src/commentwidget.cpp
@@ -52,10 +52,10 @@ private:
 void CommentWidget::Private::update()
 {
     if ( comment.isEmpty() ) {
 void CommentWidget::Private::update()
 {
     if ( comment.isEmpty() ) {

-        label->setText( "<p align=center><a style=\"font-size:small;\" href=\"addComment\">" + i18n( "Add comment..." ) + "</a>" );
+        label->setText( "<p align=center><a style=\"font-size:small;\" href=\"addComment\">" + i18nc( "@label", "Add comment..." ) + "</a>" );

     }
     else {
     }
     else {

-        label->setText( "<p>" + comment + "<p align=center><a style=\"font-size:small;\" href=\"addComment\">" + i18n( "Change comment..." ) + "</a>" );
+        label->setText( "<p>" + comment + "<p align=center><a style=\"font-size:small;\" href=\"addComment\">" + i18nc( "@label", "Change comment..." ) + "</a>" );

     }
 }
 
     }
 }
 

diff --git a/src/nepomukmassupdatejob.cpp b/src/nepomukmassupdatejob.cpp
index 484846916d674163ff1a6c7008ed5e6b618d6301..b47358fe946ff4b5d66691346015f886895bebee 100644 (file)
--- a/src/nepomukmassupdatejob.cpp
+++ b/src/nepomukmassupdatejob.cpp
@@ -71,7 +71,7 @@ void Nepomuk::MassUpdateJob::start()
     if ( m_index < 0 ) {
         kDebug();
         emit description( this,
     if ( m_index < 0 ) {
         kDebug();
         emit description( this,

-                          i18n("Changing annotations") );
+                          i18nc("@info:progress", "Changing annotations") );

         m_index = 0;
         m_processTimer.start();
     }
         m_index = 0;
         m_processTimer.start();
     }

diff --git a/src/tagcloud/newtagdialog.cpp b/src/tagcloud/newtagdialog.cpp
index 0fe574fdc9e022979ef29b16921e495b3416e8eb..4dfafedf88537c5879d526ec00730983563bfea3 100644 (file)
--- a/src/tagcloud/newtagdialog.cpp
+++ b/src/tagcloud/newtagdialog.cpp
@@ -28,7 +28,7 @@
 NewTagDialog::NewTagDialog( QWidget* parent )
     : KDialog( parent )
 {
 NewTagDialog::NewTagDialog( QWidget* parent )
     : KDialog( parent )
 {

-    setCaption( i18n( "Create new Tag" ) );
+    setCaption( i18nc( "@title:window", "Create new Tag" ) );

     setButtons( Ok|Cancel );
     enableButtonOk( false );
 
     setButtons( Ok|Cancel );
     enableButtonOk( false );
 


@@ -53,8 +53,8 @@ void NewTagDialog::slotLabelChanged( const QString& text )
 Nepomuk::Tag NewTagDialog::createTag( QWidget* parent )
 {
     NewTagDialog dlg( parent );
 Nepomuk::Tag NewTagDialog::createTag( QWidget* parent )
 {
     NewTagDialog dlg( parent );

-    dlg.m_labelTitle->setText( i18n( "Create New Tag" ) );
-    dlg.m_labelTitle->setComment( i18n( "with optional icon and description" ) );
+    dlg.m_labelTitle->setText( i18nc( "@title:window", "Create New Tag" ) );
+    dlg.m_labelTitle->setComment( i18nc( "@title:window subtitle to previous message", "with optional icon and description" ) );

     dlg.m_labelTitle->setPixmap( KIcon( "nepomuk" ).pixmap( 32, 32 ) );
 
     dlg.m_editTagLabel->setFocus();
     dlg.m_labelTitle->setPixmap( KIcon( "nepomuk" ).pixmap( 32, 32 ) );
 
     dlg.m_editTagLabel->setFocus();

diff --git a/src/tagcloud/newtagdialog.ui b/src/tagcloud/newtagdialog.ui
index 9c71b4df83b0d46303d49bdfafb30f950699b567..5146030b8313b4337855ac103a0673bafc2da2ed 100644 (file)
--- a/src/tagcloud/newtagdialog.ui
+++ b/src/tagcloud/newtagdialog.ui
@@ -9,9 +9,6 @@
     <height>149</height>
    </rect>
   </property>
     <height>149</height>
    </rect>
   </property>

-  <property name="windowTitle" >
-   <string>Form</string>
-  </property>

   <layout class="QVBoxLayout" >
    <item>
     <widget class="KTitleWidget" native="1" name="m_labelTitle" />
   <layout class="QVBoxLayout" >
    <item>
     <widget class="KTitleWidget" native="1" name="m_labelTitle" />


@@ -39,7 +36,7 @@
        <item>
         <widget class="QLabel" name="label_2" >
          <property name="text" >
        <item>
         <widget class="QLabel" name="label_2" >
          <property name="text" >

-          <string>Name:</string>
+          <string comment="@label Tag name">Name:</string>

          </property>
         </widget>
        </item>
          </property>
         </widget>
        </item>


@@ -82,7 +79,7 @@
    <item>
     <widget class="QLabel" name="label" >
      <property name="text" >
    <item>
     <widget class="QLabel" name="label" >
      <property name="text" >

-      <string>Detailed Description (optional):</string>
+      <string comment="@label">Detailed Description (optional):</string>

      </property>
     </widget>
    </item>
      </property>
     </widget>
    </item>

diff --git a/src/tagcloud/resourcetaggingwidget.cpp b/src/tagcloud/resourcetaggingwidget.cpp
index 8eba24a9cebaf31ff876513e155db808c5d8c9b3..3893426088834857f96cb53c355ed6a6c765cfc8 100644 (file)
--- a/src/tagcloud/resourcetaggingwidget.cpp
+++ b/src/tagcloud/resourcetaggingwidget.cpp
@@ -105,7 +105,7 @@ Nepomuk::ResourceTaggingWidget::ResourceTaggingWidget( QWidget* parent )
     layout->setMargin( 0 );
     d->resourceTagCloud = new TagCloud( this );
     layout->addWidget( d->resourceTagCloud );
     layout->setMargin( 0 );
     d->resourceTagCloud = new TagCloud( this );
     layout->addWidget( d->resourceTagCloud );

-    QLabel* changeTagsLabel = new QLabel( "<p align=center><a style=\"font-size:small;\" href=\"dummy\">" + i18n( "Change tags..." ) + "</a>", this );
+    QLabel* changeTagsLabel = new QLabel( "<p align=center><a style=\"font-size:small;\" href=\"dummy\">" + i18nc( "@label", "Change tags..." ) + "</a>", this );

     connect( changeTagsLabel, SIGNAL( linkActivated( const QString ) ),
              this, SLOT( _k_slotShowTaggingPopup() ) );
     layout->addWidget( changeTagsLabel );
     connect( changeTagsLabel, SIGNAL( linkActivated( const QString ) ),
              this, SLOT( _k_slotShowTaggingPopup() ) );
     layout->addWidget( changeTagsLabel );

diff --git a/src/tagcloud/tagcloud.cpp b/src/tagcloud/tagcloud.cpp
index 5f406a79645b3d1521e0b4d931a0e9c681bb86d2..0cfe7688536309ce11a0ff633c7b70446abfbf02 100644 (file)
--- a/src/tagcloud/tagcloud.cpp
+++ b/src/tagcloud/tagcloud.cpp
@@ -131,7 +131,7 @@ public:
           hoverTag( 0 ),
           cachedHfwWidth( -1 ),
           m_parent( parent ) {
           hoverTag( 0 ),
           cachedHfwWidth( -1 ),
           m_parent( parent ) {

-        newTagNode.text = i18n( "New Tag..." );
+        newTagNode.text = i18nc( "@label", "New Tag..." );

     }
 
     int maxFontSize;
     }
 
     int maxFontSize;


@@ -736,7 +736,7 @@ QSize Nepomuk::TagCloud::minimumSizeHint() const
     // If we have tags d->rebuildCloud() has been called at least once,
     // thus, we have proper rects (i.e. needed sizes)
     if ( d->nodes.isEmpty() && !d->newTagButtonEnabled ) {
     // If we have tags d->rebuildCloud() has been called at least once,
     // thus, we have proper rects (i.e. needed sizes)
     if ( d->nodes.isEmpty() && !d->newTagButtonEnabled ) {

-        return QSize( fontMetrics().width( i18n( "No Tags" ) ), fontMetrics().height() );
+        return QSize( fontMetrics().width( i18nc( "@label Indicator when no tags defined", "No Tags" ) ), fontMetrics().height() );

     }
     else {
         QSize size;
     }
     else {
         QSize size;