summaryrefslogtreecommitdiff
path: root/gtk/compose-parse.py
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/compose-parse.py')
-rwxr-xr-xgtk/compose-parse.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/compose-parse.py b/gtk/compose-parse.py
index 9a6513a70a..767f2b421e 100755
--- a/gtk/compose-parse.py
+++ b/gtk/compose-parse.py
@@ -85,8 +85,8 @@ headerfile_start = """/* GTK - The GIMP Tool Kit
* XFree86 4.0 using a set of Perl scripts. Contact Owen Taylor <otaylor@redhat.com>
* to obtain the relevant perl scripts.
*
- * The following compose letter letter sequences confliced
- * Dstroke/dstroke and ETH/eth; resolved to Dstroke (Croation, Vietnamese, Lappish), over
+ * The following compose letter letter sequences conflicted
+ * Dstroke/dstroke and ETH/eth; resolved to Dstroke (Croatian, Vietnamese, Lappish), over
* ETH (Icelandic, Faroese, old English, IPA) [ D- -D d- -d ]
* Amacron/amacron and ordfeminine; resolved to ordfeminine [ _A A_ a_ _a ]
* Amacron/amacron and Atilde/atilde; resolved to atilde [ -A A- a- -a ]