diff options
| -rw-r--r-- | src/qmmpui/configdialog.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/metadataformatter.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/qmmpuisettings.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_ru.ts | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp index df0134906..faa451642 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp @@ -313,7 +313,7 @@ void ConfigDialog::createMenus() groupMenu->addAction(tr("Year"))->setData("%y"); groupMenu->addAction(tr("Condition"))->setData("%if(%p&%a,%p - %a,%p%a)"); groupMenu->addAction(tr("Artist/Album"))->setData("%p%if(%p&%a, - ,)%a"); - groupMenu->addAction(tr("Artist/Year/Album"))->setData("%if(%p,%p -,)%if(%y, [%y],)%if(%a, %a,)"); + groupMenu->addAction(tr("Artist/Year/Album"))->setData("%p%if(%p&%a, - %if(%y,[%y] ,),)%a"); m_ui->groupButton->setMenu(groupMenu); m_ui->groupButton->setPopupMode(QToolButton::InstantPopup); diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp index a5471dd1a..d9699edb9 100644 --- a/src/qmmpui/metadataformatter.cpp +++ b/src/qmmpui/metadataformatter.cpp @@ -78,7 +78,7 @@ QString MetaDataFormatter::parse(const QMap<Qmmp::MetaData, QString> &metaData, title = processIfKeyWord(title); title.replace("%28", "("); title.replace("%29", ")"); - return title; + return title.trimmed(); } QString MetaDataFormatter::formatLength(qint64 length) const diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp index c8cdf8683..f757a7b31 100644 --- a/src/qmmpui/qmmpuisettings.cpp +++ b/src/qmmpui/qmmpuisettings.cpp @@ -31,7 +31,7 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent) m_instance = this; QSettings s (Qmmp::configFile(), QSettings::IniFormat); m_title_format = s.value("PlayList/title_format", "%p%if(%p&%t, - ,)%t").toString(); - m_group_format = s.value("PlayList/group_format", "%if(%p,%p -,)%if(%y, [%y],)%if(%a, %a,)").toString(); + m_group_format = s.value("PlayList/group_format", "%p%if(%p&%a, - %if(%y,[%y] ,),)%a").toString(); m_convertUnderscore = s.value ("PlayList/convert_underscore", true).toBool(); m_convertTwenty = s.value ("PlayList/convert_twenty", true).toBool(); m_useMetadata = s.value ("PlayList/load_metadata", true).toBool(); diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts index 92bf55c29..c75934fb7 100644 --- a/src/qmmpui/translations/libqmmpui_ru.ts +++ b/src/qmmpui/translations/libqmmpui_ru.ts @@ -197,12 +197,12 @@ <message> <location filename="../configdialog.cpp" line="315"/> <source>Artist/Album</source> - <translation type="unfinished"></translation> + <translation>Исполнитель/Альбом</translation> </message> <message> <location filename="../configdialog.cpp" line="316"/> <source>Artist/Year/Album</source> - <translation type="unfinished"></translation> + <translation>Исполнитель/Год/Альбом</translation> </message> <message> <location filename="../configdialog.cpp" line="326"/> @@ -428,7 +428,7 @@ <message> <location filename="../forms/configdialog.ui" line="160"/> <source>Group format:</source> - <translation type="unfinished"></translation> + <translation>Формат группы:</translation> </message> <message> <location filename="../forms/configdialog.ui" line="190"/> @@ -724,7 +724,7 @@ <location filename="../jumptotrackdialog.cpp" line="90"/> <location filename="../jumptotrackdialog.cpp" line="152"/> <source>Unqueue</source> - <translation type="unfinished"></translation> + <translation>Снять с очереди</translation> </message> </context> <context> |