mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

A few string changes

Browse Source 
Make a few better translatable and one more understandable
This commit is contained in:
Lasse Liehu
2012-12-20 13:57:20 +02:00
parent 031931c0e8
commit 66c05cf9b3
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/accounts/zeroconf/ZeroconfAccount.cpp
View File

@@ -64,8 +64,8 @@ ZeroconfFactory::icon() const
ZeroconfAccount::ZeroconfAccount( const QString& accountId ) ZeroconfAccount::ZeroconfAccount( const QString& accountId )
: Account( accountId ) : Account( accountId )
{ {
setAccountServiceName( "Local Network" ); setAccountServiceName( tr( "Local Network" ) );
setAccountFriendlyName( "Local Network" ); setAccountFriendlyName( tr( "Local Network" ) );
setTypes( SipType ); setTypes( SipType );
} }

2
src/accounts/zeroconf/ZeroconfAccount.h
View File

@@ -39,7 +39,7 @@ public:
virtual ~ZeroconfFactory(); virtual ~ZeroconfFactory();
virtual QString factoryId() const { return "zeroconfaccount"; } 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" ); } QString description() const { return tr( "Automatically connect to Tomahawks on the local network" ); }
virtual bool isUnique() const { return true; } virtual bool isUnique() const { return true; }
AccountTypes types() const { return AccountTypes( SipType ); }; AccountTypes types() const { return AccountTypes( SipType ); };

2
src/libtomahawk/Query.cpp
View File

@@ -773,7 +773,7 @@ Query::socialActionDescription( const QString& action, DescriptionMode mode ) co
desc += " " + tr( "and" ) + " <b>" + tr( "%n other(s)", "", loveCounter - 3 ) + "</b>"; desc += " " + tr( "and" ) + " <b>" + tr( "%n other(s)", "", loveCounter - 3 ) + "</b>";
if ( mode == Short ) if ( mode == Short )
desc = "<b>" + tr( "%1 people" ).arg( loveCounter ) + "</b>"; desc = "<b>" + tr( "%n people", "", loveCounter ) + "</b>";
desc += " " + tr( "loved this track" ); //FIXME: more action descs required desc += " " + tr( "loved this track" ); //FIXME: more action descs required
} }

2
src/libtomahawk/TomahawkSettings.cpp
View File

@@ -372,7 +372,7 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
} }
else if ( pluginName == "sipzeroconf" ) 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 ); beginGroup( "accounts/" + accountKey );

1
src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
View File

@@ -191,6 +191,7 @@ LastFmConfig::onHistoryLoaded()
{ {
if ( m_page != total ) if ( m_page != total )
{ {
//: Text on a button that resumes import
m_ui->importHistory->setText( tr( "History Incomplete. Resume" ) ); m_ui->importHistory->setText( tr( "History Incomplete. Resume" ) );
m_ui->importHistory->setEnabled( true ); m_ui->importHistory->setEnabled( true );
} }

8
src/libtomahawk/utils/GuiHelpers.cpp
View File

@@ -99,7 +99,7 @@ createAccountFromFactory( Tomahawk::Accounts::AccountFactory* factory, QWidget*
{ {
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
// on osx a sheet needs to be non-modal // 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 ) ); dialog->setProperty( "accountplugin", QVariant::fromValue< QObject* >( account ) );
UtilsObject* obj = new UtilsObject( dialog ); UtilsObject* obj = new UtilsObject( dialog );
@@ -110,7 +110,7 @@ createAccountFromFactory( Tomahawk::Accounts::AccountFactory* factory, QWidget*
dialog->show(); dialog->show();
#else #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 ); QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
if( account->configurationWidget()->metaObject()->indexOfSignal( "dataError(bool)" ) > -1 ) if( account->configurationWidget()->metaObject()->indexOfSignal( "dataError(bool)" ) > -1 )
@@ -139,7 +139,7 @@ openAccountConfig( Tomahawk::Accounts::Account* account, QWidget* parent, bool s
if( account->configurationWidget() ) if( account->configurationWidget() )
{ {
#ifndef Q_OS_MAC #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 ); dialog.setShowDelete( showDelete );
QWeakPointer< DelegateConfigWrapper > watcher( &dialog ); QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
int ret = dialog.exec(); int ret = dialog.exec();
@@ -154,7 +154,7 @@ openAccountConfig( Tomahawk::Accounts::Account* account, QWidget* parent, bool s
} }
#else #else
// on osx a sheet needs to be non-modal // 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->setShowDelete( showDelete );
dialog->setProperty( "accountplugin", QVariant::fromValue< QObject* >( account ) ); dialog->setProperty( "accountplugin", QVariant::fromValue< QObject* >( account ) );
UtilsObject* obj = new UtilsObject( dialog ); UtilsObject* obj = new UtilsObject( dialog );