diff --git a/dialog/de-de/know.dialog b/dialog/de-de/do not know.dialog
similarity index 100%
rename from dialog/de-de/know.dialog
rename to dialog/de-de/do not know.dialog
diff --git a/dialog/de-de/second.dialog b/dialog/de-de/meters per second.dialog
similarity index 100%
rename from dialog/de-de/second.dialog
rename to dialog/de-de/meters per second.dialog
diff --git a/dialog/de-de/hour.dialog b/dialog/de-de/miles per hour.dialog
similarity index 100%
rename from dialog/de-de/hour.dialog
rename to dialog/de-de/miles per hour.dialog
diff --git a/dialog/de-de/forecast.dialog b/dialog/de-de/no forecast.dialog
similarity index 100%
rename from dialog/de-de/forecast.dialog
rename to dialog/de-de/no forecast.dialog
diff --git a/dialog/de-de/no precipitation expected.dialog b/dialog/de-de/no precipitation expected.dialog
new file mode 100644
index 00000000..5194df78
--- /dev/null
+++ b/dialog/de-de/no precipitation expected.dialog	
@@ -0,0 +1,2 @@
+Es wird kein Niederschlag vorhergesagt
+Es wird nichts vorhergesagt
diff --git a/dialog/de-de/expected.dialog b/dialog/de-de/precipitation expected.dialog
similarity index 61%
rename from dialog/de-de/expected.dialog
rename to dialog/de-de/precipitation expected.dialog
index e72bd14b..5c2c0d1c 100644
--- a/dialog/de-de/expected.dialog
+++ b/dialog/de-de/precipitation expected.dialog	
@@ -1,4 +1,2 @@
-Es wird kein Niederschlag vorhergesagt
-Es wird nichts vorhergesagt
 {{modifier}} {{precip}} wird für {{day}} erwartet
 Die Vorhersage für {{day}} ist {{modifier}} {{precip}}
diff --git a/dialog/de-de/clear.future.dialog b/dialog/de-de/sky is clear.future.dialog
similarity index 100%
rename from dialog/de-de/clear.future.dialog
rename to dialog/de-de/sky is clear.future.dialog
diff --git a/dialog/nl-nl/know.dialog b/dialog/nl-nl/do not know.dialog
similarity index 100%
rename from dialog/nl-nl/know.dialog
rename to dialog/nl-nl/do not know.dialog
diff --git a/dialog/nl-nl/second.dialog b/dialog/nl-nl/meters per second.dialog
similarity index 100%
rename from dialog/nl-nl/second.dialog
rename to dialog/nl-nl/meters per second.dialog
diff --git a/dialog/nl-nl/hour.dialog b/dialog/nl-nl/miles per hour.dialog
similarity index 100%
rename from dialog/nl-nl/hour.dialog
rename to dialog/nl-nl/miles per hour.dialog
diff --git a/dialog/nl-nl/forecast.dialog b/dialog/nl-nl/no forecast.dialog
similarity index 100%
rename from dialog/nl-nl/forecast.dialog
rename to dialog/nl-nl/no forecast.dialog
diff --git a/dialog/nl-nl/no precipitation expected.dialog b/dialog/nl-nl/no precipitation expected.dialog
new file mode 100644
index 00000000..f2f9842d
--- /dev/null
+++ b/dialog/nl-nl/no precipitation expected.dialog	
@@ -0,0 +1,2 @@
+Er wordt geen neerslag verwacht
+Niks is voorspeld
diff --git a/dialog/nl-nl/expected.dialog b/dialog/nl-nl/precipitation expected.dialog
similarity index 67%
rename from dialog/nl-nl/expected.dialog
rename to dialog/nl-nl/precipitation expected.dialog
index ee9d6a97..ddc9f74d 100644
--- a/dialog/nl-nl/expected.dialog
+++ b/dialog/nl-nl/precipitation expected.dialog	
@@ -1,4 +1,2 @@
-Er wordt geen neerslag verwacht
-Niks is voorspeld
 {{modifier}} {{precip}} is verwacht op {{day}}
 De verwachting voor {{day}} is {{modifier}} {{precip}}
diff --git a/dialog/nl-nl/clear.future.dialog b/dialog/nl-nl/sky is clear.future.dialog
similarity index 100%
rename from dialog/nl-nl/clear.future.dialog
rename to dialog/nl-nl/sky is clear.future.dialog
diff --git a/dialog/ru-ru/know.dialog b/dialog/ru-ru/do not know.dialog
similarity index 100%
rename from dialog/ru-ru/know.dialog
rename to dialog/ru-ru/do not know.dialog
diff --git a/dialog/ru-ru/second.dialog b/dialog/ru-ru/meters per second.dialog
similarity index 100%
rename from dialog/ru-ru/second.dialog
rename to dialog/ru-ru/meters per second.dialog
diff --git a/dialog/ru-ru/hour.dialog b/dialog/ru-ru/miles per hour.dialog
similarity index 100%
rename from dialog/ru-ru/hour.dialog
rename to dialog/ru-ru/miles per hour.dialog
diff --git a/dialog/ru-ru/forecast.dialog b/dialog/ru-ru/no forecast.dialog
similarity index 100%
rename from dialog/ru-ru/forecast.dialog
rename to dialog/ru-ru/no forecast.dialog
diff --git a/dialog/ru-ru/no precipitation expected.dialog b/dialog/ru-ru/no precipitation expected.dialog
new file mode 100644
index 00000000..8d1306ed
--- /dev/null
+++ b/dialog/ru-ru/no precipitation expected.dialog	
@@ -0,0 +1,2 @@
+В прогнозе нет осадков
+В прогнозе ничего нет
diff --git a/dialog/ru-ru/expected.dialog b/dialog/ru-ru/precipitation expected.dialog
similarity index 60%
rename from dialog/ru-ru/expected.dialog
rename to dialog/ru-ru/precipitation expected.dialog
index 16f15754..18e1c26e 100644
--- a/dialog/ru-ru/expected.dialog
+++ b/dialog/ru-ru/precipitation expected.dialog	
@@ -1,4 +1,2 @@
-В прогнозе нет осадков
-В прогнозе ничего нет
 {{modifier}} {{precip}} ожидается {{day}}
 Прогноз погоды говорит {{modifier}} {{precip}} {{day}}
diff --git a/dialog/ru-ru/clear.future.dialog b/dialog/ru-ru/sky is clear.future.dialog
similarity index 100%
rename from dialog/ru-ru/clear.future.dialog
rename to dialog/ru-ru/sky is clear.future.dialog
diff --git a/dialog/sv-se/know.dialog b/dialog/sv-se/do not know.dialog
similarity index 100%
rename from dialog/sv-se/know.dialog
rename to dialog/sv-se/do not know.dialog
diff --git a/dialog/sv-se/second.dialog b/dialog/sv-se/meters per second.dialog
similarity index 100%
rename from dialog/sv-se/second.dialog
rename to dialog/sv-se/meters per second.dialog
diff --git a/dialog/sv-se/hour.dialog b/dialog/sv-se/miles per hour.dialog
similarity index 100%
rename from dialog/sv-se/hour.dialog
rename to dialog/sv-se/miles per hour.dialog
diff --git a/dialog/sv-se/forecast.dialog b/dialog/sv-se/no forecast.dialog
similarity index 100%
rename from dialog/sv-se/forecast.dialog
rename to dialog/sv-se/no forecast.dialog
diff --git a/dialog/sv-se/no precipitation expected.dialog b/dialog/sv-se/no precipitation expected.dialog
new file mode 100644
index 00000000..4aa6477b
--- /dev/null
+++ b/dialog/sv-se/no precipitation expected.dialog	
@@ -0,0 +1,2 @@
+Ingen nederbörd är med i prognosen
+Ingen är prognostiserad
diff --git a/dialog/sv-se/expected.dialog b/dialog/sv-se/precipitation expected.dialog
similarity index 63%
rename from dialog/sv-se/expected.dialog
rename to dialog/sv-se/precipitation expected.dialog
index 2e9e7bda..4f78b65d 100644
--- a/dialog/sv-se/expected.dialog
+++ b/dialog/sv-se/precipitation expected.dialog	
@@ -1,4 +1,2 @@
-Ingen nederbörd är med i prognosen
-Ingen är prognostiserad
 {{modifier}} {{precip}} är förväntad på {{day}}
 Prognosen utropar {{modifier}} {{precip}} på {{day}}
diff --git a/dialog/sv-se/clear.future.dialog b/dialog/sv-se/sky is clear.future.dialog
similarity index 100%
rename from dialog/sv-se/clear.future.dialog
rename to dialog/sv-se/sky is clear.future.dialog