Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-01-19 13:23:25 +00:00
20 changed files with 11836 additions and 40 deletions
+4 -4
View File
@@ -45,7 +45,7 @@ _dia 'umlawt
// numbers
_0 n'itS
_1 'ena
_1 'Ena
_2 dv#'a
_3 tR'i
_4 St'iRi
@@ -77,19 +77,19 @@ _0C sto
_0M1 t'isotS
_1M1 t'isotS
_1M2 'enmilij'on
_1M2 'Enmilij'on
_2M2 dv#'amilij'ona
_3M2 tR'ijemilij'oni
_4M2 St'iRijemilij'oni
_0M2 milij'onow
_1M3 'enamilij'aRda
_1M3 'Enamilij'aRda
_2M3 dv#'emilij'aRdi
_3M3 tR'imilij'aRde
_4M3 St'iRimilij'aRde
_0M3 milij'aRd
_1M4 'enbilij'on
_1M4 'Enbilij'on
_2M4 dv#'abilij'ona
_3M4 tR'ijebilij'oni
_4M4 St'iRijebilij'oni