diff --git a/CHANGELOG b/CHANGELOG index 9716c1b..d238081 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,23 @@ -qps-1.10.17 / 2017-09-22 +qps-1.10.18 / 2018-05-21 ======================== + * Bumped patch version to 18 (#45) + * Update from Weblate. (#41) + * Added transltion state to README.md + * Add da translation + * translation update + * Added translation using Weblate (German) + * Create qps_da.ts + * Update qps.desktop.in + * i18n: Update Polish translation + * Drop Qt foreach + * Fix links QtDesktop --> lxqt + +1.10.17 / 2017-09-22 +==================== + + * Release 1.10.17: Update changelog * some whitespaces fixed * l10n: Polish translation * Remove obsolete cpack diff --git a/CMakeLists.txt b/CMakeLists.txt index 934858d..352cdf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,12 @@ endif() set(MAJOR_VERSION 1) set(MINOR_VERSION 10) -set(PATCH_VERSION 17) +set(PATCH_VERSION 18) set(QPS_VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}) -add_definitions(-DQPS_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}") +add_definitions( + -DQPS_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" + -DQT_NO_FOREACH +) # C++11 support include(CheckCXXCompilerFlag) @@ -28,7 +31,7 @@ else() message(FATAL "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. C++11 support is required") endif() -find_package(Qt5 REQUIRED COMPONENTS Widgets X11Extras DBus LinguistTools) +find_package(Qt5 5.7.1 REQUIRED COMPONENTS Widgets X11Extras DBus LinguistTools) include(GNUInstallDirs) include(LXQtTranslateTs) # Although the name it doesn't depend on LXQt in any way diff --git a/README.md b/README.md index 717d040..d1c86b1 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,9 @@ Qps is licensed under the terms of the [GPLv2](http://choosealicense.com/licenses/gpl-2.0/) or any later version. + +### Translation Status + + +Translation status + diff --git a/debian/changelog b/debian/changelog index a29dc1f..fd278c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qps (1.10.18-1) unstable; urgency=medium + + * Cherry-picking upstream-version 1.10.18. + + -- Alf Gaida Mon, 21 May 2018 18:51:56 +0200 + qps (1.10.17-3) unstable; urgency=medium * Bumped compat to 11 diff --git a/debian/rules b/debian/rules index be82032..3132bb7 100755 --- a/debian/rules +++ b/debian/rules @@ -11,4 +11,3 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_BUILD_TYPE=RelWithDebInfo - diff --git a/qps.desktop.in b/qps.desktop.in index 57c0c92..a802f1f 100644 --- a/qps.desktop.in +++ b/qps.desktop.in @@ -2,7 +2,11 @@ Type=Application Name=qps GenericName=Qt process manager +GenericName[da]=Qt-proceshåndtering +GenericName[pl]=Menedżer procesów Qt Comment=Qt application to display and manage running processes +Comment[da]=Qt-program til at vise og håndtere kørende processer +Comment[pl]=Aplikacja Qt do wyświetlania i zarządzania uruchomionymi procesami Icon=qps Categories=System; TryExec=qps diff --git a/src/infobar.cpp b/src/infobar.cpp index 4f7356f..aba3b4b 100644 --- a/src/infobar.cpp +++ b/src/infobar.cpp @@ -806,7 +806,6 @@ void IO_Graph::paintEvent ( QPaintEvent *e ) QString doHistory(SysHistory *sysh) { QString str; - Procinfo *p; int max = 0; char buf[128]; @@ -820,7 +819,7 @@ QString doHistory(SysHistory *sysh) // qsort(ps->data(), ps->size(), sizeof(Procinfo *),(compare_func) // compare_backwards); - foreach (p, sysh->procs) + for (const auto *p : qAsConst(sysh->procs)) { if (p->pcpu == 0) continue; @@ -835,14 +834,13 @@ QString doHistory(SysHistory *sysh) QString GraphBase::doHistoryTXT(SysHistory *sysh) { QString str; - Procinfo *p; int max = 0; char buf[128]; // sprintf(buf,"miniHistory /* %.02f%%",sysh->load_cpu*100); sprintf(buf, "%%CPU miniHistory test"); str += QString::fromLatin1(buf); - foreach (p, sysh->procs) + for (const auto *p : qAsConst(sysh->procs)) { if (p->pcpu == 0) continue; @@ -906,7 +904,6 @@ void GraphBase::mouseMoveEvent(QMouseEvent *e) QString IO_Graph::doHistoryTXT(SysHistory *sysh) { QString str; - Procinfo *p; int max = 0; char buf[64], mem_str[64]; @@ -914,7 +911,7 @@ QString IO_Graph::doHistoryTXT(SysHistory *sysh) sprintf(buf, "miniHistory IO"); str += QString::fromLatin1(buf); - foreach (p, sysh->procs) + for (const auto *p : qAsConst(sysh->procs)) { if (p->io_read_KBps == 0 and p->io_write_KBps == 0) continue; diff --git a/src/proc_common.cpp b/src/proc_common.cpp index 0e27664..c06a26e 100644 --- a/src/proc_common.cpp +++ b/src/proc_common.cpp @@ -1089,8 +1089,7 @@ void Procview::refresh() SysHistory::~SysHistory() { - Procinfo *p; - foreach (p, procs) + for (const auto *p : qAsConst(procs)) { delete p; } diff --git a/src/qps.cpp b/src/qps.cpp index 3728721..0907c6c 100644 --- a/src/qps.cpp +++ b/src/qps.cpp @@ -2328,9 +2328,9 @@ void Qps::about() str.append(qVersion()); str.append("

" - "Source: http://github.com/QtDesktop/qps/" + "Source: https://github.com/lxqt/qps/" "
" - "Bugtracker: https://github.com/QtDesktop/qps/issues" + "Bugtracker: https://github.com/lxqt/qps/issues" ); label->setText(str); diff --git a/src/translations/qps.ts b/src/translations/qps.ts index 8c61fac..d32ecb5 100644 --- a/src/translations/qps.ts +++ b/src/translations/qps.ts @@ -4,7 +4,7 @@ ControlBar - + Pause (Ctrl+Space) @@ -114,7 +114,7 @@ Qps - + Detail @@ -122,47 +122,47 @@ Screenshot - + /untitled. - + Save As - + %1 Files (*.%2);;All Files (*) - + Options - + s - + Screenshot Delay: - + Hide This Window - + New Screenshot - + Quit diff --git a/src/translations/qps_da.ts b/src/translations/qps_da.ts new file mode 100644 index 0000000..2cd6f6a --- /dev/null +++ b/src/translations/qps_da.ts @@ -0,0 +1,171 @@ + + + + + ControlBar + + + Pause (Ctrl+Space) + Pause (Ctrl+Mellemrum) + + + + EventDialog + + + Watchdog 0.1 alpha + Watchdog 0.1 alfa + + + + Eventcat + + + + + Select condition + Vælg betingelse + + + + labelDescrition + etiketbeskrivelse + + + + Enable + Aktivér + + + + process name + procesnavn + + + + cpu + cpu + + + + % + % + + + + include already running process + inkluder allerede kørende proces + + + + run command + kør kommando + + + + show Message + vis meddelelse + + + + Help (Not yet. just concept) + Hjælp (ikke endnu, kun et koncept) + + + + %p : pid +%c : command + %p: pid +%c: kommando + + + + New + Ny + + + + Add + Tilføj + + + + Delete + Slet + + + + Close + Luk + + + + ExecWindow + + + Qps + Qps + + + + Ok + OK + + + + Qps + + + Detail + Detalje + + + + Screenshot + + + /untitled. + /unavngivet. + + + + Save As + Gem som + + + + %1 Files (*.%2);;All Files (*) + %1 filer (*.%2);;Alle filer (*) + + + + Options + Valgmuligheder + + + + s + s + + + + Screenshot Delay: + Forsinkelse for skærmbillede: + + + + Hide This Window + Skjul vinduet + + + + New Screenshot + Nyt skærmbillede + + + + Quit + Afslut + + + diff --git a/src/translations/qps_de.ts b/src/translations/qps_de.ts new file mode 100644 index 0000000..5dbfcd6 --- /dev/null +++ b/src/translations/qps_de.ts @@ -0,0 +1,170 @@ + + + + + ControlBar + + + Pause (Ctrl+Space) + Pause (Strg+Leertaste) + + + + EventDialog + + + Watchdog 0.1 alpha + + + + + Eventcat + + + + + Select condition + Bedingung auswählen + + + + labelDescrition + + + + + Enable + Aktivieren + + + + process name + Prozessname + + + + cpu + CPU + + + + % + + + + + include already running process + bereits laufenden Prozess einbeziehen + + + + run command + starte Befehl + + + + show Message + zeige Nachricht + + + + Help (Not yet. just concept) + Hilfe (Noch nicht. Nur Konzept) + + + + %p : pid +%c : command + + + + + New + Neu + + + + Add + Hinzufügen + + + + Delete + Löschen + + + + Close + Schließen + + + + ExecWindow + + + Qps + + + + + Ok + + + + + Qps + + + Detail + + + + + Screenshot + + + /untitled. + + + + + Save As + Speichern unter + + + + %1 Files (*.%2);;All Files (*) + %1 Dateien (*.%2);;Alle Dateien (*) + + + + Options + Optionen + + + + s + + + + + Screenshot Delay: + Bildschirmfoto Verzögerung: + + + + Hide This Window + Verstecke Dieses Fenster + + + + New Screenshot + Neues Bildschirmfoto + + + + Quit + Beenden + + + diff --git a/src/translations/qps_pl.ts b/src/translations/qps_pl.ts index ff520f8..904c8ae 100644 --- a/src/translations/qps_pl.ts +++ b/src/translations/qps_pl.ts @@ -4,7 +4,7 @@ ControlBar - + Pause (Ctrl+Space) Pauzuj (Ctrl+Spacja) @@ -14,7 +14,7 @@ Watchdog 0.1 alpha - Watchdog 0.1 alpha + Watchdog 0.1 alpha @@ -115,7 +115,7 @@ Qps - + Detail Szczegół @@ -123,47 +123,47 @@ Screenshot - + /untitled. /bez tytułu. - + Save As Zapisz jako - + %1 Files (*.%2);;All Files (*) %1 plików (*.%2);;Wszystkie pliki (*) - + Options Opcje - + s sek - + Screenshot Delay: - Opóźnienie zrzutu ekranu + Opóźnienie wykonania zrzutu ekranu: - + Hide This Window Ukryj to okno - + New Screenshot Nowy zrzut ekranu - + Quit Wyjdź