Merge branch 'develop' into s3_upload

SEED-platform · Jul 27, 2022 · 93afcbb · 93afcbb
2 parents ed636ed + c6a61ea
commit 93afcbb
Show file tree

Hide file tree

Showing 24 changed files with 4,871 additions and 147 deletions.
diff --git a/.gitignore b/.gitignore
@@ -87,6 +87,7 @@ docker-compose.*.yml
 !docker-compose.local.yml
 !docker-compose.build.yml
 !docker-compose.dev.yml
+docker-compose-dbs.yml
 
 # generated files
 /auto*.csv
diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
@@ -1156,6 +1156,9 @@ msgstr "Getting Started Guide"
 msgid "Go to Detail Page"
 msgstr "Go to Detail Page"
 
+msgid "Go to Meters"
+msgstr "Go to Meters"
+
 msgid "Go to Notes"
 msgstr "Go to Notes"
 

diff --git a/locale/fr_CA/LC_MESSAGES/django.mo b/locale/fr_CA/LC_MESSAGES/django.mo
diff --git a/locale/fr_CA/LC_MESSAGES/django.po b/locale/fr_CA/LC_MESSAGES/django.po
@@ -1167,6 +1167,9 @@ msgstr "Guide de Démarrage"
 msgid "Go to Detail Page"
 msgstr "Accéder à la page Détail"
 
+msgid "Go to Meters"
+msgstr "Aller aux compteurs"
+
 msgid "Go to Notes"
 msgstr "Accéder aux Notes"