Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchParapheur
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchParapheur
Commits
b899640a
Commit
b899640a
authored
2 years ago
by
Jean-Laurent DUZANT
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #17671 TIME 0:01 fix merge confict
parent
d71acc13
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lang/en.json
+4
-1
4 additions, 1 deletion
lang/en.json
lang/fr.json
+4
-1
4 additions, 1 deletion
lang/fr.json
with
8 additions
and
2 deletions
lang/en.json
+
4
−
1
View file @
b899640a
...
@@ -646,6 +646,9 @@
...
@@ -646,6 +646,9 @@
"externalComponentsDesc"
:
"Maarch Parapheur relies on a few external components. Thanks to their developers!"
,
"externalComponentsDesc"
:
"Maarch Parapheur relies on a few external components. Thanks to their developers!"
,
"credits"
:
"Credits"
,
"credits"
:
"Credits"
,
"allCredits"
:
"And the whole Maarch community!"
,
"allCredits"
:
"And the whole Maarch community!"
,
"licence"
:
"GNU GPLv3 license"
"licence"
:
"GNU GPLv3 license"
,
"can_purgeAdmin"
:
"Supprimer logiquement les processus de signature interrompus ou terminés"
,
"purgeDocument"
:
"Supprimer le document"
,
"downloadProofDesc"
:
"Le téléchargement du dossier complet vous sera proposé après suppression du document"
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
lang/fr.json
+
4
−
1
View file @
b899640a
...
@@ -645,6 +645,9 @@
...
@@ -645,6 +645,9 @@
"externalComponentsDesc"
:
"Maarch Parapheur s'appuie sur quelques composants externes. Merci à leurs développeurs !"
,
"externalComponentsDesc"
:
"Maarch Parapheur s'appuie sur quelques composants externes. Merci à leurs développeurs !"
,
"credits"
:
"Crédits"
,
"credits"
:
"Crédits"
,
"allCredits"
:
"Et toute la communauté Maarch !"
,
"allCredits"
:
"Et toute la communauté Maarch !"
,
"licence"
:
"licence GNU GPLv3"
"licence"
:
"licence GNU GPLv3"
,
"can_purgeAdmin"
:
"Logically and physically remove interrupted or terminated signature processes"
,
"purgeDocument"
:
"Delete the document"
,
"downloadProofDesc"
:
"The download of the complete file will be proposed to you after deletion of the document"
}
}
}
}
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