Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9760f07f authored by Reece H. Dunn's avatar Reece H. Dunn
Browse files

Merge branch 'upstream' into development 

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
parents a48a34f0 a6729964

dictsource/en_list

+6 −4
Original line number Diff line number Diff line
@@ -740,8 +740,9 @@ abstract abstrakt $only 
abstract	a#bstr'akt    $verb

academe		a#kad@mi

acapela		aka#p'El@

access		aksEs         $onlys

access		aksEs         $verb

access		aksEs

accessible	$2

accessibly	$2

accouchement	a#ku:SmO~

accusation	akju:z'eIS@n

acer		eIs3
@@ -2774,7 +2775,7 @@ permit p3mIt $verb 
persona		p3:s'oUn@

perspex		p3:spEks

perus		p@ru:z

pervert		p3v3:t	$verb

pervert		p3:v3t	$noun

peso		peIsoU

petit		p@ti:

petite		p@ti:t
@@ -2816,6 +2817,7 @@ pisces paIsi:z 
piteous		pIti@s

pituitary	$2

pizzeria	$alt1

plaid		plad

plaguing	pleIgIN

?3 plateau	$2

platoon		$alt3
@@ -3195,7 +3197,7 @@ sens sEns // for sensible 
sepia		$alt6

sepoy		si:pOI

sequester	$2

sequine		si:kwI2n

sequin		$alt6

series		si@3riz

serenade	$3

serene		$alt3

dictsource/en_rules

+12 −5
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ 
     _) ai (z      aI



.group al

     _) ale (X     alI2

     _) ale (C_    alI2

   @ic) al (_S2    @L

     _) al (@      a#l

  gonz) al         'A:l
@@ -1144,6 +1144,7 @@ calend) ar 3 
        ass (a_    'as

        as (al     eIz

     b) as (al     as

     _) asch       aS

        ascii (_   askI

     f) asc (ia    eIS

     f) asci (s    aSI
@@ -2112,7 +2113,7 @@ _it_separ) ate (_ @t 
     X) e (gan_    i:

     _) e (gest    I2

     @) e (gic     'i:

     l) egion      i:dZ@n

        egi (An    'i:dZ

     l) e (git     @

     _) ego        i:goU

     _) ego (t     Eg@
@@ -2509,6 +2510,7 @@ _it_separ) ate (_ @t 
     &) en (ment   @n

        en (mes    %En

     _) enn        %En

        enne (_    'En

        enn (ia    'En

     _) en (o      I2n

     _) en (oX     i:n
@@ -3284,6 +3286,9 @@ _it_separ) ate (_ @t 
    _t) ia         i:@

    XC) ia (_      i@

     &) iac (_     =Iak

     &) ian (_S1   n

     &) ians (_S2  nz



     C) iar        aI3

?8   C) iar        aIa#

        iar (iC    i@3
@@ -4096,7 +4101,8 @@ multip) ly laI 
?8   @) less (_S4i lEs

?8   @) lessly (_S6i lEsl%i

?8   @) lessness (_S8i lEsnEs

        le (vel++  lE

        le (vel+   lE

     c) leve (l    li:v





.group m
@@ -4208,8 +4214,6 @@ multip) ly laI 
     n) n 

     _) n (gY+     @-N



   &ia) n (_S1     n

   &ia) ns (_S2    nz

     &) name (_S4  neIm

     _) nano (P4   n,anoU

        nause      nO:sI
@@ -5264,6 +5268,7 @@ multip) ly laI 
        per (fus   p3

        per (su    p3

     _) per (va    p3

     _) per (ver   p3

     _) perus      p3ru:z

     _) peroxy     p3,0ksI

     _) peri (Be   pErI2
@@ -5515,6 +5520,8 @@ multip) ly laI 
     _) re (i@P2   r,i:

     _) rei (c     raI

        reich      raIx

     _) re (ifL02  reI

     _) rei (gA    raI

     _) rei (l     raI

     _) rei (nh    raI

     _) reis       raIz

dictsource/fa_list

+244 −119

File changed.

Preview size limit exceeded, changes collapsed.

dictsource/fa_rules

+6 −22
Original line number Diff line number Diff line 
// *   Farsi Language fa (or Parsi or Persian) fa_rules Version 3.11

// *   This file writen by Shadyar Khodayari 02-05-2014

// *   Farsi Language fa (or Parsi or Persian) fa_rules Version 3.12

// *   This file writen by Shadyar Khodayari 07-01-2014

//*********

// *   This program is free software; you can redistribute it and/or modify  *

// *   it under the terms of the GNU General Public License as published by  *
@@ -308,23 +308,7 @@ 
			l09l09l04) انتون (_NSm5	Anetun

			l09l09l04) انشان (_NSm5	AneSAn

			l09l09l04) انشون (_NSm5	AneSun

		L09L03L01) ات (_Sm2	At

		//L09L03L01) اتی (_NSm3	Ati

		L09L09L03) ات (_NSm2	At

		L09L09L03) اتی (_NSm3	Ati

		// Plural possessive pronouns for ات eg. " تفکراتمان"

			L09L09L03) اتم (_NSm3	Atam

			L09L09L03) اتت (_NSm3	Atat

			L09L09L03) اتش (_NSm3	AtaS

			L09L09L03) اتمان (_NSm5	AtemAn

			L09L09L03) اتمون (_NSm5	Atemun

			L09L09L03) اتتان (_NSm5	AtetAn

			L09L09L03) اتتون (_NSm5	Atetun

			L09L09L03) اتشان (_NSm5	AteSAn

			L09L09L03) اتشون (_NSm5	AteSun

			L09L09L03) اتها (_NSm4	AthA

			L09L09L03) اتهای (_NSm5	AthAje

			L09L09L03) اتهایی (_NSm6	AthAi:

		L09L09L09) ات (_Sm2	At

		l09l09l03) انه (_NSm3	A,ne:

		l09l09l03) انۀ (_NSm3	A,neje

		L09L09L04) اور (_Sm3	AvaR
@@ -689,6 +673,7 @@ L09L04) السّادات (_Sm8 ossAdAt 
		_) پسا (آL09L09P3@	'pasA

		_) پیکو (L04L09L09P4@	'piko

		_) پیکو (آL09L09P4@	'piko

		_) پور (L04L09L09$noprefixP3@	puR



	// suffixes پ

		L09L09) پژوه (_Sm4	paZuh
@@ -5653,9 +5638,7 @@ L09L04) السّادات (_Sm8 ossAdAt 
			L09L03) ی (_Sm1	i

			L09L01و) ی (_Sm1	i

			L09L09L03) یم (_NSm2	im

			L09L09L03) ید (_NSm2	id

			L09L09L03) یده (_NSm3	ide:	// eg. "دزدیده"

			L09L09L03) یدۀ (_NSm3	ideje	// eg. "دزدیده"

			L09L09L03) ید (_Sm2	id

		// Possessive pronouns

			L09L01) یم (_+NSm2	jam

			L09L01) یت (_+NSm2	jat
@@ -5890,6 +5873,7 @@ L09L04) السّادات (_Sm8 ossAdAt 




.group ،

،	





.group ؛

dictsource/pt_list

+15 −39
Original line number Diff line number Diff line 
// This file in UTF8 encoded

// This file in UTF8 encoded



// Options

// ?1  European Portuguese
@@ -105,8 +105,7 @@ _( ,abRipa*'eINtezy 
■	b'ax&ve*@-tSik'aUko*@-tad&

?1  ÷	divid'idUp'or

?2  ÷	dZividZ'idUp'or

?1  ×	v'ezyS

?2  ×	v'ezys

 ×	v'ezys#

?1 µ	m'ikrU

?2 µ	m'ikRU

_)	f,ES&pa*'eINtezy
@@ -337,7 +336,7 @@ sr $dot 
?2 sra	$dot



// articles

o	$u	$nounf

o	$u+	$nounf

a	$u+	$nounf

os	$u+	$nounf

as	$u+	$nounf
@@ -650,9 +649,9 @@ há $u+ 
_a      a

_e      E

_o	O

a       a $atend $atstart

e       E $atend $atstart       // assume letter-e at end of sentence

o       O $atend $atstart

a       a $atend

e       E $atend        // assume letter-e at end of sentence

o       O $atend





// some common adjectives and adverbs
@@ -703,7 +702,6 @@ aperto $alt2 $noun 
apneia		$alt

apoio		$alt $verb

arredores	$alt

arrego	$alt2

arremesso	$alt2 $noun

arrocho		$alt2 $noun

arroto		$alt2 $noun
@@ -749,7 +747,6 @@ bracelete $alt2 
brejo		$alt

bromelha	$alt

broto		$alt2 $noun

brotos	$alt2

buceta	$alt2

cabresto	$alt2

cacete		$alt2
@@ -791,7 +788,6 @@ choça $alt 
chofer		$alt

choro		$alt2 $noun

chovesse	$alt2

chope	$alt2

chuleta		$alt2

chupeta		$alt2

clamores	$alt2
@@ -810,11 +806,11 @@ colosso $alt2 
colossos	$alt2

colostro	$alt2

começo		$alt $verb

concerto	$alt2



concerto	$alt2 $noun

concertos	$alt2

concordo	$alt

conforto	$alt  $verb

conserto	$alt2

conserto	$alt $verb

console		$alt2 $noun

consolo		$alt2 $noun

constroem	$alt
@@ -843,7 +839,6 @@ cozem $alt 
cratera		$alt

crede		$alt2

credo		$alt

crimeia	$alt

decoro		$alt2 $noun

degelo		$alt2

desaforo	$alt2
@@ -892,7 +887,6 @@ doso $alt 
doze		$alt2

dueto		$alt2

edson		$alt

eletrodo	$alt2

elixir		eliSir

emborco	$alt

emprego		$alt2
@@ -902,13 +896,11 @@ encosto $alt $verb 
endereço	$alt  $verb

endoide	$alt2

enforco		$alt

engodo		$alt2

engordo		$alt

enredo		$alt  $verb

enrosco		$alt2 $noun

ensosso		$alt2

enterro		$alt2 $noun

enterros	$alt2

entorto		$alt

entroso		$alt

envelope	$alt
@@ -995,7 +987,6 @@ gesso $alt2 
gloso		$alt

gonorreia	$alt

gol		gow

?1 golo	$alt2

golpe		$alt

gorda		$alt2

gorjeta		$alt2
@@ -1055,6 +1046,7 @@ melhor $alt 
menor		$alt

meta		$alt $noun

metro		$alt

minueto		$alt2

miolo		$alt2

miolos		$alt

mister	$alt
@@ -1146,7 +1138,6 @@ program $alt 
proso		$alt

prosopopeia	$alt

proveta		$alt2

punheta	$alt2

quarteto	$alt2

quatorze	$alt2

queda		$alt
@@ -1199,8 +1190,6 @@ seca $alt2 $noun 
secas		$alt2

seco		$alt2

seco		$alt $verb

sede	$alt2

sedes	$alt

selo		$alt2

selo		$alt $verb

sexteto		$alt2
@@ -1211,13 +1200,9 @@ sinopse $alt 
soco		$alt2

soco		$alt $verb

sogra		$alt

solto	$alt2

solto	$alt $verb

soltos	$alt2

sopa		$alt2

sopeses	$alt

sopro		$alt2 $noun

sorva	$alt2

sorvete		$alt2

sossego     	$alt2 $noun

suborno		$alt  $verb
@@ -1237,9 +1222,9 @@ temores $alt2 
tempero		$alt2 $noun

tenores		$alt2

terma	$alt

test		$alt

terrores	$alt2

teses		$alt

test		$alt

teta		$alt2

tijolo	$alt2

tijolos	$alt
@@ -1266,13 +1251,11 @@ trombeta $alt2 
ureia	$alt

vanessa		$alt2

vareta		$alt2

vedeta		$alt2

vera		$alt

verbete		$alt2

verborreia	$alt

verde		$alt2

vileta		$alt2

vinheta		$alt2

vodca	v'OdZik&

voga		$alt

voice	$alt
@@ -1292,7 +1275,6 @@ zorra $alt2 
?2  backup        bEk'&p

?2  backups     bEk'&ps

bad  bEd

ballet	bal'E

bank	beINk

bacon	b'eIkoN

?2 basebol	beIzyb'Ow
@@ -1303,7 +1285,6 @@ blind bl'aind 
?2 blue	blu

?1 braille    b:r'aily

?2        Braille        bR'aili

?2 buffet	bif'e

?1 cancel     k'&ns'El

?1 caps       k'aps

?2 cappuccino	kaputS'inU
@@ -1379,6 +1360,7 @@ next n'Ekst 
?2 online     oNlaIN

   org        Org

?1 ovo        'ovu

?2 palmtop	paUmyt'Op

?1 pause      p'au:z

   page       p'eIdZ

   ?1   podcast	pOdkEst
@@ -1398,7 +1380,6 @@ shake S'eIk 
?2 site       s'aItSy

?2   shampoo  S&mpu

?2 shopping	S'OpiN

?2 shoppings	S'OpiNs

?2 slide		zl'aIdZy

?4 símbolo	s'iNbolU

?1   software   s'Oft,w'Er-
@@ -1439,9 +1420,7 @@ apple 'Epow 
outdoor	aUtd'Or

?2  outdoors	aUtd'Ors

baby	b'eIby

?2 banner	b'&~ner

?2 banners	b'&~ners

?2 campari	k&~mp'a*y

?2 campari	k&mp'a*y

?1 chrome	kr'owm

?2 chrome  kR'owmi

corpus	k'O*@-pUs#
@@ -1453,8 +1432,6 @@ corpus k'O*@-pUs# 
facebook  feIsybuk

?1 fedora      _^_EN

    firefox     f'ai@fOks

?2 folder	f'owder

?2 folders	f'owders

?1 front       fr'ont

?2 habeas	'abe&s

high   haI
@@ -1490,7 +1467,6 @@ mac mEk 
?1 product     p:r'&d&kt

?1 Publisher   p'&bl,iS&r-

?1 reader      r'id,&r-

?2 reader	r'ider

?1 setup       s'Et'&p

?1 scout       sk'aut // Nero scout       

?1 skype       sk'aip
@@ -1585,4 +1561,4 @@ vogel f'o:g@l 
volkmann    f'Olkman

washington	w'OSinton

wellington	w'Elynton

?2 wesley	w'EzleI