2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-16 03:55:41 +00:00
Commit Graph

6354 Commits

Author SHA1 Message Date
4aa83abdc6 Fix: New translations django.po from Crowdin 2021-07-03 22:44:04 +10:00
84200754aa Fix: New translations django.po from Crowdin 2021-07-03 22:44:03 +10:00
143622f82c Fix: New translations django.po from Crowdin 2021-07-03 16:27:17 +10:00
a31fad67f3 Fix: New translations django.po from Crowdin 2021-07-03 16:27:16 +10:00
3f9f0ba805 Fix: New translations django.po from Crowdin 2021-07-03 16:27:15 +10:00
d4bcfd8c46 Fix: New translations django.po from Crowdin 2021-07-03 16:27:14 +10:00
681c885921 Fix: New translations django.po from Crowdin 2021-07-03 16:27:12 +10:00
9eba4c2485 Fix: New translations django.po from Crowdin 2021-07-03 16:27:11 +10:00
c4659a688e Fix: New translations django.po from Crowdin 2021-07-03 16:27:10 +10:00
f632e379dd Fix: New translations django.po from Crowdin 2021-07-03 16:27:08 +10:00
d16277f11f Fix: New translations django.po from Crowdin 2021-07-03 16:27:07 +10:00
ba1b37fc2a Fix: New translations django.po from Crowdin 2021-07-03 13:16:26 +10:00
18d367b4d8 Fix: New translations django.po from Crowdin 2021-07-03 13:16:24 +10:00
f34233b978 Fix: New translations django.po from Crowdin 2021-07-03 13:16:23 +10:00
0c27325e74 Fix: New translations django.po from Crowdin 2021-07-03 13:16:22 +10:00
037c5a239c Fix: New translations django.po from Crowdin 2021-07-03 13:16:20 +10:00
35c95732f2 Fix: New translations django.po from Crowdin 2021-07-03 13:16:19 +10:00
2a391e1d61 Fix: New translations django.po from Crowdin 2021-07-03 13:16:18 +10:00
d1436d154c Fix: New translations django.po from Crowdin 2021-07-03 13:16:15 +10:00
eb5b386009 Fix: New translations django.po from Crowdin 2021-07-03 13:16:14 +10:00
9323a91073 updated translation base 2021-07-03 02:56:42 +00:00
67a35dc879 New Crowdin updates (#1751)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-07-03 12:46:23 +10:00
3c8cba01b1 updated translation base 2021-07-03 02:06:35 +00:00
2a10e4a69b updated translation base 2021-07-03 02:00:57 +00:00
f6e6b82df5 updated translation base 2021-07-02 23:10:57 +00:00
7b8d056d19 updated translation base 2021-07-02 22:41:45 +00:00
5739b73fb0 updated translation base 2021-07-02 12:14:25 +00:00
bb4a53bb81 Merge remote-tracking branch 'inventree/master' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
2021-07-02 21:48:49 +10:00
227d202e68 Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
2021-07-02 21:48:09 +10:00
bd0ef6f992 updated translation base 2021-07-02 04:52:50 +00:00
77f668b635 Merge pull request #1739 from SchrodingersGat/docker-fix
docker: Use a specific version of alpine
2021-07-02 14:51:45 +10:00
fa1644ed2c python -> python3 2021-07-02 13:07:42 +10:00
9cdc5a1fa1 Explicitly install python3-pip 2021-07-02 12:59:54 +10:00
56c3697e34 docker: Use a specific version of alpine 2021-07-02 12:57:37 +10:00
e39ca35eab Fix: New translations django.po from Crowdin 2021-07-02 08:38:15 +10:00
1689c3f235 Fix: New translations django.po from Crowdin 2021-07-02 08:38:14 +10:00
4c35dd4970 Fix: New translations django.po from Crowdin 2021-07-02 08:38:13 +10:00
ed961c9831 Fix: New translations django.po from Crowdin 2021-07-02 08:38:11 +10:00
9c5bfed3e2 Fix: New translations django.po from Crowdin 2021-07-02 08:38:10 +10:00
407be57b59 Fix: New translations django.po from Crowdin 2021-07-02 08:38:09 +10:00
5bbd7cd831 Fix: New translations django.po from Crowdin 2021-07-02 08:38:08 +10:00
3513f9d8a3 Fix: New translations django.po from Crowdin 2021-07-02 08:38:06 +10:00
18ff50ad40 Fix: New translations django.po from Crowdin 2021-07-02 08:38:05 +10:00
cec15de26c updated translation base 2021-07-01 22:35:28 +00:00
d243356324 Merge pull request #1736 from matmair/money-update
Money updates
2021-07-02 08:34:20 +10:00
5aaced6e66 migration for file-based currency setting 2021-07-01 18:20:39 +02:00
14c904c0c5 style fixes 2021-07-01 10:45:33 +02:00
951e8910ba using functions for currency codes 2021-07-01 10:41:23 +02:00
983255a05e naming refactor 2021-07-01 10:37:16 +02:00
66c1e9c97d currency codes in own function 2021-07-01 10:32:07 +02:00