Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

dictsource/da_list

@@ -84,7 +84,7 @@ __	b'Onsdrai
 ¢	s'ent
 ¥	j'en:
 µ	my
-'	apostr'Vf // PB o changed to V
+'	apostr'Vf 
 ½	en'hal
  +  plus
  
@@ -102,27 +102,27 @@ _9	n'i
 _10	t'i
 _11	'Elv@
 _12	t'Vl
-_13	tR'?&#d@-n // PB & changed to &#
+_13	tR'?&#d@-n 
 _14	fj'ord@-n
 _15	 f'Emd@-n
 _16	s'ajsd@-n
-_17	s'Wd@-n // PP Y changed to W
-_18	'?&d@-n  // PB a changed to &
+_17	s'Wd@-n 
+_18	'?&d@-n  
 _19	n'ed@-n
 _2X	t'y:?u
-_3X	tR'&#Dv@               //PB [tR'ADv@] changed to [tR'&#Dv@]
-_4X	 f'?W:_|V              //PB [f'W:*3] changed to [ f'?W:V]
-_5X	h&l't*Es               // PB [a] changed to [&], e changed to E
-_6X	t*'Es                  // PB changed from e to E
-_7X	h&lfj'&rs               // PV a changed to &
+_3X	tR'&#Dv@              
+_4X	 f'?W:_|V             
+_5X	h&l't*Es             
+_6X	t*'Es                
+_7X	h&lfj'&rs
 _8X	f'irs
 _9X	h&lf'Ems // PB a changed to &
-_0C	h'un*VD
-_1C  ed||h'unRV:D // PB added 'et hundrede'
-_0M1	t'u:s@-n
-_1M1    ed||t'u:s@-n      // PB added 'et' to tusind
+_0C	h'unRVD
+_1C  ed||h'unRV:D 
+_0M1	t'?us@-n
+_1M1    ed||t'?us@-n
 _1M2	'e:n||milij'o:n
-_0M2	milij'o:nV // PB [3] changed to [V]
+_0M2	milij'o:nV
 _1M3	'e:n||milij'A:d
 _0M3	milij'A:d3
 _1M4	'e:n||bilij'o:n
@@ -174,7 +174,7 @@ men		$pause	// but
 eller	// or
 mens		$pause	// while
 for	
-fordi	fVd'i $pause	// because - PB: changed stress
+fordi	fVd'i $pause	// because
 når	nVr		$pause	// while
 der	dEr	$u+ $u    // PB changed from [dA]
 hvor	v'O	// where
@@ -187,16 +187,15 @@ fra			$u+	// from
 ved			$u+	// at
 om			$u+ $brk	// about, within
 med			$u+	// with
-af      &  	// PB changed from [a?] to [&] - sound too short in a sentence
-            // Also removed $u from 'af' and other words. They disappeared.
-ad      &  // PB added 'ad' 
-ad &D $atend $sentence // PB "Det må ikke skille os ad."
-at		& $u // PB changed from [at] to [&:]
-hos			// at - PB: removed [$u+]
-som	sVm	 $u   // which / that - PB: removed [$u+]
+af      &  	
+ad      &  
+ad &D $atend $sentence // "Det må ikke skille os ad."
+at		& $u 
+hos			
+som	sVm	 $u   // which / that 
 
 // pronouns
-jeg	jaj	$u+	// I 
+jeg	jAj	$u+	// I 
 du du $u
 de	$u
 han	$u
@@ -205,8 +204,8 @@ det	de $u
 dét de
 vi	vi $u
 i	_i $u+
-mig	maj	$u	// me
-dig	daj	$u+
+mig	mAj	$u	// me
+dig	dAj	$u+
 dem	$u
 ham	$u
 hende	$u
@@ -244,7 +243,7 @@ jeres	$u+
 er	Er	$u	// is/are
 var	vAr	$u+	// was/were
 har	hAr	$u+	// has/have
-havde	h&:D@	$u+	// had
+havde	h&D@	$u+	// had
 vil		$u+	// will
 skal		$u+	// shall
 kan		$u+	// can
@@ -360,7 +359,7 @@ window		_^_EN
 word		_^_EN
 warrior     _^_EN
 
-// PB names
+// Names
 august OgOsd $capital
 austin      _^_EN
 bailey      _^_EN
@@ -381,7 +380,7 @@ piccadilly  _^_EN
 reynolds    _^_EN
 white       _^_EN
 
-// PB French words
+// French words
 croquis     _^_FR
 crouton     _^_FR
 jugement    _^_FR
@@ -389,7 +388,7 @@ monsieur    _^_FR
 madame      _^_FR
 mademoiselle _^_FR
 
-// PB (French) nouns with final -age - stressed a, "age" pronounced ['&S@]
+// French) nouns with final -age - stressed a, "age" pronounced ['&S@]
 affutage  $alt
 apanage  $alt
 arbitrage  $alt
@@ -448,7 +447,7 @@ takkelage  $alt
 tonnage  $alt
 trikotage  $alt
 
-// PB final -abel - stressed a
+// Final -abel - stressed a
 // "el" has been removed in order to make rules for
 // "konstabel" and the plural "konstabler" without "e"
 acceptab $alt
@@ -691,7 +690,7 @@ substans $alt
 tolerans $alt
 varians $alt
 
-// PB nouns with final -ade - stressed a
+// Nouns with final -ade - stressed a
 ambassade  $alt
 arkade  $alt
 ballade  $alt
@@ -755,7 +754,7 @@ tamponade  $alt
 tirade  $alt
 triade  $alt
 
-// PB nouns and adjectives with final -al - stressed a
+// Nouns and adjectives with final -al - stressed a
 admiral  $alt
 adverbial  $alt
 aksial  $alt
@@ -997,7 +996,7 @@ vokal  $alt
 ækvatorial  $alt
 ødipal  $alt
 
-// PB words with final -ar - stressed a
+// Words with final -ar - stressed a
 dokumentar    $alt
  aktuar       $alt
 proletar      $alt
@@ -1067,7 +1066,7 @@ vegetar       $alt
   velar       $alt
 vokabular     $alt
 
-// PB final -agtig - stressed a
+// Final -agtig - stressed a
 barnagtig $alt
 blødagtig $alt
 delagtig $alt
@@ -1100,7 +1099,7 @@ svinagtig $alt
 tvivlagtig $alt
 tyvagtig $alt
 
-// PB words with final -an - stressed a
+// Words with final -an - stressed a
 aeroplan $alt2
 agraman $alt2
 altan $alt2
@@ -1128,7 +1127,6 @@ filigran $alt2
 galan $alt2
 hortulan $alt2
 human $alt2
-hvordan vVd'&n  $alt
 inhuman $alt2
 kapellan $alt2
 karljohan $alt2
@@ -5778,7 +5776,6 @@ adstringer   $alt
 adviser   $alt
 advoker   $alt
 afficer   $alt
-'aflever $alt
 'afmarcher   $alt
 afrikaniser   $alt
 agere   $alt
@@ -11195,7 +11192,7 @@ skateboardet  sk'eitbo@d3D      // PB
 (secret service) sigred||s'Wvis
 (happy hour) h&pi||'AuV
 chevrolet sjEvrol'e
-saigon sajg3-n                   // PB Saigon
+saigon sAjgVn                   // PB Saigon
 managua m&n'&:gw&
 (deja-vu) deSja||'vy
 (il duce) il||d'u:tSj@ // PB Italian Fascist

dictsource/en_list

@@ -3381,6 +3381,7 @@ Amy		eImi
 Andre		0ndreI
 Andrea		andri@
 Andreas		A:ndr'eI@s
+Angela		$1
 Anita		$alt3
 Anthony		ant@ni
 Anton		ant0n