branch develop updated (2cf3d10 -> 4a66b73)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 2cf3d10 Merge branch 'feature/6549-modify-or-delete-document-file' into develop new 4a66b73 fixes #6587 replace 'questions' by 'projects' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4a66b7344c2ab2647110d89569c22d9f1a8c8a9f Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 29 17:02:20 2015 +0100 fixes #6587 replace 'questions' by 'projects' Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 36 +++++++++++++++--------------- coselmar-ui/src/main/webapp/i18n/fr.js | 40 +++++++++++++++++----------------- 2 files changed, 38 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 4a66b7344c2ab2647110d89569c22d9f1a8c8a9f Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 29 17:02:20 2015 +0100 fixes #6587 replace 'questions' by 'projects' --- coselmar-ui/src/main/webapp/i18n/en.js | 36 +++++++++++++++--------------- coselmar-ui/src/main/webapp/i18n/fr.js | 40 +++++++++++++++++----------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 6415140..bb3ef88 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -29,9 +29,9 @@ var translateEN = { "menu.item.users.list" : "List", "menu.item.users.add" : "Add an user", "menu.item.users.add.client" : "Add a client", -"menu.item.questions" : "Questions", +"menu.item.questions" : "Projects", "menu.item.questions.list" : "List", -"menu.item.questions.add" : "Add a question", +"menu.item.questions.add" : "Add a project", "menu.item.documents" : "Documents", "menu.item.documents.list" : "List", "menu.item.documents.add" : "Add a document", @@ -70,8 +70,8 @@ var translateEN = { "document.metadata.keywords" : "Keywords", "document.metadata.depositor" : "Depositor", "document.metadata.depositDate" : "Deposit Date", -"document.metadata.relatedQuestions" : "Related Questions", -"document.metadata.view.relatedQuestions" : "Questions with this document", +"document.metadata.relatedQuestions" : "Related Projects", +"document.metadata.view.relatedQuestions" : "Projects with this document", "document.metadata.type" : "Type", "document.metadata.type.publication" : "Publication", "document.metadata.type.meetingPublication" : "Publication in meeting or symposium", @@ -106,7 +106,7 @@ var translateEN = { "document.message.requiredAuthors" : "Document authors is required.", "document.message.requiredCopyright" : "Document copyright is required.", "document.message.requiredSummary" : "A summary is required.", -"document.privacy.questionRestricted" : "Restricted to Question participants", +"document.privacy.questionRestricted" : "Restricted to Project participants", "document.button.download" : "Download", "document.button.openLink" : "Open link", @@ -114,10 +114,10 @@ var translateEN = { //Questions part -"question.list.title" : "Questions", -"question.add.title" : "Add a question", +"question.list.title" : "Projects", +"question.add.title" : "Add a Project", "question.newDocument.title" : "Contribute with new documents", -"question.modal.parents.title" : "Assign parent question", +"question.modal.parents.title" : "Assign parent project", "question.metadata.title" : "Title", "question.metadata.type" : "Type", @@ -138,7 +138,7 @@ var translateEN = { "question.metadata.relatedDocuments" : "Related documents", "question.metadata.conclusion" : "Conclusion", "question.metadata.conclusionDocuments" : "Conclusion Documents", -"question.metadata.parents" : "Parent questions", +"question.metadata.parents" : "Parent projects", "question.metadata.parentsPhrase" : "Produced or inspired by", "question.metadata.childrenPhrase" : "Has produced or inspired", "question.metadata.participants" : "Participants", @@ -148,17 +148,17 @@ var translateEN = { "question.message.requiredSummary" : "A summary is required.", "question.message.requiredThemes" : "At least one theme is required.", -"question.button.add" : "Add a question", +"question.button.add" : "Add a project", "question.button.reopen" : "Reopen", "question.button.close" : "Close", -"question.button.close.fullText" : "Close this question", +"question.button.close.fullText" : "Close this project", "question.button.adjourn" : "Adjourn", "question.button.validateChanges" : "Valide changes", "question.button.validateNewDocuments" : "Valide new documents", -"question.message.notAvailable" : "Cette question n'est pas disponible à la consultation.", -"question.message.notAllowedToCreate" : "You're not allowed to create question", -"question.message.delete" : "Do you really want to delete this question ?", +"question.message.notAvailable" : "This project is not available to consultation.", +"question.message.notAllowedToCreate" : "You're not allowed to create project", +"question.message.delete" : "Do you really want to delete this project ?", "question.message.closedOn" : "Closed on ", "question.message.info.type" : "Type could be of three kinds : <ul>\ <li>Meeting : seminar, roundtable, short meeting, ...</li>\ @@ -172,7 +172,7 @@ var translateEN = { "user.create.title" : "Add an user", "user.create.info" : "Create new user, with one of following roles :\ <ul>\ - <li>Supervisor : Kind of big manager, who relays member/client question and assigns expert on questions</li>\ + <li>Supervisor : Kind of big manager, who relays member/client project and assigns expert on projects</li>\ <li>Expert : Scientist, who can add new document in the repository and see other scientist documents (according file permission)</li>\ <li>Member</li>\ <li>Client</li>\ @@ -228,11 +228,11 @@ var translateEN = { "referential.search.title" : "Ask the Referential", "referential.search.keywords" : "Keywords", "referential.search.documents" : "Documents", -"referential.search.questions" : "Questions", +"referential.search.questions" : "Projects", "referential.search.singleDocumentFound" : "document found.", "referential.search.multipleDocumentsFound" : "documents found.", -"referential.search.singleQuestionFound" : "question found.", -"referential.search.multipleQuestionsFound" : "questions found.", +"referential.search.singleQuestionFound" : "project found.", +"referential.search.multipleQuestionsFound" : "projects found.", //Admin part diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index e2982b6..877e5ee 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -29,9 +29,9 @@ var translateFR = { "menu.item.users.list" : "Liste", "menu.item.users.add" : "Ajouter un utilisateur", "menu.item.users.add.client" : "Ajouter un client", -"menu.item.questions" : "Questions", +"menu.item.questions" : "Projets", "menu.item.questions.list" : "Liste", -"menu.item.questions.add" : "Ajouter une question", +"menu.item.questions.add" : "Ajouter un projet", "menu.item.documents" : "Documents", "menu.item.documents.list" : "Liste", "menu.item.documents.add" : "Ajouter un document", @@ -61,7 +61,7 @@ var translateFR = { <ul>\ <li>Publique : tous les membres peuvent accéder au document</li>\ <li>Privé : vous seul pouvez accéder au document</li>\ - <li>Restreint : le document ne sera accessible qu'aux participants d'une question ou est attaché le document</li>\ + <li>Restreint : le document ne sera accessible qu'aux participants d'un projet ou est attaché le document</li>\ </ul>", "document.metadata.name" : "Titre", @@ -70,8 +70,8 @@ var translateFR = { "document.metadata.keywords" : "Mots clefs", "document.metadata.depositor" : "Déposant", "document.metadata.depositDate" : "Date de dépôt", -"document.metadata.relatedQuestions" : "Questions relatives", -"document.metadata.view.relatedQuestions" : "Questions utilisant ce document", +"document.metadata.relatedQuestions" : "Projets relatifs", +"document.metadata.view.relatedQuestions" : "Projets utilisant ce document", "document.metadata.type" : "Type", "document.metadata.type.publication" : "Publication", "document.metadata.type.meetingPublication" : "Publication dans des colloques ou séminaires", @@ -106,7 +106,7 @@ var translateFR = { "document.message.requiredAuthors" : "Le ou les auteur(s) du document est requis.", "document.message.requiredCopyright" : "Le copyright du document est requis.", "document.message.requiredSummary" : "Un résumé est requis.", -"document.privacy.questionRestricted" : "Restreint aux participants de question.", +"document.privacy.questionRestricted" : "Restreint aux participants de projet.", "document.button.download" : "Télécharger", "document.button.openLink" : "Ouvrir le lien", @@ -114,10 +114,10 @@ var translateFR = { //Questions part -"question.list.title" : "Questions", -"question.add.title" : "Ajouter une question", +"question.list.title" : "Projets", +"question.add.title" : "Ajouter un projet", "question.newDocument.title" : "Contribuer avec de nouveaux documents", -"question.modal.parents.title" : "Désigner une question parente", +"question.modal.parents.title" : "Désigner un projet parent", "question.metadata.title" : "Titre", "question.metadata.type" : "Type", @@ -138,8 +138,8 @@ var translateFR = { "question.metadata.relatedDocuments" : "Documents associés", "question.metadata.conclusion" : "Conclusion", "question.metadata.conclusionDocuments" : "Documents de conclusion", -"question.metadata.parents" : "Questions parentes", -"question.metadata.parentsPhrase" : "Provoquée ou inspirée par", +"question.metadata.parents" : "Projets parents", +"question.metadata.parentsPhrase" : "Provoqué ou inspiré par", "question.metadata.childrenPhrase" : "A provoqué ou inspiré", "question.metadata.participants" : "Participants", @@ -148,17 +148,17 @@ var translateFR = { "question.message.requiredSummary" : "Un résumé est requis.", "question.message.requiredThemes" : "Au moins un thème est requis.", -"question.button.add" : "Ajouter une question", +"question.button.add" : "Ajouter un projet", "question.button.reopen" : "Réouvrir", "question.button.close" : "Fermer", -"question.button.close.fullText" : "Fermer cette question", +"question.button.close.fullText" : "Fermer cet projet", "question.button.adjourn" : "Ajourner", "question.button.validateChanges" : "Valider les modifications", "question.button.validateNewDocuments" : "Valider les nouveaux documents", -"question.message.notAvailable" : "Cette question n'est pas disponible à la consultation.", -"question.message.notAllowedToCreate" : "Vous n'êtes pas autorisé à déposer une question", -"question.message.delete" : "Êtes vous sûr de vouloir supprimer cette question ?", +"question.message.notAvailable" : "Cet projet n'est pas disponible à la consultation.", +"question.message.notAllowedToCreate" : "Vous n'êtes pas autorisé à déposer un projet", +"question.message.delete" : "Êtes vous sûr de vouloir supprimer ce projet ?", "question.message.closedOn" : "Fermé le ", "question.message.info.type" : "Le type peut être l'un des trois suivants :<ul>\ <li>Réunion : séminaire, table ronde, ...</li>\ @@ -172,7 +172,7 @@ var translateFR = { "user.create.title" : "Ajouter un utilisateur", "user.create.info" : "Créer un nouvel utilisateur, avec l'un des rôles suivants :\ <ul>\ - <li>Superviseur : Manager qui relaie les questions de clients et qui assigne les experts aux questions</li>\ + <li>Superviseur : Manager qui relaie les projets de clients et qui assigne les experts aux projets</li>\ <li>Expert : Scientifique, qui peut ajouter des nouveaux documents à la base de connaissance et voir les documents des autres scientifiques (en fonction des permissions)</li>\ <li>Membre</li>\ <li>Client</li>\ @@ -228,11 +228,11 @@ var translateFR = { "referential.search.title" : "Rechercher dans le référentiel", "referential.search.keywords" : "Mots clefs", "referential.search.documents" : "Documents", -"referential.search.questions" : "Questions", +"referential.search.questions" : "Projets", "referential.search.singleDocumentFound" : "document trouvé.", "referential.search.multipleDocumentsFound" : "documents trouvés.", -"referential.search.singleQuestionFound" : "question trouvée.", -"referential.search.multipleQuestionsFound" : "questions trouvées.", +"referential.search.singleQuestionFound" : "projet trouvé.", +"referential.search.multipleQuestionsFound" : "projets trouvés.", //Admin part -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm