Skip to content

Commit

Permalink
manual 3-way merge to align translations
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Eberle committed Nov 18, 2019
1 parent 453cce9 commit fa48bcc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Resources/Private/Language/fr.locallang.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</trans-unit>
<trans-unit id="tableheader.type" resname="tableheader.type">
<source>Type</source>
<target state="needs-translation">Type</target>
<target state="translated">Type</target>
</trans-unit>
<trans-unit id="tableheader.provider" resname="tableheader.provider">
<source>Provider</source>
Expand All @@ -81,7 +81,7 @@
</trans-unit>
<trans-unit id="type.cookie_http" resname="type.cookie_http">
<source>HTTP</source>
<target state="needs-translation">HTTP</target>
<target state="translated">HTTP</target>
</trans-unit>
<trans-unit id="group.marketing" resname="group.marketing">
<source>Marketing</source>
Expand Down

0 comments on commit fa48bcc

Please sign in to comment.