Merge branch 'dev' of https://github.com/abpframework/abp into dev

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en-GB.json

@@ -197,6 +197,19 @@
     "RemoveCache": "Remove Cache",
     "Language": "Language",
     "Optional": "Optional",
-    "CreateArticleLanguageInfo": "The language in which the article is written"
+    "CreateArticleLanguageInfo": "The language in which the article is written",
+    "Menu:Quotation": "Quotation",
+    "Menu:Invoice": "Invoice",
+    "Menu:PaymentRequests": "Payment Requests",
+    "Permission:PaymentRequests": "Payment Requests",
+    "PaymentRequests": "Payment Requests",
+    "Creator": "Creator",
+    "ExtraProperties": "Extra Properties",
+    "Organization": "Organization",
+    "Waiting": "Waiting",
+    "Completed": "Completed",
+    "Failed": "Failed",
+    "PaymentRequestDeletionWarningMessage": "This payment request will be deleted. Do you confirm that?",
+    "Payment": "Payment"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

@@ -277,6 +277,19 @@
     "ThisExtensionIsNotAllowed": "This extension is not allowed.",
     "TheFileIsTooLarge": "The file is too large!",
     "ArticleDeletionConfirmationMessage": "Are you sure you want to hard delete this article?",
-    "ChooseCoverImage": "Choose a cover image..."
+    "ChooseCoverImage": "Choose a cover image...",
+    "Menu:Quotation": "Quotation",
+    "Menu:Invoice": "Invoice",
+    "Menu:PaymentRequests": "Payment Requests",
+    "Permission:PaymentRequests": "Payment Requests",
+    "PaymentRequests": "Payment Requests",
+    "Creator": "Creator",
+    "ExtraProperties": "Extra Properties",
+    "Organization": "Organization",
+    "Waiting": "Waiting",
+    "Completed": "Completed",
+    "Failed": "Failed",
+    "PaymentRequestDeletionWarningMessage": "This payment request will be deleted. Do you confirm that?",
+    "Payment": "Payment"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/tr.json

@@ -227,6 +227,19 @@
     "TheFileIsTooLarge": "Dosya çok büyük.",
     "ArticleDeletionConfirmationMessage": "Bu makaleyi kalıcı olarak silmek istediğinizden emin misiniz?",
     "ChooseCoverImage": "Bir kapak resmi seçin...",
-    "CoverImage": "Kapak Resmi"
+    "CoverImage": "Kapak Resmi",
+    "Menu:Quotation": "Fiyatlandırma",
+    "Menu:Invoice": "Fatura",
+    "Menu:PaymentRequests": "Ödeme İstekleri",
+    "Permission:PaymentRequests": "Ödeme İstekleri",
+    "PaymentRequests": "Ödeme İstekleri",
+    "Creator": "Oluşturan",
+    "ExtraProperties": "Ekstra Özellikler",
+    "Organization": "Organizasyon",
+    "Waiting": "Bekliyor",
+    "Completed": "Tamamlandı",
+    "Failed": "Başarısız Oldu",
+    "PaymentRequestDeletionWarningMessage": "Bu ödeme isteği silinecek. Bunu onaylıyor musun?",
+    "Payment": "Ödeme"
   }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatures.cs

@@ -2,7 +2,7 @@
 {
     public class SettingManagementFeatures
     {
-        public const string GroupName = "TextManagement";
+        public const string GroupName = "SettingManagement";
 
         public const string Enable = GroupName + ".Enable";
     }