Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
strass
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hub
strass
Commits
5f40d782
Commit
5f40d782
authored
3 months ago
by
Bryan BRANCOTTE
Browse files
Options
Downloads
Plain Diff
Merge branch 'lang-improvment' into 'master'
Improve lang See merge request
!247
parents
d4ea9aec
f5e94b84
No related branches found
No related tags found
1 merge request
!247
Improve lang
Pipeline
#150807
passed
3 months ago
Stage: build
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/strass/strass_app/locale/en/LC_MESSAGES/django.po
+9
-6
9 additions, 6 deletions
src/strass/strass_app/locale/en/LC_MESSAGES/django.po
src/strass/strass_app/locale/fr/LC_MESSAGES/django.po
+10
-8
10 additions, 8 deletions
src/strass/strass_app/locale/fr/LC_MESSAGES/django.po
with
19 additions
and
14 deletions
src/strass/strass_app/locale/en/LC_MESSAGES/django.po
+
9
−
6
View file @
5f40d782
...
@@ -728,7 +728,9 @@ msgid "MassMailingForm.body.placeholder"
...
@@ -728,7 +728,9 @@ msgid "MassMailingForm.body.placeholder"
msgstr ""
msgstr ""
"Dear [first_name] [last_name],\n"
"Dear [first_name] [last_name],\n"
"\n"
"\n"
"The email we have for you is [email], if you are a candidate your "
"The email we have for you is [email].\n"
"\n"
"If you are a candidate your "
"application is accessible at [application_url].\n"
"application is accessible at [application_url].\n"
"\n"
"\n"
"If you are a reviewer, your editable reviews are:\n"
"If you are a reviewer, your editable reviews are:\n"
...
@@ -2846,12 +2848,13 @@ msgstr ""
...
@@ -2846,12 +2848,13 @@ msgstr ""
msgid "ComputeAutoReviewView information about"
msgid "ComputeAutoReviewView information about"
msgstr ""
msgstr ""
"When re-running assignation data loss is prevented. Any review that is "
"Re-"
"either manually assigned or already answered by the author will be kept, i.e "
"a reviewer will not be unsigned if zhe have started to review.<br/>Re-"
"running the assignation is useful when new reviewers arrive or new conflicts "
"running the assignation is useful when new reviewers arrive or new conflicts "
"of interest declared, see <a href=\"/doc/configure_instance.html#assign-"
"of interest declared (cf <a href=\"/doc/configure_instance.html#assign-"
"reviewers-again\" target=\"_blank\">documentation</a> for more."
"reviewers-again\" target=\"_blank\">documentation</a> for more).<br/>"
"Note that data loss is prevented when re-running assignation. Any review that is "
"either manually assigned or already answered by the author will be kept, i.e "
"a reviewer will not be unsigned if zhe have started to review."
msgid "MassMailingWizard.Prepare.title"
msgid "MassMailingWizard.Prepare.title"
msgstr "Preparing the mass mailing"
msgstr "Preparing the mass mailing"
...
...
This diff is collapsed.
Click to expand it.
src/strass/strass_app/locale/fr/LC_MESSAGES/django.po
+
10
−
8
View file @
5f40d782
...
@@ -779,9 +779,10 @@ msgid "MassMailingForm.body.placeholder"
...
@@ -779,9 +779,10 @@ msgid "MassMailingForm.body.placeholder"
msgstr ""
msgstr ""
"Bonjour [prenom] [nom]\n"
"Bonjour [prenom] [nom]\n"
"\n"
"\n"
"Votre courriel est [mail]. Si vous êtes un.e candidat.e, vous pouvez "
"Votre courriel est [mail].\n"
"consulter et modifier votre candidature en utilisant le lien suivant visible "
"\n"
"à [url_candidature].\n"
"Si vous êtes un.e candidat.e, vous pouvez "
"consulter et modifier votre candidature en utilisant le lien suivant [url_candidature].\n"
"\n"
"\n"
"Si vous êtes un reviewer, vos reviews editable sont :\n"
"Si vous êtes un reviewer, vos reviews editable sont :\n"
"[liste_reviews_editable]\n"
"[liste_reviews_editable]\n"
...
@@ -798,7 +799,7 @@ msgstr "Reviewers avec des reviews éditables et pas encore finalisées (%i)"
...
@@ -798,7 +799,7 @@ msgstr "Reviewers avec des reviews éditables et pas encore finalisées (%i)"
#, python-format
#, python-format
msgid "Reviewers with no associated profile (%i)"
msgid "Reviewers with no associated profile (%i)"
msgstr "Reviewers qui n'ont pas indiqués leur profiles (%i)"
msgstr "Reviewers qui n'ont pas indiqués leur profiles
évaluables
(%i)"
#, python-format
#, python-format
msgid "Pending reviewers (%i)"
msgid "Pending reviewers (%i)"
...
@@ -2975,13 +2976,14 @@ msgstr ""
...
@@ -2975,13 +2976,14 @@ msgstr ""
msgid "ComputeAutoReviewView information about"
msgid "ComputeAutoReviewView information about"
msgstr ""
msgstr ""
"Relancer l'assignation est utile en cas de "
"nouveau reviewer, ou de nouveau conflit d'intérêt (cf <a href=\"/doc/"
"configure_instance.html#assign-reviewers-again\" "
"target=\"_blank\">documentation</a>).<br/>"
"Vous ne pouvez pas perdre de donnée en relançant l'assignation. Toutes les "
"Vous ne pouvez pas perdre de donnée en relançant l'assignation. Toutes les "
"reviews attribuées manuellement ou déjà commencées seront conservées. En "
"reviews attribuées manuellement ou déjà commencées seront conservées. En "
"d'autre terme un(e) reviewer ne sera pas dé-assigné d'un candidat si iel à "
"d'autre terme un(e) reviewer ne sera pas dé-assigné d'un candidat si iel à "
"commencé à écrire la review.<br/>Relancer l'assignation est utile en cas de "
"commencé à écrire la review."
"nouveau reviewer, ou de nouveau conflit d'intérêt, voir la <a href=\"/doc/"
"configure_instance.html#assign-reviewers-again\" "
"target=\"_blank\">documentation</a>."
msgid "MassMailingWizard.Prepare.title"
msgid "MassMailingWizard.Prepare.title"
msgstr "Préparer le message"
msgstr "Préparer le message"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment