refactor weather skill

MycroftAI · May 12, 2021 · 10af4d3 · 10af4d3
1 parent 759cb1a
commit 10af4d3
Show file tree

Hide file tree

Showing 230 changed files with 1,699 additions and 2,327 deletions.
diff --git a/__init__.py b/__init__.py
diff --git a/dialog/en-us/RelativeDay.voc b/dialog/en-us/RelativeDay.voc
diff --git a/dialog/en-us/and.dialog b/dialog/en-us/and.dialog
diff --git a/dialog/en-us/at.time.forecast.affirmative.condition.dialog b/dialog/en-us/at.time.forecast.affirmative.condition.dialog
diff --git a/dialog/en-us/at.time.forecast.cond.alternative.dialog b/dialog/en-us/at.time.forecast.cond.alternative.dialog
diff --git a/dialog/en-us/at.time.forecast.local.affirmative.condition.dialog b/dialog/en-us/at.time.forecast.local.affirmative.condition.dialog
diff --git a/dialog/en-us/at.time.forecast.local.cond.alternative.dialog b/dialog/en-us/at.time.forecast.local.cond.alternative.dialog
diff --git a/dialog/en-us/at.time.forecast.local.no.cond.predicted.dialog b/dialog/en-us/at.time.forecast.local.no.cond.predicted.dialog
diff --git a/dialog/en-us/at.time.forecast.no.cond.predicted.dialog b/dialog/en-us/at.time.forecast.no.cond.predicted.dialog
diff --git a/dialog/en-us/at.time.local.high.temperature.dialog b/dialog/en-us/at.time.local.high.temperature.dialog
diff --git a/dialog/en-us/at.time.local.low.temperature.dialog b/dialog/en-us/at.time.local.low.temperature.dialog
diff --git a/dialog/en-us/at.time.local.no.cond.predicted.dialog b/dialog/en-us/at.time.local.no.cond.predicted.dialog
diff --git a/dialog/en-us/at.time.local.temperature.dialog b/dialog/en-us/at.time.local.temperature.dialog
diff --git a/dialog/en-us/at.time.local.weather.dialog b/dialog/en-us/at.time.local.weather.dialog
diff --git a/dialog/en-us/at.time.no.cond.predicted.dialog b/dialog/en-us/at.time.no.cond.predicted.dialog
diff --git a/dialog/en-us/condition.category.value b/dialog/en-us/condition.category.value
diff --git a/dialog/en-us/clear.alternative.dialog → ...current.clear.alternative.location.dialog b/dialog/en-us/clear.alternative.dialog → ...current.clear.alternative.location.dialog
diff --git a/dialog/en-us/local.clear.alternative.dialog → ...s/current.clear.not.expected.local.dialog b/dialog/en-us/local.clear.alternative.dialog → ...s/current.clear.not.expected.local.dialog
diff --git a/dialog/en-us/no.clear.predicted.dialog → ...urrent.clear.not.expected.location.dialog b/dialog/en-us/no.clear.predicted.dialog → ...urrent.clear.not.expected.location.dialog
diff --git a/dialog/en-us/cloudy.alternative.dialog → ...urrent.clouds.alternative.location.dialog b/dialog/en-us/cloudy.alternative.dialog → ...urrent.clouds.alternative.location.dialog
diff --git a/...og/en-us/local.no.cloudy.predicted.dialog → .../current.clouds.not.expected.local.dialog b/...og/en-us/local.no.cloudy.predicted.dialog → .../current.clouds.not.expected.local.dialog
diff --git a/dialog/en-us/no.cloudy.predicted.dialog → ...rrent.clouds.not.expected.location.dialog b/dialog/en-us/no.cloudy.predicted.dialog → ...rrent.clouds.not.expected.location.dialog
diff --git a/.../en-us/local.affirmative.condition.dialog → ...s/current.condition.expected.local.dialog b/.../en-us/local.affirmative.condition.dialog → ...s/current.condition.expected.local.dialog
diff --git a/dialog/en-us/affirmative.condition.dialog → ...urrent.condition.expected.location.dialog b/dialog/en-us/affirmative.condition.dialog → ...urrent.condition.expected.location.dialog
diff --git a/dialog/en-us/local.foggy.alternative.dialog → ...n-us/current.fog.alternative.local.dialog b/dialog/en-us/local.foggy.alternative.dialog → ...n-us/current.fog.alternative.local.dialog
diff --git a/dialog/en-us/fog.alternative.dialog → ...s/current.fog.alternative.location.dialog b/dialog/en-us/fog.alternative.dialog → ...s/current.fog.alternative.location.dialog
diff --git a/dialog/en-us/local.no.fog.predicted.dialog → ...-us/current.fog.not.expected.local.dialog b/dialog/en-us/local.no.fog.predicted.dialog → ...-us/current.fog.not.expected.local.dialog
diff --git a/dialog/en-us/no.fog.predicted.dialog → .../current.fog.not.expected.location.dialog b/dialog/en-us/no.fog.predicted.dialog → .../current.fog.not.expected.location.dialog
diff --git a/dialog/en-us/current.high.temperature.dialog b/dialog/en-us/current.high.temperature.dialog
diff --git a/dialog/en-us/current.hot.dialog b/dialog/en-us/current.hot.dialog
diff --git a/dialog/en-us/current.humidity.local.dialog b/dialog/en-us/current.humidity.local.dialog
@@ -0,0 +1 @@
+Currently, the humidity is {percent}
diff --git a/dialog/en-us/current.humidity.location.dialog b/dialog/en-us/current.humidity.location.dialog
@@ -0,0 +1 @@
+Currently, the humidity in {location} is {percent}
diff --git a/dialog/en-us/current.local.cold.dialog b/dialog/en-us/current.local.cold.dialog
diff --git a/dialog/en-us/current.local.high.temperature.dialog b/dialog/en-us/current.local.high.temperature.dialog
diff --git a/dialog/en-us/current.local.hot.dialog b/dialog/en-us/current.local.hot.dialog
diff --git a/dialog/en-us/current.local.low.temperature.dialog b/dialog/en-us/current.local.low.temperature.dialog
diff --git a/dialog/en-us/current.local.temperature.dialog b/dialog/en-us/current.local.temperature.dialog
diff --git a/dialog/en-us/current.local.weather.dialog b/dialog/en-us/current.local.weather.dialog
diff --git a/dialog/en-us/current.low.temperature.dialog b/dialog/en-us/current.low.temperature.dialog
diff --git a/...og/en-us/local.raining.alternative.dialog → ...-us/current.rain.alternative.local.dialog b/...og/en-us/local.raining.alternative.dialog → ...-us/current.rain.alternative.local.dialog
diff --git a/dialog/en-us/raining.alternative.dialog → .../current.rain.alternative.location.dialog b/dialog/en-us/raining.alternative.dialog → .../current.rain.alternative.location.dialog
diff --git a/dialog/en-us/local.no.rain.predicted.dialog → ...us/current.rain.not.expected.local.dialog b/dialog/en-us/local.no.rain.predicted.dialog → ...us/current.rain.not.expected.local.dialog
diff --git a/dialog/en-us/no.rain.predicted.dialog → ...current.rain.not.expected.location.dialog b/dialog/en-us/no.rain.predicted.dialog → ...current.rain.not.expected.location.dialog
diff --git a/...og/en-us/local.snowing.alternative.dialog → ...-us/current.snow.alternative.local.dialog b/...og/en-us/local.snowing.alternative.dialog → ...-us/current.snow.alternative.local.dialog
diff --git a/dialog/en-us/snowing.alternative.dialog → .../current.snow.alternative.location.dialog b/dialog/en-us/snowing.alternative.dialog → .../current.snow.alternative.location.dialog
diff --git a/dialog/en-us/local.no.snow.predicted.dialog → ...us/current.snow.not.expected.local.dialog b/dialog/en-us/local.no.snow.predicted.dialog → ...us/current.snow.not.expected.local.dialog
diff --git a/dialog/en-us/no.snow.predicted.dialog → ...current.snow.not.expected.location.dialog b/dialog/en-us/no.snow.predicted.dialog → ...current.snow.not.expected.location.dialog
diff --git a/dialog/en-us/current.sunrise.future.local.dialog b/dialog/en-us/current.sunrise.future.local.dialog
@@ -0,0 +1,2 @@
+the sun will rise at {time} today
+sunrise will be at {time} today
diff --git a/dialog/en-us/current.sunrise.future.location.dialog b/dialog/en-us/current.sunrise.future.location.dialog
@@ -0,0 +1,2 @@
+the sun rose at {time} today in {location}
+sunrise was at {time} today in {location}
diff --git a/dialog/en-us/sunrise.dialog → ...g/en-us/current.sunrise.past.local.dialog b/dialog/en-us/sunrise.dialog → ...g/en-us/current.sunrise.past.local.dialog
diff --git a/dialog/en-us/current.sunrise.past.location.dialog b/dialog/en-us/current.sunrise.past.location.dialog
@@ -0,0 +1,2 @@
+the sun rose at {time} today in {location}
+sunrise was at {time} today in {location}
diff --git a/dialog/en-us/sunset.dialog → .../en-us/current.sunset.future.local.dialog b/dialog/en-us/sunset.dialog → .../en-us/current.sunset.future.local.dialog
diff --git a/dialog/en-us/current.sunset.future.location.dialog b/dialog/en-us/current.sunset.future.location.dialog
@@ -0,0 +1,3 @@
+the sun will set at {time} today in {location}
+in {location} the sun will go down at {time} today
+sunset will be at {time} today in {location}
diff --git a/dialog/en-us/current.sunset.past.local.dialog b/dialog/en-us/current.sunset.past.local.dialog
@@ -0,0 +1,3 @@
+the sun set at {time} today
+the sun went down at {time} today
+sunset was at {time} today
diff --git a/dialog/en-us/current.sunset.past.location.dialog b/dialog/en-us/current.sunset.past.location.dialog
@@ -0,0 +1,3 @@
+the sun set at {time} today in {location}
+in {location} the sun went down at {time} today
+sunset was at {time} today in {location}
diff --git a/dialog/en-us/current.temperature.dialog b/dialog/en-us/current.temperature.dialog
diff --git a/dialog/en-us/current.temperature.high.local.dialog b/dialog/en-us/current.temperature.high.local.dialog
@@ -0,0 +1,4 @@
+A high of {temperature} degrees {temperature_unit} is expected.
+A high of {temperature} degrees can be expected.
+Today the temperature will reach {temperature} degrees.
+
diff --git a/dialog/en-us/current.temperature.high.location.dialog b/dialog/en-us/current.temperature.high.location.dialog
@@ -0,0 +1,4 @@
+A high of {temperature} degrees {temperature_unit} is expected in {location}.
+A high of {temperature} degrees can be expected in {location}.
+Today a the temperature will reach {temperature} degrees in {location}.
+
diff --git a/dialog/en-us/current.temperature.high.low.dialog b/dialog/en-us/current.temperature.high.low.dialog
@@ -0,0 +1 @@
+Today's forecast is for a high of {high_temperature} and a low of {low_temperature}.
diff --git a/dialog/en-us/current.temperature.local.dialog b/dialog/en-us/current.temperature.local.dialog
@@ -0,0 +1,4 @@
+It's currently {temperature} degrees {temperature_unit}.
+It's currently {temperature} degrees.
+Right now, it's {temperature} degrees.
+
diff --git a/dialog/en-us/current.temperature.location.dialog b/dialog/en-us/current.temperature.location.dialog
@@ -0,0 +1,4 @@
+It's currently {temperature} degrees {temperature_unit} in {location}.
+It's currently {temperature} degrees in {location}.
+Right now, it's {temperature} degrees in {location}.
+
diff --git a/dialog/en-us/current.temperature.low.local.dialog b/dialog/en-us/current.temperature.low.local.dialog
@@ -0,0 +1,4 @@
+A low of {temperature} degrees {temperature_unit} is expected.
+A low of {temperature} degrees can be expected.
+Today it will be as low as {temperature} degrees.
+
diff --git a/dialog/en-us/current.temperature.low.location.dialog b/dialog/en-us/current.temperature.low.location.dialog
@@ -0,0 +1,2 @@
+Today the temperature will be as low as {temperature} degrees {temperature_unit} in {location}.
+Temperatures can be as low as {temperature} degrees in {location}.
diff --git a/dialog/en-us/local.storm.alternative.dialog → ...ent.thunderstorm.alternative.local.dialog b/dialog/en-us/local.storm.alternative.dialog → ...ent.thunderstorm.alternative.local.dialog
diff --git a/dialog/en-us/storm.alternative.dialog → ....thunderstorm.alternative.location.dialog b/dialog/en-us/storm.alternative.dialog → ....thunderstorm.alternative.location.dialog
diff --git a/dialog/en-us/local.no.storm.predicted.dialog → ...nt.thunderstorm.not.expected.local.dialog b/dialog/en-us/local.no.storm.predicted.dialog → ...nt.thunderstorm.not.expected.local.dialog
diff --git a/dialog/en-us/no.storm.predicted.dialog → ...thunderstorm.not.expected.location.dialog b/dialog/en-us/no.storm.predicted.dialog → ...thunderstorm.not.expected.location.dialog
diff --git a/dialog/en-us/current.weather.dialog b/dialog/en-us/current.weather.dialog
diff --git a/dialog/en-us/current.weather.local.dialog b/dialog/en-us/current.weather.local.dialog
@@ -0,0 +1,3 @@
+It's currently {condition} and {temperature} degrees {temperature_unit}.
+It's currently {condition} and {temperature} degrees.
+Right now, it's {condition} and {temperature} degrees.
diff --git a/dialog/en-us/current.weather.location.dialog b/dialog/en-us/current.weather.location.dialog
@@ -0,0 +1,3 @@
+It's currently {condition} and {temperature} degrees {temperature_unit} in {location}.
+Right now, it's {condition} and {temperature} degrees in {location}.
+{location} has {condition} and is currently {temperature} degrees.
diff --git a/dialog/en-us/current.wind.light.local.dialog b/dialog/en-us/current.wind.light.local.dialog
@@ -0,0 +1,2 @@
+The wind is light at {speed} {speed_unit} from the {direction}
+Today there is light wind from the {direction} at {speed} {speed_unit}
diff --git a/dialog/en-us/current.wind.light.location.dialog b/dialog/en-us/current.wind.light.location.dialog
@@ -0,0 +1,2 @@
+The wind is light in {location} at {speed} {speed_unit} from the {direction}
+In {location} today there is light wind from the {direction} at {speed} {speed_unit}
diff --git a/dialog/en-us/current.wind.moderate.local.dialog b/dialog/en-us/current.wind.moderate.local.dialog
@@ -0,0 +1,2 @@
+Currently the wind is a moderate {speed} {speed_unit} from the {direction}
+It's a bit windy today, currently {speed} {speed_unit}
diff --git a/dialog/en-us/current.wind.moderate.location.dialog b/dialog/en-us/current.wind.moderate.location.dialog
@@ -0,0 +1,2 @@
+Currently the wind is a moderate {speed} {speed_unit} from the {direction} in {location}
+It's a bit windy in {location} today, currently {speed} {speed_unit}
diff --git a/dialog/en-us/current.wind.strong.local.dialog b/dialog/en-us/current.wind.strong.local.dialog
@@ -0,0 +1,3 @@
+Currently, the wind is from the {direction} at {speed} {speed_unit}, might be good to stay inside today
+The wind is very strong from the {direction} today, {speed} {speed_unit}
+It's very windy today, {speed} {speed_unit}
diff --git a/dialog/en-us/current.wind.strong.location.dialog b/dialog/en-us/current.wind.strong.location.dialog
@@ -0,0 +1,3 @@
+Currently, the wind is from the {direction} at {speed} {speed_unit} in {location}, a good day to stay inside
+The wind is very strong from the {direction} in {location} today, {speed} {speed_unit}
+{location} will have strong winds today, {speed} {speed_unit}
diff --git a/dialog/en-us/local.cloudy.alternative.dialog → .../currrent.clouds.alternative.local.dialog b/dialog/en-us/local.cloudy.alternative.dialog → .../currrent.clouds.alternative.local.dialog
diff --git a/...s/forecast.local.clear.alternative.dialog → ...n-us/daily.clear.alternative.local.dialog b/...s/forecast.local.clear.alternative.dialog → ...n-us/daily.clear.alternative.local.dialog
diff --git a/...g/en-us/forecast.clear.alternative.dialog → ...s/daily.clear.alternative.location.dialog b/...g/en-us/forecast.clear.alternative.dialog → ...s/daily.clear.alternative.location.dialog
diff --git a/.../forecast.local.no.clear.predicted.dialog → ...-us/daily.clear.not.expected.local.dialog b/.../forecast.local.no.clear.predicted.dialog → ...-us/daily.clear.not.expected.local.dialog
diff --git a/.../en-us/forecast.no.clear.predicted.dialog → .../daily.clear.not.expected.location.dialog b/.../en-us/forecast.no.clear.predicted.dialog → .../daily.clear.not.expected.location.dialog
diff --git a/.../forecast.local.cloudy.alternative.dialog → ...-us/daily.clouds.alternative.local.dialog b/.../forecast.local.cloudy.alternative.dialog → ...-us/daily.clouds.alternative.local.dialog
diff --git a/.../en-us/forecast.cloudy.alternative.dialog → .../daily.clouds.alternative.location.dialog b/.../en-us/forecast.cloudy.alternative.dialog → .../daily.clouds.alternative.location.dialog
diff --git a/...forecast.local.no.cloudy.predicted.dialog → ...us/daily.clouds.not.expected.local.dialog b/...forecast.local.no.cloudy.predicted.dialog → ...us/daily.clouds.not.expected.local.dialog
diff --git a/...en-us/forecast.no.cloudy.predicted.dialog → ...daily.clouds.not.expected.location.dialog b/...en-us/forecast.no.cloudy.predicted.dialog → ...daily.clouds.not.expected.location.dialog
diff --git a/...recast.local.affirmative.condition.dialog → ...-us/daily.condition.expected.local.dialog b/...recast.local.affirmative.condition.dialog → ...-us/daily.condition.expected.local.dialog
diff --git a/...-us/forecast.affirmative.condition.dialog → .../daily.condition.expected.location.dialog b/...-us/forecast.affirmative.condition.dialog → .../daily.condition.expected.location.dialog
diff --git a/...s/forecast.local.foggy.alternative.dialog → .../en-us/daily.fog.alternative.local.dialog b/...s/forecast.local.foggy.alternative.dialog → .../en-us/daily.fog.alternative.local.dialog
diff --git a/...g/en-us/forecast.foggy.alternative.dialog → ...-us/daily.fog.alternative.location.dialog b/...g/en-us/forecast.foggy.alternative.dialog → ...-us/daily.fog.alternative.location.dialog
diff --git a/...us/forecast.local.no.fog.predicted.dialog → ...en-us/daily.fog.not.expected.local.dialog b/...us/forecast.local.no.fog.predicted.dialog → ...en-us/daily.fog.not.expected.local.dialog
diff --git a/...og/en-us/forecast.no.fog.predicted.dialog → ...us/daily.fog.not.expected.location.dialog b/...og/en-us/forecast.no.fog.predicted.dialog → ...us/daily.fog.not.expected.location.dialog
diff --git a/dialog/en-us/daily.humidity.local.dialog b/dialog/en-us/daily.humidity.local.dialog
@@ -0,0 +1,2 @@
+The humidity {day} will be {percent}
+{day} the forecast calls for a humidity of {percent}
diff --git a/dialog/en-us/daily.humidity.location.dialog b/dialog/en-us/daily.humidity.location.dialog
@@ -0,0 +1,2 @@
+The humidity in {location} {day} will be {percent}
+{day} the forecast in {location} calls for a humidity of {percent}
diff --git a/dialog/en-us/daily.precipitation.next.local.dialog b/dialog/en-us/daily.precipitation.next.local.dialog
@@ -0,0 +1,2 @@
+There is a {percent} chance of {precipitation} {day}
+The forecast calls for a {percent} chance of {precipitation} {day}
diff --git a/dialog/en-us/daily.precipitation.next.location.dialog b/dialog/en-us/daily.precipitation.next.location.dialog
@@ -0,0 +1,2 @@
+In {location} there is a {percent} chance of {precipitation} {day}
+The forecast calls for a {percent} chance of {precipitation} in {location} {day}
diff --git a/dialog/en-us/daily.precipitation.next.none.local.dialog b/dialog/en-us/daily.precipitation.next.none.local.dialog
@@ -0,0 +1,2 @@
+No precipitation is in the forecast for the next 7 days
+None is forecasted in the next 7 days.
diff --git a/dialog/en-us/daily.precipitation.next.none.location.dialog b/dialog/en-us/daily.precipitation.next.none.location.dialog
@@ -0,0 +1,2 @@
+No precipitation is in the forecast for the next seven days in {location}
+In {location} none is forecasted
diff --git a/...forecast.local.raining.alternative.dialog → ...en-us/daily.rain.alternative.local.dialog b/...forecast.local.raining.alternative.dialog → ...en-us/daily.rain.alternative.local.dialog
diff --git a/...en-us/forecast.raining.alternative.dialog → ...us/daily.rain.alternative.location.dialog b/...en-us/forecast.raining.alternative.dialog → ...us/daily.rain.alternative.location.dialog
diff --git a/...s/forecast.local.no.rain.predicted.dialog → ...n-us/daily.rain.not.expected.local.dialog b/...s/forecast.local.no.rain.predicted.dialog → ...n-us/daily.rain.not.expected.local.dialog
diff --git a/...g/en-us/forecast.no.rain.predicted.dialog → ...s/daily.rain.not.expected.location.dialog b/...g/en-us/forecast.no.rain.predicted.dialog → ...s/daily.rain.not.expected.location.dialog
diff --git a/...en-us/forecast.snowing.alternative.dialog → ...us/daily.snow.alternative.location.dialog b/...en-us/forecast.snowing.alternative.dialog → ...us/daily.snow.alternative.location.dialog
diff --git a/...s/forecast.local.no.snow.predicted.dialog → ...n-us/daily.snow.not.expected.local.dialog b/...s/forecast.local.no.snow.predicted.dialog → ...n-us/daily.snow.not.expected.local.dialog
diff --git a/...g/en-us/forecast.no.snow.predicted.dialog → ...s/daily.snow.not.expected.location.dialog b/...g/en-us/forecast.no.snow.predicted.dialog → ...s/daily.snow.not.expected.location.dialog
diff --git a/dialog/en-us/daily.sunrise.local.dialog b/dialog/en-us/daily.sunrise.local.dialog
@@ -0,0 +1,3 @@
+the sun will rise at {time} {day}
+sunrise will be at {time} {day}
+{day} the sun will rise at {time}
diff --git a/dialog/en-us/daily.sunrise.location.dialog b/dialog/en-us/daily.sunrise.location.dialog
@@ -0,0 +1,3 @@
+the sun will rise at {time} {day} in {location}
+in {location} sunrise will be at {time} {day}
+{day} the sun will rise at {time} in {location}
diff --git a/dialog/en-us/daily.sunset.local.dialog b/dialog/en-us/daily.sunset.local.dialog
@@ -0,0 +1,4 @@
+the sun will set at {time} {day}
+the sun will go down at {time} {day}
+sunset will be at {time} {day}
+{day} the sun will set at {time}
diff --git a/dialog/en-us/daily.sunset.location.dialog b/dialog/en-us/daily.sunset.location.dialog
@@ -0,0 +1,3 @@
+the sun will set at {time} {day} in {location}
+in {location} sunset will be at {time} {day}
+{day} the sun will set at {time} in {location}
diff --git a/dialog/en-us/daily.temperature.high.local.dialog b/dialog/en-us/daily.temperature.high.local.dialog
@@ -0,0 +1,2 @@
+{day} it will be as high as {temperature}
+{day} the temperature will be as high as {temperature} degrees.
diff --git a/dialog/en-us/daily.temperature.high.location.dialog b/dialog/en-us/daily.temperature.high.location.dialog
@@ -0,0 +1,2 @@
+It will be as high as {temperature} degrees in {location} {day}
+{location} will have a high of {temperature} degrees {day}
diff --git a/dialog/en-us/daily.temperature.local.dialog b/dialog/en-us/daily.temperature.local.dialog
@@ -0,0 +1,2 @@
+{day} it will be {temperature}
+{day} the temperature will be {temperature} degrees.
diff --git a/dialog/en-us/daily.temperature.location.dialog b/dialog/en-us/daily.temperature.location.dialog
@@ -0,0 +1,2 @@
+{day} it will be {temperature} degrees in {location}
+{day}, {location} will have a temperature of {temperature} degrees
diff --git a/dialog/en-us/daily.temperature.low.local.dialog b/dialog/en-us/daily.temperature.low.local.dialog
@@ -0,0 +1,2 @@
+{day} it will be as low as {temperature}
+{day} the temperature will be as low as {temperature} degrees.
diff --git a/dialog/en-us/daily.temperature.low.location.dialog b/dialog/en-us/daily.temperature.low.location.dialog
@@ -0,0 +1,2 @@
+{day} it will be as low as {temperature} degrees in {location}
+{day}, {location} will be as low as {temperature} degrees
diff --git a/...s/forecast.local.storm.alternative.dialog → ...ily.thunderstorm.alternative.local.dialog b/...s/forecast.local.storm.alternative.dialog → ...ily.thunderstorm.alternative.local.dialog
diff --git a/...g/en-us/forecast.storm.alternative.dialog → ....thunderstorm.alternative.location.dialog b/...g/en-us/forecast.storm.alternative.dialog → ....thunderstorm.alternative.location.dialog
diff --git a/.../forecast.local.no.storm.predicted.dialog → ...ly.thunderstorm.not.expected.local.dialog b/.../forecast.local.no.storm.predicted.dialog → ...ly.thunderstorm.not.expected.local.dialog
diff --git a/.../en-us/forecast.no.storm.predicted.dialog → ...thunderstorm.not.expected.location.dialog b/.../en-us/forecast.no.storm.predicted.dialog → ...thunderstorm.not.expected.location.dialog
diff --git a/dialog/en-us/daily.weather.local.dialog b/dialog/en-us/daily.weather.local.dialog
@@ -0,0 +1,5 @@
+{day} expect {condition}, with a high of {high_temperature} and a low of {low_temperature}
+Expect {condition}, with a high of {high_temperature} and a low of {low_temperature} {day}
+{day} the high will be {high_temperature} and the low {low_temperature}, with {condition}
+{day} it will be {condition} with a high of {high_temperature} and a low of {low_temperature}
+The forecast {day} is {condition} with a high of {high_temperature} and a low of {low_temperature}
diff --git a/dialog/en-us/daily.weather.location.dialog b/dialog/en-us/daily.weather.location.dialog
@@ -0,0 +1,3 @@
+{day} it will be {condition}, with a high of {high_temperature} and a low of {low_temperature} in {location}
+{day}, {location} will have a high of {high_temperature} and a low of {low_temperature}, with {condition}
+The forecast {day} is {high_temperature} for a high and {low_temperature} for a low in {location}
diff --git a/dialog/en-us/daily.wind.light.local.dialog b/dialog/en-us/daily.wind.light.local.dialog
@@ -0,0 +1,2 @@
+There will be a light wind coming from the {direction} {day} at {speed} {speed_unit}
+It will not be very windy {day}
diff --git a/dialog/en-us/daily.wind.light.location.dialog b/dialog/en-us/daily.wind.light.location.dialog
@@ -0,0 +1,2 @@
+There will be a light wind coming from the {direction} in {location} {day} at {speed} {speed_unit}
+It will not be very windy in {location} {day}
diff --git a/dialog/en-us/daily.wind.moderate.local.dialog b/dialog/en-us/daily.wind.moderate.local.dialog
@@ -0,0 +1,3 @@
+The wind will be moderate, about {speed} {speed_unit} from the {direction} {day}
+The forecast calls for a moderate wind from the {direction} at {speed} {speed_unit} {day}
+You can expect a moderate wind of about {speed} {speed_unit} {day}
diff --git a/dialog/en-us/daily.wind.moderate.location.dialog b/dialog/en-us/daily.wind.moderate.location.dialog
@@ -0,0 +1,3 @@
+The wind will be moderate in {location} {day}, about {speed} {speed_unit} from the {direction}
+The forecast {day} predicts {location} will have moderate wind from the {direction} of {speed} {speed_unit}
+You can expect a wind of about {speed} {speed_unit} in {location} {day}
diff --git a/dialog/en-us/daily.wind.strong.local.dialog b/dialog/en-us/daily.wind.strong.local.dialog
@@ -0,0 +1,2 @@
+There will be strong wind from the {direction} of {speed} {speed_unit} {day}
+The wind will be as strong as {speed} {speed_unit} {day}
diff --git a/dialog/en-us/daily.wind.strong.location.dialog b/dialog/en-us/daily.wind.strong.location.dialog
@@ -0,0 +1,2 @@
+There will be a strong wind from the {direction} of {speed} {speed_unit} in {location} {day}
+The wind will be as strong as {speed} {speed_unit} in {location} {day}
diff --git a/dialog/en-us/E.dialog → dialog/en-us/east.dialog b/dialog/en-us/E.dialog → dialog/en-us/east.dialog
diff --git a/dialog/en-us/forecast.hard.wind.dialog b/dialog/en-us/forecast.hard.wind.dialog
diff --git a/dialog/en-us/forecast.high.temperature.dialog b/dialog/en-us/forecast.high.temperature.dialog
diff --git a/dialog/en-us/forecast.hot.dialog b/dialog/en-us/forecast.hot.dialog
diff --git a/dialog/en-us/forecast.light.wind.dialog b/dialog/en-us/forecast.light.wind.dialog
diff --git a/dialog/en-us/forecast.local.hard.wind.dialog b/dialog/en-us/forecast.local.hard.wind.dialog
diff --git a/dialog/en-us/forecast.local.high.temperature.dialog b/dialog/en-us/forecast.local.high.temperature.dialog
diff --git a/dialog/en-us/forecast.local.hot.dialog b/dialog/en-us/forecast.local.hot.dialog
diff --git a/dialog/en-us/forecast.local.light.wind.dialog b/dialog/en-us/forecast.local.light.wind.dialog
diff --git a/dialog/en-us/forecast.local.low.temperature.dialog b/dialog/en-us/forecast.local.low.temperature.dialog
diff --git a/dialog/en-us/forecast.local.medium.wind.dialog b/dialog/en-us/forecast.local.medium.wind.dialog
diff --git a/dialog/en-us/forecast.local.temperature.dialog b/dialog/en-us/forecast.local.temperature.dialog
diff --git a/dialog/en-us/forecast.local.weather.dialog b/dialog/en-us/forecast.local.weather.dialog
diff --git a/dialog/en-us/forecast.low.temperature.dialog b/dialog/en-us/forecast.low.temperature.dialog
diff --git a/dialog/en-us/forecast.medium.wind.dialog b/dialog/en-us/forecast.medium.wind.dialog
diff --git a/dialog/en-us/forecast.temperature.dialog b/dialog/en-us/forecast.temperature.dialog
diff --git a/dialog/en-us/forecast.weather.dialog b/dialog/en-us/forecast.weather.dialog
diff --git a/dialog/en-us/hard.wind.dialog b/dialog/en-us/hard.wind.dialog
diff --git a/dialog/en-us/hour.local.weather.dialog b/dialog/en-us/hour.local.weather.dialog
diff --git a/dialog/en-us/hour.weather.dialog b/dialog/en-us/hour.weather.dialog
diff --git a/...-us/at.time.local.cond.alternative.dialog → ...hourly.condition.alternative.local.dialog b/...-us/at.time.local.cond.alternative.dialog → ...hourly.condition.alternative.local.dialog
diff --git a/dialog/en-us/at.time.cond.alternative.dialog → ...rly.condition.alternative.location.dialog b/dialog/en-us/at.time.cond.alternative.dialog → ...rly.condition.alternative.location.dialog
diff --git a/...t.time.local.affirmative.condition.dialog → ...us/hourly.condition.expected.local.dialog b/...t.time.local.affirmative.condition.dialog → ...us/hourly.condition.expected.local.dialog
diff --git a/...n-us/at.time.affirmative.condition.dialog → ...hourly.condition.expected.location.dialog b/...n-us/at.time.affirmative.condition.dialog → ...hourly.condition.expected.location.dialog
diff --git a/dialog/en-us/hourly.precipitation.next.local.dialog b/dialog/en-us/hourly.precipitation.next.local.dialog
@@ -0,0 +1,2 @@
+There is a {percent} chance of {precipitation} at {time}
+The forecast calls for a {percent} chance of {precipitation} at {time}
diff --git a/dialog/en-us/hourly.precipitation.next.location.dialog b/dialog/en-us/hourly.precipitation.next.location.dialog
@@ -0,0 +1,2 @@
+In {location} there is a {percent} chance of {precipitation} at {time}
+The forecast calls for a {percent} chance of {precipitation} in {location} at {time}
diff --git a/dialog/en-us/hourly.temperature.local.dialog b/dialog/en-us/hourly.temperature.local.dialog
@@ -0,0 +1,2 @@
+It will be about {temperature} degrees in the {time}
+In the {time}, it will be {temperature} degrees
diff --git a/dialog/en-us/hourly.temperature.location.dialog b/dialog/en-us/hourly.temperature.location.dialog
@@ -0,0 +1,2 @@
+In {location} it will be about {temperature} degrees in the {time}
+In the {time}, it will be {temperature} degrees in {location}
diff --git a/dialog/en-us/hourly.weather.local.dialog b/dialog/en-us/hourly.weather.local.dialog
@@ -0,0 +1,4 @@
+It will be {condition}, with temperatures near {temperature}
+Later it will be {condition} and around {temperature} degrees
+Later it will be {condition} and {temperature} degrees
+Around {temperature} degrees with {condition}
diff --git a/dialog/en-us/hourly.weather.location.dialog b/dialog/en-us/hourly.weather.location.dialog
@@ -0,0 +1,4 @@
+{location} weather in the next few hours will be {condition} and {temperature} degrees
+Later it will be {condition} in {location}, with temperatures around {temperature}
+{location} will be around {temperature} with {condition}
+{location} will be about {temperature} degrees with {condition}
diff --git a/dialog/en-us/light.wind.dialog b/dialog/en-us/light.wind.dialog
diff --git a/dialog/en-us/local.hard.wind.dialog b/dialog/en-us/local.hard.wind.dialog
diff --git a/dialog/en-us/local.light.wind.dialog b/dialog/en-us/local.light.wind.dialog
diff --git a/dialog/en-us/local.medium.wind.dialog b/dialog/en-us/local.medium.wind.dialog
diff --git a/dialog/en-us/location.not.found.dialog b/dialog/en-us/location.not.found.dialog
@@ -1,3 +1,2 @@
-I not sure where that is
-I don't know that location
-I don't know that place
+I can't find a city named {location}. Please try again
+The city {location} is not in my memory banks.  Please try again
diff --git a/dialog/en-us/medium.wind.dialog b/dialog/en-us/medium.wind.dialog
diff --git a/dialog/en-us/min.max.dialog b/dialog/en-us/min.max.dialog
diff --git a/dialog/en-us/no precipitation expected.dialog b/dialog/en-us/no precipitation expected.dialog
diff --git a/dialog/en-us/N.dialog → dialog/en-us/north.dialog b/dialog/en-us/N.dialog → dialog/en-us/north.dialog
diff --git a/dialog/en-us/NE.dialog → dialog/en-us/northeast.dialog b/dialog/en-us/NE.dialog → dialog/en-us/northeast.dialog
diff --git a/dialog/en-us/NW.dialog → dialog/en-us/northwest.dialog b/dialog/en-us/NW.dialog → dialog/en-us/northwest.dialog
diff --git a/dialog/en-us/on.date.dialog b/dialog/en-us/on.date.dialog
diff --git a/dialog/en-us/on.dialog b/dialog/en-us/on.dialog