From 57e55d0b8830f3c681712d9d746ab08afe957715 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 17 Mar 2012 11:23:40 +0100 Subject: [PATCH] * other vs others. --- lang/tomahawk_en.ts | 1985 +++++++++++++++++++++---------------- src/libtomahawk/query.cpp | 2 +- 2 files changed, 1137 insertions(+), 850 deletions(-) diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index 061841a3e..e339dfadd 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -1,6 +1,42 @@ + + AccountFactoryWrapper + + + Dialog + + + + + Description goes here + + + + + Add Account + + + + + AccountFactoryWrapperDelegate + + + Online + + + + + Connecting... + + + + + Offline + + + ActionCollection @@ -14,54 +50,59 @@ - - + + &Follow in real-time + + + + + &Listen Privately - - + + &Listen Publicly - + &Load Playlist - + &Rename Playlist - + &Copy Playlist Link - + &Play - + &Stop - + &Previous Track - + &Next Track - + &Quit @@ -78,31 +119,31 @@ Other Albums by Artist - - - - Click to show Super Collection Tracks - - - + Click to show Official Tracks - - - Click to show Super Collection Albums + + + Click to show SuperCollection Tracks - + + + Click to show SuperCollection Albums + + + + Click to show Official Albums - + Other Albums by %1 @@ -110,18 +151,18 @@ AlbumModel - + Album - - + + All albums from %1 - + All albums @@ -129,12 +170,12 @@ AlbumView - + After you have scanned your music collection you will find your latest album additions right here. - + This collection doesn't have any recent albums. @@ -162,13 +203,13 @@ - - - Click to show Super Collection Albums + + + Click to show SuperCollection Albums - + Click to show Official Albums @@ -176,17 +217,17 @@ ArtistView - + After you have scanned your music collection you will find your tracks right here. - + This collection is currently empty. - + Sorry, your filter '%1' did not match any results. @@ -239,27 +280,27 @@ - + Time Left - + Shuffle - + Repeat - + Low - + High @@ -267,41 +308,41 @@ AudioEngine - + Tomahawk is stopped. - + Tomahawk is playing "%1" by %2%3. - - on album %1 + + on album %1 CategoryAddItem - - + + New Playlist - - - - + + + + New Station - - - + + + %1 Station @@ -309,12 +350,12 @@ CategoryItem - + Playlists - + Stations @@ -340,43 +381,10 @@ - - CollectionItem - - - Top Loved Tracks - - - - - Loved Tracks - - - - - Dashboard - - - - - Charts - - - - - New Additions - - - - - Super Collection - - - CollectionView - + This collection is empty. @@ -452,6 +460,14 @@ + + DelegateConfigWrapper + + + Delete Account + + + DiagnosticsDialog @@ -471,60 +487,10 @@ - GetNewStuffDelegate + DropJob - - Installed - - - - - - Installing - - - - - - Failed - - - - - Uninstalling - - - - - Install - - - - - Upgrading - - - - - Uninstall - - - - - Upgrade - - - - - %1 downloads - - - - - GetNewStuffDialog - - - Download New Resolvers + + No tracks found for given %1 @@ -537,30 +503,10 @@ - GoogleWrapper + IndexingJobItem - - Configure this Google Account - - - - - Google Address - - - - - Enter your Google login to connect with your friends using Tomahawk! - - - - - Add Friend - - - - - Enter Google Address: + + Indexing database @@ -582,152 +528,6 @@ - - JabberConfig - - - Jabber Configuration - - - - - Configure this Jabber account - - - - - Enter your Jabber login to connect with your friends using Tomahawk! - - - - - Login Information - - - - - Jabber ID: - - - - - e.g. user@example.com - - - - - Password: - - - - - An account with this name already exists! - - - - - Advanced Jabber Settings - - - - - Server: - - - - - Port: - - - - - JabberPlugin - - - User Interaction - - - - - Host is unknown - - - - - Item not found - - - - - Authorization Error - - - - - Remote Stream Error - - - - - Remote Connection failed - - - - - Internal Server Error - - - - - System shutdown - - - - - Conflict - - - - - Unknown - - - - - Add Friend - - - - - Enter Jabber ID: - - - - - Add Friend... - - - - - XML Console... - - - - - I'm sorry -- I'm just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later! - - - - - Authorize User - - - - - Do you want to grant <b>%1</b> access to your Collection? - - - JobStatusView @@ -746,6 +546,34 @@ + + LastFmConfig + + + Form + + + + + Scrobble tracks to Last.fm + + + + + Username: + + + + + Password: + + + + + Test Login + + + LastfmContext @@ -847,12 +675,25 @@ PlaylistItemDelegate - + played %1 by you - + + played %1 by %2 + + + + + PlaylistLargeItemDelegate + + + played %1 by you + + + + played %1 by %2 @@ -870,12 +711,12 @@ - + All tracks by %1 on album %2 - + All tracks by %1 @@ -921,7 +762,7 @@ PlaylistView - + This playlist is currently empty. Add some tracks to it and enjoy the music! @@ -975,16 +816,17 @@ - No Proxy Hosts: + No Proxy Hosts: +(Overrides system proxy) - + localhost *.example.com (space separated) - + Use proxy for DNS lookups? @@ -992,7 +834,7 @@ QObject - + %n year(s) ago %n year ago @@ -1000,7 +842,7 @@ - + %n year(s) %n year @@ -1008,7 +850,7 @@ - + %n month(s) ago %n month ago @@ -1016,7 +858,7 @@ - + %n month(s) %n month @@ -1024,7 +866,7 @@ - + %n week(s) ago %n week ago @@ -1032,7 +874,7 @@ - + %n week(s) %n week @@ -1040,7 +882,7 @@ - + %n day(s) ago %n day ago @@ -1048,7 +890,7 @@ - + %n day(s) %n day @@ -1056,7 +898,7 @@ - + %n hour(s) ago %n hour ago @@ -1064,7 +906,7 @@ - + %n hour(s) %n hour @@ -1072,20 +914,35 @@ - + %1 minutes ago - + %1 minutes - + just now + + + Friend Finders + + + + + Music Finders + + + + + Status Updaters + + QuaZipFilePrivate @@ -1104,10 +961,6 @@ - Open Queue - - - Show Queue @@ -1150,12 +1003,12 @@ SearchWidget - + Search: %1 - + Results for '%1' @@ -1163,118 +1016,41 @@ SettingsDialog - - Accounts - - - - + Collection - - Last.fm - - - - - Resolvers - - - - + Advanced - - - Failed + + All - - Success + + Services - - Could not contact server + + Install resolver from file - - Load script resolver file - - - - - Delete Account - - - - + Information - + Changing this setting requires a restart of Tomahawk! - - SipConfigDelegate - - - Online - - - - - Connecting... - - - - - Offline - - - - - SipHandler - - - Legal Warning - - - - - By pressing I Agree below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemnify the Tomahawk developers and project from liability should you choose to break those laws. - -For more information, please see http://gettomahawk.com/legal - - - - - I Do Not Agree - - - - - I Agree - - - - - SipModel - - - Add New Account... - - - SocialPlaylistWidget @@ -1321,20 +1097,32 @@ For more information, please see http://gettomahawk.com/legal - + Offline - + All available tracks - + Online + + + + Show + + + + + + Hide + + SourceInfoWidget @@ -1354,45 +1142,73 @@ For more information, please see http://gettomahawk.com/legal - + New Additions - + My recent activity - + Recent activity from %1 + + SourceItem + + + Collection + + + + + Latest Additions + + + + + Recently Played + + + + + Loved Tracks + + + + + SuperCollection + + + SourceTreeView - + &Copy Link - + &Delete %1 - + &Export Playlist - + Save XSPF - + Playlists (*.xspf) @@ -1400,25 +1216,113 @@ For more information, please see http://gettomahawk.com/legal SourcesModel - + + Group + + + + Collection - + Playlist - + Automatic Playlist - + Station + + + Browse + + + + + Search History + + + + + My Music + + + + + SuperCollection + + + + + Top Loved Tracks + + + + + Dashboard + + + + + Charts + + + + + Friends + + + + + SpotifyConfig + + + Form + + + + + Configure your Spotify credentials + + + + + Username: + + + + + placeholderUsername + + + + + Password: + + + + + placeholderPw + + + + + High Quality Streaming + + + + + This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group. + + StackedSettingsDialog @@ -1428,33 +1332,17 @@ For more information, please see http://gettomahawk.com/legal - - Accounts - - - - - Connect to your friends with Google Chat, Twitter, and more. - - - - - - ... - - - - + Local Music Information - + Path to scan for music files: - + The Echo Nest supports keeping track of your catalog metadata and using it to craft personalized radios. Enabling this option will allow you (and all your friends) to create automatic playlists @@ -1462,144 +1350,390 @@ For more information, please see http://gettomahawk.com/legal - + Upload collection list to The Echo Nest to enable user radio - + Watch for changes - + Time between scans, in seconds: - - Now Playing Information + + Internet Services - - Applications to update with currently playing track: + + Install from file... - - Adium + + Filter by capability: - - Scrobble tracks to Last.fm - - - - - Username: - - - - - Password: - - - - - Test Login - - - - - Script Resolvers - - - - - Script resolvers search for a given track to make it playable. - - - - - Get more resolvers... - - - - + Advanced Network Settings - + If you're having difficulty connecting to peers, try setting this to your external IP address/host name and a port number (default 50210). Make sure to forward that port to this machine! - + Static Host Name: - + Static Port: - + Always use static host name/port? (Overrides UPnP discovery/port forwarding) - + Proxy Settings... - + Send reports after Tomahawk crashed - + Playdar HTTP API - + Use UPnP to establish port forward + + Tomahawk::Accounts::AccountDelegate + + + Add Account + + + + + Remove Account + + + + + %1 downloads + + + + + Online + + + + + Connecting... + + + + + Offline + + + + + Tomahawk::Accounts::GoogleWrapper + + + Configure this Google Account + + + + + Google Address + + + + + Enter your Google login to connect with your friends using Tomahawk! + + + + + username@gmail.com + + + + + Tomahawk::Accounts::GoogleWrapperFactory + + + Connect to Google Talk to find your friends + + + + + Tomahawk::Accounts::GoogleWrapperSip + + + Add Friend + + + + + Enter Google Address: + + + + + Tomahawk::Accounts::LastFmAccountFactory + + + Scrobble your tracks to last.fm, and find freely downloadable tracks to play + + + + + Tomahawk::Accounts::LastFmConfig + + + + Failed + + + + + Success + + + + + Could not contact server + + + + + Tomahawk::Accounts::SpotifyAccountFactory + + + Play music from and sync your playlists with Spotify + + + + + Tomahawk::Accounts::TwitterAccountFactory + + + Connect to your Twitter followers. + + + + + Tomahawk::Accounts::TwitterConfigWidget + + + + + Tweet! + + + + + + Status: No saved credentials + + + + + + + Authenticate + + + + + + Status: Credentials saved for %1 + + + + + + De-authenticate + + + + + + + + + + + Tweetin' Error + + + + + The credentials could not be verified. +You may wish to try re-authenticating. + + + + + Status: Error validating credentials + + + + + Global Tweet + + + + + Direct Message + + + + + Send Message! + + + + + @Mention + + + + + Send Mention! + + + + + You must enter a user name for this type of tweet. + + + + + Your saved credentials could not be loaded. +You may wish to try re-authenticating. + + + + + Your saved credentials could not be verified. +You may wish to try re-authenticating. + + + + + + There was an error posting your status -- sorry! + + + + + + Tweeted! + + + + + Your tweet has been posted! + + + + + There was an error posting your direct message -- sorry! + + + + + Your message has been posted! + + + + + Tomahawk::Accounts::XmppAccountFactory + + + Log on to your Jabber/XMPP account to connect to your friends + + + + + Tomahawk::Accounts::ZeroconfFactory + + + Automatically connect to Tomahawks on the local network + + + Tomahawk::ContextMenu - - - + &Play - - - + + + Add to &Queue - - Copy Track &Link + + + &Love - + + &Copy Track Link + + + + + Show &Album page + + + + + Show &Artist page + + + + + Un-&Love + + + + &Delete Items - + &Delete Item @@ -1607,32 +1741,32 @@ For more information, please see http://gettomahawk.com/legal Tomahawk::CustomPlaylistView - + Top Loved Tracks - + Your loved tracks - + %1's loved tracks - + The most loved tracks from all your friends - + All of your loved tracks - + All of %1's loved tracks @@ -1661,15 +1795,15 @@ For more information, please see http://gettomahawk.com/legal Tomahawk::DynamicModel - - + + Could not find a playable track. Please change the filters or try again. - + Failed to generate preview with the desired filters @@ -1705,269 +1839,279 @@ Please change the filters or try again. + + Tomahawk::DynamicWidget + + + Station ran out of tracks! + +Try tweaking the filters for a new set of songs to play. + + + Tomahawk::EchonestControl - - - - - - + + + + + + is - + from user - - + + No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings - + similar to - - - - - - - + + + + + + + Less - - - - - - - + + + + + + + More - + 0 BPM - + 500 BPM - + 0 secs - + 3600 secs - + -100 dB - + 100 dB - + Major - + Minor - + C - + C Sharp - + D - + E Flat - + E - + F - + F Sharp - + G - + A Flat - + A - + B Flat - + B - + Ascending - + Descending - + Tempo - + Duration - + Loudness - + Artist Familiarity - + Artist Hotttnesss - + Song Hotttnesss - + Latitude - + Longitude - + Mode - + Key - + Energy - + Danceability - + only by ~%1 - + similar to ~%1 - + with genre ~%1 - - + + from no one - + My Collection - + from %1 radio - + with %1 %2 - + about %1 BPM - + about %n minute(s) long about %n minute long @@ -1975,37 +2119,37 @@ Please change the filters or try again. - + about %1 dB - + at around %1%2 %3 - + in %1 - + in a %1 key - + sorted in %1 %2 order - + with a %1 mood - + in a %1 style @@ -2108,25 +2252,33 @@ Please change the filters or try again. + + Tomahawk::GroovesharkParser + + + Error fetching Grooveshark information from the network! + + + Tomahawk::InfoSystem::ChartsPlugin - + Top Overall - + Artists - + Albums - + Tracks @@ -2134,31 +2286,39 @@ Please change the filters or try again. Tomahawk::InfoSystem::LastFmPlugin - + Top Tracks - + Loved Tracks - + Hyped Tracks - + Top Artists - + Hyped Artists + + Tomahawk::ItunesParser + + + Error fetching iTunes information from the network! + + + Tomahawk::JSPFLoader @@ -2195,50 +2355,122 @@ Please change the filters or try again. - - + + &Listen Along + + Tomahawk::Query + + + and + + + + + You + + + + + you + + + + + and + + + + + %n other(s) + + %n other + %n others + + + + and %1%n other(s)%2 + + and %1%n other%2 + and %1%n others%2 + + + + + %1 people + + + + + loved this track + + + + + Tomahawk::RdioParser + + + Error fetching Rdio information from the network! + + + + + Tomahawk::ShortenedLinkParser + + + Network error parsing shortened link! + + + Tomahawk::Source - - + + Scanning (%L1 tracks) - + Scanning - + Checking - + Fetching - + Parsing - + Saving (%1%) + + Tomahawk::SpotifyParser + + + Error fetching Spotify information from the network! + + + TomahawkApp - + My Collection @@ -2246,12 +2478,12 @@ Please change the filters or try again. TomahawkOAuthTwitter - + Twitter PIN - + After authenticating on Twitter's web site, enter the displayed PIN number here: @@ -2261,27 +2493,27 @@ enter the displayed PIN number here: TomahawkTrayIcon - + Hide Tomahawk Window - + Show Tomahawk Window - + Currently not playing. - + Play - + Pause @@ -2425,7 +2657,7 @@ enter the displayed PIN number here: - + Play @@ -2445,134 +2677,128 @@ enter the displayed PIN number here: - + Global Search... - - + + Check For Updates... - - - + + + Connect To Peer - + Enter peer address: - + Enter peer port: - + Enter peer key: - + XSPF Error - + This is not a valid XSPF playlist. - + Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - - - Playback Error + + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - - Sorry, there is a problem accessing your audio device. Make sure you have a suitable Phonon backend and required plugins installed. + + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - - Sorry, there is a problem accessing your audio device. - - - - + Create New Station - + Name: - + New Station - + New Playlist - + Pause - + Go &offline - + Go &online - + Authentication Error - + %1 by %2 track, artist name - + %1 - %2 current track, some window title - + About Tomahawk - - <h2><b>Tomahawk %1<br/>(%2)</h2>Copyright 2010, 2011<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson + + <h2><b>Tomahawk %1<br/>(%2)</h2>Copyright 2010 - 2012<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson @@ -2650,65 +2876,70 @@ enter the displayed PIN number here: TrackModel - + Artist - + Title - + Album - + Track - + Duration - + Bitrate - + Age - + Year - + Size - + Origin - + Score + + + Composer + + TrackView - + Sorry, your filter '%1' did not match any results. @@ -2729,7 +2960,7 @@ enter the displayed PIN number here: TreeItemDelegate - + Unknown @@ -2737,54 +2968,59 @@ enter the displayed PIN number here: TreeModel - + Name - + Duration - + Bitrate - + Age - + Year - + Size - + Origin - + + Composer + + + + All Artists - - + + My Collection - - + + Collection of %1 @@ -2792,34 +3028,32 @@ enter the displayed PIN number here: TwitterConfigWidget - + Configure this Twitter account - + The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account. - - - + Status: No saved credentials - + Authenticate with Twitter - + Twitter Connections - + If you only want to post tweets, you're done. @@ -2829,158 +3063,50 @@ You can re-send a sync message at any time simply by sending another tweet using - + Select the kind of tweet you would like, then press the button to post it: - - + Global Tweet - - + @Mention - - + Direct Message - + e.g. @tomahawk - + Send Message - - - - - Tweet! - - - - - - - Authenticate - - - - - - Status: Credentials saved for %1 - - - - - - De-authenticate - - - - - - - - - - - Tweetin' Error - - - - - The credentials could not be verified. -You may wish to try re-authenticating. - - - - - Status: Error validating credentials - - - - - Send Message! - - - - - Send Mention! - - - - - You must enter a user name for this type of tweet. - - - - - Your saved credentials could not be loaded. -You may wish to try re-authenticating. - - - - - Your saved credentials could not be verified. -You may wish to try re-authenticating. - - - - - - There was an error posting your status -- sorry! - - - - - - Tweeted! - - - - - Your tweet has been posted! - - - - - There was an error posting your direct message -- sorry! - - - - - Your message has been posted! - - - - - TwitterPlugin - - - Twitter - - ViewManager - - All available tracks + + SuperCollection - + + Combined libraries of all your online friends + + + + All available albums @@ -3003,7 +3129,7 @@ You may wish to try re-authenticating. - + No recently created playlists in your network. @@ -3016,7 +3142,7 @@ You may wish to try re-authenticating. WhatsHotWidget - + Charts @@ -3070,7 +3196,22 @@ Lyrics for "%1" by %2: XSPFLoader - + + Failed to parse contents of XSPF playlist + + + + + Some playlist entries were found without artist and track name, they will be omitted + + + + + Failed to fetch the desired playlist from the network, or the desired file does not exist + + + + New Playlist @@ -3078,101 +3219,247 @@ Lyrics for "%1" by %2: XmlConsole - + Xml stream console - - + + Filter - + Save log - + Disabled - + By JID - + By namespace uri - + By all attributes - + Visible stanzas - + Information query - + Message - + Presence - + Custom - + Close - + Save XMPP log to file - + OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt) + + XmppConfigWidget + + + Xmpp Configuration + + + + + Configure this Xmpp account + + + + + Enter your Xmpp login to connect with your friends using Tomahawk! + + + + + Login Information + + + + + Xmpp ID: + + + + + e.g. user@example.com + + + + + Password: + + + + + An account with this name already exists! + + + + + Advanced Xmpp Settings + + + + + Server: + + + + + Port: + + + + + XmppSipPlugin + + + User Interaction + + + + + Host is unknown + + + + + Item not found + + + + + Authorization Error + + + + + Remote Stream Error + + + + + Remote Connection failed + + + + + Internal Server Error + + + + + System shutdown + + + + + Conflict + + + + + Unknown + + + + + Add Friend + + + + + Enter Xmpp ID: + + + + + Add Friend... + + + + + XML Console... + + + + + I'm sorry -- I'm just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later! + + + + + Authorize User + + + + + Do you want to grant <b>%1</b> access to your Collection? + + + ZeroconfConfig - + Form - + Local Network configuration - + This plugin will automatically find other users running Tomahawk on your local network - + Connect automatically when Tomahawk starts diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp index dd47eec9a..60f5a1ea6 100644 --- a/src/libtomahawk/query.cpp +++ b/src/libtomahawk/query.cpp @@ -637,7 +637,7 @@ Query::socialActionDescription( const QString& action, DescriptionMode mode ) co if ( loveCounter > 0 ) { if ( loveCounter > 3 ) - desc += " " + tr( "and %1%2 others%3" ).arg( "" ).arg( loveCounter - 3 ).arg( "" ); + desc += " " + tr( "and" ) + " " + tr( "%n other(s)", "", loveCounter - 3 ) + ""; if ( mode == Short ) desc = "" + tr( "%1 people" ).arg( loveCounter ) + "";