1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 07:49:42 +01:00

Merge pull request #139 from lliehu/i18n

Some i18n improvements
This commit is contained in:
Christian Muehlhaeuser 2012-12-20 07:12:01 -08:00
commit a6b524579c
22 changed files with 46 additions and 45 deletions

View File

@ -71,7 +71,7 @@
<item>
<widget class="ImageButton" name="prevButton">
<property name="text">
<string>Prev</string>
<string notr="true" extracomment="not translatable because is placeholder text">Prev</string>
</property>
</widget>
</item>
@ -83,14 +83,14 @@
<item>
<widget class="ImageButton" name="playPauseButton">
<property name="text">
<string>Play</string>
<string notr="true" extracomment="not translatable because is placeholder text">Play</string>
</property>
</widget>
</item>
<item>
<widget class="ImageButton" name="pauseButton">
<property name="text">
<string>Pause</string>
<string notr="true" extracomment="not translatable because is placeholder text">Pause</string>
</property>
</widget>
</item>
@ -99,7 +99,7 @@
<item>
<widget class="ImageButton" name="nextButton">
<property name="text">
<string>Next</string>
<string notr="true" extracomment="not translatable because is placeholder text">Next</string>
</property>
</widget>
</item>
@ -225,7 +225,7 @@
</size>
</property>
<property name="text">
<string>Artist</string>
<string notr="true" extracomment="not translatable because is placeholder text">Artist</string>
</property>
</widget>
</item>
@ -244,7 +244,7 @@
</size>
</property>
<property name="text">
<string>Album</string>
<string notr="true" extracomment="not translatable because is placeholder text">Album</string>
</property>
</widget>
</item>
@ -292,7 +292,7 @@
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>social</string>
<string notr="true" extracomment="not translatable because is placeholder text">social</string>
</property>
</widget>
</item>
@ -308,7 +308,7 @@
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>love</string>
<string notr="true" extracomment="not translatable because is placeholder text">love</string>
</property>
</widget>
</item>
@ -341,7 +341,7 @@
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>resolver</string>
<string notr="true" extracomment="not translatable because is placeholder text">resolver</string>
</property>
</widget>
</item>
@ -377,7 +377,7 @@
<item>
<widget class="QLabel" name="timeLabel">
<property name="text">
<string>Time</string>
<string notr="true" extracomment="not translatable because is placeholder text">Time</string>
</property>
<property name="alignment">
<set>Qt::AlignLeft|Qt::AlignVCenter</set>
@ -406,7 +406,7 @@
<item>
<widget class="QLabel" name="timeLeftLabel">
<property name="text">
<string>Time Left</string>
<string notr="true" extracomment="not translatable because is placeholder text">Time Left</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignVCenter</set>
@ -487,7 +487,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Shuffle</string>
<string notr="true" extracomment="not translatable because is placeholder text">Shuffle</string>
</property>
</widget>
</item>
@ -500,7 +500,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Repeat</string>
<string notr="true" extracomment="not translatable because is placeholder text">Repeat</string>
</property>
</widget>
</item>
@ -538,7 +538,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Low</string>
<string notr="true" extracomment="not translatable because is placeholder text">Low</string>
</property>
</widget>
</item>
@ -570,7 +570,7 @@
</sizepolicy>
</property>
<property name="text">
<string>High</string>
<string notr="true" extracomment="not translatable because is placeholder text">High</string>
</property>
</widget>
</item>

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">

View File

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">

View File

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -66,7 +66,7 @@
</size>
</property>
<property name="text">
<string>Cover</string>
<string notr="true" extracomment="not translatable because is placeholder text">Cover</string>
</property>
</widget>
</item>
@ -123,7 +123,7 @@
<item>
<widget class="QLabel" name="charsLeftLabel">
<property name="text">
<string>TextLabel</string>
<string notr="true" extracomment="not translatable because is placeholder text">TextLabel</string>
</property>
</widget>
</item>

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="topMargin">

View File

@ -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 );
}

View File

@ -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 ); };

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>";
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
}

View File

@ -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 );

View File

@ -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 );
}

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

View File

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

View File

@ -23,7 +23,7 @@
</size>
</property>
<property name="windowTitle">
<string>InfoBar</string>
<string notr="true" comment="not translatable because not shown to the user">InfoBar</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

View File

@ -23,7 +23,7 @@
</size>
</property>
<property name="windowTitle">
<string>InfoBar</string>
<string notr="true" extracomment="not translatable because not shown to the user">InfoBar</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>

View File

@ -23,7 +23,7 @@
</size>
</property>
<property name="windowTitle">
<string>InfoBar</string>
<string notr="true" extracomment="not translatable because not shown to the user">InfoBar</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

View File

@ -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 );

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -43,7 +43,7 @@
</size>
</property>
<property name="text">
<string>Cover</string>
<string notr="true" extracomment="not translatable because is placeholder text">Cover</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -43,7 +43,7 @@
</size>
</property>
<property name="text">
<string>Cover</string>
<string notr="true" extracomment="not translatable because is placeholder text">Cover</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -43,7 +43,7 @@
</size>
</property>
<property name="text">
<string>Cover</string>
<string notr="true" extracomment="not translatable because is placeholder test">Cover</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -78,7 +78,7 @@
</size>
</property>
<property name="text">
<string>Statistics</string>
<string notr="true" extracomment="not translatable because is placeholder test">Statistics</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>