diff --git a/.tx/config b/.tx/config
index 238bb5948..1e0a8be73 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host     = https://www.transifex.com
-lang_map = fa_AF: prs, uz@Cyrl: uz, uz@Latn: uz_Latn
+lang_map = fa_AF: prs, uz@Cyrl: uz_UZ_Cyrl, uz@Latn: uz_UZ_Latn
 
 [o:hisp-uio:p:app-dashboards-app:r:en-pot]
 file_filter  = i18n/<lang>.po
diff --git a/i18n/es.po b/i18n/es.po
index f7056096a..d7af8efaa 100644
--- a/i18n/es.po
+++ b/i18n/es.po
@@ -1,7 +1,7 @@
 # 
 # Translators:
 # William Aviles <waviles@clintonhealthaccess.org>, 2020
-# phil_dhis2, 2021
+# Philip Larsen Donnelly, 2021
 # Viktor Varland <viktor@dhis2.org>, 2021
 # Sergio Valenzuela <sergio.valenzuela@ehas.org>, 2021
 # Gabriela Rodriguez <grodriguezcoronado@gmail.com>, 2021
@@ -14,7 +14,7 @@ msgstr ""
 "POT-Creation-Date: 2022-01-10T14:24:29.926Z\n"
 "PO-Revision-Date: 2019-09-01 20:38+0000\n"
 "Last-Translator: Prabhjot Singh, 2021\n"
-"Language-Team: Spanish (https://www.transifex.com/hisp-uio/teams/100509/es/)\n"
+"Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/i18n/nl.po b/i18n/nl.po
index 3e8456021..173c74468 100644
--- a/i18n/nl.po
+++ b/i18n/nl.po
@@ -178,10 +178,10 @@ msgid "There was a problem loading this dashboard item"
 msgstr "Er is een probleem opgetreden bij het laden van dit dashboarditem"
 
 msgid "Hide interpretations and details"
-msgstr ""
+msgstr "Verberg interpretaties en details"
 
 msgid "Show interpretations and details"
-msgstr ""
+msgstr "Toon interpretaties en details"
 
 msgid "Open in {{appName}} app"
 msgstr "Openen in {{appName}}-app"
@@ -292,13 +292,13 @@ msgid "Failed to show description"
 msgstr ""
 
 msgid "Unstar dashboard"
-msgstr ""
+msgstr "Dashboard ongedaan maken"
 
 msgid "Star dashboard"
 msgstr "Sterrendashboard"
 
 msgid "Failed to unstar the dashboard"
-msgstr ""
+msgstr "Kan het dashboard niet ongedaan maken"
 
 msgid "Failed to star the dashboard"
 msgstr "Sterren geven aan het dashboard mislukt"
@@ -337,7 +337,7 @@ msgid "Event reports"
 msgstr "Gebeurtenissen rapporten"
 
 msgid "Event charts"
-msgstr ""
+msgstr "Evenementen grafiek"
 
 msgid "Apps"
 msgstr "Apps"
diff --git a/i18n/uz.po b/i18n/uz_UZ_Cyrl.po
similarity index 100%
rename from i18n/uz.po
rename to i18n/uz_UZ_Cyrl.po
diff --git a/i18n/uz_UZ_Latn.po b/i18n/uz_UZ_Latn.po
new file mode 100644
index 000000000..4546e168f
--- /dev/null
+++ b/i18n/uz_UZ_Latn.po
@@ -0,0 +1,345 @@
+# 
+# Translators:
+# Yury Rogachev <yury@dhis2.org>, 2021
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: i18next-conv\n"
+"POT-Creation-Date: 2022-01-10T14:24:29.926Z\n"
+"PO-Revision-Date: 2019-09-01 20:38+0000\n"
+"Last-Translator: Yury Rogachev <yury@dhis2.org>, 2021\n"
+"Language-Team: Uzbek (Latin) (https://app.transifex.com/hisp-uio/teams/100509/uz@Latn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uz@Latn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Untitled dashboard"
+msgstr "Nomsiz boshqaruv paneli"
+
+msgid "Loading dashboard – {{name}}"
+msgstr "Boshqaruv paneli yuklanmoqda - {{ismi}}"
+
+msgid "Cancel"
+msgstr "Бекор қилиш"
+
+msgid "Delete"
+msgstr "Oʼchirib tashlash"
+
+msgid "Delete dashboard"
+msgstr "Boshqaruv panelini oʼchirib tashlash"
+
+msgid ""
+"Deleting dashboard \"{{ dashboardName }}\" will remove it for all users. "
+"This action cannot be undone. Are you sure you want to permanently delete "
+"this dashboard?"
+msgstr ""
+"Panelni oʼchirib tashlash {{ dashboardName }}, uni barcha foydalanuvchilar "
+"uchun oʼchirilishiga olib keladi. Bu harakatni orqaga qaytarib boʼlmaydi. "
+"Haqiqatdan ham ushbu panelni orqaga qaytarib boʼlmaslik sharti bilan "
+"oʼchirib tashlamoqchimisiz?"
+
+msgid ""
+"Failed to save dashboard. You might be offline or not have access to edit "
+"this dashboard."
+msgstr ""
+
+msgid "Save changes"
+msgstr "Oʼzgartirishni saqlash"
+
+msgid "Exit print preview"
+msgstr ""
+
+msgid "Print preview"
+msgstr "Chop etishdan avvalgi koʼrik"
+
+msgid "Filter settings"
+msgstr ""
+
+msgid "Translate"
+msgstr "Tarjima qiling"
+
+msgid "Exit without saving"
+msgstr "Saqlamasdan chiqish"
+
+msgid "Go to dashboards"
+msgstr "Boshqaruv panellariga oʼtish"
+
+msgid "Search for a dashboard"
+msgstr "Boshqarish panelida izlash"
+
+msgid "Show fewer dashboards"
+msgstr ""
+
+msgid "Show more dashboards"
+msgstr ""
+
+msgid "No dashboards found. Use the + button to create a new dashboard."
+msgstr ""
+"Boshqaruv paneli topilmadi. Yangi boshqaruv panelini yaratish uchun + "
+"tugmasini bosing."
+
+msgid "Requested dashboard not found"
+msgstr "Soʼralgan boshqaruv paneli topilmadi"
+
+msgid "No access"
+msgstr "Kirish huquqi mavjud emas"
+
+msgid ""
+"Editing dashboards on small screens is not supported. Resize your screen to "
+"return to edit mode."
+msgstr ""
+
+msgid ""
+"Creating dashboards on small screens is not supported. Resize your screen to"
+" return to create mode."
+msgstr ""
+
+msgid "Not supported"
+msgstr ""
+
+msgid "Print"
+msgstr "Chop etish"
+
+msgid "dashboard layout"
+msgstr "boshqarish paneli maketi"
+
+msgid "one item per page"
+msgstr "bir sahifada bir element"
+
+msgid "Print Preview"
+msgstr ""
+
+msgid "For best print results"
+msgstr "Bosib chiqarishda (printerda) eng yaxshi natijaga erishish"
+
+msgid "Use Chrome or Edge web browser"
+msgstr "Chrome yoki Edge brauzeridan foydalaning"
+
+msgid "Wait for all dashboard items to load before printing"
+msgstr ""
+"Bosib chiqarishdan oldin boshqarish paneliga barcha elementlarning "
+"yuklanishini kuting"
+
+msgid ""
+"Use A4 landscape paper size and default margin settings in the browser print"
+" dialog"
+msgstr ""
+"Brauzerning bosib chiqarish (printer) panelida А4 va standart chegaralarni "
+"oʼrnating"
+
+msgid "{{count}} selected"
+msgid_plural "{{count}} selected"
+msgstr[0] ""
+
+msgid "Remove"
+msgstr "Олиб ташлаш"
+
+msgid "Delete item"
+msgstr "Elementni oʼchirib tashlash"
+
+msgid "This item has been shortened to fit on one page"
+msgstr "Ushbu element bir sahifaga joylashtirish uchun moslashtirildi"
+
+msgid "Messages"
+msgstr "Xabarlar"
+
+msgid "See all messages"
+msgstr "Barcha xabarlarni koʼrish"
+
+msgid "Item type \"{{type}}\" is not supported"
+msgstr ""
+
+msgid "The item type is missing"
+msgstr ""
+
+msgid "Filters applied"
+msgstr "Filtr qoʼllanildi"
+
+msgid "Spacer"
+msgstr "Boʼsh joy"
+
+msgid ""
+"Use a spacer to create empty vertical space between other dashboard items."
+msgstr ""
+"Monitoring panelida elementlar orasida vertikal boʼsh joy yaratish uchun "
+"boʼsh joy qoldirish funktsiyasidan foydalaning"
+
+msgid "Text item"
+msgstr "Matn elementi"
+
+msgid "Add text here"
+msgstr "Matnni shu yerga qoʼshing"
+
+msgid "There was a problem loading this dashboard item"
+msgstr "Ushbu panel elementlari yuklanishida muaamoga duch kelindi"
+
+msgid "Hide interpretations and details"
+msgstr "Talqinlar va tavsilotlarni berkitish"
+
+msgid "Show interpretations and details"
+msgstr "Talqinlar va tavsilotlarni koʼrsatish"
+
+msgid "Open in {{appName}} app"
+msgstr "Ilovada {{appName}} da ochish"
+
+msgid "View fullscreen"
+msgstr ""
+
+msgid "View as Chart"
+msgstr "Diagramma sifatida koʼrish"
+
+msgid "This map can't be displayed as a chart"
+msgstr ""
+
+msgid "View as Table"
+msgstr "Jadval sifatida koʼrish"
+
+msgid "This map can't be displayed as a table"
+msgstr ""
+
+msgid "View as Map"
+msgstr "Xarita sifatida koʼrish"
+
+msgid "There was a problem loading interpretations for this item"
+msgstr ""
+
+msgid "Unable to load the plugin for this item"
+msgstr "Ushbu element uchun plagin yuklanmadi"
+
+msgid "No data to display"
+msgstr "Maʼlumot ekranga chiqarilmadi"
+
+msgid "There was an error loading data for this item"
+msgstr ""
+
+msgid "Open this item in {{appName}}"
+msgstr ""
+
+msgid "Confirm"
+msgstr "Tasdiqlang"
+
+msgid "Add filter"
+msgstr "Filtr kiritish"
+
+msgid "Allow filtering by all dimensions"
+msgstr ""
+
+msgid "Only allow filtering by selected dimensions"
+msgstr ""
+
+msgid "Dashboard filter settings"
+msgstr ""
+
+msgid ""
+"Dashboards can be filtered by dimensions to change\n"
+"                                         the data shown. By default, all dimensions are available\n"
+"                                         as filters. Alternatively, only selected dimensions can\n"
+"                                         be made available on a dashboard."
+msgstr ""
+
+msgid "Available Filters"
+msgstr ""
+
+msgid "Selected Filters"
+msgstr ""
+
+msgid "There are no items on this dashboard"
+msgstr "Ushbu boshqaruv panelida elementlar yoʼq"
+
+msgid "Show fewer"
+msgstr "Kamroq koʼrsatish"
+
+msgid "Show more"
+msgstr "Koʼproq koʼrsatilsin"
+
+msgid "Insert"
+msgstr "Kiritish"
+
+msgid "Search for items to add to this dashboard"
+msgstr "Ushbu boshqaruv paneliga kiritish uchun elementlarni qidiring"
+
+msgid "Additional items"
+msgstr "Qoʼshimcha elementlar"
+
+msgid "Text box"
+msgstr "Matn joyi"
+
+msgid "Dashboard title"
+msgstr "Boshqaruv paneli nomlanishi"
+
+msgid "Dashboard description"
+msgstr "Boshqaruv paneli tavsifi"
+
+msgid "Hide description"
+msgstr "Tavsifni berkitish"
+
+msgid "Show description"
+msgstr "Tavsifni koʼrsatish"
+
+msgid "Failed to hide description"
+msgstr ""
+
+msgid "Failed to show description"
+msgstr ""
+
+msgid "Unstar dashboard"
+msgstr "Boshqaruv panelidagi yulduzcha oʼchiriladi"
+
+msgid "Star dashboard"
+msgstr "Boshqaruv paneliga yulduzcha oʼrnatiladi"
+
+msgid "Failed to unstar the dashboard"
+msgstr ""
+
+msgid "Failed to star the dashboard"
+msgstr ""
+
+msgid "More"
+msgstr "Koʼproq"
+
+msgid "Edit"
+msgstr "Tahrirlash"
+
+msgid "Share"
+msgstr "Улашиш"
+
+msgid "Dashboard layout"
+msgstr "Boshqaruv paneli maketi"
+
+msgid "One item per page"
+msgstr "Har bir sahifada bitta element"
+
+msgid "No description"
+msgstr "Tavsif yoʼq"
+
+msgid "Visualizations"
+msgstr "Vizualizatsiya"
+
+msgid "Pivot tables"
+msgstr ""
+
+msgid "Charts"
+msgstr "Diagrammalar"
+
+msgid "Maps"
+msgstr "Xaritalar"
+
+msgid "Event reports"
+msgstr "Hodisalar hisoboti"
+
+msgid "Event charts"
+msgstr "Hodisalar diagrammalarda"
+
+msgid "Apps"
+msgstr "Ilova"
+
+msgid "Reports"
+msgstr "Hisobotlar"
+
+msgid "Resources"
+msgstr "Resurslar"
+
+msgid "Users"
+msgstr "Foydalanuvchilar"
diff --git a/public/i18n/i18n_module_es.properties b/public/i18n/i18n_module_es.properties
index d18cc3e5f..5293851af 100644
--- a/public/i18n/i18n_module_es.properties
+++ b/public/i18n/i18n_module_es.properties
@@ -24,5 +24,5 @@ save=Guardar
 cancel=Cancelar
 select_a_locale_to_enter_translations_for_that_language=Seleccione una configuraci\u00f3n regional para introducir traducciones
 name=Nombre
-short_name=Abreviatura
+short_name=Nombre corto
 description=Descripci\u00f3n
diff --git a/public/i18n/i18n_module_uz_Cyrl.properties b/public/i18n/i18n_module_uz_Cyrl.properties
deleted file mode 100644
index 79d77fe08..000000000
--- a/public/i18n/i18n_module_uz_Cyrl.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-close=\u0401\u043f\u0438\u049b
-created_by=\u0422\u043e\u043c\u043e\u043d\u0438\u0434\u0430\u043d \u044f\u0440\u0430\u0442\u0438\u043b\u0433\u0430\u043d
-share=\u0421\u043e\u0437\u043b\u0430\u043c\u0430\u043b\u0430\u0440 \u0431\u0438\u043b\u0430\u043d \u0443\u043b\u0430\u0448\u0438\u0448
-who_has_access=\u041a\u0438\u043c\u0434\u0430 \u043a\u0438\u0440\u0438\u0448 \u04b3\u0443\u049b\u0443\u049b\u0438 \u043c\u0430\u0432\u0436\u0443\u0434
-can_capture_and_view=\u0411\u0435\u043b\u0433\u0438\u043b\u0430\u0431 \u043e\u043b\u0438\u0431 \u043a\u045e\u0440\u0438\u0448\u0438\u043d\u0433\u0438\u0437 \u043c\u0443\u043c\u043a\u0438\u043d
-can_edit_and_view=\u0422\u0430\u04b3\u0440\u0438\u0440\u043b\u0430\u0448 \u0432\u0430 \u043a\u045e\u0440\u0438\u0448 \u043c\u0443\u043c\u043a\u0438\u043d
-can_view_only=\u0424\u0430\u049b\u0430\u0442 \u043a\u045e\u0440\u0438\u0431 \u0447\u0438\u049b\u0438\u0448 \u043c\u0443\u043c\u043a\u0438\u043d
-enter_names=\u0418\u0441\u043c\u043b\u0430\u0440\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u043d\u0433
-external_access=\u0422\u0430\u0448\u049b\u0430\u0440\u0438\u0434\u0430\u043d \u043a\u0438\u0440\u0438\u0448
-metadata=\u041c\u0435\u0442\u0430\u0434\u0430\u0442\u0430
-add_users_and_user_groups=\u0424\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438 \u0432\u0430 \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438 \u0433\u0443\u0440\u0443\u04b3\u0438\u043d\u0438 \u049b\u045e\u0448\u0438\u0448
-anyone_can_find_and_view=\u0411\u0430\u0440\u0447\u0430 \u0438\u0437\u043b\u0430\u0431 \u0442\u043e\u043f\u0438\u0448\u0438 \u0432\u0430 \u043a\u045e\u0440\u0438\u0448\u0438 \u043c\u0443\u043c\u043a\u0438\u043d
-anyone_can_view_without_a_login=\u0411\u0430\u0440\u0447\u0430 \u043a\u045e\u0440\u0438\u0448\u0438 \u043c\u0443\u043c\u043a\u0438\u043d, \u0440\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u043c\u0430\u0441\u0434\u0430\u043d
-anyone_can_find_view_and_edit=\u0411\u0430\u0440\u0447\u0430 \u0438\u0437\u043b\u0430\u0431 \u0442\u043e\u043f\u0438\u0448\u0438, \u043a\u045e\u0440\u0438\u0448\u0438 \u0432\u0430 \u0442\u0430\u04b3\u0440\u0438\u0440\u043b\u0430\u0448\u0438 \u043c\u0443\u043c\u043a\u0438\u043d
-no_access=\u041a\u0438\u0440\u0438\u0448 \u0442\u0430\u044a\u049b\u0438\u049b\u043b\u0430\u043d\u0433\u0430\u043d
-no_author=\u041c\u0443\u0430\u043b\u043b\u0438\u0444 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
-no_manage_access=\u0421\u0438\u0437\u0434\u0430 \u0443\u0448\u0431\u0443 \u043e\u0431\u044a\u0435\u043a\u0442\u043d\u0438 \u0431\u043e\u0448\u049b\u0430\u0440\u0438\u0448 \u04b3\u0443\u049b\u0443\u049b\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
-public_access=\u041e\u043c\u043c\u0430\u0432\u0438\u0439 \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0438\u0448
-
-translate=\u0422\u0430\u0440\u0436\u0438\u043c\u0430 \u049b\u0438\u043b\u0438\u043d\u0433
-translation_dialog_title=\u0422\u0430\u0440\u0436\u0438\u043c\u0430 \u049b\u0438\u043b\u0438\u043d\u0433
-select_locale=\u0416\u043e\u0439\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433
-save=\u0421\u0430\u049b\u043b\u0430\u0448
-cancel=\u0411\u0435\u043a\u043e\u0440 \u049b\u0438\u043b\u0438\u0448
-select_a_locale_to_enter_translations_for_that_language=\u0422\u0430\u0440\u0436\u0438\u043c\u0430 \u049b\u0438\u043b\u0438\u043d\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c \u0431\u045e\u043b\u0433\u0430\u043d \u043e\u0431\u044a\u0435\u043a\u0442 \u0443\u0447\u0443\u043d \u0442\u0438\u043b \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u0438\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433
-name=\u0418\u0441\u043c\u0438
-short_name=\u049a\u0438\u0441\u049b\u0430\u0447\u0430 \u043d\u043e\u043c\u0438
-description=\u0422\u0430\u0432\u0441\u0438\u0444
diff --git a/public/i18n/i18n_module_uz.properties b/public/i18n/i18n_module_uz_UZ_Cyrl.properties
similarity index 100%
rename from public/i18n/i18n_module_uz.properties
rename to public/i18n/i18n_module_uz_UZ_Cyrl.properties
diff --git a/public/i18n/i18n_module_uz_Latn.properties b/public/i18n/i18n_module_uz_UZ_Latn.properties
similarity index 100%
rename from public/i18n/i18n_module_uz_Latn.properties
rename to public/i18n/i18n_module_uz_UZ_Latn.properties