Merge branch 'master' into v4.0

4 files changed, 54 insertions, 1 deletions

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6390f46..a90118a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,3 +29,10 @@ jobs:
           repository: xxxserxxx/gotop-linux
           event-type: my-release
           client-payload: '{"tag": "${{ steps.tag_name.outputs.tag }}"}'
+
+      - name: Update and inform Homebrew
+        uses: dawidd6/action-homebrew-bump-formula@v3
+        with:
+          token: ${{ secrets.homebrew }}
+          formula: gotop
+          revision: ${{ steps.tag_name.outputs.tag }}
diff --git a/README.md b/README.md
index 1880298..8a3e55e 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ If you install gotop by hand, or you download or create new layouts or colorsche
     sudo layman -a guru
     sudo emerge gotop
     ```
-- OSX: gotop is in *homebrew-core*.  `brew install gotop`.  Make sure to uninstall and untap any previous installations or taps.
+- **OSX**: gotop is in *homebrew-core*.  `brew install gotop`.  Make sure to uninstall and untap any previous installations or taps.
 - **Prebuilt binaries**: Binaries for most systems can be downloaded from [the github releases page](https://github.com/xxxserxxx/gotop/releases). RPM and DEB packages are also provided.
 - **Source**: This requires Go >= 1.14. `go get -u github.com/xxxserxxx/gotop/cmd/gotop`
 
diff --git a/devices/cpu_cpu.go b/devices/cpu_cpu.go
index 1ee50f7..46105ee 100644
--- a/devices/cpu_cpu.go
+++ b/devices/cpu_cpu.go
@@ -6,6 +6,8 @@ import (
 	psCpu "github.com/shirou/gopsutil/cpu"
 )
 
+// FIXME: broken % under Linux.  Doesn't reflect reality *at all*.
+// FIXME: gotop CPU use high -- gopsutils again? Try rolling back.
 func init() {
 	f := func(cpus map[string]int, l bool) map[string]error {
 		cpuCount, err := psCpu.Counts(l)
diff --git a/translations/en_US.toml b/translations/en_US.toml
new file mode 100644
index 0000000..05cde16
--- /dev/null
+++ b/translations/en_US.toml
@@ -0,0 +1,44 @@
+configfile="Config file"
+usage="Usage: {0} [options]\n\nOptions:\n"
+
+
+[help]
+paths="Loadable colorschemes & layouts, and the config file, are searched for, in order:"
+log="The log file is in {0}"
+written="Config written to {0}"
+
+
+[args]
+help="Show this screen."
+color="Set a colorscheme."
+scale="Graph scale factor, >0"
+version="Print version and exit."
+percpu="Show each CPU in the CPU widget."
+cpuavg="Show average CPU in the CPU widget."
+temp="Show temperatures in fahrenheit.Show temperatures in fahrenheit."
+statusbar="Show a statusbar with the time."
+rate="Refresh frequency. Most time units accepted.  \"1m\" = refresh every minute.  \"100ms\" = refresh every 100ms."
+layout="Name of layout spec file for the UI. Use \"-\" to pipe."
+net="Select network interface. Several interfaces can be defined using comma separated values. Interfaces can also be ignored using \"!\""
+export="Enable metrics for export on the specified port."
+mbps="Show network rate as mbps."
+test="Runs tests and exits with success/failure code."
+conffile="Config file to use instead of default (MUST BE FIRST ARGUMENT)"
+list="""
+List <devices|layouts|colorschemes|paths|keys>
+   devices: Prints out device names for filterable widgets
+   layouts: Lists build-in layouts
+   colorschemes: Lists built-in colorschemes
+   paths: List out configuration file search paths
+   widgets: Widgets that can be used in a layout
+   keys: Show the keyboard bindings."""
+write="Write out a default config file."
+
+
+[errors]
+configparse="failed to parse config file: {0}"
+cliparse="parsing CLI args: {0}"
+logsetup="failed to setup log file: {0}"
+unknownopt="Unknown option \"{0}\"; try layouts, colorschemes, keys, paths, or devices\n"
+writefail="Failed to write configuration file: {0}"
+checklog="errors encountered; from {0}:"