Merge branch 'master' into dev

app/src/android/input.h

@@ -21,7 +21,7 @@
 #define _ANDROID_INPUT_H
 
 /**
- * Meta key / modifer state.
+ * Meta key / modifier state.
  */
 enum android_metastate {
     /** No meta keys are pressed. */

app/src/cli.c

@@ -217,7 +217,7 @@ scrcpy_print_usage(const char *arg0) {
         "        Default is 0 (automatic).\n"
         "\n"
         "    --window-height value\n"
-        "        Set the initial window width.\n"
+        "        Set the initial window height.\n"
         "        Default is 0 (automatic).\n"
         "\n"
         "Shortcuts:\n"

app/src/event_converter.c

@@ -14,7 +14,7 @@ convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to) {
 
 static enum android_metastate
 autocomplete_metastate(enum android_metastate metastate) {
-    // fill dependant flags
+    // fill dependent flags
     if (metastate & (AMETA_SHIFT_LEFT_ON | AMETA_SHIFT_RIGHT_ON)) {
         metastate |= AMETA_SHIFT_ON;
     }

app/src/util/str_util.h

@@ -16,7 +16,7 @@ size_t
 xstrncpy(char *dest, const char *src, size_t n);
 
 // join tokens by sep into dst
-// returns the number of chars actually written (max n-1) if no trucation
+// returns the number of chars actually written (max n-1) if no truncation
 // occurred, or n if truncated
 size_t
 xstrjoin(char *dst, const char *const tokens[], char sep, size_t n);