diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 2961e0fade..4cb4eac4d0 100644 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -1173,7 +1173,7 @@ void CAudioMixerBoard::UpdateTitle() if ( eRecorderState == RS_RECORDING ) { - strTitlePrefix = "[" + tr ( "RECORDING ACTIVE" ) + "] "; + strTitlePrefix = QString ( "[%1] " ).arg ( tr ( "RECORDING ACTIVE" ) ); } // replace & signs with && (See Qt documentation for QLabel) @@ -1183,7 +1183,7 @@ void CAudioMixerBoard::UpdateTitle() QString strEscServerName = strServerName; strEscServerName.replace ( "&", "&&" ); - setTitle ( strTitlePrefix + tr ( "Personal Mix at: " ) + strEscServerName ); + setTitle ( strTitlePrefix + tr ( "Personal Mix at: %1" ).arg ( strEscServerName ) ); setAccessibleName ( title() ); } diff --git a/src/translation/translation_de_DE.ts b/src/translation/translation_de_DE.ts index b2f95fecba..b765704292 100644 --- a/src/translation/translation_de_DE.ts +++ b/src/translation/translation_de_DE.ts @@ -241,8 +241,8 @@ - Personal Mix at: - Eigener Mix am Server: + Personal Mix at: %1 + Eigener Mix am Server: %1 @@ -4485,8 +4485,8 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion 'Stummschalten&apos QCoreApplication - , Version - , Version + %1, Version %2 + %1, Version %2 diff --git a/src/translation/translation_es_ES.ts b/src/translation/translation_es_ES.ts index 1f75616d11..0b9df4eee1 100644 --- a/src/translation/translation_es_ES.ts +++ b/src/translation/translation_es_ES.ts @@ -253,8 +253,8 @@ - Personal Mix at: - Mezcla Personal en el Servidor: + Personal Mix at: %1 + Mezcla Personal en el Servidor: %1 @@ -4541,8 +4541,8 @@ Hemos silenciado tu canal y activado 'Silenciarme Yo'. Por favor resue QCoreApplication - , Version - , Versión + %1, Version %2 + %1, Versión %2 diff --git a/src/translation/translation_fr_FR.ts b/src/translation/translation_fr_FR.ts index f8182d845c..48197bb50a 100644 --- a/src/translation/translation_fr_FR.ts +++ b/src/translation/translation_fr_FR.ts @@ -201,8 +201,8 @@ - Personal Mix at: - Mixage personnel à : + Personal Mix at: %1 + Mixage personnel à : %1 @@ -3921,8 +3921,8 @@ Nous avons coupé votre canal et activé "Me silencer". Veuillez d&apo QCoreApplication - , Version - , version + %1, Version %2 + %1, version %2 diff --git a/src/translation/translation_it_IT.ts b/src/translation/translation_it_IT.ts index d757fb5b1d..d664a6e3ee 100644 --- a/src/translation/translation_it_IT.ts +++ b/src/translation/translation_it_IT.ts @@ -245,8 +245,8 @@ - Personal Mix at: - Mixer personale sul Server: + Personal Mix at: %1 + Mixer personale sul Server: %1 @@ -4482,8 +4482,8 @@ E' stato disattivato l'audio del tuo canale ed inserito il "Disat QCoreApplication - , Version - Versione, Versione + %1, Version %2 + %1 Versione, Versione %2 diff --git a/src/translation/translation_nl_NL.ts b/src/translation/translation_nl_NL.ts index 5f4ab3271e..ee2781c04e 100644 --- a/src/translation/translation_nl_NL.ts +++ b/src/translation/translation_nl_NL.ts @@ -245,8 +245,8 @@ - Personal Mix at: - Eigen mix op: + Personal Mix at: %1 + Eigen mix op: %1 @@ -4489,8 +4489,8 @@ We hebben uw kanaal gedempt en 'Demp mijzelf' geactiveerd. Los eerst h QCoreApplication - , Version - , Versie + %1, Version %2 + %1, Versie %2 diff --git a/src/translation/translation_pl_PL.ts b/src/translation/translation_pl_PL.ts index 5539161527..d3d34c88aa 100644 --- a/src/translation/translation_pl_PL.ts +++ b/src/translation/translation_pl_PL.ts @@ -205,8 +205,8 @@ - Personal Mix at: - Własny miks na: + Personal Mix at: %1 + Własny miks na: %1 @@ -3976,8 +3976,8 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę QCoreApplication - , Version - , Wersja + %1, Version %2 + %1, Wersja %2 diff --git a/src/translation/translation_pt_BR.ts b/src/translation/translation_pt_BR.ts index 42dd0d3962..78659d277c 100644 --- a/src/translation/translation_pt_BR.ts +++ b/src/translation/translation_pt_BR.ts @@ -263,8 +263,8 @@ - Personal Mix at: - Mixagem Pessoal em: + Personal Mix at: %1 + Mixagem Pessoal em: %1 @@ -4519,8 +4519,8 @@ Silenciamos seu canal e ativamos 'Silenciar-me'. Resolva o problema de QCoreApplication - , Version - , Versão + %1, Version %2 + %1, Versão %2 diff --git a/src/translation/translation_pt_PT.ts b/src/translation/translation_pt_PT.ts index 7dd39b4f8f..ecc6e0860c 100644 --- a/src/translation/translation_pt_PT.ts +++ b/src/translation/translation_pt_PT.ts @@ -261,8 +261,8 @@ - Personal Mix at: - Mistura Pessoal no Servidor: + Personal Mix at: %1 + Mistura Pessoal no Servidor: %1 @@ -4477,8 +4477,8 @@ O seu canal foi silenciado e foi activada a função 'Silenciar-me'. P QCoreApplication - , Version - , Versão + %1, Version %2 + %1, Versão %2 diff --git a/src/translation/translation_sk_SK.ts b/src/translation/translation_sk_SK.ts index e299592037..455b252305 100644 --- a/src/translation/translation_sk_SK.ts +++ b/src/translation/translation_sk_SK.ts @@ -205,8 +205,8 @@ - Personal Mix at: - Osobný mix na: + Personal Mix at: %1 + Osobný mix na: %1 @@ -3769,8 +3769,8 @@ Stíšili sme váš kanál a aktivovali nastavenia 'Stíšiť ma'. Pro QCoreApplication - , Version - , Verzia + %1, Version %2 + %1, Verzia %2 diff --git a/src/translation/translation_sv_SE.ts b/src/translation/translation_sv_SE.ts index 8858168121..40f6ce2b72 100644 --- a/src/translation/translation_sv_SE.ts +++ b/src/translation/translation_sv_SE.ts @@ -206,8 +206,8 @@ - Personal Mix at: - Personlig mix på: + Personal Mix at: %1 + Personlig mix på: %1 @@ -4116,8 +4116,8 @@ Vi stängde av din kanal och aktiverade 'Tysta mig själv'. Vänligen QCoreApplication - , Version - , Version + %1, Version %2 + %1, Version %2 diff --git a/src/translation/translation_zh_CN.ts b/src/translation/translation_zh_CN.ts index 8ba9246a38..481e748e7a 100644 --- a/src/translation/translation_zh_CN.ts +++ b/src/translation/translation_zh_CN.ts @@ -201,8 +201,8 @@ - Personal Mix at: - 个人混音室: + Personal Mix at: %1 + 个人混音室: %1 @@ -3288,8 +3288,8 @@ We muted your channel and activated 'Mute Myself'. Please solve the fe QCoreApplication - , Version - ，版本 + %1, Version %2 + %1，版本 %2 diff --git a/src/util.cpp b/src/util.cpp index 2415265999..9c2591c23d 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1562,7 +1562,7 @@ QString GetVersionAndNameStr ( const bool bDisplayInGui ) strVersionText += " *** "; } - strVersionText += APP_NAME + QCoreApplication::tr ( ", Version " ) + VERSION; + strVersionText += QCoreApplication::tr ( "%1, Version %2", "%1 is app name, %2 is version number" ).arg ( APP_NAME ).arg ( VERSION ); if ( bDisplayInGui ) {