Improvements in translation

diff --git a/resources/someplayer_ru.ts b/resources/someplayer_ru.ts
index 55c2529..9260fde 100644 (file)
--- a/resources/someplayer_ru.ts
+++ b/resources/someplayer_ru.ts
@@ -119,7 +119,7 @@
         <translation>Плейлисты</translation>
     </message>
     <message>
-        <location filename="../src/libraryform.cpp" line="778"/>
+        <location filename="../src/libraryform.cpp" line="782"/>
         <source>Search in library</source>
         <translation>Поиск по библиотеке</translation>
     </message>
@@ -265,31 +265,37 @@
     </message>
     <message>
         <location filename="../src/playerform.cpp" line="90"/>
+        <location filename="../src/playerform.cpp" line="726"/>
         <source>Clear playlist</source>
         <translation>Очистить плейлист</translation>
     </message>
     <message>
         <location filename="../src/playerform.cpp" line="91"/>
+        <location filename="../src/playerform.cpp" line="727"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <location filename="../src/playerform.cpp" line="92"/>
+        <location filename="../src/playerform.cpp" line="728"/>
         <source>Add to favorites</source>
         <translation>В любимые</translation>
     </message>
     <message>
         <location filename="../src/playerform.cpp" line="93"/>
+        <location filename="../src/playerform.cpp" line="729"/>
         <source>Enqueue</source>
         <translation>В очередь</translation>
     </message>
     <message>
         <location filename="../src/playerform.cpp" line="94"/>
+        <location filename="../src/playerform.cpp" line="730"/>
         <source>Add to playlists</source>
         <translation>Добавить в плейлисты</translation>
     </message>
     <message>
         <location filename="../src/playerform.cpp" line="95"/>
+        <location filename="../src/playerform.cpp" line="731"/>
         <source>Edit tags</source>
         <translation>Редактировать теги</translation>
     </message>

diff --git a/src/main.cpp b/src/main.cpp
index ee0a444..090c40b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <QtGui/QApplication>
-#include <QTranslator>
 #include "mainwindow.h"
 #include "config.h"
 
@@ -27,12 +26,9 @@ using namespace SomePlayer::Storage;
 int main(int argc, char *argv[])
 {
        QApplication a(argc, argv);
-       QTranslator *translator = new QTranslator(0);
-       Config config;
-       translator->load(QString("/opt/someplayer/someplayer_%1").arg(config.getValue("ui/language").toString()));
-       a.installTranslator(translator);
        a.setApplicationName("ru.somebody.someplayer");
        MainWindow w;
+       w.updateTranslations();
        w.setAttribute(Qt::WA_Maemo5StackedWindow);
        w.setWindowFlags(w.windowFlags() | Qt::Window);
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f46be74..195e01a 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -278,12 +278,6 @@ void MainWindow::settings() {
        _library_form->checkGradient();
        _directory_form->updateIcons();
        _directory_form->updateGradient();
-       if (config.getValue("ui/language").toString() != "en") {
-               _translator->load(QString("/opt/someplayer/someplayer_%1").arg(config.getValue("ui/language").toString()));
-               QApplication::installTranslator(_translator);
-       } else {
-               QApplication::removeTranslator(_translator);
-       }
        updateTranslations();
 }
 
@@ -317,6 +311,13 @@ void MainWindow::_add_tracks(QList<Track> tracks) {
 }
 
 void MainWindow::updateTranslations() {
+       Config config;
+       if (config.getValue("ui/language").toString() != "en") {
+               _translator->load(QString("/opt/someplayer/someplayer_%1").arg(config.getValue("ui/language").toString()));
+               QApplication::installTranslator(_translator);
+       } else {
+               QApplication::removeTranslator(_translator);
+       }
        ui->retranslateUi(this);
        _player_form->updateTranslations();
        _library_form->updateTranslations();

diff --git a/src/playerform.cpp b/src/playerform.cpp
index 47999d1..55d85ad 100644 (file)
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -723,4 +723,10 @@ void PlayerForm::_toggle_extra_buttons() {
 
 void PlayerForm::updateTranslations() {
        ui->retranslateUi(this);
+       __clear_playlist->setText(tr("Clear playlist"));
+       __delete_action->setText(tr("Delete"));
+       __add_to_favorites->setText(tr("Add to favorites"));
+       __enqueue_action->setText(tr("Enqueue"));
+       __add_to_playlists->setText(tr("Add to playlists"));
+       __edit_tags->setText(tr("Edit tags"));
 }