diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index 237f7e522cc..ee20f2d839f 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -97,7 +97,7 @@ class PostActionNotifier
     return if post_revision.user.blank?
     return if post.topic.blank?
     return if post.topic.private_message?
-    return if SiteSetting.disable_edit_notifications && post_revision.user_id == Discourse::SYSTEM_USER_ID
+    return if SiteSetting.disable_system_edit_notifications && post_revision.user_id == Discourse::SYSTEM_USER_ID
 
     user_ids = []
 
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 40452d6229d..25642554f7b 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1165,7 +1165,7 @@ ar:
     dominating_topic_minimum_percent: "ما هي النسبه المئويه للمشاركات التي يجب علي المستخدم عملها في الموضوع قبل تلقيه لتنبيه عن خروجه لنطاق الموضوع"
     disable_avatar_education_message: "عطل الرسالة التعليمية لتغيير الصورة الرمزية."
     suppress_uncategorized_badge: "لا تظهر الشارة للموضوعات غير المصنفة في قائمة الموضوعات."
-    disable_edit_notifications: "لتعطيل تحرير الاشعارات بواسطة العضو النظام عندما يكون نشطاً 'download_remote_images_to_local'."
+    disable_system_edit_notifications: "لتعطيل تحرير الاشعارات بواسطة العضو النظام عندما يكون نشطاً 'download_remote_images_to_local'."
     automatically_unpin_topics: "تلقائياً قم بنزع الدبوس عندا يصل المستخدم إلي نهاية الصفحه"
     read_time_word_count: "عداد الكلمات للدقيقه لحساب الوقت المقدر للقراءه "
     full_name_required: "الإسم الكامل مطلوب وهو ضروري لإكمال الحساب "
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 5efe2fa443c..a2387c48cb5 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -1277,7 +1277,7 @@ be:
     suppress_uncategorized_badge: "Не паказваць значок для неклясыфікаваных тэма ў спісах тэмы."
     header_dropdown_category_count: "Колькі катэгорый могуць быць адлюстраваны ў меню загалоўка спісу."
     global_notice: "Дысплей настойлівая, EMERGENCY, неотстранимый глабальны банэр апавяшчэння для ўсіх наведвальнікаў, каб змяніць поле пустым, каб схаваць яго (HTML дазволена)."
-    disable_edit_notifications: "Адключае рэдагаваць апавяшчэння карыстальніка сістэмы, калі «download_remote_images_to_local» актыўна."
+    disable_system_edit_notifications: "Адключае рэдагаваць апавяшчэння карыстальніка сістэмы, калі «download_remote_images_to_local» актыўна."
     likes_notification_consolidation_threshold: "Колькасць ўпадабаных апавяшчэнняў, атрыманых да апавяшчэнняў аб'яднаны ў адну. Усталюйце 0, каб адключыць. Акно можа быць сканфігураваны з дапамогай `SiteSetting.likes_notification_consolidation_window_mins`."
     likes_notification_consolidation_window_mins: "Працягласць ў хвілінах, дзе упадабаныя апавяшчэння аб'яднаны ў адно апавяшчэнне, як толькі парог дасягнуты. Парог можа быць сканфігураваны з дапамогай `SiteSetting.likes_notification_consolidation_threshold`."
     automatically_unpin_topics: "Аўтаматычна распушчае мацаваньне тэмы, калі карыстальнік дасягае дна."
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 4f5db7e5459..85c37f7cdda 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -858,7 +858,7 @@ bg:
     enable_mobile_theme: "Мобилните устройства използват адаптирана тема с възможност за преминаване към нормален изглед. Забранете тази настройка, ако искате да използвате свой собствен стил за мобилните устройства."
     dominating_topic_minimum_percent: "Какъв процент публикации може да направи един потребител преди да бъде предупреден за доминиране в тема."
     suppress_uncategorized_badge: "Не показвай значката в списъците с теми за тези, които не са категоризирани. "
-    disable_edit_notifications: "Забрани редактирането на уведомления от системните потребители когато 'download_remote_images_to_local' е активно."
+    disable_system_edit_notifications: "Забрани редактирането на уведомления от системните потребители когато 'download_remote_images_to_local' е активно."
     full_name_required: "Полето 'Пълно име' е задължително в потребителския профил"
     enable_names: "Покажи пълното име на потребителите на техните профили, потребителски карти, и имейли. Деактивирай за скриване на пълното име навсякъде."
     display_name_on_posts: "Покажи пълните имена на потребителите в техните публикации като допълнение към потребителските им имена @username."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index ce92af0728b..59a55ba9731 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -640,7 +640,7 @@ bs_BA:
     enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive."
     dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before being reminded about overly dominating a topic."
     suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists."
-    disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
+    disable_system_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
     enable_names: "Allow showing user full names. Disable to hide full names."
     display_name_on_posts: "Show a user's full name on their posts in addition to their @username."
     short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value."
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index bf9584fb81b..39f5da081d8 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -1695,7 +1695,7 @@ ca:
     header_dropdown_category_count: "Quantes categories es poden mostrar en el menú desplegable de la capçalera."
     permalink_normalizations: "Aplica la següent expressió regular abans de coincidir enllaços permanents, per exemple: /(topic.*)\\?.*/\\1 treurà les cadenes de consulta de les rutes de temes. El format és regex+string fes servir \\1 etc. per accedir a captures"
     global_notice: "Mostra un bàner d'avís global d'EMERGÈNCIA URGENT, no descartable, a tots els visitants. Canvieu a blanc per a amagar-lo. (Es permet HTML.)"
-    disable_edit_notifications: "Inhabilita l'edició d'alertes de l'usuari del sistema quan 'download_remote_images_to_local' estigui actiu."
+    disable_system_edit_notifications: "Inhabilita l'edició d'alertes de l'usuari del sistema quan 'download_remote_images_to_local' estigui actiu."
     likes_notification_consolidation_threshold: "Nombre de notificacions amb 'M'agrada' rebudes abans de consolidar les notificacions en una de sola. 0 per desactivar. La finestra es pot configurar mitjançant `SiteSetting.likes_notification_consolidation_window_mins`."
     likes_notification_consolidation_window_mins: "Durada en minuts en què les notificacions amb 'M'agrada' es consoliden en una única notificació una vegada s'ha assolit el llindar. El llindar es pot configurar mitjançant `SiteSetting.likes_notification_consolidation_threshold`."
     automatically_unpin_topics: "Desclava temes automàticament quan l'usuari arribi al final."
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index f63783af875..3a60fe6c80b 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -1671,7 +1671,7 @@ de:
     header_dropdown_category_count: "Wie viele Kategorien im der Header Dropdown-Liste angezeigt werden können."
     permalink_normalizations: "Diesen regulären Ausdruck anwenden, bevor Permalinks verarbeitet werden; Beispiel: /(topic.*)\\?.*/\\1 wird Query-Strings von Themen-Routen entfernen. Format: regulärer Ausdruck + String, benutze \\1 usw. um Teilausdrücke zu verwenden"
     global_notice: "Zeigt allen Besuchern eine DRINGENDE NOTFALL-Meldung in Form eines nicht ausblendbaren, global sichtbaren Banners an. Leere den Inhalt, um sie wieder auszublenden (HTML ist erlaubt)."
-    disable_edit_notifications: "Unterdrückt Bearbeitungshinweise durch den System-Benutzer, wenn die 'download_remote_images_to_local' Einstellung aktiviert ist."
+    disable_system_edit_notifications: "Unterdrückt Bearbeitungshinweise durch den System-Benutzer, wenn die 'download_remote_images_to_local' Einstellung aktiviert ist."
     likes_notification_consolidation_threshold: "Anzahl der Like-Benachrichtigungen, bevor die Benachrichtigungen in eine einzelne zusammengeführt werden. Ein Wert von 0 deaktiviert die Funktion. Das Zeitfenster kann via ``SiteSetting.likes_notification_consolidation_window_mins` eingestellt werden."
     likes_notification_consolidation_window_mins: "Zeitfenster in Minuten, in dem mehrere Like-Benachrichtigungen in eine einzelne Benachrichtigung zusammengeführt werden, sobald der Schwellenwert erreicht wird. Der Schwellenwert kann via `SiteSetting.likes_notification_consolidation_threshold` eingestellt werden."
     automatically_unpin_topics: "Themen automatisch loslösen, wenn ein Benutzer das Ende erreicht."
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 98fad6d5b35..32d1d50eb8b 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -1183,7 +1183,7 @@ el:
     disable_avatar_education_message: "Απενεργοποίησε εκπαιδευτικό μήνυμα για αλλαγή του avatar."
     suppress_uncategorized_badge: "Να μην εμφανίζεται το παράσημο για τα νήματα που δεν ανήκουν σε κατηγορίες στις λίστες νημάτων."
     permalink_normalizations: "Εφαρμόστε την ακόλουθη regex πριν ταιριάξετε τα permalinks, για παράδειγμα: /(topic.*)\\?.*/\\1 θα αφαιρέσει τις συμβολοσειρά για ερώτηση από τις διαδρομές για τα νήματα. Η μορφή είναι regex+συμβολοσειρά χρησημοποιήστε \\ 1 κ.λπ., για να αποκτήσετε πρόσβαση στις συλλήψεις"
-    disable_edit_notifications: "Απενεργοποιεί τη επεξεργασία των ειδοποιήσεων από τον χρήστη του συστήματος όταν το 'download_remote_images_to_local' είναι ενεργό"
+    disable_system_edit_notifications: "Απενεργοποιεί τη επεξεργασία των ειδοποιήσεων από τον χρήστη του συστήματος όταν το 'download_remote_images_to_local' είναι ενεργό"
     automatically_unpin_topics: "Αυτόματο ξεκαρφίτσωμα των νημάτων, όταν ο χρήστης φτάνει στο κάτω μέρος."
     read_time_word_count: "Μέτρηση των λέξεων ανά λεπτό για να υπολογίσεις τον εκτιμώμενο χρόνο διαβάσματος."
     share_anonymized_statistics: "Μοιράσου ανωνυμοποιημένα στατιστικά χρήσης"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6290dcaf63e..efa4a349447 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1907,7 +1907,7 @@ en:
 
     global_notice: "Display an URGENT, EMERGENCY, non-dismissible global banner notice to all visitors, change to blank to hide it (HTML allowed)."
 
-    disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
+    disable_system_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
 
     likes_notification_consolidation_threshold: "Number of liked notifications received before the notifications are consolidated into a single one. Set to 0 to disable. The window can be configured via `SiteSetting.likes_notification_consolidation_window_mins`."
 
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 387514054d9..da2b85e56b5 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -1692,7 +1692,7 @@ es:
     header_dropdown_category_count: "Cuántas categorías pueden ser mostradas en el dropdown menú de encabezado."
     permalink_normalizations: "Aplicar la siguiente expresión regular antes de los enlaces, por ejemplo: /(topic.*)\\?.*/\\1 despojará las cadenas de consulta de las rutas de los temas. El formato es regex+string usa \\1 etc. para acceder a capturas"
     global_notice: "Mostrar un global banner de URGENCIA o EMERGENCIA que no puedan ocultar, para todos los visitantes. Deja este campo en blanco para ocultarla (se puede utilizar código HTML)."
-    disable_edit_notifications: "Inhabilitar editar notificaciones por el usuario system cuando 'download_remote_images_to_local' este activo."
+    disable_system_edit_notifications: "Inhabilitar editar notificaciones por el usuario system cuando 'download_remote_images_to_local' este activo."
     likes_notification_consolidation_threshold: "Número de notificaciones de \"me gusta\" recibidas antes de que las notificaciones se consoliden en una sola. Pon 0 para deshabilitar. La ventana se puede configurar a través de `SiteSetting.likes_notification_consolidation_window_mins`."
     likes_notification_consolidation_window_mins: "Duración en minutos donde se consolidan las notificaciones preferidas en una sola notificación una vez que se ha alcanzado el umbral. El umbral se puede configurar a través de `SiteSetting.likes_notification_consolidation_threshold`."
     automatically_unpin_topics: "Quitar destacado automáticamente cuando el usuario llega al final del tema."
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 48caba0721b..b64c915a4d5 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -1146,7 +1146,7 @@ fa_IR:
     disable_avatar_education_message: "غیر‌فعال‌سازی پیام‌ آموزشی برای تغییر آواتار"
     suppress_uncategorized_badge: "نشان برای موضوعات دسته‌بندی نشده را در فهرست موضوعات را نشان نده. "
     permalink_normalizations: "اعمال Regex زیر قبل از تطابق پیوند یکتا، برای مثال /(topic.*)\\?.*/\\1 نوار query string را از پیوند موضوع جدا می‌کند. فرمت regex+string از \\1 استفاده می‌کند. برای دسترسی به تصویر‌برداری."
-    disable_edit_notifications: "ویرایش اعلان‌ها را از طریق کاربر سیستم کار بینداز وقتی 'download_remote_images_to_local' فعال است "
+    disable_system_edit_notifications: "ویرایش اعلان‌ها را از طریق کاربر سیستم کار بینداز وقتی 'download_remote_images_to_local' فعال است "
     automatically_unpin_topics: "خارج کردن خودکار موضوع از حالت سنجاقی وقتی کرابر به پایین صفحه می‌رسد."
     read_time_word_count: "تعداد کلمه در دقیقه برای محاسبه تخمین زمان خواندن."
     share_anonymized_statistics: "اشتراک گذاری آمار استفاده ناشناس"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index b7b53f791c1..002494d34d2 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -1626,7 +1626,7 @@ fi:
     header_dropdown_category_count: "Kuinka monta aluetta näytetään yläpalkin pudotusvalikossa."
     permalink_normalizations: "Sovella tätä säännöllistä lauseketta ennen ikilinkkien sovittamista, esim. /(topic.*)\\?.*/\\1 riisuu hakulausekkeet ketjujen reiteistä. Muoto on regex+string, \\1 jne. avulla pääset käsiksi captureihin."
     global_notice: "Näytä kaikilla sivuilla kaikille käyttäjille KIIREELLISESTÄ HÄTÄTAPAUKSESTA kertova banneri, jota ei voi piilottaa. Vaihda tyhjäksi piilottaaksesi sen (HTML sallittu)."
-    disable_edit_notifications: "Poista muokkausilmoitukset system-käyttäjältä, kun 'download_remote_images_to_local' on asetettu."
+    disable_system_edit_notifications: "Poista muokkausilmoitukset system-käyttäjältä, kun 'download_remote_images_to_local' on asetettu."
     likes_notification_consolidation_threshold: "Kuinka monta tykkäysilmoitusta pitää saada, jotta ilmoitukset niputetaan yhdeksi. Aseta 0 poistaaksesi käytöstä. Aikaikkunan määrittää asetus `SiteSetting.likes_notification_consolidation_window_mins`."
     likes_notification_consolidation_window_mins: "Kuinka monessa minuutissa tykkäysilmoitukset pitää saada, jotta ilmoitukset niputetaan yhdeksi, jos ilmoitusten yläraja on ylittymässä. Ylärajan määrittää asetus `SiteSetting.likes_notification_consolidation_threshold`."
     automatically_unpin_topics: "Poista ketjun kiinnitys automaattisesti, kun käyttäjä on sen lopussa."
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index e3e8e33e891..8d86a163781 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -1692,7 +1692,7 @@ fr:
     header_dropdown_category_count: "Nombre de catégories qui peuvent être affiché dans le menu déroulant d'en-tête."
     permalink_normalizations: "Appliquer l'expression régulière suivante avant de détecter les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les chaînes de requête des chemins de sujet. Le format est regex+string, utilisez \\1 etc. pour capturer des séquences"
     global_notice: "Afficher une bannière de notification globale, d'URGENCE, et qui ne peut pas être ignoré, à tous les visiteurs, vide pour cacher (HTML admis)."
-    disable_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée."
+    disable_system_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée."
     likes_notification_consolidation_threshold: "Nombre de notifications reçues et aimées avant que les notifications ne soient regroupées en une seule. Régler à 0 pour désactiver. La fenêtre peut être configurée via `SiteSetting.likes_notification_consolidation_window_mins`."
     likes_notification_consolidation_window_mins: "Durée en minutes où les notifications aimées sont regroupées en une seule une fois le seuil atteint. Le seuil peut être configuré via `SiteSetting.likes_notification_consolidation_threshold`."
     automatically_unpin_topics: "Désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 731be89305c..3041ea478ea 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -1725,7 +1725,7 @@ he:
     header_dropdown_category_count: "כמה קטגוריות ניתן להציג בתפריט הנגלל בכותרת."
     permalink_normalizations: "החילו את הביטויים הרגולריים האלו לפני שמתאימים קישורים-קבועים, למשל: /(topic.*)\\?.*/\\1 יסיר מחרוזות שאילתה מנתיבי נושאים. הפורמט הוא regex+string משתמש ב \\1 וכד׳ כדי לגשת להתאמות"
     global_notice: "הצגת מודעה גלובלית דחופה בגדר חירום לכל המבקרים, יש להחליף בתוכן ריק כדי להסתיר אותה (מותר HTML)."
-    disable_edit_notifications: "ביטול התראות עריכה על ידי משתמש המערכת כאשר 'download_remote_images_to_local' פעיל."
+    disable_system_edit_notifications: "ביטול התראות עריכה על ידי משתמש המערכת כאשר 'download_remote_images_to_local' פעיל."
     automatically_unpin_topics: "הסרת נעיצה אוטומטית של נושאים כאשר המשתמשים מגיעים לתחתית."
     read_time_word_count: "מספר המילים לדקה כדי להעריך את זמן הקריאה."
     topic_page_title_includes_category: "<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>תגית הכותרת (title)</a> בעמוד הנושא מכילה את שם הקטגוריה."
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index a53999f5f5c..1cc59fdcfc8 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -1567,7 +1567,7 @@ hy:
     header_dropdown_category_count: "Քանի կատեգորիա պետք է ցուցադրվի վերնամասի բացվող ցուցակի մենյուում:"
     permalink_normalizations: "Կիրառել հետևյալ կարգավորումը՝ մինչ մշտահղումները համապատասխանեցնելը, օրինակ՝ /(topic.*)\\?.*/\\1 -ը կառանձնացնի հարցման տողերը թեմայի ուղիներից: Ֆորմատը՝ regex+string , օգտագործեք \\1 և այլն՝ հասանելիության գրավման համար:"
     global_notice: "Ցուցադրել ՇՏԱՊ, ԱՆՀՐԱԺԵՇՏՈՒԹՅՈՒՆ, ոչ-չեղարկելի գլոբալ բանների նշումը բոլոր այցելուներին, փոխեք դատարկի՝ թաքցնելու համար (HTML -ը թույլատրված է):"
-    disable_edit_notifications: "Անջատում է խմբագրման ծանուցումները համակարգի օգտատիրոջ կողմից, երբ 'download_remote_images_to_local' -ը ակտիվ է:"
+    disable_system_edit_notifications: "Անջատում է խմբագրման ծանուցումները համակարգի օգտատիրոջ կողմից, երբ 'download_remote_images_to_local' -ը ակտիվ է:"
     likes_notification_consolidation_threshold: "Հավանումների մասին ստացված ծանուցումների քանակը, որից հետո ծանուցումները միավորվում են մեկի տակ: Սահմանեք 0՝ անջատելու համար: Պատուհանը կարող է կարգավորվել հետևյալի միջոցով՝ `SiteSetting.likes_notification_consolidation_window_mins`."
     likes_notification_consolidation_window_mins: "Տևողությունը րոպեներով, երբ հավանումների ծանուցումները միավորվում են մեկի տակ, հենց որ հատվում է սահմանը: Սահմանը կարող է կարգավորվոել հետևյալի միջոցով՝ `SiteSetting.likes_notification_consolidation_threshold`."
     automatically_unpin_topics: "Ավտոմատ կերպով ապակցել թեմաները, երբ օգտատերը հասնում է ներքև:"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index d9e8b5e23fa..7fc7ac7a354 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -1677,7 +1677,7 @@ it:
     header_dropdown_category_count: "Quante categorie possono essere visualizzate nel menu a discesa dell'intestazione."
     permalink_normalizations: "Applicare il seguente regex prima di accedere ai permalink, ad esempio: /(topic.*)\\?.*/\\1 eliminerà le stringhe query dalla route degli argomenti. Il formato è regex+string use \\1 ecc. per accedere alle catture"
     global_notice: "Mostra un banner di avviso globale URGENTE, EMERGENZA, non eliminabile a tutti i visitatori, imposta a vuoto per nasconderlo (HTML consentito)."
-    disable_edit_notifications: "Disabilita le notifiche di modifica dall'utente system quando 'download_remote_images_to_local' è attivo."
+    disable_system_edit_notifications: "Disabilita le notifiche di modifica dall'utente system quando 'download_remote_images_to_local' è attivo."
     likes_notification_consolidation_threshold: "Numero di notifiche da ricevere oltre il quale saranno consolidate in una singola notifica. Impostare su 0 per disabilitare. Il valore può essere configurato tramite 'SiteSetting.likes_notification_consolidation_window_mins'."
     likes_notification_consolidation_window_mins: "Tempo in minuti nel quale le notifiche preferite vengono consolidate in un'unica notifica una volta raggiunta una determinata soglia. La soglia può essere configurata tramite 'SiteSetting.likes_notification_consolidation_threshold'."
     automatically_unpin_topics: " Spunta automaticamente gli argomenti quando l'utente arriva in fondo. "
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index f4c97cf8ca1..d7a8b79de65 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -975,7 +975,7 @@ ja:
     enable_mobile_theme: "モバイル端末にモバイル向けテーマ (通常サイト用テーマにスイッチ可能) を利用する。レスポンシブなスタイルシートを使用する場合はこの設定を無効にしてください。"
     dominating_topic_minimum_percent: "ユーザがトピックを占拠しているとリマインドを行う、ポスト投稿支配率 "
     suppress_uncategorized_badge: "トピック一覧でカテゴライズされていないトピックのバッジは表示しない"
-    disable_edit_notifications: "システムユーザが'download_remote_images_to_local' を有効にした場合、編集時の通知を無効にする"
+    disable_system_edit_notifications: "システムユーザが'download_remote_images_to_local' を有効にした場合、編集時の通知を無効にする"
     full_name_required: "ユーザープロフィールのフルネームを必須にする"
     enable_names: "ユーザーのプロフィール、ユーザーカード、メールアドレスでのフルネームを表示します。無効にすると、フルネームは非表示になります"
     display_name_on_posts: "@usernameに加えて、ポストにユーザのフルネームを表示する"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 6abce5413ad..28e1c6a7ffd 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -1223,7 +1223,7 @@ ko:
     disable_avatar_education_message: "아바타 변경 교육 메시지 해제."
     suppress_uncategorized_badge: "글타래 리스트에서 카테고리가 없는 글타래에 대한 훈장을 보여주지 않는다."
     permalink_normalizations: "퍼마링크를 매칭하기 전에 다음 정규표현식을 적용. 예: /(topic.*)\\?.*/\\1 를 적용하면 토픽 루트에서 퀴리 스트링을 뽑아냅니다. 캡쳐된 값에 접근하려면 정규표현식+스트링 형식에 \\1 등을 사용하면 됩니다."
-    disable_edit_notifications: "'download_remote_images_to_local'가 활성화되있으면 시스템 사용자에 의한 수정 알림을 비활성화합니다."
+    disable_system_edit_notifications: "'download_remote_images_to_local'가 활성화되있으면 시스템 사용자에 의한 수정 알림을 비활성화합니다."
     automatically_unpin_topics: "사용자가 하단에 도달하면 토픽 고정을 자동 해제."
     read_time_word_count: "읽은 시간 추정치 계산을 위한 1분 당 워드 카운트."
     share_anonymized_statistics: "익명화된 사용 통계 공유하기"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 107c3c97741..d6e59934c9a 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1695,7 +1695,7 @@ nl:
     header_dropdown_category_count: "Het aantal categorieën dat in het header-vervolgkeuzemenu kan worden weergegeven."
     permalink_normalizations: "De volgende reguliere expressie toepassen voordat permalinks worden verwerkt. Voorbeeld: /(topic.*)\\?.*/\\1 verwijdert querystrings uit topicroutes. Notatie is regex+strings, gebruik \\1 etc. voor deeluitdrukkingen."
     global_notice: "Een algemene niet te verbergen DRINGEND, NOODGEVAL-bannermelding voor alle gebruikers weergeven. Laat leeg om deze te verbergen (HTML toegestaan)."
-    disable_edit_notifications: "Schakelt bewerkingsmeldingen van de systeemgebruiker uit als 'download_remote_images_to_local' actief is."
+    disable_system_edit_notifications: "Schakelt bewerkingsmeldingen van de systeemgebruiker uit als 'download_remote_images_to_local' actief is."
     likes_notification_consolidation_threshold: "Aantal ontvangen like-meldingen voordat de meldingen in een enkele worden samengevoegd. Stel dit in op 0 om uit te schakelen. Het venster kan worden geconfigureerd via `SiteSetting.likes_notification_consolidation_window_mins`."
     likes_notification_consolidation_window_mins: "Tijdsduur in minuten waarin like-meldingen in een enkele melding worden samengevoegd zodra de drempel is bereikt. De drempel kan worden geconfigureerd via `SiteSetting.likes_notification_consolidation_threshold`."
     automatically_unpin_topics: "Topics automatisch losmaken wanneer de gebruiker de onderkant bereikt."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 7962bdee6b3..4e69cf3f644 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -1345,7 +1345,7 @@ pl_PL:
     disable_avatar_education_message: "Wyłącz wiadomość edukacyjną dla zmiany avataru."
     suppress_uncategorized_badge: "Nie pokazuj etykiety z nazwą kategorii Inne na listach tematów."
     permalink_normalizations: "Zastosuj następujący regex przed dopasowaniem permalinków, na przykład /(topic.*)\\?.*/\\1  spowoduje ściągnięcie ciągu zapytań z dróg tematu. Format to regex+strin używaj \\1 itd aby przechwycić dostęp"
-    disable_edit_notifications: "Wyłącz edytowanie powiadomień przez system użytkownika gdy 'download_remote_images_to_local' jest aktywne."
+    disable_system_edit_notifications: "Wyłącz edytowanie powiadomień przez system użytkownika gdy 'download_remote_images_to_local' jest aktywne."
     automatically_unpin_topics: "Automatycznie odpinaj wątki, gdy użytkownik dotknie dna."
     read_time_word_count: "Licznik słów na minutę dla kalkulacji szacowanego czasu czytania."
     share_anonymized_statistics: "Udostępnij anonimowe statystyki użytkowania."
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 3203884cb3b..ff33dfc439f 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -1128,7 +1128,7 @@ pt:
     disable_avatar_education_message: "Desativar mensagem educativa para alteração de avatar."
     suppress_uncategorized_badge: "Não mostrar distintivos para tópicos sem categoria nas listagens de tópicos."
     permalink_normalizations: "Aplicar a seguinte expressão regular antes de igualar ligações permanentes, por exemplo: /(topic.*)\\?.*/\\1 irá remover rotas de tópico. O formato é regex+string utilize \\1 etc. para aceder a capturas"
-    disable_edit_notifications: "Desativa as notificações de edição pelo utilizador do sistema quando 'download_remote_images_to_local' está ativo."
+    disable_system_edit_notifications: "Desativa as notificações de edição pelo utilizador do sistema quando 'download_remote_images_to_local' está ativo."
     automatically_unpin_topics: "Desafixar tópicos automaticamente quando um utilizador chega ao final."
     read_time_word_count: "Contagem de palavras por minuto para calcular tempo estimado de leitura."
     share_anonymized_statistics: "Partilhe estatísticas de utilização anonimizadas."
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index dd450817209..70955fda842 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -1690,7 +1690,7 @@ pt_BR:
     header_dropdown_category_count: "Quantas categorias podem ser exibidas no menu suspenso do cabeçalho."
     permalink_normalizations: "Aplique o seguinte regex antes de combinar permalinks, por exemplo: /(topic.*)\\?.*/\\1 irá retirar as strings de consulta das rotas de tópicos. Formato é regex + string use \\ 1 etc. para acessar capturas"
     global_notice: "Exibir um aviso de banner global URGENTE, EMERGENCIAL e não descartável para todos os visitantes, deixe em branco para ocultá-lo (permitido por HTML)."
-    disable_edit_notifications: "Desabilitar modificação de notificações pelo sistema quando 'download_remote_images_to_local' estiver ativado."
+    disable_system_edit_notifications: "Desabilitar modificação de notificações pelo sistema quando 'download_remote_images_to_local' estiver ativado."
     likes_notification_consolidation_threshold: "Número de notificações de curtidas recebidas antes que as notificações sejam consolidadas em uma única. Defina como 0 para desabilitar. A janela pode ser configurada via `SiteSetting.likes_notification_consolidation_window_mins`."
     likes_notification_consolidation_window_mins: "Duração em minutos em que as notificações de curtidas são consolidadas em uma única notificação quando o limite é atingido. O limite pode ser configurado via `SiteSetting.likes_notification_consolidation_threshold`."
     automatically_unpin_topics: "Desafixar automaticamente os tópicos quando o usuário atinge o fundo."
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index a5088de7a23..668f82e2855 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1099,7 +1099,7 @@ ro:
     disable_avatar_education_message: "Dezactivează mesajul educațional pentru schimbarea avatarului."
     suppress_uncategorized_badge: "Nu arăta ecusonul pentru subiectele fără categorie în lista de subiecte."
     permalink_normalizations: "Aplică următorul regex înainte de a detecta permalink-urile, de exemplu: /(topic.*)\\?.*/\\1 va elimina șirurile de interogare din căile subiectelor. Formatul este regex+șir folosește \\1 etc.pentru a capturarea secvențelor"
-    disable_edit_notifications: "Deactivează editarea notificărilo de către utilizator atunci când setarea 'download_remote_images_to_local' este activată."
+    disable_system_edit_notifications: "Deactivează editarea notificărilo de către utilizator atunci când setarea 'download_remote_images_to_local' este activată."
     automatically_unpin_topics: "Desprinde automat subiecte când utilizatorul ajunge la sfârșitul paginii."
     read_time_word_count: "Contor de cuvinte pe minut pentru calcularea timpului estimat de citire."
     max_prints_per_hour_per_user: "Numărul maxim de amprente de vizualizare lăsate pentru /print (0 pentru dezactivare)"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 7b62a27cfcd..03f9c2a37cb 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -1539,7 +1539,7 @@ ru:
     dominating_topic_minimum_percent: "Количество сообщений, отправленных пользователем подряд в одной теме, прежде чем ему будет показано предупреждение о слишком частых ответах."
     disable_avatar_education_message: "Отключить обучающее сообщение при смене аватара."
     suppress_uncategorized_badge: "Не показывать награду в списках тем для тех тем, которые вне разделов."
-    disable_edit_notifications: "Отключить уведомления системы пользователя когда 'download_remote_images_to_local' активна."
+    disable_system_edit_notifications: "Отключить уведомления системы пользователя когда 'download_remote_images_to_local' активна."
     full_name_required: "Полное имя это обязательное поле для профиля пользователя."
     enable_names: "Отображать полное имя пользователя на его странице пользователя, карточке пользователя и в письмах. Выключите, чтобы спрятать полное имя отовсюду."
     display_name_on_posts: "Показывать полные имена пользователей в их сообщениях в дополнение к их @нику."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 66a56eafca2..a2b39ddeaa1 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -1012,7 +1012,7 @@ sk:
     dominating_topic_minimum_percent: "Koľko percent príspevkov musí používateľ pridať do témy než sa mu zobrazí pripomienka o dominovaní témy."
     disable_avatar_education_message: "Vypnúť informatívnu hlášku na zmenu avatara."
     suppress_uncategorized_badge: "V zozname tém nezobrazuj odznak za nekategorizované príspevky."
-    disable_edit_notifications: "Ak je premenná 'download_remote_images_to_local' aktívna, vypnúť notifikácie o úpravách systémového používateľa."
+    disable_system_edit_notifications: "Ak je premenná 'download_remote_images_to_local' aktívna, vypnúť notifikácie o úpravách systémového používateľa."
     automatically_unpin_topics: "Automaticky odopnúť témy ak používateľ dostanie posledný príspevok."
     read_time_word_count: "Počet slov za minútu určený na výpočet odkazovaného času čítania."
     full_name_required: "Na používateľskom profile je vyžadované plné meno."
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 95d05dff0f6..eee5bf946de 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -818,7 +818,7 @@ sq:
     enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive."
     dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before being reminded about overly dominating a topic."
     suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists."
-    disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
+    disable_system_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
     automatically_unpin_topics: "Çngjiti temat automatikisht kur përdoruesi arrin fundin e faqes."
     read_time_word_count: "Numërimi i fjalëve për minutë për të llogaritur kohën e vlerësuar të leximit."
     full_name_required: "Full name is a required field of a user's profile."
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 6e5f514d617..7dcf4958af1 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -1034,7 +1034,7 @@ sv:
     disable_avatar_education_message: "Inaktivera hjälpmeddelande för byte av avatar."
     suppress_uncategorized_badge: "Visa inte utmärkelsen för okategoriserade ämnen i ämneslistan."
     permalink_normalizations: "Applicera följande regex innan matchning av permalänkar, till exempel: /(topic.*)\\?.*/\\1 kommer att rensa bort söksträngar från ämnesvägen. Formatet är regex+sträng, använd \\1 osv. för att komma åt grupperingar."
-    disable_edit_notifications: "Inaktivera redigering av notifikationer av systemanvändaren när 'download_remote_images_to_local' är aktiverad."
+    disable_system_edit_notifications: "Inaktivera redigering av notifikationer av systemanvändaren när 'download_remote_images_to_local' är aktiverad."
     automatically_unpin_topics: "Avklistra automatiskt ämnen när användaren når botten."
     read_time_word_count: "Ordräknare per minut för att beräkna uppskattad lästid."
     max_prints_per_hour_per_user: "Maximalt antal av /printade sidhänvisnigar ( satt till 0 för att inaktivera)"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 3e2cd0e3c95..e823cae2145 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -949,7 +949,7 @@ tr_TR:
     dominating_topic_minimum_percent: "Konuyu domine ettiğine dair uyarı almadan önce konudaki gönderilerin yüzde kaçının kullanıcıya ait olması gerekir."
     disable_avatar_education_message: "Avatar değiştirme için eğitici iletileri kapat."
     suppress_uncategorized_badge: "Kategorisiz konular için olan rozeti konu listesinde gösterme."
-    disable_edit_notifications: " 'download_remote_images_to_local' etkin olduğunda, sistem kullanıcısından gelen düzenleme bildirilerini devre dışı bırakır"
+    disable_system_edit_notifications: " 'download_remote_images_to_local' etkin olduğunda, sistem kullanıcısından gelen düzenleme bildirilerini devre dışı bırakır"
     automatically_unpin_topics: "Kullanıcı sayfa sonuna eriştiğinde tutturulmuş konuları otomatik olarak sayfadan ayır."
     read_time_word_count: "Tahmini okuma süresini hesaplamak için dakika başına kelime sayısı."
     full_name_required: "Kullanıcı profili için tam ad zorunlu bir alandır."
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index f9cb8d4107f..e3d8c1de29d 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -1695,7 +1695,7 @@ ur:
     header_dropdown_category_count: "ہیڈر ڈراپ ڈاؤن مینو میں کتنے زُمرہ جات ظاہر کیے جا سکتے ہیں۔"
     permalink_normalizations: "دائمی لِنکس میچ کرنے سے پہلے درج ذیل رَیج اَیکس کا اطلاق کریں، مثال کے طور پر: /(topic.*)\\?.*/\\1 ٹاپک روٹس میں سے قُوَیری سٹرِنگ کو نکال دے گا۔ فارمیٹ regex+string ہے، میچ کردہ کو ایکسَیس کرنے کیلئے \\1 وغیرہ کا استعمال کریں"
     global_notice: "تمام زائرین کو فوری،اَیمرجنسی ناقابلِ برطرف گلوبل بَینر نوٹِس دکھائیں، اِسے چھپانے کیلئے خالی جگہ میں تبدیل کریں (HTML کی اجازت)۔"
-    disable_edit_notifications: "سِسٹم صارف کی طرف سے ترمیم اطلاعات کو غیر فعال کریں جب 'download_remote_images_to_local' فعال ہو۔"
+    disable_system_edit_notifications: "سِسٹم صارف کی طرف سے ترمیم اطلاعات کو غیر فعال کریں جب 'download_remote_images_to_local' فعال ہو۔"
     likes_notification_consolidation_threshold: "لائیک اطلاعات کی تعداد جس سے پہلے اطلاعات ایک میں جمع کر دی جائیں۔ غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔ ونڈو بذریعہ `SiteSetting.likes_notification_consolidation_window_mins` ترتیب دی جا سکتی ہے۔"
     likes_notification_consolidation_window_mins: "منٹوں میں مدت جہاں لائیک اطلاعات کو ایک میں جمع کر دیا جاتا ہے، جب حد تک پہنچ جایا جائے۔ حد کو بذریعہ `SiteSetting.likes_notification_consolidation_threshold` ترتیب دیا جا سکتا ہے۔"
     automatically_unpin_topics: "صارفین جب ٹاپک کے آخر تک پہنچ جائیں تو خود بخود ٹاپکس پر سے پِن ہٹا دیں۔"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 01e8dd764c7..84bb8e29461 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -867,7 +867,7 @@ vi:
     disable_avatar_education_message: "Tắt thông điệp hướng dẫn khi đổi avatar."
     suppress_uncategorized_badge: "Không hiển thị huy hiệu cho các chủ đề chưa phân loại trong danh sách chủ đề"
     permalink_normalizations: "Áp dụng regex sau trước khi khớp với permalink, ví dụ: /(topic.*)\\?.*/\\1 sẽ loại bỏ các chuỗi truy vấn từ đường dẫn chủ đề. Định dạng regex+string với \\1 ... để giữ truy cập"
-    disable_edit_notifications: "Vô hiệu hoá thông báo chỉnh sửa bởi người dùng hệ thống khi 'download_remote_images_to_local' đang hoạt động."
+    disable_system_edit_notifications: "Vô hiệu hoá thông báo chỉnh sửa bởi người dùng hệ thống khi 'download_remote_images_to_local' đang hoạt động."
     automatically_unpin_topics: "Tự động bỏ ghim chủ đề khi người dùng xuống cuối trang."
     read_time_word_count: "Đếm số từ mỗi phút để ước lượng thời gian đọc."
     full_name_required: "Tên đầy đủ là trường bắt buộc trong hồ sơ thành viên."
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 3f3aab654a3..0a8cad74b79 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -1648,7 +1648,7 @@ zh_CN:
     header_dropdown_category_count: "标题下拉菜单可显示多少分类。"
     permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(topic.*)\\?.*/\\1 将去掉所有主题路径的参数字符串。格式为使用正则表达式+使用 \\1 等字符串来访问捕获内容"
     global_notice: "为所有访客显示紧急的，不可取消的全局横幅通知，修改为空以隐藏（可使用HTML）。"
-    disable_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统编辑提醒。"
+    disable_system_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统编辑提醒。"
     likes_notification_consolidation_threshold: "合并为单个提醒前接受的被赞提醒数量。设置为0以关闭。窗口可以通过`SiteSetting.likes_notification_consolidation_window_mins`配置。"
     likes_notification_consolidation_window_mins: "当达到阈值时多个赞的提醒合并到单个的持续时间。阈值可通过`SiteSetting.likes_notification_consolidation_threshold`配置。"
     automatically_unpin_topics: "当用户到达底部时自动解除主题置顶。"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 4935eeb90ad..40f195e45f1 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -1626,7 +1626,7 @@ zh_TW:
     header_dropdown_category_count: "在下拉式功能表中可以顯示多少類別"
     permalink_normalizations: "在匹配永久連結之前應用如下正則表達式，例如：/(topic.*)\\?.*/\\1 將去掉所有主題路徑的參數字元串。格式為使用正則表達式+使用 \\1 等字元串來訪問捕獲內容"
     global_notice: "向所有訪客顯示緊急的、不可駁回的全版面橫幅通知，設定留空將會隱藏它（允許使用HTML）。"
-    disable_edit_notifications: "當 'download_remote_images_to_local' 啟用時禁用系統編輯提醒。"
+    disable_system_edit_notifications: "當 'download_remote_images_to_local' 啟用時禁用系統編輯提醒。"
     likes_notification_consolidation_threshold: "在將通知合併為單個通知之前收到的已通知數。 設定0為禁用。該視窗可以通過`SiteSetting.likes_notification_consolidation_window_mins`進行設定。"
     likes_notification_consolidation_window_mins: "達到門檻值後，將受歡迎的通知合併為單個通知的持續時間（分鐘）。 可以通過`SiteSetting.likes_notification_consolidation_threshold`設定門檻值。"
     automatically_unpin_topics: "當使用者到達底部時自動解除主題置頂。"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 29dc73a1dd5..a4b26ff86cb 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1848,7 +1848,7 @@ uncategorized:
     hidden: true
     default: true
 
-  disable_edit_notifications: true
+  disable_system_edit_notifications: true
 
   likes_notification_consolidation_threshold:
     default: 3
diff --git a/db/migrate/20190731090219_rename_edit_notification_setting.rb b/db/migrate/20190731090219_rename_edit_notification_setting.rb
new file mode 100644
index 00000000000..b4c7ceb34c9
--- /dev/null
+++ b/db/migrate/20190731090219_rename_edit_notification_setting.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameEditNotificationSetting < ActiveRecord::Migration[5.2]
+  def change
+    execute "UPDATE site_settings SET name = 'disable_system_edit_notifications' WHERE name = 'disable_edit_notifications'"
+  end
+end
diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb
index 8e760ae57b5..9eaa03f1a5a 100644
--- a/lib/site_settings/deprecated_settings.rb
+++ b/lib/site_settings/deprecated_settings.rb
@@ -15,7 +15,8 @@ module SiteSettings::DeprecatedSettings
     ['twitter_summary_large_image_url', 'twitter_summary_large_image', false, '2.3'],
     ['push_notifications_icon_url', 'push_notifications_icon', false, '2.3'],
     ['show_email_on_profile', 'moderators_view_emails', true, '2.4'],
-    ['allow_moderators_to_create_categories', 'moderators_create_categories', true, '2.4']
+    ['allow_moderators_to_create_categories', 'moderators_create_categories', true, '2.4'],
+    ['disable_edit_notifications', 'disable_system_edit_notifications', true, '2.4']
   ]
 
   def setup_deprecated_methods
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 26bf54ec84e..2d521c6f534 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -97,8 +97,8 @@ def rebake_posts(opts = {})
   puts "Rebaking post markdown for '#{RailsMultisite::ConnectionManagement.current_db}'"
 
   begin
-    disable_edit_notifications = SiteSetting.disable_edit_notifications
-    SiteSetting.disable_edit_notifications = true
+    disable_system_edit_notifications = SiteSetting.disable_system_edit_notifications
+    SiteSetting.disable_system_edit_notifications = true
 
     total = Post.count
     rebaked = 0
@@ -112,7 +112,7 @@ def rebake_posts(opts = {})
       end
     end
   ensure
-    SiteSetting.disable_edit_notifications = disable_edit_notifications
+    SiteSetting.disable_system_edit_notifications = disable_system_edit_notifications
   end
 
   puts "", "#{rebaked} posts done!", "-" * 50
diff --git a/script/import_scripts/ipboard.rb b/script/import_scripts/ipboard.rb
index 0306ec6adae..9f88d169862 100644
--- a/script/import_scripts/ipboard.rb
+++ b/script/import_scripts/ipboard.rb
@@ -81,7 +81,7 @@ class ImportScripts::IpboardSQL < ImportScripts::Base
   # if site is made available, don't let it get indexed
   SiteSetting.allow_index_in_robots_txt = false
   # don't notify users when images in their posts get downloaded
-  SiteSetting.disable_edit_notifications = true
+  SiteSetting.disable_system_edit_notifications = true
   #  SiteSetting.force_hostname='forum.dev1dev.com'
   SiteSetting.title = "IPB Import"
 
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index 592372c2c5e..7f36af6b2c4 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -82,7 +82,7 @@ describe PostActionNotifier do
 
     context "edit notifications are disabled" do
 
-      before { SiteSetting.disable_edit_notifications = true }
+      before { SiteSetting.disable_system_edit_notifications = true }
 
       it 'notifies a user of the revision made by another user' do
         expect {