diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | geometry.c | 4 | ||||
| -rw-r--r-- | keycodes.c | 4 | ||||
| -rw-r--r-- | keytypes.c | 2 | ||||
| -rw-r--r-- | symbols.c | 4 | ||||
| -rw-r--r-- | xkbcomp.c | 2 | ||||
| -rw-r--r-- | xkbpath.c | 4 |
7 files changed, 11 insertions, 11 deletions
@@ -8,7 +8,7 @@ logical and physical state of the keyboard. It also includes a number of keyboard controls designed to make keyboards more accessible to people with physical impairments. -There are five types of components in the server database corresponing to five +There are five types of components in the server database corresponding to five xkb symbolic names: symbols, geometry, keycodes, compat and types which determine the keyboard behaviour. These five components can combined together into a resulting keyboard mapping using the 'rules' component. @@ -2882,7 +2882,7 @@ HandleGeometryFile(XkbFile * file, break; case StmtVModDef: if (!failWhat) - failWhat = "virtual modfier"; + failWhat = "virtual modifier"; case StmtInterpDef: if (!failWhat) failWhat = "symbol interpretation"; @@ -3256,7 +3256,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info) } break; default: - WSGO1("Uknown doodad type %d in VerifyDoodad\n", + WSGO1("Unknown doodad type %d in VerifyDoodad\n", (unsigned int) di->type); return False; } @@ -370,7 +370,7 @@ AddKeyName(KeyNamesInfo * info, else if (reportCollisions) { WARN("Multiple identical key name definitions\n"); - ACTION2("Later occurences of \"<%s> = %d\" ignored\n", + ACTION2("Later occurrences of \"<%s> = %d\" ignored\n", buf, kc); } return True; @@ -648,7 +648,7 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info) else { ERROR("Unknown field encountered\n"); - ACTION1("Assigment to field %s ignored\n", field.str); + ACTION1("Assignment to field %s ignored\n", field.str); return 0; } if (arrayNdx != NULL) @@ -644,7 +644,7 @@ AddMapEntry(XkbDescPtr xkb, } else if (warningLevel > 9) { - WARN3("Multiple occurences of map[%s]= %d in %s\n", + WARN3("Multiple occurrences of map[%s]= %d in %s\n", MapEntryTxt(type, xkb, new), new->level + 1, TypeTxt(type)); ACTION("Ignored\n"); return True; @@ -1898,7 +1898,7 @@ PrepareKeyDef(KeyInfo * key) } } /* If all groups are completely identical remove them all */ - /* exept the first one. */ + /* except the first one. */ identical = True; for (i = lastGroup; i > 0; i--) { @@ -2084,7 +2084,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) /* assign kt_index[i] to the index of the type in map->types. * kt_index[i] may have been set by a previous run (if we have two * layouts specified). Let's not overwrite it with the ONE_LEVEL - * default group if we dont even have keys for this group anyway. + * default group if we don't even have keys for this group anyway. * * FIXME: There should be a better fix for this. */ @@ -305,7 +305,7 @@ parseArgs(int argc, char *argv[]) { if (warningLevel > 0) { - WARN("Multiple pre-error messsages specified\n"); + WARN("Multiple pre-error messages specified\n"); ACTION2("Compiling %s, ignoring %s\n", preErrorMsg, argv[i]); } @@ -53,7 +53,7 @@ static char **includePath; /* Holds all directories we might be including data f * @param nextop_rtrn Set to the next operation in the complete statement. * @param extra_data Set to the string between ( and ), if any. * - * @return True if parsing was succcessful, False for an illegal string. + * @return True if parsing was successful, False for an illegal string. * * Example: "evdev+aliases(qwerty)" * str_inout = aliases(qwerty) @@ -212,7 +212,7 @@ XkbAddDirectoryToPath(const char *dir) len = strlen(dir); if (len + 2 >= PATH_MAX) { /* allow for '/' and at least one character */ - ERROR2("Path entry (%s) too long (maxiumum length is %d)\n", + ERROR2("Path entry (%s) too long (maximum length is %d)\n", dir, PATH_MAX - 3); return False; } |