From 49ba6c2fa06151f4c80b847d5be20185e3896ac8 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 16 May 2010 12:09:27 +0000 Subject: added wm detection, removed useless settings git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1737 90c681e8-e032-0410-971d-27865f9a5e38 --- src/ui/configdialog.cpp | 5 - src/ui/eqwidget.cpp | 12 +-- src/ui/forms/configdialog.ui | 25 +---- src/ui/mainwindow.cpp | 12 ++- src/ui/playlist.cpp | 13 ++- src/ui/translations/qmmp_cs.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_de.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_hu.ts | 207 +++++++++++++++++-------------------- src/ui/translations/qmmp_it.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_lt.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_pl_PL.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_pt_BR.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_ru.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_tr.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_uk_UA.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_zh_CN.ts | 209 ++++++++++++++++++-------------------- src/ui/translations/qmmp_zh_TW.ts | 209 ++++++++++++++++++-------------------- src/ui/windowsystem.cpp | 16 ++- src/ui/windowsystem.h | 2 +- 19 files changed, 1194 insertions(+), 1397 deletions(-) (limited to 'src') diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 80885919d..8313450a1 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -126,9 +126,6 @@ void ConfigDialog::readSettings() ui.mwTransparencySlider->setValue(100 - settings.value("MainWindow/opacity", 1.0).toDouble()*100); ui.eqTransparencySlider->setValue(100 - settings.value("Equalizer/opacity", 1.0).toDouble()*100); ui.plTransparencySlider->setValue(100 - settings.value("PlayList/opacity", 1.0).toDouble()*100); - //compatibility - ui.openboxCheckBox->setChecked(settings.value("General/openbox_compat", false).toBool()); - ui.metacityCheckBox->setChecked(settings.value("General/metacity_compat", false).toBool()); //view ui.skinCursorsCheckBox->setChecked(settings.value("General/skin_cursors", false).toBool()); ui.doubleSizeCheckBox->setChecked(settings.value("General/double_size", false).toBool()); @@ -442,8 +439,6 @@ void ConfigDialog::saveSettings() settings.setValue ("MainWindow/opacity", 1.0 - (double)ui.mwTransparencySlider->value()/100); settings.setValue ("Equalizer/opacity", 1.0 - (double)ui.eqTransparencySlider->value()/100); settings.setValue ("PlayList/opacity", 1.0 - (double)ui.plTransparencySlider->value()/100); - settings.setValue ("General/openbox_compat", ui.openboxCheckBox->isChecked()); - settings.setValue ("General/metacity_compat", ui.metacityCheckBox->isChecked()); settings.setValue ("General/resume_on_startup", ui.continuePlaybackCheckBox->isChecked()); settings.setValue ("MainWindow/bitmap_font", ui.useBitmapCheckBox->isChecked()); settings.setValue ("General/skin_cursors", ui.skinCursorsCheckBox->isChecked()); diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp index 176394f35..790f88a84 100644 --- a/src/ui/eqwidget.cpp +++ b/src/ui/eqwidget.cpp @@ -142,13 +142,16 @@ void EqWidget::setMimimalMode(bool b) void EqWidget::readSettings() { - QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("General/openbox_compat", false).toBool() || - settings.value("General/metacity_compat", false).toBool()) +#ifdef Q_WS_X11 + QString wm_name = WindowSystem::netWindowManagerName(); + if(wm_name.contains("metacity", Qt::CaseInsensitive) || + wm_name.contains("openbox", Qt::CaseInsensitive)) setWindowFlags (Qt::Tool | Qt::FramelessWindowHint); else +#endif setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup ("Equalizer"); //geometry move (settings.value ("pos", QPoint (100, 216)).toPoint()); @@ -459,6 +462,3 @@ void EqWidget::updateMask() if (!region.isEmpty()) setMask(region); } - - - diff --git a/src/ui/forms/configdialog.ui b/src/ui/forms/configdialog.ui index e0dd6a78c..6390ae7d0 100644 --- a/src/ui/forms/configdialog.ui +++ b/src/ui/forms/configdialog.ui @@ -707,7 +707,7 @@ - + Visibility Control @@ -730,29 +730,6 @@ - - - - Compatibility - - - - - - Openbox compatibility - - - - - - - Metacity compatibility - - - - - - diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 787fb0069..b1547eb4b 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -48,6 +48,7 @@ #include "addurldialog.h" #include "listwidget.h" #include "visualmenu.h" +#include "windowsystem.h" #include "builtincommandlineoption.h" #define KEY_OFFSET 10000 @@ -55,6 +56,9 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option_manager, QWidget *parent) : QMainWindow(parent) { +#ifdef Q_WS_X11 + qDebug("MainWindow: detected wm: %s", qPrintable(WindowSystem::netWindowManagerName())); +#endif m_vis = 0; m_update = false; m_option_manager = option_manager; @@ -134,7 +138,6 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option resume(); } - MainWindow::~MainWindow() {} @@ -331,13 +334,16 @@ void MainWindow::readSettings() m_playlist->setVisible(m_display->isPlaylistVisible()); m_equalizer->setVisible(m_display->isEqualizerVisible()); } - - if(!settings.value("General/metacity_compat", false).toBool()) +#ifdef Q_WS_X11 + if(!WindowSystem::netWindowManagerName().contains("metacity", Qt::CaseInsensitive)) { +#endif setWindowOpacity(settings.value("MainWindow/opacity", 1.0).toDouble()); m_equalizer->setWindowOpacity(settings.value("Equalizer/opacity", 1.0).toDouble()); m_playlist->setWindowOpacity(settings.value("PlayList/opacity", 1.0).toDouble()); +#ifdef Q_WS_X11 } +#endif m_hideOnClose = settings.value("MainWindow/hide_on_close", false).toBool(); } diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index fa9a273f2..60784a31f 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -467,6 +467,14 @@ void PlayList::changeEvent (QEvent * event) void PlayList::readSettings() { +#ifdef Q_WS_X11 + QString wm_name = WindowSystem::netWindowManagerName(); + if(wm_name.contains("metacity", Qt::CaseInsensitive) || + wm_name.contains("openbox", Qt::CaseInsensitive)) + setWindowFlags (Qt::Tool | Qt::FramelessWindowHint); + else +#endif + setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); QSettings settings (Qmmp::configFile(), QSettings::IniFormat); if (settings.value("PlayList/show_plalists", false).toBool()) { @@ -490,11 +498,6 @@ void PlayList::readSettings() } else { - if (settings.value("General/openbox_compat", false).toBool() || - settings.value("General/metacity_compat", false).toBool()) - setWindowFlags (Qt::Tool | Qt::FramelessWindowHint); - else - setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); move (settings.value ("PlayList/pos", QPoint (100, 332)).toPoint()); //position m_update = true; } diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index 1de290dfc..b8ffc8787 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -183,13 +183,13 @@ Soubor - + Artist Umělec - + Album Album @@ -204,72 +204,72 @@ Vypnuto - + Transports Protokoly - + Decoders Dekodéry - + Engines Přehrávače - + Title Název - + Track number Číslo stopy - + Two-digit track number Dvoumístné číslo stopy - + Disc number Číslo disku - + Condition Stav - + Composer Skladatel - + File name Název souboru - + File path Cesta k souboru - + Genre Žánr - + Year Rok - + Comment Poznámka @@ -326,7 +326,7 @@ ??? - + Replay Gain Zisk při přehrávání @@ -404,100 +404,85 @@ - + Preferences Nastavení - - + + Information Informace - - Compatibility - Kompatibilita - - - - Openbox compatibility - Kompatibilita s Openbox - - - - Metacity compatibility - Kompatibilita s Metacity - - - + Cover Image Retrieve Získat obrázek obalu - + Use separate image files Použít samostatné obrázky - + Include files: Zahrnout soubory: - + Exclude files: Vynechat soubory: - + Recursive search depth: Hloubka rekurzivního hledání: - + Playback Přehrávání - + Continue playback on startup Po startu pokračovat v přehrávání - + Replay Gain mode: Režim úpravy zisku při přehrávání: - + Preamp: Předzesílení: - - + + dB dB - + Default gain: Výchozí zisk: - + Use peak info to prevent clipping Použít informaci o vrcholu k zabránění ořezu - + Output: Výstup: - + 16-bit output 16bitový výstup @@ -512,78 +497,78 @@ Zobrazení - + File Dialog Souborový dialog - + Proxy Proxy - + Enable proxy usage Povolit používání proxy - + Proxy host name: Adresa proxy: - + Proxy port: Port proxy: - + Use authentication with proxy Použít autorizaci pro proxy - + Proxy user name: Uživatelské jméno: - + Proxy password: Heslo: - + Archived skin Sbalené téma - + Unarchived skin Rozbalené téma - + Visualization Vizualizace - + Effects Efekty - + General Obecné - + Audio Zvuk - + Use software volume control Používat softwarové ovládání hlasitosti @@ -613,12 +598,12 @@ Převést %20 na mezery - + Select Skin Files Vybrat soubory s tématy - + Skin files Soubory s tématy @@ -663,53 +648,53 @@ EqWidget - - + + preset předvolba - + &Load/Delete &Načíst/Odstranit - + &Save Preset &Uložit předvolbu - + &Save Auto-load Preset Uložit &automatickou předvolbu - + &Import &Importovat - + &Clear &Vynulovat - + Saving Preset Uložení předvolby - + Preset name: Název předvolby: - + preset # předvolba # - + Import Preset Importovat předvolbu @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Výběr adresáře - + Select one or more files to open Vyberte jeden či více souborů k otevření - + &Play Pře&hrát - + X X - + &Pause Pau&za - + C C - + &Stop &Stop - + V V - + &Previous &Předchozí - + Z Z - + &Next &Další - + B B - + &Jump To File Přeskočit na soubo&r - + J J - + &Settings &Nastavení - + Ctrl+P Ctrl+P - + &About O &aplikaci - + &Exit U&končit - + Ctrl+Q Ctrl+Q - - + + Playlist Files Seznamy skladeb - + Open Playlist Načíst seznam skladeb - + Save Playlist Uložit seznam skladeb - + Space Mezerník - + &About Qt O knihovně &Qt - + &Play/Pause &Přehrát/Pauza - + All Supported Bitstreams Všechny podporované formáty - + &Repeat Track &Opakovat stopu - + &Shuffle Za&míchat - + R O - + Ctrl+R Ctrl+R - + S M - + &Repeat Playlist &Opakovat seznam skladeb - + Tools Nástroje diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index 13ac58449..7c0b000cb 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -183,13 +183,13 @@ Dateiname - + Artist Interpret - + Album Album @@ -204,72 +204,72 @@ Deaktiviert - + Transports Transporte - + Decoders Decoder - + Engines - + Title Titel - + Track number Stücknummer - + Two-digit track number Zweistellige Stücknummer - + Disc number CD-Nummer - + Condition Zustand - + Genre Genre - + Composer Komponist - + File name Dateiname - + File path Dateipfad - + Year Jahr - + Comment Kommentar @@ -326,7 +326,7 @@ ??? - + Replay Gain Replay Gain @@ -404,100 +404,85 @@ - + Preferences Konfiguration - - + + Information Information - - Compatibility - Kompatibilität - - - - Openbox compatibility - Openbox-Kompatibilität - - - - Metacity compatibility - Metacity-Kompatibilität - - - + Cover Image Retrieve Holen von Cover-Bildern - + Use separate image files - + Include files: Einzubeziehende Dateien: - + Exclude files: Auszuschließende Dateien: - + Recursive search depth: Rekursive Suchtiefe: - + Playback - + Continue playback on startup - + Replay Gain mode: Replay-Gain-Modus: - + Preamp: - - + + dB dB - + Default gain: - + Use peak info to prevent clipping - + Output: Ausgabe: - + 16-bit output 16-Bit-Ausgabe @@ -512,78 +497,78 @@ - + File Dialog Datei-Dialog - + Proxy Proxyserver - + Enable proxy usage Proxyserver verwenden - + Proxy host name: Name des Proxyservers: - + Proxy port: Port: - + Use authentication with proxy Authentisierung verwenden - + Proxy user name: Benutzername: - + Proxy password: Passwort: - + Archived skin Archiviertes Design - + Unarchived skin Nicht archiviertes Design - + Visualization Visualisierung - + Effects Effekte - + General Sonstige - + Audio Audio - + Use software volume control Softwaregesteuerte Lautstärkeregelung @@ -613,12 +598,12 @@ %20 in Leerzeichen umwandeln - + Select Skin Files Design-Dateien auswählen - + Skin files Design-Dateien @@ -663,53 +648,53 @@ EqWidget - - + + preset Voreinstellung - + &Load/Delete &Laden/Löschen - + &Save Preset &Voreinstellung speichern - + &Save Auto-load Preset &Automatische Voreinstellungen speichern - + &Import &Importieren - + &Clear &Zurücksetzen - + Saving Preset Voreinstellung speichern - + Preset name: Name der Voreinstellung: - + preset # Voreinstellung # - + Import Preset Voreinstellung importieren @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Verzeichnis wählen - + Select one or more files to open Dateien hinzufügen - + &Play &Wiedergabe - + X X - + &Pause &Pause - + C C - + &Stop &Stopp - + V V - + &Previous &Vorheriger Titel - + Z Z - + &Next &Nächster Titel - + B B - + &Jump To File Springe zu &Titel - + J J - + &Settings &Einstellungen - + Ctrl+P Strg+P - + &About Ü&ber - + &Exit Be&enden - + Ctrl+Q Strg+Q - - + + Playlist Files Wiedergabelisten - + Open Playlist Wiedergabeliste öffnen - + Save Playlist Wiedergabeliste speichern - + Space Leertaste - + &About Qt Übe&r Qt - + &Play/Pause Wieder&gabe/Pause - + All Supported Bitstreams Alle unterstützten Formate - + &Repeat Track Tite&l wiederholen - + &Shuffle &Zufallswiedergabe - + R R - + Ctrl+R Strg+R - + S S - + &Repeat Playlist W&iedergabeliste wiederholen - + Tools Werkzeuge diff --git a/src/ui/translations/qmmp_hu.ts b/src/ui/translations/qmmp_hu.ts index 5db987adb..88f45d840 100644 --- a/src/ui/translations/qmmp_hu.ts +++ b/src/ui/translations/qmmp_hu.ts @@ -173,12 +173,12 @@ ConfigDialog - + Archived skin Tömörített skin - + Unarchived skin Tömörítettlen skin @@ -193,33 +193,33 @@ Fájlnév - + Artist Előadó - + Album Album - + Title Cím - + Genre Műfaj - + Year Év - + Comment Megjegyzés @@ -234,62 +234,62 @@ Kikapcsolva - + Transports Transzportálás - + Decoders Dekóderek - + Engines Motorok - + Track number Zeneszám - + Two-digit track number Két jegyű zeneszám - + Composer Zeneszerző - + Disc number Lemezszám - + File name Fájl neve - + File path File útvonala - + Condition Feltétel - + Select Skin Files Skin fájl kiválasztása - + Skin files Skin fájlok @@ -449,91 +449,91 @@ - + Preferences Tulajdonságok - - + + Information Információ - + Playback Lejátszás - + Continue playback on startup Lejátszás folytatása indításkor - + 16-bit output 16 bites kimenet - + Visualization Vizualizáció - + Effects Effektek - + General Általános - + Audio Audió - + Replay Gain Replay Gain - + Replay Gain mode: Replay Gain mód: - + Preamp: Preamp: - - + + dB dB - + Default gain: Alapértelmezett gain: - + Use peak info to prevent clipping Csúcs információ használata a klippelés megelőzéséhez - + Output: Kimenet: - + Use software volume control Szoftveres hangerőszabályzó használata @@ -554,21 +554,6 @@ - Compatibility - Kompatibilitás - - - - Openbox compatibility - Openbox kompatibilitás - - - - Metacity compatibility - Metacity kompatibilitás - - - File Dialog Fájl ablak @@ -600,62 +585,62 @@ Hangszínszabályozó - + Cover Image Retrieve Borító beszerzése - + Use separate image files Különböző képfájlok használata - + Include files: Tartalmazott fájlok: - + Exclude files: Kihagyott fájlok: - + Recursive search depth: Rekúrzív keresési mélység: - + Proxy Proxy - + Enable proxy usage Proxy használatának engedélyezése - + Proxy host name: Proxy host name: - + Proxy port: Proxy port: - + Use authentication with proxy Hitelesítés hasznáalta proxy-val - + Proxy user name: Proxy felhasználónév: - + Proxy password: Proxy jelszó: @@ -663,53 +648,53 @@ EqWidget - - + + preset beállítás - + &Load/Delete &Betölt/Töröl - + &Save Preset Beálítás &mentése - + &Save Auto-load Preset &Automatikusan betöltödő beállítás mentése - + &Import &Importálás - + &Clear &Törlés - + Saving Preset Beállítások mentése - + Preset name: Beállítás neve: - + preset # beállítás # - + Import Preset Beállítás importálása @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Válassz egy könyvtárat - + All Supported Bitstreams Minden támogatott bitráta - + Select one or more files to open Válassz egy vagy több fájlat megnyitásra - + &Play &Lejátszás - + X X - + &Pause &Szünet - + C C - + &Stop &Megállítás - + V V - + &Previous &Előző - + Z Z - + &Next &Következő - + B B - + &Play/Pause &Lejátszás/Szünet - + Space Szóköz - + &Repeat Playlist Lista &ismétlése - + &Repeat Track Számok i&smétlése - + &Shuffle &Véletlenszerű - + R - + Ctrl+R Crtl+R - + S S - + &Jump To File &Ugrás fájlra - + J J - + Tools Eszközök - + &Settings &Beállítások - + Ctrl+P Ctrl+P - + &About &Névjegy - + &About Qt N&évjegy: Qt - + &Exit &Kilépés - + Ctrl+Q Ctrl+Q - - + + Playlist Files Lejátszási lista fájl - + Open Playlist Lista megnyitása - + Save Playlist Lista mentése diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index 73fccee88..a4b9fc7c1 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -183,13 +183,13 @@ File - + Artist Interprete - + Album Album @@ -204,72 +204,72 @@ Disabilitato - + Transports Protocolli di trasporto - + Decoders Decodificatori - + Engines Meccanismi - + Title Titolo - + Track number Traccia n° - + Two-digit track number Traccia n° a due cifre - + Disc number Disco n° - + Condition Condizione - + Genre Genere - + Composer Compositore - + File name Nome file - + File path Percorso file - + Year Anno - + Comment Commento @@ -333,14 +333,14 @@ - + Preferences Impostazioni preferite - - + + Information Informazioni @@ -366,17 +366,17 @@ Avanzato - + 16-bit output uscita a 16 bit - + Archived skin Tema archiviato - + Unarchived skin Tema non archiviato @@ -386,33 +386,33 @@ Connettività - + Visualization Visualizzazione - + Effects Effetti - + General Generale - + File Dialog Menu brani - + Audio Audio - + Replay Gain Normalizzazione @@ -457,38 +457,38 @@ Personalizza - + Replay Gain mode: Metodo di normalizzazione - + Preamp: Preamp: - - + + dB dB - + Default gain: Normalizzazione predefinita - + Use peak info to prevent clipping Utilizza informazioni di picco per evitare tagli - + Output: Uscita: - + Use software volume control Utilizza il controllo volume del programma @@ -518,87 +518,72 @@ Avvia nascosto - - Compatibility - Compatibilità - - - - Openbox compatibility - Compatibilità openbox - - - - Metacity compatibility - Compatibilità Metacity - - - + Cover Image Retrieve Trova immagine copertina - + Use separate image files Usa immagini separate - + Include files: Includi i file: - + Exclude files: Escludi i file: - + Recursive search depth: Profondità ricerca ricorsiva: - + Playback Riproduzione - + Continue playback on startup Continua la riproduzione all'avvio - + Proxy Proxy - + Enable proxy usage Attiva il proxy - + Proxy host name: Nome del server : - + Proxy port: Porta del server : - + Use authentication with proxy Usa autenticazione con il proxy - + Proxy user name: Utente: - + Proxy password: Password : @@ -613,12 +598,12 @@ Converti il carattere « %20 » in spazi - + Select Skin Files Seleziona aspetto - + Skin files Aspetto @@ -663,53 +648,53 @@ EqWidget - - + + preset Impostazione - + &Load/Delete &Carica/Elimina - + &Save Preset &Salva preimpostazione - + &Save Auto-load Preset &Salvare preimpostazioni caricate automaticamente - + &Clear &Cancella - + Saving Preset Salvataggio preimpostazioni - + Preset name: Nome delle preimpostazioni: - + preset # Preimpostazione # - + &Import &Importa - + Import Preset Importa preimpostazione @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Scegliere una cartella - + Select one or more files to open Seleziona uno o più brani da aprire - + &Play &Esegui - + X X - + &Pause &Pausa - + C C - + &Stop &Arresta - + V V - + &Previous &Precedente - + Z Z - + &Next &Successivo - + B B - + &Jump To File &Vai al brano - + J J - + &Settings &Configurazione - + Ctrl+P Ctrl+P - + &Exit &Esci - + Ctrl+Q Ctrl+Q - + Open Playlist Apri lista di brani - + Save Playlist Salva lista di brani - + &About &Informazioni - - + + Playlist Files Brani della lista - + Space Spazio - + &About Qt &Informazioni su Qt - + &Play/Pause &Esegui / Pausa - + All Supported Bitstreams Elenco di tutti i tipi di flusso accettati - + &Repeat Track &Ripeti brano - + &Shuffle &Ordine casuale - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist &Ripeti lista brani - + Tools Strumenti diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index 430b61cc7..5e328536d 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -183,13 +183,13 @@ Bylos pavadinimas - + Artist Atlikėjas - + Album Albumas @@ -204,72 +204,72 @@ Išjungta - + Transports Transportas - + Decoders Dekoderiai - + Engines Varikliai - + Title Pavadinimas - + Track number Takelio numeris - + Two-digit track number Dviejų skaičių takelio numeris - + Disc number Disko numeris - + Condition Būklė - + Composer Autorius - + File name Bylos pavadinimas - + File path Bylos kelias - + Genre Žanras - + Year Metai - + Comment Komentaras @@ -333,14 +333,14 @@ - + Preferences Nustatymai - - + + Information Informacija @@ -366,17 +366,17 @@ Papildomi - + 16-bit output 16 bitų išvestis - + Archived skin Suspausta tema - + Unarchived skin Išskleista tema @@ -386,33 +386,33 @@ Tinklas - + Visualization Vizualizacija - + Effects Efektai - + General Bendri - + File Dialog Pasirinkimo langas - + Audio Audio - + Replay Gain Neįsivaizduoju kaip verst Replay Gain @@ -458,38 +458,38 @@ Nustatyti - + Replay Gain mode: Replay Gain metodas: - + Preamp: Išankstinis stiprinimas: - - + + dB dB - + Default gain: Stiprinimas pagal nutylėjima: - + Use peak info to prevent clipping Naudoti pikų informaciją trūkinėjimo išvengimui - + Output: Išvestis - + Use software volume control Naudoti programinį garso valdymą @@ -519,87 +519,72 @@ Įjungti paslėptą - - Compatibility - Suderinamumas - - - - Openbox compatibility - Openbox suderinamumas - - - - Metacity compatibility - Metacity suderinamumas - - - + Cover Image Retrieve Parsiųsti cd viršelį - + Use separate image files Naudoti atskiras paveiksliukų bylas - + Include files: Įtraukti bylas - + Exclude files: Išskirti bylas - + Recursive search depth: Rekursinės paieškos gylis - + Playback Grojimas - + Continue playback on startup Tęsti grojimą įjungus - + Proxy Proxy - + Enable proxy usage Įjungti proxy palaikymą - + Proxy host name: Proxy serveris: - + Proxy port: Proxy portas: - + Use authentication with proxy Naudoti proxy autentifikavimą - + Proxy user name: Proxy vartotojo vardas: - + Proxy password: Proxy slaptažodis: @@ -614,12 +599,12 @@ Paversti %20 į tarpus - + Select Skin Files Pasirinkti temų bylas - + Skin files Temų bylos @@ -664,53 +649,53 @@ EqWidget - - + + preset Nustatymas - + &Load/Delete &Įkelti/Pašalinti - + &Save Preset &Išsaugoti nustatymus - + &Save Auto-load Preset &Išsaugoti auto-nustatymą - + &Clear &išvalyti - + Saving Preset Išsaugojamas nustatymas - + Preset name: Nustatymo pavadinimas: - + preset # Nustatymas # - + &Import &Importuoti - + Import Preset Importuoti nustatymus @@ -965,168 +950,168 @@ MainWindow - + Choose a directory Pasirinkite aplanką - + Select one or more files to open Pasirinkite vieną ar kelias bylas atvėrimui - + &Play &Groti - + X - + &Pause &Pristabdyti - + C - + &Stop &Sustabdyti - + V - + &Previous &Ankstesnis - + Z - + &Next &Sekantis - + B - + &Jump To File &Pereiti prie bylos - + J - + &Settings &Nustatymai - + Ctrl+P - + &Exit &Išeiti - + Ctrl+Q - + Open Playlist Atverti grojaraštį - + Save Playlist Išsaugoti grojaraštį - + &About &Apie - - + + Playlist Files Grojaraščio bylos - + Space - + &About Qt &Apie Qt - + &Play/Pause &Groti/Pristabdyti - + All Supported Bitstreams Palaikomi bylų tipai - + &Repeat Track &Kartoti takelį - + &Shuffle &Atsitiktine tvarka - + R - + Ctrl+R - + S - + &Repeat Playlist &Kartoti grojaraštį - + Tools Įrankiai diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index 0265dd9eb..f1d9405c6 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -183,13 +183,13 @@ Nazwa pliku - + Artist Artysta - + Album Album @@ -204,72 +204,72 @@ Wyłączone - + Transports Transporty - + Decoders Dekodery - + Engines Silniki - + Title Tytuł - + Track number Numer utworu - + Two-digit track number Dwuznakowy numer utworu - + Disc number Numer albumu - + Condition Warunek - + Genre Gatunek - + Composer Kompozytor - + File name Nazwa pliku - + File path Lokalizacja - + Year Rok - + Comment Komentarz @@ -333,14 +333,14 @@ - + Preferences Ustawienia - - + + Information Informacje @@ -366,17 +366,17 @@ Zaawansowane - + 16-bit output 16-bitowe odtwarzanie - + Archived skin Skompresowana skórka - + Unarchived skin Niekompresowana skórka @@ -386,33 +386,33 @@ Sieć - + Visualization Wizualizacje - + Effects Efekty - + General Ogólne - + File Dialog Okno dialogowe - + Audio Dźwięk - + Replay Gain @@ -457,38 +457,38 @@ Dostosuj - + Replay Gain mode: Tryb Replay Gain: - + Preamp: - - + + dB - + Default gain: Domyślne wzmocnienie: - + Use peak info to prevent clipping Użyj informacji peak by zapobiec "klipnięciom" - + Output: Wyjście: - + Use software volume control Użyj programowej regulacji głośności @@ -518,87 +518,72 @@ Uruchom zminimalizowany - - Compatibility - Kompatybilność - - - - Openbox compatibility - Zgodność z Openbox - - - - Metacity compatibility - Zgodność z Metacity - - - + Cover Image Retrieve Pobieranie okładek - + Use separate image files Użyj oddzielnych obrazków - + Include files: Użyj plików: - + Exclude files: Wyłącz pliki: - + Recursive search depth: Głębokość rekursywnego przeszukiwania: - + Playback Odtwarzanie - + Continue playback on startup Wznów odtwarzanie po uruchomieniu programu - + Proxy Proxy - + Enable proxy usage Włącz proxy - + Proxy host name: Nazwa hosta proxy: - + Proxy port: Port proxy: - + Use authentication with proxy Użyj autoryzacji z proxy - + Proxy user name: Nazwa użytkownika: - + Proxy password: Hasło: @@ -613,12 +598,12 @@ Konwertuj sekwencje %20 na spacje - + Select Skin Files Wybierz skórę - + Skin files Pliki skór @@ -663,53 +648,53 @@ EqWidget - - + + preset profil - + &Load/Delete Wczytaj/&Usuń - + &Save Preset Zapi&sz Profil - + &Save Auto-load Preset Zapi&sz Auto-ładowanie Profilu - + &Clear &Wyczyść - + Saving Preset Zapisywanie Profilu - + Preset name: Nazwa Profilu: - + preset # profil # - + &Import &Importuj - + Import Preset Importuj Profil @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Wybierz katalog - + Select one or more files to open Wybierz jeden lub więcej plików do otwarcia - + &Play &Odtwarzaj - + X X - + &Pause &Wstrzymaj - + C C - + &Stop &Zatrzymaj - + V V - + &Previous &Poprzedni - + Z Z - + &Next &Następny - + B B - + &Jump To File &Skocz do pliku - + J J - + &Settings &Ustawienia - + Ctrl+P Ctrl+P - + &Exit &Wyjście - + Ctrl+Q Ctrl+Q - + Open Playlist Otwórz listę odtwarzania - + Save Playlist Zapisz listę odtwarzania - + &About &O programie - - + + Playlist Files Pliki listy odtwarzania - + Space - + &About Qt &O Qt - + &Play/Pause &Odtwarzaj/Wstrzymaj - + All Supported Bitstreams Wszystkie wspierane formaty - + &Repeat Track &Powtórz utwór - + &Shuffle &Losowo - + R - + Ctrl+R - + S - + &Repeat Playlist Powtó&rz listę odtwarzania - + Tools Narzędzia diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index 7b4d691fc..21af412d6 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -183,13 +183,13 @@ Nome do Arquivo - + Artist Artista - + Album Álbum @@ -204,72 +204,72 @@ - + Transports - + Decoders - + Engines - + Title Título - + Track number - + Two-digit track number - + Disc number - + Condition - + Genre Gênero - + Composer - + File name - + File path - + Year Ano - + Comment Comentário @@ -333,14 +333,14 @@ - + Preferences Preferências - - + + Information Informações @@ -366,17 +366,17 @@ Avançado - + 16-bit output - + Archived skin - + Unarchived skin @@ -386,33 +386,33 @@ - + Visualization - + Effects - + General - + File Dialog - + Audio - + Replay Gain @@ -457,38 +457,38 @@ - + Replay Gain mode: - + Preamp: - - + + dB - + Default gain: - + Use peak info to prevent clipping - + Output: - + Use software volume control @@ -518,87 +518,72 @@ - - Compatibility - - - - - Openbox compatibility - - - - - Metacity compatibility - - - - + Cover Image Retrieve - + Use separate image files - + Include files: - + Exclude files: - + Recursive search depth: - + Playback - + Continue playback on startup - + Proxy - + Enable proxy usage - + Proxy host name: - + Proxy port: - + Use authentication with proxy - + Proxy user name: - + Proxy password: @@ -613,12 +598,12 @@ - + Select Skin Files - + Skin files @@ -663,53 +648,53 @@ EqWidget - - + + preset preset - + &Load/Delete &Carregar/Deletar - + &Save Preset %Salvar preset - + &Save Auto-load Preset &Salvar Auto-Carregar preset - + &Clear &Limpar - + Saving Preset Salvando Preset - + Preset name: Nome Preset: - + preset # Preset # - + &Import &Importar - + Import Preset Importar Preset @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Escolher o diretorio - + Select one or more files to open Selecionar um ou mais arquivos - + &Play Tocar - + X - + &Pause Pausar - + C - + &Stop Parar - + V - + &Previous Anterior - + Z - + &Next Próximo - + B - + &Jump To File Pular para arquivo - + J - + &Settings Configurações - + Ctrl+P - + &Exit Sair - + Ctrl+Q - + Open Playlist Abrir Playlist - + Save Playlist Salvar Playlist - + &About &Sobre - - + + Playlist Files ФArquivos de lista de músicas - + Space - + &About Qt - + &Play/Pause - + All Supported Bitstreams - + &Repeat Track - + &Shuffle - + R - + Ctrl+R - + S - + &Repeat Playlist - + Tools diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index 73e57c3a2..4076e0050 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -183,13 +183,13 @@ Имя файла - + Artist Исполнитель - + Album Альбом @@ -204,72 +204,72 @@ Отключено - + Transports Транспорты - + Decoders Декодеры - + Engines Внешние проигрыватели - + Title Название - + Track number Номер трека - + Two-digit track number 2-x разрядный номер трека - + Disc number Номер диска - + Condition Условие - + Genre Жанр - + Composer Композитор - + File name Имя файла - + File path Путь к файлу - + Year Год - + Comment Комментарий @@ -333,14 +333,14 @@ - + Preferences Настройки - - + + Information Информация @@ -366,17 +366,17 @@ Дополнительно - + 16-bit output 16-битный вывод - + Archived skin Упакованная тема - + Unarchived skin Распакованная тема @@ -386,33 +386,33 @@ Сеть - + Visualization Визуализация - + Effects Эффекты - + General Общие - + File Dialog Файловый диалог - + Audio Аудио - + Replay Gain Выравнивание громкости (Replay Gain) @@ -457,38 +457,38 @@ Настроить - + Replay Gain mode: Режим Replay Gain: - + Preamp: Предусиление: - - + + dB дБ - + Default gain: Усиление по умолчанию: - + Use peak info to prevent clipping Использовать пиковое значение для предотвращения срезания - + Output: Вывод: - + Use software volume control Использовать программную регулировку громкости @@ -518,87 +518,72 @@ Запускать скрытым - - Compatibility - Совместимость - - - - Openbox compatibility - Совместимость с Openbox - - - - Metacity compatibility - Совместимость с Metacity - - - + Cover Image Retrieve Поиск обложки альбома - + Use separate image files Использовать отдельные файлы с изображениями - + Include files: Включить файлы: - + Exclude files: Исключить файлы: - + Recursive search depth: Глубина рекурсивного поиска: - + Playback Воспроизведение - + Continue playback on startup Продолжить воспроизведение после запуска - + Proxy Прокси - + Enable proxy usage Использовать прокси - + Proxy host name: Прокси сервер: - + Proxy port: Прокси порт: - + Use authentication with proxy Использовать авторизацию на прокси - + Proxy user name: Имя пользователя прокси: - + Proxy password: Пароль прокси: @@ -613,12 +598,12 @@ Преобразовывать %20 в пробел - + Select Skin Files Выберите файлы обложек - + Skin files Файлы обложек @@ -663,53 +648,53 @@ EqWidget - - + + preset предустановка - + &Load/Delete &Загрузить/Удалить - + &Save Preset &Сохранить предустановку - + &Save Auto-load Preset &Сохранить авто-предустановку - + &Clear &Очистить - + Saving Preset Сохранение предустановки - + Preset name: Имя предустановки: - + preset # предустановка # - + &Import &Импортировать - + Import Preset Импорт предустановки @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Выберите директорию - + Select one or more files to open Выберите один или несколько файлов - + &Play &Воспроизвести - + X - + &Pause &Приостановить - + C - + &Stop &Стоп - + V - + &Previous &Предыдущий фрагмент - + Z - + &Next &Следующий фрагмент - + B - + &Jump To File &Перейти к файлу - + J - + &Settings &Настройки - + Ctrl+P - + &Exit &Выход - + Ctrl+Q - + Open Playlist Открыть список - + Save Playlist Сохранить список - + &About &О программе - - + + Playlist Files Файлы списков - + Space - + &About Qt &О библиотеке Qt - + &Play/Pause &Воспр/приост - + All Supported Bitstreams Все форматы - + &Repeat Track &Повторять трек - + &Shuffle &В случайном порядке - + R - + Ctrl+R - + S - + &Repeat Playlist &Повторять список - + Tools Сервис diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index 398a50e79..f6061b9ed 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -183,13 +183,13 @@ Dosya adı - + Artist Sanatçı - + Album Albüm @@ -204,72 +204,72 @@ - + Transports - + Decoders - + Engines - + Title Başlık - + Track number - + Two-digit track number - + Disc number - + Condition - + Genre Tarz - + Composer - + File name - + File path - + Year Yıl - + Comment Yorum @@ -333,14 +333,14 @@ - + Preferences Tercihler - - + + Information Bilgi @@ -366,17 +366,17 @@ Gelişmiş - + 16-bit output - + Archived skin Arşivlenmiş kabuk - + Unarchived skin Arşivlenmemiş kabuk @@ -386,33 +386,33 @@ Bağlanırlık - + Visualization Görsellik - + Effects Efektler - + General Genel - + File Dialog Dosya Diyaloğu - + Audio Ses - + Replay Gain @@ -457,38 +457,38 @@ - + Replay Gain mode: - + Preamp: - - + + dB - + Default gain: - + Use peak info to prevent clipping - + Output: - + Use software volume control Yazılımsal ses kontrolünü kullan @@ -518,87 +518,72 @@ Gizli başlat - - Compatibility - Uyumluluk - - - - Openbox compatibility - Openbox uyumluluğu - - - - Metacity compatibility - - - - + Cover Image Retrieve - + Use separate image files - + Include files: - + Exclude files: - + Recursive search depth: - + Playback - + Continue playback on startup - + Proxy Vekil sunucu - + Enable proxy usage Vekil sunucu kullanımını etkinleştir - + Proxy host name: Vekil sunucu adı: - + Proxy port: Vekil sunucu portu: - + Use authentication with proxy Vekil sunucu yetkilendirmesi kullan - + Proxy user name: Vekil sunucu kullanıcı adı: - + Proxy password: Vekil sunucu parolası: @@ -613,12 +598,12 @@ %20 yi boşluğa çevir - + Select Skin Files Kabuk Dosyası Seç - + Skin files Kabuk dosyaları @@ -663,53 +648,53 @@ EqWidget - - + + preset tanımlanmış ayar - + &Load/Delete &Yükle/Sil - + &Save Preset Tanımlanmış &Ayarları Kaydet - + &Save Auto-load Preset &Otomatik Tanımlanmış Ayarları Kaydet - + &Clear &Temizle - + Saving Preset Tanımlanmış Ayarla Kaydediliyor - + Preset name: Tanımlanmış ayar adı: - + preset # tanımlanmış ayar # - + &Import &İçe Aktar - + Import Preset Tanımlanmış Ayarları Al @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Bir dizin seçin - + Select one or more files to open Açmak için bir yada daha çok dosya seçin - + &Play &Çal - + X X - + &Pause &Duraklat - + C C - + &Stop &Durdur - + V V - + &Previous &Önceki - + Z Z - + &Next &Sonraki - + B B - + &Jump To File &Parçaya Git - + J J - + &Settings &Ayarlar - + Ctrl+P Ctrl+P - + &Exit &Çıkış - + Ctrl+Q Ctrl+Q - + Open Playlist Çalma Listesini Aç - + Save Playlist Çalma Listesini Kaydet - + &About &Hakkında - - + + Playlist Files Çalma Listesi Dosyaları - + Space Boşluk - + &About Qt &Qt Hakkında - + &Play/Pause &Oynat/Duraklat - + All Supported Bitstreams Tüm Desteklenen Bitstreamler - + &Repeat Track &Parçayı Yinele - + &Shuffle &Rastgele - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist &Çalma Listesini Yinele - + Tools Araçlar diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index 670e76447..f75d9d267 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -183,13 +183,13 @@ Ім'я файлу - + Artist Виконавець - + Album Альбом @@ -204,72 +204,72 @@ Вимкнено - + Transports Транспорти - + Decoders Декодери - + Engines Зовнішні програвачі - + Title Назва - + Track number Номер треку - + Two-digit track number 2- розрядний номер трека - + Disc number Номер диску - + Condition Умова - + Genre Жанр - + Composer Композитор - + File name Ім'я файлу - + File path Шлях файлу - + Year Рік - + Comment Коментар @@ -333,14 +333,14 @@ - + Preferences Налаштування - - + + Information Інформація @@ -366,17 +366,17 @@ Додатково - + 16-bit output 16-бітний вивід - + Archived skin Упакована тема - + Unarchived skin Розпакована тема @@ -386,33 +386,33 @@ Мережа - + Visualization Візуалізація - + Effects Ефекти - + General Загальне - + File Dialog Файловий діалог - + Audio Звук - + Replay Gain Нормалізація гучності @@ -457,38 +457,38 @@ Налаштувати - + Replay Gain mode: Режим нормалізації гучності: - + Preamp: Преамплітуда: - - + + dB - + Default gain: Нормалізація за умовчанням: - + Use peak info to prevent clipping Використовувати інформацію піків для запобігання відсікання - + Output: Виведення: - + Use software volume control Використовувати програмний контроль гучності @@ -518,87 +518,72 @@ Запускати схованим - - Compatibility - Сумісність - - - - Openbox compatibility - Сумісність з Openbox - - - - Metacity compatibility - Сумісність з Metacity - - - + Cover Image Retrieve Пошук обладинки альбома - + Use separate image files Використовувати окремі файли зображень - + Include files: Включити файли: - + Exclude files: Виключити файли: - + Recursive search depth: Глибина рекурсивного пошуку: - + Playback Відтворення - + Continue playback on startup Продовжити відтворення при запуску - + Proxy Проксі - + Enable proxy usage Використосувати проксі - + Proxy host name: Сервер проксі: - + Proxy port: Порт проксі: - + Use authentication with proxy Використовувати авторизацію на проксі - + Proxy user name: Ім'я користвача проксі: - + Proxy password: Пароль проксі: @@ -613,12 +598,12 @@ Конвертувати %20 в пробіл - + Select Skin Files Вибрати файли скінів - + Skin files Файли скінів @@ -663,53 +648,53 @@ EqWidget - - + + preset предвстановлення - + &Load/Delete &Завантажити/Видалити - + &Save Preset &Зберегти предвстановлення - + &Save Auto-load Preset &Зберегти авто-предвстановлення - + &Clear &Очистити - + Saving Preset Збережені предвстановлення - + Preset name: Ім'я предвстановлення: - + preset # предвстановлення # - + &Import &Імпортувати - + Import Preset Імпорт предвстановлення @@ -964,168 +949,168 @@ MainWindow - + Choose a directory Виберіть теку - + Select one or more files to open Виберіть один чи кілька файлів - + &Play &Відтворити - + X - + &Pause &Пауза - + C - + &Stop &Стоп - + V - + &Previous &Назад - + Z - + &Next &Вперед - + B - + &Jump To File &Перейти до файлу - + J - + &Settings &Налаштування - + Ctrl+P - + &Exit &Вихід - + Ctrl+Q - + Open Playlist Відкрити список - + Save Playlist Зберегти список - + &About &Про програму - - + + Playlist Files Файли списків - + Space - + &About Qt &Про Qt - + &Play/Pause &Грати/Пауза - + All Supported Bitstreams Усі формати - + &Repeat Track &Повторити трек - + &Shuffle &Перемішати - + R - + Ctrl+R - + S - + &Repeat Playlist &Повторити список - + Tools Утиліти diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index 486c9b0f8..cf1ab5871 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -183,13 +183,13 @@ 文件名 - + Artist 艺术家 - + Album 专辑 @@ -204,72 +204,72 @@ - + Transports - + Decoders - + Engines - + Title 标题 - + Track number - + Two-digit track number - + Disc number - + Condition - + Genre 流派 - + Composer - + File name - + File path - + Year 年代 - + Comment 备注 @@ -333,14 +333,14 @@ - + Preferences 参数设置 - - + + Information 信息 @@ -366,17 +366,17 @@ 高级 - + 16-bit output - + Archived skin 压缩皮肤 - + Unarchived skin 未压缩皮肤 @@ -386,33 +386,33 @@ 连接 - + Visualization 可视化 - + Effects 特效 - + General 常规 - + File Dialog 文件对话 - + Audio 音频 - + Replay Gain @@ -457,38 +457,38 @@ - + Replay Gain mode: - + Preamp: - - + + dB - + Default gain: - + Use peak info to prevent clipping - + Output: - + Use software volume control 使用软设备音量控制 @@ -518,87 +518,72 @@ 启动时隐藏 - - Compatibility - - - - - Openbox compatibility - - - - - Metacity compatibility - - - - + Cover Image Retrieve - + Use separate image files - + Include files: - + Exclude files: - + Recursive search depth: - + Playback - + Continue playback on startup - + Proxy 代理 - + Enable proxy usage 启用代理 - + Proxy host name: 主机名： - + Proxy port: 端口： - + Use authentication with proxy 需要身份验证 - + Proxy user name: 用户名： - + Proxy password: 密码： @@ -613,12 +598,12 @@ 转换 %20 为空格 - + Select Skin Files 选择皮肤文件 - + Skin files 皮肤文件 @@ -663,53 +648,53 @@ EqWidget - - + + preset 预设 - + &Load/Delete 载入/删除(&L) - + &Save Preset 保存预设(&S) - + &Save Auto-load Preset 保存自动载入预设(&S) - + &Clear 清除(&C) - + Saving Preset 保存预设 - + Preset name: 预设名称： - + preset # 预设 # - + &Import 导入(&I) - + Import Preset 导入预设 @@ -964,168 +949,168 @@ MainWindow - + Choose a directory 选择一个目录 - + Select one or more files to open 选择打开一个或更多文件 - + &Play 播放(&P) - + X X - + &Pause 暂停(&P) - + C C - + &Stop 停止(&S) - + V V - + &Previous 上一曲(&P) - + Z Z - + &Next 下一曲(&N) - + B B - + &Jump To File 跳到文件(&J) - + J J - + &Settings 设置(&S) - + Ctrl+P Ctrl+P - + &Exit 退出(&E) - + Ctrl+Q Ctrl+Q - + Open Playlist 打开播放列表 - + Save Playlist 保存播放列表 - + &About 关于(&A) - - + + Playlist Files 播放列表文件 - + Space 空格 - + &About Qt 关于 Qt (&A) - + &Play/Pause 播放/暂停(&P) - + All Supported Bitstreams 支持的全部文件 - + &Repeat Track 重复音轨(&R) - + &Shuffle 乱序(&S) - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist 重复播放列表(&R) - + Tools 工具 diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index aacecbbb3..bfa76f94c 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -183,13 +183,13 @@ 檔名 - + Artist 藝術家 - + Album 專輯 @@ -204,72 +204,72 @@ - + Transports - + Decoders - + Engines - + Title 標題 - + Track number - + Two-digit track number - + Disc number - + Condition - + Genre 流派 - + Composer - + File name - + File path - + Year 年代 - + Comment 備註 @@ -333,14 +333,14 @@ - + Preferences 引數設定 - - + + Information 資訊 @@ -366,17 +366,17 @@ 進階 - + 16-bit output - + Archived skin 封包皮膚 - + Unarchived skin 未封包皮膚 @@ -386,33 +386,33 @@ 連線 - + Visualization 可視化 - + Effects 特效 - + General 常規 - + File Dialog 檔案對話 - + Audio 聲訊 - + Replay Gain @@ -457,38 +457,38 @@ - + Replay Gain mode: - + Preamp: - - + + dB - + Default gain: - + Use peak info to prevent clipping - + Output: - + Use software volume control 使用軟裝置音量控制 @@ -518,87 +518,72 @@ 啟動時隱藏 - - Compatibility - - - - - Openbox compatibility - - - - - Metacity compatibility - - - - + Cover Image Retrieve - + Use separate image files - + Include files: - + Exclude files: - + Recursive search depth: - + Playback - + Continue playback on startup - + Proxy 代理 - + Enable proxy usage 啟用代理 - + Proxy host name: 主機名： - + Proxy port: 通訊埠： - + Use authentication with proxy 需要身份驗證 - + Proxy user name: 用戶名： - + Proxy password: 密碼： @@ -613,12 +598,12 @@ 轉換 %20 為空格 - + Select Skin Files 選取皮膚檔案 - + Skin files 皮膚檔案 @@ -663,53 +648,53 @@ EqWidget - - + + preset 預設 - + &Load/Delete 載入/移除(&L) - + &Save Preset 儲存預設(&S) - + &Save Auto-load Preset 儲存自動載入預設(&S) - + &Clear 清除(&C) - + Saving Preset 儲存預設 - + Preset name: 預設名稱： - + preset # 預設 # - + &Import 導入(&I) - + Import Preset 導入預設 @@ -964,168 +949,168 @@ MainWindow - + Choose a directory 選取一個目錄 - + Select one or more files to open 選取開啟一個或更多檔案 - + &Play 播放(&P) - + X X - + &Pause 暫停(&P) - + C C - + &Stop 停止(&S) - + V V - + &Previous 上一曲(&P) - + Z Z - + &Next 下一曲(&N) - + B B - + &Jump To File 跳到檔案(&J) - + J J - + &Settings 設定(&S) - + Ctrl+P Ctrl+P - + &Exit 結束(&E) - + Ctrl+Q Ctrl+Q - + Open Playlist 開啟播放清單 - + Save Playlist 儲存播放清單 - + &About 關於(&A) - - + + Playlist Files 播放清單檔案 - + Space 空格 - + &About Qt 關於 Qt (&A) - + &Play/Pause 播放/暫停(&P) - + All Supported Bitstreams 支援的全部檔案 - + &Repeat Track 重復音軌(&R) - + &Shuffle 亂序(&S) - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist 重復播放清單(&R) - + Tools 工具 diff --git a/src/ui/windowsystem.cpp b/src/ui/windowsystem.cpp index a85748584..bbf1a457b 100644 --- a/src/ui/windowsystem.cpp +++ b/src/ui/windowsystem.cpp @@ -59,10 +59,8 @@ void WindowSystem::ghostWindow(WId win) SubstructureRedirectMask | SubstructureNotifyMask, &xev); } -char* WindowSystem::netWindowManagerName() +QString WindowSystem::netWindowManagerName() { - char* name = NULL; - Display* dsp = QX11Info::display(); WId root = DefaultRootWindow(dsp); @@ -71,7 +69,7 @@ char* WindowSystem::netWindowManagerName() retValue1 = getWindowProperty(root, "_NET_SUPPORTING_WM_CHECK"); if (retValue1 == NULL) - return NULL; + return QString(); WId win = *(reinterpret_cast(retValue1)); @@ -79,14 +77,14 @@ char* WindowSystem::netWindowManagerName() if (retValue2 == NULL) { XFree(retValue1); - return NULL; + return QString(); } if (win != *(reinterpret_cast(retValue2))) { XFree(retValue1); XFree(retValue2); - return NULL; + return QString(); } XFree(retValue2); @@ -95,12 +93,10 @@ char* WindowSystem::netWindowManagerName() retValue2 = getWindowProperty(win, "_NET_WM_NAME"); XFree(retValue1); if (retValue2 == NULL) - return NULL; - - name = strdup(reinterpret_cast(retValue2)); + return QString(); + QString name = QString((char *)retValue2); XFree(retValue2); - return name; } diff --git a/src/ui/windowsystem.h b/src/ui/windowsystem.h index bc317f426..051982de5 100644 --- a/src/ui/windowsystem.h +++ b/src/ui/windowsystem.h @@ -28,7 +28,7 @@ class WindowSystem public: #ifdef Q_WS_X11 static void ghostWindow(WId id); - static char* netWindowManagerName(); + static QString netWindowManagerName(); static void changeWinSticky(WId win, bool stick); private: static unsigned char* getWindowProperty(WId win, const char* prop); -- cgit v1.2.3-13-gbd6f