diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json
index 4a835b6a..96a93e88 100644
--- a/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json
+++ b/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json
@@ -811,12 +811,6 @@
             "en": "Search topics...",
             "tr": "Konular arama..."
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.Forum.TopicManagement.Topics",
-            "en": "Topics",
-            "tr": "Konular"
-        },
         {
             "resourceName": "Platform",
             "key": "App.Forum.TopicManagement.Loadingtopics",
@@ -1447,12 +1441,6 @@
             "en": "You can directly generate the report.",
             "tr": "Direkt rapor oluşturabilirsiniz."
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.Reports.ReportGenerator.Generating",
-            "en": "Generating...",
-            "tr": "Oluşturuluyor..."
-        },
         {
             "resourceName": "Platform",
             "key": "App.Reports.ReportGenerator.GenerateReport",
@@ -1489,12 +1477,6 @@
             "en": "The report you are looking for may not exist or has been deleted.",
             "tr": "Aradığınız rapor mevcut değil veya silinmiş olabilir."
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.Reports.ReportViewer.BackToDashboard",
-            "en": "Back to Home",
-            "tr": "Ana Sayfa'ya Dön"
-        },
         {
             "resourceName": "Platform",
             "key": "App.Reports.ReportViewer.DownloadPDF",
@@ -1621,12 +1603,6 @@
             "en": "Parameter description",
             "tr": "Parametre açıklaması"
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.Reports.TemplateEditor.Placeholder.DefaultValue",
-            "en": "Default Value",
-            "tr": "Varsayılan Değer"
-        },
         {
             "resourceName": "Platform",
             "key": "App.Reports.TemplateEditor.Button.Saving",
@@ -1765,12 +1741,6 @@
             "en": "Import",
             "tr": "İçe Aktar"
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.Listforms.ImportManager.Tab.Preview",
-            "en": "Preview",
-            "tr": "Önizleme"
-        },
         {
             "resourceName": "Platform",
             "key": "App.Listforms.ImportManager.Tab.History",
@@ -1801,12 +1771,6 @@
             "en": "Column",
             "tr": "Kolon"
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.Listforms.ImportManager.Type",
-            "en": "Type",
-            "tr": "Tip"
-        },
         {
             "resourceName": "Platform",
             "key": "App.Listforms.ImportManager.Yes",
@@ -3607,102 +3571,24 @@
             "en": "User",
             "tr": "Kullanıcı"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsAll",
-            "en": "All",
-            "tr": "Tümü"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsDetails",
-            "en": "Details",
-            "tr": "Detay"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsOptions",
-            "en": "Options",
-            "tr": "Seçenekler"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormField.CopyFieldsPermission",
             "en": "Permission",
             "tr": "Yetki"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsCustomization",
-            "en": "Customization",
-            "tr": "Özelleştirme"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsFiltering",
-            "en": "Filtering",
-            "tr": "Filtreleme"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsHeadering",
-            "en": "Headering",
-            "tr": "Başlıklandırma"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsGrouping",
-            "en": "Grouping",
-            "tr": "Gruplama"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsGroupSummary",
-            "en": "Group Summary",
-            "tr": "Grup Özeti"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsTotalSummary",
-            "en": "Total Summary",
-            "tr": "Toplam Özeti"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsJoinOptions",
-            "en": "Join Options",
-            "tr": "Birleştirme"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsLookup",
-            "en": "Lookup",
-            "tr": "Seçme Kutusu"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormField.CopyFieldsCssOptions",
             "en": "Css Options",
             "tr": "Css Seçenekleri"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsValidationRules",
-            "en": "Validation Rules",
-            "tr": "Doğrulama Kuralları"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormField.CopyFieldsFormatting",
             "en": "Formatting",
             "tr": "Formatlama"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormField.CopyFieldsPivotSetting",
-            "en": "Pivot Settings",
-            "tr": "Pivot Ayarları"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.TabTree",
@@ -3721,24 +3607,12 @@
             "en": "Database",
             "tr": "Veritabanı"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.TabPermissions",
-            "en": "Permissions",
-            "tr": "Yetkiler"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.TabCommands",
             "en": "Commands",
             "tr": "Butonlar"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.TabEditing",
-            "en": "Editing",
-            "tr": "Düzenleme"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.TabSorting",
@@ -3781,12 +3655,6 @@
             "en": "Columns",
             "tr": "Sütunlar"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.TabPivots",
-            "en": "Pivots",
-            "tr": "Pivotlar"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.TabPaging",
@@ -3799,12 +3667,6 @@
             "en": "State",
             "tr": "State"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.TabSubForms",
-            "en": "Sub Forms",
-            "tr": "Alt Formlar"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.TabWidgets",
@@ -3871,12 +3733,6 @@
             "en": "Legend",
             "tr": "Gösterge"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.TabChartExport",
-            "en": "Export",
-            "tr": "Dışa Ver"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.TabChartCrosshair",
@@ -4225,18 +4081,6 @@
             "en": "Deny",
             "tr": "Reddet"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.PermissionsRead",
-            "en": "Read",
-            "tr": "Gör"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.PermissionsExport",
-            "en": "Export",
-            "tr": "Dışa Ver"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.PermissionsExport",
@@ -4303,12 +4147,6 @@
             "en": "Url Target",
             "tr": "Url Türü"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.Widgets",
-            "en": "Widgets",
-            "tr": "Widget'lar"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.WidgetsDescription",
@@ -4363,12 +4201,6 @@
             "en": "Select Text On Edit Start",
             "tr": "Düzenleme Başlangıcında Metni Seç"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.EditingMode",
-            "en": "Mode",
-            "tr": "Mod"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.EditingRefreshMode",
@@ -4399,12 +4231,6 @@
             "en": "Show Title",
             "tr": "Başlık Göster"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.EditingHeight",
-            "en": "Height",
-            "tr": "Yükseklik"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.EditingFullScreen",
@@ -4477,12 +4303,6 @@
             "en": "Relation Fields",
             "tr": "İlişkili Sütunlar"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.SubFormsRelation.ParentFieldName",
-            "en": "Parent Field Name",
-            "tr": "Üst Kimlik İfadesi"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.SubFormsRelation.ChildFieldName",
@@ -4495,12 +4315,6 @@
             "en": "Column Gap",
             "tr": "Sütun Boşluğu"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.WidgetColSpan",
-            "en": "Column Span",
-            "tr": "Sütun Genişliği"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.WidgetTitle",
@@ -4591,12 +4405,6 @@
             "en": "Hide On Outside Click",
             "tr": "Dış Tıklamada Gizle"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.FilteringSorting",
-            "en": "Sorting",
-            "tr": "Sıralama"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.FilteringSortingSortMode",
@@ -4651,12 +4459,6 @@
             "en": "Filter Panel",
             "tr": "Filter Panel"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.FilteringSortingRowProps",
-            "en": "Row",
-            "tr": "Satır"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.FilteringSortingRowHeight",
@@ -4717,12 +4519,6 @@
             "en": "Panel Width",
             "tr": "Panel Genişliği"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.TreeKeyFieldName",
-            "en": "Key Field Name",
-            "tr": "Anahtar Alanı"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormEdit.ParentIdExpr",
@@ -5007,7 +4803,7 @@
         },
         {
             "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.StateType",
+            "key": "ListForms.ListFormEdit.Type",
             "en": "Type",
             "tr": "Tip"
         },
@@ -5047,48 +4843,18 @@
             "en": "Customization Data",
             "tr": "Özelleştirme Verisi"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TabDetails",
-            "en": "Details",
-            "tr": "Detay"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TabPermissions",
-            "en": "Permissions",
-            "tr": "Yetkiler"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.TabOptions",
             "en": "Options",
             "tr": "Seçenekler"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TabCustomization",
-            "en": "Customization",
-            "tr": "Özelleştirme"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TabFiltering",
-            "en": "Filtering",
-            "tr": "Filtreleme"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.TabHeadering",
             "en": "Headering",
             "tr": "Başlıklandırma"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TabGrouping",
-            "en": "Grouping",
-            "tr": "Gruplama"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.TabGroupSummary",
@@ -5113,12 +4879,6 @@
             "en": "Lookup",
             "tr": "Seçme Kutusu"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TabCssOptions",
-            "en": "Css Options",
-            "tr": "Css Seçenekleri"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.TabValidationRules",
@@ -5137,12 +4897,6 @@
             "en": "Field Name",
             "tr": "Alan Adı"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.DetailsAuthorizationType",
-            "en": "Authorization Type",
-            "tr": "Yetkilendirme Türü"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.DetailsBandName",
@@ -5197,18 +4951,6 @@
             "en": "Visible",
             "tr": "Görünür"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.OptionsAllowEditing",
-            "en": "Allow Editing",
-            "tr": "Güncellemeye İzin Ver"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.OptionsAllowSearch",
-            "en": "Allow Search",
-            "tr": "Aramaya İzin Ver"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.CustomizationFixed",
@@ -5257,12 +4999,6 @@
             "en": "Allow Search",
             "tr": "Aramaya İzin Ver"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.HeaderingDataSourceString",
-            "en": "Data Source",
-            "tr": "Veri Kaynağı"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.GroupingAllowGrouping",
@@ -5317,36 +5053,6 @@
             "en": "AlignBy Column",
             "tr": "Sütuna Göre Hizala"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TotalSummaryValueFormat",
-            "en": "Value Format",
-            "tr": "Değer Biçimi"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TotalSummaryDisplayFormat",
-            "en": "Display Format",
-            "tr": "Görüntüleme Biçimi"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TotalSummaryShowInColumn",
-            "en": "ShowIn Column",
-            "tr": "Gösterilecek Sütun"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TotalSummaryShowInGroupFooter",
-            "en": "ShowIn Group Footer",
-            "tr": "Grup Altbilgisini Göster"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.TotalSummaryAlignByColumn",
-            "en": "AlignBy Column",
-            "tr": "Sütuna Göre Hizala"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.JoinOptionsJoinType",
@@ -5461,30 +5167,6 @@
             "en": "Cascade Relation Sql Table Column Name",
             "tr": "Cascade İlişki Sql Tablo Alanı Adı"
         },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.LookupTableFilterRowVisible",
-            "en": "Filter Row Visible",
-            "tr": "Filtre Satırı Göster"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.LookupTableHeight",
-            "en": "Height",
-            "tr": "Yükseklik"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.LookupTableColumnsString",
-            "en": "Columns",
-            "tr": "Sütunlar"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "ListForms.ListFormFieldEdit.LookupTableSelectionMode",
-            "en": "Selection Mode",
-            "tr": "Seçme Modu"
-        },
         {
             "resourceName": "Platform",
             "key": "ListForms.ListFormFieldEdit.LookupTagBox",
@@ -5737,12 +5419,6 @@
             "tr": "Blog Yazısını Düzenle",
             "en": "Edit Blog Post"
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.post.slug",
-            "tr": "Slug",
-            "en": "Slug"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.posts.post.summary",
@@ -5755,24 +5431,12 @@
             "tr": "Kategori",
             "en": "Category"
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.post.tags",
-            "tr": "Etiketler",
-            "en": "Tags"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.posts.post.image",
             "tr": "Kapak Görseli",
             "en": "Cover Image"
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.post.content",
-            "tr": "İçerik",
-            "en": "Content"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.posts.post.author",
@@ -5791,42 +5455,12 @@
             "tr": "Yeni Kategori",
             "en": "New Category"
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.categories.edittitle",
-            "tr": "Kategori Düzenle",
-            "en": "Edit Category"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.posts.categories.name",
             "tr": "Kategori Adı",
             "en": "Category Name"
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.categories.slug",
-            "tr": "Slug",
-            "en": "Slug"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.categories.icon",
-            "tr": "İkon",
-            "en": "Icon"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.categories.count",
-            "tr": "Adet",
-            "en": "Quantity"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.categories.order",
-            "tr": "Sıralama",
-            "en": "Sorting"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.posts.ai.title",
@@ -5839,12 +5473,6 @@
             "tr": "Yapay zekanın iş süreçlerindeki etkileri ve geleceği...",
             "en": "The impacts and future of AI in business processes..."
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.ai.date",
-            "tr": "10 Mayıs 2024",
-            "en": "May 10, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.categories.technology",
@@ -5863,12 +5491,6 @@
             "tr": "Modern web geliştirme teknikleri ve araçları...",
             "en": "Modern web development techniques and tools..."
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.web.date",
-            "tr": "5 Mayıs 2024",
-            "en": "May 5, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.categories.webdev",
@@ -5911,12 +5533,6 @@
             "tr": "Başarılı bir mobil uygulama geliştirmek için ipuçları...",
             "en": "Tips for building a successful mobile app..."
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.mobile.date",
-            "tr": "25 Nisan 2024",
-            "en": "April 25, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.categories.mobile",
@@ -5935,12 +5551,6 @@
             "tr": "Veritabanı tasarımı ve optimizasyonu...",
             "en": "Database design and optimization..."
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.database.date",
-            "tr": "20 Nisan 2024",
-            "en": "April 20, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.categories.database",
@@ -5959,12 +5569,6 @@
             "tr": "İşletmenizi dijital dünyada büyütün...",
             "en": "Grow your business in the digital world..."
         },
-        {
-            "resourceName": "Platform",
-            "key": "blog.posts.digital.date",
-            "tr": "April 15, 2024",
-            "en": "April 15, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "blog.categories.digital",
@@ -6499,12 +6103,6 @@
             "tr": "Web Geliştirme",
             "en": "Web Development"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.blog.posts.ai.date",
-            "tr": "10 Mayıs 2024",
-            "en": "May 10, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.blog.posts.ai.excerpt",
@@ -6517,12 +6115,6 @@
             "tr": "Yapay Zeka ve İş Dünyası",
             "en": "Artificial Intelligence and Business"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.blog.posts.database.date",
-            "tr": "20 Nisan 2024",
-            "en": "April 20, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.blog.posts.database.excerpt",
@@ -6535,12 +6127,6 @@
             "tr": "Veritabanı Yönetimi Temelleri",
             "en": "Fundamentals of Database Management"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.blog.posts.digital.date",
-            "tr": "April 15, 2024",
-            "en": "April 15, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.blog.posts.digital.excerpt",
@@ -6553,12 +6139,6 @@
             "tr": "Dijital Pazarlama Stratejileri",
             "en": "Digital Marketing Strategies"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.blog.posts.mobile.date",
-            "tr": "25 Nisan 2024",
-            "en": "April 25, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.blog.posts.mobile.excerpt",
@@ -6571,12 +6151,6 @@
             "tr": "Mobil Uygulama Geliştirme Rehberi",
             "en": "Mobile App Development Guide"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.blog.posts.security.date",
-            "tr": "1 Mayıs 2024",
-            "en": "May 1, 2024"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.blog.posts.security.excerpt",
@@ -6589,18 +6163,6 @@
             "tr": "Siber Güvenlik İpuçları",
             "en": "Cybersecurity Tips"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.blog.posts.web.date",
-            "tr": "5 Mayıs 2024",
-            "en": "May 5, 2024"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.blog.posts.web.excerpt",
-            "tr": "Modern web geliştirme teknikleri ve araçları...",
-            "en": "Modern web development techniques and tools..."
-        },
         {
             "resourceName": "Platform",
             "key": "Public.blog.posts.web.title",
@@ -6745,12 +6307,6 @@
             "tr": "Vergi Dairesi",
             "en": "Tax Office"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.contact.title",
-            "tr": "İletişim",
-            "en": "Contact"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.contact.transferForm",
@@ -6973,12 +6529,6 @@
             "tr": "Hızlı Bağlantılar",
             "en": "Quick Links"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.footer.servicesTitle",
-            "tr": "Hizmetlerimiz",
-            "en": "Our Services"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.footer.sitemap",
@@ -7063,18 +6613,6 @@
             "tr": "yeni hesap oluşturun",
             "en": "create a new account"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.login.emailOrUsername",
-            "tr": "E-posta veya Kullanıcı Adı",
-            "en": "Email or Username"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.login.emailPlaceholder",
-            "tr": "E-posta veya Kullanıcı Adı",
-            "en": "Email or Username"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.login.emailRequired",
@@ -7099,42 +6637,18 @@
             "tr": "Parola gereklidir",
             "en": "Password is required"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.login.signIn",
-            "tr": "Oturum Aç",
-            "en": "Sign In"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.login.signingIn",
-            "tr": "Giriş yapılıyor...",
-            "en": "Signing in..."
-        },
         {
             "resourceName": "Platform",
             "key": "Public.login.subtitle",
             "tr": "Hesabınıza giriş yapın veya",
             "en": "Sign in to your account or"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.nav.contact",
-            "tr": "İletişim",
-            "en": "Contact"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.nav.giris",
             "tr": "Giriş",
             "en": "Login"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.nav.products",
-            "tr": "Satınalma",
-            "en": "Buy"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.nav.checkout",
@@ -7315,12 +6829,6 @@
             "tr": "Kurulum desteği için ekibimizle iletişime geçebilirsiniz",
             "en": "You can contact our team for installation support"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.order.success.backHome",
-            "tr": "Ana Sayfa'ya Dön",
-            "en": "Back to Home"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.payment.customerInfo",
@@ -7345,12 +6853,6 @@
             "tr": "Ülke",
             "en": "Country"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.payment.customer.city",
-            "tr": "Şehir",
-            "en": "City"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.payment.customer.district",
@@ -7363,18 +6865,6 @@
             "tr": "Posta Kodu",
             "en": "Postal Code"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.payment.customer.taxOffice",
-            "tr": "Vergi Dairesi",
-            "en": "Tax Office"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.payment.customer.taxNumber",
-            "tr": "Vergi No",
-            "en": "Tax Number"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.payment.customer.reference",
@@ -7399,12 +6889,6 @@
             "tr": "Komisyon yok",
             "en": "No commission"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.payment.installments.title",
-            "tr": "Taksit Seçenekleri",
-            "en": "Installment Options"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.payment.installments.commission",
@@ -7453,12 +6937,6 @@
             "tr": "Ara Toplam",
             "en": "Subtotal"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.payment.summary.commission",
-            "tr": "Komisyon",
-            "en": "Commission"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.payment.summary.monthlyInstallment",
@@ -7489,12 +6967,6 @@
             "tr": "Ödeme Yap",
             "en": "Pay"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.customerInfo",
-            "tr": "Müşteri Bilgileri",
-            "en": "Customer Information"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.tenantForm.existing.title",
@@ -7519,12 +6991,6 @@
             "tr": "Kayıt olun ve hemen başlayın",
             "en": "Register and get started immediately"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.orgCode",
-            "tr": "Kurum Kodu",
-            "en": "Organization Code"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.tenantForm.orgName",
@@ -7537,78 +7003,6 @@
             "tr": "Kurumu Bul",
             "en": "Find Organization"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.company",
-            "tr": "Şirket",
-            "en": "Company"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.mobile",
-            "tr": "Cep Telefonu",
-            "en": "Mobile"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.country",
-            "tr": "Ülke",
-            "en": "Country"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.city",
-            "tr": "Şehir",
-            "en": "City"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.district",
-            "tr": "İlçe",
-            "en": "District"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.postalCode",
-            "tr": "Posta Kodu",
-            "en": "Postal Code"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.taxOffice",
-            "tr": "Vergi Dairesi",
-            "en": "Tax Office"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.taxNumber",
-            "tr": "Vergi No",
-            "en": "Tax Number"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.reference",
-            "tr": "Referans",
-            "en": "Reference"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.buttons.back",
-            "tr": "Geri",
-            "en": "Back"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.tenantForm.buttons.continue",
-            "tr": "Devam",
-            "en": "Continue"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.search.title",
-            "tr": "Arama",
-            "en": "Search"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.search.placeholder",
@@ -7651,24 +7045,6 @@
             "tr": "Ürün eklemek için katalogdan seçim yapın",
             "en": "Add products from the catalog"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.cart.month",
-            "tr": "Ay",
-            "en": "Month"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.cart.year",
-            "tr": "Yıl",
-            "en": "Year"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.cart.total",
-            "tr": "Toplam",
-            "en": "Total"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.cart.checkout",
@@ -7693,30 +7069,6 @@
             "tr": "/ Ay",
             "en": "/ Month"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.price.perYearSuffix",
-            "tr": "/ Yıl",
-            "en": "/ Year"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.period.month",
-            "tr": "Ay",
-            "en": "Month"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.period.year",
-            "tr": "Yıl",
-            "en": "Year"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.total",
-            "tr": "Toplam",
-            "en": "Total"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.addToCart",
@@ -7747,12 +7099,6 @@
             "tr": "E-Ticaret Analitiği",
             "en": "E-Commerce Analytics"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.ecommerce.features.inventory",
-            "tr": "Stok Yönetimi",
-            "en": "Inventory Management"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.ecommerce.features.marketplace",
@@ -7771,12 +7117,6 @@
             "tr": "Duyarlı Tasarım",
             "en": "Responsive Design"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.ecommerce.features.seo",
-            "tr": "Seo Optimizasyonu",
-            "en": "Seo Optimization"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.ecommerce.title",
@@ -7795,18 +7135,6 @@
             "tr": "Dijital İk Süreçleri",
             "en": "Digital Hr Processes"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.hr.features.leave",
-            "tr": "İzin Yönetimi",
-            "en": "Leave Management"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.hr.features.payroll",
-            "tr": "Bordro Yönetimi",
-            "en": "Payroll Management"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.hr.features.performance",
@@ -7837,36 +7165,12 @@
             "tr": "İşletmenizin tüm süreçlerini tek bir platformdan yönetin.",
             "en": "Manage all your business processes from a single platform."
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.kurs.features.accounting",
-            "tr": "Muhasebe Yönetimi",
-            "en": "Accounting Management"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.kurs.features.inventory",
-            "tr": "Stok Yönetimi",
-            "en": "Inventory Management"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.kurs.features.mobile",
-            "tr": "Mobil Erişim",
-            "en": "Mobile Access"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.kurs.features.purchasing",
             "tr": "Satın Alma Yönetimi",
             "en": "Purchasing Management"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.kurs.features.reporting",
-            "tr": "Raporlama",
-            "en": "Reporting"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.kurs.features.sales",
@@ -7921,12 +7225,6 @@
             "tr": "Öğretmen ücretleri hesaplama",
             "en": "Teacher fee calculation"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.modules.accounting.title",
-            "tr": "Muhasebe Yönetimi",
-            "en": "Accounting Management"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.modules.reporting.features.branch",
@@ -8065,12 +7363,6 @@
             "tr": "Program satışları ve takibi",
             "en": "Program sales and tracking"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.modules.student.title",
-            "tr": "Öğrenci Yönetimi",
-            "en": "Student Management"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.pricing.founder.description",
@@ -8107,12 +7399,6 @@
             "tr": "350 ₺",
             "en": "₺350"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.pricing.teacher.title",
-            "tr": "Öğretmen Lisansı",
-            "en": "Teacher License"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.pricing.teacher.yearlyPrice",
@@ -8131,18 +7417,6 @@
             "tr": "Şube personelleri için temel kullanıcı lisansı",
             "en": "Basic user license for branch personnel"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.pricing.user.price",
-            "tr": "750 ₺",
-            "en": "₺750"
-        },
-        {
-            "resourceName": "Platform",
-            "key": "Public.products.pricing.user.title",
-            "tr": "Kullanıcı Lisansı",
-            "en": "User License"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.products.pricing.user.yearlyPrice",
@@ -8203,12 +7477,6 @@
             "tr": "Teknoloji Danışmanlığı",
             "en": "Technology Consulting"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.services.cta.contact",
-            "tr": "İletişime Geçin",
-            "en": "Get in Touch"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.services.cta.description",
@@ -8425,12 +7693,6 @@
             "tr": "Siber Güvenlik Eğitimleri",
             "en": "Cybersecurity Training"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.services.security.title",
-            "tr": "Siber Güvenlik",
-            "en": "Cybersecurity"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.services.software.desc",
@@ -8509,12 +7771,6 @@
             "tr": "Yedek doğrulama",
             "en": "Backup verification"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.services.support.backup.period",
-            "tr": "/ Yıl",
-            "en": "/ Year"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.services.support.backup.price",
@@ -8611,12 +7867,6 @@
             "tr": "'den başlayan",
             "en": "starting from"
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.services.support.sms.price",
-            "tr": "750 ₺",
-            "en": "₺750"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.services.support.sms.title",
@@ -8707,12 +7957,6 @@
             "tr": "iOS ve Android için native mobil uygulamalar geliştiriyoruz.",
             "en": "We develop native mobile applications for iOS and Android."
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.solutions.mobile.title",
-            "tr": "Mobil Uygulamalar",
-            "en": "Mobile Applications"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.solutions.subtitle",
@@ -8731,12 +7975,6 @@
             "tr": "Modern ve kullanıcı dostu web uygulamaları geliştiriyoruz.",
             "en": "We build modern and user-friendly web applications."
         },
-        {
-            "resourceName": "Platform",
-            "key": "Public.solutions.web.title",
-            "tr": "Web Uygulamaları",
-            "en": "Web Applications"
-        },
         {
             "resourceName": "Platform",
             "key": "Public.testimonials.title",
@@ -9193,12 +8431,6 @@
             "en": "Created",
             "tr": "Oluşturuldu"
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.DeveloperKit.Migration.AppliedLabel",
-            "en": "Applied",
-            "tr": "Uygulandı"
-        },
         {
             "resourceName": "Platform",
             "key": "App.DeveloperKit.Entity.Description",
@@ -9631,24 +8863,12 @@
             "en": "Add Field",
             "tr": "Alan Ekle"
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.DeveloperKit.EntityEditor.Type",
-            "en": "Type",
-            "tr": "Tip"
-        },
         {
             "resourceName": "Platform",
             "key": "App.DeveloperKit.EntityEditor.MaxLength",
             "en": "Max Length",
             "tr": "Maksimum Uzunluk"
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.DeveloperKit.EntityEditor.DefaultValue",
-            "en": "Default Value",
-            "tr": "Varsayılan Değer"
-        },
         {
             "resourceName": "Platform",
             "key": "App.DeveloperKit.EntityEditor.Unique",
@@ -9739,12 +8959,6 @@
             "en": "found",
             "tr": "bulundu"
         },
-        {
-            "resourceName": "Platform",
-            "key": "App.DeveloperKit.ComponentEditor.ValidationError.Line",
-            "en": "Row",
-            "tr": "Satır"
-        },
         {
             "resourceName": "Platform",
             "key": "App.DeveloperKit.ComponentEditor.ValidationError.More",
diff --git a/ui/src/components/developerKit/EntityEditor.tsx b/ui/src/components/developerKit/EntityEditor.tsx
index 4770d76c..1037b3be 100644
--- a/ui/src/components/developerKit/EntityEditor.tsx
+++ b/ui/src/components/developerKit/EntityEditor.tsx
@@ -454,11 +454,11 @@ const EntityEditor: React.FC = () => {
                           </div>
 
                           <div className="col-span-1 font-bold">
-                            {translate('::App.DeveloperKit.EntityEditor.Type')} *
+                            {translate('::ListForms.ListFormEdit.Type')} *
                           </div>
 
                           <div className="col-span-2 font-bold">
-                            {translate('::App.DeveloperKit.EntityEditor.DefaultValue')}
+                            {translate('::ListForms.ListFormEdit.ExtraDefaultValue')}
                           </div>
 
                           <div className="font-bold">
diff --git a/ui/src/components/developerKit/MigrationManager.tsx b/ui/src/components/developerKit/MigrationManager.tsx
index cf436755..670e3ae7 100644
--- a/ui/src/components/developerKit/MigrationManager.tsx
+++ b/ui/src/components/developerKit/MigrationManager.tsx
@@ -360,7 +360,7 @@ const MigrationManager: React.FC = () => {
                           <div className="flex items-center gap-1">
                             <FaCheckCircle className="w-3 h-3" />
                             <span>
-                              {translate('::App.DeveloperKit.Migration.AppliedLabel')}{' '}
+                              {translate('::App.DeveloperKit.Migration.Applied')}{' '}
                               {new Date(migration.appliedAt).toLocaleDateString()}
                             </span>
                           </div>
diff --git a/ui/src/components/importManager/ImportDashboard.tsx b/ui/src/components/importManager/ImportDashboard.tsx
index b03f0b5e..ba31ac43 100644
--- a/ui/src/components/importManager/ImportDashboard.tsx
+++ b/ui/src/components/importManager/ImportDashboard.tsx
@@ -286,7 +286,7 @@ export const ImportDashboard: React.FC<ImportDashboardProps> = ({ gridDto }) =>
                           {translate('::App.Listforms.ImportManager.Column')}
                         </th>
                         <th className="px-4 py-2 text-left text-xs font-medium text-slate-500 uppercase">
-                          {translate('::App.Listforms.ImportManager.Type')}
+                          {translate('::ListForms.ListFormEdit.Type')}
                         </th>
                         <th className="px-4 py-2 text-left text-xs font-medium text-slate-500 uppercase">
                           {translate('::App.Required')}
diff --git a/ui/src/components/layouts/PublicLayout.tsx b/ui/src/components/layouts/PublicLayout.tsx
index 761dc5fe..9309c08c 100644
--- a/ui/src/components/layouts/PublicLayout.tsx
+++ b/ui/src/components/layouts/PublicLayout.tsx
@@ -82,7 +82,7 @@ const PublicLayout = () => {
     },
     {
       resourceKey: 'Public.nav.products',
-      name: translate('::Public.nav.products'),
+      name: translate('::App.Orders'),
       path: ROUTES_ENUM.public.products,
       icon: FaVectorSquare,
     },
@@ -100,7 +100,7 @@ const PublicLayout = () => {
     },
     {
       resourceKey: 'Public.nav.contact',
-      name: translate('::Public.nav.contact'),
+      name: translate('::App.Contact'),
       path: ROUTES_ENUM.public.contact,
       icon: FaPhone,
     },
@@ -271,7 +271,7 @@ const PublicLayout = () => {
                       to={ROUTES_ENUM.public.products}
                       className="text-gray-400 hover:text-white transition-colors"
                     >
-                      {translate('::Public.nav.products')}
+                      {translate('::App.Orders')}
                     </Link>
                   </li>
                   <li>
@@ -303,7 +303,7 @@ const PublicLayout = () => {
                       to={ROUTES_ENUM.public.contact}
                       className="text-gray-400 hover:text-white transition-colors"
                     >
-                      {translate('::Public.nav.contact')}
+                      {translate('::App.Contact')}
                     </Link>
                   </li>
                 </ul>
@@ -312,7 +312,7 @@ const PublicLayout = () => {
               {/* Services */}
               <div>
                 <h3 className="text-lg font-bold mb-4 text-white">
-                  {translate('::Public.footer.servicesTitle')}
+                  {translate('::Public.services.title')}
                 </h3>
                 <ul className="space-y-2">
                   <li>
@@ -369,7 +369,7 @@ const PublicLayout = () => {
               {/* Contact Info */}
               <div>
                 <h3 className="text-lg font-bold mb-4 text-white">
-                  {translate('::Public.nav.contact')}
+                  {translate('::App.Contact')}
                 </h3>
                 <ul className="space-y-3">
                   <li className="flex items-start space-x-3">
diff --git a/ui/src/components/orders/Cart.tsx b/ui/src/components/orders/Cart.tsx
index c43d7c98..4b7089a9 100644
--- a/ui/src/components/orders/Cart.tsx
+++ b/ui/src/components/orders/Cart.tsx
@@ -116,8 +116,8 @@ export const Cart: React.FC<CartProps> = ({
                           <span className="text-xs text-gray-500">
                             ({cartState.globalPeriod}{' '}
                             {item.billingCycle === 'monthly'
-                              ? translate('::Public.cart.month')
-                              : translate('::Public.cart.year')}
+                              ? translate('::Public.products.billingcycle.month')
+                              : translate('::Public.products.billingcycle.year')}
                             )
                           </span>
                         )}
@@ -155,7 +155,7 @@ export const Cart: React.FC<CartProps> = ({
             <div className="border-t border-gray-200 p-6">
               <div className="flex justify-between items-center mb-4">
                 <span className="text-lg font-semibold text-gray-900">
-                  {translate('::Public.cart.total')}
+                  {translate('::Public.payment.summary.total')}
                 </span>
                 <span className="text-xl font-bold text-blue-600">
                   {formatPrice(cartState.total)}
diff --git a/ui/src/components/orders/OrderSuccess.tsx b/ui/src/components/orders/OrderSuccess.tsx
index 492f1f65..fe7ee715 100644
--- a/ui/src/components/orders/OrderSuccess.tsx
+++ b/ui/src/components/orders/OrderSuccess.tsx
@@ -45,7 +45,7 @@ export const OrderSuccess: React.FC<OrderSuccessProps> = ({ orderId, onBackToSho
             className="flex items-center justify-center px-6 py-3 border border-gray-300 text-gray-700 rounded-lg hover:bg-gray-50 transition-colors"
           >
             <FaArrowLeft className="w-4 h-4 mr-2" />
-            {translate('::Public.order.success.backHome')}
+            {translate('::Public.notFound.button')}
           </button>
         </div>
       </div>
diff --git a/ui/src/components/orders/PaymentForm.tsx b/ui/src/components/orders/PaymentForm.tsx
index 52aa70a8..a5a2b266 100644
--- a/ui/src/components/orders/PaymentForm.tsx
+++ b/ui/src/components/orders/PaymentForm.tsx
@@ -197,7 +197,7 @@ export const PaymentForm: React.FC<PaymentFormProps> = ({
                       <div className="flex items-center gap-2">
                         <FaGlobe className="w-4 h-4 text-gray-500" />
                         <span className="font-medium">
-                          {translate('::Public.payment.customer.city')}
+                          {translate('::Public.common.city')}
                         </span>
                         <span>{tenant.city}</span>
                       </div>
@@ -221,7 +221,7 @@ export const PaymentForm: React.FC<PaymentFormProps> = ({
                       <div className="flex items-center gap-2">
                         <FaMoneyBillWave className="w-4 h-4 text-gray-500" />
                         <span className="font-medium">
-                          {translate('::Public.payment.customer.taxOffice')}:
+                          {translate('::Public.contact.taxOffice')}:
                         </span>
                         <span>{tenant.taxOffice}</span>
                       </div>
@@ -229,7 +229,7 @@ export const PaymentForm: React.FC<PaymentFormProps> = ({
                       <div className="flex items-center gap-2">
                         <FaDollarSign className="w-4 h-4 text-gray-500" />
                         <span className="font-medium">
-                          {translate('::Public.payment.customer.taxNumber')}:
+                          {translate('::Public.contact.taxNumber')}:
                         </span>
                         <span>{tenant.vknTckn}</span>
                       </div>
@@ -295,7 +295,7 @@ export const PaymentForm: React.FC<PaymentFormProps> = ({
             {selectedPaymentMethod === defaultPaymentMethod && (
               <div className="bg-white rounded-xl shadow border p-4">
                 <h3 className="text-md font-medium text-gray-800 mb-2">
-                  {translate('::Public.payment.installments.title')}
+                  {translate('::App.Orders.InstallmentOptions')}
                 </h3>
                 <div className="grid grid-cols-2 md:grid-cols-3 gap-3">
                   {installmentOptions.map((option) => (
@@ -421,7 +421,7 @@ export const PaymentForm: React.FC<PaymentFormProps> = ({
                   <span>{formatPrice(cartState.total)}</span>
                 </div>
                 <div className="flex justify-between">
-                  <span>{translate('::Public.payment.summary.commission')}</span>
+                  <span>{translate('::Public.payment.installments.commission')}</span>
                   <span>{formatPrice(commission)}</span>
                 </div>
                 {selectedPaymentMethod === defaultPaymentMethod &&
diff --git a/ui/src/components/orders/ProductCard.tsx b/ui/src/components/orders/ProductCard.tsx
index 4e0f2426..96660e49 100644
--- a/ui/src/components/orders/ProductCard.tsx
+++ b/ui/src/components/orders/ProductCard.tsx
@@ -71,8 +71,8 @@ export const ProductCard: React.FC<ProductCardProps> = ({
   const getPeriodText = () => {
     const periodText =
       globalBillingCycle === 'monthly'
-        ? translate('::Public.products.period.month')
-        : translate('::Public.products.period.year')
+        ? translate('::Public.products.billingcycle.month')
+        : translate('::Public.products.billingcycle.year')
     return globalPeriod > 1 ? ` (${globalPeriod} ${periodText})` : ''
   }
 
@@ -154,7 +154,7 @@ export const ProductCard: React.FC<ProductCardProps> = ({
             </div>
             {globalPeriod > 1 && (
               <div className="text-lg font-semibold text-blue-600 mt-1">
-                {translate('::Public.products.total')} {formatPrice(getTotalPrice())}
+                {translate('::Public.payment.summary.total')} {formatPrice(getTotalPrice())}
                 <span className="text-sm font-normal text-gray-500 ml-1">{getPeriodText()}</span>
               </div>
             )}
diff --git a/ui/src/components/orders/ProductCatalog.tsx b/ui/src/components/orders/ProductCatalog.tsx
index 79e90ad4..be464d10 100644
--- a/ui/src/components/orders/ProductCatalog.tsx
+++ b/ui/src/components/orders/ProductCatalog.tsx
@@ -129,7 +129,7 @@ export const ProductCatalog: React.FC<ProductCatalogProps> = ({
             <div className="flex items-center space-x-2 mb-3">
               <FaSearch className="w-5 h-5 text-gray-600" />
               <h3 className="font-semibold text-gray-900">
-                {translate('::Public.products.search.title')}
+                {translate('::ListForms.ListFormEdit.TabSearch')}
               </h3>
             </div>
             <div className="relative">
diff --git a/ui/src/components/orders/TenantForm.tsx b/ui/src/components/orders/TenantForm.tsx
index 2b5582be..319f1ec0 100644
--- a/ui/src/components/orders/TenantForm.tsx
+++ b/ui/src/components/orders/TenantForm.tsx
@@ -78,7 +78,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
         <div className="mb-6">
           <h2 className="text-lg font-semibold mb-4 flex items-center">
             <FaUser className="w-5 h-5 text-green-600 mr-2" />{' '}
-            {translate('::Public.products.tenantForm.customerInfo')}
+            {translate('::Public.payment.customerInfo')}
           </h2>
         </div>
 
@@ -125,7 +125,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
             {isExisting ? (
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-2">
-                  {translate('::Public.products.tenantForm.orgCode')}
+                  {translate('::Public.payment.customer.code')}
                 </label>
                 <div className="relative flex flex-col sm:flex-row sm:items-stretch">
                   <div className="relative w-full">
@@ -169,7 +169,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                     <div className="flex items-center gap-2">
                       <FaBuilding className="w-4 h-4 text-gray-500" />
                       <span className="font-medium">
-                        {translate('::Public.products.tenantForm.company')}
+                        {translate('::Public.payment.customer.company')}
                       </span>
                       <span>{formData.organizationName}</span>
                     </div>
@@ -185,7 +185,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                     <div className="flex items-center gap-2">
                       <FaPhone className="w-4 h-4 text-gray-500" />
                       <span className="font-medium">
-                        {translate('::Public.products.tenantForm.mobile')}:
+                        {translate('::blog.categories.mobile')}:
                       </span>
                       <span>{formData.mobileNumber}</span>
                     </div>
@@ -203,7 +203,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                     <div className="flex items-center gap-2">
                       <FaGlobe className="w-4 h-4 text-gray-500" />
                       <span className="font-medium">
-                        {translate('::Public.products.tenantForm.country')}:
+                        {translate('::Public.payment.customer.country')}:
                       </span>
                       <span>{formData.country}</span>
                     </div>
@@ -211,7 +211,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                     <div className="flex items-center gap-2">
                       <FaGlobe className="w-4 h-4 text-gray-500" />
                       <span className="font-medium">
-                        {translate('::Public.products.tenantForm.city')}:
+                        {translate('::Public.common.city')}:
                       </span>
                       <span>{formData.city}</span>
                     </div>
@@ -219,7 +219,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                     <div className="flex items-center gap-2">
                       <FaMap className="w-4 h-4 text-gray-500" />
                       <span className="font-medium">
-                        {translate('::Public.products.tenantForm.district')}:
+                        {translate('::Public.payment.customer.district')}:
                       </span>
                       <span>{formData.district}</span>
                     </div>
@@ -227,7 +227,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                     <div className="flex items-center gap-2">
                       <FaMapPin className="w-4 h-4 text-gray-500" />
                       <span className="font-medium">
-                        {translate('::Public.products.tenantForm.postalCode')}:
+                        {translate('::Public.payment.customer.postalCode')}:
                       </span>
                       <span>{formData.postalCode}</span>
                     </div>
@@ -235,7 +235,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                     <div className="flex items-center gap-2">
                       <FaMoneyBillWave className="w-4 h-4 text-gray-500" />
                       <span className="font-medium">
-                        {translate('::Public.products.tenantForm.taxOffice')}:
+                        {translate('::Public.contact.taxOffice')}:
                       </span>
                       <span>{formData.taxOffice}</span>
                     </div>
@@ -243,7 +243,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                     <div className="flex items-center gap-2">
                       <FaDollarSign className="w-4 h-4 text-gray-500" />
                       <span className="font-medium">
-                        {translate('::Public.products.tenantForm.taxNumber')}:
+                        {translate('::Public.contact.taxNumber')}:
                       </span>
                       <span>{formData.vknTckn}</span>
                     </div>
@@ -252,7 +252,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                       <div className="flex items-center gap-2">
                         <FaUserPlus className="w-4 h-4 text-gray-500" />
                         <span className="font-medium">
-                          {translate('::Public.products.tenantForm.reference')}:
+                          {translate('::Public.payment.customer.reference')}:
                         </span>
                         <span>{formData.reference}</span>
                       </div>
@@ -353,7 +353,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                 <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
                   <div>
                     <label className="text-sm font-medium text-gray-700">
-                      {translate('::Public.products.tenantForm.country')}
+                      {translate('::Public.payment.customer.country')}
                     </label>
                     <div className="relative">
                       <FaGlobe className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
@@ -368,7 +368,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                   </div>
                   <div>
                     <label className="text-sm font-medium text-gray-700">
-                      {translate('::Public.products.tenantForm.city')}
+                      {translate('::Public.common.city')}
                     </label>
                     <div className="relative">
                       <FaGlobe className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
@@ -387,7 +387,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                 <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
                   <div>
                     <label className="text-sm font-medium text-gray-700">
-                      {translate('::Public.products.tenantForm.district')}
+                      {translate('::Public.payment.customer.district')}
                     </label>
                     <div className="relative">
                       <FaMapPin className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
@@ -403,7 +403,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                   </div>
                   <div>
                     <label className="text-sm font-medium text-gray-700">
-                      {translate('::Public.products.tenantForm.postalCode')}
+                      {translate('::Public.payment.customer.postalCode')}
                     </label>
                     <div className="relative">
                       <FaMapPin className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
@@ -422,7 +422,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                 <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
                   <div>
                     <label className="text-sm font-medium text-gray-700">
-                      {translate('::Public.products.tenantForm.taxOffice')}
+                      {translate('::Public.contact.taxOffice')}
                     </label>
                     <div className="relative">
                       <FaBuilding className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
@@ -438,7 +438,7 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                   </div>
                   <div>
                     <label className="text-sm font-medium text-gray-700">
-                      {translate('::Public.products.tenantForm.taxNumber')}
+                      {translate('::Public.contact.taxNumber')}
                     </label>
                     <div className="relative">
                       <FaDollarSign className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
@@ -456,13 +456,13 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
 
                 <div>
                   <label className="text-sm font-medium text-gray-700">
-                    {translate('::Public.products.tenantForm.reference')}
+                    {translate('::Public.payment.customer.reference')}
                   </label>
                   <div className="relative">
                     <FaUserPlus className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
                     <input
                       type="text"
-                      placeholder={translate('::Public.products.tenantForm.reference')}
+                      placeholder={translate('::Public.payment.customer.reference')}
                       value={formData.reference || ''}
                       onChange={(e) => handleInputChange('reference', e.target.value)}
                       className="w-full pl-10 pr-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
@@ -479,14 +479,14 @@ export const TenantForm: React.FC<TenantFormProps> = ({ onSubmit }) => {
                 className="flex items-center px-6 py-3 border border-gray-300 text-gray-700 rounded-lg"
               >
                 <FaArrowLeft className="w-4 h-4 mr-2" />
-                {translate('::Public.products.tenantForm.buttons.back')}
+                {translate('::Public.payment.buttons.back')}
               </button>
               <button
                 type="submit"
                 className="flex items-center justify-center px-6 py-3 bg-green-600 text-white rounded-lg"
               >
                 <FaArrowRight className="w-5 h-5 mr-2" />
-                {translate('::Public.products.tenantForm.buttons.continue')}
+                {translate('::Abp.Account.ResetPassword.Continue')}
               </button>
             </div>
           </form>
diff --git a/ui/src/components/reports/ReportGenerator.tsx b/ui/src/components/reports/ReportGenerator.tsx
index a1706359..dd0e1e53 100644
--- a/ui/src/components/reports/ReportGenerator.tsx
+++ b/ui/src/components/reports/ReportGenerator.tsx
@@ -135,7 +135,7 @@ export const ReportGenerator: React.FC<ReportGeneratorProps> = ({
             >
               <FaFileAlt className="h-4 w-4 mr-2" />
               {isGenerating
-                ? translate('::App.Reports.ReportGenerator.Generating')
+                ? translate('::App.DeveloperKit.Migration.Generating')
                 : translate('::App.Reports.ReportGenerator.GenerateReport')}
             </Button>
           </div>
diff --git a/ui/src/components/reports/ReportViewer.tsx b/ui/src/components/reports/ReportViewer.tsx
index 976aa18c..1b9f1b66 100644
--- a/ui/src/components/reports/ReportViewer.tsx
+++ b/ui/src/components/reports/ReportViewer.tsx
@@ -189,7 +189,7 @@ export const ReportViewer: React.FC = () => {
           </p>
           <Button onClick={() => navigate(ROUTES_ENUM.protected.dashboard)}>
             <FaArrowLeft className="h-4 w-4 mr-2" />
-            {translate('::App.Reports.ReportViewer.BackToDashboard')}
+            {translate('::Public.notFound.button')}
           </Button>
         </div>
       </div>
diff --git a/ui/src/components/reports/TemplateEditor.tsx b/ui/src/components/reports/TemplateEditor.tsx
index 61fd601a..a4d0507c 100644
--- a/ui/src/components/reports/TemplateEditor.tsx
+++ b/ui/src/components/reports/TemplateEditor.tsx
@@ -381,7 +381,7 @@ export const TemplateEditor: React.FC<TemplateEditorProps> = ({
                                 updateParameter(param.id, { defaultValue: e.target.value })
                               }
                               placeholder={translate(
-                                '::App.Reports.TemplateEditor.Placeholder.DefaultValue',
+                                '::ListForms.ListFormEdit.ExtraDefaultValue',
                               )}
                               className="w-full text-xs bg-gray-50 px-1.5 py-0.5 rounded border border-gray-200 outline-none"
                             />
diff --git a/ui/src/views/admin/listForm/edit/FormEdit.tsx b/ui/src/views/admin/listForm/edit/FormEdit.tsx
index 02932195..6386bf84 100644
--- a/ui/src/views/admin/listForm/edit/FormEdit.tsx
+++ b/ui/src/views/admin/listForm/edit/FormEdit.tsx
@@ -200,7 +200,7 @@ const FormEdit = () => {
           )}
           {visibleTabs.includes('permissions') && (
             <TabNav value="permissions">
-              {translate('::ListForms.ListFormEdit.TabPermissions')}
+              {translate('::Abp.Identity.Permissions')}
             </TabNav>
           )}
           {visibleTabs.includes('commands') && (
@@ -210,7 +210,7 @@ const FormEdit = () => {
             <TabNav value="columns">{translate('::ListForms.ListFormEdit.TabColumns')}</TabNav>
           )}
           {visibleTabs.includes('edit') && (
-            <TabNav value="edit">{translate('::ListForms.ListFormEdit.TabEditing')}</TabNav>
+            <TabNav value="edit">{translate('::ListForms.ListFormEdit.Editing')}</TabNav>
           )}
           {visibleTabs.includes('sortingForm') && (
             <TabNav value="sortingForm">{translate('::ListForms.ListFormEdit.TabSorting')}</TabNav>
@@ -231,7 +231,7 @@ const FormEdit = () => {
             <TabNav value="select">{translate('::ListForms.ListFormEdit.TabSelection')}</TabNav>
           )}
           {visibleTabs.includes('pivots') && (
-            <TabNav value="pivots">{translate('::ListForms.ListFormEdit.TabPivots')}</TabNav>
+            <TabNav value="pivots">{translate('::ListForms.ListForm.Pivots')}</TabNav>
           )}
           {visibleTabs.includes('tree') && (
             <TabNav value="tree">{translate('::ListForms.ListFormEdit.TabTree')}</TabNav>
@@ -259,7 +259,7 @@ const FormEdit = () => {
             <TabNav value="editForm">{translate('::ListForms.ListFormEdit.EditingForm')}</TabNav>
           )}
           {visibleTabs.includes('subForms') && (
-            <TabNav value="subForms">{translate('::ListForms.ListFormEdit.TabSubForms')}</TabNav>
+            <TabNav value="subForms">{translate('::ListForms.ListFormEdit.SubForms')}</TabNav>
           )}
           {visibleTabs.includes('widget') && (
             <TabNav value="widget">{translate('::ListForms.ListFormEdit.TabWidgets')}</TabNav>
@@ -307,7 +307,7 @@ const FormEdit = () => {
           )}
           {visibleTabs.includes('exportSettings') && (
             <TabNav value="exportSettings">
-              {translate('::ListForms.ListFormEdit.TabChartExport')}
+              {translate('::ListForms.ListFormEdit.PermissionsExport')}
             </TabNav>
           )}
         </TabList>
diff --git a/ui/src/views/admin/listForm/edit/FormTabEdit.tsx b/ui/src/views/admin/listForm/edit/FormTabEdit.tsx
index ae20229a..d2971f61 100644
--- a/ui/src/views/admin/listForm/edit/FormTabEdit.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabEdit.tsx
@@ -137,7 +137,7 @@ function FormTabEdit(props: FormEditProps & { listFormCode: string }) {
                   />
                 </FormItem>
                 <FormItem
-                  label={translate('::ListForms.ListFormEdit.EditingMode')}
+                  label={translate('::SidePanel.Mode')}
                   invalid={errors.editingOptionDto?.mode && touched.editingOptionDto?.mode}
                   errorMessage={errors.editingOptionDto?.mode}
                 >
@@ -145,7 +145,7 @@ function FormTabEdit(props: FormEditProps & { listFormCode: string }) {
                     type="text"
                     autoComplete="off"
                     name="editingOptionDto.mode"
-                    placeholder={translate('::ListForms.ListFormEdit.EditingMode')}
+                    placeholder={translate('::SidePanel.Mode')}
                   >
                     {({ field, form }: FieldProps<GridsEditMode>) => (
                       <Select
@@ -310,7 +310,7 @@ function FormTabEdit(props: FormEditProps & { listFormCode: string }) {
                       />
                     </FormItem>
                     <FormItem
-                      label={translate('::ListForms.ListFormEdit.EditingHeight')}
+                      label={translate('::ListForms.ListFormEdit.DetailsHeight')}
                       invalid={
                         errors.editingOptionDto?.popup?.height &&
                         touched.editingOptionDto?.popup?.height
@@ -322,7 +322,7 @@ function FormTabEdit(props: FormEditProps & { listFormCode: string }) {
                         type="number"
                         autoComplete="off"
                         name="editingOptionDto.popup.height"
-                        placeholder={translate('::ListForms.ListFormEdit.EditingHeight')}
+                        placeholder={translate('::ListForms.ListFormEdit.DetailsHeight')}
                         component={Input}
                       />
                     </FormItem>
diff --git a/ui/src/views/admin/listForm/edit/FormTabFilters.tsx b/ui/src/views/admin/listForm/edit/FormTabFilters.tsx
index 6021b754..9924a2c8 100644
--- a/ui/src/views/admin/listForm/edit/FormTabFilters.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabFilters.tsx
@@ -139,7 +139,7 @@ function FormTabFilters(props: FormEditProps) {
                     />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormFieldEdit.OptionsAllowSearch')}
+                    label={translate('::ListForms.ListFormFieldEdit.HeaderingAllowSearch')}
                     invalid={
                       errors.headerFilterDto?.allowSearch && touched.headerFilterDto?.allowSearch
                     }
@@ -147,7 +147,7 @@ function FormTabFilters(props: FormEditProps) {
                   >
                     <Field
                       name="headerFilterDto.allowSearch"
-                      placeholder={translate('::ListForms.ListFormFieldEdit.OptionsAllowSearch')}
+                      placeholder={translate('::ListForms.ListFormFieldEdit.HeaderingAllowSearch')}
                       component={Checkbox}
                     />
                   </FormItem>
@@ -166,7 +166,7 @@ function FormTabFilters(props: FormEditProps) {
                     />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormEdit.EditingHeight')}
+                    label={translate('::ListForms.ListFormEdit.DetailsHeight')}
                     invalid={errors.headerFilterDto?.height && touched.headerFilterDto?.height}
                     errorMessage={errors.headerFilterDto?.height}
                   >
@@ -175,7 +175,7 @@ function FormTabFilters(props: FormEditProps) {
                       type="number"
                       autoComplete="off"
                       name="headerFilterDto.height"
-                      placeholder={translate('::ListForms.ListFormEdit.EditingHeight')}
+                      placeholder={translate('::ListForms.ListFormEdit.DetailsHeight')}
                       component={Input}
                     />
                   </FormItem>
diff --git a/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx b/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx
index 9b71da27..8982eecd 100644
--- a/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx
@@ -86,7 +86,7 @@ function FormTabPermissions(props: FormEditProps) {
                 </Field>
               </FormItem>
               <FormItem
-                label={translate('::ListForms.ListFormEdit.PermissionsRead')}
+                label={translate('::Read')}
                 invalid={errors.permissionDto?.r && touched.permissionDto?.r}
                 errorMessage={errors.permissionDto?.r}
               >
@@ -94,7 +94,7 @@ function FormTabPermissions(props: FormEditProps) {
                   type="text"
                   autoComplete="off"
                   name="permissionDto.r"
-                  placeholder={translate('::ListForms.ListFormEdit.PermissionsRead')}
+                  placeholder={translate('::Read')}
                 >
                   {({ field, form }: FieldProps<SelectBoxOption>) => (
                     <Select
diff --git a/ui/src/views/admin/listForm/edit/FormTabState.tsx b/ui/src/views/admin/listForm/edit/FormTabState.tsx
index 75ec27a9..69a3dc3f 100644
--- a/ui/src/views/admin/listForm/edit/FormTabState.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabState.tsx
@@ -59,7 +59,7 @@ function FormTabState(props: FormEditProps) {
                 />
               </FormItem>
               <FormItem
-                label={translate('::ListForms.ListFormEdit.StateType')}
+                label={translate('::ListForms.ListFormEdit.Type')}
                 invalid={errors.stateStoringDto?.type && touched.stateStoringDto?.type}
                 errorMessage={errors.stateStoringDto?.type}
               >
@@ -67,7 +67,7 @@ function FormTabState(props: FormEditProps) {
                   type="text"
                   autoComplete="off"
                   name="stateStoringDto.type"
-                  placeholder={translate('::ListForms.ListFormEdit.StateType')}
+                  placeholder={translate('::ListForms.ListFormEdit.Type')}
                 >
                   {({ field, form }: FieldProps<StateStoreType>) => (
                     <Select
diff --git a/ui/src/views/admin/listForm/edit/FormTabTree.tsx b/ui/src/views/admin/listForm/edit/FormTabTree.tsx
index 64391b80..83c42f77 100644
--- a/ui/src/views/admin/listForm/edit/FormTabTree.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabTree.tsx
@@ -83,14 +83,14 @@ function FormTabTree(props: FormEditProps) {
           <Form>
             <FormContainer size="sm">
               <FormItem
-                label={translate('::ListForms.ListFormEdit.TreeKeyFieldName')}
+                label={translate('::ListForms.ListFormEdit.DatabaseDataSourceKeyFieldName')}
                 invalid={errors.treeOptionDto?.keyExpr && touched.treeOptionDto?.keyExpr}
                 errorMessage={errors.treeOptionDto?.keyExpr}
               >
                 <Field
                   type="text"
                   name="treeOptionDto.keyExpr"
-                  placeholder={translate('::ListForms.ListFormEdit.TreeKeyFieldName')}
+                  placeholder={translate('::ListForms.ListFormEdit.DatabaseDataSourceKeyFieldName')}
                 >
                   {({ field, form }: FieldProps<SelectBoxOption>) => (
                     <Select
diff --git a/ui/src/views/admin/listForm/edit/FormTabWidgets.tsx b/ui/src/views/admin/listForm/edit/FormTabWidgets.tsx
index 12064d53..765c07cc 100644
--- a/ui/src/views/admin/listForm/edit/FormTabWidgets.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabWidgets.tsx
@@ -28,7 +28,7 @@ function FormTabWidgets(props: { listFormCode: string }) {
       <Card
         className="my-2"
         bodyClass="p-0"
-        header={translate('::ListForms.ListFormEdit.Widgets')}
+        header={translate('::ListForms.ListFormEdit.TabWidgets')}
         headerExtra={translate('::ListForms.ListFormEdit.WidgetsDescription')}
       >
         <Table compact>
@@ -55,7 +55,7 @@ function FormTabWidgets(props: { listFormCode: string }) {
                 />
               </Th>
               <Th>{translate('::ListForms.ListFormEdit.WidgetColGap')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.WidgetColSpan')}</Th>
+              <Th>{translate('::ListForms.ListFormEdit.EditingFormColumnSpan')}</Th>
               <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
               <Th>{translate('::ListForms.ListFormEdit.WidgetClassName')}</Th>
               <Th>{translate('::ListForms.ListFormEdit.WidgetValueClassName')}</Th>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx
index 6a93b954..b2d3bf26 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx
@@ -39,22 +39,22 @@ function FormFieldEdit({
     <>
       <Tabs defaultValue="details">
         <TabList className="flex-wrap">
-          <TabNav value="details">{translate('::ListForms.ListFormFieldEdit.TabDetails')}</TabNav>
+          <TabNav value="details">{translate('::ListForms.ListFormEdit.TabDetails')}</TabNav>
           <TabNav value="options">{translate('::ListForms.ListFormFieldEdit.TabOptions')}</TabNav>
           <TabNav value="permissions">
-            {translate('::ListForms.ListFormFieldEdit.TabPermissions')}
+            {translate('::Abp.Identity.Permissions')}
           </TabNav>
           <TabNav value="lookup">{translate('::ListForms.ListFormFieldEdit.TabLookup')}</TabNav>
           <TabNav value="customization">
-            {translate('::ListForms.ListFormFieldEdit.TabCustomization')}
+            {translate('::ListForms.ListFormEdit.TabCustomization')}
           </TabNav>
           <TabNav value="filtering">
-            {translate('::ListForms.ListFormFieldEdit.TabFiltering')}
+            {translate('::ListForms.ListFormEdit.TabFiltering')}
           </TabNav>
           <TabNav value="headering">
             {translate('::ListForms.ListFormFieldEdit.TabHeadering')}
           </TabNav>
-          <TabNav value="grouping">{translate('::ListForms.ListFormFieldEdit.TabGrouping')}</TabNav>
+          <TabNav value="grouping">{translate('::ListForms.ListFormEdit.TabGrouping')}</TabNav>
           <TabNav value="groupSummary">
             {translate('::ListForms.ListFormFieldEdit.TabGroupSummary')}
           </TabNav>
@@ -65,7 +65,7 @@ function FormFieldEdit({
             {translate('::ListForms.ListFormFieldEdit.TabJoinOptions')}
           </TabNav>
           <TabNav value="cssOptions">
-            {translate('::ListForms.ListFormFieldEdit.TabCssOptions')}
+            {translate('::ListForms.ListFormField.CopyFieldsCssOptions')}
           </TabNav>
           <TabNav value="validationRules">
             {translate('::ListForms.ListFormFieldEdit.TabValidationRules')}
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabHeadering.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabHeadering.tsx
index de3c8046..54988324 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabHeadering.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabHeadering.tsx
@@ -50,7 +50,7 @@ function FormFieldTabHeadering({
               </FormItem>
 
               <FormItem
-                label={translate('::ListForms.ListFormFieldEdit.HeaderingDataSourceString')}
+                label={translate('::ListForms.ListFormEdit.DatabaseDataSource')}
                 invalid={
                   errors.columnHeaderDto?.dataSourceString &&
                   touched.columnHeaderDto?.dataSourceString
@@ -59,7 +59,7 @@ function FormFieldTabHeadering({
               >
                 <Field
                   name="columnHeaderDto.dataSourceString"
-                  placeholder={translate('::ListForms.ListFormFieldEdit.HeaderingDataSourceString')}
+                  placeholder={translate('::ListForms.ListFormEdit.DatabaseDataSource')}
                   component={Input}
                   textArea={true}
                 />
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx
index 53f4bd50..5ccff4dd 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx
@@ -102,10 +102,10 @@ function FormFieldTabOptions({
               >
                 <Field name="visible" component={Checkbox} />
               </FormItem>
-              <FormItem label={translate('::ListForms.ListFormFieldEdit.OptionsAllowEditing')}>
+              <FormItem label={translate('::ListForms.ListFormEdit.EditingAllowUpdating')}>
                 <Field name="columnEditingDto.allowEditing" component={Checkbox} />
               </FormItem>
-              <FormItem label={translate('::ListForms.ListFormFieldEdit.OptionsAllowSearch')}>
+              <FormItem label={translate('::ListForms.ListFormFieldEdit.HeaderingAllowSearch')}>
                 <Field name="allowSearch" component={Checkbox} />
               </FormItem>
 
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPermissions.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPermissions.tsx
index 8008d237..22cd13a2 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPermissions.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPermissions.tsx
@@ -70,7 +70,7 @@ function FormFieldTabPermissions({
                 <Field name="permissionDto.deny" component={Checkbox} />
               </FormItem>
               <FormItem
-                label={translate('::ListForms.ListFormEdit.PermissionsRead')}
+                label={translate('::Read')}
                 invalid={errors.permissionDto?.r && touched.permissionDto?.r}
                 errorMessage={errors.permissionDto?.r}
               >
@@ -78,7 +78,7 @@ function FormFieldTabPermissions({
                   type="text"
                   autoComplete="off"
                   name="permissionDto.r"
-                  placeholder={translate('::ListForms.ListFormEdit.PermissionsRead')}
+                  placeholder={translate('::Read')}
                 >
                   {({ field, form }: FieldProps<SelectBoxOption>) => (
                     <Select
@@ -145,7 +145,7 @@ function FormFieldTabPermissions({
                 </Field>
               </FormItem>
               <FormItem
-                label={translate('::ListForms.ListFormFieldEdit.PermissionsExport')}
+                label={translate('::ListForms.ListFormEdit.PermissionsExport')}
                 invalid={errors.permissionDto?.e && touched.permissionDto?.e}
                 errorMessage={errors.permissionDto?.e}
               >
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabTotalSummary.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabTotalSummary.tsx
index ccd57e50..0ebd6e79 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabTotalSummary.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabTotalSummary.tsx
@@ -66,12 +66,12 @@ function FormFieldTabTotalSummary({
                 </Field>
               </FormItem>
 
-              <FormItem label={translate('::ListForms.ListFormFieldEdit.TotalSummaryValueFormat')}>
+              <FormItem label={translate('::ListForms.ListFormFieldEdit.GroupingSummaryValueFormat')}>
                 <Field
                   type="text"
                   autoComplete="off"
                   name="columnTotalSummaryDto.valueFormat"
-                  placeholder={translate('::ListForms.ListFormFieldEdit.TotalSummaryValueFormat')}
+                  placeholder={translate('::ListForms.ListFormFieldEdit.GroupingSummaryValueFormat')}
                 >
                   {({ field, form }: FieldProps<any>) => (
                     <Select
@@ -89,7 +89,7 @@ function FormFieldTabTotalSummary({
               </FormItem>
 
               <FormItem
-                label={translate('::ListForms.ListFormFieldEdit.TotalSummaryDisplayFormat')}
+                label={translate('::ListForms.ListFormFieldEdit.GroupingSummaryDisplayFormat')}
                 invalid={
                   errors.columnTotalSummaryDto?.displayFormat &&
                   touched.columnTotalSummaryDto?.displayFormat
@@ -100,13 +100,13 @@ function FormFieldTabTotalSummary({
                   type="text"
                   autoComplete="off"
                   name="columnTotalSummaryDto.displayFormat"
-                  placeholder={translate('::ListForms.ListFormFieldEdit.TotalSummaryDisplayFormat')}
+                  placeholder={translate('::ListForms.ListFormFieldEdit.GroupingSummaryDisplayFormat')}
                   component={Input}
                 />
               </FormItem>
 
               <FormItem
-                label={translate('::ListForms.ListFormFieldEdit.TotalSummaryShowInColumn')}
+                label={translate('::ListForms.ListFormFieldEdit.GroupingSummaryShowInColumn')}
                 invalid={
                   errors.columnTotalSummaryDto?.showInColumn &&
                   touched.columnTotalSummaryDto?.showInColumn
@@ -117,29 +117,29 @@ function FormFieldTabTotalSummary({
                   type="text"
                   autoComplete="off"
                   name="columnTotalSummaryDto.showInColumn"
-                  placeholder={translate('::ListForms.ListFormFieldEdit.TotalSummaryShowInColumn')}
+                  placeholder={translate('::ListForms.ListFormFieldEdit.GroupingSummaryShowInColumn')}
                   component={Input}
                 />
               </FormItem>
 
               <FormItem
-                label={translate('::ListForms.ListFormFieldEdit.TotalSummaryShowInGroupFooter')}
+                label={translate('::ListForms.ListFormFieldEdit.GroupingSummaryShowInGroupFooter')}
               >
                 <Field
                   name="columnTotalSummaryDto.showInGroupFooter"
                   placeholder={translate(
-                    '::ListForms.ListFormFieldEdit.TotalSummaryShowInGroupFooter',
+                    '::ListForms.ListFormFieldEdit.GroupingSummaryShowInGroupFooter',
                   )}
                   component={Checkbox}
                 />
               </FormItem>
 
               <FormItem
-                label={translate('::ListForms.ListFormFieldEdit.TotalSummaryAlignByColumn')}
+                label={translate('::ListForms.ListFormFieldEdit.GroupingSummaryAlignByColumn')}
               >
                 <Field
                   name="columnTotalSummaryDto.alignByColumn"
-                  placeholder={translate('::ListForms.ListFormFieldEdit.TotalSummaryAlignByColumn')}
+                  placeholder={translate('::ListForms.ListFormFieldEdit.GroupingSummaryAlignByColumn')}
                   component={Checkbox}
                 />
               </FormItem>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx
index ad3c1c01..792ced46 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx
@@ -791,19 +791,19 @@ function FormFields({
                 </FormItem>
                 <div className="grid grid-cols-4 gap-4">
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsAll')}
+                    label={translate('::App.Reports.Dashboard.All')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.all" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsDetails')}
+                    label={translate('::ListForms.ListFormEdit.TabDetails')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.details" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsOptions')}
+                    label={translate('::ListForms.ListFormFieldEdit.TabOptions')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.options" component={Checkbox} className="mr-1" />
@@ -815,13 +815,13 @@ function FormFields({
                     <Field name="copiedFields.permission" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsLookup')}
+                    label={translate('::ListForms.ListFormFieldEdit.TabLookup')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.lookup" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsCustomization')}
+                    label={translate('::ListForms.ListFormEdit.TabCustomization')}
                     labelClass="justify-center"
                   >
                     <Field
@@ -831,37 +831,37 @@ function FormFields({
                     />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsFiltering')}
+                    label={translate('::ListForms.ListFormEdit.TabFiltering')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.filtering" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsHeadering')}
+                    label={translate('::ListForms.ListFormFieldEdit.TabHeadering')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.headering" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsGrouping')}
+                    label={translate('::ListForms.ListFormEdit.TabGrouping')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.grouping" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsGroupSummary')}
+                    label={translate('::ListForms.ListFormFieldEdit.TabGroupSummary')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.groupSummary" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsTotalSummary')}
+                    label={translate('::ListForms.ListFormFieldEdit.TabTotalSummary')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.totalSummary" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsJoinOptions')}
+                    label={translate('::ListForms.ListFormFieldEdit.TabJoinOptions')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.joinOptions" component={Checkbox} className="mr-1" />
@@ -873,7 +873,7 @@ function FormFields({
                     <Field name="copiedFields.cssOptions" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsValidationRules')}
+                    label={translate('::ListForms.ListFormFieldEdit.TabValidationRules')}
                     labelClass="justify-center"
                   >
                     <Field
@@ -889,7 +889,7 @@ function FormFields({
                     <Field name="copiedFields.formatting" component={Checkbox} className="mr-1" />
                   </FormItem>
                   <FormItem
-                    label={translate('::ListForms.ListFormField.CopyFieldsPivotSetting')}
+                    label={translate('::ListForms.ListFormFieldEdit.TabPivotSettings')}
                     labelClass="justify-center"
                   >
                     <Field name="copiedFields.pivotSetting" component={Checkbox} className="mr-1" />
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx
index 564356fd..a9e312af 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx
@@ -484,13 +484,13 @@ function JsonRowOpDialogEditForm({
                                             </FormItem>
                                             <FormItem
                                               label={translate(
-                                                '::ListForms.ListFormFieldEdit.LookupTableFilterRowVisible',
+                                                '::ListForms.ListFormEdit.FilteringSortingFilterRowVisible',
                                               )}
                                             >
                                               <Field
                                                 name={`items.${index}.gridBoxOptions.filterRowVisible`}
                                                 placeholder={translate(
-                                                  '::ListForms.ListFormFieldEdit.LookupTableFilterRowVisible',
+                                                  '::ListForms.ListFormEdit.FilteringSortingFilterRowVisible',
                                                 )}
                                                 component={Checkbox}
                                               />
@@ -512,7 +512,7 @@ function JsonRowOpDialogEditForm({
                                             </FormItem>
                                             <FormItem
                                               label={translate(
-                                                '::ListForms.ListFormFieldEdit.LookupTableHeight',
+                                                '::ListForms.ListFormEdit.DetailsHeight',
                                               )}
                                             >
                                               <Field
@@ -520,14 +520,14 @@ function JsonRowOpDialogEditForm({
                                                 autoComplete="off"
                                                 name={`items.${index}.gridBoxOptions.height`}
                                                 placeholder={translate(
-                                                  '::ListForms.ListFormFieldEdit.LookupTableHeight',
+                                                  '::ListForms.ListFormEdit.DetailsHeight',
                                                 )}
                                                 component={Input}
                                               />
                                             </FormItem>
                                             <FormItem
                                               label={translate(
-                                                '::ListForms.ListFormFieldEdit.LookupTableColumnsString',
+                                                '::ListForms.ListFormEdit.TabColumns',
                                               )}
                                             >
                                               <Field
@@ -535,14 +535,14 @@ function JsonRowOpDialogEditForm({
                                                 autoComplete="off"
                                                 name={`items.${index}.gridBoxOptions.columnsString`}
                                                 placeholder={translate(
-                                                  '::ListForms.ListFormFieldEdit.LookupTableColumnsString',
+                                                  '::ListForms.ListFormEdit.TabColumns',
                                                 )}
                                                 component={Input}
                                               />
                                             </FormItem>
                                             <FormItem
                                               label={translate(
-                                                '::ListForms.ListFormFieldEdit.LookupTableSelectionMode',
+                                                '::ListForms.ListFormEdit.SelectionMode',
                                               )}
                                             >
                                               <Field
@@ -550,7 +550,7 @@ function JsonRowOpDialogEditForm({
                                                 autoComplete="off"
                                                 name={`items.${index}.gridBoxOptions.selectionMode`}
                                                 placeholder={translate(
-                                                  '::ListForms.ListFormFieldEdit.LookupTableSelectionMode',
+                                                  '::ListForms.ListFormEdit.SelectionMode',
                                                 )}
                                               >
                                                 {({ field, form }: FieldProps<any>) => (
diff --git a/ui/src/views/forum/admin/TopicManagement.tsx b/ui/src/views/forum/admin/TopicManagement.tsx
index 96c9710e..bff5b2ca 100644
--- a/ui/src/views/forum/admin/TopicManagement.tsx
+++ b/ui/src/views/forum/admin/TopicManagement.tsx
@@ -348,7 +348,7 @@ export function TopicManagement({
       <div className="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
         <div className="px-6 py-4 border-b border-gray-200">
           <h3 className="text-lg font-semibold text-gray-900">
-            {translate('::App.Forum.TopicManagement.Topics')} ({topics.length})
+            {translate('::App.Forum.Dashboard.Topics')} ({topics.length})
           </h3>
         </div>
 
diff --git a/ui/src/views/public/Contact.tsx b/ui/src/views/public/Contact.tsx
index 0e6ae366..6b83256d 100644
--- a/ui/src/views/public/Contact.tsx
+++ b/ui/src/views/public/Contact.tsx
@@ -55,7 +55,7 @@ const Contact: React.FC = () => {
     <div className="min-h-screen bg-gray-50">
       <Helmet
         titleTemplate="%s | Erp Platform"
-        title={translate('::' + 'Public.contact.title')}
+        title={translate('::App.Contact')}
         defaultTitle="Erp Platform"
       ></Helmet>
 
@@ -72,7 +72,7 @@ const Contact: React.FC = () => {
         ></div>
         <div className="container mx-auto pt-20 relative">
           <h1 className="text-5xl font-bold ml-4 mt-3 mb-2 text-white">
-            {translate('::Public.contact.title')}
+            {translate('::App.Contact')}
           </h1>
           <p className="text-xl max-w-3xl ml-4">{translate('::Public.contact.subtitle')}</p>
         </div>
diff --git a/ui/src/views/public/Home.tsx b/ui/src/views/public/Home.tsx
index b1e30121..b292481f 100644
--- a/ui/src/views/public/Home.tsx
+++ b/ui/src/views/public/Home.tsx
@@ -68,13 +68,13 @@ const Home: React.FC = () => {
   const solutions = [
     {
       icon: <FaDesktop className="w-16 h-16 text-white" />,
-      title: translate('::Public.solutions.web.title'),
+      title: translate('::Public.services.web.title'),
       description: translate('::Public.solutions.web.desc'),
       color: 'bg-blue-600',
     },
     {
       icon: <FaMobileAlt className="w-16 h-16 text-white" />,
-      title: translate('::Public.solutions.mobile.title'),
+      title: translate('::Public.services.mobile.title'),
       description: translate('::Public.solutions.mobile.desc'),
       color: 'bg-purple-600',
     },
diff --git a/ui/src/views/public/Products.tsx b/ui/src/views/public/Products.tsx
index 29bdda65..2a577db4 100644
--- a/ui/src/views/public/Products.tsx
+++ b/ui/src/views/public/Products.tsx
@@ -77,7 +77,7 @@ const Products: React.FC = () => {
     <div className="min-h-screen bg-gray-50">
       <Helmet
         titleTemplate="%s | Erp Platform"
-        title={translate('::' + 'Public.nav.products')}
+        title={translate('::App.Orders')}
         defaultTitle="Erp Platform"
       ></Helmet>
 
diff --git a/ui/src/views/public/Services.tsx b/ui/src/views/public/Services.tsx
index e32d3e52..e0451e11 100644
--- a/ui/src/views/public/Services.tsx
+++ b/ui/src/views/public/Services.tsx
@@ -191,7 +191,7 @@ const Services: React.FC = () => {
             to={ROUTES_ENUM.public.contact}
             className="bg-white text-blue-900 px-8 py-3 rounded-lg font-semibold hover:bg-blue-50 transition-colors"
           >
-            {translate('::Public.services.cta.contact')}
+            {translate('::Public.services.support.contactButton')}
           </Link>
         </div>
       </div>