Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
6da69208
Commit
6da69208
authored
13 years ago
by
Regis Houssin
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of
git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop
parents
41144643
20c1e29d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/langs/en_US/admin.lang
+1
-1
1 addition, 1 deletion
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/admin.lang
+1
-1
1 addition, 1 deletion
htdocs/langs/fr_FR/admin.lang
with
2 additions
and
2 deletions
htdocs/langs/en_US/admin.lang
+
1
−
1
View file @
6da69208
...
@@ -663,7 +663,7 @@ DictionnarySocialContributions=Social contributions types
...
@@ -663,7 +663,7 @@ DictionnarySocialContributions=Social contributions types
DictionnaryVAT=VAT Rates or Sales Tax Rates
DictionnaryVAT=VAT Rates or Sales Tax Rates
DictionnaryPaymentConditions=Payment terms
DictionnaryPaymentConditions=Payment terms
DictionnaryPaymentModes=Payment modes
DictionnaryPaymentModes=Payment modes
DictionnaryTypeContact=Contact types
DictionnaryTypeContact=Contact
/Address
types
DictionnaryEcotaxe=Ecotax (WEEE)
DictionnaryEcotaxe=Ecotax (WEEE)
DictionnaryPaperFormat=Paper formats
DictionnaryPaperFormat=Paper formats
DictionnaryFees=Type of fees
DictionnaryFees=Type of fees
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/fr_FR/admin.lang
+
1
−
1
View file @
6da69208
...
@@ -670,7 +670,7 @@ DictionnarySocialContributions= Types de charges sociales
...
@@ -670,7 +670,7 @@ DictionnarySocialContributions= Types de charges sociales
DictionnaryVAT= Taux de TVA (ou de taxes de ventes US)
DictionnaryVAT= Taux de TVA (ou de taxes de ventes US)
DictionnaryPaymentConditions= Conditions de règlement
DictionnaryPaymentConditions= Conditions de règlement
DictionnaryPaymentModes= Modes de paiements
DictionnaryPaymentModes= Modes de paiements
DictionnaryTypeContact= Types de contacts
DictionnaryTypeContact= Types de contacts
/adresses
DictionnaryEcotaxe= Barèmes Eco-participation (DEEE)
DictionnaryEcotaxe= Barèmes Eco-participation (DEEE)
DictionnaryPaperFormat= Format papiers
DictionnaryPaperFormat= Format papiers
DictionnaryFees= Types de déplacement et notes de frais
DictionnaryFees= Types de déplacement et notes de frais
...
...
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