Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keeping fr language in sync #2591

Merged
merged 25 commits into from
Oct 5, 2020
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6130871
Updating FRENCH after Beta34
ebeauchamps Jul 6, 2020
7dea7fb
Merge branch 'master' into master
ebeauchamps Jul 6, 2020
541377a
Small changes to FRENCH
ebeauchamps Jul 6, 2020
1cc4331
Merge branch 'master' into master
ebeauchamps Jul 7, 2020
0870d60
French translation tweaks
ebeauchamps Jul 7, 2020
b4f0e1b
EOL: deleting blank space
ebeauchamps Jul 7, 2020
95ff980
Caps
ebeauchamps Jul 7, 2020
02932b8
FRENCH update after Beta36
ebeauchamps Jul 9, 2020
94a4304
Merge branch 'master' into master
ebeauchamps Jul 9, 2020
5cef084
Merge pull request #6 from statamic/master
ebeauchamps Jul 10, 2020
d3b9a89
Updating FRENCH CP for 3.0.7
ebeauchamps Sep 14, 2020
b6d593d
Merge pull request #7 from statamic/master
ebeauchamps Sep 15, 2020
e14f80a
Updating French CP for 3.0.8
ebeauchamps Sep 15, 2020
eb4f5f4
Update fr.json
ebeauchamps Sep 15, 2020
96fe799
Update fieldtypes.php
ebeauchamps Sep 16, 2020
7fc1466
Merge branch 'master' into master
ebeauchamps Sep 16, 2020
48b190a
Updating fr_FR for 3.0.11
ebeauchamps Sep 22, 2020
9a8917e
Updating fr_FR for 3.0.12
ebeauchamps Sep 23, 2020
9b84663
Updating fr_FR for 3.0.13
ebeauchamps Sep 25, 2020
93991cb
Merge remote-tracking branch 'upstream/master'
ebeauchamps Sep 28, 2020
89ccea5
Updating messages.php fr_FR for 3.0.14
ebeauchamps Oct 1, 2020
efcf9d0
Merge branch 'master' of git://github.com/statamic/cms into statamic-…
ebeauchamps Oct 1, 2020
575f698
Merge
ebeauchamps Oct 1, 2020
587864f
Merge pull request #8 from statamic/master
ebeauchamps Oct 1, 2020
a09ce00
Merge remote-tracking branch 'upstream/master'
ebeauchamps Oct 5, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/lang/fr/messages.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
'fieldset_import_prefix_instructions' => 'Le préfixe à appliquer à chaque champ lors de leur importation. Ex. hero_',
'fieldset_intro' => 'Les jeux de champs sont des compagnons optionnels des Blueprints qui vous permettent de créer des partiels utilisables dans ces Blueprints.',
'fieldset_link_fields_prefix_instructions' => 'Tous les champs du jeu de champs lié seront préfixés avec ceci. Utile quand vous voulez importer les mêmes champs plusieurs fois.',
'fieldsets_handle_instructions' => 'Utilisé pour référencer cet ensemble de champs ailleurs. Il n\'est pas anodin de changer plus tard.',
'fieldsets_handle_instructions' => 'Comment vous allez faire référence à ce jeu de champs sur le frontal. Ne peut pas être facilement changé.',
'fieldsets_title_instructions' => 'Décrit généralement quels champs seront inclus, comme "Bloc Image"',
'focal_point_instructions' => 'La définition d’un point focal permet un recadrage dynamique des photos avec un sujet qui reste dans le cadre.',
'focal_point_previews_are_examples' => 'Les aperçus de recadrage n’ont qu’une valeur d’exemple',
Expand Down