From 509c4b021bdc4fc8fe0b4a13fe634cb97c47c3e2 Mon Sep 17 00:00:00 2001
From: Hadrien Froger <hadrien@octree.ch>
Date: Fri, 18 Oct 2024 10:39:09 +0100
Subject: [PATCH] fix: merge

---
 config/locales/decidim-geo.de.yml | 6 +++---
 config/locales/decidim-geo.fr.yml | 6 +++---
 config/locales/decidim-geo.pt.yml | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/locales/decidim-geo.de.yml b/config/locales/decidim-geo.de.yml
index 80f3ce1..0c1a77c 100644
--- a/config/locales/decidim-geo.de.yml
+++ b/config/locales/decidim-geo.de.yml
@@ -40,7 +40,7 @@ de:
       admin:
         geo_configs:
           map_config_title: Kartenkonfigurationen
-          spaces_config_title: Configurations for Participatory Spaces
+          spaces_config_title: Einstellungen für partizipative Bereiche
           only_assemblies: Ausschliesslich Gremien auf der Gremienübersichtsseite anzeigen	
           only_processes: Ausschliesslich Prozesse auf der Prozessübersichtsseite anzeigen	
           default_filter:
@@ -112,12 +112,12 @@ de:
         reset_button: "Zurücksetzen"
         apply_button: "Anwenden"
         results:
-          warn_empty: Nothing here, change filters to update
+          warn_empty: Keine Daten mit dieser Filterauswahl
           zero: no results
           one: 1 result
           other: "%count% results"
         empty:
-          message: "Nothing here, change filters to update"
+          message: "Keine Daten mit dieser Filterauswahl"
           update_button: "Update"
         geo:
           label: Zeigen
diff --git a/config/locales/decidim-geo.fr.yml b/config/locales/decidim-geo.fr.yml
index c9aef0b..1c21943 100644
--- a/config/locales/decidim-geo.fr.yml
+++ b/config/locales/decidim-geo.fr.yml
@@ -40,7 +40,7 @@ fr:
       admin:
         geo_configs:
           map_config_title: Configurations de la carte
-          spaces_config_title: Configurations for Participatory Spaces
+          spaces_config_title: Configurations des Espaces Participatifs
           only_assemblies: Afficher uniquement les assemblées dans Assemblées
           only_processes: Afficher uniquement les processus dans Processus
           default_filter:
@@ -112,12 +112,12 @@ fr:
         reset_button: "Annuler"
         apply_button: "Afficher"
         results:
-          warn_empty: Nothing here, change filters to update
+          warn_empty: Aucun résultat, modifier les filters pour mettre à jour
           zero: no results
           one: 1 result
           other: "%count% results"
         empty:
-          message: "Nothing here, change filters to update"
+          message: "Aucun résultat, modifier les filters pour mettre à jour"
           update_button: "Update"
         geo:
           label: Localisation
diff --git a/config/locales/decidim-geo.pt.yml b/config/locales/decidim-geo.pt.yml
index 5d84d52..bd3d566 100644
--- a/config/locales/decidim-geo.pt.yml
+++ b/config/locales/decidim-geo.pt.yml
@@ -5,7 +5,7 @@ pt:
       assembly:
         decidim_geo_space_address: Endereço
       participatory_process:
-        decidim_geo_space_address: Adresse
+        decidim_geo_space_address: Endereço
       component:
         decidim_geo_avoid_index: Hide geolocated points outside this process
   decidim:
@@ -40,7 +40,7 @@ pt:
       admin:
         geo_configs:
           map_config_title: Configurações do mapa
-          spaces_config_title: Configurations for Participatory Spaces
+          spaces_config_title: Configurações de espaços participativos
           only_assemblies: Exibir apenas reuniões em Reuniões
           only_processes: Exibir apenas processos em Processos
           default_filter:
@@ -112,12 +112,12 @@ pt:
         reset_button: "Restaurar"
         apply_button: "Aplicar"
         results:
-          warn_empty: Nothing here, change filters to update
+          warn_empty: Não há dados com esses filtros, muda os filtros para atualizar
           zero: no results
           one: 1 result
           other: "%count% results"
         empty:
-          message: "Nothing here, change filters to update"
+          message: "Não há dados com esses filtros, muda os filtros para atualizar"
           update_button: "Update"
         geo:
           label: Mostrar