Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanisław committed May 4, 2020
2 parents a6709d9 + f7da1ac commit 5b11c95
Show file tree
Hide file tree
Showing 24 changed files with 1,892 additions and 649 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
com.github.stsdc.monitor (0.7.2) bionic; urgency=low

* Fix sorting arrows
* Update Russian translation (camellan)
* Add Turkish translation (Harun Yasar)
* Use newest version of live-chart (Laurent Callarec) ← Check his lib for creating charts, it's amazing!

com.github.stsdc.monitor (0.7.1) bionic; urgency=low

* Detailed process info in sidebar
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

project('com.github.stsdc.monitor', 'vala', 'c', version: '0.7.1')
project('com.github.stsdc.monitor', 'vala', 'c', version: '0.7.2')

# these are Meson modules
gnome = import('gnome')
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 uk
de es fr it ja lt nl pl pt ru tr uk
19 changes: 10 additions & 9 deletions po/POTFILES
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
src/Monitor.vala
src/MainWindow.vala
src/Utils.vala
src/Indicator/Widgets/PopoverWidget.vala
src/Indicator/Indicator.vala
src/Widgets/Headerbar.vala
src/Widgets/OverallView.vala
src/Widgets/Search.vala
src/Views/ProcessView/ProcessInfoView/OpenFilesListBox.vala
src/Views/ProcessView/ProcessInfoView/Preventor.vala
src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala
src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala
src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala
src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala
src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala
src/Widgets/Headerbar/Headerbar.vala
src/Widgets/Headerbar/Search.vala
src/Widgets/Statusbar/Statusbar.vala
src/Managers/AppManager.vala
src/Managers/ProcessManager.vala
src/Managers/Process.vala
src/Models/GenericModel.vala
src/Services/Shortcuts.vala
163 changes: 123 additions & 40 deletions po/com.github.stsdc.monitor.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: com.github.stsdc.monitor\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-17 21:21+0200\n"
"POT-Creation-Date: 2020-04-28 22:18+0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -17,99 +17,182 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: src/Indicator/Widgets/PopoverWidget.vala:12
msgid "Show Monitor"
#: src/Utils.vala:13
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:32
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:35
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:24
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:25
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:29
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:30
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:34
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:35
msgid "N/A"
msgstr ""

#: src/Utils.vala:45
msgid "B"
msgstr ""

#: src/Utils.vala:50
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:113
msgid "KiB"
msgstr ""

#: src/Utils.vala:56
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:118
msgid "MiB"
msgstr ""

#: src/Indicator/Widgets/PopoverWidget.vala:13
msgid "Show Monitor"
msgstr ""

#: src/Indicator/Widgets/PopoverWidget.vala:16
msgid "Quit Monitor"
msgstr ""

#. Some information about the indicator
#. Unique name
#: src/Indicator/Indicator.vala:44
msgid "Monitor Indicator"
#: src/Views/ProcessView/ProcessInfoView/OpenFilesListBox.vala:56
msgid "Deleted"
msgstr ""

#. Localised name
#: src/Indicator/Indicator.vala:45
msgid "Show system resources"
#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:21
msgid "Are you sure you want to do this?"
msgstr ""

#: src/Widgets/Headerbar.vala:15
msgid "Monitor"
#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:24
msgid "Yes"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:28
msgid "No"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:39
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:59
msgid "PID"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:40
msgid "NI"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:41
msgid "PRI"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:42
msgid "THR"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:18
msgid "Opened files"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:22
msgid "Characters"
msgstr ""

#: src/Widgets/Headerbar.vala:23
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:27
msgid "System calls"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:32
msgid "Read/Written"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:37
msgid "Cancelled write"
msgstr ""

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:79
msgid "End Process"
msgstr ""

#: src/Widgets/Headerbar.vala:26
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:81
msgid "End selected process"
msgstr ""

#: src/Widgets/Headerbar.vala:30
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:85
msgid "Kill Process"
msgstr ""

#: src/Widgets/Headerbar.vala:32
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:86
msgid "Kill selected process"
msgstr ""

#: src/Widgets/Headerbar.vala:42
msgid "Settings"
msgstr ""

#: src/Widgets/Headerbar.vala:56
msgid "Show an indicator:"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:96
msgid "Confirm kill of the process?"
msgstr ""

#: src/Widgets/Headerbar.vala:62
msgid "Start in background:"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:103
msgid "Confirm end of the process?"
msgstr ""

#. setup name column
#: src/Widgets/OverallView.vala:21
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:17
msgid "Process Name"
msgstr ""

#: src/Widgets/OverallView.vala:42 src/Widgets/Statusbar/Statusbar.vala:7
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:38
#: src/Widgets/Statusbar/Statusbar.vala:8
msgid "CPU"
msgstr ""

#: src/Widgets/OverallView.vala:53 src/Widgets/Statusbar/Statusbar.vala:10
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:49
#: src/Widgets/Statusbar/Statusbar.vala:11
msgid "Memory"
msgstr ""

#: src/Widgets/OverallView.vala:63
msgid "PID"
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:124
#: src/Widgets/Statusbar/Statusbar.vala:41
#: src/Widgets/Statusbar/Statusbar.vala:49
msgid "GiB"
msgstr ""

#: src/Widgets/OverallView.vala:107
msgid "KiB"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala:50
#, c-format
msgid "CPU: %.1f%%"
msgstr ""

#: src/Widgets/OverallView.vala:112
msgid "MiB"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala:51
#, c-format
msgid "RAM: %.1f%%"
msgstr ""

#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar/Statusbar.vala:28
msgid "GiB"
#: src/Widgets/Headerbar/Headerbar.vala:13
msgid "Monitor"
msgstr ""

#: src/Widgets/Headerbar/Headerbar.vala:21
msgid "Settings"
msgstr ""

#: src/Widgets/Headerbar/Headerbar.vala:35
msgid "Show an indicator:"
msgstr ""

#: src/Widgets/Search.vala:14
#: src/Widgets/Headerbar/Headerbar.vala:41
msgid "Start in background:"
msgstr ""

#: src/Widgets/Headerbar/Search.vala:14
msgid "Search Process"
msgstr ""

#: src/Widgets/Search.vala:15
#: src/Widgets/Headerbar/Search.vala:15
msgid "Type process name or PID to search"
msgstr ""

#: src/Widgets/Statusbar/Statusbar.vala:12
#: src/Widgets/Statusbar/Statusbar.vala:14
msgid "Swap"
msgstr ""

#: src/Widgets/Statusbar/Statusbar.vala:16
#: src/Widgets/Statusbar/Statusbar.vala:20
#: src/Widgets/Statusbar/Statusbar.vala:25
msgid "Calculating…"
msgstr ""

#: src/Models/GenericModel.vala:274
msgid "Background Applications"
#: src/Widgets/Statusbar/Statusbar.vala:38
msgid "GHz"
msgstr ""
Loading

0 comments on commit 5b11c95

Please sign in to comment.