Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-04-05 12:55:09 +01:00
19 changed files with 248 additions and 114 deletions
+6
View File
@@ -1,3 +1,4 @@
// Aragon translation rules
// This file is UTF-8 encoded
@@ -111,6 +112,7 @@
i i
i (u_ i
i (A j
.group j
@@ -168,6 +170,7 @@
.group q
q k
qu (A kw
qü kw
qu (e k
@@ -204,6 +207,9 @@
u) t (_ t#
ei) t (_ t#
n) t (_ = // silent, but stress on last vowel
n) t (m // Silent
_pos) t (h t
_pos) t (C // Silent
tz T
ue) t (_ t#
ui) t (_ t#