CVS commit by tokoe: 

Makes translators life easier.


  M +6 -6      addresseditwidget.cpp   1.39
  M +4 -4      addresseeeditorwidget.cpp   1.105


--- kdepim/kaddressbook/addresseditwidget.cpp  #1.38:1.39
@@ -265,5 +265,5 @@ AddressEditDialog::AddressEditDialog( co
   topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
 
-  QLabel *label = new QLabel( KABC::Address::streetLabel() + ":", page );
+  QLabel *label = new QLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page );
   label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
   topLayout->addWidget( label, 1, 0 );
@@ -275,5 +275,5 @@ AddressEditDialog::AddressEditDialog( co
   mStreetTextEdit->installEventFilter( eater );
 
-  label = new QLabel( KABC::Address::postOfficeBoxLabel() + ":", page );
+  label = new QLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page );
   topLayout->addWidget( label, 2 , 0 );
   mPOBoxEdit = new KLineEdit( page );
@@ -281,5 +281,5 @@ AddressEditDialog::AddressEditDialog( co
   topLayout->addWidget( mPOBoxEdit, 2, 1 );
 
-  label = new QLabel( KABC::Address::localityLabel() + ":", page );
+  label = new QLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page );
   topLayout->addWidget( label, 3, 0 );
   mLocalityEdit = new KLineEdit( page );
@@ -287,5 +287,5 @@ AddressEditDialog::AddressEditDialog( co
   topLayout->addWidget( mLocalityEdit, 3, 1 );
 
-  label = new QLabel( KABC::Address::regionLabel() + ":", page );
+  label = new QLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page );
   topLayout->addWidget( label, 4, 0 );
   mRegionEdit = new KLineEdit( page );
@@ -293,5 +293,5 @@ AddressEditDialog::AddressEditDialog( co
   topLayout->addWidget( mRegionEdit, 4, 1 );
 
-  label = new QLabel( KABC::Address::postalCodeLabel() + ":", page );
+  label = new QLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page );
   topLayout->addWidget( label, 5, 0 );
   mPostalCodeEdit = new KLineEdit( page );
@@ -299,5 +299,5 @@ AddressEditDialog::AddressEditDialog( co
   topLayout->addWidget( mPostalCodeEdit, 5, 1 );
 
-  label = new QLabel( KABC::Address::countryLabel() + ":", page );
+  label = new QLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page );
   topLayout->addWidget( label, 6, 0 );
   mCountryCombo = new KComboBox( page );

--- kdepim/kaddressbook/addresseeeditorwidget.cpp  #1.104:1.105
@@ -170,5 +170,5 @@ void AddresseeEditorWidget::setupTab1()
   layout->addWidget( mNameEdit, 0, 2 );
   layout->addWidget( mNameLabel, 0, 2 );
-  label = new QLabel( i18n( "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
+  label = new QLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
   mRoleEdit = new KLineEdit( tab1 );
   connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ),
@@ -179,5 +179,5 @@ void AddresseeEditorWidget::setupTab1()
 
   // Organization
-  label = new QLabel( i18n( "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
+  label = new QLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
   mOrgEdit = new KLineEdit( tab1 );
   label->setBuddy( mOrgEdit );
@@ -245,5 +245,5 @@ void AddresseeEditorWidget::setupTab1()
   homePageLayout->addWidget( label );
 
-  label = new QLabel( i18n( "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
+  label = new QLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
   mURLEdit = new KLineEdit( tab1 );
   connect( mURLEdit, SIGNAL( textChanged( const QString& ) ),
@@ -358,5 +358,5 @@ void AddresseeEditorWidget::setupTab2()
   layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
 
-  label = new QLabel( i18n( "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
+  label = new QLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
   layout->addWidget( label, 2, 3 );
   mTitleEdit = new KLineEdit( tab2 );