diff --git a/src/accounts/zeroconf/ZeroconfAccount.cpp b/src/accounts/zeroconf/ZeroconfAccount.cpp index b337b48e1..e2cf9a674 100644 --- a/src/accounts/zeroconf/ZeroconfAccount.cpp +++ b/src/accounts/zeroconf/ZeroconfAccount.cpp @@ -64,8 +64,8 @@ ZeroconfFactory::icon() const ZeroconfAccount::ZeroconfAccount( const QString& accountId ) : Account( accountId ) { - setAccountServiceName( "Local Network" ); - setAccountFriendlyName( "Local Network" ); + setAccountServiceName( tr( "Local Network" ) ); + setAccountFriendlyName( tr( "Local Network" ) ); setTypes( SipType ); } diff --git a/src/accounts/zeroconf/ZeroconfAccount.h b/src/accounts/zeroconf/ZeroconfAccount.h index 136c971c0..fc7a939ae 100644 --- a/src/accounts/zeroconf/ZeroconfAccount.h +++ b/src/accounts/zeroconf/ZeroconfAccount.h @@ -39,7 +39,7 @@ public: virtual ~ZeroconfFactory(); virtual QString factoryId() const { return "zeroconfaccount"; } - virtual QString prettyName() const { return "Local Network"; } + virtual QString prettyName() const { return tr( "Local Network" ); } QString description() const { return tr( "Automatically connect to Tomahawks on the local network" ); } virtual bool isUnique() const { return true; } AccountTypes types() const { return AccountTypes( SipType ); }; diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index 378bb8d0c..47e5852fc 100644 --- a/src/libtomahawk/Query.cpp +++ b/src/libtomahawk/Query.cpp @@ -773,7 +773,7 @@ Query::socialActionDescription( const QString& action, DescriptionMode mode ) co desc += " " + tr( "and" ) + " " + tr( "%n other(s)", "", loveCounter - 3 ) + ""; if ( mode == Short ) - desc = "" + tr( "%1 people" ).arg( loveCounter ) + ""; + desc = "" + tr( "%n people", "", loveCounter ) + ""; desc += " " + tr( "loved this track" ); //FIXME: more action descs required } diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp index 0aa059583..ad3f9e855 100644 --- a/src/libtomahawk/TomahawkSettings.cpp +++ b/src/libtomahawk/TomahawkSettings.cpp @@ -372,7 +372,7 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion ) } else if ( pluginName == "sipzeroconf" ) { - setValue( QString( "accounts/%1/accountfriendlyname" ).arg( accountKey ), "Local Network" ); + setValue( QString( "accounts/%1/accountfriendlyname" ).arg( accountKey ), tr( "Local Network" ) ); } beginGroup( "accounts/" + accountKey ); diff --git a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp index 9d985f156..1351df07e 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp +++ b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp @@ -191,6 +191,7 @@ LastFmConfig::onHistoryLoaded() { if ( m_page != total ) { + //: Text on a button that resumes import m_ui->importHistory->setText( tr( "History Incomplete. Resume" ) ); m_ui->importHistory->setEnabled( true ); } diff --git a/src/libtomahawk/utils/GuiHelpers.cpp b/src/libtomahawk/utils/GuiHelpers.cpp index a682f8b9c..2342c5344 100644 --- a/src/libtomahawk/utils/GuiHelpers.cpp +++ b/src/libtomahawk/utils/GuiHelpers.cpp @@ -99,7 +99,7 @@ createAccountFromFactory( Tomahawk::Accounts::AccountFactory* factory, QWidget* { #ifdef Q_WS_MAC // on osx a sheet needs to be non-modal - DelegateConfigWrapper* dialog = new DelegateConfigWrapper( account->configurationWidget(), account->aboutWidget(), QString("%1 Config" ).arg( account->accountFriendlyName() ), parent, Qt::Sheet ); + DelegateConfigWrapper* dialog = new DelegateConfigWrapper( account->configurationWidget(), account->aboutWidget(), QObject::tr( "%1 Config" ).arg( account->accountFriendlyName() ), parent, Qt::Sheet ); dialog->setProperty( "accountplugin", QVariant::fromValue< QObject* >( account ) ); UtilsObject* obj = new UtilsObject( dialog ); @@ -110,7 +110,7 @@ createAccountFromFactory( Tomahawk::Accounts::AccountFactory* factory, QWidget* dialog->show(); #else - DelegateConfigWrapper dialog( account->configurationWidget(), account->aboutWidget(), QString("%1 Config" ).arg( account->accountFriendlyName() ), parent ); + DelegateConfigWrapper dialog( account->configurationWidget(), account->aboutWidget(), QObject::tr( "%1 Config" ).arg( account->accountFriendlyName() ), parent ); QWeakPointer< DelegateConfigWrapper > watcher( &dialog ); if( account->configurationWidget()->metaObject()->indexOfSignal( "dataError(bool)" ) > -1 ) @@ -139,7 +139,7 @@ openAccountConfig( Tomahawk::Accounts::Account* account, QWidget* parent, bool s if( account->configurationWidget() ) { #ifndef Q_OS_MAC - DelegateConfigWrapper dialog( account->configurationWidget(), account->aboutWidget(), QString("%1 Configuration" ).arg( account->accountFriendlyName() ), parent ); + DelegateConfigWrapper dialog( account->configurationWidget(), account->aboutWidget(), QObject::tr("%1 Configuration" ).arg( account->accountFriendlyName() ), parent ); dialog.setShowDelete( showDelete ); QWeakPointer< DelegateConfigWrapper > watcher( &dialog ); int ret = dialog.exec(); @@ -154,7 +154,7 @@ openAccountConfig( Tomahawk::Accounts::Account* account, QWidget* parent, bool s } #else // on osx a sheet needs to be non-modal - DelegateConfigWrapper* dialog = new DelegateConfigWrapper( account->configurationWidget(), account->aboutWidget(), QString("%1 Configuration" ).arg( account->accountFriendlyName() ), parent, Qt::Sheet ); + DelegateConfigWrapper* dialog = new DelegateConfigWrapper( account->configurationWidget(), account->aboutWidget(), QObject::tr("%1 Configuration" ).arg( account->accountFriendlyName() ), parent, Qt::Sheet ); dialog->setShowDelete( showDelete ); dialog->setProperty( "accountplugin", QVariant::fromValue< QObject* >( account ) ); UtilsObject* obj = new UtilsObject( dialog );