Merge branch 'master' into simple_calendar

man/waybar-pulseaudio.5.scd

@@ -100,16 +100,17 @@ The following strings for *format-icons* are supported.
 If they are found in the current PulseAudio port name, the corresponding icons will be selected.
 
 - *default* (Shown, when no other port is found)
-- *headphones*
+- *headphone*
 - *speaker*
 - *hdmi*
 - *headset*
-- *handsfree*
+- *hands-free*
 - *portable*
 - *car*
 - *hifi*
 - *phone*
 
+
 # EXAMPLES
 
 ```

man/waybar-temperature.5.scd

@@ -22,7 +22,7 @@ Addressed by *temperature*
 
 *critical-threshold*: ++
 	typeof: integer ++
-	The threshold before it is considered critical (Celcius).
+	The threshold before it is considered critical (Celsius).
 
 *interval*: ++
 	typeof: integer ++
@@ -36,11 +36,11 @@ Addressed by *temperature*
 *format*: ++
 	typeof: string  ++
 	default: {temperatureC}°C ++
-	The format (Celcius/Farenheit) in which the temperature should be displayed.
+	The format (Celsius/Fahrenheit) in which the temperature should be displayed.
 
 *format-icons*: ++
 	typeof: array ++
-	Based on the current temperature (Celcius) and *critical-threshold* if available, the corresponding icon gets selected. The order is *low* to *high*.
+	Based on the current temperature (Celsius) and *critical-threshold* if available, the corresponding icon gets selected. The order is *low* to *high*.
 
 *rotate*: ++
 	typeof: integer ++
@@ -81,7 +81,7 @@ Addressed by *temperature*
 
 # FORMAT REPLACEMENTS
 
-*{temperatureC}*: Temperature in Celcius.
+*{temperatureC}*: Temperature in Celsius.
 
 *{temperatureF}*: Temperature in Fahrenheit.
 

resources/config

@@ -122,8 +122,8 @@
         "format-source": "{volume}% ",
         "format-source-muted": "",
         "format-icons": {
-            "headphones": "",
-            "handsfree": "",
+            "headphone": "",
+            "hands-free": "",
             "headset": "",
             "phone": "",
             "portable": "",

resources/custom_modules/mediaplayer.py

@@ -79,7 +79,7 @@ def signal_handler(sig, frame):
 def parse_arguments():
     parser = argparse.ArgumentParser()
 
-    # Increase verbosity with every occurance of -v
+    # Increase verbosity with every occurence of -v
     parser.add_argument('-v', '--verbose', action='count', default=0)
 
     # Define for which player we're listening