Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
stsdc committed Apr 23, 2021
2 parents ac9b829 + 46778d4 commit e58b80c
Show file tree
Hide file tree
Showing 24 changed files with 708 additions and 112 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

name: "CI: Lint"
# name: "CI: Lint"

on: [push, pull_request]
# on: [push, pull_request]

jobs:
lint:
# jobs:
# lint:

runs-on: ubuntu-latest
# runs-on: ubuntu-latest

container:
image: valalang/lint
# container:
# image: valalang/lint

steps:
- uses: actions/checkout@v1
- name: Lint
run: io.elementary.vala-lint -d .
# steps:
# - uses: actions/checkout@v1
# - name: Lint
# run: io.elementary.vala-lint -d .
17 changes: 16 additions & 1 deletion data/com.github.stsdc.monitor.appdata.xml.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2020 Stanisław <@ststdc> -->
<!-- Copyright 2021 Stanisław <@ststdc> -->
<component type="desktop">
<id>com.github.stsdc.monitor</id>
<metadata_license>CC0</metadata_license>
Expand Down Expand Up @@ -28,6 +28,21 @@
<url type="help">https://github.com/stsdc/monitor/issues</url>

<releases>
<release version="0.9.4" date="2021-04-23">
​ <description>
​ <p>🐛 Should fix empty Indicator. Please reboot after installation ⚡️</p>
​ </description>
​ </release>
<release version="0.9.3" date="2021-04-17">
​ <description>
​ <ul>
<li>🐛 Try to fix frequent GUI hangs 🥶</li>
<li>🇳🇱 Update Dutch translation (@Vistaus)</li>
<li>🇵🇹 Update Portuguese translation (@hugok79)</li>
<li>🇷🇴 Add Romanian translation (@tiberiufrat)</li>
</ul>
​ </description>
​ </release>
<release version="0.9.2" date="2020-12-14">
​ <description>
​ <ul>
Expand Down
25 changes: 25 additions & 0 deletions data/com.github.stsdc.monitor.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,31 @@
<summary>To start Monitor in background or not</summary>
<description>To start Monitor in background or not</description>
</key>
<key type='b' name="indicator-cpu-state">
<default>true</default>
<summary>To show CPU usage in Monitor Indicator or not</summary>
<description>To show CPU usage in Monitor Indicator or not</description>
</key>
<key type='b' name="indicator-memory-state">
<default>true</default>
<summary>To show memory usage in Monitor Indicator or not</summary>
<description>To show memory usage in Monitor Indicator or not</description>
</key>
<key type='b' name="indicator-temperature-state">
<default>true</default>
<summary>To show temperature value in Monitor Indicator or not</summary>
<description>To show temperature value in Monitor Indicator or not</description>
</key>
<key type='b' name="indicator-network-up-state">
<default>false</default>
<summary>To show network up bandwith data in Monitor Indicator or not</summary>
<description>To show network up bandwith in Monitor Indicator or not</description>
</key>
<key type='b' name="indicator-network-down-state">
<default>false</default>
<summary>To show network down bandwith in Monitor Indicator or not</summary>
<description>To show network down bandwith in Monitor Indicator or not</description>
</key>
<key type="s" name="opened-view">
<default>'process_view'</default>
<summary>Opened view</summary>
Expand Down
1 change: 1 addition & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ shared_module(
'src/Indicator/Widgets/PopoverWidget.vala',
'src/Indicator/Widgets/IndicatorWidget.vala',
'src/Indicator/Widgets/TemperatureWidget.vala',
'src/Indicator/Widgets/NetworkWidget.vala',

'src/Indicator/Services/DBusClient.vala',
# 'src/Widgets/RevealerSwitch.vala',
Expand Down
2 changes: 1 addition & 1 deletion po/LINGUAS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
de es fr it ja lt nl pl pt ru tr uk
de es fr it ja lt nl pl pt ru tr uk ro
2 changes: 1 addition & 1 deletion po/extra/LINGUAS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
de es fr ja lt nl pl pt ru uk
de es fr ja lt nl pl pt ru uk ro
11 changes: 6 additions & 5 deletions po/extra/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the extra package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# Hugo Carvalho <[email protected]>, 2019, 2020, 2021.
#
msgid ""
msgstr ""
"Project-Id-Version: extra\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-20 22:25+0900\n"
"PO-Revision-Date: 2020-10-15 18:34+0100\n"
"PO-Revision-Date: 2021-01-11 21:29+0000\n"
"Last-Translator: Hugo Carvalho <[email protected]>\n"
"Language-Team: \n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.6\n"
"Last-Translator: Hugo Carvalho <[email protected]>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: pt\n"

#: data/com.github.stsdc.monitor.appdata.xml.in:7
#: data/com.github.stsdc.monitor.desktop.in:3
Expand All @@ -37,7 +38,7 @@ msgstr "Stanisław Dac"

#: data/com.github.stsdc.monitor.desktop.in:4
msgid "System Monitor"
msgstr "Monitor do sistema"
msgstr "Monitor do Sistema"

#: data/com.github.stsdc.monitor.desktop.in:6
msgid "Manage processes and monitor resource usage of the system"
Expand All @@ -49,4 +50,4 @@ msgstr "com.github.stsdc.monitor"

#: data/com.github.stsdc.monitor.desktop.in:14
msgid "System monitor;System usage;Task manager;"
msgstr "Monitor do sistema;Utilização do sistema;Gestor de tarefas;"
msgstr "Monitor do Sistema;Utilização do Sistema;Gestor de Tarefas;"
52 changes: 52 additions & 0 deletions po/extra/ro.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the extra package.
# Tiberiu Frățilă <[email protected]>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: extra\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-20 22:25+0900\n"
"PO-Revision-Date: 2020-12-16 09:58+0200\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.6\n"
"Last-Translator: \n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
"Language: ro_RO\n"

#: data/com.github.stsdc.monitor.appdata.xml.in:7
#: data/com.github.stsdc.monitor.desktop.in:3
msgid "Monitor"
msgstr "Monitor"

#: data/com.github.stsdc.monitor.appdata.xml.in:8
msgid "Manage processes and monitor system resources"
msgstr "Gestionează procesele și monitorizează resursele de sistem"

#: data/com.github.stsdc.monitor.appdata.xml.in:10
msgid "Display usage of system resources, filter and manage processes."
msgstr "Afișează gradul de utilizare a resurselor de sistem, filtrează și gestionează procesele."

#: data/com.github.stsdc.monitor.appdata.xml.in:22
msgid "Stanisław Dac"
msgstr "Stanisław Dac"

#: data/com.github.stsdc.monitor.desktop.in:4
msgid "System Monitor"
msgstr "Monitor de sistem"

#: data/com.github.stsdc.monitor.desktop.in:6
msgid "Manage processes and monitor resource usage of the system"
msgstr "Gestionează procesele și monitorizează resursele de sistem"

#: data/com.github.stsdc.monitor.desktop.in:10
msgid "com.github.stsdc.monitor"
msgstr "com.github.stsdc.monitor"

#: data/com.github.stsdc.monitor.desktop.in:14
msgid "System monitor;System usage;Task manager;"
msgstr "System monitor;System usage;Task manager;Monitor de sistem;Manager de activități;Procese;Utilizarea sistemului;"
67 changes: 32 additions & 35 deletions po/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,22 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-25 22:12+0400\n"
"PO-Revision-Date: 2020-08-22 19:23+0200\n"
"PO-Revision-Date: 2020-12-14 13:52+0100\n"
"Last-Translator: Heimen Stoffels <[email protected]>\n"
"Language-Team: \n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.1\n"
"X-Generator: Poedit 2.4.2\n"

#: src/MainWindow.vala:34
#, fuzzy
msgid "Processes"
msgstr "Procesnaam"
msgstr "Processen"

#: src/MainWindow.vala:35
#, fuzzy
msgid "System"
msgstr "Systeemaanroepen"
msgstr "Systeem"

#: src/Utils.vala:2
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:32
Expand Down Expand Up @@ -97,32 +95,31 @@ msgstr "THR"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:110
msgid "The app is waiting in an uninterruptible disk sleep"
msgstr ""
msgstr "De toepassing wacht op een ononderbreekbare slaapstand"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:112
msgid "Idle kernel thread"
msgstr ""
msgstr "Inactieve kernel-thread"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:114
msgid "The process is running or runnable (on run queue)"
msgstr ""
msgstr "Het proces is actief of activeerbaar (in de wachtrij)"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:116
msgid ""
"The process is in an interruptible sleep; waiting for an event to complete"
msgstr ""
msgid "The process is in an interruptible sleep; waiting for an event to complete"
msgstr "Het proces bevindt zich in een ononderbreekbare slaapstand, wachtend op afronding van een handeling"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:118
msgid "The process is stopped by a job control signal"
msgstr ""
msgstr "Het proces is afgebroken door een taaksignaal"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:120
msgid "The process is stopped stopped by a debugger during the tracing"
msgstr ""
msgstr "Het proces is afgebroken door een foutopsporingstoepassing"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:122
msgid "The app is terminated but not reaped by its parent"
msgstr ""
msgstr "De toepassing is gedwongen afgesloten, maar niet door het bovenliggende proces"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:18
msgid "Opened files"
Expand Down Expand Up @@ -197,33 +194,33 @@ msgstr "RAM: %.1f%%"
#: src/Views/SystemView/SystemCPUView.vala:32
#: src/Views/SystemView/SystemMemoryView.vala:28
msgid "UTILIZATION"
msgstr ""
msgstr "GEBRUIK"

#: src/Views/SystemView/SystemCPUView.vala:34
#: src/Views/SystemView/SystemCPUView.vala:94
#: src/Views/SystemView/SystemMemoryView.vala:30
#: src/Views/SystemView/SystemMemoryView.vala:35
msgid "Show detailed info"
msgstr ""
msgstr "Uitgebreide informatie tonen"

#: src/Views/SystemView/SystemCPUView.vala:36
msgid "FREQUENCY"
msgstr ""
msgstr "FREQUENTIE"

#: src/Views/SystemView/SystemCPUView.vala:40
msgid "TEMPERATURE"
msgstr ""
msgstr "TEMPERATUUR"

#: src/Views/SystemView/SystemCPUView.vala:96
#: src/Views/SystemView/SystemMemoryView.vala:37
msgid "Hide detailed info"
msgstr ""
msgstr "Uitgebreide informatie verbergen"

#: src/Views/SystemView/SystemCPUView.vala:152
#: src/Views/SystemView/SystemMemoryView.vala:100
#, c-format
msgid "%d%%"
msgstr ""
msgstr "%d%%"

#: src/Views/SystemView/SystemCPUView.vala:153
#: src/Widgets/Statusbar/Statusbar.vala:44
Expand All @@ -232,61 +229,61 @@ msgstr "GHz"

#: src/Views/SystemView/SystemCPUView.vala:154
msgid "℃"
msgstr ""
msgstr ""

#: src/Views/SystemView/SystemMemoryView.vala:41
msgid "Total: "
msgstr ""
msgstr "Totaal: "

#: src/Views/SystemView/SystemMemoryView.vala:44
msgid "Used: "
msgstr ""
msgstr "Gebruikt: "

#: src/Views/SystemView/SystemMemoryView.vala:47
msgid "Shared: "
msgstr ""
msgstr "Gedeeld: "

#: src/Views/SystemView/SystemMemoryView.vala:50
msgid "Buffered: "
msgstr ""
msgstr "Gebufferd: "

#: src/Views/SystemView/SystemMemoryView.vala:53
msgid "Cached: "
msgstr ""
msgstr "Gecachet: "

#: src/Views/SystemView/SystemMemoryView.vala:56
msgid "Locked: "
msgstr ""
msgstr "Vergrendeld: "

#: src/Views/SystemView/SystemMemoryView.vala:103
#, c-format
msgid "Total: %s"
msgstr ""
msgstr "Totaal: %s"

#: src/Views/SystemView/SystemMemoryView.vala:104
#, c-format
msgid "Used: %s"
msgstr ""
msgstr "Gebruikt: %s"

#: src/Views/SystemView/SystemMemoryView.vala:105
#, c-format
msgid "Shared: %s"
msgstr ""
msgstr "Gedeeld: %s"

#: src/Views/SystemView/SystemMemoryView.vala:106
#, c-format
msgid "Buffered: %s"
msgstr ""
msgstr "Gebufferd: %s"

#: src/Views/SystemView/SystemMemoryView.vala:107
#, c-format
msgid "Cached: %s"
msgstr ""
msgstr "Gecachet: %s"

#: src/Views/SystemView/SystemMemoryView.vala:108
#, c-format
msgid "Locked: %s"
msgstr ""
msgstr "Vergrendeld: %s"

#: src/Widgets/Headerbar/Headerbar.vala:13
msgid "Monitor"
Expand All @@ -310,7 +307,7 @@ msgstr "Zoeken naar proces"

#: src/Widgets/Headerbar/Search.vala:15
msgid "Type process name or PID to search"
msgstr "Voer de procesnaam of PID in"
msgstr "Voer de procesnaam of pid in"

#: src/Widgets/Statusbar/Statusbar.vala:14
msgid "Swap"
Expand Down
Loading

0 comments on commit e58b80c

Please sign in to comment.