From: Flavio Tordini Date: Thu, 25 Jun 2009 09:30:46 +0000 (+0200) Subject: Fixed shortcuts that need no translations. X-Git-Tag: 0.4~35 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2f3954aea5a4a170cb5a541c83771b95cab1073e;p=minitube Fixed shortcuts that need no translations. Also added a missing tr() and restored system locale detection --- diff --git a/locale/es_AR.ts b/locale/es_AR.ts index b564585..3ec7c57 100644 --- a/locale/es_AR.ts +++ b/locale/es_AR.ts @@ -5,57 +5,62 @@ AboutView - + There's life outside the browser! Hay vida fuera del navegador! - + Version %1 Versión-%1 - + This is a "Technology Preview" release, do not expect it to be perfect. Esta es a edicion "Technology Preview". no espere que sea perfecta. - + Report bugs and send in your ideas to %1 Reportar errores y envia tus idea a %1 - + %1 is Free Software but its development takes precious time. %1 es Software Libre pero su desarrollo lleva tiempo. - + Please <a href='%1'>donate via PayPal</a> to support the continued development of %2. Por favor <a href='%1'>donar a través de PayPal para colaborar con el desarrollo de %2. - + Icon designed by %1. Iconos diseñados por %1. - + Translated by %1 Traducido por %1 - + Released under the <a href='%1'>GNU General Public License</a> Desarrollado bajo <a href='%1'>GNU General Public License</a> - + + &Close + + + + About Acerca - + What you always wanted to know about %1 and never dared to ask Que es lo que siempre quisiste saber acerca de %1 y nunca lo preguntaste @@ -63,7 +68,7 @@ ClearButton - + Clear Limpiar @@ -71,22 +76,22 @@ ListModel - + Searching... Buscando... - + Show %1 More Mostrar %1 más - + No videos No videos - + No more videos No más videos @@ -94,229 +99,223 @@ MainWindow - + &Back &Atrás - Alt+Left - Retroceder + Retroceder - + Go to the previous view Atrás - + &Stop &Parar - + Stop playback and go back to the search view Parar - - - Esc - Escape + Escape - + S&kip &Saltar - + Skip to the next video Siguiente - Ctrl+Right - Avanzar + Avanzar - - + + &Pause &Pausar - - + + Pause playback Pausar - Space - Espacio + Espacio - - + + &Full Screen &Pantalla completa - + Go full screen Pantalla completa - - Alt+Return - Pantalla completa + Pantalla completa - + &YouTube &YouTube - + Open the YouTube video page Abrir YouTube - + Ctrl+Y - Ir a YouTube + - + &Remove &Borrar - + Remove the selected videos from the playlist Borrar - + Move &Up &Arriba - + Move up the selected videos in the playlist Arriba - Ctrl+Up - Arriba + Arriba - + Move &Down &Abajo - + Move down the selected videos in the playlist Abajo - Ctrl+Down - Arriba + Arriba - + &Quit &Salir - + Ctrl+Q - Salir + - + Bye Adiós - + &Website &Sitio web - Minitube on the Web - Minitube en internet + Minitube en internet + + + + %1 on the Web + - + &Donate via PayPal &Donar-a-través de PayPal - + Please support the continued development of %1 Por favor apoyo el desarrollo continuo de-%1 - + &About &Acerca - + Info about %1 Acercá de-%1 - + &Search &Buscar - + &Application &Aplicación - + &Playlist &Lista de reproducción - + &Video &Video - + &Help &Ayuda - - + + Opening %1 Abriendo-%1 - + &Play &Reproducir - + Resume playback Reproducir - + Exit &Full Screen &Salir de pantalla completa @@ -324,22 +323,22 @@ MediaView - + Most relevant Más relevantes - + Most recent Más recientes - + Most viewed Más visitadas - + You're watching "%1" Estás viendo %1 @@ -347,7 +346,7 @@ PrettyItemDelegate - + %1 views %1-visitas @@ -355,7 +354,7 @@ SearchLineEdit - + Search Buscar @@ -363,32 +362,32 @@ SearchView - + Welcome to <a href='%1'>%2</a>, Bienvenidos a <a href='%1'>%2</a> - + Enter a keyword to start watching videos. Ingrese palabra a buscar. - + Watch Viendo - + Recent keywords Búsquedas recientes - + A new version of %1 is available. Please <a href='%2'>update to version %3</a> Una nueva versión de %1 esta disponible. Por favor <a href='%2'>actualice a la version %3</a> - + Make yourself comfortable Personalizar @@ -396,7 +395,7 @@ SettingsView - + Preferences Preferencias diff --git a/locale/it_IT.ts b/locale/it_IT.ts index cb04d02..8816ad5 100644 --- a/locale/it_IT.ts +++ b/locale/it_IT.ts @@ -45,10 +45,15 @@ Tradotto da %1 - + Released under the <a href='%1'>GNU General Public License</a> Rilasciato sotto licenza <a href="%1">GNU General Public License</a> + + + &Close + &Chiudi + About @@ -98,11 +103,6 @@ &Back &Indietro - - - Alt+Left - - Go to the previous view @@ -118,13 +118,6 @@ Stop playback and go back to the search view Ferma il video e torna alla ricerca - - - - - Esc - - S&kip @@ -135,31 +128,21 @@ Skip to the next video Salta al prossimo video - - - Ctrl+Right - - - + &Pause &Pausa - + Pause playback Metti in pausa - - - Space - - - + &Full Screen &Schermo intero @@ -168,12 +151,6 @@ Go full screen Vai in modalità schermo intero - - - - Alt+Return - - &YouTube @@ -209,11 +186,6 @@ Move up the selected videos in the playlist Sposta video selezionati verso l'alto - - - Ctrl+Up - - Move &Down @@ -224,11 +196,6 @@ Move down the selected videos in the playlist Sposta i video selezionati verso il basso - - - Ctrl+Down - - &Quit @@ -250,9 +217,13 @@ Sito &web - Minitube on the Web - Minitube sul Web + Minitube sul Web + + + + %1 on the Web + %1 sul Web @@ -300,23 +271,23 @@ &Aiuto - - + + Opening %1 Apertura di %1 - + &Play - + Resume playback Continua - + Exit &Full Screen &Esci dallo schermo intero diff --git a/locale/locale.pri b/locale/locale.pri index e428eec..e480367 100644 --- a/locale/locale.pri +++ b/locale/locale.pri @@ -6,7 +6,8 @@ DEPENDPATH += $$PWD TRANSLATIONS += \ it_IT.ts \ pt_BR.ts \ - ru_RU.ts + ru_RU.ts \ + es_AR.ts isEmpty(QMAKE_LRELEASE) { win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe -silent diff --git a/locale/pt_BR.ts b/locale/pt_BR.ts index c281b38..16f1046 100644 --- a/locale/pt_BR.ts +++ b/locale/pt_BR.ts @@ -45,10 +45,15 @@ - + Released under the <a href='%1'>GNU General Public License</a> Lançado sob a <a href='%1'>Licença Pública Geral GNU</a> + + + &Close + + About @@ -99,9 +104,8 @@ &Voltar - Alt+Left - Alt+Left + Alt+Left @@ -119,11 +123,8 @@ Parar a reprodução e voltar à visualização da pesquisa - - - Esc - Esc + Esc @@ -136,30 +137,28 @@ Pular para o próximo vídeo - Ctrl+Right - Ctrl+Right + Ctrl+Right - + &Pause &Pausar - + Pause playback Pausar a reprodução - Space - Barra de espaço + Barra de espaço - + &Full Screen &Tela Cheia @@ -169,10 +168,8 @@ Ir para a tela cheia - - Alt+Return - Alt+Enter + Alt+Enter @@ -210,9 +207,8 @@ Mover para cima os vídeos selecionados na playlist - Ctrl+Up - Ctrl+Up + Ctrl+Up @@ -225,9 +221,8 @@ Mover para baixo os vídeos selecionados na playlist - Ctrl+Down - Ctrl+Down + Ctrl+Down @@ -250,9 +245,13 @@ &Website - Minitube on the Web - Minitube na Web + Minitube na Web + + + + %1 on the Web + %1 na Web @@ -300,23 +299,23 @@ &Ajuda - - + + Opening %1 Abrindo %1 - + &Play &Reproduzir - + Resume playback Continuar reprodução - + Exit &Full Screen Sair de &Tela Cheia diff --git a/locale/ru_RU.ts b/locale/ru_RU.ts index bef123f..5618fd2 100644 --- a/locale/ru_RU.ts +++ b/locale/ru_RU.ts @@ -45,10 +45,15 @@ - + Released under the <a href='%1'>GNU General Public License</a> Выпущено на условиях <a href='%1'>GNU General Public License</a> + + + &Close + + About @@ -99,9 +104,8 @@ &Назад - Alt+Left - Alt+стрелка назад + Alt+стрелка назад @@ -119,11 +123,8 @@ Остановить воспроизведение и вернуться к поиску - - - Esc - Esc + Esc @@ -136,30 +137,28 @@ Перейти к следующему видео - Ctrl+Right - Ctrl+стрелка вправо + Ctrl+стрелка вправо - + &Pause &Приостановить - + Pause playback Приостановить воспроизведение - Space - Пробел + Пробел - + &Full Screen &На весь экран @@ -169,10 +168,8 @@ Полноэкранное воспроизведение - - Alt+Return - Alt+Enter + Alt+Enter @@ -210,9 +207,8 @@ Сдвинуть выбранные видеоклипы вверх в списке воспроизведения - Ctrl+Up - Ctrl+стрелка вверх + Ctrl+стрелка вверх @@ -225,9 +221,8 @@ Сдвинуть выбранные видеоклипы вниз в списке воспроизведения - Ctrl+Down - Ctrl+стрелка вниз + Ctrl+стрелка вниз @@ -250,9 +245,13 @@ &Домашняя страница - Minitube on the Web - Minitube в интернете + Minitube в интернете + + + + %1 on the Web + %1 в интернете @@ -300,23 +299,23 @@ Спр&авка - - + + Opening %1 Открытие %1 - + &Play Пр&оиграть - + Resume playback Продолжить воспроизведение - + Exit &Full Screen В&ыйти из полноэкранного воспроизведения diff --git a/src/AboutView.cpp b/src/AboutView.cpp index a94ecbf..1ef93b7 100644 --- a/src/AboutView.cpp +++ b/src/AboutView.cpp @@ -31,7 +31,10 @@ AboutView::AboutView(QWidget *parent) : QWidget(parent) { "

" + tr("Icon designed by %1.").arg("Sebastian Kraft") + "

" - "

" + tr("Translated by %1").arg("Nikita Lyalin (ru_RU), Márcio Moraes (pt_BR)") + "

" + "

" + tr("Translated by %1").arg("Nikita Lyalin (ru_RU), " + "Márcio Moraes (pt_BR), " + "Sergio Tocalini Joerg (es_AR)" + ) + "

" "

" + tr("Released under the GNU General Public License") .arg("http://www.gnu.org/licenses/gpl.html") + "

" @@ -43,7 +46,7 @@ AboutView::AboutView(QWidget *parent) : QWidget(parent) { QLayout *buttonLayout = new QHBoxLayout(); buttonLayout->setAlignment(Qt::AlignLeft); - QPushButton *closeButton = new QPushButton("&Close", this); + QPushButton *closeButton = new QPushButton(tr("&Close"), this); closeButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); closeButton->setDefault(true); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 1f9ed55..00ce011 100755 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -88,34 +88,34 @@ void MainWindow::createActions() { backAct = new QAction(QIcon(":/images/go-previous.png"), tr("&Back"), this); backAct->setEnabled(false); - backAct->setShortcut(tr("Alt+Left")); + backAct->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Left)); backAct->setStatusTip(tr("Go to the previous view")); actions->insert("back", backAct); connect(backAct, SIGNAL(triggered()), this, SLOT(goBack())); stopAct = new QAction(QtIconLoader::icon("media-stop", QIcon(":/images/stop.png")), tr("&Stop"), this); stopAct->setStatusTip(tr("Stop playback and go back to the search view")); - stopAct->setShortcut(tr("Esc")); + stopAct->setShortcut(QKeySequence(Qt::Key_Escape)); actions->insert("stop", stopAct); connect(stopAct, SIGNAL(triggered()), this, SLOT(stop())); skipAct = new QAction(QtIconLoader::icon("media-skip-forward", QIcon(":/images/skip.png")), tr("S&kip"), this); skipAct->setStatusTip(tr("Skip to the next video")); - skipAct->setShortcut(tr("Ctrl+Right")); + skipAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Right)); skipAct->setEnabled(false); actions->insert("skip", skipAct); connect(skipAct, SIGNAL(triggered()), mediaView, SLOT(skip())); pauseAct = new QAction(QtIconLoader::icon("media-pause", QIcon(":/images/pause.png")), tr("&Pause"), this); pauseAct->setStatusTip(tr("Pause playback")); - pauseAct->setShortcut(tr("Space")); + pauseAct->setShortcut(QKeySequence(Qt::Key_Space)); pauseAct->setEnabled(false); actions->insert("pause", pauseAct); connect(pauseAct, SIGNAL(triggered()), mediaView, SLOT(pause())); fullscreenAct = new QAction(QtIconLoader::icon("view-fullscreen", QIcon(":/images/view-fullscreen.png")), tr("&Full Screen"), this); fullscreenAct->setStatusTip(tr("Go full screen")); - fullscreenAct->setShortcut(tr("Alt+Return")); + fullscreenAct->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Enter)); fullscreenAct->setShortcutContext(Qt::ApplicationShortcut); actions->insert("fullscreen", fullscreenAct); connect(fullscreenAct, SIGNAL(triggered()), this, SLOT(fullscreen())); @@ -147,14 +147,14 @@ void MainWindow::createActions() { moveUpAct = new QAction(QtIconLoader::icon("go-up", QIcon(":/images/go-up.png")), tr("Move &Up"), this); moveUpAct->setStatusTip(tr("Move up the selected videos in the playlist")); - moveUpAct->setShortcut(tr("Ctrl+Up")); + moveUpAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Up)); moveUpAct->setEnabled(false); actions->insert("moveUp", moveUpAct); connect(moveUpAct, SIGNAL(triggered()), mediaView, SLOT(moveUpSelected())); moveDownAct = new QAction(QtIconLoader::icon("go-down", QIcon(":/images/go-down.png")), tr("Move &Down"), this); moveDownAct->setStatusTip(tr("Move down the selected videos in the playlist")); - moveDownAct->setShortcut(tr("Ctrl+Down")); + moveDownAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Down)); moveDownAct->setEnabled(false); actions->insert("moveDown", moveDownAct); connect(moveDownAct, SIGNAL(triggered()), mediaView, SLOT(moveDownSelected())); @@ -168,7 +168,7 @@ void MainWindow::createActions() { siteAct = new QAction(tr("&Website"), this); siteAct->setShortcut(QKeySequence::HelpContents); - siteAct->setStatusTip(tr("Minitube on the Web")); + siteAct->setStatusTip(tr("%1 on the Web").arg(Constants::APP_NAME)); actions->insert("site", siteAct); connect(siteAct, SIGNAL(triggered()), this, SLOT(visitSite())); @@ -450,13 +450,13 @@ void MainWindow::stop() { void MainWindow::fullscreen() { if (m_fullscreen) { mediaView->exitFullscreen(); - fullscreenAct->setShortcut(tr("Alt+Return")); + fullscreenAct->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Enter)); fullscreenAct->setText(tr("&Full Screen")); - stopAct->setShortcut(tr("Esc")); + stopAct->setShortcut(QKeySequence(Qt::Key_Escape)); } else { mediaView->fullscreen(); - stopAct->setShortcut(tr("")); - fullscreenAct->setShortcut(tr("Esc")); + stopAct->setShortcut(QString("")); + fullscreenAct->setShortcut(QKeySequence(Qt::Key_Escape)); fullscreenAct->setText(tr("Exit &Full Screen")); } m_fullscreen = !m_fullscreen; diff --git a/src/main.cpp b/src/main.cpp index 98d8ae6..6f4166f 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,7 +13,7 @@ int main(int argc, char **argv) { app.setOrganizationName(Constants::ORG_NAME); app.setOrganizationDomain(Constants::ORG_DOMAIN); - QString locale = ""; //QLocale::system().name(); + QString locale = QLocale::system().name(); // qt translations QTranslator qtTranslator;