autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update: merge conflict resolved + fixes

Browse Source
This commit is contained in:
gaelle morin
2021-01-21 23:54:20 +01:00
parent ef2b2295e4 32b055c2db
commit bc64019b63
28 changed files with 274 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/locales/en.json
View File

@ -70,18 +70,22 @@
"title": " Create a circle",
"labelStatus": "Statut du circle",
"labelName": "Circle name *",
"labelDescription": "Circle headline *",
"labelSubtitle": "Circle headline *",
"labelDescription": "Circle description",
"descriptionHelp": "You can use markdown",
"buttonSubmit": "Save"
},
"edit": {
"buttonDelete": "Remove",
"backlink": "Back",
"title": "Edit your circle",
"labelStatus": "Circle status",
"labelStatus": "Circle status *",
"labelName": "Circle name *",
"labelOwner": "Admin *",
"labelDescription": "Circle headline",
"subTitle": "Members list",
"labelDescription": "Circle description",
"descriptionHelp": "You can use markdown",
"labelSubtitle": "Circle headline *",
"subTitle": "Members list :",
"tableHeader1": "Name",
"tableHeader2": "Access",
"buttonSubmit": "Save",
@ -111,6 +115,7 @@
"buttonDelete": "Remove the circle",
"buttonQuit": "Leave the circle",
"buttonJoin": "Join the circle",
"description": "Description :",
"subTitle": "Members :"
}
},
@ -134,6 +139,8 @@
"backlink": "Back",
"title": " Create a nouveau project",
"labelName": "Project name*",
"labelDescription": "Poject description",
"descriptionHelp": "You can use markdown",
"labelCustomer": "Customer name*",
"labelDescription": "Description",
"labelCaptain": "Project captain*",
@ -146,8 +153,9 @@
"labelName": "Project name *",
"labelCustomer": "Customer name *",
"labelCaptain": "Capitain *",
"labelDescription": "Description",
"subTitle": "Team members",
"labelDescription": "Project description",
"descriptionHelp": "You can use markdown",
"subTitle": "Team members :",
"tableHeader1": "Name",
"tableHeader2": "Access",
"buttonSubmit": "Save",
@ -183,6 +191,7 @@
"buttonQuit": "Leave the project",
"buttonJoin": "Join the project",
"captain": "Captain :",
"description": "Description :",
"subTitle": "Team :"
}
},
@ -213,4 +222,4 @@
"private": "Private",
"public": "Public"
}
}
}

21
src/locales/es.json
View File

@ -70,18 +70,22 @@
"title": "Crear un círculo",
"labelStatus": "Estado del círculo",
"labelName": "Nombre del círculo *",
"labelDescription": "Subtítulo del círculo *",
"labelSubtitle": "Subtítulo del círculo *",
"labelDescription": "Descripción del círculo",
"descriptionHelp": "Puedes usar markdown",
"buttonSubmit": "Guardar"
},
"edit": {
"buttonDelete": "Eliminar",
"backlink": "Atrás",
"title": "Modificá tu círculo",
"labelStatus": "Estado del círculo",
"labelStatus": "Estado del círculo *",
"labelName": "Nombre del círculo *",
"labelOwner": "Administrador/a *",
"labelDescription": "Subtítulo del círculo",
"subTitle": "Listado de miembrxs",
"labelSubtitle": "Subtítulo del círculo *",
"labelDescription": "Descripción del círculo",
"descriptionHelp": "Puedes usar markdown",
"subTitle": "Listado de miembrxs: ",
"tableHeader1": "Nombre",
"tableHeader2": "Acceso",
"buttonSubmit": "Guardar",
@ -111,6 +115,7 @@
"buttonDelete": "Eliminar el círculo",
"buttonQuit": "Salir del círculo",
"buttonJoin": "Unirse al círculo",
"description": "Descripción :",
"subTitle": "Miembrxs: "
}
},
@ -134,6 +139,8 @@
"backlink": "Atrás",
"title": "Crear un proyecto nuevo",
"labelName": "Nombre del proyecto *",
"labelDescription": "Descripción del proyecto",
"descriptionHelp": "Puedes usar markdown",
"labelCustomer": "Nombre del/la clientx *",
"labelDescription": "Description",
"labelCaptain": "Líder del proyecto *",
@ -146,8 +153,9 @@
"labelName": "Nombre del proyecto *",
"labelCustomer": "Nombre del/la clientx *",
"labelCaptain": "Capitain *",
"labelDescription": "Description",
"subTitle": "Lista de miembrxs",
"labelDescription": "Descripción del proyecto",
"descriptionHelp": "Puedes usar markdown",
"subTitle": "Lista de miembrxs: ",
"tableHeader1": "Nombre",
"tableHeader2": "Acceso",
"buttonSubmit": "Guardar",
@ -183,6 +191,7 @@
"buttonQuit": "Salir del proyecto",
"buttonJoin": "Unirse al proyecto",
"captain": "Líder : ",
"description": "Descripción :",
"subTitle": "Equipo : "
}
},

24
src/locales/fr.json
View File

@ -70,18 +70,23 @@
"title": "Créer un cercle",
"labelStatus": "Statut du cercle",
"labelName": "Nom du cercle *",
"labelDescription": "Sous-titre du cercle *",
"labelSubtitle": "Sous-titre du cercle *",
"labelDescription": "Description du cercle",
"descriptionHelp": "Vous pouvez utiliser Markdown",
"buttonSubmit": "Enregistrer"
},
"edit": {
"buttonDelete": "Retirer",
"backlink": "Retour",
"title": "Modifie ton cercle",
"labelStatus": "Statut du cercle",
"labelStatus": "Statut du cercle *",
"labelName": "Nom du cercle *",
"labelOwner": "Administrateur ou administratrice *",
"labelDescription": "Sous-titre du cercle",
"subTitle": "Liste des membres",
"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",
"buttonSubmit": "Enregistrer",
@ -111,6 +116,7 @@
"buttonDelete": "Supprimer le cercle",
"buttonQuit": "Quitter le cercle",
"buttonJoin": "Rejoindre le cercle",
"description": "Description :",
"subTitle": "Membres :"
}
},
@ -134,6 +140,8 @@
"backlink": "Retour",
"title": "Créer un nouveau projet",
"labelName": "Nom du projet *",
"labelDescription": "Description du projet",
"descriptionHelp": "Vous pouvez utiliser Markdown",
"labelCustomer": "Nom du client*",
"labelDescription": "Description",
"labelCaptain": "Capitaine du projet*",
@ -146,8 +154,9 @@
"labelName": "Nom du projet *",
"labelCustomer": "Nom du client *",
"labelCaptain": "Capitaine *",
"labelDescription": "Description",
"subTitle": "Liste des membres",
"labelDescription": "Description du projet",
"descriptionHelp": "Vous pouvez utiliser Markdown",
"subTitle": "Liste des membres :",
"tableHeader1": "Nom",
"tableHeader2": "Accès",
"buttonSubmit": "Enregistrer",
@ -183,6 +192,7 @@
"buttonQuit": "Quitter le projet",
"buttonJoin": "Rejoindre le projet",
"captain": "Capitaine :",
"description": "Description :",
"subTitle": "Equipe :"
}
},
@ -213,4 +223,4 @@
"private": "Privé",
"public": "Public"
}
}
}