Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	dictsource/pt_list
	dictsource/pt_rules
	phsource/compile_report
	phsource/vowel/uu#_2
	src/synthdata.cpp
	src/translate.h
This commit is contained in:
Reece H. Dunn
2012-10-22 17:58:19 +01:00
22 changed files with 369 additions and 193 deletions
+2 -1
View File
@@ -1,4 +1,4 @@
// translation rules for Georgian
// This file is UTF-8 encoded
@@ -59,6 +59,7 @@ _0M2x m'ilioni
_0and d%a
_dpt mt#eli_
_roman m'esame
_0Z1 me'at#edi
_0Z2 me'asedi