diff --git a/__init__.py b/__init__.py
index 77dddd43..b86004b5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -26,18 +26,24 @@
 from adapt.intent import IntentBuilder
 from requests import HTTPError
 
-import mycroft.audio
 from mycroft import MycroftSkill, intent_handler
 from mycroft.messagebus.message import Message
 from mycroft.util.parse import extract_number
 from .source import (
+    CurrentDialog,
+    DAILY,
+    DailyDialog,
     DailyWeather,
+    HOURLY,
+    HourlyDialog,
+    get_dialog_for_timeframe,
     LocationNotFoundError,
     OpenWeatherMapApi,
     WeatherConfig,
     WeatherDialog,
     WeatherIntent,
     WeatherReport,
+    WeeklyDialog,
 )
 
 # TODO: VK Failures
@@ -67,7 +73,7 @@ def __init__(self):
         self.weather_api = OpenWeatherMapApi()
         self.weather_api.set_language_parameter(self.lang)
         self.weather_config = WeatherConfig(self.config_core, self.settings)
-        self.platform = self.config_core["enclosure"]["platform"]
+        self.platform = self.config_core["enclosure"].get("platform", "unknown")
 
         # Build a dictionary to translate OWM weather-conditions
         # codes into the Mycroft weather icon codes
@@ -88,8 +94,8 @@ def __init__(self):
 
     @intent_handler(
         IntentBuilder("")
-        .one_of("Weather", "Forecast")
         .optionally("Query")
+        .one_of("Weather", "Forecast")
         .optionally("Location")
         .optionally("Today")
     )
@@ -114,8 +120,14 @@ def handle_like_outside(self, message: Message):
         """
         self._report_current_weather(message)
 
-    @intent_handler("what.is.multi.day.forecast.intent")
-    def handle_multi_day_forecast(self, message: Message):
+    @intent_handler(
+        IntentBuilder("")
+        .optionally("Query")
+        .one_of("Weather", "Forecast")
+        .require("NumberDays")
+        .optionally("Location")
+    )
+    def handle_number_days_forecast(self, message: Message):
         """Handle multiple day forecast without specified location.
 
         Examples:
@@ -124,18 +136,18 @@ def handle_multi_day_forecast(self, message: Message):
 
         :param message: Message Bus event information from the intent parser
         """
-        if self.voc_match(message.data["num"], "Couple"):
+        if self.voc_match(message.data["utterance"], "Couple"):
             days = 2
-        elif self.voc_match(message.data["num"], "Few"):
+        elif self.voc_match(message.data["utterance"], "Few"):
             days = 3
         else:
-            days = int(extract_number(message.data["num"]))
+            days = int(extract_number(message.data["utterance"]))
         self._report_multi_day_forecast(message, days)
 
     @intent_handler(
         IntentBuilder("")
-        .one_of("Weather", "Forecast")
         .optionally("Query")
+        .one_of("Weather", "Forecast")
         .require("RelativeDay")
         .optionally("Location")
     )
@@ -157,7 +169,7 @@ def handle_one_day_forecast(self, message):
         .require("Later")
         .optionally("Location")
     )
-    def handle_next_hour(self, message: Message):
+    def handle_weather_later(self, message: Message):
         """Handle future weather requests such as: what's the weather later?
 
         :param message: Message Bus event information from the intent parser
@@ -166,9 +178,9 @@ def handle_next_hour(self, message: Message):
 
     @intent_handler(
         IntentBuilder("")
-        .require("RelativeTime")
-        .one_of("Weather", "Forecast")
         .optionally("Query")
+        .one_of("Weather", "Forecast")
+        .require("RelativeTime")
         .optionally("RelativeDay")
         .optionally("Location")
     )
@@ -205,12 +217,12 @@ def handle_week_weather(self, message: Message):
 
         :param message: Message Bus event information from the intent parser
         """
-        self._report_multi_day_forecast(message, days=7)
+        self._report_week_summary(message)
 
     @intent_handler(
         IntentBuilder("")
-        .require("Temperature")
         .optionally("Query")
+        .require("Temperature")
         .optionally("Location")
         .optionally("Unit")
         .optionally("Today")
@@ -221,7 +233,7 @@ def handle_current_temperature(self, message: Message):
 
         Examples:
             "What is the temperature in Celsius?"
-            "What is the temperature in Baltimore?"
+            "What is the temperature in Baltimore now?"
 
         :param message: Message Bus event information from the intent parser
         """
@@ -229,11 +241,11 @@ def handle_current_temperature(self, message: Message):
 
     @intent_handler(
         IntentBuilder("")
-        .require("Temperature")
         .optionally("Query")
+        .require("Temperature")
+        .require("RelativeDay")
         .optionally("Location")
         .optionally("Unit")
-        .optionally("RelativeDay")
     )
     def handle_daily_temperature(self, message: Message):
         """Handle simple requests for current temperature.
@@ -246,9 +258,9 @@ def handle_daily_temperature(self, message: Message):
 
     @intent_handler(
         IntentBuilder("")
+        .optionally("Query")
         .require("Temperature")
         .require("RelativeTime")
-        .optionally("Query")
         .optionally("RelativeDay")
         .optionally("Location")
     )
@@ -321,7 +333,7 @@ def handle_is_it_hot(self, message: Message):
         IntentBuilder("")
         .optionally("How")
         .one_of("Hot", "Cold")
-        .one_of("ConfirmQueryFuture", "ConfirmQueryCurrent")
+        .require("ConfirmQuery")
         .optionally("Location")
         .optionally("RelativeDay")
     )
@@ -333,22 +345,6 @@ def handle_how_hot_or_cold(self, message):
         temperature_type = "high" if message.data.get("Hot") else "low"
         self._report_temperature(message, temperature_type)
 
-    @intent_handler(
-        IntentBuilder("")
-        .require("How")
-        .one_of("Hot", "Cold")
-        .one_of("ConfirmQueryFuture", "ConfirmQueryCurrent")
-        .optionally("Location")
-        .optionally("RelativeDay")
-    )
-    def handle_how_hot_or_cold_alt(self, message: Message):
-        """Handler for temperature requests such as: how cold will it be today?
-
-        :param message: Message Bus event information from the intent parser
-        """
-        temperature_type = "high" if message.data.get("Hot") else "low"
-        self._report_temperature(message, temperature_type)
-
     @intent_handler(
         IntentBuilder("")
         .require("ConfirmQuery")
@@ -367,9 +363,9 @@ def handle_is_it_windy(self, message: Message):
         IntentBuilder("")
         .require("How")
         .require("Windy")
-        .optionally("Location")
         .optionally("ConfirmQuery")
         .optionally("RelativeDay")
+        .optionally("Location")
     )
     def handle_windy(self, message):
         """Handler for weather requests such as: how windy is it?
@@ -379,10 +375,7 @@ def handle_windy(self, message):
         self._report_wind(message)
 
     @intent_handler(
-        IntentBuilder("")
-        .require("ConfirmQuery")
-        .require("Snowing")
-        .optionally("Location")
+        IntentBuilder("").require("ConfirmQuery").require("Snow").optionally("Location")
     )
     def handle_is_it_snowing(self, message: Message):
         """Handler for weather requests such as: is it snowing today?
@@ -407,7 +400,7 @@ def handle_is_it_clear(self, message: Message):
     @intent_handler(
         IntentBuilder("")
         .require("ConfirmQuery")
-        .require("Cloudy")
+        .require("Clouds")
         .optionally("Location")
         .optionally("RelativeTime")
     )
@@ -419,10 +412,7 @@ def handle_is_it_cloudy(self, message: Message):
         self._report_weather_condition(message, "Clouds")
 
     @intent_handler(
-        IntentBuilder("")
-        .require("ConfirmQuery")
-        .require("Foggy")
-        .optionally("Location")
+        IntentBuilder("").require("ConfirmQuery").require("Fog").optionally("Location")
     )
     def handle_is_it_foggy(self, message: Message):
         """Handler for weather requests such as: is it foggy today?
@@ -432,10 +422,7 @@ def handle_is_it_foggy(self, message: Message):
         self._report_weather_condition(message, "Fog")
 
     @intent_handler(
-        IntentBuilder("")
-        .require("ConfirmQuery")
-        .require("Raining")
-        .optionally("Location")
+        IntentBuilder("").require("ConfirmQuery").require("Rain").optionally("Location")
     )
     def handle_is_it_raining(self, message: Message):
         """Handler for weather requests such as: is it raining today?
@@ -455,7 +442,7 @@ def handle_need_umbrella(self, message: Message):
     @intent_handler(
         IntentBuilder("")
         .require("ConfirmQuery")
-        .require("Storm")
+        .require("Thunderstorm")
         .optionally("Location")
     )
     def handle_is_it_storming(self, message: Message):
@@ -516,36 +503,42 @@ def handle_humidity(self, message: Message):
         .one_of("Query", "When")
         .optionally("Location")
         .require("Sunrise")
+        .optionally("Today")
+        .optionally("RelativeDay")
     )
     def handle_sunrise(self, message: Message):
         """Handler for weather requests such as: when is the sunrise?
 
         :param message: Message Bus event information from the intent parser
         """
-        intent_data = WeatherIntent(message, self.lang)
+        intent_data = self._get_intent_data(message)
         weather = self._get_weather(intent_data)
         if weather is not None:
             intent_weather = weather.get_weather_for_intent(intent_data)
-            dialog = WeatherDialog(intent_weather, self.weather_config, intent_data)
+            dialog_args = intent_data, self.weather_config, intent_weather
+            dialog = get_dialog_for_timeframe(intent_data.timeframe, dialog_args)
             dialog.build_sunrise_dialog()
             self._speak_weather(dialog)
 
     @intent_handler(
         IntentBuilder("")
         .one_of("Query", "When")
-        .optionally("Location")
         .require("Sunset")
+        .optionally("Location")
+        .optionally("Today")
+        .optionally("RelativeDay")
     )
     def handle_sunset(self, message: Message):
         """Handler for weather requests such as: when is the sunset?
 
         :param message: Message Bus event information from the intent parser
         """
-        intent_data = WeatherIntent(message, self.lang)
+        intent_data = self._get_intent_data(message)
         weather = self._get_weather(intent_data)
         if weather is not None:
             intent_weather = weather.get_weather_for_intent(intent_data)
-            dialog = WeatherDialog(intent_weather, self.weather_config, intent_data)
+            dialog_args = intent_data, self.weather_config, intent_weather
+            dialog = get_dialog_for_timeframe(intent_data.timeframe, dialog_args)
             dialog.build_sunset_dialog()
             self._speak_weather(dialog)
 
@@ -558,8 +551,8 @@ def _report_current_weather(self, message: Message):
         weather = self._get_weather(intent_data)
         if weather is not None:
             self._display_current_conditions(weather, intent_data)
-            dialog = WeatherDialog(weather, self.weather_config, intent_data)
-            dialog.build_current_weather_dialog()
+            dialog = CurrentDialog(intent_data, self.weather_config, weather.current)
+            dialog.build_weather_dialog()
             self._speak_weather(dialog)
             if self.gui.connected and self.platform != MARK_II:
                 self._display_more_current_conditions(weather)
@@ -574,7 +567,9 @@ def _report_current_weather(self, message: Message):
                     four_day_forecast = weather.daily[1:5]
                     self._display_forecast(four_day_forecast)
 
-    def _display_current_conditions(self, weather: WeatherReport, intent_data: WeatherIntent):
+    def _display_current_conditions(
+        self, weather: WeatherReport, intent_data: WeatherIntent
+    ):
         """Display current weather conditions on a screen.
 
         This is the first screen that shows.  Others will follow.
@@ -598,6 +593,17 @@ def _display_current_conditions(self, weather: WeatherReport, intent_data: Weath
             self.enclosure.weather_display(image_code, weather.current.temperature)
 
     def _build_display_location(self, intent_data: WeatherIntent) -> str:
+        """Build a string representing the location of the weather for display on GUI
+
+        The return value will be the device's configured location if no location is
+        specified in the intent.  If a location is specified, and it is in the same
+        country as that in the device configuration, the return value will be city and
+        region.  A specified location in a different country will result in a return
+        value of city and country.
+
+        :param intent_data: information about the intent that was triggered
+        :return: The weather location to be displayed on the GUI
+        """
         if intent_data.geolocation:
             location = [intent_data.geolocation["city"]]
             if intent_data.geolocation["country"] == self.weather_config.country:
@@ -640,8 +646,8 @@ def _report_one_hour_weather(self, message: Message):
             except IndexError:
                 self.speak_dialog("forty-eight.hours.available")
             else:
-                dialog = WeatherDialog(forecast, self.weather_config, intent_data)
-                dialog.build_hourly_weather_dialog()
+                dialog = HourlyDialog(intent_data, self.weather_config, forecast)
+                dialog.build_weather_dialog()
                 self._speak_weather(dialog)
 
     def _display_hourly_forecast(self, weather: WeatherReport):
@@ -659,7 +665,7 @@ def _display_hourly_forecast(self, weather: WeatherReport):
             if hour_count > 4:
                 break
             # TODO: make the timeframe aware of language/location settings
-            if self.config_core['time_format'] == TWELVE_HOUR:
+            if self.config_core["time_format"] == TWELVE_HOUR:
                 # The datetime builtin returns hour in two character format.  Convert
                 # to a integer and back again to remove the leading zero when present.
                 hour = int(hourly.date_time.strftime("%I"))
@@ -727,7 +733,7 @@ def _report_weekend_forecast(self, message: Message):
 
     def _build_forecast_dialogs(
         self, forecast: List[DailyWeather], intent_data: WeatherIntent
-    ) -> List[WeatherDialog]:
+    ) -> List[DailyDialog]:
         """
         Build the dialogs for each of the forecast days being reported to the user.
 
@@ -737,12 +743,66 @@ def _build_forecast_dialogs(
         """
         dialogs = list()
         for forecast_day in forecast:
-            dialog = WeatherDialog(forecast_day, self.weather_config, intent_data)
-            dialog.build_daily_weather_dialog()
+            dialog = DailyDialog(intent_data, self.weather_config, forecast_day)
+            dialog.build_weather_dialog()
             dialogs.append(dialog)
 
         return dialogs
 
+    def _report_week_summary(self, message: Message):
+        """Summarize the week's weather rather than giving daily details.
+
+        When the user requests the weather for the week, rather than give a daily
+        forecast for seven days, summarize the weather conditions for the week.
+
+        :param message: Message Bus event information from the intent parser
+        """
+        intent_data = WeatherIntent(message, self.lang)
+        weather = self._get_weather(intent_data)
+        if weather is not None:
+            forecast = weather.get_forecast_for_multiple_days(7)
+            dialogs = self._build_weekly_condition_dialogs(forecast, intent_data)
+            dialogs.append(self._build_weekly_temperature_dialog(forecast, intent_data))
+            self._display_forecast(forecast)
+            for dialog in dialogs:
+                self._speak_weather(dialog)
+
+    def _build_weekly_condition_dialogs(
+        self, forecast: List[DailyWeather], intent_data: WeatherIntent
+    ) -> List[WeeklyDialog]:
+        """Build the dialog communicating a weather condition on days it is forecasted.
+
+        :param forecast: seven day daily forecast
+        :param intent_data: Parsed intent data
+        :return: List of dialogs for each condition expected in the coming week.
+        """
+        dialogs = list()
+        conditions = set([daily.condition.category for daily in forecast])
+        for condition in conditions:
+            dialog = WeeklyDialog(intent_data, self.weather_config, forecast)
+            dialog.build_condition_dialog(condition=condition)
+            dialog.data.update(
+                condition=self.translate(condition.lower()),
+                days=dialog.data["days"].replace("and", self.translate("and")),
+            )
+            dialogs.append(dialog)
+
+        return dialogs
+
+    def _build_weekly_temperature_dialog(
+        self, forecast: List[DailyWeather], intent_data: WeatherIntent
+    ) -> WeeklyDialog:
+        """Build the dialog communicating the forecasted range of temperatures.
+
+        :param forecast: seven day daily forecast
+        :param intent_data: Parsed intent data
+        :return: Dialog for the temperature ranges over the coming week.
+        """
+        dialog = WeeklyDialog(intent_data, self.weather_config, forecast)
+        dialog.build_temperature_dialog()
+
+        return dialog
+
     def _display_forecast(self, forecast: List[DailyWeather]):
         """Display daily forecast data on devices that support the GUI.
 
@@ -768,14 +828,14 @@ def _display_forecast_mark_ii(self, forecast: List[DailyWeather]):
                     weatherCode=self.image_codes[day.condition.icon],
                     day=day.date_time.strftime("%a"),
                     highTemperature=day.temperature.high,
-                    lowTemperature=day.temperature.low
+                    lowTemperature=day.temperature.low,
                 )
             )
         self.gui.clear()
         self.gui["dailyForecast"] = dict(days=daily_forecast[:4])
         self.gui.show_page(page_name)
         if len(forecast) > 4:
-            sleep(20)
+            sleep(15)
             self.gui.clear()
             self.gui["dailyForecast"] = dict(days=daily_forecast[4:])
             self.gui.show_page(page_name)
@@ -816,7 +876,8 @@ def _report_temperature(self, message: Message, temperature_type: str = None):
         weather = self._get_weather(intent_data)
         if weather is not None:
             intent_weather = weather.get_weather_for_intent(intent_data)
-            dialog = WeatherDialog(intent_weather, self.weather_config, intent_data)
+            dialog_args = intent_data, self.weather_config, intent_weather
+            dialog = get_dialog_for_timeframe(intent_data.timeframe, dialog_args)
             dialog.build_temperature_dialog(temperature_type)
             self._speak_weather(dialog)
 
@@ -844,12 +905,11 @@ def _build_condition_dialog(
         :param intent_data: Parsed intent data
         :param condition: weather condition requested by the user
         """
-        dialog = WeatherDialog(weather, self.weather_config, intent_data)
+        dialog_args = intent_data, self.weather_config, weather
+        dialog = get_dialog_for_timeframe(intent_data.timeframe, dialog_args)
         intent_match = self.voc_match(weather.condition.category.lower(), condition)
-        alternative_vocab = condition + "Alternatives"
-        alternative = self.voc_match(weather.condition.category, alternative_vocab)
-        dialog.build_condition_dialog(condition, intent_match, alternative)
-        dialog.data.update(condition=self.translate(condition))
+        dialog.build_condition_dialog(intent_match)
+        dialog.data.update(condition=self.translate(weather.condition.description))
 
         return dialog
 
@@ -882,12 +942,12 @@ def _get_intent_data(self, message: Message) -> WeatherIntent:
             self.speak_dialog("cant.get.forecast")
         else:
             if self.voc_match(intent_data.utterance, "RelativeTime"):
-                intent_data.timeframe = "hourly"
+                intent_data.timeframe = HOURLY
             elif self.voc_match(intent_data.utterance, "Later"):
-                intent_data.timeframe = "hourly"
+                intent_data.timeframe = HOURLY
             elif self.voc_match(intent_data.utterance, "RelativeDay"):
                 if not self.voc_match(intent_data.utterance, "Today"):
-                    intent_data.timeframe = "daily"
+                    intent_data.timeframe = DAILY
 
         return intent_data
 
@@ -945,14 +1005,13 @@ def _determine_weather_location(
 
         return latitude, longitude
 
-    def _speak_weather(self, dialog: WeatherDialog):
+    def _speak_weather(self, dialog):
         """Instruct device to speak the contents of the specified dialog.
 
         :param dialog: the dialog that will be spoken
         """
         self.log.info("Speaking dialog: " + dialog.name)
-        self.speak_dialog(dialog.name, dialog.data)
-        mycroft.audio.wait_while_speaking()
+        self.speak_dialog(dialog.name, dialog.data, wait=True)
 
 
 def create_skill():
diff --git a/locale/ca-es/ClearAlternatives.voc b/locale/ca-es/ClearAlternatives.voc
deleted file mode 100644
index 7192d353..00000000
--- a/locale/ca-es/ClearAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similars a temps clar
-(nebulós|nebulosa|bromós|bromos|boira|boirós|boirosa|enlleganyat|enlleganyada|lleganyós|lleganyos|calitjós|calitjosa|núvol|ennuvolat|ennuvolada|encapotat|encapotada|fosc|fosca|cobert|coberta|tapat|tapada|emboirat|emboirada|nuvolós|nuvolosa|embromat|embromada|núvol|núvols)
diff --git a/locale/ca-es/CloudsAlternatives.voc b/locale/ca-es/CloudsAlternatives.voc
deleted file mode 100644
index 9c2f0d7d..00000000
--- a/locale/ca-es/CloudsAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similars a temps ennuvolat
-(clar|boirina|aigua|pluja|plovisqueja| pluja lleugera)
diff --git a/locale/ca-es/RainAlternatives.voc b/locale/ca-es/RainAlternatives.voc
deleted file mode 100644
index e1c6e8b6..00000000
--- a/locale/ca-es/RainAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similars a la pluja
-(neu|nevada lleugera|aiguaneu|boira)
diff --git a/locale/ca-es/SnowAlternatives.voc b/locale/ca-es/SnowAlternatives.voc
deleted file mode 100644
index bdf3bde1..00000000
--- a/locale/ca-es/SnowAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Condicions similars a la neu
-(pluja|pluja lleugera)
diff --git a/locale/ca-es/ThunderstormAlternatives.voc b/locale/ca-es/ThunderstormAlternatives.voc
deleted file mode 100644
index a382d361..00000000
--- a/locale/ca-es/ThunderstormAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similars a temps tempestuós
-(plugim|plovisqueig|pluja|pluja lleugera|neu|poca neu|boirós|boira|núvol|núvols|nuvolat|parcialment ennuvolat)
diff --git a/locale/ca-es/and.dialog b/locale/ca-es/and.dialog
new file mode 100644
index 00000000..24e79aeb
--- /dev/null
+++ b/locale/ca-es/and.dialog
@@ -0,0 +1 @@
+, i
diff --git a/locale/ca-es/clear.future.dialog b/locale/ca-es/clear.future.dialog
deleted file mode 100644
index 2789b6da..00000000
--- a/locale/ca-es/clear.future.dialog
+++ /dev/null
@@ -1 +0,0 @@
-un cel clar
diff --git a/locale/ca-es/condition.category.value b/locale/ca-es/condition.category.value
deleted file mode 100644
index fe43ad83..00000000
--- a/locale/ca-es/condition.category.value
+++ /dev/null
@@ -1,15 +0,0 @@
-Núvols, ennuvolat
-Clar, un cel ras
-Tempesta, tempestuós
-Plugim, plovisquejant
-pluja|plovent
-neu|nevada|nevant
-Boirina, boirós
-Fum, amb fum
-Calitja, boirina
-Pols,polsegós
-Boira,boirós
-Sorra,sorrenc
-Cendra,ennuvolat amb possible cendra volcànica
-Ratxa de vent,tempestuós
-Tornado,tempestat amb un possible tornado
diff --git a/locale/ca-es/current.clear.alternative.local.dialog b/locale/ca-es/current.clear.alternative.local.dialog
deleted file mode 100644
index 00ce0005..00000000
--- a/locale/ca-es/current.clear.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-No, la previsió d'avui és {condition}
-Sembla que hi haurà {condition} avui
-És possible que avui sigui {condition}
diff --git a/locale/ca-es/current.clear.alternative.location.dialog b/locale/ca-es/current.clear.alternative.location.dialog
deleted file mode 100644
index 5834454d..00000000
--- a/locale/ca-es/current.clear.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-No, la previsió a {location} és {condition}
-Sembla que hi haurà {condition} a {location}
-Es probable que {condition} a {location}
diff --git a/locale/ca-es/current.clear.not.expected.local.dialog b/locale/ca-es/current.clear.not.expected.local.dialog
deleted file mode 100644
index 48842485..00000000
--- a/locale/ca-es/current.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si és clar però no ho és
-Ho sento, sembla que serà {condition}
-No és probable que el cel vagi a estar clar
diff --git a/locale/ca-es/current.clouds.alternative.local.dialog b/locale/ca-es/current.clouds.alternative.local.dialog
deleted file mode 100644
index 76fa6587..00000000
--- a/locale/ca-es/current.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-No, la previsió d'avui és {condition}
-# Informant que es produirà una alternativa al cel ennuvolat
-No hauria d'estar ennuvolat, sembla que avui farà {condition}
-No sembla que sigui així, hi ha possibilitats que avui faci {condition}
diff --git a/locale/ca-es/current.clouds.alternative.location.dialog b/locale/ca-es/current.clouds.alternative.location.dialog
deleted file mode 100644
index 401f7485..00000000
--- a/locale/ca-es/current.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-No, la previsió meteorològica és {condition}
-No hauria d'estar ennuvolat, sembla que farà {condition}
-No sembla que sigui així, hi ha possibilitats que farà {condition}
diff --git a/locale/ca-es/current.clouds.not.expected.local.dialog b/locale/ca-es/current.clouds.not.expected.local.dialog
deleted file mode 100644
index 444434a8..00000000
--- a/locale/ca-es/current.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si plou, però no es preveu cap núvol o una previsió similar
-Avui no es preveu boira
-No hauria d'estar ennuvolat avui
diff --git a/locale/ca-es/current.clouds.not.expected.location.dialog b/locale/ca-es/current.clouds.not.expected.location.dialog
deleted file mode 100644
index dcc6c21c..00000000
--- a/locale/ca-es/current.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si farà núvol però no ho farà
-No sembla que avui estigui ennuvolat
-No hauria d'estar ennuvolat
diff --git a/locale/ca-es/current.fog.alternative.local.dialog b/locale/ca-es/current.fog.alternative.local.dialog
deleted file mode 100644
index 00ce0005..00000000
--- a/locale/ca-es/current.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-No, la previsió d'avui és {condition}
-Sembla que hi haurà {condition} avui
-És possible que avui sigui {condition}
diff --git a/locale/ca-es/current.fog.alternative.location.dialog b/locale/ca-es/current.fog.alternative.location.dialog
deleted file mode 100644
index f3523516..00000000
--- a/locale/ca-es/current.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-No, la previsió a {location} és {condition}
-Es probable que {condition} a {location}
-# S'informa que es produirà una alternativa a la boira en la ubicació
-Sembla que hi haurà {condition} a {location}
diff --git a/locale/ca-es/current.fog.not.expected.local.dialog b/locale/ca-es/current.fog.not.expected.local.dialog
deleted file mode 100644
index 624cdd4a..00000000
--- a/locale/ca-es/current.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si fa boira, però no es preveu neu ni cap alternativa
-Sembla que la visibilitat serà bona avui
-No es preveu boira avui
diff --git a/locale/ca-es/current.fog.not.expected.location.dialog b/locale/ca-es/current.fog.not.expected.location.dialog
deleted file mode 100644
index 5ce3cab2..00000000
--- a/locale/ca-es/current.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si fa boira, però no es preveu neu ni cap alternativa
-Sembla que la visibilitat serà bona a {location}
-No es preveu cap tempesta a {location} avui
diff --git a/locale/ca-es/current.rain.alternative.local.dialog b/locale/ca-es/current.rain.alternative.local.dialog
deleted file mode 100644
index 7864854c..00000000
--- a/locale/ca-es/current.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informar que es produirà una alternativa a la pluja (com la neu o la boira)
-No, però la previsió d'avui és {condition}
-Avui no es preveu pluja, però sembla que hi haurà {condition}
diff --git a/locale/ca-es/current.rain.alternative.location.dialog b/locale/ca-es/current.rain.alternative.location.dialog
deleted file mode 100644
index 069bb28e..00000000
--- a/locale/ca-es/current.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informar que es produirà una alternativa a la pluja (com la neu o la boira)
-No, però la previsió a {location} és {condition}
-Avui no es preveu pluja a {location}, però sembla que hi haurà {condition}
diff --git a/locale/ca-es/current.rain.not.expected.local.dialog b/locale/ca-es/current.rain.not.expected.local.dialog
deleted file mode 100644
index c974e878..00000000
--- a/locale/ca-es/current.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quan l'usuari pregunta si plou, però no es preveu pluja ni cap alternativa
-No es preveu cap pluja avui
-Avui no hauria de ploure
-No hi ha necessitat de paraigua avui
diff --git a/locale/ca-es/current.rain.not.expected.location.dialog b/locale/ca-es/current.rain.not.expected.location.dialog
deleted file mode 100644
index ddabf71a..00000000
--- a/locale/ca-es/current.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quan l'usuari pregunta si plou, però no es preveu pluja ni cap alternativa
-No es preveu cap pluja a {location} 
-No hauria d'estar plovent a {location}
-No hi ha cap necessitat de paraigua a {location}
diff --git a/locale/ca-es/current.snow.alternative.local.dialog b/locale/ca-es/current.snow.alternative.local.dialog
deleted file mode 100644
index e941ee22..00000000
--- a/locale/ca-es/current.snow.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informant que es produirà una alternativa a la neu
-No, però la previsió d'avui és {condition}
-Avui no hi ha previsió de pluja, però hi ha possibilitat que faci {condition}
diff --git a/locale/ca-es/current.snow.alternative.location.dialog b/locale/ca-es/current.snow.alternative.location.dialog
deleted file mode 100644
index feeccd1b..00000000
--- a/locale/ca-es/current.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informant que es produirà una alternativa a la neu
-No, però la previsió a {location} és {condition}
-Avui no hi ha previsió de pluja, però hi ha possibilitat que faci {condition} a {location}
diff --git a/locale/ca-es/current.snow.not.expected.local.dialog b/locale/ca-es/current.snow.not.expected.local.dialog
deleted file mode 100644
index 06cfe127..00000000
--- a/locale/ca-es/current.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si neva, però no es preveu neu ni cap alternativa
-No es preveu neu avui
-Avui no hauria de nevar
diff --git a/locale/ca-es/current.snow.not.expected.location.dialog b/locale/ca-es/current.snow.not.expected.location.dialog
deleted file mode 100644
index 7cfb1d3c..00000000
--- a/locale/ca-es/current.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si neva, però no neva ni es preveu alternativa
-No es preveu cap tempesta per a {location}
-No nevarà a {location}
diff --git a/locale/ca-es/current.thunderstorm.alternative.local.dialog b/locale/ca-es/current.thunderstorm.alternative.local.dialog
deleted file mode 100644
index f097999d..00000000
--- a/locale/ca-es/current.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-No, però la previsió d'avui és {condition}
-# Informar que es produirà una alternativa a una tempesta (com la neu o la boira)
-Avui no hi ha prevsió de tempesta, però sembla que farà {condition}
diff --git a/locale/ca-es/current.thunderstorm.not.expected.local.dialog b/locale/ca-es/current.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 87c2e132..00000000
--- a/locale/ca-es/current.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-# Quan l'usuari pregunta si plou, però no es preveu pluja ni cap alternativa
-No es preveu cap tempesta avui
-Avui no hauria d'haver-hi tempesta
-Avui no hauria d'haver-hi tempesta
-Avui és poc probable que hi hagi tempesta
-Una tempesta no és probable avui
diff --git a/locale/ca-es/current.thunderstorm.not.expected.location.dialog b/locale/ca-es/current.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index 023c4223..00000000
--- a/locale/ca-es/current.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quan l'usuari pregunta si fa tempesta, però no n'hi ha ni es preveu cap alternativa
-No es preveu cap tempesta a {location}
-No s'ha de produir cap tempesta a {location}
-No hauria d'haver-hi tempesta a {location}
diff --git a/locale/ca-es/current.thundestorm.alternative.location.dialog b/locale/ca-es/current.thundestorm.alternative.location.dialog
deleted file mode 100644
index 1ab19a73..00000000
--- a/locale/ca-es/current.thundestorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-No, però la previsió a {location} és {condition}
-# Informar que es produirà una alternativa a la tempesta (com la neu o la boira)
-Avui no es preveu tempesta a {location}, però sembla que hi haurà {condition}
diff --git a/locale/ca-es/daily.clear.alternative.local.dialog b/locale/ca-es/daily.clear.alternative.local.dialog
deleted file mode 100644
index 268e1a27..00000000
--- a/locale/ca-es/daily.clear.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-No, la previsió de {day} és {condition}
-El {day} sembla que hi haurà {condition}
diff --git a/locale/ca-es/daily.clear.alternative.location.dialog b/locale/ca-es/daily.clear.alternative.location.dialog
deleted file mode 100644
index 33ad44a4..00000000
--- a/locale/ca-es/daily.clear.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informant que es produirà una alternativa a la pluja
-No, però la previsió de {day} a {location} és {condition}
-{day} no hi ha cap pluja prevista el {day} per a {location}, però sembla que hi haurà {condition}
diff --git a/locale/ca-es/daily.clear.not.expected.local.dialog b/locale/ca-es/daily.clear.not.expected.local.dialog
deleted file mode 100644
index 2bdd0bf4..00000000
--- a/locale/ca-es/daily.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si és clar, però es preveu un alternativa
-Ho sento, la previsió no prediu condicions clares per al {day}
-{day} no és probable que estigui clar
diff --git a/locale/ca-es/daily.clear.not.expected.location.dialog b/locale/ca-es/daily.clear.not.expected.location.dialog
deleted file mode 100644
index b2a0a964..00000000
--- a/locale/ca-es/daily.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si és clar, però es preveu un alternativa
-Ho sento, la previsió per a {day} no prediu condicions clares a {location}
-{day} no és probable que estigui clar el temps a {location} 
diff --git a/locale/ca-es/daily.clouds.alternative.local.dialog b/locale/ca-es/daily.clouds.alternative.local.dialog
deleted file mode 100644
index f813d739..00000000
--- a/locale/ca-es/daily.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-No, la previsió de {day} és {condition}
-No hauria d'estar ennuvolat, sembla que farà {condition} el {day}
-No sembla que sigui així, hi ha possibilitats que farà {condition} el {day}
diff --git a/locale/ca-es/daily.clouds.alternative.location.dialog b/locale/ca-es/daily.clouds.alternative.location.dialog
deleted file mode 100644
index c550fc71..00000000
--- a/locale/ca-es/daily.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-# No, la previsió de {day} a {location} és {condition}
-# No hauria d'estar ennuvolat a {location} el {day}. Sembla que hi haurà {condition}
-No sembla que sigui així, hi ha possibilitats que farà {condition} a {location} el {day}
diff --git a/locale/ca-es/daily.clouds.not.expected.local.dialog b/locale/ca-es/daily.clouds.not.expected.local.dialog
deleted file mode 100644
index ab8ba7e1..00000000
--- a/locale/ca-es/daily.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Quan l'usuari pregunta si farà núvol però no ho farà
-No sembla que vagi a estar ennuvolat {day}
-Es preveuen cels clars {day}
-S'espera un cel clar {day}
-No hauria d'estar ennuvolat {day}
diff --git a/locale/ca-es/daily.clouds.not.expected.location.dialog b/locale/ca-es/daily.clouds.not.expected.location.dialog
deleted file mode 100644
index c74a24e5..00000000
--- a/locale/ca-es/daily.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Quan l'usuari pregunta si farà núvol però no ho farà
-No sembla que {day} hagi d'estar ennuvolat a {location}
-Es preveuen cels clars a {location} el {day}
-S'espera cels clars a {location} el {day} 
-No hauria d'estar ennuvolat a {location} el {day}
diff --git a/locale/ca-es/daily.fog.alternative.local.dialog b/locale/ca-es/daily.fog.alternative.local.dialog
deleted file mode 100644
index 8feea765..00000000
--- a/locale/ca-es/daily.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-No, la previsió de {day} és {condition}
-Sembla que hi haurà {condition} el {day}
-Hi ha possibilitats que {day} faci {condition}
diff --git a/locale/ca-es/daily.fog.alternative.location.dialog b/locale/ca-es/daily.fog.alternative.location.dialog
deleted file mode 100644
index 72cdb7b0..00000000
--- a/locale/ca-es/daily.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informant que es produirà una alternativa per aclarir els cels
-No, la previsió el {day} per a {location} és de {condition}
-Sembla que hi haurà {condition} a {location} el {day}
-Hi ha possibilitats que {day} faci {condition} a {location}
diff --git a/locale/ca-es/daily.fog.not.expected.local.dialog b/locale/ca-es/daily.fog.not.expected.local.dialog
deleted file mode 100644
index 98ef337a..00000000
--- a/locale/ca-es/daily.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si fa boira, però no es preveu neu ni cap alternativa
-{day} la visibilitat hauria de ser bona
-No es preveu boira {day}
diff --git a/locale/ca-es/daily.fog.not.expected.location.dialog b/locale/ca-es/daily.fog.not.expected.location.dialog
deleted file mode 100644
index 95bbaff9..00000000
--- a/locale/ca-es/daily.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si fa boira, però no es preveu neu ni cap alternativa
-{day} la visibilitat hauria de ser bona a {location}
-No es preveu boira {day} a {location}
diff --git a/locale/ca-es/daily.rain.alternative.local.dialog b/locale/ca-es/daily.rain.alternative.local.dialog
deleted file mode 100644
index 44562f4c..00000000
--- a/locale/ca-es/daily.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informant que es produirà una alternativa a la pluja
-No, però la previsió de {day} és {condition}
-{day} no hi ha previst pluja, però sembla que farà {condition}
diff --git a/locale/ca-es/daily.rain.alternative.location.dialog b/locale/ca-es/daily.rain.alternative.location.dialog
deleted file mode 100644
index 1b8a655e..00000000
--- a/locale/ca-es/daily.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informant que es produirà una alternativa a la pluja
-No, però la previsió {day} a {location} és {condition}
-{day} no hi ha previsió de pluja a {location}, però sembla que hi haurà {condition}
diff --git a/locale/ca-es/daily.rain.not.expected.local.dialog b/locale/ca-es/daily.rain.not.expected.local.dialog
deleted file mode 100644
index 0cf0d56f..00000000
--- a/locale/ca-es/daily.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quan l'usuari pregunta si plou, però no es preveu pluja ni cap alternativa
-No es preveu cap pluja {day}
-No hauria de ploure {day}
-No necessitareu un paraigua {day}
diff --git a/locale/ca-es/daily.rain.not.expected.location.dialog b/locale/ca-es/daily.rain.not.expected.location.dialog
deleted file mode 100644
index 80f5ba90..00000000
--- a/locale/ca-es/daily.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quan l'usuari pregunta si plou, però no es preveu pluja ni cap alternativa
-No es preveu cap pluja per a {location} {day}
-{day} no hauria de ploure a {location}
-No hi ha cap necessitat de paraigua a {location} per a {day}
diff --git a/locale/ca-es/daily.snow.alternative.location.dialog b/locale/ca-es/daily.snow.alternative.location.dialog
deleted file mode 100644
index f205180e..00000000
--- a/locale/ca-es/daily.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informant que es produirà una alternativa a la neu
-No, però la previsió de {day} és {condition}
-{day} no hi ha previsió de pluja, però hi ha possibilitat que faci {condition}
diff --git a/locale/ca-es/daily.snow.not.expected.local.dialog b/locale/ca-es/daily.snow.not.expected.local.dialog
deleted file mode 100644
index 90874b2e..00000000
--- a/locale/ca-es/daily.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si neva, però no neva ni es preveu alternativa
-No es preveu neu {day}
-No nevarà {day}
diff --git a/locale/ca-es/daily.snow.not.expected.location.dialog b/locale/ca-es/daily.snow.not.expected.location.dialog
deleted file mode 100644
index 89bf0e0a..00000000
--- a/locale/ca-es/daily.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quan l'usuari pregunta si neva, però no neva ni es preveu alternativa
-No es preveu neu a {location} {day}
-No hauria de nevar a {location} {day}
diff --git a/locale/ca-es/daily.thunderstorm.alternative.local.dialog b/locale/ca-es/daily.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 48291433..00000000
--- a/locale/ca-es/daily.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informant que es produirà una alternativa a la pluja
-No, però la previsió de {day} és {condition}
-{day} no hi ha previsió de tempesta, però sembla que farà {condition}
diff --git a/locale/ca-es/daily.thunderstorm.alternative.location.dialog b/locale/ca-es/daily.thunderstorm.alternative.location.dialog
deleted file mode 100644
index c8455a53..00000000
--- a/locale/ca-es/daily.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-No, però la previsió {day} a {location} és {condition}
-# Informant que es produirà una alternativa a la tempesta
-{day} no hi ha previsió de tempesta a {location}, però sembla que hi haurà {condition}
diff --git a/locale/ca-es/daily.thunderstorm.not.expected.local.dialog b/locale/ca-es/daily.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index a358d563..00000000
--- a/locale/ca-es/daily.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quan l'usuari pregunta si plou, però no es preveu pluja ni cap alternativa
-No es preveu cap tempesta {day}
-{day}, no hauria de fer tempesta
-No hauria d'haver-hi tempesta {day}
diff --git a/locale/ca-es/daily.thunderstorm.not.expected.location.dialog b/locale/ca-es/daily.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index d81f5a67..00000000
--- a/locale/ca-es/daily.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quan l'usuari pregunta si plou, però no es preveu pluja ni cap alternativa
-No es preveu cap tempesta per a {location} {day}
-{day} no hauria d'haver-hi tempesta a {location}
-És poc probable que hi hagi tempesta {day} a {location}
diff --git a/locale/ca-es/do not know.dialog b/locale/ca-es/do not know.dialog
deleted file mode 100644
index d22d7b83..00000000
--- a/locale/ca-es/do not know.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-Em temo que no ho sé
-No tinc aquesta informació
diff --git a/locale/ca-es/light.dialog b/locale/ca-es/light.dialog
deleted file mode 100644
index 001b4a58..00000000
--- a/locale/ca-es/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-llum
diff --git a/locale/ca-es/on.date.dialog b/locale/ca-es/on.date.dialog
deleted file mode 100644
index 78981922..00000000
--- a/locale/ca-es/on.date.dialog
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/locale/ca-es/on.dialog b/locale/ca-es/on.dialog
deleted file mode 100644
index c574d073..00000000
--- a/locale/ca-es/on.dialog
+++ /dev/null
@@ -1 +0,0 @@
-en
diff --git a/locale/ca-es/storm.dialog b/locale/ca-es/thunderstorm.dialog
similarity index 100%
rename from locale/ca-es/storm.dialog
rename to locale/ca-es/thunderstorm.dialog
diff --git a/locale/ca-es/weekly.condition.on.day.dialog b/locale/ca-es/weekly.condition.on.day.dialog
deleted file mode 100644
index d2d19228..00000000
--- a/locale/ca-es/weekly.condition.on.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-{day} serà {condition},
diff --git a/locale/ca-es/weekly.conditions.mostly.one.dialog b/locale/ca-es/weekly.conditions.mostly.one.dialog
deleted file mode 100644
index 31e11a0f..00000000
--- a/locale/ca-es/weekly.conditions.mostly.one.dialog
+++ /dev/null
@@ -1 +0,0 @@
-serà majoritàriament {condition}.
diff --git a/locale/ca-es/weekly.conditions.seq.extra.dialog b/locale/ca-es/weekly.conditions.seq.extra.dialog
deleted file mode 100644
index 70419434..00000000
--- a/locale/ca-es/weekly.conditions.seq.extra.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-sembla que també hi haurà
-també ho serà
diff --git a/locale/ca-es/weekly.conditions.seq.period.dialog b/locale/ca-es/weekly.conditions.seq.period.dialog
deleted file mode 100644
index 1e87105a..00000000
--- a/locale/ca-es/weekly.conditions.seq.period.dialog
+++ /dev/null
@@ -1 +0,0 @@
-de {from} a {to}
diff --git a/locale/ca-es/weekly.conditions.seq.start.dialog b/locale/ca-es/weekly.conditions.seq.start.dialog
deleted file mode 100644
index 7a44b534..00000000
--- a/locale/ca-es/weekly.conditions.seq.start.dialog
+++ /dev/null
@@ -1 +0,0 @@
-serà {condition} 
diff --git a/locale/ca-es/weekly.conditions.some.days.dialog b/locale/ca-es/weekly.conditions.some.days.dialog
deleted file mode 100644
index e2e64ba8..00000000
--- a/locale/ca-es/weekly.conditions.some.days.dialog
+++ /dev/null
@@ -1 +0,0 @@
-serà {condition} alguns dies.
diff --git a/locale/ca-es/weekly.temp.range.dialog b/locale/ca-es/weekly.temperature.dialog
similarity index 100%
rename from locale/ca-es/weekly.temp.range.dialog
rename to locale/ca-es/weekly.temperature.dialog
diff --git a/locale/ca-es/what.is.multi.day.forecast.intent b/locale/ca-es/what.is.multi.day.forecast.intent
deleted file mode 100644
index 1a212a3b..00000000
--- a/locale/ca-es/what.is.multi.day.forecast.intent
+++ /dev/null
@@ -1,4 +0,0 @@
-temps|clima (en|sobre|per) els següents {num} dies
-com és el temps|clima (a|sobre|per) els pròxims {num} dies
-quin serà el temps (a|sobre|per) els següents|pròxims {num} dies
-com serà el temps|clima (a|sobre|per) als següents {num} dies
diff --git a/locale/ca-es/whats.weather.like.intent b/locale/ca-es/whats.weather.like.intent
deleted file mode 100644
index 2de5ea39..00000000
--- a/locale/ca-es/whats.weather.like.intent
+++ /dev/null
@@ -1,5 +0,0 @@
-pronòstic
-oratge|el temps|meteo
-quin temps fa (avui|)
-quin temps fa fora
-previsió meteorològica|pronòstic del temps
diff --git a/locale/da-dk/ClearAlternatives.voc b/locale/da-dk/ClearAlternatives.voc
deleted file mode 100644
index 7cbe3791..00000000
--- a/locale/da-dk/ClearAlternatives.voc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Alternatives similar to clear weather 
-# (fog|mist|clouds|cloud)
-(tåge|tåge|skyer|Sky)  
diff --git a/locale/da-dk/CloudsAlternatives.voc b/locale/da-dk/CloudsAlternatives.voc
deleted file mode 100644
index 71cede88..00000000
--- a/locale/da-dk/CloudsAlternatives.voc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Alternatives similar to clody weather 
-# (clear|mist|fog|rain| light rain)
-(klar|tåge|tåge|regn| let regn)  
diff --git a/locale/da-dk/FogAlternatives.voc b/locale/da-dk/FogAlternatives.voc
deleted file mode 100644
index 4a70db06..00000000
--- a/locale/da-dk/FogAlternatives.voc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Alternatives to foggy weather 
-# (clear|clouds|cloud|partially cloudy)
-(klar|skyer|Sky|delvis skyet)  
diff --git a/locale/da-dk/RainAlternatives.voc b/locale/da-dk/RainAlternatives.voc
deleted file mode 100644
index 1ee1452a..00000000
--- a/locale/da-dk/RainAlternatives.voc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Alternatives similar to rain 
-# (snow|light snow|sleet|fog|mist)
-(sne|let sne|slud|tåge|tåge)  
diff --git a/locale/da-dk/SnowAlternatives.voc b/locale/da-dk/SnowAlternatives.voc
deleted file mode 100644
index de5dee50..00000000
--- a/locale/da-dk/SnowAlternatives.voc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Conditions similar to snow 
-# (rain|light rain)
-(regn|let regn)  
diff --git a/locale/da-dk/and.dialog b/locale/da-dk/and.dialog
new file mode 100644
index 00000000..49555825
--- /dev/null
+++ b/locale/da-dk/and.dialog
@@ -0,0 +1,2 @@
+# , and
+, og
diff --git a/locale/da-dk/clear.future.dialog b/locale/da-dk/clear.future.dialog
deleted file mode 100644
index 69e97e40..00000000
--- a/locale/da-dk/clear.future.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# a clear sky
-en klar himmel  
diff --git a/locale/da-dk/condition.category.value b/locale/da-dk/condition.category.value
deleted file mode 100644
index aae8055f..00000000
--- a/locale/da-dk/condition.category.value
+++ /dev/null
@@ -1,30 +0,0 @@
-# Clouds,cloudy
-Skyer,overskyet  
-# Clear,a clear sky
-Klar,en klar himmel  
-# Thunderstorm,storming
-Tordenvejr,stormen  
-# Drizzle,drizzling
-støvregn,støvregn  
-# Rain,raining
-Regn,regner  
-# Snow,snowing
-Sne,sner  
-# Mist,misty
-Tåge,tåget  
-# Smoke,smokey
-Røg,smokey  
-# Haze,hazey
-Dis,Hazey  
-# Dust,dusty
-Støv,støvet  
-# Fog,foggy
-Tåge,tåget  
-# Sand,sandy
-Sand,sandet  
-# Ash,cloudy with possible volcanic ash
-Aske,overskyet med mulig vulkansk aske  
-# Squall,storming
-Squall,stormen  
-# Tornado,storming with a possible tornado
-Tornado,storme med en mulig tornado  
diff --git a/locale/da-dk/current.clear.alternative.local.dialog b/locale/da-dk/current.clear.alternative.local.dialog
deleted file mode 100644
index 44c7018f..00000000
--- a/locale/da-dk/current.clear.alternative.local.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to clear skies will occur 
-# No, the forecast calls for {condition} today
-Ingen, prognosen kræver {condition} i dag  
-# It looks like there'll be {condition} today
-Det ser ud som der vil være {condition} i dag  
-# Chances are it's going to be {condition} today
-Det er chancerne for, at det bliver {condition} i dag  
diff --git a/locale/da-dk/current.clear.alternative.location.dialog b/locale/da-dk/current.clear.alternative.location.dialog
deleted file mode 100644
index a54a7b64..00000000
--- a/locale/da-dk/current.clear.alternative.location.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to clear skies will occur 
-# No, the forecast calls for {condition} in {location}
-Ingen, prognosen kræver {condition} i {location}  
-# It looks like there will be {condition} in {location}
-Det ser ud som der vil være {condition} i {location}  
-# Chances are it's going to be {condition} in {location}
-Det er chancerne for, at det bliver {condition} i {location}  
diff --git a/locale/da-dk/current.clear.not.expected.location.dialog b/locale/da-dk/current.clear.not.expected.location.dialog
deleted file mode 100644
index 7551d4b6..00000000
--- a/locale/da-dk/current.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's clear but it's not 
-# Sorry, it seems like it's going to be {condition}
-Undskyld, det ser ud til, at det bliver {condition}  
-# It's not likely to be a clear sky
-Det er sandsynligt, at det ikke er en klar himmel  
diff --git a/locale/da-dk/current.clouds.alternative.local.dialog b/locale/da-dk/current.clouds.alternative.local.dialog
deleted file mode 100644
index e60df09a..00000000
--- a/locale/da-dk/current.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to cloudy skies will occur 
-# No, the forecast calls for {condition} today
-Ingen, prognosen kræver {condition} i dag  
-# It should not be cloudy, it looks like there'll be {condition} today
-Det skal ikke være overskyet, det ser ud som der vil være {condition} i dag  
-# Doesn't seem so, chances are it's going to be {condition} today
-Ser ikke ud til, chancerne er, at det bliver {condition} i dag  
diff --git a/locale/da-dk/current.clouds.alternative.location.dialog b/locale/da-dk/current.clouds.alternative.location.dialog
deleted file mode 100644
index 8ebe2257..00000000
--- a/locale/da-dk/current.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to clear skies will occur 
-# No, the forecast calls for {condition}
-Ingen, prognosen kræver {condition}  
-# It should not be cloudy, it looks like there'll be {condition}
-Det skal ikke være overskyet, det ser ud som der vil være {condition}  
-# Doesn't seem so, chances are it's going to be {condition}
-Ser ikke ud til, chancerne er, at det bliver {condition}  
diff --git a/locale/da-dk/current.clouds.not.expected.local.dialog b/locale/da-dk/current.clouds.not.expected.local.dialog
deleted file mode 100644
index ddd76675..00000000
--- a/locale/da-dk/current.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's raining but no cloud or alternative is forcasted 
-# No clouds are predicted for today
-Der forudsiges ingen skyer i dag  
-# It should not be cloudy today
-Det skulle ikke være overskyet i dag  
diff --git a/locale/da-dk/current.clouds.not.expected.location.dialog b/locale/da-dk/current.clouds.not.expected.location.dialog
deleted file mode 100644
index 220a4b78..00000000
--- a/locale/da-dk/current.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's cloudy but it's not 
-# It doesn't seem to be cloudy today
-Det ser ikke ud til at være overskyet i dag  
-# It should not be cloudy
-Det skal ikke være overskyet  
diff --git a/locale/da-dk/current.fog.alternative.local.dialog b/locale/da-dk/current.fog.alternative.local.dialog
deleted file mode 100644
index 8b2ae764..00000000
--- a/locale/da-dk/current.fog.alternative.local.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to fog will occur 
-# No, the forecast calls for {condition} today
-Ingen, prognosen kræver {condition} i dag  
-# It looks like there'll be {condition} today
-Det ser ud som der vil være {condition} i dag  
-# Chances are it's going to be {condition} today
-Det er chancerne for, at det bliver {condition} i dag  
diff --git a/locale/da-dk/current.fog.alternative.location.dialog b/locale/da-dk/current.fog.alternative.location.dialog
deleted file mode 100644
index fe92b46c..00000000
--- a/locale/da-dk/current.fog.alternative.location.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to fog will occur at a location 
-# No, the forecast calls for {condition} in {location}
-Ingen, prognosen kræver {condition} i {location}  
-# It looks like there'll be {condition} in {location}
-Det ser ud som der vil være {condition} i {location}  
-# Chances are it's going to be {condition} in {location}
-Det er chancerne for, at det bliver {condition} i {location}  
diff --git a/locale/da-dk/current.fog.not.expected.local.dialog b/locale/da-dk/current.fog.not.expected.local.dialog
deleted file mode 100644
index bfefe629..00000000
--- a/locale/da-dk/current.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted 
-# Seems like the visibility will be good today
-Synes, at synligheden vil være god i dag  
-# No fog is predicted for today
-Ingen tåge er forudsagt for i dag  
diff --git a/locale/da-dk/current.fog.not.expected.location.dialog b/locale/da-dk/current.fog.not.expected.location.dialog
deleted file mode 100644
index 9ff5291c..00000000
--- a/locale/da-dk/current.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted 
-# Seems like the visibility will be good in {location}
-Synes, at synligheden vil være god i {location}  
-# No fog is predicted for {location} today
-Ingen tåge er forudsagt for {location} i dag  
diff --git a/locale/da-dk/current.rain.alternative.local.dialog b/locale/da-dk/current.rain.alternative.local.dialog
deleted file mode 100644
index 4cb41d30..00000000
--- a/locale/da-dk/current.rain.alternative.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to rain will occur (like snow or fog) 
-# No, but today the forecast calls for {condition}
-Ingen, men i dag kræver prognosen {condition}  
-# There is no rain predicted for today but it looks like there'll be {condition}
-Der er ikke forventet regn for i dag, men det ser ud til, at der vil være {condition}  
diff --git a/locale/da-dk/current.rain.alternative.location.dialog b/locale/da-dk/current.rain.alternative.location.dialog
deleted file mode 100644
index 0a2470c7..00000000
--- a/locale/da-dk/current.rain.alternative.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to rain will occur (like snow or fog) 
-# No, but the forecast calls for {condition} in {location}
-Ingen, men prognosen kræver {condition} i {location}  
-# There is no rain predicted for today in {location}, but it looks like there'll be {condition}
-Der er ikke forventet regn for i dag i {location}, men det ser ud som der vil være {condition}  
diff --git a/locale/da-dk/current.rain.not.expected.local.dialog b/locale/da-dk/current.rain.not.expected.local.dialog
deleted file mode 100644
index b4b22432..00000000
--- a/locale/da-dk/current.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted 
-# No rain is predicted today
-Der regnes ikke med regn i dag  
-# It should not rain today
-Det skulle ikke regne i dag  
-# There's no need for an umbrella today
-Der er ikke behov for en paraply i dag  
diff --git a/locale/da-dk/current.rain.not.expected.location.dialog b/locale/da-dk/current.rain.not.expected.location.dialog
deleted file mode 100644
index 908b97df..00000000
--- a/locale/da-dk/current.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted 
-# No rain is predicted for {location}
-Der regnes ikke med regn {location}  
-# It should not be raining in {location}
-Det bør ikke regne ind {location}  
-# There's no need for an umbrella in {location}
-Der er ikke behov for en paraply ind {location}  
diff --git a/locale/da-dk/current.snow.alternative.local.dialog b/locale/da-dk/current.snow.alternative.local.dialog
deleted file mode 100644
index 0514b262..00000000
--- a/locale/da-dk/current.snow.alternative.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to snowing will occur 
-# No, but today the forecast calls for {condition}
-Ingen, men i dag kræver prognosen {condition}  
-# There is no snow predicted for today but the chances are that it'll be {condition}
-Der er ikke forudsagt sne i dag, men chancerne er for, at det bliver {condition}  
diff --git a/locale/da-dk/current.snow.alternative.location.dialog b/locale/da-dk/current.snow.alternative.location.dialog
deleted file mode 100644
index 6921771c..00000000
--- a/locale/da-dk/current.snow.alternative.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to snowing will occur 
-# No, but the forecast calls for {condition} in {location}
-Ingen, men prognosen kræver {condition} i {location}  
-# There is no snow predicted for today but the chances are that it'll be {condition} in {location}
-Der er ikke forudsagt sne i dag, men chancerne er for, at det bliver {condition} i {location}  
diff --git a/locale/da-dk/current.snow.not.expected.local.dialog b/locale/da-dk/current.snow.not.expected.local.dialog
deleted file mode 100644
index dc06e23a..00000000
--- a/locale/da-dk/current.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forecasted 
-# No snow is predicted today
-Der forudsiges ingen sne i dag  
-# It should not snow today
-Det skulle ikke sne i dag  
diff --git a/locale/da-dk/current.snow.not.expected.location.dialog b/locale/da-dk/current.snow.not.expected.location.dialog
deleted file mode 100644
index db87db81..00000000
--- a/locale/da-dk/current.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted 
-# No snow is predicted for {location}
-Der er ikke forudsagt nogen sne {location}  
-# It will not snow in {location}
-Det sneer ikke ind {location}  
diff --git a/locale/da-dk/current.thunderstorm.alternative.local.dialog b/locale/da-dk/current.thunderstorm.alternative.local.dialog
deleted file mode 100644
index b3f7449d..00000000
--- a/locale/da-dk/current.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to a storm will occur (like snow or fog) 
-# No, but today the forecast calls for {condition}
-Ingen, men i dag kræver prognosen {condition}  
-# There is no storm predicted for today but it looks like there'll be {condition}
-Der er ingen storm forudsagt for i dag, men det ser ud til, at der vil være {condition}  
diff --git a/locale/da-dk/current.thunderstorm.alternative.location.dialog b/locale/da-dk/current.thunderstorm.alternative.location.dialog
deleted file mode 100644
index c7db4aa3..00000000
--- a/locale/da-dk/current.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to storm will occur (like snow or fog) 
-# No, but the forecast calls for {condition} in {location}
-Ingen, men prognosen kræver {condition} i {location}  
-# There is no storm predicted for today in {location}, but it looks like there'll be {condition}
-Der er ingen storm forudsagt for i dag i {location}, men det ser ud som der vil være {condition}  
diff --git a/locale/da-dk/current.thunderstorm.not.expected.local.dialog b/locale/da-dk/current.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index a7aae65d..00000000
--- a/locale/da-dk/current.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,11 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted 
-# No storm is predicted today
-Ingen storm forudsiges i dag  
-# It should not storm today
-Det skulle ikke storme i dag  
-# There should not be a storm today
-Der skulle ikke være storm i dag  
-# Today it is unlikely to storm
-I dag er det usandsynligt at storme  
-# A storm is not likely today
-En storm er sandsynligvis ikke i dag  
diff --git a/locale/da-dk/current.thunderstorm.not.expected.location.dialog b/locale/da-dk/current.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index cc724bbf..00000000
--- a/locale/da-dk/current.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# When user asks if it's storming but no storm or alternative is forcasted 
-# No storm is predicted for {location}
-Ingen storm forudsiges for {location}  
-# There should not be a storm in {location}
-Der skulle ikke være en storm ind {location}  
-# It should not storm in {location}
-Det bør ikke storme ind {location}  
diff --git a/locale/da-dk/daily.clear.alternative.local.dialog b/locale/da-dk/daily.clear.alternative.local.dialog
deleted file mode 100644
index 44d3e0c0..00000000
--- a/locale/da-dk/daily.clear.alternative.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to clear skies will occur 
-# No, the forecast {day} calls for {condition}
-Ingen, prognosen {day} kræver {condition}  
-# {day}, it looks like there'll be {condition}
-{day}, det ser ud som der vil være {condition}  
diff --git a/locale/da-dk/daily.clear.alternative.location.dialog b/locale/da-dk/daily.clear.alternative.location.dialog
deleted file mode 100644
index 5bbf6742..00000000
--- a/locale/da-dk/daily.clear.alternative.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to rain will occur 
-# No, but the forecast {day} calls for {condition} in {location}
-Ingen, men prognosen {day} kræver {condition} i {location}  
-# {day}, there is no rain predicted {day} for {location} but it looks like there'll be {condition}
-{day}, der er ingen regn {day} til {location} men det ser ud som der vil være {condition}  
diff --git a/locale/da-dk/daily.clear.not.expected.local.dialog b/locale/da-dk/daily.clear.not.expected.local.dialog
deleted file mode 100644
index 581bf2e1..00000000
--- a/locale/da-dk/daily.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's clear but an alternative is forcasted 
-# Sorry, the forecast doesn't predict clear conditions {day}
-Undskyld, prognosen forudsiger ikke klare forhold {day}  
-# {day}, it is not likely to be clear
-{day}, det er sandsynligvis ikke klart  
diff --git a/locale/da-dk/daily.clear.not.expected.location.dialog b/locale/da-dk/daily.clear.not.expected.location.dialog
deleted file mode 100644
index ad78faaf..00000000
--- a/locale/da-dk/daily.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's clear but an alternative is forcasted 
-# Sorry, the forecast {day} doesn't predict clear conditions for {location}
-Undskyld, prognosen {day} forudsiger ikke klare betingelser for {location}  
-# {day}, it is not likely to be clear weather in {location}
-{day}, det er sandsynligvis ikke klart vejr i {location}  
diff --git a/locale/da-dk/daily.clouds.alternative.local.dialog b/locale/da-dk/daily.clouds.alternative.local.dialog
deleted file mode 100644
index 10b3a56e..00000000
--- a/locale/da-dk/daily.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to clear skies will occur 
-# No, the forecast {day} calls for {condition}
-Ingen, prognosen {day} kræver {condition}  
-# It should not be cloudy, it looks like there'll be {condition} {day}
-Det skal ikke være overskyet, det ser ud som der vil være {condition} {day}  
-# Doesn't seem so, chances are it's going to be {condition} {day}
-Ser ikke ud til, chancerne er, at det bliver {condition} {day}  
diff --git a/locale/da-dk/daily.clouds.alternative.location.dialog b/locale/da-dk/daily.clouds.alternative.location.dialog
deleted file mode 100644
index f6262f6c..00000000
--- a/locale/da-dk/daily.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to clear skies will occur 
-# No, the forecast {day} calls for {condition} in {location} 
-# It should not be cloudy in {location} {day}, it looks like there'll be {condition} 
-# Doesn't seem so, chances are {location} will have {condition} {day}
-Ser ikke ud til, chancerne er {location} vil have {condition} {day}  
diff --git a/locale/da-dk/daily.clouds.not.expected.local.dialog b/locale/da-dk/daily.clouds.not.expected.local.dialog
deleted file mode 100644
index 26bec585..00000000
--- a/locale/da-dk/daily.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,9 +0,0 @@
-# When user asks if it's cloudy but it's not 
-# It doesn't seem like it's going to be cloudy {day}
-Det ser ikke ud til, at det bliver overskyet {day}  
-# Clear skies are forecast {day}
-Klar himmel er forventet {day}  
-# Expect clear skies {day}
-Forvent klare himmel {day}  
-# It should not be cloudy {day}
-Det skal ikke være overskyet {day}  
diff --git a/locale/da-dk/daily.clouds.not.expected.location.dialog b/locale/da-dk/daily.clouds.not.expected.location.dialog
deleted file mode 100644
index 1f3985c9..00000000
--- a/locale/da-dk/daily.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,9 +0,0 @@
-# When user asks if it's cloudy but it's not 
-# It doesn't seem like it's going to be cloudy in {location} {day}
-Det ser ikke ud til, at det bliver overskyet i {location} {day}  
-# Clear skies are forecast in {location} {day}
-Klar himmel er forventet i {location} {day}  
-# Expect clear skies in {location} {day}
-Forvent klare himmel ind {location} {day}  
-# It should not be cloudy in {location} {day}
-Det skal ikke være overskyet i {location} {day}  
diff --git a/locale/da-dk/daily.fog.alternative.local.dialog b/locale/da-dk/daily.fog.alternative.local.dialog
deleted file mode 100644
index 8c8f8621..00000000
--- a/locale/da-dk/daily.fog.alternative.local.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to fog will occur 
-# No, the forecast {day} calls for {condition}
-Ingen, prognosen {day} kræver {condition}  
-# It looks like there'll be {condition} {day}
-Det ser ud som der vil være {condition} {day}  
-# Chances are it's going to be {condition} {day}
-Det er chancerne for, at det bliver {condition} {day}  
diff --git a/locale/da-dk/daily.fog.alternative.location.dialog b/locale/da-dk/daily.fog.alternative.location.dialog
deleted file mode 100644
index e980ea18..00000000
--- a/locale/da-dk/daily.fog.alternative.location.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# Informing that an alternative to fog will occur 
-# No, the forecast {day} for {location} calls for {condition}
-Ingen, prognosen {day} til {location} kræver {condition}  
-# It looks like there'll be {condition} in {location} {day}
-Det ser ud som der vil være {condition} i {location} {day}  
-# Chances are it's going to be {condition} in {location} {day}
-Det er chancerne for, at det bliver {condition} i {location} {day}  
diff --git a/locale/da-dk/daily.fog.not.expected.local.dialog b/locale/da-dk/daily.fog.not.expected.local.dialog
deleted file mode 100644
index d533515b..00000000
--- a/locale/da-dk/daily.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted 
-# {day} the visibility should be good
-{day} synligheden skal være god  
-# No fog is predicted {day}
-Ingen tåge er forudsagt {day}  
diff --git a/locale/da-dk/daily.fog.not.expected.location.dialog b/locale/da-dk/daily.fog.not.expected.location.dialog
deleted file mode 100644
index 68a970d3..00000000
--- a/locale/da-dk/daily.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted 
-# {day} the visibility should be good in {location}
-{day} synligheden skal være god i {location}  
-# No fog is predicted {day} in {location}
-Ingen tåge er forudsagt {day} i {location}  
diff --git a/locale/da-dk/daily.rain.alternative.local.dialog b/locale/da-dk/daily.rain.alternative.local.dialog
deleted file mode 100644
index fd2b5331..00000000
--- a/locale/da-dk/daily.rain.alternative.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to rain will occur 
-# No, but the forecast {day} calls for {condition}
-Ingen, men prognosen {day} kræver {condition}  
-# {day}, there is no rain predicted but it looks like there'll be {condition}
-{day}, der er ikke forudsagt regn, men det ser ud til, at der vil være {condition}  
diff --git a/locale/da-dk/daily.rain.alternative.location.dialog b/locale/da-dk/daily.rain.alternative.location.dialog
deleted file mode 100644
index 9a682448..00000000
--- a/locale/da-dk/daily.rain.alternative.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to rain will occur 
-# No, but the forecast calls for {condition} in {location} {day}
-Ingen, men prognosen kræver {condition} i {location} {day}  
-# {day}, there is no rain predicted for {location} but it looks like there'll be {condition}
-{day}, der er ingen regn forventet for {location} men det ser ud som der vil være {condition}  
diff --git a/locale/da-dk/daily.rain.not.expected.local.dialog b/locale/da-dk/daily.rain.not.expected.local.dialog
deleted file mode 100644
index fa8429b5..00000000
--- a/locale/da-dk/daily.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted 
-# No rain is predicted {day}
-Der forventes ingen regn {day}  
-# It should not rain {day}
-Det bør ikke regne {day}  
-# You won't need an umbrella {day}
-Du behøver ikke en paraply {day}  
diff --git a/locale/da-dk/daily.rain.not.expected.location.dialog b/locale/da-dk/daily.rain.not.expected.location.dialog
deleted file mode 100644
index d54e4d29..00000000
--- a/locale/da-dk/daily.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted 
-# No rain is predicted for {location} {day}
-Der regnes ikke med regn {location} {day}  
-# {day}, it should not rain in {location}
-{day}, det skulle ikke regne ind {location}  
-# There's no need for an umbrella in {location} {day}
-Der er ikke behov for en paraply ind {location} {day}  
diff --git a/locale/da-dk/daily.snow.alternative.location.dialog b/locale/da-dk/daily.snow.alternative.location.dialog
deleted file mode 100644
index 66421e2e..00000000
--- a/locale/da-dk/daily.snow.alternative.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to snowing will occur 
-# No, but the forecast calls for {condition} {day}
-Ingen, men prognosen kræver {condition} {day}  
-# {day} there is no snow predicted but the chances are that it'll be {condition}
-{day} der er ikke forudsagt sne, men chancerne er for, at det bliver {condition}  
diff --git a/locale/da-dk/daily.snow.not.expected.local.dialog b/locale/da-dk/daily.snow.not.expected.local.dialog
deleted file mode 100644
index dafa500b..00000000
--- a/locale/da-dk/daily.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted 
-# No snow is predicted {day}
-Der forudsiges ingen sne {day}  
-# It will not snow {day}
-Det sneer ikke {day}  
diff --git a/locale/da-dk/daily.snow.not.expected.location.dialog b/locale/da-dk/daily.snow.not.expected.location.dialog
deleted file mode 100644
index d313ce2a..00000000
--- a/locale/da-dk/daily.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted 
-# No snow is predicted in {location} {day}
-Der forudsiges ingen sne i {location} {day}  
-# It should not snow in {location} {day}
-Det skal ikke sne ind {location} {day}  
diff --git a/locale/da-dk/daily.thunderstorm.alternative.local.dialog b/locale/da-dk/daily.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 661a639e..00000000
--- a/locale/da-dk/daily.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to rain will occur 
-# No, but the forecast {day} calls for {condition}
-Ingen, men prognosen {day} kræver {condition}  
-# {day}, there is no storm predicted but it looks like there'll be {condition}
-{day}, der er ingen storm forudsagt, men det ser ud som der vil være {condition}  
diff --git a/locale/da-dk/daily.thunderstorm.alternative.location.dialog b/locale/da-dk/daily.thunderstorm.alternative.location.dialog
deleted file mode 100644
index b0f90b95..00000000
--- a/locale/da-dk/daily.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Informing that an alternative to storm will occur 
-# No, but the forecast calls for {condition} in {location} {day}
-Ingen, men prognosen kræver {condition} i {location} {day}  
-# {day}, there is no storm predicted for {location} but it looks like there'll be {condition}
-{day}, der er ingen storm forudsagt for {location} men det ser ud som der vil være {condition}  
diff --git a/locale/da-dk/daily.thunderstorm.not.expected.local.dialog b/locale/da-dk/daily.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 8ee43356..00000000
--- a/locale/da-dk/daily.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted 
-# No storm is predicted {day}
-Ingen storm forudsiges {day}  
-# {day}, it should not storm
-{day}, det skal ikke storme  
-# It should not storm {day}
-Det bør ikke storme {day}  
diff --git a/locale/da-dk/daily.thunderstorm.not.exptected.location.dialog b/locale/da-dk/daily.thunderstorm.not.exptected.location.dialog
deleted file mode 100644
index fbe23fb7..00000000
--- a/locale/da-dk/daily.thunderstorm.not.exptected.location.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted 
-# No storm is predicted for {location} {day}
-Ingen storm forudsiges for {location} {day}  
-# {day}, it should not storm in {location}
-{day}, det skal ikke storme ind {location}  
-# It is unlikely to storm {day} in {location}
-Det er usandsynligt at storme {day} i {location}  
diff --git a/locale/da-dk/do not know.dialog b/locale/da-dk/do not know.dialog
deleted file mode 100644
index a4696f42..00000000
--- a/locale/da-dk/do not know.dialog	
+++ /dev/null
@@ -1,6 +0,0 @@
-# I'm afraid I don't know that
-Jeg er bange for, at jeg ikke ved det  
-# I don't have that information
-Jeg har ikke de oplysninger  
-# 
-  
diff --git a/locale/da-dk/from.day.dialog b/locale/da-dk/from.day.dialog
deleted file mode 100644
index 4d19defe..00000000
--- a/locale/da-dk/from.day.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# From {day}
-Fra {day}  
diff --git a/locale/da-dk/heavy.dialog b/locale/da-dk/heavy.dialog
deleted file mode 100644
index db7e28b6..00000000
--- a/locale/da-dk/heavy.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# heavy
-tung  
diff --git a/locale/da-dk/light.dialog b/locale/da-dk/light.dialog
deleted file mode 100644
index 78c76c1c..00000000
--- a/locale/da-dk/light.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# light
-lys  
diff --git a/locale/da-dk/on.date.dialog b/locale/da-dk/on.date.dialog
deleted file mode 100644
index 9dadba92..00000000
--- a/locale/da-dk/on.date.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# on 
-på  
diff --git a/locale/da-dk/on.dialog b/locale/da-dk/on.dialog
deleted file mode 100644
index 752baeef..00000000
--- a/locale/da-dk/on.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# on
-på 
diff --git a/locale/da-dk/simple.temperature.intent b/locale/da-dk/simple.temperature.intent
deleted file mode 100644
index bad00a0e..00000000
--- a/locale/da-dk/simple.temperature.intent
+++ /dev/null
@@ -1,2 +0,0 @@
-# temperature
-temperatur  
diff --git a/locale/da-dk/sky is clear.future.dialog b/locale/da-dk/sky is clear.future.dialog
deleted file mode 100644
index 69e97e40..00000000
--- a/locale/da-dk/sky is clear.future.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-# a clear sky
-en klar himmel  
diff --git a/locale/da-dk/sunrise.dialog b/locale/da-dk/sunrise.dialog
deleted file mode 100644
index 427766df..00000000
--- a/locale/da-dk/sunrise.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# the sun rose at {time} today
-solen steg kl {time} i dag  
-# sunrise was at {time} today
-solopgang var kl {time} i dag  
diff --git a/locale/da-dk/sunset.dialog b/locale/da-dk/sunset.dialog
deleted file mode 100644
index 63494e47..00000000
--- a/locale/da-dk/sunset.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-# the sun will set at {time} today
-solen går ned kl {time} i dag  
-# the sun will go down at {time} today
-solen går ned kl {time} i dag  
-# sunset will be at {time} today
-solnedgang er kl {time} i dag  
diff --git a/locale/da-dk/storm.dialog b/locale/da-dk/thunderstorm.dialog
similarity index 100%
rename from locale/da-dk/storm.dialog
rename to locale/da-dk/thunderstorm.dialog
diff --git a/locale/da-dk/weekly.condition.on.day.dialog b/locale/da-dk/weekly.condition.on.day.dialog
deleted file mode 100644
index dd061ae5..00000000
--- a/locale/da-dk/weekly.condition.on.day.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# {day} will be {condition},
-{day} vil være {condition},  
diff --git a/locale/da-dk/weekly.conditions.mostly.one.dialog b/locale/da-dk/weekly.conditions.mostly.one.dialog
deleted file mode 100644
index 5d8032c6..00000000
--- a/locale/da-dk/weekly.conditions.mostly.one.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# it will be mostly {condition}.
-det vil være det meste {condition}.  
diff --git a/locale/da-dk/weekly.conditions.seq.extra.dialog b/locale/da-dk/weekly.conditions.seq.extra.dialog
deleted file mode 100644
index afe2e149..00000000
--- a/locale/da-dk/weekly.conditions.seq.extra.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# it looks like there will also be
-det ser ud som der også vil være  
-# it will also be
-det vil det også være  
diff --git a/locale/da-dk/weekly.conditions.seq.period.dialog b/locale/da-dk/weekly.conditions.seq.period.dialog
deleted file mode 100644
index 953bd7ef..00000000
--- a/locale/da-dk/weekly.conditions.seq.period.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# from {from} to {to}
-fra {from} til {to}  
diff --git a/locale/da-dk/weekly.conditions.seq.start.dialog b/locale/da-dk/weekly.conditions.seq.start.dialog
deleted file mode 100644
index dc3c8dc3..00000000
--- a/locale/da-dk/weekly.conditions.seq.start.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# it will be {condition} 
-det vil være {condition}   
diff --git a/locale/da-dk/weekly.conditions.some.days.dialog b/locale/da-dk/weekly.conditions.some.days.dialog
deleted file mode 100644
index 9f87b348..00000000
--- a/locale/da-dk/weekly.conditions.some.days.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-# it will be {condition} some days.
-det vil være {condition} nogle dage.  
diff --git a/locale/da-dk/weekly.temp.range.dialog b/locale/da-dk/weekly.temperature.dialog
similarity index 100%
rename from locale/da-dk/weekly.temp.range.dialog
rename to locale/da-dk/weekly.temperature.dialog
diff --git a/locale/da-dk/what.is.multi.day.forecast.intent b/locale/da-dk/what.is.multi.day.forecast.intent
deleted file mode 100644
index 7e518e38..00000000
--- a/locale/da-dk/what.is.multi.day.forecast.intent
+++ /dev/null
@@ -1,8 +0,0 @@
-# weather (in|over|for) the next {num} days
-vejr (i|over|til) den næste {num} dage  
-# what is the weather (like|) (in|over|for) the next {num} days
-hvordan er vejret (synes godt om|) (i|over|til) den næste {num} dage  
-# what will the weather be (like|) (in|over|for) the next {num} days
-hvad bliver vejret (synes godt om|) (i|over|til) den næste {num} dage  
-# what is the weather (going to |gonna |)be (like |)(in|over|for) the next {num} days
-hvordan er vejret (går til |skal nok |)være (synes godt om |)(i|over|til) den næste {num} dage  
diff --git a/locale/de-de/ClearAlternatives.voc b/locale/de-de/ClearAlternatives.voc
deleted file mode 100644
index 7f2b86b8..00000000
--- a/locale/de-de/ClearAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ähnliche Alternativen zu schönem Wetter
-(Nebel|Wolken|Wolke)
diff --git a/locale/de-de/CloudsAlternatives.voc b/locale/de-de/CloudsAlternatives.voc
deleted file mode 100644
index 2ba67c34..00000000
--- a/locale/de-de/CloudsAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativen ähnlich zu bewölktem Wetter
-(klar|Nebel|Nebel|Regen|Nieselregen)
diff --git a/locale/de-de/FogAlternatives.voc b/locale/de-de/FogAlternatives.voc
deleted file mode 100644
index bdcdd64f..00000000
--- a/locale/de-de/FogAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativen zu nebligem Wetter
-(klar|Wolken|Wolke|teilweise bewölkt)
diff --git a/locale/de-de/RainAlternatives.voc b/locale/de-de/RainAlternatives.voc
deleted file mode 100644
index df30d577..00000000
--- a/locale/de-de/RainAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-Alternativen vergleichbar mit Regen
-(Schnee|leichter Schneefall|Schneeregen|Nebel|Nebel)
diff --git a/locale/de-de/SnowAlternatives.voc b/locale/de-de/SnowAlternatives.voc
deleted file mode 100644
index 38e0b6aa..00000000
--- a/locale/de-de/SnowAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bedingungen ähnlich wie Schneefall
-(Regen|leichter Regen)
diff --git a/locale/de-de/ThunderstormAlternatives.voc b/locale/de-de/ThunderstormAlternatives.voc
deleted file mode 100644
index 8abfddfc..00000000
--- a/locale/de-de/ThunderstormAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativen ähnlich zu bewölktem Wetter
-(Nieselregen | Regen | leichter Regen | Schnee | leichter Schnee | Schneeregen | Nebel | Nebel | Wolken | Wolke | teilweise bewölkt)
diff --git a/locale/de-de/and.dialog b/locale/de-de/and.dialog
new file mode 100644
index 00000000..c7d3bb55
--- /dev/null
+++ b/locale/de-de/and.dialog
@@ -0,0 +1 @@
+, und
diff --git a/locale/de-de/clear.future.dialog b/locale/de-de/clear.future.dialog
deleted file mode 100644
index 39e5a15b..00000000
--- a/locale/de-de/clear.future.dialog
+++ /dev/null
@@ -1 +0,0 @@
-Klarer Himmel
diff --git a/locale/de-de/condition.category.value b/locale/de-de/condition.category.value
deleted file mode 100644
index e8fb8d57..00000000
--- a/locale/de-de/condition.category.value
+++ /dev/null
@@ -1,15 +0,0 @@
-Wolken, bewölkt
-Klar, klarer Himmel
-Gewitter, Sturm
-Nieselregen, Nieselregen
-regnen|regnet
-schneien|schneit
-Nebel,neblig
-Rauch,rauchig
-Dunst,dunstig
-Staub,staubig
-Nebel,nebelig
-Sand,sandig
-Asche, trübe mit möglicher Vulkanasche
-Böe, stürmend
-Tornado,der mit einem möglichen Tornado stürmt
diff --git a/locale/de-de/current.clear.alternative.local.dialog b/locale/de-de/current.clear.alternative.local.dialog
deleted file mode 100644
index a02e2288..00000000
--- a/locale/de-de/current.clear.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informieren, dass es eine Alternative zum klaren Himmel gibt
-Nein, die Prognose heute ist {condition}
-Es sieht so aus, als gäbe es heute {condition}
-Chancen stehen gut, dass es heute {condition} wird
diff --git a/locale/de-de/current.clear.alternative.location.dialog b/locale/de-de/current.clear.alternative.location.dialog
deleted file mode 100644
index 0f45a147..00000000
--- a/locale/de-de/current.clear.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informieren, dass es eine Alternative zum klaren Himmel gibt
-Nein, aber die Prognose ist {condition} in {location}
-Es sieht so aus, als wäre {condition} in {location}
-Wahrscheinlich wird es {condition} in {location} sein
diff --git a/locale/de-de/current.clear.not.expected.location.dialog b/locale/de-de/current.clear.not.expected.location.dialog
deleted file mode 100644
index 9c262a51..00000000
--- a/locale/de-de/current.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es klar ist, aber nicht
-Sorry, es sieht so aus, als würde es {condition} geben
-Es wird wahrscheinlich keinen klaren Himmel geben
diff --git a/locale/de-de/current.clouds.alternative.local.dialog b/locale/de-de/current.clouds.alternative.local.dialog
deleted file mode 100644
index 23d0a4d2..00000000
--- a/locale/de-de/current.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Nein, die Prognose heute ist {condition}
-# Es wird darauf hingewiesen, dass eine Alternative zum bewölkten Himmel auftreten wird
-Es wird wahrscheinlich nicht bewölkt sein, es sieht so aus, als würde es {condition} geben
-Scheint nicht so, es ist wahrscheinlich, dass es heute {condition} sein wird
diff --git a/locale/de-de/current.clouds.alternative.location.dialog b/locale/de-de/current.clouds.alternative.location.dialog
deleted file mode 100644
index 770265b0..00000000
--- a/locale/de-de/current.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informieren, dass es eine Alternative zum klaren Himmel gibt
-Nein, die Prognose ist {condition}
-Es wird wahrscheinlich nicht bewölkt sein, es sieht so aus, als würde es {condition} geben
-Scheint nicht so; wahrscheinlich wird es {condition}
diff --git a/locale/de-de/current.clouds.not.expected.local.dialog b/locale/de-de/current.clouds.not.expected.local.dialog
deleted file mode 100644
index 0e918ca4..00000000
--- a/locale/de-de/current.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es regnet, aber keine Wolke oder Alternative vorhergesagt wird
-Für heute ist kein Nebel vorhergesagt
-Es sollte heute nicht bewölkt sein
diff --git a/locale/de-de/current.clouds.not.expected.location.dialog b/locale/de-de/current.clouds.not.expected.location.dialog
deleted file mode 100644
index 9c61f05f..00000000
--- a/locale/de-de/current.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es bewölkt ist, aber nicht
-Es scheint heute nicht bewölkt zu sein
-Es sollte nicht bewölkt sein
diff --git a/locale/de-de/current.fog.alternative.local.dialog b/locale/de-de/current.fog.alternative.local.dialog
deleted file mode 100644
index 6b69e3fe..00000000
--- a/locale/de-de/current.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informieren, dass eine Alternative zu Nebel auftritt
-Nein, die Prognose heute ist {condition}
-Es sieht so aus, als gäbe es heute {condition}
-Chancen stehen gut, dass es heute {condition} wird
diff --git a/locale/de-de/current.fog.alternative.location.dialog b/locale/de-de/current.fog.alternative.location.dialog
deleted file mode 100644
index 3071cf63..00000000
--- a/locale/de-de/current.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Nein, aber die Prognose ist {condition} in {location}
-Wahrscheinlich wird es {condition} in {location} sein
-# Informieren, dass an einem Ort eine Alternative zum Nebel auftritt
-Es sieht so aus, als wäre {condition} in {location}
diff --git a/locale/de-de/current.fog.not.expected.local.dialog b/locale/de-de/current.fog.not.expected.local.dialog
deleted file mode 100644
index f6a8878e..00000000
--- a/locale/de-de/current.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es nebelig ist, aber kein Schnee oder keine Alternative angezeigt wird
-Die Sicht scheint heute gut zu sein
-Für heute ist kein Nebel vorhergesagt
diff --git a/locale/de-de/current.fog.not.expected.location.dialog b/locale/de-de/current.fog.not.expected.location.dialog
deleted file mode 100644
index e2925588..00000000
--- a/locale/de-de/current.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es nebelig ist, aber kein Schnee oder keine Alternative angezeigt wird
-Die Sicht scheint gut zu sein in {location}
-Für {location} wird heute kein Nebel vorhergesagt
diff --git a/locale/de-de/current.rain.alternative.local.dialog b/locale/de-de/current.rain.alternative.local.dialog
deleted file mode 100644
index e02f96ed..00000000
--- a/locale/de-de/current.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass es eine Alternative zu Regen gibt (wie Schnee oder Nebel)
-Nein, aber die Prognose ist {condition}
-Es wird kein Regen für heute vorhergesagt, aber es sieht so aus, als würde es {condition} geben.
diff --git a/locale/de-de/current.rain.alternative.location.dialog b/locale/de-de/current.rain.alternative.location.dialog
deleted file mode 100644
index f011f726..00000000
--- a/locale/de-de/current.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass es eine Alternative zu Regen gibt (wie Schnee oder Nebel)
-Nein, aber die Prognose ist {condition} in {location}
-Es wird in {location} kein Regen vorhergesagt heute, aber es sieht so aus, als würde es {condition} geben.
diff --git a/locale/de-de/current.rain.not.expected.local.dialog b/locale/de-de/current.rain.not.expected.local.dialog
deleted file mode 100644
index 130edc97..00000000
--- a/locale/de-de/current.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Wenn der Benutzer fragt, ob es regnet, aber kein Regen oder eine Alternative angezeigt wird
-Es wird heute kein Regen vorhergesagt
-Es sollte heute nicht regnen
-Es ist heute kein Regenschirm nötig
diff --git a/locale/de-de/current.rain.not.expected.location.dialog b/locale/de-de/current.rain.not.expected.location.dialog
deleted file mode 100644
index e5cf5958..00000000
--- a/locale/de-de/current.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Wenn der Benutzer fragt, ob es regnet, aber kein Regen oder eine Alternative angezeigt wird
-Es wird kein Regen für {location} vorhergesagt
-Es sollte nicht regnen in {location}
-In {location} brauchst du keinen Regenschirm.
diff --git a/locale/de-de/current.snow.alternative.local.dialog b/locale/de-de/current.snow.alternative.local.dialog
deleted file mode 100644
index a8818ed7..00000000
--- a/locale/de-de/current.snow.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass eine Alternative zum Schneefall auftritt
-Nein, aber die Prognose ist {condition}
-Es ist kein Schnee für heute vorhergesagt, aber die Chancen stehen gut, dass es {condition} wird.
diff --git a/locale/de-de/current.snow.alternative.location.dialog b/locale/de-de/current.snow.alternative.location.dialog
deleted file mode 100644
index 90916ab7..00000000
--- a/locale/de-de/current.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass eine Alternative zum Schneefall auftritt
-Nein, aber die Prognose ist {condition} in {location}
-Es ist kein Schnee {location} vorhergesagt heute, aber die Chancen stehen gut, dass es {condition} wird.
diff --git a/locale/de-de/current.snow.not.expected.local.dialog b/locale/de-de/current.snow.not.expected.local.dialog
deleted file mode 100644
index 18fd8c87..00000000
--- a/locale/de-de/current.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es schneit, aber kein Schnee oder keine Alternative vorhergesagt wird
-Es wird heute kein Schnee vorhergesagt
-Es sollte nicht schneien heute
diff --git a/locale/de-de/current.snow.not.expected.location.dialog b/locale/de-de/current.snow.not.expected.location.dialog
deleted file mode 100644
index 32e17841..00000000
--- a/locale/de-de/current.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es schneit, aber kein Schnee oder eine Alternative ist
-Es wird kein Schnee für {location} vorhergesagt
-Es wird nicht schneien in {location}
diff --git a/locale/de-de/current.thunderstorm.alternative.local.dialog b/locale/de-de/current.thunderstorm.alternative.local.dialog
deleted file mode 100644
index a27813e9..00000000
--- a/locale/de-de/current.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Nein, aber die Prognose ist {condition}
-# Informieren, dass es eine Alternative zu Regen gibt (wie Schnee oder Nebel)
-Es wird kein Sturm für heute vorhergesagt, aber es sieht so aus, als würde es {condition}
diff --git a/locale/de-de/current.thunderstorm.alternative.location.dialog b/locale/de-de/current.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 3ca8e4d8..00000000
--- a/locale/de-de/current.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Nein, aber die Prognose ist {condition} in {location}
-# Informieren, dass es eine Alternative zu Regen gibt (wie Schnee oder Nebel)
-Für heute ist in {location} kein Sturm vorhergesagt, aber es sieht so aus, als gäbe es {condition}
diff --git a/locale/de-de/current.thunderstorm.not.expected.local.dialog b/locale/de-de/current.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 0fa4025b..00000000
--- a/locale/de-de/current.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-# Wenn der Benutzer fragt, ob es regnet, aber kein Regen oder eine Alternative angezeigt wird
-Es wird heute kein Sturm vorhergesagt
-Es sollte nicht stürmen heute
-Es sollte heute keinen Sturm geben
-es ist unwahrscheinlich, dass es heute stürmt
-Ein Sturm ist heute nicht wahrscheinlich
diff --git a/locale/de-de/current.thunderstorm.not.expected.location.dialog b/locale/de-de/current.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index ac1605c0..00000000
--- a/locale/de-de/current.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Wenn der Benutzer fragt, ob es schneit, aber kein Schnee oder eine Alternative ist
-Es wird kein Sturm für {location} vorhergesagt
-Es wird nicht stürmisch in {location}
-Es wird nicht stürmen in {location}
diff --git a/locale/de-de/daily.clear.alternative.local.dialog b/locale/de-de/daily.clear.alternative.local.dialog
deleted file mode 100644
index e66a019f..00000000
--- a/locale/de-de/daily.clear.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass es eine Alternative zum klaren Himmel gibt
-Nein, die Prognose {day} ist {condition}
-Es sieht so aus, als gäbe es {condition}{day}
diff --git a/locale/de-de/daily.clear.alternative.location.dialog b/locale/de-de/daily.clear.alternative.location.dialog
deleted file mode 100644
index 647a3bfb..00000000
--- a/locale/de-de/daily.clear.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass es eine Alternative zu Regen gibt
-Nein, aber die Prognose für {day} ist {condition} in {location}
-An {day} ist kein Regen in {location} vorhergesagt, aber es sieht so aus, als ob {day} {condition} kommt
diff --git a/locale/de-de/daily.clear.not.expected.local.dialog b/locale/de-de/daily.clear.not.expected.local.dialog
deleted file mode 100644
index 8b009f1d..00000000
--- a/locale/de-de/daily.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es eindeutig ist, aber eine Alternative angezeigt wird
-Entschuldigung, für {day} wird kein klares Wetter vorausgesagt
-{day} wird es höchstwahrscheinlich nicht klar sein
diff --git a/locale/de-de/daily.clear.not.expected.location.dialog b/locale/de-de/daily.clear.not.expected.location.dialog
deleted file mode 100644
index 84baa570..00000000
--- a/locale/de-de/daily.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es eindeutig ist, aber eine Alternative angezeigt wird
-Entschuldigung, die Vorhersage {day} sagt keine klaren Bedingungen in {location} voraus
-{day} ist es wahrscheinlich nicht klares Wetter in {location}
diff --git a/locale/de-de/daily.clouds.alternative.local.dialog b/locale/de-de/daily.clouds.alternative.local.dialog
deleted file mode 100644
index c027f799..00000000
--- a/locale/de-de/daily.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informieren, dass es eine Alternative zum klaren Himmel gibt
-Nein, die Prognose {day} ist {condition}
-Es wird wahrscheinlich nicht bewölkt sein {day}, es sieht so aus, als würde es {condition} geben
-Scheint nicht so; wahrscheinlich wird es {condition} {day}
diff --git a/locale/de-de/daily.clouds.alternative.location.dialog b/locale/de-de/daily.clouds.alternative.location.dialog
deleted file mode 100644
index 6a1f2adb..00000000
--- a/locale/de-de/daily.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informieren, dass es eine Alternative zum klaren Himmel gibt
-# Nein, aber die {day} Prognose ist {condition} in {location}
-# In {location} am {day} sollte es nicht bewölkt sein, es sieht so aus, als gäbe es {condition}
-Scheint nicht so, die Wahrscheinlichkeit, dass {location} {condition} am {day} hat
diff --git a/locale/de-de/daily.clouds.not.expected.local.dialog b/locale/de-de/daily.clouds.not.expected.local.dialog
deleted file mode 100644
index 073fcbd6..00000000
--- a/locale/de-de/daily.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Wenn der Benutzer fragt, ob es bewölkt ist, aber nicht
-Es scheint nicht so, als würde es {day} bewölkt sein
-{day} wird Klarer Himmel vorhergesagt
-Erwarte einen klaren Himmel {day}
-Es sollte {day} nicht bewölkt sein
diff --git a/locale/de-de/daily.clouds.not.expected.location.dialog b/locale/de-de/daily.clouds.not.expected.location.dialog
deleted file mode 100644
index 61f336a5..00000000
--- a/locale/de-de/daily.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Wenn der Benutzer fragt, ob es bewölkt ist, aber nicht
-Es scheint nicht so, als würde es {day} in {location} bewölkt sein
-Klarer Himmel {day} in {location} wird vorhergesagt
-Ich erwarte klaren Himmel {day} in {location}
-Es wird in {location} {day} nicht schneien 
diff --git a/locale/de-de/daily.fog.alternative.local.dialog b/locale/de-de/daily.fog.alternative.local.dialog
deleted file mode 100644
index 23092a22..00000000
--- a/locale/de-de/daily.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informieren, dass eine Alternative zu Nebel auftritt
-Nein, die Prognose {day} ist {condition}
-Es sieht so aus, als gäbe es {condition} {day}
-Chancen stehen gut, dass es {condition} {day} wird
diff --git a/locale/de-de/daily.fog.alternative.location.dialog b/locale/de-de/daily.fog.alternative.location.dialog
deleted file mode 100644
index 5fc8a3bb..00000000
--- a/locale/de-de/daily.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informieren, dass eine Alternative zu Nebel auftritt
-Nein, die Prognose für {day} in {location} ruft {condition} auf.
-Es sieht so aus, als wäre {day} {condition} in {location}
-Wahrscheinlich wird es {day} {condition} in {location} sein
diff --git a/locale/de-de/daily.fog.not.expected.local.dialog b/locale/de-de/daily.fog.not.expected.local.dialog
deleted file mode 100644
index d2f68a19..00000000
--- a/locale/de-de/daily.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es nebelig ist, aber kein Schnee oder keine Alternative angezeigt wird
-{day} sollte es gute Sicht geben
-{day} wird kein Nebel vorhergesagt
diff --git a/locale/de-de/daily.fog.not.expected.location.dialog b/locale/de-de/daily.fog.not.expected.location.dialog
deleted file mode 100644
index 1ec7f003..00000000
--- a/locale/de-de/daily.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es nebelig ist, aber kein Schnee oder keine Alternative angezeigt wird
-{day} sollte die Sicht in {location} gut sein
-Für {day} wird in {location} kein Nebel vorhergesagt
diff --git a/locale/de-de/daily.rain.alternative.local.dialog b/locale/de-de/daily.rain.alternative.local.dialog
deleted file mode 100644
index 589242db..00000000
--- a/locale/de-de/daily.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass es eine Alternative zu Regen gibt
-Nein, aber die Prognose {day} ist {condition}
-{day} ist kein Regen vorhergesagt, aber es sieht so aus, als ob {condition} kommt
diff --git a/locale/de-de/daily.rain.alternative.location.dialog b/locale/de-de/daily.rain.alternative.location.dialog
deleted file mode 100644
index ff03025c..00000000
--- a/locale/de-de/daily.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass es eine Alternative zu Regen gibt
-Nein, aber die Prognose {day} ist {condition} in {location}
-{day} ist kein Regen in {location} vorhergesagt, aber es sieht so aus, als ob {condition} kommt
diff --git a/locale/de-de/daily.rain.not.expected.local.dialog b/locale/de-de/daily.rain.not.expected.local.dialog
deleted file mode 100644
index 13224ed0..00000000
--- a/locale/de-de/daily.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Wenn der Benutzer fragt, ob es regnet, aber kein Regen oder eine Alternative angezeigt wird
-Es wird kein Regen {day} vorhergesagt
-Es sollte nicht regnen {day}
-Du brauchst keinen Regenschirm {day}
diff --git a/locale/de-de/daily.rain.not.expected.location.dialog b/locale/de-de/daily.rain.not.expected.location.dialog
deleted file mode 100644
index 4fcaf6c0..00000000
--- a/locale/de-de/daily.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Wenn der Benutzer fragt, ob es regnet, aber kein Regen oder eine Alternative angezeigt wird
-Für {location} wird am {day} kein Regen vorhergesagt
-Es wird {day} nicht regnen in {location}
-In {location} brauchst du {day} keinen Regenschirm.
diff --git a/locale/de-de/daily.snow.alternative.location.dialog b/locale/de-de/daily.snow.alternative.location.dialog
deleted file mode 100644
index 21754de1..00000000
--- a/locale/de-de/daily.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass eine Alternative zum Schneefall auftritt
-Nein, aber die {day} Prognose ist {condition}
-{day} wird kein Schnee vorhergesagt, aber die Chance ist, dass es {condition} ist.
diff --git a/locale/de-de/daily.snow.not.expected.local.dialog b/locale/de-de/daily.snow.not.expected.local.dialog
deleted file mode 100644
index 980e8686..00000000
--- a/locale/de-de/daily.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es schneit, aber kein Schnee oder eine Alternative ist
-Es wird {day} kein Schnee vorhergesagt
-Es wird {day} nicht schneien
diff --git a/locale/de-de/daily.snow.not.expected.location.dialog b/locale/de-de/daily.snow.not.expected.location.dialog
deleted file mode 100644
index 035fb6d8..00000000
--- a/locale/de-de/daily.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wenn der Benutzer fragt, ob es schneit, aber kein Schnee oder eine Alternative ist
-In {location} wird für {day} kein Schnee vorhergesagt
-Es wird {day} nicht schneien in {location}
diff --git a/locale/de-de/daily.thunderstorm.alternative.local.dialog b/locale/de-de/daily.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 38262cd8..00000000
--- a/locale/de-de/daily.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informieren, dass es eine Alternative zu Regen gibt
-Nein, aber die Prognose {day} ist {condition}
-{day} ist kein Sturm vorhergesagt, aber es sieht so aus, als ob {condition} kommt
diff --git a/locale/de-de/daily.thunderstorm.alternative.location.dialog b/locale/de-de/daily.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 5b0b8308..00000000
--- a/locale/de-de/daily.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Nein, aber die Prognose {day} ist {condition} in {location}
-# Informieren, dass eine Alternative zum Sturm auftreten wird
-{day} ist kein Regen in {location} vorhergesagt, aber es sieht so aus, als ob {condition} kommt
diff --git a/locale/de-de/daily.thunderstorm.not.expected.local.dialog b/locale/de-de/daily.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index d4a8275c..00000000
--- a/locale/de-de/daily.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Wenn der Benutzer fragt, ob es regnet, aber kein Regen oder eine Alternative angezeigt wird
-Es wird {day} kein Sturm vorhergesagt
-{day}, sollte es nicht stürmen
-Es sollte nicht stürmen {day}
diff --git a/locale/de-de/daily.thunderstorm.not.expected.location.dialog b/locale/de-de/daily.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index 841c00f6..00000000
--- a/locale/de-de/daily.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Wenn der Benutzer fragt, ob es regnet, aber kein Regen oder eine Alternative angezeigt wird
-Für {location} {day} wird kein Sturm vorhergesagt
-Es wird {day} nicht stürmen in {location}
-Es ist unwahrscheinlich, dass {day} in {location} stürmt.
diff --git a/locale/de-de/from.day.dialog b/locale/de-de/from.day.dialog
deleted file mode 100644
index 4e2d099a..00000000
--- a/locale/de-de/from.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-Ab {day}
diff --git a/locale/de-de/heavy.dialog b/locale/de-de/heavy.dialog
deleted file mode 100644
index e26309cb..00000000
--- a/locale/de-de/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-schwerer
diff --git a/locale/de-de/hour.weather.location.dialog b/locale/de-de/hourly.weather.location.dialog
similarity index 100%
rename from locale/de-de/hour.weather.location.dialog
rename to locale/de-de/hourly.weather.location.dialog
diff --git a/locale/de-de/light.dialog b/locale/de-de/light.dialog
deleted file mode 100644
index c5141f41..00000000
--- a/locale/de-de/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-leichter
diff --git a/locale/de-de/on.date.dialog b/locale/de-de/on.date.dialog
deleted file mode 100644
index 1b65dc25..00000000
--- a/locale/de-de/on.date.dialog
+++ /dev/null
@@ -1 +0,0 @@
-am
diff --git a/locale/de-de/on.dialog b/locale/de-de/on.dialog
deleted file mode 100644
index 17f49231..00000000
--- a/locale/de-de/on.dialog
+++ /dev/null
@@ -1 +0,0 @@
-ein
diff --git a/locale/de-de/simple.temperature.intent b/locale/de-de/simple.temperature.intent
deleted file mode 100644
index 9d86c38a..00000000
--- a/locale/de-de/simple.temperature.intent
+++ /dev/null
@@ -1 +0,0 @@
-Temperatur
diff --git a/locale/de-de/sky is clear.future.dialog b/locale/de-de/sky is clear.future.dialog
deleted file mode 100644
index 39e5a15b..00000000
--- a/locale/de-de/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-Klarer Himmel
diff --git a/locale/de-de/storm.dialog b/locale/de-de/thunderstorm.dialog
similarity index 100%
rename from locale/de-de/storm.dialog
rename to locale/de-de/thunderstorm.dialog
diff --git a/locale/de-de/weekly.condition.on.day.dialog b/locale/de-de/weekly.condition.on.day.dialog
deleted file mode 100644
index 045a35e8..00000000
--- a/locale/de-de/weekly.condition.on.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-{day} wird es {condition},
diff --git a/locale/de-de/weekly.conditions.mostly.one.dialog b/locale/de-de/weekly.conditions.mostly.one.dialog
deleted file mode 100644
index 28481a0e..00000000
--- a/locale/de-de/weekly.conditions.mostly.one.dialog
+++ /dev/null
@@ -1 +0,0 @@
-es wird meistens {condition}.
diff --git a/locale/de-de/weekly.conditions.seq.extra.dialog b/locale/de-de/weekly.conditions.seq.extra.dialog
deleted file mode 100644
index 9fa71f00..00000000
--- a/locale/de-de/weekly.conditions.seq.extra.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-wie es aussieht wird es auch
-es wird auch
diff --git a/locale/de-de/weekly.conditions.seq.period.dialog b/locale/de-de/weekly.conditions.seq.period.dialog
deleted file mode 100644
index 5e29471a..00000000
--- a/locale/de-de/weekly.conditions.seq.period.dialog
+++ /dev/null
@@ -1 +0,0 @@
-von {from} zu {to}
diff --git a/locale/de-de/weekly.conditions.seq.start.dialog b/locale/de-de/weekly.conditions.seq.start.dialog
deleted file mode 100644
index 8ef6acc6..00000000
--- a/locale/de-de/weekly.conditions.seq.start.dialog
+++ /dev/null
@@ -1 +0,0 @@
-es wird {condition}
diff --git a/locale/de-de/weekly.conditions.some.days.dialog b/locale/de-de/weekly.conditions.some.days.dialog
deleted file mode 100644
index 2908f4c2..00000000
--- a/locale/de-de/weekly.conditions.some.days.dialog
+++ /dev/null
@@ -1 +0,0 @@
-Es wird einige Tage {condition} geben.
diff --git a/locale/de-de/weekly.temp.range.dialog b/locale/de-de/weekly.temperature.dialog
similarity index 100%
rename from locale/de-de/weekly.temp.range.dialog
rename to locale/de-de/weekly.temperature.dialog
diff --git a/locale/de-de/what.is.multi.day.forecast.intent b/locale/de-de/what.is.multi.day.forecast.intent
deleted file mode 100644
index 90a7925b..00000000
--- a/locale/de-de/what.is.multi.day.forecast.intent
+++ /dev/null
@@ -1,4 +0,0 @@
-Wetter (in | über | für) die nächsten {num} Tage
-(wie wird |) das Wetter (in | für | über) die nächsten {num} Tage
-(wie wird|)das Wetter (in den| über die| für die) nächsten {num} Tagen sein
-(wie wird das |das|) Wetter (in |über|für) (|die|den) nächsten {num} Tagen sein
diff --git a/locale/en-us/ClearAlternatives.voc b/locale/en-us/ClearAlternatives.voc
deleted file mode 100644
index f6bdd087..00000000
--- a/locale/en-us/ClearAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similar to clear weather
-(fog|mist|clouds|cloud)
diff --git a/locale/en-us/CloudsAlternatives.voc b/locale/en-us/CloudsAlternatives.voc
deleted file mode 100644
index d3bf7f42..00000000
--- a/locale/en-us/CloudsAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similar to clody weather
-(clear|mist|fog|rain| light rain)
diff --git a/locale/en-us/FogAlternatives.voc b/locale/en-us/FogAlternatives.voc
deleted file mode 100644
index 0bc78fe9..00000000
--- a/locale/en-us/FogAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives to foggy weather
-(clear|clouds|cloud|partially cloudy)
diff --git a/locale/en-us/NumberDays.voc b/locale/en-us/NumberDays.voc
new file mode 100644
index 00000000..27800c6f
--- /dev/null
+++ b/locale/en-us/NumberDays.voc
@@ -0,0 +1,23 @@
+2 day
+two day
+next 2 days
+next two days
+next couple of days
+next couple days
+3 day
+three day
+next 3 days
+next three days
+next few days
+4 day
+four day(s|)
+next 4 days
+next four days
+5 days
+five day
+next 5 days
+next five days
+6 day(s|)
+six day(s|)
+next 6 days
+next six days
diff --git a/locale/en-us/Query.voc b/locale/en-us/Query.voc
index 1dd41071..aae3edd4 100644
--- a/locale/en-us/Query.voc
+++ b/locale/en-us/Query.voc
@@ -4,3 +4,4 @@ what's
 what will
 tell (me|us) (about|)
 give me
+what
diff --git a/locale/en-us/RainAlternatives.voc b/locale/en-us/RainAlternatives.voc
deleted file mode 100644
index 5ee042e6..00000000
--- a/locale/en-us/RainAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similar to rain
-(snow|light snow|sleet|fog|mist)
diff --git a/locale/en-us/SnowAlternatives.voc b/locale/en-us/SnowAlternatives.voc
deleted file mode 100644
index 0ce959b0..00000000
--- a/locale/en-us/SnowAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Conditions similar to snow
-(rain|light rain)
diff --git a/locale/en-us/ThreeDay.voc b/locale/en-us/ThreeDay.voc
deleted file mode 100644
index e0ef09c4..00000000
--- a/locale/en-us/ThreeDay.voc
+++ /dev/null
@@ -1,3 +0,0 @@
-3 day(s|)
-three day(s|)
-few days
diff --git a/locale/en-us/ThunderstormAlternatives.voc b/locale/en-us/ThunderstormAlternatives.voc
deleted file mode 100644
index df62273e..00000000
--- a/locale/en-us/ThunderstormAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similar to stormy weather
-(drizzle|rain|light rain|snow|light snow|sleet|fog|mist|clouds|cloud|partially cloudy)
diff --git a/locale/en-us/WeatherType.voc b/locale/en-us/WeatherType.voc
deleted file mode 100644
index 79188010..00000000
--- a/locale/en-us/WeatherType.voc
+++ /dev/null
@@ -1,8 +0,0 @@
-rain|raining
-snow|snowing
-sleet
-hail|hailing
-sunny|sun
-hot|warm
-cold|cool
-
diff --git a/locale/en-us/When.voc b/locale/en-us/When.voc
index 1a06d5b1..7be21d85 100644
--- a/locale/en-us/When.voc
+++ b/locale/en-us/When.voc
@@ -1,5 +1,5 @@
 when
 when's
-when will it
-when is it
+when will
+when is
 what time
diff --git a/locale/en-us/and.dialog b/locale/en-us/and.dialog
new file mode 100644
index 00000000..e8c07838
--- /dev/null
+++ b/locale/en-us/and.dialog
@@ -0,0 +1 @@
+and
diff --git a/locale/en-us/clear.future.dialog b/locale/en-us/clear.future.dialog
deleted file mode 100644
index dceb7a14..00000000
--- a/locale/en-us/clear.future.dialog
+++ /dev/null
@@ -1 +0,0 @@
-a clear sky
diff --git a/locale/en-us/clouds.dialog b/locale/en-us/clouds.dialog
new file mode 100644
index 00000000..487078d1
--- /dev/null
+++ b/locale/en-us/clouds.dialog
@@ -0,0 +1 @@
+clouds
diff --git a/locale/en-us/current.clear.alternative.location.dialog b/locale/en-us/current.clear.alternative.location.dialog
deleted file mode 100644
index b8ce4992..00000000
--- a/locale/en-us/current.clear.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, the forecast calls for {condition} in {location}
-It looks like there will be {condition} in {location}
-Chances are it's going to be {condition} in {location}
diff --git a/locale/en-us/current.clear.not.expected.local.dialog b/locale/en-us/current.clear.not.expected.local.dialog
deleted file mode 100644
index 77ae6f37..00000000
--- a/locale/en-us/current.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, the forecast calls for {condition} today
-It looks like there'll be {condition} today
-Chances are it's going to be {condition} today
diff --git a/locale/en-us/current.clear.not.expected.location.dialog b/locale/en-us/current.clear.not.expected.location.dialog
deleted file mode 100644
index 0db30deb..00000000
--- a/locale/en-us/current.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's clear but it's not
-Sorry, it seems like it's going to be {condition}
-It's not likely to be a clear sky
diff --git a/locale/en-us/current.clouds.alternative.location.dialog b/locale/en-us/current.clouds.alternative.location.dialog
deleted file mode 100644
index 90295084..00000000
--- a/locale/en-us/current.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, the forecast calls for {condition}
-It should not be cloudy, it looks like there'll be {condition}
-Doesn't seem so, chances are it's going to be {condition}
diff --git a/locale/en-us/current.clouds.not.expected.local.dialog b/locale/en-us/current.clouds.not.expected.local.dialog
deleted file mode 100644
index 1dd69ccd..00000000
--- a/locale/en-us/current.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's raining but no cloud or alternative is forcasted
-No clouds are predicted for today
-It should not be cloudy today
diff --git a/locale/en-us/current.clouds.not.expected.location.dialog b/locale/en-us/current.clouds.not.expected.location.dialog
deleted file mode 100644
index e53f0b1f..00000000
--- a/locale/en-us/current.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's cloudy but it's not
-It doesn't seem to be cloudy today
-It should not be cloudy
diff --git a/locale/en-us/current.condition.expected.local.dialog b/locale/en-us/current.condition.expected.local.dialog
index b8ad6597..e2506105 100644
--- a/locale/en-us/current.condition.expected.local.dialog
+++ b/locale/en-us/current.condition.expected.local.dialog
@@ -1,2 +1,3 @@
 # The queried condition will occur today
 Yes, it is going to be {condition} today
+It looks like there will be {condition} today
diff --git a/locale/en-us/current.condition.expected.location.dialog b/locale/en-us/current.condition.expected.location.dialog
index 93a8af0f..35fb0677 100644
--- a/locale/en-us/current.condition.expected.location.dialog
+++ b/locale/en-us/current.condition.expected.location.dialog
@@ -1,2 +1,3 @@
 # The queried condition will occur
 Yes, it is going to be {condition} in {location}
+In {location}, it looks like there will be {condition} today
diff --git a/locale/en-us/current.condition.not.expected.local.dialog b/locale/en-us/current.condition.not.expected.local.dialog
new file mode 100644
index 00000000..fa678544
--- /dev/null
+++ b/locale/en-us/current.condition.not.expected.local.dialog
@@ -0,0 +1,3 @@
+# Informing that an the requested condition is not in the forecast
+No, the forecast calls for {condition} today
+No, {condition} is expected today
diff --git a/locale/en-us/current.condition.not.expected.location.dialog b/locale/en-us/current.condition.not.expected.location.dialog
new file mode 100644
index 00000000..da5a406e
--- /dev/null
+++ b/locale/en-us/current.condition.not.expected.location.dialog
@@ -0,0 +1,3 @@
+# Informing that an the requested condition is not in the forecast
+No, the forecast calls for {condition} today in {location}
+No, in {location} {condition} is expected today
diff --git a/locale/en-us/current.fog.alternative.local.dialog b/locale/en-us/current.fog.alternative.local.dialog
deleted file mode 100644
index d6c25852..00000000
--- a/locale/en-us/current.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to fog will occur
-No, the forecast calls for {condition} today
-It looks like there'll be {condition} today
-Chances are it's going to be {condition} today
diff --git a/locale/en-us/current.fog.alternative.location.dialog b/locale/en-us/current.fog.alternative.location.dialog
deleted file mode 100644
index 4018ff7f..00000000
--- a/locale/en-us/current.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to fog will occur at a location
-No, the forecast calls for {condition} in {location}
-It looks like there'll be {condition} in {location}
-Chances are it's going to be {condition} in {location}
diff --git a/locale/en-us/current.fog.not.expected.local.dialog b/locale/en-us/current.fog.not.expected.local.dialog
deleted file mode 100644
index 2ad54756..00000000
--- a/locale/en-us/current.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted
-Seems like the visibility will be good today
-No fog is predicted for today
diff --git a/locale/en-us/current.fog.not.expected.location.dialog b/locale/en-us/current.fog.not.expected.location.dialog
deleted file mode 100644
index aac9a3fe..00000000
--- a/locale/en-us/current.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted
-Seems like the visibility will be good in {location}
-No fog is predicted for {location} today
diff --git a/locale/en-us/current.rain.alternative.local.dialog b/locale/en-us/current.rain.alternative.local.dialog
deleted file mode 100644
index 1005d2ea..00000000
--- a/locale/en-us/current.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur (like snow or fog)
-No, but today the forecast calls for {condition}
-There is no rain predicted for today but it looks like there'll be {condition}
diff --git a/locale/en-us/current.rain.alternative.location.dialog b/locale/en-us/current.rain.alternative.location.dialog
deleted file mode 100644
index 72c16809..00000000
--- a/locale/en-us/current.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur (like snow or fog)
-No, but the forecast calls for {condition} in {location}
-There is no rain predicted for today in {location}, but it looks like there'll be {condition}
diff --git a/locale/en-us/current.rain.not.expected.local.dialog b/locale/en-us/current.rain.not.expected.local.dialog
deleted file mode 100644
index bf5fb348..00000000
--- a/locale/en-us/current.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-No rain is predicted today
-It should not rain today
-There's no need for an umbrella today
diff --git a/locale/en-us/current.rain.not.expected.location.dialog b/locale/en-us/current.rain.not.expected.location.dialog
deleted file mode 100644
index 08dc0f39..00000000
--- a/locale/en-us/current.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-No rain is predicted for {location}
-It should not be raining in {location}
-There's no need for an umbrella in {location}
diff --git a/locale/en-us/current.snow.alternative.local.dialog b/locale/en-us/current.snow.alternative.local.dialog
deleted file mode 100644
index 08ea49e1..00000000
--- a/locale/en-us/current.snow.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to snowing will occur
-No, but today the forecast calls for {condition}
-There is no snow predicted for today but the chances are that it'll be {condition}
diff --git a/locale/en-us/current.snow.alternative.location.dialog b/locale/en-us/current.snow.alternative.location.dialog
deleted file mode 100644
index fe7d2869..00000000
--- a/locale/en-us/current.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to snowing will occur
-No, but the forecast calls for {condition} in {location}
-There is no snow predicted for today but the chances are that it'll be {condition} in {location}
diff --git a/locale/en-us/current.snow.not.expected.local.dialog b/locale/en-us/current.snow.not.expected.local.dialog
deleted file mode 100644
index 164d6d42..00000000
--- a/locale/en-us/current.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forecasted
-No snow is predicted today
-It should not snow today
diff --git a/locale/en-us/current.snow.not.expected.location.dialog b/locale/en-us/current.snow.not.expected.location.dialog
deleted file mode 100644
index 774c89b4..00000000
--- a/locale/en-us/current.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted
-No snow is predicted for {location}
-It will not snow in {location}
diff --git a/locale/en-us/current.thunderstorm.alternative.local.dialog b/locale/en-us/current.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 14e9771f..00000000
--- a/locale/en-us/current.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to a storm will occur (like snow or fog)
-No, but today the forecast calls for {condition}
-There is no storm predicted for today but it looks like there'll be {condition}
diff --git a/locale/en-us/current.thunderstorm.alternative.location.dialog b/locale/en-us/current.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 4e6e8174..00000000
--- a/locale/en-us/current.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to storm will occur (like snow or fog)
-No, but the forecast calls for {condition} in {location}
-There is no storm predicted for today in {location}, but it looks like there'll be {condition}
diff --git a/locale/en-us/current.thunderstorm.not.expected.local.dialog b/locale/en-us/current.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 67679186..00000000
--- a/locale/en-us/current.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-No storm is predicted today
-It should not storm today
-There should not be a storm today
-Today it is unlikely to storm
-A storm is not likely today
diff --git a/locale/en-us/current.thunderstorm.not.expected.location.dialog b/locale/en-us/current.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index 35aadc46..00000000
--- a/locale/en-us/current.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's storming but no storm or alternative is forcasted
-No storm is predicted for {location}
-There should not be a storm in {location}
-It should not storm in {location}
diff --git a/locale/en-us/daily.clear.alternative.local.dialog b/locale/en-us/daily.clear.alternative.local.dialog
deleted file mode 100644
index 9b427c06..00000000
--- a/locale/en-us/daily.clear.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, the forecast {day} calls for {condition}
-{day}, it looks like there'll be {condition}
diff --git a/locale/en-us/daily.clear.alternative.location.dialog b/locale/en-us/daily.clear.alternative.location.dialog
deleted file mode 100644
index 2d412d9e..00000000
--- a/locale/en-us/daily.clear.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-No, but the forecast {day} calls for {condition} in {location}
-{day}, there is no rain predicted {day} for {location} but it looks like there'll be {condition}
diff --git a/locale/en-us/daily.clear.not.expected.local.dialog b/locale/en-us/daily.clear.not.expected.local.dialog
deleted file mode 100644
index 358a7bae..00000000
--- a/locale/en-us/daily.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's clear but an alternative is forcasted
-Sorry, the forecast doesn't predict clear conditions {day}
-{day}, it is not likely to be clear
diff --git a/locale/en-us/daily.clear.not.expected.location.dialog b/locale/en-us/daily.clear.not.expected.location.dialog
deleted file mode 100644
index 5441faca..00000000
--- a/locale/en-us/daily.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's clear but an alternative is forcasted
-Sorry, the forecast {day} doesn't predict clear conditions for {location}
-{day}, it is not likely to be clear weather in {location}
diff --git a/locale/en-us/daily.clouds.alternative.local.dialog b/locale/en-us/daily.clouds.alternative.local.dialog
deleted file mode 100644
index 42a473bf..00000000
--- a/locale/en-us/daily.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, the forecast {day} calls for {condition}
-It should not be cloudy, it looks like there'll be {condition} {day}
-Doesn't seem so, chances are it's going to be {condition} {day}
diff --git a/locale/en-us/daily.clouds.alternative.location.dialog b/locale/en-us/daily.clouds.alternative.location.dialog
deleted file mode 100644
index b83a80db..00000000
--- a/locale/en-us/daily.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-# No, the forecast {day} calls for {condition} in {location}
-# It should not be cloudy in {location} {day}, it looks like there'll be {condition}
-Doesn't seem so, chances are {location} will have {condition} {day}
diff --git a/locale/en-us/daily.clouds.not.expected.local.dialog b/locale/en-us/daily.clouds.not.expected.local.dialog
deleted file mode 100644
index ffe9d171..00000000
--- a/locale/en-us/daily.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's cloudy but it's not
-It doesn't seem like it's going to be cloudy {day}
-Clear skies are forecast {day}
-Expect clear skies {day}
-It should not be cloudy {day}
diff --git a/locale/en-us/daily.clouds.not.expected.location.dialog b/locale/en-us/daily.clouds.not.expected.location.dialog
deleted file mode 100644
index bd9a08f6..00000000
--- a/locale/en-us/daily.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's cloudy but it's not
-It doesn't seem like it's going to be cloudy in {location} {day}
-Clear skies are forecast in {location} {day}
-Expect clear skies in {location} {day}
-It should not be cloudy in {location} {day}
diff --git a/locale/en-us/daily.condition.expected.local.dialog b/locale/en-us/daily.condition.expected.local.dialog
index 066ed694..2c9e146b 100644
--- a/locale/en-us/daily.condition.expected.local.dialog
+++ b/locale/en-us/daily.condition.expected.local.dialog
@@ -1,3 +1,3 @@
 # Affirmative response to questions like "is it going to snow tomorrow"
-Yes, expect {condition}
-Yes, the forecast calls for {condition}
+Yes, expect {condition} {day}
+Yes, the forecast calls for {condition} {day}
diff --git a/locale/en-us/daily.condition.not.expected.local.dialog b/locale/en-us/daily.condition.not.expected.local.dialog
new file mode 100644
index 00000000..53dde4cc
--- /dev/null
+++ b/locale/en-us/daily.condition.not.expected.local.dialog
@@ -0,0 +1,3 @@
+# Informing that an the requested condition is not in the forecast
+No, {day} the forecast calls for {condition}
+No, {condition} is expected {day}
diff --git a/locale/en-us/daily.condition.not.expected.location.dialog b/locale/en-us/daily.condition.not.expected.location.dialog
new file mode 100644
index 00000000..55098b21
--- /dev/null
+++ b/locale/en-us/daily.condition.not.expected.location.dialog
@@ -0,0 +1,3 @@
+# Informing that an the requested condition is not in the forecast
+No, {day} the forecast calls for {condition} in {location}
+No, in {location} {condition} is expected {day}
diff --git a/locale/en-us/daily.fog.alternative.local.dialog b/locale/en-us/daily.fog.alternative.local.dialog
deleted file mode 100644
index 5b9a7b0f..00000000
--- a/locale/en-us/daily.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to fog will occur
-No, the forecast {day} calls for {condition}
-It looks like there'll be {condition} {day}
-Chances are it's going to be {condition} {day}
diff --git a/locale/en-us/daily.fog.alternative.location.dialog b/locale/en-us/daily.fog.alternative.location.dialog
deleted file mode 100644
index 25966c4b..00000000
--- a/locale/en-us/daily.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to fog will occur
-No, the forecast {day} for {location} calls for {condition}
-It looks like there'll be {condition} in {location} {day}
-Chances are it's going to be {condition} in {location} {day}
diff --git a/locale/en-us/daily.fog.not.expected.local.dialog b/locale/en-us/daily.fog.not.expected.local.dialog
deleted file mode 100644
index 77ab2208..00000000
--- a/locale/en-us/daily.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted
-{day} the visibility should be good
-No fog is predicted {day}
diff --git a/locale/en-us/daily.fog.not.expected.location.dialog b/locale/en-us/daily.fog.not.expected.location.dialog
deleted file mode 100644
index 9fed10f8..00000000
--- a/locale/en-us/daily.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted
-{day} the visibility should be good in {location}
-No fog is predicted {day} in {location}
diff --git a/locale/en-us/daily.rain.alternative.local.dialog b/locale/en-us/daily.rain.alternative.local.dialog
deleted file mode 100644
index 27fd124e..00000000
--- a/locale/en-us/daily.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-No, but the forecast {day} calls for {condition}
-{day}, there is no rain predicted but it looks like there'll be {condition}
diff --git a/locale/en-us/daily.rain.alternative.location.dialog b/locale/en-us/daily.rain.alternative.location.dialog
deleted file mode 100644
index 48dc1cc9..00000000
--- a/locale/en-us/daily.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-No, but the forecast calls for {condition} in {location} {day}
-{day}, there is no rain predicted for {location} but it looks like there'll be {condition}
diff --git a/locale/en-us/daily.rain.not.expected.local.dialog b/locale/en-us/daily.rain.not.expected.local.dialog
deleted file mode 100644
index 9d8d8c98..00000000
--- a/locale/en-us/daily.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-No rain is predicted {day}
-It should not rain {day}
-You won't need an umbrella {day}
diff --git a/locale/en-us/daily.rain.not.expected.location.dialog b/locale/en-us/daily.rain.not.expected.location.dialog
deleted file mode 100644
index 0a915db0..00000000
--- a/locale/en-us/daily.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-No rain is predicted for {location} {day}
-{day}, it should not rain in {location}
-There's no need for an umbrella in {location} {day}
diff --git a/locale/en-us/daily.snow.alternative.location.dialog b/locale/en-us/daily.snow.alternative.location.dialog
deleted file mode 100644
index 08c34229..00000000
--- a/locale/en-us/daily.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to snowing will occur
-No, but the forecast calls for {condition} {day}
-{day} there is no snow predicted but the chances are that it'll be {condition}
diff --git a/locale/en-us/daily.snow.not.expected.local.dialog b/locale/en-us/daily.snow.not.expected.local.dialog
deleted file mode 100644
index 9fa7a729..00000000
--- a/locale/en-us/daily.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted
-No snow is predicted {day}
-It will not snow {day}
diff --git a/locale/en-us/daily.snow.not.expected.location.dialog b/locale/en-us/daily.snow.not.expected.location.dialog
deleted file mode 100644
index 31828b0c..00000000
--- a/locale/en-us/daily.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted
-No snow is predicted in {location} {day}
-It should not snow in {location} {day}
diff --git a/locale/en-us/daily.thunderstorm.alternative.local.dialog b/locale/en-us/daily.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 50503cb6..00000000
--- a/locale/en-us/daily.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-No, but the forecast {day} calls for {condition}
-{day}, there is no storm predicted but it looks like there'll be {condition}
diff --git a/locale/en-us/daily.thunderstorm.alternative.location.dialog b/locale/en-us/daily.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 0cb8fde0..00000000
--- a/locale/en-us/daily.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to storm will occur
-No, but the forecast calls for {condition} in {location} {day}
-{day}, there is no storm predicted for {location} but it looks like there'll be {condition}
diff --git a/locale/en-us/daily.thunderstorm.not.expected.local.dialog b/locale/en-us/daily.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index cebb8664..00000000
--- a/locale/en-us/daily.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-No storm is predicted {day}
-{day}, it should not storm
-It should not storm {day}
diff --git a/locale/en-us/daily.thunderstorm.not.expected.location.dialog b/locale/en-us/daily.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index 5a028b54..00000000
--- a/locale/en-us/daily.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-No storm is predicted for {location} {day}
-{day}, it should not storm in {location}
-It is unlikely to storm {day} in {location}
diff --git a/locale/en-us/do not know.dialog b/locale/en-us/do not know.dialog
deleted file mode 100644
index 6467724d..00000000
--- a/locale/en-us/do not know.dialog	
+++ /dev/null
@@ -1,3 +0,0 @@
-I'm afraid I don't know that
-I don't have that information
-
diff --git a/locale/en-us/from.day.dialog b/locale/en-us/from.day.dialog
deleted file mode 100644
index 6c0a30d9..00000000
--- a/locale/en-us/from.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-From {day}
diff --git a/locale/en-us/heavy.dialog b/locale/en-us/heavy.dialog
deleted file mode 100644
index 9d1f86a0..00000000
--- a/locale/en-us/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-heavy
diff --git a/locale/en-us/hourly.condition.alternative.local.dialog b/locale/en-us/hourly.condition.alternative.local.dialog
deleted file mode 100644
index b6f5ee33..00000000
--- a/locale/en-us/hourly.condition.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to a condition will occur
-No, the {time} forecast calls for {condition} today
-Doesn't seem so, the {time} forecast suggests it will be {condition}
diff --git a/locale/en-us/hourly.condition.alternative.location.dialog b/locale/en-us/hourly.condition.alternative.location.dialog
deleted file mode 100644
index e18a7ee1..00000000
--- a/locale/en-us/hourly.condition.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that at a specified time an alternative to some condition will occur
-No, the {time} forecast calls for {condition} in {location}
-Doesn't seem so, the {time} forecast suggests it's going to be {condition} in {location}
diff --git a/locale/en-us/light.dialog b/locale/en-us/light.dialog
deleted file mode 100644
index 162faa69..00000000
--- a/locale/en-us/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-light
diff --git a/locale/en-us/simple.temperature.intent b/locale/en-us/simple.temperature.intent
deleted file mode 100644
index 746a65eb..00000000
--- a/locale/en-us/simple.temperature.intent
+++ /dev/null
@@ -1 +0,0 @@
-temperature
diff --git a/locale/en-us/sky is clear.future.dialog b/locale/en-us/sky is clear.future.dialog
deleted file mode 100644
index dceb7a14..00000000
--- a/locale/en-us/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-a clear sky
diff --git a/locale/en-us/thunderstorm.dialog b/locale/en-us/thunderstorm.dialog
new file mode 100644
index 00000000..15750d69
--- /dev/null
+++ b/locale/en-us/thunderstorm.dialog
@@ -0,0 +1 @@
+storms
diff --git a/locale/en-us/weekly.condition.dialog b/locale/en-us/weekly.condition.dialog
new file mode 100644
index 00000000..15f37fc0
--- /dev/null
+++ b/locale/en-us/weekly.condition.dialog
@@ -0,0 +1,2 @@
+The forecast calls for {condition} on {days}
+On {days} expect {condition}
diff --git a/locale/en-us/weekly.temperature.dialog b/locale/en-us/weekly.temperature.dialog
new file mode 100644
index 00000000..b67b3143
--- /dev/null
+++ b/locale/en-us/weekly.temperature.dialog
@@ -0,0 +1 @@
+lows will be between {low_min} and {low_max}, with highs between {high_min} and {high_max}
diff --git a/locale/en-us/what.is.multi.day.forecast.intent b/locale/en-us/what.is.multi.day.forecast.intent
deleted file mode 100644
index 4b46089d..00000000
--- a/locale/en-us/what.is.multi.day.forecast.intent
+++ /dev/null
@@ -1,4 +0,0 @@
-(weather|forecast) (in|over|for) the next {num} days
-what is the (weather|forecast) (like|) (in|over|for) the next {num} days
-what will the weather be (like|) (in|over|for) the next {num} days
-what is the weather (going to|gonna|) be (like|) (in|over|for) the next {num} days
diff --git a/locale/es-es/heavy.dialog b/locale/es-es/heavy.dialog
deleted file mode 100644
index e524be2f..00000000
--- a/locale/es-es/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-pesado
diff --git a/locale/es-es/hour.local.weather.dialog b/locale/es-es/hourly.weather.local.dialog
similarity index 100%
rename from locale/es-es/hour.local.weather.dialog
rename to locale/es-es/hourly.weather.local.dialog
diff --git a/locale/es-es/hour.weather.dialog b/locale/es-es/hourly.weather.location.dialog
similarity index 100%
rename from locale/es-es/hour.weather.dialog
rename to locale/es-es/hourly.weather.location.dialog
diff --git a/locale/es-es/light.dialog b/locale/es-es/light.dialog
deleted file mode 100644
index abd55634..00000000
--- a/locale/es-es/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-luz
diff --git a/locale/es-es/report.condition.dialog b/locale/es-es/report.condition.dialog
deleted file mode 100644
index 3cd26d5d..00000000
--- a/locale/es-es/report.condition.dialog
+++ /dev/null
@@ -1 +0,0 @@
-{{condition}} es {{value}}
diff --git a/locale/es-es/report.future.condition.dialog b/locale/es-es/report.future.condition.dialog
deleted file mode 100644
index c633dff6..00000000
--- a/locale/es-es/report.future.condition.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-{{condition}} para el {{day}} será de {{value}}
-El {{day}}, el pronóstico indica {{condition}} de {{value}}
diff --git a/locale/es-es/sky is clear.future.dialog b/locale/es-es/sky is clear.future.dialog
deleted file mode 100644
index 126bbb7b..00000000
--- a/locale/es-es/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-despejado
diff --git a/locale/es-es/wind.speed.dialog b/locale/es-es/wind.speed.dialog
deleted file mode 100644
index cff9d7e4..00000000
--- a/locale/es-es/wind.speed.dialog
+++ /dev/null
@@ -1 +0,0 @@
-{{speed}} {{unit}}
diff --git a/locale/es-es/wind.speed.dir.dialog b/locale/es-es/wind.speed.dir.dialog
deleted file mode 100644
index 1a4c3cfc..00000000
--- a/locale/es-es/wind.speed.dir.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-a {{speed}} {{unit}} desde el {{dir}}
-desde el {{dir}} a {{speed}} {{unit}}
diff --git a/locale/es-es/winds.dialog b/locale/es-es/winds.dialog
deleted file mode 100644
index c3abf711..00000000
--- a/locale/es-es/winds.dialog
+++ /dev/null
@@ -1 +0,0 @@
-el viento
diff --git a/locale/fr-fr/current.humitidy.location.dialog b/locale/fr-fr/current.humidity.location.dialog
similarity index 100%
rename from locale/fr-fr/current.humitidy.location.dialog
rename to locale/fr-fr/current.humidity.location.dialog
diff --git a/locale/fr-fr/do not know.dialog b/locale/fr-fr/do not know.dialog
deleted file mode 100644
index 39258797..00000000
--- a/locale/fr-fr/do not know.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-J'ai bien peur de ne pas le savoir
-Je n'ai pas cette information
diff --git a/locale/fr-fr/heavy.dialog b/locale/fr-fr/heavy.dialog
deleted file mode 100644
index c1992a78..00000000
--- a/locale/fr-fr/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-forte
diff --git a/locale/fr-fr/light.dialog b/locale/fr-fr/light.dialog
deleted file mode 100644
index a974bef3..00000000
--- a/locale/fr-fr/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-faible
diff --git a/locale/fr-fr/sky is clear.future.dialog b/locale/fr-fr/sky is clear.future.dialog
deleted file mode 100644
index 09b10976..00000000
--- a/locale/fr-fr/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-clair
diff --git a/locale/gl-es/ClearAlternatives.voc b/locale/gl-es/ClearAlternatives.voc
deleted file mode 100644
index d35fa5a0..00000000
--- a/locale/gl-es/ClearAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas similares a tempo firme
-(nebuloso|neboeiro|néboa|nubes|nube)
diff --git a/locale/gl-es/CloudsAlternatives.voc b/locale/gl-es/CloudsAlternatives.voc
deleted file mode 100644
index b7bd2c9e..00000000
--- a/locale/gl-es/CloudsAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas semellantes ao tempo nubrado
-(claro|neblina|neboeiro|chuvia|chuvia miúda)
diff --git a/locale/gl-es/FogAlternatives.voc b/locale/gl-es/FogAlternatives.voc
deleted file mode 100644
index 1b4c2bab..00000000
--- a/locale/gl-es/FogAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas ao tempo nubrado
-(despexado|nubes|nubrado|parcialmente nubrado)
diff --git a/locale/gl-es/RainAlternatives.voc b/locale/gl-es/RainAlternatives.voc
deleted file mode 100644
index 25142570..00000000
--- a/locale/gl-es/RainAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas similares á chuvia
-(neve|neve leve|granizo|néboa|neblina)
diff --git a/locale/gl-es/SnowAlternatives.voc b/locale/gl-es/SnowAlternatives.voc
deleted file mode 100644
index 743a0434..00000000
--- a/locale/gl-es/SnowAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Condicións similares para a neve
-(chuvia|chuvia leve)
diff --git a/locale/gl-es/ThunderstormAlternatives.voc b/locale/gl-es/ThunderstormAlternatives.voc
deleted file mode 100644
index 9c4f7fac..00000000
--- a/locale/gl-es/ThunderstormAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas semellantes ao tempo tempestuoso
-(chuvisco|chuvia|chuvia fraca|neve|neve fraca|granizo|neboeiro|néboa|néboa|nubes|nube|parcialmente nubrado)
diff --git a/locale/gl-es/and.dialog b/locale/gl-es/and.dialog
new file mode 100644
index 00000000..b18c97b5
--- /dev/null
+++ b/locale/gl-es/and.dialog
@@ -0,0 +1 @@
+, e
diff --git a/locale/gl-es/clear.future.dialog b/locale/gl-es/clear.future.dialog
deleted file mode 100644
index 969865c8..00000000
--- a/locale/gl-es/clear.future.dialog
+++ /dev/null
@@ -1 +0,0 @@
-un ceo despexado
diff --git a/locale/gl-es/condition.category.value b/locale/gl-es/condition.category.value
deleted file mode 100644
index f42da6dd..00000000
--- a/locale/gl-es/condition.category.value
+++ /dev/null
@@ -1,15 +0,0 @@
-Nubes, nubrado
-despexado, un ceo despexado
-Tempestades con trombas, tempestades
-Chuviscos, chuviscando
-Chuvia,chovendo
-Neve,nevando
-Néboa,neboado
-Fume,fumento
-neblina,nubrado
-Poeira, empoeirado
-Neboeiro, neboento
-Area, areoso
-Cinza, nubrado con posíble cinza volcánica
-Borrasca, tempestuoso
-Tornado, tempestuoso con posibilidade de tornado
diff --git a/locale/gl-es/current.clear.alternative.local.dialog b/locale/gl-es/current.clear.alternative.local.dialog
deleted file mode 100644
index 1b1b2fff..00000000
--- a/locale/gl-es/current.clear.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que unha alternativa ao tempo bo vai ocorrer
-Non, a previsión require {condition} hoxe
-Parece que hoxe teremos {condition}
-Si, vai estar {condition} hoxe
diff --git a/locale/gl-es/current.clear.alternative.location.dialog b/locale/gl-es/current.clear.alternative.location.dialog
deleted file mode 100644
index 4d978203..00000000
--- a/locale/gl-es/current.clear.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que unha alternativa ao tempo bo vai ocorrer
-Non, a previsión require {condition} en {location} 
-Parece que haberá {condition} en {location}
-As opcións son que vai estar {condition} en {location}
diff --git a/locale/gl-es/current.clear.not.expected.location.dialog b/locale/gl-es/current.clear.not.expected.location.dialog
deleted file mode 100644
index 719aaaac..00000000
--- a/locale/gl-es/current.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está despexado ou non
-Desculpa, parece que vai ocorrer {condition}
-Non é probable que faga bo tempo
diff --git a/locale/gl-es/current.clouds.alternative.local.dialog b/locale/gl-es/current.clouds.alternative.local.dialog
deleted file mode 100644
index fe6d6040..00000000
--- a/locale/gl-es/current.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Non, a previsión require {condition} hoxe
-# Informando de que unha alternativa ao ceo nubrado vai ocorrer
-Non debería estar nubrado, parece que estará {condition} hoxe
-Parece que non, as opcións son de que estea {condition} hoxe
diff --git a/locale/gl-es/current.clouds.alternative.location.dialog b/locale/gl-es/current.clouds.alternative.location.dialog
deleted file mode 100644
index 70bca1f2..00000000
--- a/locale/gl-es/current.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que unha alternativa ao tempo bo vai ocorrer
-Non, a previsión require {condition}
-Probablemente non estará nubrado, parece que estará {condition}
-Parece que non, as opcións son de que estea {condition}
diff --git a/locale/gl-es/current.clouds.not.expected.local.dialog b/locale/gl-es/current.clouds.not.expected.local.dialog
deleted file mode 100644
index de0e27ba..00000000
--- a/locale/gl-es/current.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está chovendo mais non hai previsión de nubes ou alternativa
-Non hai previsto nubes para hoxe
-Non debería estar nubrado hoxe
diff --git a/locale/gl-es/current.clouds.not.expected.location.dialog b/locale/gl-es/current.clouds.not.expected.location.dialog
deleted file mode 100644
index 07309eb0..00000000
--- a/locale/gl-es/current.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nubrado mais non o está
-Non parece estar nubrado hoxe
-Non debería estar nubrado
diff --git a/locale/gl-es/current.fog.alternative.local.dialog b/locale/gl-es/current.fog.alternative.local.dialog
deleted file mode 100644
index fb1c910a..00000000
--- a/locale/gl-es/current.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que unha alternativa ao bo tempo ocorrerá
-Non, a previsión require {condition} hoxe
-Parece que hoxe teremos {condition}
-Si, vai estar {condition} hoxe
diff --git a/locale/gl-es/current.fog.alternative.location.dialog b/locale/gl-es/current.fog.alternative.location.dialog
deleted file mode 100644
index 3721230c..00000000
--- a/locale/gl-es/current.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Non, a previsión require {condition} en {location} 
-As opcións son que vai estar {condition} en {location}
-# Informando que unha alternativa ao neboeiro ocorrerá nunha localización
-Parece que haberá {condition} en {location}
diff --git a/locale/gl-es/current.fog.not.expected.local.dialog b/locale/gl-es/current.fog.not.expected.local.dialog
deleted file mode 100644
index 195a3741..00000000
--- a/locale/gl-es/current.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nubrado mais ningunha neve ou alternativa é feita como previsión
-Parece que a visibilidade será boa hoxe
-Non hai previsto neboeiros para hoxe
diff --git a/locale/gl-es/current.fog.not.expected.location.dialog b/locale/gl-es/current.fog.not.expected.location.dialog
deleted file mode 100644
index d1b60e50..00000000
--- a/locale/gl-es/current.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nubrado mais ningunha neve ou alternativa é feita como previsión
-Parece que a visibilidade será boa en {location}
-Non está previsto ningún nevoeiro en {location} hoxe
diff --git a/locale/gl-es/current.rain.alternative.local.dialog b/locale/gl-es/current.rain.alternative.local.dialog
deleted file mode 100644
index b03d7d8a..00000000
--- a/locale/gl-es/current.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando de que unha alternativa para a chuvia vai acontecer (como neve ou neboeiro)
-Non, pero hoxe a previsión require {condition}
-Non hai previsión de chuvia hoxe mais parece que haberá {condition}
diff --git a/locale/gl-es/current.rain.alternative.location.dialog b/locale/gl-es/current.rain.alternative.location.dialog
deleted file mode 100644
index 7e663e4f..00000000
--- a/locale/gl-es/current.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando de que unha alternativa para a chuvia vai acontecer (como neve ou neboeiro)
-Non, pero a previsión require {condition} en {location} 
-Non hai previsión de chuvia para hoxe en {location}, mais parece que haberá {condition}
diff --git a/locale/gl-es/current.rain.not.expected.local.dialog b/locale/gl-es/current.rain.not.expected.local.dialog
deleted file mode 100644
index faa9491d..00000000
--- a/locale/gl-es/current.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cando o usuario pregunta se está chovendo mais ningunha chuvia ou alternativa está prevista
-Non está prevista para hoxe a chuvia
-Non debería chover hoxe
-Non hai necesidade dun paraugas hoxe
diff --git a/locale/gl-es/current.rain.not.expected.location.dialog b/locale/gl-es/current.rain.not.expected.location.dialog
deleted file mode 100644
index 6947a572..00000000
--- a/locale/gl-es/current.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cando o usuario pregunta se está chovendo mais ningunha chuvia ou alternativa está prevista
-Non está prevista chuvia en {location}
-Non debría estar chovendo en {location}
-Non hai necesidade de usar paraugas en {location}
diff --git a/locale/gl-es/current.snow.alternative.local.dialog b/locale/gl-es/current.snow.alternative.local.dialog
deleted file mode 100644
index 05e53278..00000000
--- a/locale/gl-es/current.snow.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando de que unha alternativa ao bo tempo vai ocorrer
-Non, pero hoxe a previsión require {condition}
-Non hai previsión de neve para hoxe, mais as oportunidades son de {condition}
diff --git a/locale/gl-es/current.snow.alternative.location.dialog b/locale/gl-es/current.snow.alternative.location.dialog
deleted file mode 100644
index 5e3eb760..00000000
--- a/locale/gl-es/current.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando de que unha alternativa ao bo tempo vai ocorrer
-Non, pero a previsión require {condition} en {location} 
-Non está previsto que neve hoxe pero as opcións son que haxa {condition} en {location}
diff --git a/locale/gl-es/current.snow.not.expected.local.dialog b/locale/gl-es/current.snow.not.expected.local.dialog
deleted file mode 100644
index c022bdb9..00000000
--- a/locale/gl-es/current.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nevando mais non hai previsión dela
-Esta previsto que neve hoxe
-Non debería nevar hoxe
diff --git a/locale/gl-es/current.snow.not.expected.location.dialog b/locale/gl-es/current.snow.not.expected.location.dialog
deleted file mode 100644
index 2ba435f5..00000000
--- a/locale/gl-es/current.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nevando mais ningunha neve ou alternativa está prevista
-Non está prevista a neve en {location}
-Non vai nevar en {location}
diff --git a/locale/gl-es/current.thunderstorm.alternative.local.dialog b/locale/gl-es/current.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 659cbdee..00000000
--- a/locale/gl-es/current.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Non, pero hoxe a previsión require {condition}
-# Informando de que unha alternativa para a tempestade vai acontecer (como neve ou nevoeiro)
-Non hai previsión de tempestades para hoxe, mais parece que haberá {condition}
diff --git a/locale/gl-es/current.thunderstorm.alternative.location.dialog b/locale/gl-es/current.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 65613323..00000000
--- a/locale/gl-es/current.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Non, pero a previsión require {condition} en {location} 
-# Informando de que unha alternativa para a chuvia forte vai acontecer (como neve ou nevoeiro)
-Non hai previsión de chuvia para hoxe en {location}, mais parece que haberá {condition}
diff --git a/locale/gl-es/current.thunderstorm.not.expected.local.dialog b/locale/gl-es/current.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index b56ae2d3..00000000
--- a/locale/gl-es/current.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-# Cando o usuario pregunta se está chovendo mais ningunha chuvia ou alternativa está prevista
-Non está prevista a neve para hoxe
-Non debería facer tormenta hoxe
-Non debería haber tormenta hoxe
-O máis probable é que hoxe non haxa tormenta
-Non está prevista unha tormenta hoxe
diff --git a/locale/gl-es/current.thunderstorm.not.expected.location.dialog b/locale/gl-es/current.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index dacfe066..00000000
--- a/locale/gl-es/current.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cando o usuario pregunta se hai tormenta mais non hai previsión dela
-Non está prevista ningunha tempestade en {location}
-Non debería haber unha tormenta en {location}
-Non debería haber unha tormenta en {location}
diff --git a/locale/gl-es/daily.clear.alternative.local.dialog b/locale/gl-es/daily.clear.alternative.local.dialog
deleted file mode 100644
index ac92fcbd..00000000
--- a/locale/gl-es/daily.clear.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que unha alternativa ao tempo bo vai ocorrer
-Non, a previsión para o {day} require {condition} 
-{day}, parece que haberá {condition}
diff --git a/locale/gl-es/daily.clear.alternative.location.dialog b/locale/gl-es/daily.clear.alternative.location.dialog
deleted file mode 100644
index 4214cf9c..00000000
--- a/locale/gl-es/daily.clear.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que unha alternativa á chuvia ocorrerá
-Non, pero a previsión {day} require {condition} en {location} 
-No {day}, non hai previsión de chuvia para {location}, mais parece que haberá {condition}
diff --git a/locale/gl-es/daily.clear.not.expected.local.dialog b/locale/gl-es/daily.clear.not.expected.local.dialog
deleted file mode 100644
index 5ac34af9..00000000
--- a/locale/gl-es/daily.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se o ceo está claro mais unha previsión alternativa é feita
-Desculpa, a previsión non prevé condicións de céeo despexado o {day}
-{day}, non é probable que o tempo estea bo.
diff --git a/locale/gl-es/daily.clear.not.expected.location.dialog b/locale/gl-es/daily.clear.not.expected.location.dialog
deleted file mode 100644
index fb8148ce..00000000
--- a/locale/gl-es/daily.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se o ceo está claro mais unha previsión alternativa é feita
-Desculpa, a previsión non indica condicións de ceo despexado para {location} o {day}
-{day}, é probable que o tempo non estea bo en {location}
diff --git a/locale/gl-es/daily.clouds.alternative.local.dialog b/locale/gl-es/daily.clouds.alternative.local.dialog
deleted file mode 100644
index ef3be97f..00000000
--- a/locale/gl-es/daily.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que unha alternativa ao tempo bo vai ocorrer
-Non, a previsión para o {day} require {condition} 
-Probablemente non estará nubrado, parece que {day} estará {condition}
-Parece que non, as opcións son de que {day} estea {condition}
diff --git a/locale/gl-es/daily.clouds.alternative.location.dialog b/locale/gl-es/daily.clouds.alternative.location.dialog
deleted file mode 100644
index 4c6c7b41..00000000
--- a/locale/gl-es/daily.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que unha alternativa ao tempo bo vai ocorrer
-# Non, a previsión para o {day} require {condition} en {location} 
-# Probablemente non estará nubrado {day} en {location}, parece que estará {condition}
-Parece que non, as opcións son de que en {location} haberá {condition} {day}
diff --git a/locale/gl-es/daily.clouds.not.expected.local.dialog b/locale/gl-es/daily.clouds.not.expected.local.dialog
deleted file mode 100644
index c37494e4..00000000
--- a/locale/gl-es/daily.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Cando o usuario pregunta se está nubrado mais non o está
-Non parece probable que vai estar nubrado {day}
-Está previsto ceo despexado {day}
-É esperado un ceo despexado {day}
-Non debe estar nubrado {day}
diff --git a/locale/gl-es/daily.clouds.not.expected.location.dialog b/locale/gl-es/daily.clouds.not.expected.location.dialog
deleted file mode 100644
index b21b8575..00000000
--- a/locale/gl-es/daily.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Cando o usuario pregunta se está nubrado mais non o está
-Non parece probable que vaia estar nubrado en {location} o {day}
-O ceo despexado está previsto en {location} o {day}
-É esperado o ceo despexado en {location} o {day}
-Non vai nevar en {location} o {day}
diff --git a/locale/gl-es/daily.fog.alternative.local.dialog b/locale/gl-es/daily.fog.alternative.local.dialog
deleted file mode 100644
index 8dc2a4d9..00000000
--- a/locale/gl-es/daily.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que unha alternativa ao bo tempo ocorrerá
-Non, a previsión para o {day} require {condition} 
-Parece que {day} teremos {condition}
-Vai estar {condition} {day}
diff --git a/locale/gl-es/daily.fog.alternative.location.dialog b/locale/gl-es/daily.fog.alternative.location.dialog
deleted file mode 100644
index 96362359..00000000
--- a/locale/gl-es/daily.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que unha alternativa ao bo tempo ocorrerá
-Non, a previsión para {location} {day} é de {condition}
-Parece que haberá {condition} en {location} {day}
-As opcións din que vai ser {condition} en {location} {day}
diff --git a/locale/gl-es/daily.fog.not.expected.local.dialog b/locale/gl-es/daily.fog.not.expected.local.dialog
deleted file mode 100644
index 8073dc5f..00000000
--- a/locale/gl-es/daily.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nubrado mais ningunha neve ou alternativa é feita como previsión
-o {day} a visibilidade debería ser boa
-Ningún noboeiroestá previsto para {day}
diff --git a/locale/gl-es/daily.fog.not.expected.location.dialog b/locale/gl-es/daily.fog.not.expected.location.dialog
deleted file mode 100644
index 8f3c7096..00000000
--- a/locale/gl-es/daily.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nubrado mais ningunha neve ou alternativa é feita como previsión
-o {day} a visibilidade debe estar boa en {location}
-Ningún neboeiro está previsto para o {day} en {location}
diff --git a/locale/gl-es/daily.rain.alternative.local.dialog b/locale/gl-es/daily.rain.alternative.local.dialog
deleted file mode 100644
index 2c143c01..00000000
--- a/locale/gl-es/daily.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que unha alternativa á chuvia ocorrerá
-Non, a previsión para o {day} require {condition}
-o {day}, non hai previsión de chuvia, mais parece que haberá {condition}
diff --git a/locale/gl-es/daily.rain.alternative.location.dialog b/locale/gl-es/daily.rain.alternative.location.dialog
deleted file mode 100644
index 0b6eb58f..00000000
--- a/locale/gl-es/daily.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que unha alternativa á chuvia ocorrerá
-Non, pero a previsión require {condition} en {location} {day}
-o {day}, non hai previsión de chuvia en {location} mais parece que haberá {condition}
diff --git a/locale/gl-es/daily.rain.not.expected.local.dialog b/locale/gl-es/daily.rain.not.expected.local.dialog
deleted file mode 100644
index 8afd19d8..00000000
--- a/locale/gl-es/daily.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cando o usuario pregunta se está chovendo mais ningunha chuvia ou alternativa está prevista
-Ningunha chuvia está prevista {day}
-Non debe chover {day}
-Non vas precisar dun paraugas {day}
diff --git a/locale/gl-es/daily.rain.not.expected.location.dialog b/locale/gl-es/daily.rain.not.expected.location.dialog
deleted file mode 100644
index ed17800d..00000000
--- a/locale/gl-es/daily.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cando o usuario pregunta se está chovendo mais ningunha chuvia ou alternativa está prevista
-Non está prevista ninguha chuvia para {location} o {day}
-{day}, non vai nevar en {location}
-Non hai necesidade dun paraugas en {location} o {day}
diff --git a/locale/gl-es/daily.snow.alternative.location.dialog b/locale/gl-es/daily.snow.alternative.location.dialog
deleted file mode 100644
index 2c2ef207..00000000
--- a/locale/gl-es/daily.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando de que unha alternativa ao bo tempo vai ocorrer
-Non, pero a previsión require {condition} {day}
-{day} non hai previsión de neve mais as opcións son que será {condition}
diff --git a/locale/gl-es/daily.snow.not.expected.local.dialog b/locale/gl-es/daily.snow.not.expected.local.dialog
deleted file mode 100644
index 39631591..00000000
--- a/locale/gl-es/daily.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nevando mais ningunha neve ou alternativa está prevista
-Non está prevista a neve {day}
-Non vai nevar o {day}
diff --git a/locale/gl-es/daily.snow.not.expected.location.dialog b/locale/gl-es/daily.snow.not.expected.location.dialog
deleted file mode 100644
index 8e0f7939..00000000
--- a/locale/gl-es/daily.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Cando o usuario pregunta se está nevando mais ningunha neve ou alternativa está prevista
-Non está prevista a neve en {location} o {day}
-Non debería nevar en {location} o {day}
diff --git a/locale/gl-es/daily.thunderstorm.alternative.local.dialog b/locale/gl-es/daily.thunderstorm.alternative.local.dialog
deleted file mode 100644
index a0a1ac1d..00000000
--- a/locale/gl-es/daily.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que unha alternativa á chuvia ocorrerá
-Non, a previsión para o {day} require {condition}
-{day}, non hai previsión de tempestade, mais parece que haberá {condition}
diff --git a/locale/gl-es/daily.thunderstorm.alternative.location.dialog b/locale/gl-es/daily.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 9eb25558..00000000
--- a/locale/gl-es/daily.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Non, pero a previsión require {condition} en {location} {day}
-# Informando de que vai ocorrer unha alternativa ao bo tempo
-o {day}, non hai previsión de tormenta en {location}, mais parece que haberá {condition}
diff --git a/locale/gl-es/daily.thunderstorm.not.expected.local.dialog b/locale/gl-es/daily.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 6ec7062d..00000000
--- a/locale/gl-es/daily.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cando o usuario pregunta se está chovendo mais ningunha chuvia ou alternativa está prevista
-Non está previsto que neve o {day}
-o {day}, non debería haber tempestade
-Non debe haber tempestade o {day}
diff --git a/locale/gl-es/daily.thunderstorm.not.expected.location.dialog b/locale/gl-es/daily.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index cd9f7708..00000000
--- a/locale/gl-es/daily.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cando o usuario pregunta se está chovendo mais ningunha chuvia ou alternativa está prevista
-Non está previsto ningún neboeiro en {location} o {day}
-{day}, non debería nevar en {location}
-Non debería haber treboadas o {day} en {location}
diff --git a/locale/gl-es/do not know.dialog b/locale/gl-es/do not know.dialog
deleted file mode 100644
index 44c84bca..00000000
--- a/locale/gl-es/do not know.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-Temo que eu non saiba isto
-Non teño esta información
diff --git a/locale/gl-es/from.day.dialog b/locale/gl-es/from.day.dialog
deleted file mode 100644
index 971c5767..00000000
--- a/locale/gl-es/from.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-Desde o {day}
diff --git a/locale/gl-es/heavy.dialog b/locale/gl-es/heavy.dialog
deleted file mode 100644
index e524be2f..00000000
--- a/locale/gl-es/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-pesado
diff --git a/locale/gl-es/light.dialog b/locale/gl-es/light.dialog
deleted file mode 100644
index 86fcb7d6..00000000
--- a/locale/gl-es/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-leve
diff --git a/locale/gl-es/on.date.dialog b/locale/gl-es/on.date.dialog
deleted file mode 100644
index c574d073..00000000
--- a/locale/gl-es/on.date.dialog
+++ /dev/null
@@ -1 +0,0 @@
-en
diff --git a/locale/gl-es/on.dialog b/locale/gl-es/on.dialog
deleted file mode 100644
index c574d073..00000000
--- a/locale/gl-es/on.dialog
+++ /dev/null
@@ -1 +0,0 @@
-en
diff --git a/locale/gl-es/simple.temperature.intent b/locale/gl-es/simple.temperature.intent
deleted file mode 100644
index 7d8f4cb4..00000000
--- a/locale/gl-es/simple.temperature.intent
+++ /dev/null
@@ -1 +0,0 @@
-temperatura
diff --git a/locale/gl-es/sky is clear.future.dialog b/locale/gl-es/sky is clear.future.dialog
deleted file mode 100644
index 969865c8..00000000
--- a/locale/gl-es/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-un ceo despexado
diff --git a/locale/gl-es/sunrise.dialog b/locale/gl-es/sunrise.dialog
deleted file mode 100644
index ad9b61ff..00000000
--- a/locale/gl-es/sunrise.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-o sol naceu ás {time} hoxe
-o nacer do sol foi ás {time} hoxe
diff --git a/locale/gl-es/sunset.dialog b/locale/gl-es/sunset.dialog
deleted file mode 100644
index cebd1363..00000000
--- a/locale/gl-es/sunset.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-o sol vai poñerse hoxe ás {time}
-o sol vai poñerse ás {time} hoxe
-o solpor será ás {time} hoxe
diff --git a/locale/gl-es/storm.dialog b/locale/gl-es/thunderstorm.dialog
similarity index 100%
rename from locale/gl-es/storm.dialog
rename to locale/gl-es/thunderstorm.dialog
diff --git a/locale/gl-es/tonight.local.weather.dialog b/locale/gl-es/tonight.local.weather.dialog
deleted file mode 100644
index b2085f81..00000000
--- a/locale/gl-es/tonight.local.weather.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Esta noite teremos {condition}, con temperaturas preto de {temp}
-Esta noite teremos {condition} e ao redor de {temp} graos
-Esta noite teremos {condition} e {temp} graos
-Cerca de {temp} graos con {condition} esta noite
diff --git a/locale/gl-es/weekly.condition.on.day.dialog b/locale/gl-es/weekly.condition.on.day.dialog
deleted file mode 100644
index 5a1d1c07..00000000
--- a/locale/gl-es/weekly.condition.on.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-o {day} será {condition},
diff --git a/locale/gl-es/weekly.conditions.mostly.one.dialog b/locale/gl-es/weekly.conditions.mostly.one.dialog
deleted file mode 100644
index 5d4c0182..00000000
--- a/locale/gl-es/weekly.conditions.mostly.one.dialog
+++ /dev/null
@@ -1 +0,0 @@
-será principalmente {condition}.
diff --git a/locale/gl-es/weekly.conditions.seq.extra.dialog b/locale/gl-es/weekly.conditions.seq.extra.dialog
deleted file mode 100644
index 7fc55f59..00000000
--- a/locale/gl-es/weekly.conditions.seq.extra.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-parece que tamén haberá
-tamén será
diff --git a/locale/gl-es/weekly.conditions.seq.period.dialog b/locale/gl-es/weekly.conditions.seq.period.dialog
deleted file mode 100644
index 667d1e84..00000000
--- a/locale/gl-es/weekly.conditions.seq.period.dialog
+++ /dev/null
@@ -1 +0,0 @@
-de {from} ata {to}
diff --git a/locale/gl-es/weekly.conditions.seq.start.dialog b/locale/gl-es/weekly.conditions.seq.start.dialog
deleted file mode 100644
index 324e1d91..00000000
--- a/locale/gl-es/weekly.conditions.seq.start.dialog
+++ /dev/null
@@ -1 +0,0 @@
-será {condition} 
diff --git a/locale/gl-es/weekly.conditions.some.days.dialog b/locale/gl-es/weekly.conditions.some.days.dialog
deleted file mode 100644
index ebf61df2..00000000
--- a/locale/gl-es/weekly.conditions.some.days.dialog
+++ /dev/null
@@ -1 +0,0 @@
-Será {condition} algúns días.
diff --git a/locale/gl-es/weekly.temp.range.dialog b/locale/gl-es/weekly.temperature.dialog
similarity index 100%
rename from locale/gl-es/weekly.temp.range.dialog
rename to locale/gl-es/weekly.temperature.dialog
diff --git a/locale/gl-es/what.is.multi.day.forecast.intent b/locale/gl-es/what.is.multi.day.forecast.intent
deleted file mode 100644
index 693ccfb9..00000000
--- a/locale/gl-es/what.is.multi.day.forecast.intent
+++ /dev/null
@@ -1,4 +0,0 @@
-o tempo (nos|para os) próximos {num} días
-como será o tempo nos próximos {num} días 
-como será o tempo nos próximos {num} días
-cal é a previsión do tempo (nos|para os) próximos {num} días
diff --git a/locale/it-it/ClearAlternatives.voc b/locale/it-it/ClearAlternatives.voc
deleted file mode 100644
index 388d88cd..00000000
--- a/locale/it-it/ClearAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternative simili a tempo sereno
-(nebbia|foschia|nuvole|nuvolo)
diff --git a/locale/it-it/CloudsAlternatives.voc b/locale/it-it/CloudsAlternatives.voc
deleted file mode 100644
index c2042ab4..00000000
--- a/locale/it-it/CloudsAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternative simili a tempo nuvoloso
-(chiaro|umido|nebbia|pioggia|pioggia leggera)
diff --git a/locale/it-it/FogAlternatives.voc b/locale/it-it/FogAlternatives.voc
deleted file mode 100644
index 0ec7481e..00000000
--- a/locale/it-it/FogAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives to foggy weather
-(sereno|nuvole|nube|parzialmente nuvoloso)
diff --git a/locale/it-it/RainAlternatives.voc b/locale/it-it/RainAlternatives.voc
deleted file mode 100644
index 059c6f98..00000000
--- a/locale/it-it/RainAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similar a pioggia
-(neve|neve leggera|nevischio|nebbia|nebbioso)
diff --git a/locale/it-it/SnowAlternatives.voc b/locale/it-it/SnowAlternatives.voc
deleted file mode 100644
index e47c6f94..00000000
--- a/locale/it-it/SnowAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Conditions similar to neve
-(pioggia|pioggia leggera)
diff --git a/locale/it-it/current.clear.alternative.local.dialog b/locale/it-it/current.clear.alternative.local.dialog
deleted file mode 100644
index aa71efc2..00000000
--- a/locale/it-it/current.clear.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, la previsione indica {condition}
-Sembra che sarà {condition}
-Probabilmente sarà {condition}
diff --git a/locale/it-it/current.clear.alternative.location.dialog b/locale/it-it/current.clear.alternative.location.dialog
deleted file mode 100644
index 708d8ccc..00000000
--- a/locale/it-it/current.clear.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, la previsione indica {condition} a {location}
-Sembra che a {location} ci sarà {condition}
-Sì, sarà {condition} a {location}
diff --git a/locale/it-it/current.clear.not.expected.location.dialog b/locale/it-it/current.clear.not.expected.location.dialog
deleted file mode 100644
index 5ee26992..00000000
--- a/locale/it-it/current.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's clear but it's not
-Mi dispiace, sembra che sarà {condition}
-Molto probabilmente il cielo non sarà sereno
diff --git a/locale/it-it/current.clouds.alternative.local.dialog b/locale/it-it/current.clouds.alternative.local.dialog
deleted file mode 100644
index d1dca18c..00000000
--- a/locale/it-it/current.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, la previsione indica {condition}
-Probabilmente non sarà nuvoloso, sembra che ci sarà {condition}
-Non sembra così, è probabile che sarà {condition}
diff --git a/locale/it-it/current.clouds.alternative.location.dialog b/locale/it-it/current.clouds.alternative.location.dialog
deleted file mode 100644
index d1dca18c..00000000
--- a/locale/it-it/current.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, la previsione indica {condition}
-Probabilmente non sarà nuvoloso, sembra che ci sarà {condition}
-Non sembra così, è probabile che sarà {condition}
diff --git a/locale/it-it/current.clouds.not.expected.location.dialog b/locale/it-it/current.clouds.not.expected.location.dialog
deleted file mode 100644
index 19000698..00000000
--- a/locale/it-it/current.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's cloudy but it's not
-Molto probabilmente non pioverà
-Oggi non sembra che sia nuvoloso
diff --git a/locale/it-it/current.fog.alternative.local.dialog b/locale/it-it/current.fog.alternative.local.dialog
deleted file mode 100644
index 6fff95a5..00000000
--- a/locale/it-it/current.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-No, la previsione indica {condition}
-# Informing that an alternative to fog will occur
-Sembra che sarà {condition}
-Probabilmente sarà {condition}
diff --git a/locale/it-it/current.fog.alternative.location.dialog b/locale/it-it/current.fog.alternative.location.dialog
deleted file mode 100644
index a70a797e..00000000
--- a/locale/it-it/current.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-No, la previsione indica {condition} a {location}
-Sembra che a {location} ci sarà {condition}
-Sì, sarà {condition} a {location}
-# Informing that an alternative to fog will occur at a location
diff --git a/locale/it-it/current.fog.not.expected.local.dialog b/locale/it-it/current.fog.not.expected.local.dialog
deleted file mode 100644
index 2fc152cc..00000000
--- a/locale/it-it/current.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-Sembra che la visibilità sarà buona
-Per oggi non è prevista alcuna nebbia
diff --git a/locale/it-it/current.fog.not.expected.location.dialog b/locale/it-it/current.fog.not.expected.location.dialog
deleted file mode 100644
index 9d80a6d5..00000000
--- a/locale/it-it/current.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-Sembra che a {location} le condizioni di visibilità saranno buone
-Oggi a {location} non si prevede nebbia
diff --git a/locale/it-it/current.rain.alternative.local.dialog b/locale/it-it/current.rain.alternative.local.dialog
deleted file mode 100644
index d0c6837a..00000000
--- a/locale/it-it/current.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-No, ma la previsione indica {condition}
-# Informa che si verificherà un'alternativa alla pioggia (come neve o nebbia)
-Non è prevista pioggia per oggi ma sembra che sarà {condition}
diff --git a/locale/it-it/current.rain.alternative.location.dialog b/locale/it-it/current.rain.alternative.location.dialog
deleted file mode 100644
index d85055c1..00000000
--- a/locale/it-it/current.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-No, la previsione a {location} indica {condition}
-# Informa che si verificherà un'alternativa alla pioggia (come neve o nebbia)
-Per oggi a {location} non è prevista pioggia, ma sembra che ci sarà {condition}
diff --git a/locale/it-it/current.rain.not.expected.local.dialog b/locale/it-it/current.rain.not.expected.local.dialog
deleted file mode 100644
index 6c3d5367..00000000
--- a/locale/it-it/current.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Non c'è previsione di pioggia
-Non c'è bisogno dell'ombrello
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-Molto probabilmente non pioverà
diff --git a/locale/it-it/current.rain.not.expected.location.dialog b/locale/it-it/current.rain.not.expected.location.dialog
deleted file mode 100644
index 47760995..00000000
--- a/locale/it-it/current.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Non c'è bisogno di ombrelli a {location}
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-A {location} non si prevede pioggia
-A {location} probabilmente non pioverà
diff --git a/locale/it-it/current.snow.alternative.local.dialog b/locale/it-it/current.snow.alternative.local.dialog
deleted file mode 100644
index 1ee8df70..00000000
--- a/locale/it-it/current.snow.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-No, ma la previsione indica {condition}
-# Informing that an alternative to snowing will occur
-Non è prevista neve per oggi, ma è probabile che sarà {condition}
diff --git a/locale/it-it/current.snow.alternative.location.dialog b/locale/it-it/current.snow.alternative.location.dialog
deleted file mode 100644
index 8fea273f..00000000
--- a/locale/it-it/current.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-No, la previsione a {location} indica {condition}
-# Informing that an alternative to snowing will occur
-A {location} per oggi non è prevista neve, ma è probabile che sarà {condition}
diff --git a/locale/it-it/current.snow.not.expected.local.dialog b/locale/it-it/current.snow.not.expected.local.dialog
deleted file mode 100644
index a62eaceb..00000000
--- a/locale/it-it/current.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se nevica ma non viene proiettata neve o alternativa
-Non c'è previsione di neve
-Non nevicherà
diff --git a/locale/it-it/current.snow.not.expected.location.dialog b/locale/it-it/current.snow.not.expected.location.dialog
deleted file mode 100644
index eab8347e..00000000
--- a/locale/it-it/current.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se nevica ma non viene proiettata neve o alternativa
-A {location} non pioverà
-A {location} non si prevede neve
diff --git a/locale/it-it/daily.clear.alternative.local.dialog b/locale/it-it/daily.clear.alternative.local.dialog
deleted file mode 100644
index 2bd64a46..00000000
--- a/locale/it-it/daily.clear.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-No, ma la previsione indica {condition}
-Per {day} non è prevista pioggia, ma sembra che ci sarà {condition}
diff --git a/locale/it-it/daily.clear.alternative.location.dialog b/locale/it-it/daily.clear.alternative.location.dialog
deleted file mode 100644
index 4e432239..00000000
--- a/locale/it-it/daily.clear.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-No, la previsione a {location} indica {condition}
-Per {day} non è prevista pioggia a {location}, ma sembra che ci sarà {condition}
diff --git a/locale/it-it/daily.clear.not.expected.local.dialog b/locale/it-it/daily.clear.not.expected.local.dialog
deleted file mode 100644
index 0b7caaef..00000000
--- a/locale/it-it/daily.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-Somo spiacente, la previsione non prevede condizioni serene
-{day}, molto probabilmente il cielo non sarà sereno
diff --git a/locale/it-it/daily.clear.not.expected.location.dialog b/locale/it-it/daily.clear.not.expected.location.dialog
deleted file mode 100644
index b61c7164..00000000
--- a/locale/it-it/daily.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-Sono spiacente, a {location} non si prevede tempo sereno
-{day}, a {location} molto probabilmente il cielo non sarà sereno
diff --git a/locale/it-it/daily.clouds.alternative.local.dialog b/locale/it-it/daily.clouds.alternative.local.dialog
deleted file mode 100644
index d1dca18c..00000000
--- a/locale/it-it/daily.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, la previsione indica {condition}
-Probabilmente non sarà nuvoloso, sembra che ci sarà {condition}
-Non sembra così, è probabile che sarà {condition}
diff --git a/locale/it-it/daily.clouds.alternative.location.dialog b/locale/it-it/daily.clouds.alternative.location.dialog
deleted file mode 100644
index 52a3c7d3..00000000
--- a/locale/it-it/daily.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-No, la previsione indica {condition} a {location}
-Probabilmente non sarà nuvoloso a {location}, sembra che ci sarà {condition}
-Non sembra così, è probabile a {location} avremo {condition}
diff --git a/locale/it-it/daily.clouds.not.expected.local.dialog b/locale/it-it/daily.clouds.not.expected.local.dialog
deleted file mode 100644
index 0d34307b..00000000
--- a/locale/it-it/daily.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's cloudy but it's not
-Non sembra che sarà nuvoloso
-Le previsioni dicono che il cielo sarà sereno
-Aspettati un cielo sereno
-Molto probabilmente non pioverà
diff --git a/locale/it-it/daily.clouds.not.expected.location.dialog b/locale/it-it/daily.clouds.not.expected.location.dialog
deleted file mode 100644
index a47d6111..00000000
--- a/locale/it-it/daily.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's cloudy but it's not
-A {location} non sembra che sarà nuvoloso.
-A {location} il meteo dice che il cielo sarà sereno
-A {location} aspettati un cielo sereno
-A {location} probabilmente non sarà nuvoloso
diff --git a/locale/it-it/daily.fog.alternative.local.dialog b/locale/it-it/daily.fog.alternative.local.dialog
deleted file mode 100644
index 6fff95a5..00000000
--- a/locale/it-it/daily.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-No, la previsione indica {condition}
-# Informing that an alternative to fog will occur
-Sembra che sarà {condition}
-Probabilmente sarà {condition}
diff --git a/locale/it-it/daily.fog.alternative.location.dialog b/locale/it-it/daily.fog.alternative.location.dialog
deleted file mode 100644
index 887a9ad1..00000000
--- a/locale/it-it/daily.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Sembra che a {location} ci sarà {condition}
-Sì, sarà {condition} a {location}
-# Informing that an alternative to fog will occur
-No, a {location} si prevede {condition}
diff --git a/locale/it-it/daily.fog.not.expected.local.dialog b/locale/it-it/daily.fog.not.expected.local.dialog
deleted file mode 100644
index 1475bdd4..00000000
--- a/locale/it-it/daily.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-{day} le condizioni di visibilità dovrebbero essere buone
-Per {day} non è prevista alcuna nebbia
diff --git a/locale/it-it/daily.fog.not.expected.location.dialog b/locale/it-it/daily.fog.not.expected.location.dialog
deleted file mode 100644
index d7f0e30e..00000000
--- a/locale/it-it/daily.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-{day} a {location} le condizioni di visibilità dovrebbero essere buone
-A {location}, {day} non è prevista nebbia
diff --git a/locale/it-it/daily.rain.alternative.local.dialog b/locale/it-it/daily.rain.alternative.local.dialog
deleted file mode 100644
index 2bd64a46..00000000
--- a/locale/it-it/daily.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-No, ma la previsione indica {condition}
-Per {day} non è prevista pioggia, ma sembra che ci sarà {condition}
diff --git a/locale/it-it/daily.rain.alternative.location.dialog b/locale/it-it/daily.rain.alternative.location.dialog
deleted file mode 100644
index 4e432239..00000000
--- a/locale/it-it/daily.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-No, la previsione a {location} indica {condition}
-Per {day} non è prevista pioggia a {location}, ma sembra che ci sarà {condition}
diff --git a/locale/it-it/daily.rain.not.expected.local.dialog b/locale/it-it/daily.rain.not.expected.local.dialog
deleted file mode 100644
index 7717cb5b..00000000
--- a/locale/it-it/daily.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-Non c'è previsione di pioggia
-{day}, molto probabilmente non pioverà
-Non c'è bisogno dell'ombrello
diff --git a/locale/it-it/daily.rain.not.expected.location.dialog b/locale/it-it/daily.rain.not.expected.location.dialog
deleted file mode 100644
index 07b71321..00000000
--- a/locale/it-it/daily.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando l'utente chiede se piove ma non viene proiettata neve o alternativa
-A {location}, {day} non è prevista pioggia
-A {location}, molto probabilmente {day} non pioverà
-Non c'è bisogno di ombrelli a {location}
diff --git a/locale/it-it/daily.snow.alternative.location.dialog b/locale/it-it/daily.snow.alternative.location.dialog
deleted file mode 100644
index a5b15b43..00000000
--- a/locale/it-it/daily.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-No, ma la previsione indica {condition}
-# Informing that an alternative to snowing will occur
-Non è prevista neve per {day}, ma è probabile che sarà {condition}
diff --git a/locale/it-it/daily.snow.not.expected.local.dialog b/locale/it-it/daily.snow.not.expected.local.dialog
deleted file mode 100644
index a62eaceb..00000000
--- a/locale/it-it/daily.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se nevica ma non viene proiettata neve o alternativa
-Non c'è previsione di neve
-Non nevicherà
diff --git a/locale/it-it/daily.snow.not.expected.location.dialog b/locale/it-it/daily.snow.not.expected.location.dialog
deleted file mode 100644
index 457e7606..00000000
--- a/locale/it-it/daily.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando l'utente chiede se nevica ma non viene proiettata neve o alternativa
-A {location} per {day} non è prevista neve
-A {location} non pioverà
diff --git a/locale/it-it/do not know.dialog b/locale/it-it/do not know.dialog
deleted file mode 100644
index f07fc380..00000000
--- a/locale/it-it/do not know.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-Purtroppo non lo so
-Non ho questa informazione
diff --git a/locale/it-it/heavy.dialog b/locale/it-it/heavy.dialog
deleted file mode 100644
index 5c0ee68c..00000000
--- a/locale/it-it/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-pesante
diff --git a/locale/it-it/light.dialog b/locale/it-it/light.dialog
deleted file mode 100644
index d52ad3d6..00000000
--- a/locale/it-it/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-luminoso
diff --git a/locale/it-it/simple.temperature.intent b/locale/it-it/simple.temperature.intent
deleted file mode 100644
index 7d8f4cb4..00000000
--- a/locale/it-it/simple.temperature.intent
+++ /dev/null
@@ -1 +0,0 @@
-temperatura
diff --git a/locale/it-it/sky is clear.future.dialog b/locale/it-it/sky is clear.future.dialog
deleted file mode 100644
index b719f7bd..00000000
--- a/locale/it-it/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-chiaro
diff --git a/locale/it-it/what.is.multi.day.forecast.intent b/locale/it-it/what.is.multi.day.forecast.intent
deleted file mode 100644
index 32f21341..00000000
--- a/locale/it-it/what.is.multi.day.forecast.intent
+++ /dev/null
@@ -1,2 +0,0 @@
-come sarà il tempo (per i|nei) prossimi {num} giorni?
-previsioni (per i|nei) prossimi {num} giorni?
diff --git a/locale/nl-nl/do not know.dialog b/locale/nl-nl/do not know.dialog
deleted file mode 100644
index 0b4a6501..00000000
--- a/locale/nl-nl/do not know.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-Ik ben bang dat ik dat niet weet
-Die informatie heb ik niet
diff --git a/locale/nl-nl/heavy.dialog b/locale/nl-nl/heavy.dialog
deleted file mode 100644
index 2522541d..00000000
--- a/locale/nl-nl/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-zware
diff --git a/locale/nl-nl/light.dialog b/locale/nl-nl/light.dialog
deleted file mode 100644
index 554fef73..00000000
--- a/locale/nl-nl/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-lichte
diff --git a/locale/nl-nl/sky is clear.future.dialog b/locale/nl-nl/sky is clear.future.dialog
deleted file mode 100644
index baf7e603..00000000
--- a/locale/nl-nl/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-helder
diff --git a/locale/pt-br/ClearAlternatives.voc b/locale/pt-br/ClearAlternatives.voc
deleted file mode 100644
index b104b96c..00000000
--- a/locale/pt-br/ClearAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas similares a tempo firme
-(nebuloso|nevoeiro|névoa|nuvens|nuvem)
diff --git a/locale/pt-br/CloudsAlternatives.voc b/locale/pt-br/CloudsAlternatives.voc
deleted file mode 100644
index 365e01e7..00000000
--- a/locale/pt-br/CloudsAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas semelhantes ao tempo nublado
-(claro|neblina|nevoeiro|chuva|chuva fraca)
diff --git a/locale/pt-br/FogAlternatives.voc b/locale/pt-br/FogAlternatives.voc
deleted file mode 100644
index a05fa844..00000000
--- a/locale/pt-br/FogAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas para o tempo nublado
-(limpo|nuvens|nublado|parcialmente nublado)
diff --git a/locale/pt-br/RainAlternatives.voc b/locale/pt-br/RainAlternatives.voc
deleted file mode 100644
index c459c30e..00000000
--- a/locale/pt-br/RainAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas similares à chuva
-(neve|neve leve|granizo|névoa|neblina)
diff --git a/locale/pt-br/SnowAlternatives.voc b/locale/pt-br/SnowAlternatives.voc
deleted file mode 100644
index 04d320f5..00000000
--- a/locale/pt-br/SnowAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Condições similares à neve
-(chuva|chuva leve)
diff --git a/locale/pt-br/ThunderstormAlternatives.voc b/locale/pt-br/ThunderstormAlternatives.voc
deleted file mode 100644
index d796b6cb..00000000
--- a/locale/pt-br/ThunderstormAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativas semelhantes ao tempo tempestuoso
-(chuvisco|chuva|chuva fraca|neve|neve fraca|granizo|nevoeiro|névoa|névoa|nuvens|nuvem|parcialmente nublado)
diff --git a/locale/pt-br/and.dialog b/locale/pt-br/and.dialog
new file mode 100644
index 00000000..b18c97b5
--- /dev/null
+++ b/locale/pt-br/and.dialog
@@ -0,0 +1 @@
+, e
diff --git a/locale/pt-br/clear.future.dialog b/locale/pt-br/clear.future.dialog
deleted file mode 100644
index b657c448..00000000
--- a/locale/pt-br/clear.future.dialog
+++ /dev/null
@@ -1 +0,0 @@
-um céu limpo
diff --git a/locale/pt-br/condition.category.value b/locale/pt-br/condition.category.value
deleted file mode 100644
index 3db11587..00000000
--- a/locale/pt-br/condition.category.value
+++ /dev/null
@@ -1,15 +0,0 @@
-nuvens,nublado
-limpo,um céu limpo
-Tempestades com trovões, tempestades
-Chuviscos, chuviscando
-chuva|chovendo
-neve|nevando
-Névoa, enevoado
-Fumaça, fumacento
-neblina,nublado
-Poeira, empoeirado
-Nevoeiro, nevoento
-Areia, poeirento
-Cinza, nublado com possível cinza vulcânica
-Borrasca, tempestuoso
-Tornado, tempestuoso com possibilidade de tornado
diff --git a/locale/pt-br/current.clear.alternative.local.dialog b/locale/pt-br/current.clear.alternative.local.dialog
deleted file mode 100644
index e1a226d0..00000000
--- a/locale/pt-br/current.clear.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que uma alternativa para limpar o tempo vai ocorrer
-Não, a previsão indica {condition} hoje
-Parece que haverá {condition} hoje
-As chances são que fará {condition} hoje
diff --git a/locale/pt-br/current.clear.alternative.location.dialog b/locale/pt-br/current.clear.alternative.location.dialog
deleted file mode 100644
index 6b61e56c..00000000
--- a/locale/pt-br/current.clear.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que uma alternativa para limpar o tempo vai ocorrer
-Não, a previsão indica {condition} em {location}
-Parece que haverá {condition} em {location}
-As chances são que vai estar {condition} em {location}
diff --git a/locale/pt-br/current.clear.not.expected.location.dialog b/locale/pt-br/current.clear.not.expected.location.dialog
deleted file mode 100644
index 3a450cbc..00000000
--- a/locale/pt-br/current.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta o tempo está claro, mas não está
-Desculpe, parece que vai ocorrer {condition}
-Não é provável que faça tempo bom
diff --git a/locale/pt-br/current.clouds.alternative.local.dialog b/locale/pt-br/current.clouds.alternative.local.dialog
deleted file mode 100644
index d6ed0986..00000000
--- a/locale/pt-br/current.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Não, a previsão indica {condition} hoje
-# Informando que uma alternativa para tempo nublado vai ocorrer
-Provavelmente não será nublado, parece que será {condition} hoje
-Não parece assim, as chances são de que esteja {condition} hoje
diff --git a/locale/pt-br/current.clouds.alternative.location.dialog b/locale/pt-br/current.clouds.alternative.location.dialog
deleted file mode 100644
index 9031cc47..00000000
--- a/locale/pt-br/current.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que uma alternativa para limpar o tempo vai ocorrer
-Não, a previsão indica {condition}
-Provavelmente não estará nublado, parece que estará {condition}
-Parece que não, as chances são de que esteja {condition}
diff --git a/locale/pt-br/current.clouds.not.expected.local.dialog b/locale/pt-br/current.clouds.not.expected.local.dialog
deleted file mode 100644
index a4f139a0..00000000
--- a/locale/pt-br/current.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está chovendo mas não há previsão de nuvens ou alternativa
-Não há previsão de nuvens para hoje
-Não deve estar nublado hoje
diff --git a/locale/pt-br/current.clouds.not.expected.location.dialog b/locale/pt-br/current.clouds.not.expected.location.dialog
deleted file mode 100644
index c6561514..00000000
--- a/locale/pt-br/current.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nublado mas não está
-Não parece estar nublado hoje
-Não deve estar nublado
diff --git a/locale/pt-br/current.fog.alternative.local.dialog b/locale/pt-br/current.fog.alternative.local.dialog
deleted file mode 100644
index 620d0c19..00000000
--- a/locale/pt-br/current.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que uma alternativa ao nevoeiro vai ocorrer
-Não, a previsão indica {condition} hoje
-Parece que haverá {condition} hoje
-As chances são que fará {condition} hoje
diff --git a/locale/pt-br/current.fog.alternative.location.dialog b/locale/pt-br/current.fog.alternative.location.dialog
deleted file mode 100644
index b6078143..00000000
--- a/locale/pt-br/current.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Não, a previsão indica {condition} em {location}
-As chances são que vai estar {condition} em {location}
-# Informando que uma alternativa ao nevoeiro ocorrerá em um local
-Parece que haverá {condition} em {location}
diff --git a/locale/pt-br/current.fog.not.expected.local.dialog b/locale/pt-br/current.fog.not.expected.local.dialog
deleted file mode 100644
index aceb1200..00000000
--- a/locale/pt-br/current.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nublado mas nenhuma neve ou alternativa é feita como previsão
-Parece que a visibilidade será boa hoje
-Não há previsão de nevoeiro para hoje
diff --git a/locale/pt-br/current.fog.not.expected.location.dialog b/locale/pt-br/current.fog.not.expected.location.dialog
deleted file mode 100644
index be956b4f..00000000
--- a/locale/pt-br/current.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nublado mas nenhuma neve ou alternativa é feita como previsão
-Parece que a visibilidade será boa em {location}
-Nenhum nevoeiro está previsto para {location} hoje
diff --git a/locale/pt-br/current.rain.alternative.local.dialog b/locale/pt-br/current.rain.alternative.local.dialog
deleted file mode 100644
index bf20e061..00000000
--- a/locale/pt-br/current.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa para chuva vai acontecer (como neve ou nevoeiro)
-Não, mas a previsão indica {condition} hoje
-Não há previsão de chuva para hoje, mas parece que haverá {condition}
diff --git a/locale/pt-br/current.rain.alternative.location.dialog b/locale/pt-br/current.rain.alternative.location.dialog
deleted file mode 100644
index f1c54f8f..00000000
--- a/locale/pt-br/current.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa para chuva vai acontecer (como neve ou nevoeiro)
-Não, mas a previsão indica {condition} em {location}
-Não há previsão de chuva para hoje em {location}, mas parece que haverá {condition}
diff --git a/locale/pt-br/current.rain.not.expected.local.dialog b/locale/pt-br/current.rain.not.expected.local.dialog
deleted file mode 100644
index 5c6175d6..00000000
--- a/locale/pt-br/current.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando o usuário pergunta se está chovendo mas nenhuma chuva ou alternativa é prevista
-Nenhuma chuva está prevista para hoje
-Não deve chover hoje
-Não há necessidade de um guarda-chuva para hoje
diff --git a/locale/pt-br/current.rain.not.expected.location.dialog b/locale/pt-br/current.rain.not.expected.location.dialog
deleted file mode 100644
index 6d49f704..00000000
--- a/locale/pt-br/current.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando o usuário pergunta se está chovendo mas nenhuma chuva ou alternativa é prevista
-Nenhuma chuva está prevista para {location}
-Não deve estar chovendo em {location}
-Não há necessidade para guarda-chuva em {location}
diff --git a/locale/pt-br/current.snow.alternative.local.dialog b/locale/pt-br/current.snow.alternative.local.dialog
deleted file mode 100644
index eb7f78ee..00000000
--- a/locale/pt-br/current.snow.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa para neve vai ocorrer
-Não, mas a previsão indica {condition} hoje
-Não há previsão de neve para hoje, mas as chances são de {condition}
diff --git a/locale/pt-br/current.snow.alternative.location.dialog b/locale/pt-br/current.snow.alternative.location.dialog
deleted file mode 100644
index ee03d763..00000000
--- a/locale/pt-br/current.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa para neve vai ocorrer
-Não, mas a previsão indica {condition} em {location}
-Não há previsão de neve para hoje, mas as chances são de que haja {condition} em {location}
diff --git a/locale/pt-br/current.snow.not.expected.local.dialog b/locale/pt-br/current.snow.not.expected.local.dialog
deleted file mode 100644
index d7733ed1..00000000
--- a/locale/pt-br/current.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nevando mas nenhuma neve ou alternativa é prevista
-Nenhuma neve é prevista para hoje
-Não deve nevar hoje
diff --git a/locale/pt-br/current.snow.not.expected.location.dialog b/locale/pt-br/current.snow.not.expected.location.dialog
deleted file mode 100644
index e8d651b8..00000000
--- a/locale/pt-br/current.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nevando mas nenhuma neve ou alternativa é prevista
-Nenhuma neve está prevista para {location}
-Não vai nevar em {location}
diff --git a/locale/pt-br/current.thunderstorm.alternative.local.dialog b/locale/pt-br/current.thunderstorm.alternative.local.dialog
deleted file mode 100644
index b4f3015b..00000000
--- a/locale/pt-br/current.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Não, mas a previsão indica {condition} hoje
-# Informando que uma alternativa para tempestade vai acontecer (como neve ou nevoeiro)
-Não há previsão de tempestades para hoje, mas parece que haverá {condition}
diff --git a/locale/pt-br/current.thunderstorm.alternative.location.dialog b/locale/pt-br/current.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 92e1ed4a..00000000
--- a/locale/pt-br/current.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Não, mas a previsão indica {condition} em {location}
-# Informando que uma alternativa para chuva forte vai acontecer (como neve ou nevoeiro)
-Não há previsão de chuva forte para hoje em {location}, mas parece que haverá {condition}
diff --git a/locale/pt-br/current.thunderstorm.not.expected.local.dialog b/locale/pt-br/current.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 51920acc..00000000
--- a/locale/pt-br/current.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-# Quando o usuário pergunta se está chovendo mas nenhuma chuva ou alternativa é prevista
-Nenhuma neve é prevista para hoje
-Não deve haver tempestade hoje
-Não deve haver nenhuma tempestade hoje 
-Hoje não é provável que haja trovoadas
-Tempestades não são prováveis para hoje
diff --git a/locale/pt-br/current.thunderstorm.not.expected.location.dialog b/locale/pt-br/current.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index de22a04a..00000000
--- a/locale/pt-br/current.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando o usuário pergunta se está chovendo forte mas nenhuma chuva forte ou alternativa é prevista
-Nenhuma tempestade está prevista para {location}
-Não vai haver tempestades em {location}
-Não vai haver tempestades em {location}
diff --git a/locale/pt-br/daily.clear.alternative.local.dialog b/locale/pt-br/daily.clear.alternative.local.dialog
deleted file mode 100644
index 75e3067d..00000000
--- a/locale/pt-br/daily.clear.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa para limpar o tempo vai ocorrer
-Não, a previsão para {day} indica {condition}
-{day}, parece que haverá {condition}
diff --git a/locale/pt-br/daily.clear.alternative.location.dialog b/locale/pt-br/daily.clear.alternative.location.dialog
deleted file mode 100644
index b6d463aa..00000000
--- a/locale/pt-br/daily.clear.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa à chuva ocorrerá
-Não, mas a previsão indica {condition} em {location} {day}
-No {day}, não há previsão de chuva para {location}, mas parece que haverá {condition}
diff --git a/locale/pt-br/daily.clear.not.expected.local.dialog b/locale/pt-br/daily.clear.not.expected.local.dialog
deleted file mode 100644
index 750c6ab5..00000000
--- a/locale/pt-br/daily.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se o céu está claro mas uma previsão alternativa é feita
-Desculpe, a previsão não prevê condições de céu claro {day}
-{day}, não é provável que o tempo esteja bom.
diff --git a/locale/pt-br/daily.clear.not.expected.location.dialog b/locale/pt-br/daily.clear.not.expected.location.dialog
deleted file mode 100644
index a1cd6478..00000000
--- a/locale/pt-br/daily.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se o céu está claro mas uma previsão alternativa é feita
-Desculpe, a previsão não indica condições de céu claro para {location}{day}
-{day}, é provável que o tempo não esteja bom em {location}
diff --git a/locale/pt-br/daily.clouds.alternative.local.dialog b/locale/pt-br/daily.clouds.alternative.local.dialog
deleted file mode 100644
index 99641ed7..00000000
--- a/locale/pt-br/daily.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que uma alternativa para limpar o tempo vai ocorrer
-Não, a previsão para {day} indica {condition}
-Provavelmente não estará nublado, parece que {day} estará {condition}
-Parece que não, as chances são de que {day} esteja {condition}
diff --git a/locale/pt-br/daily.clouds.alternative.location.dialog b/locale/pt-br/daily.clouds.alternative.location.dialog
deleted file mode 100644
index 501c0696..00000000
--- a/locale/pt-br/daily.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que uma alternativa para limpar o tempo vai ocorrer
-# Não, a previsão indica {condition} em {location} {day}
-# Provavelmente não estará nublado {day} em {location}, parece que estará {condition}
-Parece que não, as chances são de que em {location} haverá {condition} {day}
diff --git a/locale/pt-br/daily.clouds.not.expected.local.dialog b/locale/pt-br/daily.clouds.not.expected.local.dialog
deleted file mode 100644
index dfb3ef1c..00000000
--- a/locale/pt-br/daily.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Quando o usuário pergunta se está nublado mas não está
-Não parece provável que vá estar nublado {day}
-Está previsto céu claro {day}
-É esperado céu claro {day}
-Não deve estar nublado {day}
diff --git a/locale/pt-br/daily.clouds.not.expected.location.dialog b/locale/pt-br/daily.clouds.not.expected.location.dialog
deleted file mode 100644
index 5e289e8b..00000000
--- a/locale/pt-br/daily.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# Quando o usuário pergunta se está nublado mas não está
-Não parece provável que vá estar nublado em {location}{day}
-Céu claro está previsto em {location} {day}
-É esperado céu claro em {location} {day}
-Não vai nevar em {location} {day}
diff --git a/locale/pt-br/daily.fog.alternative.local.dialog b/locale/pt-br/daily.fog.alternative.local.dialog
deleted file mode 100644
index 0bb4abe6..00000000
--- a/locale/pt-br/daily.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que uma alternativa ao nevoeiro vai ocorrer
-Não, a previsão para {day} indica {condition}
-Parece que {day} teremos {condition}
-Chances são de que fará {condition} {day}
diff --git a/locale/pt-br/daily.fog.alternative.location.dialog b/locale/pt-br/daily.fog.alternative.location.dialog
deleted file mode 100644
index ffc2cd26..00000000
--- a/locale/pt-br/daily.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informando que uma alternativa ao nevoeiro vai ocorrer
-Não, a previsão para {location} {day} é de {condition}
-Parece que haverá {condition} em {location} {day}
-Chances são de que vai estar {condition} em {location} {day}
diff --git a/locale/pt-br/daily.fog.not.expected.local.dialog b/locale/pt-br/daily.fog.not.expected.local.dialog
deleted file mode 100644
index 9d6163f1..00000000
--- a/locale/pt-br/daily.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nublado mas nenhuma neve ou alternativa é feita como previsão
-{day} a visibilidade deve estar boa 
-Nenhum nevoeiro está previsto para {day}
diff --git a/locale/pt-br/daily.fog.not.expected.location.dialog b/locale/pt-br/daily.fog.not.expected.location.dialog
deleted file mode 100644
index 52508cf0..00000000
--- a/locale/pt-br/daily.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nublado mas nenhuma neve ou alternativa é feita como previsão
-{day} a visibilidade deve estar boa em {location}
-Nenhum nevoeiro está previsto para {day} em {location}
diff --git a/locale/pt-br/daily.rain.alternative.local.dialog b/locale/pt-br/daily.rain.alternative.local.dialog
deleted file mode 100644
index 6ff6a55c..00000000
--- a/locale/pt-br/daily.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa à chuva ocorrerá
-Não, mas a previsão indica {condition} {day}
-{day}, não há previsão de chuva, mas parece que haverá {condition}
diff --git a/locale/pt-br/daily.rain.alternative.location.dialog b/locale/pt-br/daily.rain.alternative.location.dialog
deleted file mode 100644
index b2ce3400..00000000
--- a/locale/pt-br/daily.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa à chuva ocorrerá
-Não, mas a previsão indica {condition} em {location} {day}
-{day}, não há previsão de chuva para {location}, mas parece que haverá {condition}
diff --git a/locale/pt-br/daily.rain.not.expected.local.dialog b/locale/pt-br/daily.rain.not.expected.local.dialog
deleted file mode 100644
index 22b17dca..00000000
--- a/locale/pt-br/daily.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando o usuário pergunta se está chovendo mas nenhuma chuva ou alternativa é prevista
-Nenhuma chuva está prevista {day}
-Não deve chover {day}
-Você não vai precisar de um guarda-chuva {day}
diff --git a/locale/pt-br/daily.rain.not.expected.location.dialog b/locale/pt-br/daily.rain.not.expected.location.dialog
deleted file mode 100644
index 8b6db478..00000000
--- a/locale/pt-br/daily.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando o usuário pergunta se está chovendo mas nenhuma chuva ou alternativa é prevista
-Nenhuma chuva está prevista para {location} {day}
-{day}, não vai nevar em {location}
-Não há necessidade para guarda-chuva em {location} {day}
diff --git a/locale/pt-br/daily.snow.alternative.location.dialog b/locale/pt-br/daily.snow.alternative.location.dialog
deleted file mode 100644
index 0de48735..00000000
--- a/locale/pt-br/daily.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa para neve vai ocorrer
-Não, mas a previsão indica {condition} {day}
-{day} não há previsão de neve mas as chances são que irá {condition}
diff --git a/locale/pt-br/daily.snow.not.expected.local.dialog b/locale/pt-br/daily.snow.not.expected.local.dialog
deleted file mode 100644
index f54836af..00000000
--- a/locale/pt-br/daily.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nevando mas nenhuma neve ou alternativa é prevista
-Nenhuma neve é prevista {day}
-Não vai nevar {day}
diff --git a/locale/pt-br/daily.snow.not.expected.location.dialog b/locale/pt-br/daily.snow.not.expected.location.dialog
deleted file mode 100644
index c65e5198..00000000
--- a/locale/pt-br/daily.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Quando o usuário pergunta se está nevando mas nenhuma neve ou alternativa é prevista
-Nenhuma neve está prevista em {location} para {day}
-Não deve nevar em {location} {day}
diff --git a/locale/pt-br/daily.thunderstorm.alternative.local.dialog b/locale/pt-br/daily.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 61c90260..00000000
--- a/locale/pt-br/daily.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informando que uma alternativa à chuva ocorrerá
-Não, mas a previsão indica {condition} {day}
-{day}, não há previsão de tempestade, mas parece que haverá {condition}
diff --git a/locale/pt-br/daily.thunderstorm.alternative.location.dialog b/locale/pt-br/daily.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 54285ec9..00000000
--- a/locale/pt-br/daily.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Não, mas a previsão indica {condition} em {location} {day}
-# Informando que uma alternativa a tempestade vai ocorrer
-{day}, não há previsão de chuva para {location}, mas parece que haverá {condition}
diff --git a/locale/pt-br/daily.thunderstorm.not.expected.local.dialog b/locale/pt-br/daily.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 35206051..00000000
--- a/locale/pt-br/daily.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando o usuário pergunta se está chovendo mas nenhuma chuva ou alternativa é prevista
-Nenhuma neve é prevista {day}
-{day}, não deve ter tempestade
-Não deve ter tempestade {day}
diff --git a/locale/pt-br/daily.thunderstorm.not.expected.location.dialog b/locale/pt-br/daily.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index 43dd8421..00000000
--- a/locale/pt-br/daily.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Quando o usuário pergunta se está chovendo mas nenhuma chuva ou alternativa é prevista
-Nenhum nevoeiro está previsto para {location} {day}
-{day}, Não deve nevar em {location}
-Não deve ter trovoadas {day} em {location}
diff --git a/locale/pt-br/do not know.dialog b/locale/pt-br/do not know.dialog
deleted file mode 100644
index 29401b1a..00000000
--- a/locale/pt-br/do not know.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-Eu receio que eu não saiba isso
-Eu não tenho essa informação
diff --git a/locale/pt-br/from.day.dialog b/locale/pt-br/from.day.dialog
deleted file mode 100644
index ac74c195..00000000
--- a/locale/pt-br/from.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-desde {day}
diff --git a/locale/pt-br/heavy.dialog b/locale/pt-br/heavy.dialog
deleted file mode 100644
index e524be2f..00000000
--- a/locale/pt-br/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-pesado
diff --git a/locale/pt-br/light.dialog b/locale/pt-br/light.dialog
deleted file mode 100644
index 86fcb7d6..00000000
--- a/locale/pt-br/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-leve
diff --git a/locale/pt-br/on.date.dialog b/locale/pt-br/on.date.dialog
deleted file mode 100644
index 6fc4557f..00000000
--- a/locale/pt-br/on.date.dialog
+++ /dev/null
@@ -1 +0,0 @@
-em
diff --git a/locale/pt-br/on.dialog b/locale/pt-br/on.dialog
deleted file mode 100644
index 6fc4557f..00000000
--- a/locale/pt-br/on.dialog
+++ /dev/null
@@ -1 +0,0 @@
-em
diff --git a/locale/pt-br/simple.temperature.intent b/locale/pt-br/simple.temperature.intent
deleted file mode 100644
index 7d8f4cb4..00000000
--- a/locale/pt-br/simple.temperature.intent
+++ /dev/null
@@ -1 +0,0 @@
-temperatura
diff --git a/locale/pt-br/sky is clear.future.dialog b/locale/pt-br/sky is clear.future.dialog
deleted file mode 100644
index b657c448..00000000
--- a/locale/pt-br/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-um céu limpo
diff --git a/locale/pt-br/sunrise.dialog b/locale/pt-br/sunrise.dialog
deleted file mode 100644
index 2e1f57a3..00000000
--- a/locale/pt-br/sunrise.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-o sol nasceu às {time} hoje
-o nascer do sol foi às {time} hoje
diff --git a/locale/pt-br/sunset.dialog b/locale/pt-br/sunset.dialog
deleted file mode 100644
index 74759a30..00000000
--- a/locale/pt-br/sunset.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-o sol vai se pôr hoje às {time}
-o sol vai se pôr às {time} hoje
-o pôr do sol será às {time} hoje
diff --git a/locale/pt-br/storm.dialog b/locale/pt-br/thunderstorm.dialog
similarity index 100%
rename from locale/pt-br/storm.dialog
rename to locale/pt-br/thunderstorm.dialog
diff --git a/locale/pt-br/weekly.condition.on.day.dialog b/locale/pt-br/weekly.condition.on.day.dialog
deleted file mode 100644
index 8e2f79c7..00000000
--- a/locale/pt-br/weekly.condition.on.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-{day} será {condition},
diff --git a/locale/pt-br/weekly.conditions.mostly.one.dialog b/locale/pt-br/weekly.conditions.mostly.one.dialog
deleted file mode 100644
index 5d4c0182..00000000
--- a/locale/pt-br/weekly.conditions.mostly.one.dialog
+++ /dev/null
@@ -1 +0,0 @@
-será principalmente {condition}.
diff --git a/locale/pt-br/weekly.conditions.seq.extra.dialog b/locale/pt-br/weekly.conditions.seq.extra.dialog
deleted file mode 100644
index be418116..00000000
--- a/locale/pt-br/weekly.conditions.seq.extra.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-parece que também haverá
-também será
diff --git a/locale/pt-br/weekly.conditions.seq.period.dialog b/locale/pt-br/weekly.conditions.seq.period.dialog
deleted file mode 100644
index ea20c7e1..00000000
--- a/locale/pt-br/weekly.conditions.seq.period.dialog
+++ /dev/null
@@ -1 +0,0 @@
-de {from} até {to}
diff --git a/locale/pt-br/weekly.conditions.seq.start.dialog b/locale/pt-br/weekly.conditions.seq.start.dialog
deleted file mode 100644
index ab7de457..00000000
--- a/locale/pt-br/weekly.conditions.seq.start.dialog
+++ /dev/null
@@ -1 +0,0 @@
-irá {condition}
diff --git a/locale/pt-br/weekly.conditions.some.days.dialog b/locale/pt-br/weekly.conditions.some.days.dialog
deleted file mode 100644
index f5140076..00000000
--- a/locale/pt-br/weekly.conditions.some.days.dialog
+++ /dev/null
@@ -1 +0,0 @@
-Será {condition} alguns dias.
diff --git a/locale/pt-br/weekly.temp.range.dialog b/locale/pt-br/weekly.temperature.dialog
similarity index 100%
rename from locale/pt-br/weekly.temp.range.dialog
rename to locale/pt-br/weekly.temperature.dialog
diff --git a/locale/pt-br/what.is.multi.day.forecast.intent b/locale/pt-br/what.is.multi.day.forecast.intent
deleted file mode 100644
index f6634d4b..00000000
--- a/locale/pt-br/what.is.multi.day.forecast.intent
+++ /dev/null
@@ -1,4 +0,0 @@
-tempo (nos|para os) próximos {num} dias
-como será o tempo nos próximos {num} dias 
-como será o tempo nos próximos {num} dias
-qual é a previsão do tempo (nos|para os) próximos {num} dias
diff --git a/locale/ru-ru/do not know.dialog b/locale/ru-ru/do not know.dialog
deleted file mode 100644
index df072712..00000000
--- a/locale/ru-ru/do not know.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-Боюсь, я не знаю этого
-У меня нет этой информации
diff --git a/locale/ru-ru/heavy.dialog b/locale/ru-ru/heavy.dialog
deleted file mode 100644
index 00d7ab62..00000000
--- a/locale/ru-ru/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-сильный
diff --git a/locale/ru-ru/light.dialog b/locale/ru-ru/light.dialog
deleted file mode 100644
index ac92829f..00000000
--- a/locale/ru-ru/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-легкий
diff --git a/locale/ru-ru/sky is clear.future.dialog b/locale/ru-ru/sky is clear.future.dialog
deleted file mode 100644
index 1fab83e8..00000000
--- a/locale/ru-ru/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-чистое
diff --git a/locale/sv-se/ClearAlternatives.voc b/locale/sv-se/ClearAlternatives.voc
deleted file mode 100644
index 9b47e62c..00000000
--- a/locale/sv-se/ClearAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similar to clear weather
-(dimma|dimmigt|moln|molnigt)
diff --git a/locale/sv-se/CloudsAlternatives.voc b/locale/sv-se/CloudsAlternatives.voc
deleted file mode 100644
index 6a67e263..00000000
--- a/locale/sv-se/CloudsAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similar to clody weather
-(klart|dimma|regn|lätt regn)
diff --git a/locale/sv-se/FogAlternatives.voc b/locale/sv-se/FogAlternatives.voc
deleted file mode 100644
index 3d357758..00000000
--- a/locale/sv-se/FogAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives to foggy weather
-(klart|moln|spridda moln|molnigt)
diff --git a/locale/sv-se/RainAlternatives.voc b/locale/sv-se/RainAlternatives.voc
deleted file mode 100644
index bac31e9c..00000000
--- a/locale/sv-se/RainAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternatives similar to rain
-(snö|snöa|lätt snö|snöfall|dimma)
diff --git a/locale/sv-se/SnowAlternatives.voc b/locale/sv-se/SnowAlternatives.voc
deleted file mode 100644
index e58f3f7e..00000000
--- a/locale/sv-se/SnowAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Conditions similar to snow
-(regn|lätt regn|duggregn)
diff --git a/locale/sv-se/ThunderstormAlternatives.voc b/locale/sv-se/ThunderstormAlternatives.voc
deleted file mode 100644
index 18f366b8..00000000
--- a/locale/sv-se/ThunderstormAlternatives.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Alternativ som liknar molnigt väder
-(duggregn|regn|lätt regn|snö|lätt snö|snöslask|dimma|molnigt|moln|delvis molnigt)
diff --git a/locale/sv-se/and.dialog b/locale/sv-se/and.dialog
new file mode 100644
index 00000000..c32e3925
--- /dev/null
+++ b/locale/sv-se/and.dialog
@@ -0,0 +1 @@
+, och
diff --git a/locale/sv-se/clear.future.dialog b/locale/sv-se/clear.future.dialog
deleted file mode 100644
index 7e17430f..00000000
--- a/locale/sv-se/clear.future.dialog
+++ /dev/null
@@ -1 +0,0 @@
-en klar himmel
diff --git a/locale/sv-se/condition.category.value b/locale/sv-se/condition.category.value
deleted file mode 100644
index 24f74a19..00000000
--- a/locale/sv-se/condition.category.value
+++ /dev/null
@@ -1,15 +0,0 @@
-Molnigt,moln
-Klart,klar himmel
-Åska,oväder
-Duggregn, lätt regn
-Regn,regnar
-Snö,snöar
-Dimma,dimmigt
-Rök, rökigt
-Dis,disigt
-Dam,dammigt
-Dimma, dimmigt
-Sand,sandigt
-Aska,molnigt med möjlig vulkanisk aska
-Stormby,blåsigt
-Tornado,stormar med en eventuell tornado
diff --git a/locale/sv-se/current.clear.alternative.local.dialog b/locale/sv-se/current.clear.alternative.local.dialog
deleted file mode 100644
index 8dc55021..00000000
--- a/locale/sv-se/current.clear.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-Nej, idag hävdar prognosen för {condition}
-Det verkar som det kommer vara {condition} idag
-Chansen är stor att det kommer att bli{condition} idag
diff --git a/locale/sv-se/current.clear.alternative.location.dialog b/locale/sv-se/current.clear.alternative.location.dialog
deleted file mode 100644
index 89bde9f6..00000000
--- a/locale/sv-se/current.clear.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-Nej, men det verkar bli {condition} i {location}
-Det verkar bli {condition} i {location}
-Det ser ut att bli {condition} i {location}
diff --git a/locale/sv-se/current.clear.not.expected.locatioin.dialog b/locale/sv-se/current.clear.not.expected.locatioin.dialog
deleted file mode 100644
index 2161810c..00000000
--- a/locale/sv-se/current.clear.not.expected.locatioin.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's clear but it's not
-Jag är ledsen men det verkar bli {condition}
-Det blir troligtvis inte en klar himmel
diff --git a/locale/sv-se/current.clouds.alternative.local.dialog b/locale/sv-se/current.clouds.alternative.local.dialog
deleted file mode 100644
index ab3d6ebb..00000000
--- a/locale/sv-se/current.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Nej, idag hävdar prognosen för {condition}
-# Informera att ett alternativ till molnigt kommer att inträffa
-Det bör inte bli molnigt, det ser ut som det blir {condition} idag
-Verkar inte så, chansen är stor att det kommer att bli {condition} idag
diff --git a/locale/sv-se/current.clouds.alternative.location.dialog b/locale/sv-se/current.clouds.alternative.location.dialog
deleted file mode 100644
index 007c3cfc..00000000
--- a/locale/sv-se/current.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-Nej, prognosen hävdar {condition}
-Det bör inte vara mulet, det ser ut som det blir {condition}
-Det verkar inte som det, troligt vis kommer det vara {condition}
diff --git a/locale/sv-se/current.clouds.not.expected.local.dialog b/locale/sv-se/current.clouds.not.expected.local.dialog
deleted file mode 100644
index e0713cab..00000000
--- a/locale/sv-se/current.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# När användaren frågar om det regnar men inget moln eller alternativ förutspås
-Inga moln idag enligt prognosen
-Det borde inte vara molnigt idag
diff --git a/locale/sv-se/current.clouds.not.expected.location.dialog b/locale/sv-se/current.clouds.not.expected.location.dialog
deleted file mode 100644
index b419654d..00000000
--- a/locale/sv-se/current.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's cloudy but it's not
-Det verkar inte bli molnigt idag
-Det bör inte bli molnigt
diff --git a/locale/sv-se/current.fog.alternative.local.dialog b/locale/sv-se/current.fog.alternative.local.dialog
deleted file mode 100644
index 82f4602c..00000000
--- a/locale/sv-se/current.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to fog will occur
-Nej, idag hävdar prognosen för {condition}
-Det verkar som det kommer vara {condition} idag
-Chansen är stor att det kommer att bli{condition} idag
diff --git a/locale/sv-se/current.fog.alternative.location.dialog b/locale/sv-se/current.fog.alternative.location.dialog
deleted file mode 100644
index 0e71873e..00000000
--- a/locale/sv-se/current.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Nej, men det verkar bli {condition} i {location}
-Det ser ut att bli {condition} i {location}
-# Informing that an alternative to fog will occur
-Det verkar bli {condition} i {location}
diff --git a/locale/sv-se/current.fog.not.expected.local.dialog b/locale/sv-se/current.fog.not.expected.local.dialog
deleted file mode 100644
index 894b8892..00000000
--- a/locale/sv-se/current.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted
-Sikten verkar bli god idag
-Ingen dimma idag enligt prognosen
diff --git a/locale/sv-se/current.fog.not.expected.location.dialog b/locale/sv-se/current.fog.not.expected.location.dialog
deleted file mode 100644
index 30fbe9d3..00000000
--- a/locale/sv-se/current.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted
-Det verkar vara god sikt i {location}
-Ingen dimma förutspås för {location} idag
diff --git a/locale/sv-se/current.rain.alternative.local.dialog b/locale/sv-se/current.rain.alternative.local.dialog
deleted file mode 100644
index d21210f6..00000000
--- a/locale/sv-se/current.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur (like snow or fog)
-Nej, men det verkar bli {condition}
-Inget regn förväntas idag men det ser ut att bli {condition}
diff --git a/locale/sv-se/current.rain.alternative.location.dialog b/locale/sv-se/current.rain.alternative.location.dialog
deleted file mode 100644
index a9af8b7f..00000000
--- a/locale/sv-se/current.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur (like snow or fog)
-Nej, men det verkar bli {condition} i {location}
-Inget regn förväntas idag i {location}, men det ser ut att bli {condition}
diff --git a/locale/sv-se/current.rain.not.expected.local.dialog b/locale/sv-se/current.rain.not.expected.local.dialog
deleted file mode 100644
index 45939754..00000000
--- a/locale/sv-se/current.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-Det blir inget regn enligt prognosen idag
-Det borde inte regna idag
-Du kommer inte behöva något paraply idag
diff --git a/locale/sv-se/current.rain.not.expected.location.dialog b/locale/sv-se/current.rain.not.expected.location.dialog
deleted file mode 100644
index 982fb4e1..00000000
--- a/locale/sv-se/current.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-Inget regn förutspås för {location}
-Det kommer inte regna i {location}
-I {location} behövs inget paraply
diff --git a/locale/sv-se/current.snow.alternative.local.dialog b/locale/sv-se/current.snow.alternative.local.dialog
deleted file mode 100644
index 760d5320..00000000
--- a/locale/sv-se/current.snow.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to snowing will occur
-Nej, men det verkar bli {condition}
-Ingen snö förväntas idag men risken är att det kommer bli {condition}
diff --git a/locale/sv-se/current.snow.alternative.location.dialog b/locale/sv-se/current.snow.alternative.location.dialog
deleted file mode 100644
index c694db3e..00000000
--- a/locale/sv-se/current.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to snowing will occur
-Nej, men det verkar bli {condition} i {location}
-Ingen snö förväntas i {location} idag men risken är att det kommer bli {condition}
diff --git a/locale/sv-se/current.snow.not.expected.local.dialog b/locale/sv-se/current.snow.not.expected.local.dialog
deleted file mode 100644
index 830c09dc..00000000
--- a/locale/sv-se/current.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# När användaren frågar om det snöar men ingen snö eller alternativ förutspås
-Det kommer inte bli någon snö idag
-Det borde inte snöa idag
diff --git a/locale/sv-se/current.snow.not.expected.location.dialog b/locale/sv-se/current.snow.not.expected.location.dialog
deleted file mode 100644
index 7fddc037..00000000
--- a/locale/sv-se/current.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted
-Ingen snö förutspås i {location}
-Det kommer inte snöa i {location}
diff --git a/locale/sv-se/current.thunderstorm.alternative.local.dialog b/locale/sv-se/current.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 912ce642..00000000
--- a/locale/sv-se/current.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Nej, men det verkar bli {condition}
-# Informera att ett alternativ till en storm kommer att ske (som snö eller dimma)
-Det finns ingen storm förutspås för idag, men det ser ut som det kommer att bli {condition}
diff --git a/locale/sv-se/current.thunderstorm.alternative.location.dialog b/locale/sv-se/current.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 16873b80..00000000
--- a/locale/sv-se/current.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Nej, men det verkar bli {condition} i {location}
-# Informera att ett alternativ till storm kommer att ske (som snö eller dimma)
-Det förutspås ingen storm för idag i {location}, men det ser ut att bli {condition}
diff --git a/locale/sv-se/current.thunderstorm.not.expected.local.dialog b/locale/sv-se/current.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 9965f787..00000000
--- a/locale/sv-se/current.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-Ingen storm förutspås idag
-Det borde inte storma idag
-Det borde inte bli storm i dag
-Idag är det osannolikt att blir storm
-En storm är inte troligt idag
diff --git a/locale/sv-se/current.thunderstorm.not.expected.location.dialog b/locale/sv-se/current.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index e2e9c845..00000000
--- a/locale/sv-se/current.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# När användaren frågar om det stormar men ingen storm eller alternativ förutspås
-Ingen storm förutspås för {location}
-Det bör inte bli storm i {location}
-Det borde inte bli storm i {location}
diff --git a/locale/sv-se/daily.clear.alternative.local.dialog b/locale/sv-se/daily.clear.alternative.local.dialog
deleted file mode 100644
index 74c01d0d..00000000
--- a/locale/sv-se/daily.clear.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to clear skies will occur
-Nej, prognosen på {day} hävdar {condition}
-{day}, verkar som det kommer vara {condition}
diff --git a/locale/sv-se/daily.clear.alternative.location.dialog b/locale/sv-se/daily.clear.alternative.location.dialog
deleted file mode 100644
index 67d8fad0..00000000
--- a/locale/sv-se/daily.clear.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-Nej, prognosen på {day} visar på {condition} i {location}
-{day}, förväntas inget regn i {location} men det kan bli {condition}
diff --git a/locale/sv-se/daily.clear.not.expected.local.dialog b/locale/sv-se/daily.clear.not.expected.local.dialog
deleted file mode 100644
index 917cea0e..00000000
--- a/locale/sv-se/daily.clear.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's clear but an alternative is forcasted
-Jag är ledsen, men {day} så verkar det inte bli klart väder
-{day}, kommer det mest troligt inte bli klart
diff --git a/locale/sv-se/daily.clear.not.expected.location.dialog b/locale/sv-se/daily.clear.not.expected.location.dialog
deleted file mode 100644
index c546b552..00000000
--- a/locale/sv-se/daily.clear.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's clear but an alternative is forcasted
-Jag är ledsen, men det verkar inte bli klart väder i {location} på {day}
-{day}, kommer det mest troligt inte bli klart väder i {location}
diff --git a/locale/sv-se/daily.clouds.alternative.local.dialog b/locale/sv-se/daily.clouds.alternative.local.dialog
deleted file mode 100644
index 9997e033..00000000
--- a/locale/sv-se/daily.clouds.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-Nej, prognosen på {day} hävdar {condition}
-Det borde inte bli molnigt, det ser ut som det blir {condition} för {day}
-Det verkar inte som det, troligtvis kommer det vara {condition} på {day}
diff --git a/locale/sv-se/daily.clouds.alternative.location.dialog b/locale/sv-se/daily.clouds.alternative.location.dialog
deleted file mode 100644
index 7e768362..00000000
--- a/locale/sv-se/daily.clouds.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to clear skies will occur
-# Nej, prognosen för {day} visar på {condition} i {location}
-# Det kommer inte vara mulet i {location} för {day}, utan det ser ut att bli {condition}
-Det verkar inte så, {location} ser ut att få {condition} på {day}
diff --git a/locale/sv-se/daily.clouds.not.expected.local.dialog b/locale/sv-se/daily.clouds.not.expected.local.dialog
deleted file mode 100644
index 60bf1fee..00000000
--- a/locale/sv-se/daily.clouds.not.expected.local.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's cloudy but it's not
-{day} verkar det inte bli molnigt
-För {day} visar rapporten på klart väder
-Räkna med klar himmel {day}
-Det bör inte vara molnigt {day}
diff --git a/locale/sv-se/daily.clouds.not.expected.location.dialog b/locale/sv-se/daily.clouds.not.expected.location.dialog
deleted file mode 100644
index c47a33ae..00000000
--- a/locale/sv-se/daily.clouds.not.expected.location.dialog
+++ /dev/null
@@ -1,5 +0,0 @@
-# When user asks if it's cloudy but it's not
-Det verkar inte bli molnigt i {location} på {day}
-Klar himmel förutspås för {location} på {day}
-Förvänta dig molnfri himmel i {location} på {day}
-Det kommer inte snöa i {location} på {day}
diff --git a/locale/sv-se/daily.fog.alternative.local.dialog b/locale/sv-se/daily.fog.alternative.local.dialog
deleted file mode 100644
index 38b3e0a1..00000000
--- a/locale/sv-se/daily.fog.alternative.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to fog will occur
-Nej, prognosen på {day} hävdar {condition}
-Det verkar som det kommer vara {condition} på {day}
-Chansen är stor att det kommer att bli {condition} {day}
diff --git a/locale/sv-se/daily.fog.alternative.location.dialog b/locale/sv-se/daily.fog.alternative.location.dialog
deleted file mode 100644
index dcc992f0..00000000
--- a/locale/sv-se/daily.fog.alternative.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Informing that an alternative to fog will occur
-Nej, prognosen på {day} för {location} säger att det blir {condition}
-Det verkar bli {condition} i {location} på {day}
-Det ser ut att bli {condition} i {location} på {day}
diff --git a/locale/sv-se/daily.fog.not.expected.local.dialog b/locale/sv-se/daily.fog.not.expected.local.dialog
deleted file mode 100644
index f33487be..00000000
--- a/locale/sv-se/daily.fog.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted
-{day} verkar det bli god sikt
-Ingen dimma förutspås för {day}
diff --git a/locale/sv-se/daily.fog.not.expected.location.dialog b/locale/sv-se/daily.fog.not.expected.location.dialog
deleted file mode 100644
index e32d04d0..00000000
--- a/locale/sv-se/daily.fog.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's foggy but no snow or alternative is forcasted
-{day} borde sikten vara god i {location}
-Prognosen för {day} innehåller ingen dimma i {location}
diff --git a/locale/sv-se/daily.rain.alternative.local.dialog b/locale/sv-se/daily.rain.alternative.local.dialog
deleted file mode 100644
index 24ac58ab..00000000
--- a/locale/sv-se/daily.rain.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-Nej, men det verkar bli {condition} på {day}
-{day}, förväntas inget regn men det kan bli {condition}
diff --git a/locale/sv-se/daily.rain.alternative.location.dialog b/locale/sv-se/daily.rain.alternative.location.dialog
deleted file mode 100644
index 943bc3ce..00000000
--- a/locale/sv-se/daily.rain.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-Nej, men det verkar bli {condition} i {location} på {day}
-för {day}, förväntas inget regn i {location} men det kan bli {condition}
diff --git a/locale/sv-se/daily.rain.not.expected.local.dialog b/locale/sv-se/daily.rain.not.expected.local.dialog
deleted file mode 100644
index 6f629d02..00000000
--- a/locale/sv-se/daily.rain.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-Det blir inget regn enligt prognosen på {day}
-Det bör inte regna {day}
-Du behöver inget paraply {day}
diff --git a/locale/sv-se/daily.rain.not.expected.location.dialog b/locale/sv-se/daily.rain.not.expected.location.dialog
deleted file mode 100644
index 43a8e5b3..00000000
--- a/locale/sv-se/daily.rain.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-Inget regn förutspås för {location} för {day}
-för {day}, kommer det inte att regna i {location}
-I {location} behövs inget paraply på {day}
diff --git a/locale/sv-se/daily.snow.alternative.location.dialog b/locale/sv-se/daily.snow.alternative.location.dialog
deleted file mode 100644
index cf91d0ce..00000000
--- a/locale/sv-se/daily.snow.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to snowing will occur
-Nej, men det verkar bli {condition} på {day}
-för {day} förutspås ingen snö men risken är att det blir {condition}
diff --git a/locale/sv-se/daily.snow.not.expected.local.dialog b/locale/sv-se/daily.snow.not.expected.local.dialog
deleted file mode 100644
index a24983c0..00000000
--- a/locale/sv-se/daily.snow.not.expected.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted
-Det kommer inte bli någon snö på {day}
-Det kommer inta att snöa på{day}
diff --git a/locale/sv-se/daily.snow.not.expected.location.dialog b/locale/sv-se/daily.snow.not.expected.location.dialog
deleted file mode 100644
index 3ce2b665..00000000
--- a/locale/sv-se/daily.snow.not.expected.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# When user asks if it's snowing but no snow or alternative is forcasted
-Ingen snö förutspås i {location} för {day}
-Det kommer inte snöa i {location} på {day}
diff --git a/locale/sv-se/daily.thunderstorm.alternative.local.dialog b/locale/sv-se/daily.thunderstorm.alternative.local.dialog
deleted file mode 100644
index 24ac58ab..00000000
--- a/locale/sv-se/daily.thunderstorm.alternative.local.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-# Informing that an alternative to rain will occur
-Nej, men det verkar bli {condition} på {day}
-{day}, förväntas inget regn men det kan bli {condition}
diff --git a/locale/sv-se/daily.thunderstorm.alternative.location.dialog b/locale/sv-se/daily.thunderstorm.alternative.location.dialog
deleted file mode 100644
index 25b02049..00000000
--- a/locale/sv-se/daily.thunderstorm.alternative.location.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Nej, men det verkar bli {condition} i {location} på {day}
-# Informera att ett alternativ till storm kommer att inträffa
-för {day}, förväntas ingen storm i {location} men det kan bli {condition}
diff --git a/locale/sv-se/daily.thunderstorm.not.expected.local.dialog b/locale/sv-se/daily.thunderstorm.not.expected.local.dialog
deleted file mode 100644
index 3f720c75..00000000
--- a/locale/sv-se/daily.thunderstorm.not.expected.local.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-Det kommer inte bli någon storm på {day}
-{day}, det bör inte bli storm
-Det borde inte storma {day}
diff --git a/locale/sv-se/daily.thunderstorm.not.expected.location.dialog b/locale/sv-se/daily.thunderstorm.not.expected.location.dialog
deleted file mode 100644
index dad97ebb..00000000
--- a/locale/sv-se/daily.thunderstorm.not.expected.location.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-# When user asks if it's raining but no rain or alternative is forcasted
-Ingen dimma förutspås för {location} på {day}
-för {day}, kommer det inte storma i {location}
-Det kommer troligtvis inte storma {day} i {location}
diff --git a/locale/sv-se/do not know.dialog b/locale/sv-se/do not know.dialog
deleted file mode 100644
index 2580530b..00000000
--- a/locale/sv-se/do not know.dialog	
+++ /dev/null
@@ -1,2 +0,0 @@
-Jag är rädd att jag inte vet det
-Jag har inte den informationen
diff --git a/locale/sv-se/from.day.dialog b/locale/sv-se/from.day.dialog
deleted file mode 100644
index b727df72..00000000
--- a/locale/sv-se/from.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-Från {day}
diff --git a/locale/sv-se/heavy.dialog b/locale/sv-se/heavy.dialog
deleted file mode 100644
index b34313cd..00000000
--- a/locale/sv-se/heavy.dialog
+++ /dev/null
@@ -1 +0,0 @@
-tung
diff --git a/locale/sv-se/light.dialog b/locale/sv-se/light.dialog
deleted file mode 100644
index af0c693c..00000000
--- a/locale/sv-se/light.dialog
+++ /dev/null
@@ -1 +0,0 @@
-lätt
diff --git a/locale/sv-se/on.date.dialog b/locale/sv-se/on.date.dialog
deleted file mode 100644
index 29a710bf..00000000
--- a/locale/sv-se/on.date.dialog
+++ /dev/null
@@ -1 +0,0 @@
-på 
diff --git a/locale/sv-se/on.dialog b/locale/sv-se/on.dialog
deleted file mode 100644
index 2fcbf0d9..00000000
--- a/locale/sv-se/on.dialog
+++ /dev/null
@@ -1 +0,0 @@
-på
diff --git a/locale/sv-se/simple.temperature.intent b/locale/sv-se/simple.temperature.intent
deleted file mode 100644
index e8a58ef5..00000000
--- a/locale/sv-se/simple.temperature.intent
+++ /dev/null
@@ -1 +0,0 @@
-temperatur
diff --git a/locale/sv-se/sky is clear.future.dialog b/locale/sv-se/sky is clear.future.dialog
deleted file mode 100644
index 7e17430f..00000000
--- a/locale/sv-se/sky is clear.future.dialog	
+++ /dev/null
@@ -1 +0,0 @@
-en klar himmel
diff --git a/locale/sv-se/storm.dialog b/locale/sv-se/storm.dialog
deleted file mode 100644
index db4cfc7b..00000000
--- a/locale/sv-se/storm.dialog
+++ /dev/null
@@ -1 +0,0 @@
-storm
diff --git a/locale/en-us/storm.dialog b/locale/sv-se/thunderstorm.dialog
similarity index 100%
rename from locale/en-us/storm.dialog
rename to locale/sv-se/thunderstorm.dialog
diff --git a/locale/sv-se/weekly.condition.on.day.dialog b/locale/sv-se/weekly.condition.on.day.dialog
deleted file mode 100644
index 19bf507d..00000000
--- a/locale/sv-se/weekly.condition.on.day.dialog
+++ /dev/null
@@ -1 +0,0 @@
-{day} kommer att vara {condition},
diff --git a/locale/sv-se/weekly.conditions.mostly.one.dialog b/locale/sv-se/weekly.conditions.mostly.one.dialog
deleted file mode 100644
index bf3e933c..00000000
--- a/locale/sv-se/weekly.conditions.mostly.one.dialog
+++ /dev/null
@@ -1 +0,0 @@
-det blir mest {condition}.
diff --git a/locale/sv-se/weekly.conditions.seq.extra.dialog b/locale/sv-se/weekly.conditions.seq.extra.dialog
deleted file mode 100644
index e6bf6b66..00000000
--- a/locale/sv-se/weekly.conditions.seq.extra.dialog
+++ /dev/null
@@ -1,2 +0,0 @@
-det ser ut som det också kommer att bli
-det blir också
diff --git a/locale/sv-se/weekly.conditions.seq.period.dialog b/locale/sv-se/weekly.conditions.seq.period.dialog
deleted file mode 100644
index e5867e05..00000000
--- a/locale/sv-se/weekly.conditions.seq.period.dialog
+++ /dev/null
@@ -1 +0,0 @@
-från {from} till {to}
diff --git a/locale/sv-se/weekly.conditions.seq.start.dialog b/locale/sv-se/weekly.conditions.seq.start.dialog
deleted file mode 100644
index 83115c55..00000000
--- a/locale/sv-se/weekly.conditions.seq.start.dialog
+++ /dev/null
@@ -1 +0,0 @@
-det blir {condition} 
diff --git a/locale/sv-se/weekly.conditions.some.days.dialog b/locale/sv-se/weekly.conditions.some.days.dialog
deleted file mode 100644
index de6a9af9..00000000
--- a/locale/sv-se/weekly.conditions.some.days.dialog
+++ /dev/null
@@ -1 +0,0 @@
-det kommer att vara {condition} några dagar.
diff --git a/locale/sv-se/weekly.temp.range.dialog b/locale/sv-se/weekly.temperature.dialog
similarity index 100%
rename from locale/sv-se/weekly.temp.range.dialog
rename to locale/sv-se/weekly.temperature.dialog
diff --git a/locale/sv-se/what.is.multi.day.forecast.intent b/locale/sv-se/what.is.multi.day.forecast.intent
deleted file mode 100644
index a270cbdb..00000000
--- a/locale/sv-se/what.is.multi.day.forecast.intent
+++ /dev/null
@@ -1,4 +0,0 @@
-väder (i|över de|för de) kommande {num} dagarna
-vad är vädret (som|) (i|över|för de) kommande {num} dagarna
-vad blir vädret (som|) (i|över de| för de) kommande {num} dagarna
-hur (kommer vädret |kommer det |)vara (i|över de|för de) kommande {num} dagarna
diff --git a/source/__init__.py b/source/__init__.py
index 9a6757e9..1440667f 100644
--- a/source/__init__.py
+++ b/source/__init__.py
@@ -13,7 +13,14 @@
 # limitations under the License.
 from .api import OpenWeatherMapApi
 from .config import WeatherConfig
-from .dialog import WeatherDialog
+from .dialog import (
+    CurrentDialog,
+    DailyDialog,
+    HourlyDialog,
+    WeatherDialog,
+    WeeklyDialog,
+    get_dialog_for_timeframe,
+)
 from .intent import WeatherIntent
-from .weather import DailyWeather, WeatherReport
+from .weather import CURRENT, DAILY, DailyWeather, HOURLY, WeatherReport
 from .util import LocationNotFoundError
diff --git a/source/dialog.py b/source/dialog.py
index 6dcce746..67ced909 100644
--- a/source/dialog.py
+++ b/source/dialog.py
@@ -12,15 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Abstraction of dialog building for the weather skill."""
+from typing import List, Tuple
+
 from mycroft.util.format import nice_number, nice_time
 from mycroft.util.time import now_local
-from .util import get_time_period
-from .weather import is_current_weather, is_hourly_forecast, is_daily_forecast
-
-CURRENT = "current"
-DAILY = "daily"
-HOURLY = "hourly"
-
+from .config import WeatherConfig
+from .intent import WeatherIntent
+from .util import get_speakable_day_of_week, get_time_period
+from .weather import (
+    CURRENT,
+    CurrentWeather,
+    DAILY,
+    DailyWeather,
+    HOURLY,
+    HourlyWeather,
+    is_current_weather,
+    is_hourly_forecast,
+    is_daily_forecast,
+)
 
 # TODO: MISSING DIALOGS
 #   - current.clear.alternative.local
@@ -28,82 +37,130 @@
 #   - daily.snow.alternative.local
 #   - all hourly.<condition>.alternative.local/location
 #   - all hourly.<condition>.not.expected.local/location
-class WeatherDialog:
+class Dialog:
+    """Abstract base class for the weather dialog builders."""
+
+    def __init__(self, intent_data: WeatherIntent, config: WeatherConfig):
+        self.intent_data = intent_data
+        self.config = config
+        self.name = None
+        self.data = None
+
+    def _add_location(self):
+        """Add location information to the dialog."""
+        if self.intent_data.location is None:
+            self.name += ".local"
+        else:
+            self.name += ".location"
+            if self.config.country == self.intent_data.geolocation["country"]:
+                spoken_location = ", ".join(
+                    [
+                        self.intent_data.geolocation["city"],
+                        self.intent_data.geolocation["region"],
+                    ]
+                )
+            else:
+                spoken_location = ", ".join(
+                    [
+                        self.intent_data.geolocation["city"],
+                        self.intent_data.geolocation["country"],
+                    ]
+                )
+            self.data.update(location=spoken_location)
+
+
+class WeatherDialog(Dialog):
     """Use intent and weather data to determine which dialog will be spoken."""
 
     def __init__(self, weather, config, intent_data):
+        super().__init__(intent_data, config)
         self.weather = weather
         self.config = config
         self.intent_data = intent_data
         self.current_weather = is_current_weather(weather)
         self.daily_forecast = is_daily_forecast(weather)
         self.hourly_forecast = is_hourly_forecast(weather)
-        self.name = None
-        self.data = None
 
-    def build_current_weather_dialog(self):
-        """Build the components necessary to speak current weather."""
-        self.name = "current.weather"
+    def build_wind_dialog(self):
+        """Build the components necessary to speak the wind conditions."""
+        wind_strength = self.weather.determine_wind_strength(self.config.speed_unit)
         self.data = dict(
-            condition=self.weather.current.condition.description,
-            temperature=self.weather.current.temperature,
-            temperature_unit=self.config.temperature_unit,
+            speed=nice_number(self.weather.wind_speed),
+            speed_unit=self.config.speed_unit,
+            direction=self.weather.wind_direction,
         )
+        self.name = self.intent_data.timeframe
+        if self.intent_data.timeframe == DAILY:
+            self.data.update(day=self.weather.date_time.strftime("%A"))
+        elif self.hourly_forecast:
+            self.data.update(time=nice_time(self.weather.date_time))
+        self.name += ".wind." + wind_strength
         self._add_location()
 
-    def build_high_low_temperature_dialog(self):
-        """Build the components necessary to speak high and low temperature."""
-        self.name = "current.temperature.high.low"
-        self.data = dict(
-            high_temperature=self.weather.current.high_temperature,
-            low_temperature=self.weather.current.low_temperature,
-        )
+    def build_humidity_dialog(self):
+        """Build the components necessary to speak the percentage humidity."""
+        self.data = dict(percent=self.weather.humidity)
+        if self.intent_data.timeframe == DAILY:
+            self.name = "daily.humidity"
+            self.data.update(day=self.weather.date_time.strftime("%A"))
+        else:
+            self.name = "current.humidity"
+        self._add_location()
+
+    def build_next_precipitation_dialog(self):
+        """Build the components necessary to speak the next chance of rain."""
+        if self.weather is None:
+            self.name = "daily.precipitation.next.none"
+            self.data = dict()
+        else:
+            if self.intent_data.timeframe == DAILY:
+                self.name = "daily.precipitation.next"
+                self.data = dict(day=self.weather.date_time.strftime("%A"))
+            else:
+                self.name = "hourly.precipitation.next"
+                self.data = dict(time=get_time_period(self.weather.date_time))
+            self.data = dict(
+                percent=self.weather.chance_of_precipitation,
+                precipitation="rain",
+                day=self.weather.date_time.strftime("%A"),
+            )
+        self._add_location()
+
+
+class CurrentDialog(Dialog):
+    """Weather dialog builder for current weather."""
+
+    def __init__(
+        self, intent_data: WeatherIntent, config: WeatherConfig, weather: CurrentWeather
+    ):
+        super().__init__(intent_data, config)
+        self.weather = weather
+        self.name = CURRENT
 
-    def build_hourly_weather_dialog(self):
+    def build_weather_dialog(self):
         """Build the components necessary to speak current weather."""
-        self.name = "hourly.weather"
+        self.name += ".weather"
         self.data = dict(
             condition=self.weather.condition.description,
-            time=self.weather.date_time.strftime("%H:00"),
             temperature=self.weather.temperature,
+            temperature_unit=self.config.temperature_unit,
         )
         self._add_location()
 
-    def build_daily_weather_dialog(self):
-        """Build the components necessary to speak the forecast for a day."""
-        self.name = "daily.weather"
+    def build_high_low_temperature_dialog(self):
+        """Build the components necessary to speak high and low temperature."""
+        self.name += ".temperature.high.low"
         self.data = dict(
-            condition=self.weather.condition.description,
-            day=self.weather.date_time.strftime("%A"),
-            high_temperature=self.weather.temperature.high,
-            low_temperature=self.weather.temperature.low,
+            high_temperature=self.weather.high_temperature,
+            low_temperature=self.weather.low_temperature,
         )
-        if self.weather.date_time.date() == self.intent_data.location_datetime.date():
-            self.data.update(day="Today")
-        self._add_location()
 
     def build_temperature_dialog(self, temperature_type: str):
-        """Build the components necessary to speak the temperature.
-
-        :param temperature_type: indicates if temperature is current, high or low
-        """
-        if self.daily_forecast:
-            self._build_daily_temperature_dialog(temperature_type)
-        elif self.hourly_forecast:
-            self._build_hourly_temperature_dialog()
-        else:
-            self._build_current_temperature_dialog(temperature_type)
-        self.data.update(
-            temperature_unit=self.intent_data.unit or self.config.temperature_unit
-        )
-        self._add_location()
-
-    def _build_current_temperature_dialog(self, temperature_type):
         """Build the components necessary to speak the current temperature.
 
         :param temperature_type: indicates if temperature is current, high or low
         """
-        self.name = "current.temperature"
+        self.name += ".temperature"
         if temperature_type == "high":
             self.name += ".high"
             self.data = dict(temperature=self.weather.high_temperature)
@@ -112,155 +169,226 @@ def _build_current_temperature_dialog(self, temperature_type):
             self.data = dict(temperature=self.weather.low_temperature)
         else:
             self.data = dict(temperature=self.weather.temperature)
+        self._add_location()
 
-    def _build_daily_temperature_dialog(self, temperature_type):
-        """Build the components necessary to speak the daily temperature.
+    def build_condition_dialog(self, intent_match: bool):
+        """Select the relevant dialog file for condition based reports.
 
-        :param temperature_type: indicates if temperature is day, high or low
+        A condition can for example be "snow" or "rain".
+
+        :param intent_match: true if intent matches a vocabulary for the condition
         """
-        self.name = "daily.temperature"
-        if temperature_type == "high":
-            self.name += ".high"
-            self.data = dict(temperature=self.weather.temperature.high)
-        elif temperature_type == "low":
-            self.name += ".low"
-            self.data = dict(temperature=self.weather.temperature.low)
+        self.data = dict(condition=self.weather.condition.description.lower())
+        if intent_match:
+            self.name += ".condition.expected"
         else:
-            self.data = dict(temperature=self.weather.temperature.day)
-        self.data.update(day=self.weather.date_time.strftime("%A"))
+            self.name += ".condition.not.expected".format(
+                self.weather.condition.category.lower()
+            )
+        self._add_location()
+
+    def build_sunrise_dialog(self):
+        """Build the components necessary to speak the sunrise time."""
+        if self.intent_data.location is None:
+            now = now_local()
+        else:
+            now = now_local(tz=self.intent_data.geolocation["timezone"])
+        if now < self.weather.sunrise:
+            self.name += ".sunrise.future"
+        else:
+            self.name += ".sunrise.past"
+        self.data = dict(time=nice_time(self.weather.sunrise))
+        self._add_location()
+
+    def build_sunset_dialog(self):
+        """Build the components necessary to speak the sunset time."""
+        if self.intent_data.location is None:
+            now = now_local()
+        else:
+            now = now_local(tz=self.intent_data.geolocation["timezone"])
+        if now < self.weather.sunset:
+            self.name += ".sunset.future"
+        else:
+            self.name = ".sunset.past"
+        self.data = dict(time=nice_time(self.weather.sunset))
+        self._add_location()
+
 
-    def _build_hourly_temperature_dialog(self):
+class HourlyDialog(Dialog):
+    """Weather dialog builder for hourly weather."""
+
+    def __init__(
+        self, intent_data: WeatherIntent, config: WeatherConfig, weather: HourlyWeather
+    ):
+        super().__init__(intent_data, config)
+        self.weather = weather
+        self.name = HOURLY
+
+    def build_weather_dialog(self):
+        """Build the components necessary to speak the forecast for a hour."""
+        self.name = ".weather"
+        self.data = dict(
+            condition=self.weather.condition.description,
+            time=self.weather.date_time.strftime("%H:00"),
+            temperature=self.weather.temperature,
+        )
+        self._add_location()
+
+    def build_temperature_dialog(self, _):
         """Build the components necessary to speak the hourly temperature."""
-        self.name = "hourly.temperature"
+        self.name += ".temperature"
         self.data = dict(
             temperature=self.weather.temperature,
             time=get_time_period(self.weather.date_time),
         )
+        self._add_location()
 
-    def build_wind_dialog(self):
-        """Build the components necessary to speak the wind conditions."""
-        wind_strength = self.weather.determine_wind_strength(self.config.speed_unit)
+    def build_condition_dialog(self, intent_match: bool):
+        """Select the relevant dialog file for condition based reports.
+
+        A condition can for example be "snow" or "rain".
+
+        :param intent_match: true if intent matches a vocabulary for the condition
+        """
         self.data = dict(
-            speed=nice_number(self.weather.wind_speed),
-            speed_unit=self.config.speed_unit,
-            direction=self.weather.wind_direction,
+            condition=self.weather.condition.description.lower(),
+            time=nice_time(self.weather.date_time),
         )
-        self.name = self.intent_data.timeframe
-        if self.intent_data.timeframe == DAILY:
-            self.data.update(day=self.weather.date_time.strftime("%A"))
-        elif self.hourly_forecast:
-            self.data.update(time=nice_time(self.weather.date_time))
-        self.name += ".wind." + wind_strength
+        if intent_match:
+            self.name += ".condition.expected"
+        else:
+            self.name += ".condition.not.expected".format(
+                self.weather.condition.category.lower()
+            )
         self._add_location()
 
-    def build_humidity_dialog(self):
-        """Build the components necessary to speak the percentage humidity."""
-        self.data = dict(percent=self.weather.humidity)
-        if self.intent_data.timeframe == DAILY:
-            self.name = "daily.humidity"
-            self.data.update(day=self.weather.date_time.strftime("%A"))
+
+class DailyDialog(Dialog):
+    """Weather dialog builder for daily weather."""
+
+    def __init__(
+        self, intent_data: WeatherIntent, config: WeatherConfig, weather: DailyWeather
+    ):
+        super().__init__(intent_data, config)
+        self.weather = weather
+        self.name = DAILY
+
+    def build_weather_dialog(self):
+        """Build the components necessary to speak the forecast for a day."""
+        self.name += ".weather"
+        self.data = dict(
+            condition=self.weather.condition.description,
+            day=get_speakable_day_of_week(self.weather.date_time),
+            high_temperature=self.weather.temperature.high,
+            low_temperature=self.weather.temperature.low,
+        )
+        if self.weather.date_time.date() == self.intent_data.location_datetime.date():
+            self.data.update(day="Today")
+        self._add_location()
+
+    def build_temperature_dialog(self, temperature_type: str):
+        """Build the components necessary to speak the daily temperature.
+
+        :param temperature_type: indicates if temperature is day, high or low
+        """
+        self.name += ".temperature"
+        if temperature_type == "high":
+            self.name += ".high"
+            self.data = dict(temperature=self.weather.temperature.high)
+        elif temperature_type == "low":
+            self.name += ".low"
+            self.data = dict(temperature=self.weather.temperature.low)
         else:
-            self.name = "current.humidity"
+            self.data = dict(temperature=self.weather.temperature.day)
+        self.data.update(day=get_speakable_day_of_week(self.weather.date_time))
         self._add_location()
 
-    def build_condition_dialog(
-        self, condition: str, intent_match: bool, alternative: bool
-    ):
+    def build_condition_dialog(self, intent_match: bool):
         """Select the relevant dialog file for condition based reports.
 
         A condition can for example be "snow" or "rain".
 
-        :param condition: name of condition eg snow
         :param intent_match: true if intent matches a vocabulary for the condition
-        :param alternative: true if intent matches a vocabulary for an alternative
-            condition
         """
-        self.data = dict(condition=condition.lower())
-        if self.daily_forecast:
-            self.name = "daily"
-            self.data.update(day=self.weather.date_time.strftime("%A"))
-        elif self.hourly_forecast:
-            self.name = "hourly"
-            self.data.update(time=nice_time(self.weather.date_time))
-        else:
-            self.name = "current"
+        self.data = dict(
+            condition=self.weather.condition.description.lower(),
+            day=get_speakable_day_of_week(self.weather.date_time),
+        )
         if intent_match:
             self.name += ".condition.expected"
-        elif alternative:
-            self.name += ".{}.alternative".format(condition.lower())
-        else:
-            self.name += ".{}.not.expected".format(condition.lower())
-        self._add_location()
-
-    def build_next_precipitation_dialog(self):
-        """Build the components necessary to speak the next chance of rain."""
-        if self.weather is None:
-            self.name = "daily.precipitation.next.none"
-            self.data = dict()
         else:
-            if self.intent_data.timeframe == DAILY:
-                self.name = "daily.precipitation.next"
-                self.data = dict(day=self.weather.date_time.strftime("%A"))
-            else:
-                self.name = "hourly.precipitation.next"
-                self.data = dict(time=get_time_period(self.weather.date_time))
-            self.data = dict(
-                percent=self.weather.chance_of_precipitation,
-                precipitation="rain",
-                day=self.weather.date_time.strftime("%A"),
+            self.name += ".condition.not.expected".format(
+                self.weather.condition.category.lower()
             )
         self._add_location()
 
     def build_sunrise_dialog(self):
         """Build the components necessary to speak the sunrise time."""
-        if self.daily_forecast:
-            self.name = "daily.sunrise"
-        else:
-            if self.intent_data.location is None:
-                now = now_local()
-            else:
-                now = now_local(tz=self.intent_data.geolocation["timezone"])
-            if now < self.weather.sunrise:
-                self.name = "current.sunrise.future"
-            else:
-                self.name = "current.sunrise.past"
+        self.name += ".sunrise"
+        self.data = dict(time=nice_time(self.weather.sunrise))
+        self.data.update(day=get_speakable_day_of_week(self.weather.date_time))
         self._add_location()
-        self.data = dict(time=nice_time(self.weather.sunrise.strftime("%H:%M")))
 
     def build_sunset_dialog(self):
         """Build the components necessary to speak the sunset time."""
-        if self.daily_forecast:
-            self.name = "daily.sunset"
-        else:
-            if self.intent_data.location is None:
-                now = now_local()
-            else:
-                now = now_local(tz=self.intent_data.geolocation["timezone"])
-            if now < self.weather.sunset:
-                self.name = "current.sunset.future"
-            else:
-                self.name = "current.sunset.past"
+        self.name += ".sunset"
+        self.data = dict(time=nice_time(self.weather.sunset))
+        self.data.update(day=get_speakable_day_of_week(self.weather.date_time))
         self._add_location()
-        self.data = dict(time=nice_time(self.weather.sunset.strftime("%H:%M")))
 
-    def _add_location(self):
-        """Add location information to the dialog."""
-        if self.intent_data.location is None:
-            self.name += ".local"
-        else:
-            self.name += ".location"
-            if self.config.country == self.intent_data.geolocation["country"]:
-                spoken_location = ", ".join(
-                    [
-                        self.intent_data.geolocation["city"],
-                        self.intent_data.geolocation["region"],
-                    ]
-                )
-            else:
-                spoken_location = ", ".join(
-                    [
-                        self.intent_data.geolocation["city"],
-                        self.intent_data.geolocation["country"],
-                    ]
-                )
-            self.data.update(location=spoken_location)
+
+class WeeklyDialog(Dialog):
+    """Weather dialog builder for weekly weather."""
+
+    def __init__(
+        self,
+        intent_data: WeatherIntent,
+        config: WeatherConfig,
+        forecast: List[DailyWeather],
+    ):
+        super().__init__(intent_data, config)
+        self.forecast = forecast
+        self.name = "weekly"
+
+    def build_temperature_dialog(self):
+        """Build the components necessary to temperature ranges for a week."""
+        low_temperatures = [daily.temperature.low for daily in self.forecast]
+        high_temperatures = [daily.temperature.low for daily in self.forecast]
+        self.name += ".temperature"
+        self.data = dict(
+            low_min=min(low_temperatures),
+            low_max=max(low_temperatures),
+            high_min=min(high_temperatures),
+            high_max=max(high_temperatures),
+        )
+
+    def build_condition_dialog(self, condition: str):
+        """Build the components necessary to speak the days of week for a condition."""
+        self.name += ".condition"
+        self.data = dict(condition=condition)
+        days_with_condition = []
+        for daily in self.forecast:
+            if daily.condition.category == condition:
+                day = get_speakable_day_of_week(daily.date_time)
+                days_with_condition.append(day)
+        if len(days_with_condition) > 1:
+            last_day = days_with_condition.pop(-1)
+            days_with_condition.append("and " + last_day)
+        self.data.update(days=", ".join(days_with_condition))
+
+
+def get_dialog_for_timeframe(timeframe: str, dialog_ags: Tuple):
+    """Use the intent data to determine which dialog builder to use.
+
+    :param timeframe: current, hourly, daily
+    :param dialog_ags: Arguments to pass to the dialog builder
+    :return: The correct dialog builder for the timeframe
+    """
+    if timeframe == DAILY:
+        dialog = DailyDialog(*dialog_ags)
+    elif timeframe == HOURLY:
+        dialog = HourlyDialog(*dialog_ags)
+    else:
+        dialog = CurrentDialog(*dialog_ags)
+
+    return dialog
diff --git a/source/intent.py b/source/intent.py
index 273dfe6a..5e74c243 100644
--- a/source/intent.py
+++ b/source/intent.py
@@ -21,6 +21,7 @@
     get_tz_info,
     LocationNotFoundError,
 )
+from .weather import CURRENT
 
 
 class WeatherIntent:
@@ -38,7 +39,7 @@ def __init__(self, message, language):
         self.location = message.data.get("Location")
         self.language = language
         self.unit = message.data.get("Unit")
-        self.timeframe = "current"
+        self.timeframe = CURRENT
 
     @property
     def geolocation(self):
diff --git a/source/util.py b/source/util.py
index c2c02535..e5168044 100644
--- a/source/util.py
+++ b/source/util.py
@@ -12,13 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Utility functions for the weather skill."""
-from datetime import datetime, tzinfo
+from datetime import datetime, timedelta, tzinfo
 from time import time
 
 import pytz
 
 from mycroft.api import GeolocationApi
+from mycroft.util.format import nice_date
 from mycroft.util.parse import extract_datetime
+from mycroft.util.time import now_local
 
 
 class LocationNotFoundError(ValueError):
@@ -106,3 +108,24 @@ def get_time_period(intent_datetime: datetime) -> str:
         period = "overnight"
 
     return period
+
+
+def get_speakable_day_of_week(date_to_speak: datetime):
+    """Convert the time of the a daily weather forecast to a speakable day of week.
+
+    :param date_to_speak: The date/time for the forecast being reported.
+    :return: The day of the week in the device's configured language
+    """
+    now = now_local()
+    tomorrow = now.date() + timedelta(days=1)
+
+    # A little hack to prevent nice_date() from returning "tomorrow"
+    if date_to_speak.date() == tomorrow:
+        now_arg = now - timedelta(days=1)
+    else:
+        now_arg = now
+
+    speakable_date = nice_date(date_to_speak, now=now_arg)
+    day_of_week = speakable_date.split(",")[0]
+
+    return day_of_week
diff --git a/source/weather.py b/source/weather.py
index 17a5c31f..1140855f 100644
--- a/source/weather.py
+++ b/source/weather.py
@@ -12,12 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Representations and conversions of the data returned by the weather API."""
-from datetime import time, timedelta
+from datetime import timedelta
 
-from mycroft.util.time import now_local
 from .config import MILES_PER_HOUR
 from .util import convert_to_local_datetime
 
+CURRENT = "current"
+DAILY = "daily"
+HOURLY = "hourly"
 THIRTY_PERCENT = 30
 SATURDAY = 5
 SUNDAY = 6
@@ -78,12 +80,11 @@ def _determine_wind_direction(degree_direction: int):
 
         :param degree_direction: Degrees on a compass indicating wind direction.
         """
-        wind_direction = None
         for min_degree, compass_direction in WIND_DIRECTION_CONVERSION:
             if degree_direction < min_degree:
                 wind_direction = compass_direction
                 break
-        if wind_direction is None:
+        else:
             wind_direction = "north"
 
         return wind_direction