diff --git a/i18n/nl.po b/i18n/nl.po
index dc88b076..10fddc98 100644
--- a/i18n/nl.po
+++ b/i18n/nl.po
@@ -1,15 +1,15 @@
 # 
 # Translators:
 # Cherise Beek <cherise.beek@gmail.com>, 2022
-# Rica Zamora Duchateau, 2022
 # Charel van den Elsen, 2023
+# Rica, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-02-27T15:56:53.590Z\n"
+"POT-Creation-Date: 2023-08-24T10:48:48.806Z\n"
 "PO-Revision-Date: 2022-04-20 10:52+0000\n"
-"Last-Translator: Charel van den Elsen, 2023\n"
+"Last-Translator: Rica, 2024\n"
 "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-msgid "System default (fallback)"
+msgid "System default ({{language}})"
 msgstr ""
 
 msgid "Set the main field value before adding a translation"
@@ -391,13 +391,13 @@ msgid "Last 12 months"
 msgstr "Laatste 12 maanden"
 
 msgid "This bi-month"
-msgstr ""
+msgstr "Deze twee manden"
 
 msgid "Last bi-month"
-msgstr ""
+msgstr "Vorige twee maanden"
 
 msgid "Last 6 bi-months"
-msgstr ""
+msgstr "Vorige 6 twee maanden"
 
 msgid "This quarter"
 msgstr "Dit kwartier"
@@ -690,6 +690,9 @@ msgstr ""
 msgid "Email sender"
 msgstr ""
 
+msgid "The address that outgoing messages are sent from."
+msgstr ""
+
 msgid "Send me a test email"
 msgstr ""
 
diff --git a/i18n/vi.po b/i18n/vi.po
index 2c430c9e..3f673b7c 100644
--- a/i18n/vi.po
+++ b/i18n/vi.po
@@ -1,16 +1,17 @@
 # 
 # Translators:
 # Mai Nguyen <thanhmai.jica@gmail.com>, 2022
-# phil_dhis2, 2022
+# Philip Larsen Donnelly, 2022
 # Viktor Varland <viktor@dhis2.org>, 2022
+# Thuy Nguyen <thuynguyen@hispvietnam.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2022-03-30T09:47:23.342Z\n"
+"POT-Creation-Date: 2023-08-24T10:48:48.806Z\n"
 "PO-Revision-Date: 2022-04-20 10:52+0000\n"
-"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2022\n"
-"Language-Team: Vietnamese (https://www.transifex.com/hisp-uio/teams/100509/vi/)\n"
+"Last-Translator: Thuy Nguyen <thuynguyen@hispvietnam.org>, 2024\n"
+"Language-Team: Vietnamese (https://app.transifex.com/hisp-uio/teams/100509/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,7 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Hủy bỏ tải lên"
 
-msgid "System default (fallback)"
+msgid "System default ({{language}})"
 msgstr ""
 
 msgid "Set the main field value before adding a translation"
@@ -572,10 +573,10 @@ msgid "OSM Light (default)"
 msgstr ""
 
 msgid "OSM Detailed"
-msgstr ""
+msgstr "Bản đồ OSM Detailed"
 
 msgid "Bing Road"
-msgstr ""
+msgstr "Bản đồ Bing Road"
 
 msgid "Bing Dark"
 msgstr ""
@@ -693,6 +694,9 @@ msgstr ""
 msgid "Email sender"
 msgstr "Người gửi email"
 
+msgid "The address that outgoing messages are sent from."
+msgstr ""
+
 msgid "Send me a test email"
 msgstr "Gửi tôi thư điện tử để kiểm định"
 
@@ -779,6 +783,18 @@ msgstr ""
 msgid "Persian"
 msgstr ""
 
+msgid "Change calendar setting"
+msgstr ""
+
+msgid ""
+"Changing your calendar setting after you have entered data can make your "
+"system unusable. If you have entered data, it is strongly recommended that "
+"you do not change your calendar setting."
+msgstr ""
+
+msgid "Yes, change calendar"
+msgstr ""
+
 msgid "Date format"
 msgstr "Định dạng ngày"