diff --git a/locale/ca/available_memory.dialog b/locale/ca-ES/available_memory.dialog
similarity index 100%
rename from locale/ca/available_memory.dialog
rename to locale/ca-ES/available_memory.dialog
diff --git a/locale/ca/cpu_percent.dialog b/locale/ca-ES/cpu_percent.dialog
similarity index 100%
rename from locale/ca/cpu_percent.dialog
rename to locale/ca-ES/cpu_percent.dialog
diff --git a/locale/ca/current_lang.dialog b/locale/ca-ES/current_lang.dialog
similarity index 100%
rename from locale/ca/current_lang.dialog
rename to locale/ca-ES/current_lang.dialog
diff --git a/locale/ca/current_memory.dialog b/locale/ca-ES/current_memory.dialog
similarity index 100%
rename from locale/ca/current_memory.dialog
rename to locale/ca-ES/current_memory.dialog
diff --git a/locale/ca/has_gpu.dialog b/locale/ca-ES/has_gpu.dialog
similarity index 100%
rename from locale/ca/has_gpu.dialog
rename to locale/ca-ES/has_gpu.dialog
diff --git a/locale/ca/kernel_version.dialog b/locale/ca-ES/kernel_version.dialog
similarity index 100%
rename from locale/ca/kernel_version.dialog
rename to locale/ca-ES/kernel_version.dialog
diff --git a/locale/ca/no_gpu.dialog b/locale/ca-ES/no_gpu.dialog
similarity index 100%
rename from locale/ca/no_gpu.dialog
rename to locale/ca-ES/no_gpu.dialog
diff --git a/locale/ca/no_secondary_langs.dialog b/locale/ca-ES/no_secondary_langs.dialog
similarity index 100%
rename from locale/ca/no_secondary_langs.dialog
rename to locale/ca-ES/no_secondary_langs.dialog
diff --git a/locale/ca/primary_lang.dialog b/locale/ca-ES/primary_lang.dialog
similarity index 100%
rename from locale/ca/primary_lang.dialog
rename to locale/ca-ES/primary_lang.dialog
diff --git a/locale/ca/query_cpu_usage.intent b/locale/ca-ES/query_cpu_usage.intent
similarity index 100%
rename from locale/ca/query_cpu_usage.intent
rename to locale/ca-ES/query_cpu_usage.intent
diff --git a/locale/ca/query_extra_langs.intent b/locale/ca-ES/query_extra_langs.intent
similarity index 100%
rename from locale/ca/query_extra_langs.intent
rename to locale/ca-ES/query_extra_langs.intent
diff --git a/locale/ca/query_gpu.intent b/locale/ca-ES/query_gpu.intent
similarity index 100%
rename from locale/ca/query_gpu.intent
rename to locale/ca-ES/query_gpu.intent
diff --git a/locale/ca/query_kernel_version.intent b/locale/ca-ES/query_kernel_version.intent
similarity index 100%
rename from locale/ca/query_kernel_version.intent
rename to locale/ca-ES/query_kernel_version.intent
diff --git a/locale/ca/query_langs.intent b/locale/ca-ES/query_langs.intent
similarity index 100%
rename from locale/ca/query_langs.intent
rename to locale/ca-ES/query_langs.intent
diff --git a/locale/ca/query_memory_usage.intent b/locale/ca-ES/query_memory_usage.intent
similarity index 100%
rename from locale/ca/query_memory_usage.intent
rename to locale/ca-ES/query_memory_usage.intent
diff --git a/locale/ca/query_ovos_location.intent b/locale/ca-ES/query_ovos_location.intent
similarity index 100%
rename from locale/ca/query_ovos_location.intent
rename to locale/ca-ES/query_ovos_location.intent
diff --git a/locale/ca/query_primary_lang.intent b/locale/ca-ES/query_primary_lang.intent
similarity index 100%
rename from locale/ca/query_primary_lang.intent
rename to locale/ca-ES/query_primary_lang.intent
diff --git a/locale/ca/query_user_lang.intent b/locale/ca-ES/query_user_lang.intent
similarity index 100%
rename from locale/ca/query_user_lang.intent
rename to locale/ca-ES/query_user_lang.intent
diff --git a/locale/ca/query_user_location.intent b/locale/ca-ES/query_user_location.intent
similarity index 100%
rename from locale/ca/query_user_location.intent
rename to locale/ca-ES/query_user_location.intent
diff --git a/locale/ca/secondary_langs.dialog b/locale/ca-ES/secondary_langs.dialog
similarity index 100%
rename from locale/ca/secondary_langs.dialog
rename to locale/ca-ES/secondary_langs.dialog
diff --git a/locale/ca/system_location.dialog b/locale/ca-ES/system_location.dialog
similarity index 100%
rename from locale/ca/system_location.dialog
rename to locale/ca-ES/system_location.dialog
diff --git a/locale/ca/user_location.dialog b/locale/ca-ES/user_location.dialog
similarity index 100%
rename from locale/ca/user_location.dialog
rename to locale/ca-ES/user_location.dialog
diff --git a/locale/da/available_memory.dialog b/locale/da-DK/available_memory.dialog
similarity index 100%
rename from locale/da/available_memory.dialog
rename to locale/da-DK/available_memory.dialog
diff --git a/locale/da/cpu_percent.dialog b/locale/da-DK/cpu_percent.dialog
similarity index 100%
rename from locale/da/cpu_percent.dialog
rename to locale/da-DK/cpu_percent.dialog
diff --git a/locale/da/current_lang.dialog b/locale/da-DK/current_lang.dialog
similarity index 100%
rename from locale/da/current_lang.dialog
rename to locale/da-DK/current_lang.dialog
diff --git a/locale/da/current_memory.dialog b/locale/da-DK/current_memory.dialog
similarity index 100%
rename from locale/da/current_memory.dialog
rename to locale/da-DK/current_memory.dialog
diff --git a/locale/da/has_gpu.dialog b/locale/da-DK/has_gpu.dialog
similarity index 100%
rename from locale/da/has_gpu.dialog
rename to locale/da-DK/has_gpu.dialog
diff --git a/locale/da/kernel_version.dialog b/locale/da-DK/kernel_version.dialog
similarity index 100%
rename from locale/da/kernel_version.dialog
rename to locale/da-DK/kernel_version.dialog
diff --git a/locale/da/no_gpu.dialog b/locale/da-DK/no_gpu.dialog
similarity index 100%
rename from locale/da/no_gpu.dialog
rename to locale/da-DK/no_gpu.dialog
diff --git a/locale/da/no_secondary_langs.dialog b/locale/da-DK/no_secondary_langs.dialog
similarity index 100%
rename from locale/da/no_secondary_langs.dialog
rename to locale/da-DK/no_secondary_langs.dialog
diff --git a/locale/da/primary_lang.dialog b/locale/da-DK/primary_lang.dialog
similarity index 100%
rename from locale/da/primary_lang.dialog
rename to locale/da-DK/primary_lang.dialog
diff --git a/locale/da/query_cpu_usage.intent b/locale/da-DK/query_cpu_usage.intent
similarity index 100%
rename from locale/da/query_cpu_usage.intent
rename to locale/da-DK/query_cpu_usage.intent
diff --git a/locale/da/query_extra_langs.intent b/locale/da-DK/query_extra_langs.intent
similarity index 100%
rename from locale/da/query_extra_langs.intent
rename to locale/da-DK/query_extra_langs.intent
diff --git a/locale/da/query_gpu.intent b/locale/da-DK/query_gpu.intent
similarity index 100%
rename from locale/da/query_gpu.intent
rename to locale/da-DK/query_gpu.intent
diff --git a/locale/da/query_kernel_version.intent b/locale/da-DK/query_kernel_version.intent
similarity index 100%
rename from locale/da/query_kernel_version.intent
rename to locale/da-DK/query_kernel_version.intent
diff --git a/locale/da/query_langs.intent b/locale/da-DK/query_langs.intent
similarity index 100%
rename from locale/da/query_langs.intent
rename to locale/da-DK/query_langs.intent
diff --git a/locale/da/query_memory_usage.intent b/locale/da-DK/query_memory_usage.intent
similarity index 100%
rename from locale/da/query_memory_usage.intent
rename to locale/da-DK/query_memory_usage.intent
diff --git a/locale/da/query_ovos_location.intent b/locale/da-DK/query_ovos_location.intent
similarity index 100%
rename from locale/da/query_ovos_location.intent
rename to locale/da-DK/query_ovos_location.intent
diff --git a/locale/da/query_primary_lang.intent b/locale/da-DK/query_primary_lang.intent
similarity index 100%
rename from locale/da/query_primary_lang.intent
rename to locale/da-DK/query_primary_lang.intent
diff --git a/locale/da/query_user_lang.intent b/locale/da-DK/query_user_lang.intent
similarity index 100%
rename from locale/da/query_user_lang.intent
rename to locale/da-DK/query_user_lang.intent
diff --git a/locale/da/query_user_location.intent b/locale/da-DK/query_user_location.intent
similarity index 100%
rename from locale/da/query_user_location.intent
rename to locale/da-DK/query_user_location.intent
diff --git a/locale/da/secondary_langs.dialog b/locale/da-DK/secondary_langs.dialog
similarity index 100%
rename from locale/da/secondary_langs.dialog
rename to locale/da-DK/secondary_langs.dialog
diff --git a/locale/da/system_location.dialog b/locale/da-DK/system_location.dialog
similarity index 100%
rename from locale/da/system_location.dialog
rename to locale/da-DK/system_location.dialog
diff --git a/locale/da/user_location.dialog b/locale/da-DK/user_location.dialog
similarity index 100%
rename from locale/da/user_location.dialog
rename to locale/da-DK/user_location.dialog
diff --git a/locale/gl/available_memory.dialog b/locale/gl-ES/available_memory.dialog
similarity index 100%
rename from locale/gl/available_memory.dialog
rename to locale/gl-ES/available_memory.dialog
diff --git a/locale/gl/cpu_percent.dialog b/locale/gl-ES/cpu_percent.dialog
similarity index 100%
rename from locale/gl/cpu_percent.dialog
rename to locale/gl-ES/cpu_percent.dialog
diff --git a/locale/gl/current_lang.dialog b/locale/gl-ES/current_lang.dialog
similarity index 100%
rename from locale/gl/current_lang.dialog
rename to locale/gl-ES/current_lang.dialog
diff --git a/locale/gl/current_memory.dialog b/locale/gl-ES/current_memory.dialog
similarity index 100%
rename from locale/gl/current_memory.dialog
rename to locale/gl-ES/current_memory.dialog
diff --git a/locale/gl/has_gpu.dialog b/locale/gl-ES/has_gpu.dialog
similarity index 100%
rename from locale/gl/has_gpu.dialog
rename to locale/gl-ES/has_gpu.dialog
diff --git a/locale/gl/kernel_version.dialog b/locale/gl-ES/kernel_version.dialog
similarity index 100%
rename from locale/gl/kernel_version.dialog
rename to locale/gl-ES/kernel_version.dialog
diff --git a/locale/gl/no_gpu.dialog b/locale/gl-ES/no_gpu.dialog
similarity index 100%
rename from locale/gl/no_gpu.dialog
rename to locale/gl-ES/no_gpu.dialog
diff --git a/locale/gl/no_secondary_langs.dialog b/locale/gl-ES/no_secondary_langs.dialog
similarity index 100%
rename from locale/gl/no_secondary_langs.dialog
rename to locale/gl-ES/no_secondary_langs.dialog
diff --git a/locale/gl/primary_lang.dialog b/locale/gl-ES/primary_lang.dialog
similarity index 100%
rename from locale/gl/primary_lang.dialog
rename to locale/gl-ES/primary_lang.dialog
diff --git a/locale/gl/query_cpu_usage.intent b/locale/gl-ES/query_cpu_usage.intent
similarity index 100%
rename from locale/gl/query_cpu_usage.intent
rename to locale/gl-ES/query_cpu_usage.intent
diff --git a/locale/gl/query_extra_langs.intent b/locale/gl-ES/query_extra_langs.intent
similarity index 100%
rename from locale/gl/query_extra_langs.intent
rename to locale/gl-ES/query_extra_langs.intent
diff --git a/locale/gl/query_gpu.intent b/locale/gl-ES/query_gpu.intent
similarity index 100%
rename from locale/gl/query_gpu.intent
rename to locale/gl-ES/query_gpu.intent
diff --git a/locale/gl/query_kernel_version.intent b/locale/gl-ES/query_kernel_version.intent
similarity index 100%
rename from locale/gl/query_kernel_version.intent
rename to locale/gl-ES/query_kernel_version.intent
diff --git a/locale/gl/query_langs.intent b/locale/gl-ES/query_langs.intent
similarity index 100%
rename from locale/gl/query_langs.intent
rename to locale/gl-ES/query_langs.intent
diff --git a/locale/gl/query_memory_usage.intent b/locale/gl-ES/query_memory_usage.intent
similarity index 100%
rename from locale/gl/query_memory_usage.intent
rename to locale/gl-ES/query_memory_usage.intent
diff --git a/locale/gl/query_ovos_location.intent b/locale/gl-ES/query_ovos_location.intent
similarity index 100%
rename from locale/gl/query_ovos_location.intent
rename to locale/gl-ES/query_ovos_location.intent
diff --git a/locale/gl/query_primary_lang.intent b/locale/gl-ES/query_primary_lang.intent
similarity index 100%
rename from locale/gl/query_primary_lang.intent
rename to locale/gl-ES/query_primary_lang.intent
diff --git a/locale/gl/query_user_lang.intent b/locale/gl-ES/query_user_lang.intent
similarity index 100%
rename from locale/gl/query_user_lang.intent
rename to locale/gl-ES/query_user_lang.intent
diff --git a/locale/gl/query_user_location.intent b/locale/gl-ES/query_user_location.intent
similarity index 100%
rename from locale/gl/query_user_location.intent
rename to locale/gl-ES/query_user_location.intent
diff --git a/locale/gl/secondary_langs.dialog b/locale/gl-ES/secondary_langs.dialog
similarity index 100%
rename from locale/gl/secondary_langs.dialog
rename to locale/gl-ES/secondary_langs.dialog
diff --git a/locale/gl/system_location.dialog b/locale/gl-ES/system_location.dialog
similarity index 100%
rename from locale/gl/system_location.dialog
rename to locale/gl-ES/system_location.dialog
diff --git a/locale/gl/user_location.dialog b/locale/gl-ES/user_location.dialog
similarity index 100%
rename from locale/gl/user_location.dialog
rename to locale/gl-ES/user_location.dialog