1 files changed, 22 insertions, 0 deletions

diff --git a/src/i18n/locales/fa.json b/src/i18n/locales/fa.json
index 21f1c6fe9..1e72905d7 100644
--- a/src/i18n/locales/fa.json
+++ b/src/i18n/locales/fa.json
@@ -284,6 +284,7 @@
   "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
   "settings.recipes.customService.openDevDocs": "Developer Documentation",
   "settings.recipes.customService.openFolder": "Open folder",
+<<<<<<< HEAD
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -304,6 +305,27 @@
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
+=======
+  "settings.recipes.headline": "سرویس های موجود",
+  "settings.recipes.missingService": "سرویسی را نیاز دارید ؟",
+  "settings.recipes.mostPopular": "مشهورترین ها",
+  "settings.recipes.nothingFound": "متاسفیم ، اما هیچ سرویسی با آنچه که جستجو کردید مطابقت نداشت .",
+  "settings.recipes.servicesSuccessfulAddedInfo": "سرویس با موفقیت اضافه شد",
+  "settings.searchService": "جستجوی سرویس ها",
+  "settings.service.error.goBack": "بازگشت به سرویس ها",
+  "settings.service.error.headline": "خطا ",
+  "settings.service.error.message": "دستورالعمل سرویس بارگذاری نشد.",
+  "settings.service.form.addServiceHeadline": "اضافه کردن {نام}",
+  "settings.service.form.availableServices": "سرویس های موجود",
+  "settings.service.form.customUrl": "سرور سفارشی",
+  "settings.service.form.customUrlPremiumInfo": "برای اضافه کردن سرویس هایی که خود دارید ، نیاز به پشتیبانی پیشرفته فرانز را دارید",
+  "settings.service.form.customUrlValidationError": "نتوانستیم سرور {نام} را تایید اعتبار کنیم",
+  "settings.service.form.deleteButton": "حذف سرویس",
+  "settings.service.form.editServiceHeadline": "ویرایش {name}",
+  "settings.service.form.enableAudio": "فعال‌سازی صدا",
+  "settings.service.form.enableBadge": "نماد پیام خوانده نشده را نشان بده ",
+  "settings.service.form.enableDarkMode": "فعالسازی حالت شب",
+>>>>>>> parent of 1c1b3e1f... Removed 'Most Popular' services since it alludes to user-tracking (#1718)
   "settings.service.form.enableHibernation": "Enable hibernation",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",