[amarok] src: Fixed some translatable strings as reported by our awesome translators team.

Teo Mrnjavac teo at kde.org
Fri Apr 1 13:26:06 CEST 2011


Git commit feca3faf6f7ea248b3bce438b9e7ba4905cfcb58 by Teo Mrnjavac.
Committed on 01/04/2011 at 13:29.
Pushed by mrnjavac into branch 'master'.

Fixed some translatable strings as reported by our awesome translators team.
CCMAIL:amarok-devel at kde.org
CCMAIL:kde-i18n-doc at kde.org

M  +1    -1    src/browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp     
M  +3    -3    src/configdialog/dialogs/NotificationsConfig.ui     
M  +3    -3    src/configdialog/dialogs/PlaybackConfig.ui     
M  +5    -2    src/context/applets/photos/PhotosApplet.cpp     
M  +2    -2    src/core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui     
M  +5    -5    src/core/meta/support/MetaConstants.cpp     
M  +2    -2    src/dialogs/FilenameLayoutDialog.cpp     
M  +5    -5    src/dialogs/TagDialogBase.ui     
M  +1    -1    src/playlistgenerator/PresetModel.cpp     
M  +5    -1    src/playlistgenerator/constraints/TagMatch.cpp     

http://commits.kde.org/amarok/feca3faf6f7ea248b3bce438b9e7ba4905cfcb58

diff --git a/src/browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp b/src/browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp
index 3813f9a..6f31c67 100644
--- a/src/browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp
+++ b/src/browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp
@@ -332,7 +332,7 @@ PlaylistsInFoldersProxy::deleteFolder( const QModelIndex &groupIdx )
         KDialog dialog;
         dialog.setCaption( i18n( "Confirm Delete" ) );
         dialog.setButtons( KDialog::Ok | KDialog::Cancel );
-        QLabel label( i18n( "Are you sure you want to delete this folder and it's contents?" )
+        QLabel label( i18n( "Are you sure you want to delete this folder and its contents?" )
                       , &dialog
                     );
         //TODO:include a text area with all the names of the playlists
diff --git a/src/configdialog/dialogs/NotificationsConfig.ui b/src/configdialog/dialogs/NotificationsConfig.ui
index 5afef8c..3b0c47f 100644
--- a/src/configdialog/dialogs/NotificationsConfig.ui
+++ b/src/configdialog/dialogs/NotificationsConfig.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>598</width>
-    <height>426</height>
+    <width>596</width>
+    <height>424</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="rootLayout">
@@ -223,7 +223,7 @@
            <item>
             <widget class="QLabel" name="label">
              <property name="text">
-              <string>Scale Font:</string>
+              <string>Font scale:</string>
              </property>
             </widget>
            </item>
diff --git a/src/configdialog/dialogs/PlaybackConfig.ui b/src/configdialog/dialogs/PlaybackConfig.ui
index 3b03d30..3a79e43 100644
--- a/src/configdialog/dialogs/PlaybackConfig.ui
+++ b/src/configdialog/dialogs/PlaybackConfig.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>293</width>
-    <height>252</height>
+    <width>291</width>
+    <height>250</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_5">
@@ -33,7 +33,7 @@
       <item row="1" column="1">
        <widget class="QGroupBox" name="kcfg_Fadeout">
         <property name="toolTip">
-         <string>If checked, Amarok will slowly fade the volume of the playing track on stop or at the end of the playlist, or stop playback immediately</string>
+         <string>If checked, Amarok will slowly fade the volume of the playing track on stop or at the end of the playlist, rather than stopping playback immediately</string>
         </property>
         <property name="whatsThis">
          <string>&lt;b&gt;Quit Behavior&lt;/b&gt;
diff --git a/src/context/applets/photos/PhotosApplet.cpp b/src/context/applets/photos/PhotosApplet.cpp
index b12f18c..39f078e 100644
--- a/src/context/applets/photos/PhotosApplet.cpp
+++ b/src/context/applets/photos/PhotosApplet.cpp
@@ -128,8 +128,11 @@ void
 PhotosApplet::photoAdded()
 {
     setBusy( false );
-    setHeaderText( i18nc( "@title:window Number of photos of artist", "%1 Photos: %2",
-                          m_widget->count(), m_currentArtist ) );
+    setHeaderText( i18ncp( "@title:window Number of photos of artist",
+                           "1 Photo: %2",
+                           "%1 Photos: %2",
+                           m_widget->count(),
+                           m_currentArtist ) );
 }
 
 void
diff --git a/src/core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui b/src/core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui
index a7da2ad..e61e33d 100644
--- a/src/core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui
+++ b/src/core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>508</width>
+    <width>506</width>
     <height>65</height>
    </rect>
   </property>
@@ -57,7 +57,7 @@
       <string extracomment="automatic updates turned off">disabled</string>
      </property>
      <property name="prefix">
-      <string extracomment="prefix to update interval in minutes">every </string>
+      <string notr="true" extracomment="prefix to update interval in minutes">every </string>
      </property>
      <property name="minimum">
       <number>0</number>
diff --git a/src/core/meta/support/MetaConstants.cpp b/src/core/meta/support/MetaConstants.cpp
index 6393ea6..d302ace 100644
--- a/src/core/meta/support/MetaConstants.cpp
+++ b/src/core/meta/support/MetaConstants.cpp
@@ -102,7 +102,7 @@ QString Meta::i18nForField( qint64 field )
     switch( field )
     {
     case 0:                    return i18nc("The field name in case nothing specific is selected e.g. in the automatic playlist generator", "anything");
-    case Meta::valUrl:         return i18nc( "The name of the file this track is stored in", "filename" );
+    case Meta::valUrl:         return i18nc( "The name of the file this track is stored in", "File Name" );
     case Meta::valTitle:       return i18n("Title");
     case Meta::valArtist:      return i18n("Artist Name");
     case Meta::valAlbum:       return i18n("Album Name");
@@ -126,10 +126,10 @@ QString Meta::i18nForField( qint64 field )
     case Meta::valPlaycount:   return i18n("Playcount");
     case Meta::valUniqueId:    return i18n("Unique Id");
 
-    case Meta::valTrackGain:   return i18n("track gain");
-    case Meta::valTrackGainPeak:   return i18n("track gain peak");
-    case Meta::valAlbumGain:   return i18n("album gain");
-    case Meta::valAlbumGainPeak:   return i18n("album gain peak");
+    case Meta::valTrackGain:   return i18n("Track Gain");
+    case Meta::valTrackGainPeak:   return i18n("Track Gain Peak");
+    case Meta::valAlbumGain:   return i18n("Album Gain");
+    case Meta::valAlbumGainPeak:   return i18n("Album Gain Peak");
 
     case Meta::valAlbumArtist: return i18n("Album Artist Name");
     case Meta::valLabel:       return i18n("Label");
diff --git a/src/dialogs/FilenameLayoutDialog.cpp b/src/dialogs/FilenameLayoutDialog.cpp
index 94983d3..c9f2cc7 100644
--- a/src/dialogs/FilenameLayoutDialog.cpp
+++ b/src/dialogs/FilenameLayoutDialog.cpp
@@ -267,7 +267,7 @@ FilenameLayoutDialog::FilenameLayoutDialog( QWidget *parent, bool isOrganizeColl
     if( !m_isOrganizeCollection )
     {
         tokenPool->addToken( new Token( i18n( "Ignore" ), "filename-ignore-amarok", Ignore ) );
-        syntaxLabel->setText( i18nc("Please do not translate the %foo words as they define a syntax used internally by a parser to describe a filename.",
+        syntaxLabel->setText( i18nc("Please do not translate the %foo% words as they define a syntax used internally by a parser to describe a filename.",
                                     // xgettext: no-c-format
                                     "The following tokens can be used to define a filename scheme:<br> \
                                      <font color=\"%1\">%track%</font>, <font color=\"%2\">%title%</font>, \
@@ -285,7 +285,7 @@ FilenameLayoutDialog::FilenameLayoutDialog( QWidget *parent, bool isOrganizeColl
         Token *filetypeToken = new Token( i18n( "File type" ), "filename-filetype-amarok", FileType );
         tokenPool->addToken( filetypeToken );
         tokenPool->addToken( new Token( i18n( "Disc number" ), "filename-discnumber-amarok", DiscNumber ) );
-        syntaxLabel->setText( i18nc("Please do not translate the %foo words as they define a syntax used internally by a parser to describe a filename.",
+        syntaxLabel->setText( i18nc("Please do not translate the %foo% words as they define a syntax used internally by a parser to describe a filename.",
                                     // xgettext: no-c-format
                                     "The following tokens can be used to define a filename scheme: \
                                      <br>%track%, %title%, %artist%, %composer%, %year%, %album%, %albumartist%, %comment%, %genre%, %initial%, %folder%, %filetype%, %discnumber%." ) );
diff --git a/src/dialogs/TagDialogBase.ui b/src/dialogs/TagDialogBase.ui
index c22e8c4..10610bd 100644
--- a/src/dialogs/TagDialogBase.ui
+++ b/src/dialogs/TagDialogBase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>670</width>
-    <height>417</height>
+    <width>668</width>
+    <height>429</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -482,7 +482,7 @@
               </font>
              </property>
              <property name="text">
-              <string>1/1/2000</string>
+              <string notr="true">1/1/2000</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -520,7 +520,7 @@
               </font>
              </property>
              <property name="text">
-              <string>1/1/2000</string>
+              <string notr="true">1/1/2000</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -703,7 +703,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string> Trac&amp;k Number:</string>
+            <string>Trac&amp;k Number:</string>
            </property>
            <property name="textFormat">
             <enum>Qt::PlainText</enum>
diff --git a/src/playlistgenerator/PresetModel.cpp b/src/playlistgenerator/PresetModel.cpp
index 5dc34bd..8b4b115 100644
--- a/src/playlistgenerator/PresetModel.cpp
+++ b/src/playlistgenerator/PresetModel.cpp
@@ -292,7 +292,7 @@ APG::PresetModel::ExportDialog::ExportDialog( APG::PresetPtr ps )
     setSelection( ps->title() + ".xml" );
     setOperationMode( KFileDialog::Saving );
     setKeepLocation( true );
-    setCaption( i18n("Export `%1' preset", ps->title() ) );
+    setCaption( i18n( "Export \"%1\" preset", ps->title() ) );
     connect( this, SIGNAL( okClicked() ), this, SLOT( recvAccept() ) );
 }
 
diff --git a/src/playlistgenerator/constraints/TagMatch.cpp b/src/playlistgenerator/constraints/TagMatch.cpp
index 1762097..394ecac 100644
--- a/src/playlistgenerator/constraints/TagMatch.cpp
+++ b/src/playlistgenerator/constraints/TagMatch.cpp
@@ -177,7 +177,11 @@ ConstraintTypes::TagMatch::toXml( QDomDocument& doc, QDomElement& elem ) const
 QString
 ConstraintTypes::TagMatch::getName() const
 {
-    QString v( i18n("Match tag:%1 %2 %3 %4") );
+    QString v( i18nc( "%1 = empty string or \"not\"; "
+                      "%2 = a metadata field, like \"title\" or \"artist name\"; "
+                      "%3 = a predicate, can be equals, starts with, ends with or contains; "
+                      "%4 = a string to match; "
+                      "Example: Match tag: not title contains \"foo\"", "Match tag:%1 %2 %3 %4") );
     v = v.arg( ( m_invert ? i18n(" not") : "" ), m_fieldsModel->pretty_name_of( m_field ), comparisonToString() );
     if ( m_field == "rating" ) {
         double r = m_value.toDouble() / 2.0;


More information about the Amarok-devel mailing list