diff --git a/bumblebee_status/_version.py b/bumblebee_status/_version.py index 154e077..247364e 100644 --- a/bumblebee_status/_version.py +++ b/bumblebee_status/_version.py @@ -292,7 +292,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): # TAG-NUM-gHEX mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) if not mo: - # unparseable. Maybe git-describe is misbehaving? + # unparsable. Maybe git-describe is misbehaving? pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out return pieces diff --git a/bumblebee_status/core/module.py b/bumblebee_status/core/module.py index 312862d..84c3ab5 100644 --- a/bumblebee_status/core/module.py +++ b/bumblebee_status/core/module.py @@ -295,7 +295,7 @@ class Error(Module): def full_text(self, widget): return "{}: {}".format(self.__module, self.__error) - """Overriden state, always returns critical (it *is* an error, after all""" + """Overridden state, always returns critical (it *is* an error, after all""" def state(self, widget): return ["critical"] diff --git a/bumblebee_status/modules/contrib/battery-upower.py b/bumblebee_status/modules/contrib/battery-upower.py index 9167ad7..3cc9e7f 100644 --- a/bumblebee_status/modules/contrib/battery-upower.py +++ b/bumblebee_status/modules/contrib/battery-upower.py @@ -68,7 +68,7 @@ class UPowerManager: isPresent = battery_proxy_interface.Get( self.UPOWER_NAME + ".Device", "IsPresent" ) - isRechargable = battery_proxy_interface.Get( + isRechargeable = battery_proxy_interface.Get( self.UPOWER_NAME + ".Device", "IsRechargeable" ) online = battery_proxy_interface.Get(self.UPOWER_NAME + ".Device", "Online") @@ -128,7 +128,7 @@ class UPowerManager: "HasHistory": hasHistory, "HasStatistics": hasStatistics, "IsPresent": isPresent, - "IsRechargeable": isRechargable, + "IsRechargeable": isRechargeable, "Online": online, "PowerSupply": powersupply, "Capacity": capacity, diff --git a/bumblebee_status/modules/contrib/blugon.py b/bumblebee_status/modules/contrib/blugon.py index 4fa0079..83e0bb6 100644 --- a/bumblebee_status/modules/contrib/blugon.py +++ b/bumblebee_status/modules/contrib/blugon.py @@ -1,6 +1,6 @@ """Displays temperature of blugon and Controls it. -Use wheel up and down to change temperature, middle click to toggle and right click to reset temprature. +Use wheel up and down to change temperature, middle click to toggle and right click to reset temperature. Default Values: * Minimum temperature: 1000 (red) diff --git a/bumblebee_status/modules/contrib/cpu2.py b/bumblebee_status/modules/contrib/cpu2.py index 1512681..e017f04 100644 --- a/bumblebee_status/modules/contrib/cpu2.py +++ b/bumblebee_status/modules/contrib/cpu2.py @@ -24,9 +24,9 @@ Parameters: * cpu2.fanspeed * cpu2.colored: 1 for colored per core load graph, 0 for mono (default) * cpu2.temp_pattern: pattern to look for in the output of 'sensors -u'; - required if cpu2.temp widged is used + required if cpu2.temp widget is used * cpu2.fan_pattern: pattern to look for in the output of 'sensors -u'; - required if cpu2.fanspeed widged is used + required if cpu2.fanspeed widget is used Note: if you are getting 'n/a' for CPU temperature / fan speed, then you're lacking the aforementioned pattern settings or they have wrong values. diff --git a/bumblebee_status/modules/contrib/messagereceiver.py b/bumblebee_status/modules/contrib/messagereceiver.py index 48c389a..74943cd 100644 --- a/bumblebee_status/modules/contrib/messagereceiver.py +++ b/bumblebee_status/modules/contrib/messagereceiver.py @@ -3,7 +3,7 @@ """ Displays the message that's received via unix socket. -Parameteres: +Parameters: * messagereceiver : Unix socket address (e.g: /tmp/bumblebee_messagereceiver.sock) Example: diff --git a/bumblebee_status/modules/contrib/pacman.py b/bumblebee_status/modules/contrib/pacman.py index b50ed53..cb3de96 100644 --- a/bumblebee_status/modules/contrib/pacman.py +++ b/bumblebee_status/modules/contrib/pacman.py @@ -3,7 +3,7 @@ """Displays update information per repository for pacman. Parameters: - * pacman.sum: If you prefere displaying updates with a single digit (defaults to 'False') + * pacman.sum: If you prefer displaying updates with a single digit (defaults to 'False') Requires the following executables: * fakeroot diff --git a/bumblebee_status/modules/contrib/pomodoro.py b/bumblebee_status/modules/contrib/pomodoro.py index fe5959f..3f1397a 100644 --- a/bumblebee_status/modules/contrib/pomodoro.py +++ b/bumblebee_status/modules/contrib/pomodoro.py @@ -13,7 +13,7 @@ Parameters: Example: 'notify-send 'Time up!''. If you want to chain multiple commands, please use an external wrapper script and invoke that. The module itself does not support command chaining (see https://github.com/tobi-wan-kenobi/bumblebee-status/issues/532 - for a detailled explanation) + for a detailed explanation) contributed by `martindoublem `_, inspired by `karthink `_ - many thanks! """ diff --git a/bumblebee_status/modules/contrib/progress.py b/bumblebee_status/modules/contrib/progress.py index 9148acb..c8905e7 100644 --- a/bumblebee_status/modules/contrib/progress.py +++ b/bumblebee_status/modules/contrib/progress.py @@ -56,7 +56,7 @@ class Module(core.module.Module): return self.parameter("placeholder", "n/a") def update_progress_info(self, widget): - """Update widget's informations about the copy""" + """Update widget's information about the copy""" if not self.__active: return @@ -64,8 +64,8 @@ class Module(core.module.Module): # 1. pid # 2. command # 3. arguments - # 4. progress (xx.x formated) - # 5. quantity (.. unit / .. unit formated) + # 4. progress (xx.x formatted) + # 5. quantity (.. unit / .. unit formatted) # 6. speed # 7. time remaining extract_nospeed = re.compile( @@ -80,7 +80,7 @@ class Module(core.module.Module): result = extract_wtspeed.match(raw) if not result: - # Abord speed measures + # Abort speed measures raw = util.cli.execute("progress -q") result = extract_nospeed.match(raw) diff --git a/bumblebee_status/modules/contrib/smartstatus.py b/bumblebee_status/modules/contrib/smartstatus.py index 81060da..ddd187c 100644 --- a/bumblebee_status/modules/contrib/smartstatus.py +++ b/bumblebee_status/modules/contrib/smartstatus.py @@ -10,7 +10,7 @@ Requires the following executables: * smartctl Parameters: - * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'seperate' or 'singles') + * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'separate' or 'singles') * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc') * smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all. """ diff --git a/bumblebee_status/modules/contrib/spaceapi.py b/bumblebee_status/modules/contrib/spaceapi.py index a6c2772..e36d7bd 100644 --- a/bumblebee_status/modules/contrib/spaceapi.py +++ b/bumblebee_status/modules/contrib/spaceapi.py @@ -16,7 +16,7 @@ Parameters: Format Strings: * Format strings are indicated by double %% - * They represent a leaf in the JSON tree, layers seperated by '.' + * They represent a leaf in the JSON tree, layers separated by '.' * Boolean values can be overwritten by appending '%true%false' in the format string * Example: to reference 'open' in '{'state':{'open': true}}' diff --git a/bumblebee_status/modules/contrib/traffic.py b/bumblebee_status/modules/contrib/traffic.py index c8b87db..4c91b61 100644 --- a/bumblebee_status/modules/contrib/traffic.py +++ b/bumblebee_status/modules/contrib/traffic.py @@ -8,7 +8,7 @@ Parameters: * traffic.showname: If set to False, hide network interface name (defaults to True) * traffic.format: Format string for download/upload speeds. Defaults to '{:.2f}' - * traffic.graphlen: Graph lenth in seconds. Positive even integer. Each + * traffic.graphlen: Graph length in seconds. Positive even integer. Each char shows 2 seconds. If set, enables up/down traffic graphs diff --git a/bumblebee_status/modules/core/disk.py b/bumblebee_status/modules/core/disk.py index ff0d4f9..0488535 100644 --- a/bumblebee_status/modules/core/disk.py +++ b/bumblebee_status/modules/core/disk.py @@ -4,7 +4,7 @@ Parameters: * disk.warning: Warning threshold in % of disk space (defaults to 80%) - * disk.critical: Critical threshold in % of disk space (defaults ot 90%) + * disk.critical: Critical threshold in % of disk space (defaults to 90%) * disk.path: Path to calculate disk usage from (defaults to /) * disk.open: Which application / file manager to launch (default xdg-open) * disk.format: Format string, tags {path}, {used}, {left}, {size} and {percent} (defaults to '{path} {used}/{size} ({percent:05.02f}%)') diff --git a/bumblebee_status/modules/core/sensors2.py b/bumblebee_status/modules/core/sensors2.py index 5f101fa..68b58b6 100644 --- a/bumblebee_status/modules/core/sensors2.py +++ b/bumblebee_status/modules/core/sensors2.py @@ -11,7 +11,7 @@ Parameters: * sensors2.showother: Enable or display 'other' sensor readings (default: false) * sensors2.showname: Enable or disable show of sensor name (default: false) * sensors2.chip_include: Comma-separated list of chip to include (defaults to '' will include all by default, example: 'coretemp,bat') - * sensors2.chip_exclude:Comma separated list of chip to exclude (defaults to '' will exlude none by default) + * sensors2.chip_exclude:Comma separated list of chip to exclude (defaults to '' will exclude none by default) * sensors2.field_include: Comma separated list of chip to include (defaults to '' will include all by default, example: 'temp,fan') * sensors2.field_exclude: Comma separated list of chip to exclude (defaults to '' will exclude none by default) * sensors2.chip_field_exclude: Comma separated list of chip field to exclude (defaults to '' will exclude none by default, example: 'coretemp-isa-0000.temp1,coretemp-isa-0000.fan1') diff --git a/docs/modules.rst b/docs/modules.rst index 69e56fd..21a1439 100644 --- a/docs/modules.rst +++ b/docs/modules.rst @@ -60,7 +60,7 @@ Shows free diskspace, total diskspace and the percentage of free disk space. Parameters: * disk.warning: Warning threshold in % of disk space (defaults to 80%) - * disk.critical: Critical threshold in % of disk space (defaults ot 90%) + * disk.critical: Critical threshold in % of disk space (defaults to 90%) * disk.path: Path to calculate disk usage from (defaults to /) * disk.open: Which application / file manager to launch (default xdg-open) * disk.format: Format string, tags {path}, {used}, {left}, {size} and {percent} (defaults to '{path} {used}/{size} ({percent:05.02f}%)') @@ -246,7 +246,7 @@ Parameters: * sensors2.showother: Enable or display 'other' sensor readings (default: false) * sensors2.showname: Enable or disable show of sensor name (default: false) * sensors2.chip_include: Comma-separated list of chip to include (defaults to '' will include all by default, example: 'coretemp,bat') - * sensors2.chip_exclude:Comma separated list of chip to exclude (defaults to '' will exlude none by default) + * sensors2.chip_exclude:Comma separated list of chip to exclude (defaults to '' will exclude none by default) * sensors2.field_include: Comma separated list of chip to include (defaults to '' will include all by default, example: 'temp,fan') * sensors2.field_exclude: Comma separated list of chip to exclude (defaults to '' will exclude none by default) * sensors2.chip_field_exclude: Comma separated list of chip field to exclude (defaults to '' will exclude none by default, example: 'coretemp-isa-0000.temp1,coretemp-isa-0000.fan1') @@ -574,9 +574,9 @@ Parameters: * cpu2.fanspeed * cpu2.colored: 1 for colored per core load graph, 0 for mono (default) * cpu2.temp_pattern: pattern to look for in the output of 'sensors -u'; - required if cpu2.temp widged is used + required if cpu2.temp widget is used * cpu2.fan_pattern: pattern to look for in the output of 'sensors -u'; - required if cpu2.fanspeed widged is used + required if cpu2.fanspeed widget is used Note: if you are getting 'n/a' for CPU temperature / fan speed, then you're lacking the aforementioned pattern settings or they have wrong values. @@ -907,7 +907,7 @@ messagereceiver Displays the message that's received via unix socket. -Parameteres: +Parameters: * messagereceiver : Unix socket address (e.g: /tmp/bumblebee_messagereceiver.sock) Example: @@ -1059,7 +1059,7 @@ pacman Displays update information per repository for pacman. Parameters: - * pacman.sum: If you prefere displaying updates with a single digit (defaults to 'False') + * pacman.sum: If you prefer displaying updates with a single digit (defaults to 'False') Requires the following executables: * fakeroot @@ -1119,7 +1119,7 @@ Parameters: Example: 'notify-send 'Time up!''. If you want to chain multiple commands, please use an external wrapper script and invoke that. The module itself does not support command chaining (see https://github.com/tobi-wan-kenobi/bumblebee-status/issues/532 - for a detailled explanation) + for a detailed explanation) contributed by `martindoublem `_, inspired by `karthink `_ - many thanks! @@ -1303,7 +1303,7 @@ Requires the following executables: * smartctl Parameters: - * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'seperate' or 'singles') + * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'separate' or 'singles') * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc') * smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all. @@ -1323,7 +1323,7 @@ Parameters: Format Strings: * Format strings are indicated by double %% - * They represent a leaf in the JSON tree, layers seperated by '.' + * They represent a leaf in the JSON tree, layers separated by '.' * Boolean values can be overwritten by appending '%true%false' in the format string * Example: to reference 'open' in '{'state':{'open': true}}' @@ -1514,7 +1514,7 @@ Parameters: * traffic.showname: If set to False, hide network interface name (defaults to True) * traffic.format: Format string for download/upload speeds. Defaults to '{:.2f}' - * traffic.graphlen: Graph lenth in seconds. Positive even integer. Each + * traffic.graphlen: Graph length in seconds. Positive even integer. Each char shows 2 seconds. If set, enables up/down traffic graphs diff --git a/versioneer.py b/versioneer.py index 2b54540..d6b8fc6 100644 --- a/versioneer.py +++ b/versioneer.py @@ -179,7 +179,7 @@ two common reasons why `setup.py` might not be in the root: `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI distributions (and upload multiple independently-installable tarballs). * Source trees whose main purpose is to contain a C library, but which also - provide bindings to Python (and perhaps other langauges) in subdirectories. + provide bindings to Python (and perhaps other languages) in subdirectories. Versioneer will look for `.git` in parent directories, and most operations should get the right version string. However `pip` and `setuptools` have bugs @@ -699,7 +699,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): # TAG-NUM-gHEX mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) if not mo: - # unparseable. Maybe git-describe is misbehaving? + # unparsable. Maybe git-describe is misbehaving? pieces["error"] = ("unable to parse git-describe output: '%%s'" %% describe_out) return pieces @@ -1106,7 +1106,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): # TAG-NUM-gHEX mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) if not mo: - # unparseable. Maybe git-describe is misbehaving? + # unparsable. Maybe git-describe is misbehaving? pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out return pieces