change locations and objects

psGrammar/tasks/speechrec/questions.jsgf

@@ -100,10 +100,10 @@ public <quest_crowd> = <crowd1> | <crowd2> | <crowd3> | <crowd4> | <crowd5> | <c
 <poses> = standing or sitting | standing or lying | sitting or lying | <pospr>;
 <pospr> = standing | sitting | lying;
 <color> = red | blue | white | black | green | yellow;
-<gesture> = waving | raising left arm | raising right arm | pointing left | pointing right | rising left arm | rising right arm;
+<gesture> = waving | raising left arm | raising right arm | pointing [to the] left | pointing [to the] right | rising left arm | rising right arm;
 
-<location> = living table | sofa | comfy chair | fridge | kitchen counter | sink | stove | cabinet | bar;
-<room> = corridor | living room | kitchen | bathroom;
-<object> = basket | cereals | cloth | coconut milk | coke | cornflakes | noodles | orange drink | peas | plate | pringles | red bowl | salt | soap | sponge | tomato pasta | water;
+<room> = bedroom | dining room | kitchen | living room;
+<location> = bed | bar table | tv | armchair | couch table | couch | desk | bookcase | bedside table | sink | kitchen table | kitchen cabinet | dining table | cupboard;
+<object> = shower gel | soap | toothpaste | sponge | wiper | box | tray | cacao | coke | malz | mixdrink | orange | peppermint | water | cookies | fruit | kinder | nuts  | apple | green | kiwi | lemon | noodles | pepper | salt  | tomato | bag | dishwasher tray;
 <property> = color | shape | size | category | location;
-<category> = container | food | cleaning stuff | drink | cutlery | snack;
+<category> = care | drink | (cleaning stuff) | container | food | snack | (kitchen stuff) | other;