[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [amarok] src: Fix: several i18n issues
From:       Ralf Engels <ralf-engels () gmx ! de>
Date:       2015-02-01 20:48:15
Message-ID: E1YI1RH-00038C-VH () scm ! kde ! org
[Download RAW message or body]

Git commit c50eee6a98c666389940d25deb17f08e49507069 by Ralf Engels.
Committed on 01/02/2015 at 20:13.
Pushed by rengels into branch 'master'.

Fix: several i18n issues

Fix some plural strings.
Make a comma separator translatable.
Get rid of some pluzzle strings.

Courtesy of Safa Alfulaij

REVIEW: 122226

M  +4    -3    src/browsers/playlistbrowser/PlaylistBrowserView.cpp
M  +3    -2    src/covermanager/CoverManager.cpp
M  +5    -3    src/playlistgenerator/constraints/PlaylistLength.cpp

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

diff --git a/src/browsers/playlistbrowser/PlaylistBrowserView.cpp \
b/src/browsers/playlistbrowser/PlaylistBrowserView.cpp index bd4f6d6..bb2f488 100644
--- a/src/browsers/playlistbrowser/PlaylistBrowserView.cpp
+++ b/src/browsers/playlistbrowser/PlaylistBrowserView.cpp
@@ -370,9 +370,10 @@ PlaylistBrowserNS::PlaylistBrowserView::actionsFor( const \
QModelIndexList &index  const int actionTrackCount = m_writableActionTracks.count();
         const int playlistCount = m_writableActionTracks.uniqueKeys().count();
         if( playlistCount > 1 )
-            m_removeTracksAction->setText( i18ncp( "Number of playlists is >= 2",
-                "Remove a Track From %2 Playlists", "Remove %1 Tracks From %2 \
                Playlists",
-                actionTrackCount, playlistCount ) );
+            m_removeTracksAction->setText( i18nc( "%1: number of tracks. %2: number \
of playlists", +                "Remove %1 From %2", i18ncp ("First part of 'Remove \
%1 From %2'", "a Track", +                "%1 Tracks", actionTrackCount), i18ncp \
("Second part of 'Remove %1 From %2'", "1 Playlist", +                "%1 Playlists", \
playlistCount ) ) );  else
             m_removeTracksAction->setText( i18ncp( "%2 is saved playlist name",
                 "Remove a Track From %2", "Remove %1 Tracks From %2", \
                actionTrackCount,
diff --git a/src/covermanager/CoverManager.cpp b/src/covermanager/CoverManager.cpp
index c56382b..d18a288 100644
--- a/src/covermanager/CoverManager.cpp
+++ b/src/covermanager/CoverManager.cpp
@@ -690,12 +690,13 @@ CoverManager::updateStatusBar()
                     Amarok::manipulateThe( artist, false );
                     artists.append( artist );
                 }
-                text += i18n( " by " ) + artists.join( ", " );
+                text = i18n( "%1 by %2", text, artists.join( i18nc("Separator for \
artists", ", ")) );  }
         }
 
         if( missingCounter )
-            text += i18n(" - ( <b>%1</b> without cover )", missingCounter );
+            text = i18np("%2 - ( <b>1</b> without cover )", "%2 - ( <b>%1</b> \
without cover )", +                         missingCounter, text );
 
         m_fetchButton->setEnabled( missingCounter );
     }
diff --git a/src/playlistgenerator/constraints/PlaylistLength.cpp \
b/src/playlistgenerator/constraints/PlaylistLength.cpp index 224ce94..fb0a516 100644
--- a/src/playlistgenerator/constraints/PlaylistLength.cpp
+++ b/src/playlistgenerator/constraints/PlaylistLength.cpp
@@ -115,11 +115,13 @@ ConstraintTypes::PlaylistLength::getName() const
 
     KLocalizedString v;
     if ( m_comparison == CompareNumEquals ) {
-        v = ki18nc( "%1 is a number", "Playlist length: %1 tracks");
+        v = ki18ncp( "%1 is a number", "Playlist length: 1 track", "Playlist length: \
%1 tracks");  } else if ( m_comparison == CompareNumGreaterThan ) {
-        v = ki18nc( "%1 is a number", "Playlist length: more than %1 tracks");
+        v = ki18ncp( "%1 is a number", "Playlist length: more than 1 track",
+                     "Playlist length: more than %1 tracks");
     } else if ( m_comparison == CompareNumLessThan ) {
-        v = ki18nc( "%1 is a number", "Playlist length: less than %1 tracks");
+        v = ki18ncp( "%1 is a number", "Playlist length: less than 1 track",
+                     "Playlist length: less than %1 tracks");
     } else {
         v = ki18n( "Playlist length: unknown");
     }


[prev in list] [next in list] [prev in thread] [next in thread]