Merge branch 'translate-develop' into develop

Browse Source

# Conflicts:
#	cookbook/locale/fr/LC_MESSAGES/django.po

...

This commit is contained in:

vabene1111

2021-08-17 08:41:53 +02:00

parent 478a3272e5 3f848b42af

commit 8ecb1af16c

2 changed files with 332 additions and 442 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

622

cookbook/locale/fr/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff