patch: conflict resolved

src/locales/en.json

@@ -77,6 +77,7 @@
       "backlink": "Back",
       "title": " Create a circle",
       "labelStatus": "Circle status",
+      "labelCommunity": "Circle community *",
       "labelName": "Circle name *",
       "labelSubtitle": "Circle headline *",
       "labelDescription": "Circle description",
@@ -88,6 +89,7 @@
       "backlink": "Back",
       "title": "Edit your circle",
       "labelStatus": "Circle status *",
+      "labelCommunity": "Circle community *",
       "labelName": "Circle name *",
       "labelOwner": "Admin *",
       "labelDescription": "Circle description",
@@ -104,12 +106,12 @@
       "buttonMobile": "MENU",
       "subTitle": "Circles",
       "buttonCreate": " Create a circle",
-      "tableHeader1": "Name",
-      "tableHeader2": "Admins",
-      "tableHeader3": "Join",
       "buttonQuit": "Leave",
       "buttonJoin": "Join",
-      "searchBy": "Find a circle by name"
+      "searchBy": "Find a circle",
+      "searchButton": "search",
+      "tabJoin": "Discover circles",
+      "tabLeave": "My circles"
     },
     "left": {
       "paragraphQuit": "You left this circle.",

src/locales/es.json

@@ -77,6 +77,7 @@
       "backlink": "Atrás",
       "title": "Crear un círculo",
       "labelStatus": "Estado del círculo",
+      "labelCommunity": "Comunidad del círculo *",
       "labelName": "Nombre del círculo *",
       "labelSubtitle": "Subtítulo del círculo *",
       "labelDescription": "Descripción del círculo",
@@ -88,6 +89,7 @@
       "backlink": "Atrás",
       "title": "Modificá tu círculo",
       "labelStatus": "Estado del círculo *",
+      "labelCommunity": "Comunidad del círculo *",
       "labelName": "Nombre del círculo *",
       "labelOwner": "Administrador/a *",
       "labelSubtitle": "Subtítulo del círculo *",
@@ -104,12 +106,12 @@
       "buttonMobile": "MENÚ",
       "subTitle": "Círculos",
       "buttonCreate": "Crear un círculo",
-      "tableHeader1": "Nombre",
-      "tableHeader2": "Administradorxs",
-      "tableHeader3": "Unirse",
       "buttonQuit": "Salir",
       "buttonJoin": "Unirse",
-      "searchBy": "Busca un círculo por nombre "
+      "searchBy": "Busca un círculo",
+      "searchButton": "Buscar",
+      "tabJoin": "Descubrir los círculos",
+      "tabLeave": "Mis círculos"
     },
     "left": {
       "paragraphQuit": "Dejaste este círculo.",

src/locales/fr.json

@@ -77,6 +77,7 @@
       "backlink": "Retour",
       "title": "Créer un cercle",
       "labelStatus": "Statut du cercle",
+      "labelCommunity": "Communauté du cercle *",
       "labelName": "Nom du cercle *",
       "labelSubtitle": "Sous-titre du cercle *",
       "labelDescription": "Description du cercle",
@@ -88,12 +89,12 @@
       "backlink": "Retour",
       "title": "Modifie ton cercle",
       "labelStatus": "Statut du cercle *",
+      "labelCommunity": "Communauté du cercle *",
       "labelName": "Nom du cercle *",
       "labelOwner": "Administrateur ou administratrice *",
       "labelDescription": "Description du cercle",
       "descriptionHelp": "Vous pouvez utiliser Markdown",
       "labelSubtitle": "Sous-titre du cercle *",
-      "labelStatus": "Statut *",
       "subTitle": "Liste des membres :",
       "tableHeader1": "Nom",
       "tableHeader2": "Accès",
@@ -105,12 +106,12 @@
       "buttonMobile": "MENU",
       "subTitle": "Cercles",
       "buttonCreate": "Créer un cercle",
-      "tableHeader1": "Nom",
-      "tableHeader2": "Administrateurs",
-      "tableHeader3": "Rejoindre",
       "buttonQuit": "Quitter",
       "buttonJoin": "Rejoindre",
-      "searchBy": "Rechercher un cercle par nom"
+      "searchBy": "Trouver un cercle",
+      "searchButton": "Rechercher",
+      "tabJoin": "Découvrir des cercles",
+      "tabLeave": "Mes cercles"
     },
     "left": {
       "paragraphQuit": "Tu as quitté ce cercle.",