diff --git a/.tx/config b/.tx/config
index 2a3157b..62e43f9 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-menu-management:r:en-pot]
 file_filter  = i18n/<lang>.po
diff --git a/i18n/uz.po b/i18n/uz_UZ_Cyrl.po
similarity index 91%
rename from i18n/uz.po
rename to i18n/uz_UZ_Cyrl.po
index 1ed1c5d..f52d430 100644
--- a/i18n/uz.po
+++ b/i18n/uz_UZ_Cyrl.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2021-01-11T11:03:15.488Z\n"
 "PO-Revision-Date: 2021-03-11 23:17+0000\n"
 "Last-Translator: Ibatov <ibatovk@who.int>, 2021\n"
-"Language-Team: Uzbek (Cyrillic) (https://www.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n"
+"Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/i18n/uz_UZ_Latn.po b/i18n/uz_UZ_Latn.po
new file mode 100644
index 0000000..a356823
--- /dev/null
+++ b/i18n/uz_UZ_Latn.po
@@ -0,0 +1,28 @@
+# 
+# Translators:
+# Yury Rogachev <yury@dhis2.org>, 2021
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: i18next-conv\n"
+"POT-Creation-Date: 2021-01-11T11:03:15.488Z\n"
+"PO-Revision-Date: 2021-03-11 23:17+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 "Your apps"
+msgstr "Sizning ilovalaringiz"
+
+msgid "Drag and drop the menu items to re-order them."
+msgstr ""
+
+msgid "Updated order of apps."
+msgstr ""
+
+msgid "Something went wrong whilst loading your apps"
+msgstr ""
diff --git a/src/i18n/menu-management_uz_Latn.properties b/src/i18n/menu-management_uz_Latn.properties
deleted file mode 100644
index faeada3..0000000
--- a/src/i18n/menu-management_uz_Latn.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-Your_apps=Sizning ilovalaringiz
-Loading=Yuklanmoqda...
-Menu_items_saved=Menyu elementlari saqlandi!
-Failed_to_save=Saqlash amalga oshmadi
-Drag_and_drop=Menyu elementlari joyini o\u02bczgartirish uchun ularni siljiting!
diff --git a/src/i18n/uz.po b/src/i18n/uz.po
deleted file mode 100644
index 400c631..0000000
--- a/src/i18n/uz.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# 
-# Translators:
-# Ibatov <ibatovk@who.int>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 02:56-0400\n"
-"PO-Revision-Date: 2019-09-02 08:07+0000\n"
-"Last-Translator: Ibatov <ibatovk@who.int>, 2020\n"
-"Language-Team: Uzbek (Cyrillic) (https://www.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: uz@Cyrl\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Translate Toolkit 2.0.0b3\n"
-
-#: Your_apps
-msgid "Your apps"
-msgstr "Сизнинг иловаларингиз"
-
-#: Loading
-msgid "Loading..."
-msgstr "Юкланмоқда..."
-
-#: Menu_items_saved
-msgid "Menu items saved!"
-msgstr "Меню элементлари сақланди!"
-
-#: Failed_to_save
-msgid "Failed to save"
-msgstr "Сақлаш амалга ошмади"
-
-#: Drag_and_drop
-msgid "Drag and drop the menu items to re-order them!"
-msgstr "Меню элементлари жойини ўзгартириш учун уларни силжитинг!"