the phrasebook phrases are now ordered in the same way as in the Phrasomatic

1 files changed, 184 insertions, 156 deletions

diff --git a/src/ui/android/assets/phrases.xml b/src/ui/android/assets/phrases.xml
index e3ab5006b..b02b21a6b 100644
--- a/src/ui/android/assets/phrases.xml
+++ b/src/ui/android/assets/phrases.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phrasebook>
-
-    <!--works-->
     <sentence desc="What is somebody's name?" id="QWhatName">
         <node syntax="PQuestion">
             <node syntax="QWhatName">
@@ -13,8 +11,6 @@
         </node>
     </sentence>
 
-    <!--SOMETHING IS UP WITH THE NAMEPARSING; WE CAN TRANSLATE ONCE BUT NOT INITIALIZE-->
-
     <sentence desc="Somebody's name is..." id="AHasName">
         <node child="phraseit">
             <node syntax="PropAction">
@@ -54,27 +50,6 @@
         </node>
     </sentence>
 
-    <!--<sentence desc="Numbers" id="NNumeral">
-        <node syntax="">
-            <option option="Which number?">
-                <node syntax="NNumeral"/>
-            </option>
-        </node>
-    </sentence>-->
-
-    <advanced desc="Reported Speech" id="AKnowQuestion">
-        <node child="advphraseit">
-            <node syntax="PropAction">
-                <node syntax="AKnow">
-                    <option option="Who is saying they know this?">
-                        <node child="allpersons" />
-                    </option>
-                </node>
-            </node>
-        </node>
-    </advanced>
-
-    <!--works-->
     <sentence advanced="true" desc="Someone loves someone" id="ALove">
         <node child="phraseit">
             <node syntax="PropAction">
@@ -90,7 +65,6 @@
         </node>
     </sentence>
 
-    <!--works-->
     <sentence advanced="true" desc="Someone is married" id="AMarried">
         <node child="phraseit">
             <node syntax="PropAction">
@@ -103,294 +77,336 @@
         </node>
     </sentence>
 
-    <!--works-->
-    <sentence desc="Someone is hungry" id="AHungry">
+    <sentence desc="Someone has children" id="AHasChildren">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node syntax="AHungry">
+                <node args="2" syntax="AHasChildren">
                     <option option="Who are we talking about?">
-                        <node child="allpersons" />
+                        <node child="allpersons"></node>
+                    </option>
+                    <option option="How many children?">
+                        <node syntax="NNumeral" />
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--works-->
-    <sentence advanced="true" desc="Someone is thirsty" id="AThirsty">
+    <sentence desc="Someone lives somewhere" id="ALive">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node syntax="AThirsty">
+                <node args="2" syntax="ALive">
                     <option option="Who are we talking about?">
-                        <node child="allpersons" />
+                        <node child="allpersons"></node>
+                    </option>
+                    <option option="Living where?">
+                        <node child="country"></node>
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--works-->
-    <sentence desc="Someone is tired" id="ATired">
+    <sentence desc="Someone wants to go somewhere" id="AWantGo">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node syntax="ATired">
+                <node args="2" syntax="AWantGo">
                     <option option="Who are we talking about?">
-                        <node child="allpersons" />
+                        <node child="allpersons"></node>
+                    </option>
+                    <option option="What article?">
+                        <node child="a/an/the">
+                            <option option="What place?">
+                                <node child="places"></node>
+                            </option>
+                        </node>
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!-- works-->
-    <sentence desc="Someone is scared" id="AScared">
+    <sentence desc="Someone is somewhere" id="ABePlace">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node syntax="AScared">
+                <node args="2" syntax="ABePlace">
                     <option option="Who are we talking about?">
                         <node child="allpersons"></node>
                     </option>
+                    <option option="What article?">
+                        <node child="a/an/the">
+                            <option option="What place?">
+                                <node child="places"></node>
+                            </option>
+                        </node>
+                    </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="Someone is ill" id="AIll">
+    <sentence desc="How far is something?" id="HowFar">
+        <node syntax="PQuestion">
+            <node syntax="HowFar">
+                <option option="What place are we asking about?">
+                    <node child="superlative_places" />
+                </option>
+            </node>
+        </node>
+    </sentence>
+
+    <sentence desc="How far is something from somewhere?" id="HowFarFrom">
+        <node syntax="PQuestion">
+            <node args="2" syntax="HowFarFrom">
+                <option option="Where are we going from?">
+                    <node child="superlative_places" />
+                </option>
+                <option option="Where are we going to?">
+                    <node child="superlative_places" />
+                </option>
+            </node>
+        </node>
+    </sentence>
+
+    <sentence desc="Some place is open" id="PropOpen">
         <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AIll">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
+            <node syntax="PropOpen">
+                <node args="2" syntax=" ">
+                    <option option="Superlative">
+                        <node child="superlative" />
+                    </option>
+                    <option option="What place are we asking about?">
+                        <node child="places" />
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="Someone understands" id="AUnderstand">
+    <sentence desc="Some place is closed" id="PropClosed">
+        <node child="phraseit">
+            <node syntax="PropClosed">
+                <node args="2" syntax=" ">
+                    <option option="Superlative">
+                        <node child="superlative" />
+                    </option>
+                    <option option="What place are we asking about?">
+                        <node child="places" />
+                    </option>
+                </node>
+            </node>
+        </node>
+    </sentence>
+
+    <sentence desc="Someone wants some food" id="AWant">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node syntax="AUnderstand">
-                    <option option="Who are we talking about?">
+                <node args="2" syntax="AWant">
+                    <option option="Who wants food?">
                         <node child="allpersons"></node>
                     </option>
+                    <node child="food_with_objectsPrep"></node>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="Someone knows" id="AKnow">
+    <sentence desc="Someone likes some food" id="ALike">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node syntax="AKnow">
-                    <option option="Who are we talking about?">
+                <node args="2" syntax="ALike">
+                    <option option="Who likes it?">
                         <node child="allpersons"></node>
                     </option>
+                    <node child="det">
+                        <node child="food"></node>
+                    </node>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="Someone is ready" id="AReady">
+    <sentence desc="Someone has a table" id="AHasTable">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node syntax="AReady">
+                <node args="2" syntax="AHasTable">
                     <option option="Who are we talking about?">
                         <node child="allpersons"></node>
                     </option>
+                    <option option="How many persons?">
+                        <node syntax="NNumeral"/>
+                    </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <sentence desc="Someone speaks a language" id="ASpeak">
+    <sentence desc="Someone has a room" id="AHasRoom">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node args="2" syntax="ASpeak">
-                    <option option="Who speaks it?">
+                <node args="2" syntax="AHasRoom">
+                    <option option="Who are we talking about?">
                         <node child="allpersons"></node>
                     </option>
-                    <option option="What language?">
-                        <node child="language" />
+                    <option option="How many persons?">
+                        <node syntax="NNumeral"/>
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="How far is something?" id="HowFar">
+    <sentence desc="How much does something cost?" id="HowMuchCost">
         <node syntax="PQuestion">
-            <node syntax="HowFar">
-                <option option="What place are we asking about?">
-                    <node child="superlative_places" />
-                </option>
+            <node syntax="HowMuchCost">
+                <node child="det">
+                    <node child="food" />
+                </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="Someone has children" id="AHasChildren">
+    <sentence desc="Something costs ..." id="ItCost">
+        <node child="phraseit">
+            <node args="2" syntax="ItCost">
+                <node child="det">
+					<node child="food"/>
+                </node>
+				<node args="2" syntax="AmountCurrency">
+					<option option="How much does it cost?">
+						<node syntax="NNumeral"/>
+					</option>
+					<option option="In what currency?">
+						<node child="currency" />
+					</option>
+				</node>
+            </node>
+        </node>
+    </sentence>
+
+    <sentence desc="Someone is hungry" id="AHungry">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node args="2" syntax="AHasChildren">
+                <node syntax="AHungry">
                     <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="How many children?">
-                        <node syntax="NNumeral" />
+                        <node child="allpersons" />
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="Someone lives somewhere" id="ALive">
+    <sentence advanced="true" desc="Someone is thirsty" id="AThirsty">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node args="2" syntax="ALive">
+                <node syntax="AThirsty">
                     <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="Living where?">
-                        <node child="country"></node>
+                        <node child="allpersons" />
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-
-    <!-- Works-->
-    <sentence desc="Someone wants to go somewhere" id="AWantGo">
+    <sentence desc="Someone is tired" id="ATired">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node args="2" syntax="AWantGo">
+                <node syntax="ATired">
                     <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="What article?">
-                        <node child="a/an/the">
-                            <option option="What place?">
-                                <node child="places"></node>
-                            </option>
-                        </node>
+                        <node child="allpersons" />
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--Works-->
-    <sentence desc="Someone is somewhere" id="ABePlace">
+    <sentence desc="Someone is scared" id="AScared">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node args="2" syntax="ABePlace">
+                <node syntax="AScared">
                     <option option="Who are we talking about?">
                         <node child="allpersons"></node>
                     </option>
-                    <option option="What article?">
-                        <node child="a/an/the">
-                            <option option="What place?">
-                                <node child="places"></node>
-                            </option>
-                        </node>
-                    </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!-- Someone is somewhere -->
-    <!-- ASK KRASIMIR-->
-    <sentence desc="How far is something from somewhere?" id="HowFarFrom">
-        <node syntax="PQuestion">
-            <node args="2" syntax="HowFarFrom">
-                <option option="Where are we going from?">
-                    <node child="superlative_places" />
-                </option>
-                <option option="Where are we going to?">
-                    <node child="superlative_places" />
-                </option>
+    <sentence desc="Someone is ill" id="AIll">
+        <node child="phraseit">
+            <node syntax="PropAction">
+                <node syntax="AIll">
+                    <option option="Who are we talking about?">
+                        <node child="allpersons"></node>
+                    </option>
+                </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="Some place is open" id="PropOpen">
+    <sentence desc="Someone is ready" id="AReady">
         <node child="phraseit">
-            <node syntax="PropOpen">
-                <node args="2" syntax=" ">
-                    <option option="Superlative">
-                        <node child="superlative" />
-                    </option>
-                    <option option="What place are we asking about?">
-                        <node child="places" />
+            <node syntax="PropAction">
+                <node syntax="AReady">
+                    <option option="Who are we talking about?">
+                        <node child="allpersons"></node>
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!--WORKS-->
-    <sentence desc="Some place is closed" id="PropClosed">
+    <sentence desc="Someone speaks a language" id="ASpeak">
         <node child="phraseit">
-            <node syntax="PropClosed">
-                <node args="2" syntax=" ">
-                    <option option="Superlative">
-                        <node child="superlative" />
+            <node syntax="PropAction">
+                <node args="2" syntax="ASpeak">
+                    <option option="Who speaks it?">
+                        <node child="allpersons"></node>
                     </option>
-                    <option option="What place are we asking about?">
-                        <node child="places" />
+                    <option option="What language?">
+                        <node child="language" />
                     </option>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <!-- Kinda works-->
-    <sentence desc="Someone wants some food" id="AWant">
+    <sentence desc="Someone understands" id="AUnderstand">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node args="2" syntax="AWant">
-                    <option option="Who wants food?">
+                <node syntax="AUnderstand">
+                    <option option="Who are we talking about?">
                         <node child="allpersons"></node>
                     </option>
-                    <node child="food_with_objectsPrep"></node>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <sentence desc="Someone likes some food" id="ALike">
+    <sentence desc="Someone knows" id="AKnow">
         <node child="phraseit">
             <node syntax="PropAction">
-                <node args="2" syntax="ALike">
-                    <option option="Who likes it?">
+                <node syntax="AKnow">
+                    <option option="Who are we talking about?">
                         <node child="allpersons"></node>
                     </option>
-                    <node child="prep">
-                        <node child="food"></node>
-                    </node>
                 </node>
             </node>
         </node>
     </sentence>
 
-    <sentence desc="How much does something cost?" id="HowMuchCost">
-        <node syntax="PQuestion">
-            <node syntax="HowMuchCost">
-                <node child="prep">
-                    <node child="food" />
+    <advanced desc="Reported Speech" id="AKnowQuestion">
+        <node child="advphraseit">
+            <node syntax="PropAction">
+                <node syntax="AKnow">
+                    <option option="Who is saying they know this?">
+                        <node child="allpersons" />
+                    </option>
                 </node>
             </node>
         </node>
-    </sentence>
+    </advanced>
+
     <!-- ___________________________________________________________________________________________ -->
     <!--Option lists -->
     <child id="allpersons">
@@ -420,7 +436,7 @@
     </child>
 
     <child id="phraseit">
-        <option option="How do you want to phrase it?">
+        <option option="How to phrase it?">
             <node desc="As a statement" syntax="PSentence">
                 <node syntax="SProp"/>
             </node>
@@ -582,7 +598,6 @@
         </option>
     </child>
 
-
     <child id="food_with_objectsPrep">
         <option option="What is being wanted?">
             <node child="objectsPrep">
@@ -591,7 +606,6 @@
         </option>
     </child>
 
-
     <child id="objectsPrep">
         <node desc="a/an" syntax="OneObj">
             <node syntax="ObjMass"></node>
@@ -613,8 +627,8 @@
         </node>
     </child>
 
-    <child id="prep">
-        <option option="Preposition">
+    <child id="det">
+        <option option="Determiner">
             <node desc="The" syntax="TheMass" />
             <node desc="This" syntax="ThisMass" />
             <node desc="That" syntax="ThatMass" />
@@ -637,6 +651,20 @@
             <node desc="Wine" syntax="MassDrink Wine"></node>
         </option>
     </child>
-
+    
+    <child id="currency">
+        <node desc="Euro"  syntax="Euro"/>
+        <node desc="Dollar" syntax="Dollar"/>
+        <node desc="DanishCrown" syntax="DanishCrown"/>
+        <node desc="NorwegianCrown" syntax="NorwegianCrown"/>
+        <node desc="SwedishCrown" syntax="SwedishCrown"/>
+        <node desc="Pound" syntax="Pound"/>
+        <node desc="Rouble" syntax="Rouble"/>
+        <node desc="Rupee" syntax="Rupee"/>
+        <node desc="Lei" syntax="Lei"/>
+        <node desc="Leva" syntax="Leva"/>
+        <node desc="Yuan" syntax="Yuan"/>
+        <node desc="Zloty" syntax="Zloty"/>
+    </child>
 </phrasebook>