Merge branch 'upstream' into development

This commit is contained in:
Reece H. Dunn
2013-04-09 11:21:35 +01:00
+3 -2
View File
@@ -1,4 +1,4 @@
// You can use the en_extra file, rather than this one
// to add your own pronunciation definitions.
@@ -759,6 +759,7 @@ allover O:l'oUv3
alm A:m
almost O:lmoUst
allspice $1
alt 0lt //not abbrev
alternate O:lt'3:n@t $only
alternate O:lt3neIt $verb
alternately O:lt'3:n@tlI $verbf
@@ -4163,7 +4164,7 @@ someone sVmw0n
//conjunctions
although OlD'oU $pause
although 0lD'oU $pause
and and $u $pause $only
as %az $only
(as is) ,az,Iz $pause