Skip to content

Commit dec0cde

Browse files
committed
Merge branch 'dev'
2 parents ac9b829 + 8a1576b commit dec0cde

24 files changed

+702
-111
lines changed

.github/workflows/lint.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

2-
name: "CI: Lint"
2+
# name: "CI: Lint"
33

4-
on: [push, pull_request]
4+
# on: [push, pull_request]
55

6-
jobs:
7-
lint:
6+
# jobs:
7+
# lint:
88

9-
runs-on: ubuntu-latest
9+
# runs-on: ubuntu-latest
1010

11-
container:
12-
image: valalang/lint
11+
# container:
12+
# image: valalang/lint
1313

14-
steps:
15-
- uses: actions/checkout@v1
16-
- name: Lint
17-
run: io.elementary.vala-lint -d .
14+
# steps:
15+
# - uses: actions/checkout@v1
16+
# - name: Lint
17+
# run: io.elementary.vala-lint -d .

data/com.github.stsdc.monitor.appdata.xml.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
<url type="help">https://github.com/stsdc/monitor/issues</url>
2929

3030
<releases>
31+
<release version="0.9.3" date="2021-04-17">
32+
​ <description>
33+
​ <ul>
34+
<li>🐛 Try to fix frequent GUI hangs 🥶</li>
35+
<li>🇳🇱 Update Dutch translation (@Vistaus)</li>
36+
<li>🇵🇹 Update Portuguese translation (@hugok79)</li>
37+
<li>🇷🇴 Add Romanian translation (@tiberiufrat)</li>
38+
</ul>
39+
​ </description>
40+
​ </release>
3141
<release version="0.9.2" date="2020-12-14">
3242
​ <description>
3343
​ <ul>

data/com.github.stsdc.monitor.gschema.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,31 @@
4040
<summary>To start Monitor in background or not</summary>
4141
<description>To start Monitor in background or not</description>
4242
</key>
43+
<key type='b' name="indicator-cpu-state">
44+
<default>false</default>
45+
<summary>To show CPU usage in Monitor Indicator or not</summary>
46+
<description>To show CPU usage in Monitor Indicator or not</description>
47+
</key>
48+
<key type='b' name="indicator-memory-state">
49+
<default>false</default>
50+
<summary>To show memory usage in Monitor Indicator or not</summary>
51+
<description>To show memory usage in Monitor Indicator or not</description>
52+
</key>
53+
<key type='b' name="indicator-temperature-state">
54+
<default>false</default>
55+
<summary>To show temperature value in Monitor Indicator or not</summary>
56+
<description>To show temperature value in Monitor Indicator or not</description>
57+
</key>
58+
<key type='b' name="indicator-network-up-state">
59+
<default>false</default>
60+
<summary>To show network up bandwith data in Monitor Indicator or not</summary>
61+
<description>To show network up bandwith in Monitor Indicator or not</description>
62+
</key>
63+
<key type='b' name="indicator-network-down-state">
64+
<default>false</default>
65+
<summary>To show network down bandwith in Monitor Indicator or not</summary>
66+
<description>To show network down bandwith in Monitor Indicator or not</description>
67+
</key>
4368
<key type="s" name="opened-view">
4469
<default>'process_view'</default>
4570
<summary>Opened view</summary>

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ shared_module(
144144
'src/Indicator/Widgets/PopoverWidget.vala',
145145
'src/Indicator/Widgets/IndicatorWidget.vala',
146146
'src/Indicator/Widgets/TemperatureWidget.vala',
147+
'src/Indicator/Widgets/NetworkWidget.vala',
147148

148149
'src/Indicator/Services/DBusClient.vala',
149150
# 'src/Widgets/RevealerSwitch.vala',

po/LINGUAS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
de es fr it ja lt nl pl pt ru tr uk
1+
de es fr it ja lt nl pl pt ru tr uk ro

po/extra/LINGUAS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
de es fr ja lt nl pl pt ru uk
1+
de es fr ja lt nl pl pt ru uk ro

po/extra/pt.po

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
33
# This file is distributed under the same license as the extra package.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5+
# Hugo Carvalho <[email protected]>, 2019, 2020, 2021.
56
#
67
msgid ""
78
msgstr ""
89
"Project-Id-Version: extra\n"
910
"Report-Msgid-Bugs-To: \n"
1011
"POT-Creation-Date: 2018-10-20 22:25+0900\n"
11-
"PO-Revision-Date: 2020-10-15 18:34+0100\n"
12+
"PO-Revision-Date: 2021-01-11 21:29+0000\n"
13+
"Last-Translator: Hugo Carvalho <[email protected]>\n"
1214
"Language-Team: \n"
15+
"Language: pt\n"
1316
"MIME-Version: 1.0\n"
1417
"Content-Type: text/plain; charset=UTF-8\n"
1518
"Content-Transfer-Encoding: 8bit\n"
1619
"X-Generator: Poedit 2.0.6\n"
17-
"Last-Translator: Hugo Carvalho <[email protected]>\n"
1820
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19-
"Language: pt\n"
2021

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

3839
#: data/com.github.stsdc.monitor.desktop.in:4
3940
msgid "System Monitor"
40-
msgstr "Monitor do sistema"
41+
msgstr "Monitor do Sistema"
4142

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

5051
#: data/com.github.stsdc.monitor.desktop.in:14
5152
msgid "System monitor;System usage;Task manager;"
52-
msgstr "Monitor do sistema;Utilização do sistema;Gestor de tarefas;"
53+
msgstr "Monitor do Sistema;Utilização do Sistema;Gestor de Tarefas;"

po/extra/ro.po

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3+
# This file is distributed under the same license as the extra package.
4+
# Tiberiu Frățilă <[email protected]>, 2020.
5+
#
6+
msgid ""
7+
msgstr ""
8+
"Project-Id-Version: extra\n"
9+
"Report-Msgid-Bugs-To: \n"
10+
"POT-Creation-Date: 2018-10-20 22:25+0900\n"
11+
"PO-Revision-Date: 2020-12-16 09:58+0200\n"
12+
"Language-Team: \n"
13+
"MIME-Version: 1.0\n"
14+
"Content-Type: text/plain; charset=UTF-8\n"
15+
"Content-Transfer-Encoding: 8bit\n"
16+
"X-Generator: Poedit 2.0.6\n"
17+
"Last-Translator: \n"
18+
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
19+
"Language: ro_RO\n"
20+
21+
#: data/com.github.stsdc.monitor.appdata.xml.in:7
22+
#: data/com.github.stsdc.monitor.desktop.in:3
23+
msgid "Monitor"
24+
msgstr "Monitor"
25+
26+
#: data/com.github.stsdc.monitor.appdata.xml.in:8
27+
msgid "Manage processes and monitor system resources"
28+
msgstr "Gestionează procesele și monitorizează resursele de sistem"
29+
30+
#: data/com.github.stsdc.monitor.appdata.xml.in:10
31+
msgid "Display usage of system resources, filter and manage processes."
32+
msgstr "Afișează gradul de utilizare a resurselor de sistem, filtrează și gestionează procesele."
33+
34+
#: data/com.github.stsdc.monitor.appdata.xml.in:22
35+
msgid "Stanisław Dac"
36+
msgstr "Stanisław Dac"
37+
38+
#: data/com.github.stsdc.monitor.desktop.in:4
39+
msgid "System Monitor"
40+
msgstr "Monitor de sistem"
41+
42+
#: data/com.github.stsdc.monitor.desktop.in:6
43+
msgid "Manage processes and monitor resource usage of the system"
44+
msgstr "Gestionează procesele și monitorizează resursele de sistem"
45+
46+
#: data/com.github.stsdc.monitor.desktop.in:10
47+
msgid "com.github.stsdc.monitor"
48+
msgstr "com.github.stsdc.monitor"
49+
50+
#: data/com.github.stsdc.monitor.desktop.in:14
51+
msgid "System monitor;System usage;Task manager;"
52+
msgstr "System monitor;System usage;Task manager;Monitor de sistem;Manager de activități;Procese;Utilizarea sistemului;"

po/nl.po

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,22 @@ msgstr ""
33
"Project-Id-Version: \n"
44
"Report-Msgid-Bugs-To: \n"
55
"POT-Creation-Date: 2020-09-25 22:12+0400\n"
6-
"PO-Revision-Date: 2020-08-22 19:23+0200\n"
6+
"PO-Revision-Date: 2020-12-14 13:52+0100\n"
77
"Last-Translator: Heimen Stoffels <[email protected]>\n"
88
"Language-Team: \n"
99
"Language: nl\n"
1010
"MIME-Version: 1.0\n"
1111
"Content-Type: text/plain; charset=UTF-8\n"
1212
"Content-Transfer-Encoding: 8bit\n"
13-
"X-Generator: Poedit 2.4.1\n"
13+
"X-Generator: Poedit 2.4.2\n"
1414

1515
#: src/MainWindow.vala:34
16-
#, fuzzy
1716
msgid "Processes"
18-
msgstr "Procesnaam"
17+
msgstr "Processen"
1918

2019
#: src/MainWindow.vala:35
21-
#, fuzzy
2220
msgid "System"
23-
msgstr "Systeemaanroepen"
21+
msgstr "Systeem"
2422

2523
#: src/Utils.vala:2
2624
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:32
@@ -97,32 +95,31 @@ msgstr "THR"
9795

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

102100
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:112
103101
msgid "Idle kernel thread"
104-
msgstr ""
102+
msgstr "Inactieve kernel-thread"
105103

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

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

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

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

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

127124
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:18
128125
msgid "Opened files"
@@ -197,33 +194,33 @@ msgstr "RAM: %.1f%%"
197194
#: src/Views/SystemView/SystemCPUView.vala:32
198195
#: src/Views/SystemView/SystemMemoryView.vala:28
199196
msgid "UTILIZATION"
200-
msgstr ""
197+
msgstr "GEBRUIK"
201198

202199
#: src/Views/SystemView/SystemCPUView.vala:34
203200
#: src/Views/SystemView/SystemCPUView.vala:94
204201
#: src/Views/SystemView/SystemMemoryView.vala:30
205202
#: src/Views/SystemView/SystemMemoryView.vala:35
206203
msgid "Show detailed info"
207-
msgstr ""
204+
msgstr "Uitgebreide informatie tonen"
208205

209206
#: src/Views/SystemView/SystemCPUView.vala:36
210207
msgid "FREQUENCY"
211-
msgstr ""
208+
msgstr "FREQUENTIE"
212209

213210
#: src/Views/SystemView/SystemCPUView.vala:40
214211
msgid "TEMPERATURE"
215-
msgstr ""
212+
msgstr "TEMPERATUUR"
216213

217214
#: src/Views/SystemView/SystemCPUView.vala:96
218215
#: src/Views/SystemView/SystemMemoryView.vala:37
219216
msgid "Hide detailed info"
220-
msgstr ""
217+
msgstr "Uitgebreide informatie verbergen"
221218

222219
#: src/Views/SystemView/SystemCPUView.vala:152
223220
#: src/Views/SystemView/SystemMemoryView.vala:100
224221
#, c-format
225222
msgid "%d%%"
226-
msgstr ""
223+
msgstr "%d%%"
227224

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

233230
#: src/Views/SystemView/SystemCPUView.vala:154
234231
msgid "℃"
235-
msgstr ""
232+
msgstr ""
236233

237234
#: src/Views/SystemView/SystemMemoryView.vala:41
238235
msgid "Total: "
239-
msgstr ""
236+
msgstr "Totaal: "
240237

241238
#: src/Views/SystemView/SystemMemoryView.vala:44
242239
msgid "Used: "
243-
msgstr ""
240+
msgstr "Gebruikt: "
244241

245242
#: src/Views/SystemView/SystemMemoryView.vala:47
246243
msgid "Shared: "
247-
msgstr ""
244+
msgstr "Gedeeld: "
248245

249246
#: src/Views/SystemView/SystemMemoryView.vala:50
250247
msgid "Buffered: "
251-
msgstr ""
248+
msgstr "Gebufferd: "
252249

253250
#: src/Views/SystemView/SystemMemoryView.vala:53
254251
msgid "Cached: "
255-
msgstr ""
252+
msgstr "Gecachet: "
256253

257254
#: src/Views/SystemView/SystemMemoryView.vala:56
258255
msgid "Locked: "
259-
msgstr ""
256+
msgstr "Vergrendeld: "
260257

261258
#: src/Views/SystemView/SystemMemoryView.vala:103
262259
#, c-format
263260
msgid "Total: %s"
264-
msgstr ""
261+
msgstr "Totaal: %s"
265262

266263
#: src/Views/SystemView/SystemMemoryView.vala:104
267264
#, c-format
268265
msgid "Used: %s"
269-
msgstr ""
266+
msgstr "Gebruikt: %s"
270267

271268
#: src/Views/SystemView/SystemMemoryView.vala:105
272269
#, c-format
273270
msgid "Shared: %s"
274-
msgstr ""
271+
msgstr "Gedeeld: %s"
275272

276273
#: src/Views/SystemView/SystemMemoryView.vala:106
277274
#, c-format
278275
msgid "Buffered: %s"
279-
msgstr ""
276+
msgstr "Gebufferd: %s"
280277

281278
#: src/Views/SystemView/SystemMemoryView.vala:107
282279
#, c-format
283280
msgid "Cached: %s"
284-
msgstr ""
281+
msgstr "Gecachet: %s"
285282

286283
#: src/Views/SystemView/SystemMemoryView.vala:108
287284
#, c-format
288285
msgid "Locked: %s"
289-
msgstr ""
286+
msgstr "Vergrendeld: %s"
290287

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

311308
#: src/Widgets/Headerbar/Search.vala:15
312309
msgid "Type process name or PID to search"
313-
msgstr "Voer de procesnaam of PID in"
310+
msgstr "Voer de procesnaam of pid in"
314311

315312
#: src/Widgets/Statusbar/Statusbar.vala:14
316313
msgid "Swap"

0 commit comments

Comments
 (0)