diff --git a/public/language/ar/admin/settings/email.json b/public/language/ar/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/ar/admin/settings/email.json
+++ b/public/language/ar/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/ar/admin/settings/guest.json b/public/language/ar/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/ar/admin/settings/guest.json
+++ b/public/language/ar/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/ar/flags.json b/public/language/ar/flags.json
index 574e792e3b..1e5dff7c54 100644
--- a/public/language/ar/flags.json
+++ b/public/language/ar/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json
index 71ae442723..9f349b3895 100644
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index 63fc6a10ff..0871e78c11 100644
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -30,6 +30,7 @@
"locked": "مقفل",
"pinned": "مثبت",
"moved": "منقول",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/bg/admin/settings/email.json b/public/language/bg/admin/settings/email.json
index 3605e93a50..2722d28c0d 100644
--- a/public/language/bg/admin/settings/email.json
+++ b/public/language/bg/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Следният адрес на е-поща е този, който получателят ще види в полетата „От“ и “Отговор до“.",
"from": "Име за полето „От“",
"from-help": "Името на изпращача, което да бъде показано в е-писмото.",
-
+
"smtp-transport": "Транспорт чрез SMTP",
"smtp-transport.enabled": "Използване на външен сървър за е-поща за изпращане на е-писма",
"smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.",
@@ -35,5 +35,7 @@
"subscriptions": "Резюмета по е-поща",
"subscriptions.disable": "Изключване на резюметата по е-пощата",
"subscriptions.hour": "Време за разпращане",
- "subscriptions.hour-help": "Моля, въведете число, представляващо часа, в който да се разпращат е-писма с подготвеното резюме (напр.. 0 за полунощ, 17 за 5 следобед). Имайте предвид, че този час е според часовата зона на сървъра и може да не съвпада с часовника на системата Ви.
Приблизителното време на сървъра е:
Изпращането на следващия ежедневен бюлетин е планирано за "
+ "subscriptions.hour-help": "Моля, въведете число, представляващо часа, в който да се разпращат е-писма с подготвеното резюме (напр.. 0 за полунощ, 17 за 5 следобед). Имайте предвид, че този час е според часовата зона на сървъра и може да не съвпада с часовника на системата Ви.
Приблизителното време на сървъра е:
Изпращането на следващия ежедневен бюлетин е планирано за ",
+ "notifications.settings": "Настройки за известията по е-поща",
+ "notifications.remove-images": "Премахване на изображенията от известията по е-поща"
}
\ No newline at end of file
diff --git a/public/language/bg/admin/settings/guest.json b/public/language/bg/admin/settings/guest.json
index 4e1faed5a9..d87b6ec60d 100644
--- a/public/language/bg/admin/settings/guest.json
+++ b/public/language/bg/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Имена за гостите",
+ "settings": "Настройки",
"handles.enabled": "Позволяване на имената за гостите",
"handles.enabled-help": "Тази възможност предоставя ново поле, което позволява на гостите да си изберат име, което да се използва за всяка публикация, която правят. Ако е изключено, всички те просто ще имат името „Гост“.",
- "topic-views": "Преглеждания на темите",
- "topic-views.enabled": "Гостите да допринасят за броя на преглеждания на темите"
+ "topic-views.enabled": "Гостите да допринасят за броя на преглеждания на темите",
+ "reply-notifications.enabled": "Гостите да могат да предизвикват изпращането на известия за отговорите си"
}
\ No newline at end of file
diff --git a/public/language/bg/flags.json b/public/language/bg/flags.json
index 66e013266b..d8d404f2a2 100644
--- a/public/language/bg/flags.json
+++ b/public/language/bg/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Най-много положителни гласове",
"sort-replies": "Най-много отговори",
- "modal-title": "Докладване на неуместно съдържание",
+ "modal-title": "Докладване на съдържанието",
"modal-body": "Моля, посочете причината за докладването на %1 %2 за преглед. Или използвайте някой от бутоните за бързо докладване, ако са приложими.",
"modal-reason-spam": "Спам",
"modal-reason-offensive": "Обидно",
diff --git a/public/language/bg/notifications.json b/public/language/bg/notifications.json
index d5818a10a5..f975415a91 100644
--- a/public/language/bg/notifications.json
+++ b/public/language/bg/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Когато бъде редактирана публикация в тема, която следите",
"notificationType_follow": "Когато някой започне да Ви следва",
"notificationType_new-chat": "Когато получите съобщение в разговор",
+ "notificationType_new-group-chat": "Когато получите съобщение в групов разговор",
"notificationType_group-invite": "Когато получите покана за група",
"notificationType_group-request-membership": "Когато някой поиска да се включи в група, на която Вие сте собственик",
"notificationType_new-register": "Когато някой бъде добавен в опашката за регистрация",
diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json
index b173eb2bfa..2c31e0f5d9 100644
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -30,6 +30,7 @@
"locked": "Заключена",
"pinned": "Закачена",
"moved": "Преместена",
+ "moved-from": "Преместена от %1",
"copy-ip": "Копиране на IP адреса",
"ban-ip": "Блокиране на IP адреса",
"view-history": "История на редакциите",
diff --git a/public/language/bn/admin/settings/email.json b/public/language/bn/admin/settings/email.json
index 205865077f..18d4209380 100644
--- a/public/language/bn/admin/settings/email.json
+++ b/public/language/bn/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "ইমেইল ডাইজেস্ট",
"subscriptions.disable": "ইমেইল ডাইজেস্ট নিষ্ক্রিয়",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/bn/admin/settings/guest.json b/public/language/bn/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/bn/admin/settings/guest.json
+++ b/public/language/bn/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/bn/flags.json b/public/language/bn/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/bn/flags.json
+++ b/public/language/bn/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json
index f17cd098c2..6c99b29edd 100644
--- a/public/language/bn/notifications.json
+++ b/public/language/bn/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json
index 702e6d052f..078de5e741 100644
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -30,6 +30,7 @@
"locked": "বন্ধ",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/cs/admin/settings/email.json b/public/language/cs/admin/settings/email.json
index 1938eb5702..c545b1a4bf 100644
--- a/public/language/cs/admin/settings/email.json
+++ b/public/language/cs/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Následující e-mailové adresy budou zobrazeny příjemci v políčkách „Od” a „Odpovědět”.",
"from": "Jméno – od",
"from-help": "Zobrazené jméno v e-mailu v – Od",
-
+
"smtp-transport": "Přenos SMTP",
"smtp-transport.enabled": "Pro odesílání e-mailů použít externí e-mailový server ",
"smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.",
@@ -35,5 +35,7 @@
"subscriptions": "E-mailové odběry",
"subscriptions.disable": "Zakázat e-mailové odběry",
"subscriptions.hour": "Hodina přehledu",
- "subscriptions.hour-help": "Zadejte číslo odpovídající hodině, kdy mají být odeslány přehledové e-maily (tj. 0 pro půlnoc, 17 pro 5:00pm). Mějte na paměti, že tato hodina závisí na hodinách samotného serveru a nemusí tak souhlasit se systémovými hodinami.
Přibližný čas serveru je: .
Další odeslání přehledů je plánováno na ."
+ "subscriptions.hour-help": "Zadejte číslo odpovídající hodině, kdy mají být odeslány přehledové e-maily (tj. 0 pro půlnoc, 17 pro 5:00pm). Mějte na paměti, že tato hodina závisí na hodinách samotného serveru a nemusí tak souhlasit se systémovými hodinami.
Přibližný čas serveru je: .
Další odeslání přehledů je plánováno na .",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/cs/admin/settings/guest.json b/public/language/cs/admin/settings/guest.json
index ff3c9b0065..9435fdc4df 100644
--- a/public/language/cs/admin/settings/guest.json
+++ b/public/language/cs/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Zacházení s hosty",
+ "settings": "Settings",
"handles.enabled": "Povolit upravení zacházení s hosty",
"handles.enabled-help": "Tato možnost odkryje nové pole, které umožňuje hostům vybrat jméno, které se připojí ke každému příspěvku, který vytvoří. Bude-li zakázáno, budou jednoduše nazýváni „Host”",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/cs/flags.json b/public/language/cs/flags.json
index cedf3990dd..4228803ec0 100644
--- a/public/language/cs/flags.json
+++ b/public/language/cs/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Nahlásit nevhodný obsah",
+ "modal-title": "Report Content",
"modal-body": "Zadejte váš důvod k označení %1 %2 pro kontrolu. Nebo použijte tlačítko je-li dostupné.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Urážlivé",
diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json
index 662cf1541d..6fe457883d 100644
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Začne-li vás někdo sledovat",
"notificationType_new-chat": "Obdržíte-li novou konverzační zprávu",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Obdržíte-li pozvání ke skupině",
"notificationType_group-request-membership": "Pokud někdo požaduje připojení se do vaší skupiny",
"notificationType_new-register": "Bude-li někdo přidán do registrační fronty",
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index 68f6a57c4d..14cff97bdf 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -30,6 +30,7 @@
"locked": "Uzamknuto",
"pinned": "Připnuto",
"moved": "Přesunuto",
+ "moved-from": "Moved from %1",
"copy-ip": "Kopírovat IP",
"ban-ip": "Zakázat IP",
"view-history": "Upravit historii",
diff --git a/public/language/da/admin/settings/email.json b/public/language/da/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/da/admin/settings/email.json
+++ b/public/language/da/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/da/admin/settings/guest.json b/public/language/da/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/da/admin/settings/guest.json
+++ b/public/language/da/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/da/flags.json b/public/language/da/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/da/flags.json
+++ b/public/language/da/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json
index e18b411132..daa04bcf68 100644
--- a/public/language/da/notifications.json
+++ b/public/language/da/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/da/topic.json b/public/language/da/topic.json
index 158dbf0587..7ae6aa1e22 100644
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -30,6 +30,7 @@
"locked": "Låst",
"pinned": "Pinned",
"moved": "Flyttet",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/de/admin/settings/email.json b/public/language/de/admin/settings/email.json
index 8c4a3508cd..89a5bbba80 100644
--- a/public/language/de/admin/settings/email.json
+++ b/public/language/de/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Die folgende E-Mail Adresse ist die E-Mail Adresse, welche dem Empfänger im \"Von\" und \"Antworten\" Bereich sehen wird.",
"from": "Name des Absenders",
"from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.",
-
+
"smtp-transport": "SMTP Konfiguration",
"smtp-transport.enabled": "Benutze einen externen Email-Server",
"smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Zusammenfassungen",
"subscriptions.disable": "Deaktivierung der Email Zusammenfassungen",
"subscriptions.hour": "Sende Zeit",
- "subscriptions.hour-help": "Bitte geben Sie eine Nummer ein, welche die Stunde repräsentiert zu welcher geplante Emails versandt werden sollen (z.B. 0 für Mitternacht, 17 für 5 Uhr Nachmittags). Beachten Sie, dass die Zeit auf der Serverzeit basiert und daher nicht umbedingt mit ihrer Systemzeit übereinstimmen muss.
Die ungefähre Serverzeit ist:
Die nächste tägliche Sendung ist um geplant"
+ "subscriptions.hour-help": "Bitte geben Sie eine Nummer ein, welche die Stunde repräsentiert zu welcher geplante Emails versandt werden sollen (z.B. 0 für Mitternacht, 17 für 5 Uhr Nachmittags). Beachten Sie, dass die Zeit auf der Serverzeit basiert und daher nicht umbedingt mit ihrer Systemzeit übereinstimmen muss.
Die ungefähre Serverzeit ist:
Die nächste tägliche Sendung ist um geplant",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/de/admin/settings/guest.json b/public/language/de/admin/settings/guest.json
index 63f5712808..6c0f22ef55 100644
--- a/public/language/de/admin/settings/guest.json
+++ b/public/language/de/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Gastzugang",
+ "settings": "Settings",
"handles.enabled": "Gastzugänge erlauben",
"handles.enabled-help": "Diese Option offenbart ein neues Feld, welches Gästen erlaubt einen Nutzernamen zu wählen, welcher sie mit jedem Beitrag assoziiert den sie erstellen. Wenn diese Option deaktiviert ist, werden sie einfach \"Gast\" genannt",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/de/flags.json b/public/language/de/flags.json
index c13378a447..914b2dcecc 100644
--- a/public/language/de/flags.json
+++ b/public/language/de/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Anstößige Inhalte Melden",
+ "modal-title": "Report Content",
"modal-body": "Bitte geben Sie den Grund an, weshalb Sie %1 %2 melden wollen. Alternativ können Sie einen der Schnell-Meldungs-Knöpfe verwenden, wenn anwendbar.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Beleidigend",
diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json
index 736cf94e69..53407294d2 100644
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Wenn ein Post bearbeitet wurde, in einem Thema welches du beobachtest",
"notificationType_follow": "Wenn dir jemand neues folgt",
"notificationType_new-chat": "Wenn du eine Chat Nachricht erhältst",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Wenn du eine Gruppeneinladung erhältst",
"notificationType_group-request-membership": "Wenn jemand einer Gruppe beitreten möchte, die dir gehört",
"notificationType_new-register": "Wenn jemand der Registrierungswarteschlange hinzugefügt wird",
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
index 387375fa94..a28cb572dc 100644
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -30,6 +30,7 @@
"locked": "Gesperrt",
"pinned": "Angeheftet",
"moved": "Verschoben",
+ "moved-from": "Moved from %1",
"copy-ip": "IP-Adresse Kopieren",
"ban-ip": "IP-Adresse bannen",
"view-history": "Verlauf bearbeiten",
diff --git a/public/language/el/admin/settings/email.json b/public/language/el/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/el/admin/settings/email.json
+++ b/public/language/el/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/el/admin/settings/guest.json b/public/language/el/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/el/admin/settings/guest.json
+++ b/public/language/el/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/el/flags.json b/public/language/el/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/el/flags.json
+++ b/public/language/el/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json
index 85efcdc2ed..248c0a6034 100644
--- a/public/language/el/notifications.json
+++ b/public/language/el/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/el/topic.json b/public/language/el/topic.json
index b726e77cd3..8128c0a405 100644
--- a/public/language/el/topic.json
+++ b/public/language/el/topic.json
@@ -30,6 +30,7 @@
"locked": "Κλειδωμένο",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/en-US/admin/settings/email.json b/public/language/en-US/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/en-US/admin/settings/email.json
+++ b/public/language/en-US/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/en-US/admin/settings/guest.json b/public/language/en-US/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/en-US/admin/settings/guest.json
+++ b/public/language/en-US/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/en-US/flags.json b/public/language/en-US/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/en-US/flags.json
+++ b/public/language/en-US/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/en-US/notifications.json b/public/language/en-US/notifications.json
index 91600bf79a..c5d367fae2 100644
--- a/public/language/en-US/notifications.json
+++ b/public/language/en-US/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json
index 933960757e..16dc2d4b75 100644
--- a/public/language/en-US/topic.json
+++ b/public/language/en-US/topic.json
@@ -30,6 +30,7 @@
"locked": "Locked",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/en-x-pirate/admin/settings/email.json b/public/language/en-x-pirate/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/en-x-pirate/admin/settings/email.json
+++ b/public/language/en-x-pirate/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/en-x-pirate/admin/settings/guest.json b/public/language/en-x-pirate/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/en-x-pirate/admin/settings/guest.json
+++ b/public/language/en-x-pirate/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/en-x-pirate/flags.json b/public/language/en-x-pirate/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/en-x-pirate/flags.json
+++ b/public/language/en-x-pirate/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/en-x-pirate/notifications.json b/public/language/en-x-pirate/notifications.json
index 705fed3063..26adae26f2 100644
--- a/public/language/en-x-pirate/notifications.json
+++ b/public/language/en-x-pirate/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json
index 933960757e..16dc2d4b75 100644
--- a/public/language/en-x-pirate/topic.json
+++ b/public/language/en-x-pirate/topic.json
@@ -30,6 +30,7 @@
"locked": "Locked",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/es/admin/settings/email.json b/public/language/es/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/es/admin/settings/email.json
+++ b/public/language/es/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/es/admin/settings/guest.json b/public/language/es/admin/settings/guest.json
index 235c604455..0fbe97ac7b 100644
--- a/public/language/es/admin/settings/guest.json
+++ b/public/language/es/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Manejar visitantes",
+ "settings": "Settings",
"handles.enabled": "Permitir manejo de visitantes",
"handles.enabled-help": "Esta opción expone un nuevo campo que permite a los invitados escoger un nombre para asociarse con cada entrada/respuesta que hagan. Si está desactivado, se les llamará simplemente \"Invitado\".",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/es/flags.json b/public/language/es/flags.json
index a33c6919a6..8ac3583388 100644
--- a/public/language/es/flags.json
+++ b/public/language/es/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Reportar contenido inapropiado",
+ "modal-title": "Report Content",
"modal-body": "Por favor especifica tu razón para marcar %1 %2 para revisar. Alternativamente, usa una de los botones de reporte rápido si corresponde.",
"modal-reason-spam": "Correo no deseado",
"modal-reason-offensive": "Ofensivo",
diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json
index 6dc1c86b19..cd0b726262 100644
--- a/public/language/es/notifications.json
+++ b/public/language/es/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Cuando alguien comienza a seguirte",
"notificationType_new-chat": "Cuando recibes un mensaje de chat",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Cuando recibes una invitación a un grupo",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "Cuando alguien es añadido a una cola de registro",
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index dda4294346..d0073d0a43 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -30,6 +30,7 @@
"locked": "Cerrado",
"pinned": "Fijo",
"moved": "Movido",
+ "moved-from": "Moved from %1",
"copy-ip": "Copiar IP",
"ban-ip": "Banear IP",
"view-history": "Editar Historial",
diff --git a/public/language/et/admin/settings/email.json b/public/language/et/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/et/admin/settings/email.json
+++ b/public/language/et/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/et/admin/settings/guest.json b/public/language/et/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/et/admin/settings/guest.json
+++ b/public/language/et/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/et/flags.json b/public/language/et/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/et/flags.json
+++ b/public/language/et/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json
index 43a8469320..0db60d7e5c 100644
--- a/public/language/et/notifications.json
+++ b/public/language/et/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index cbeff78e93..415dac6e17 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -30,6 +30,7 @@
"locked": "Lukustatud",
"pinned": "Märgistatud",
"moved": "Liigutatud",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/fa-IR/admin/settings/email.json b/public/language/fa-IR/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/fa-IR/admin/settings/email.json
+++ b/public/language/fa-IR/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/fa-IR/admin/settings/guest.json b/public/language/fa-IR/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/fa-IR/admin/settings/guest.json
+++ b/public/language/fa-IR/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json
index 42e0884fca..b2a7b9cf65 100644
--- a/public/language/fa-IR/error.json
+++ b/public/language/fa-IR/error.json
@@ -133,7 +133,7 @@
"reputation-system-disabled": "سیستم اعتبار غیر فعال شده است",
"downvoting-disabled": "رأی منفی غیر فعال شده است",
"not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رأی منفی به این پست را ندارید.",
- "not-enough-reputation-to-flag": "شما اعتبار کافی برای نشاندار کردن این پست ندارید",
+ "not-enough-reputation-to-flag": "شما اعتبار کافی را برای گزارش کردن این پست ندارید",
"not-enough-reputation-min-rep-website": "شما اعتبار لازم برای درج آدرس وبسایت را ندارید",
"not-enough-reputation-min-rep-aboutme": "شما اعتبار لازم برای ویرایش بخش درباره من را ندارید",
"not-enough-reputation-min-rep-signature": "شما اعتبار لازم برای ایجاد امضاء را ندارید",
diff --git a/public/language/fa-IR/flags.json b/public/language/fa-IR/flags.json
index 18cb602477..b9b0e9ece7 100644
--- a/public/language/fa-IR/flags.json
+++ b/public/language/fa-IR/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "گزارش محتوای نامناسب",
+ "modal-title": "Report Content",
"modal-body": "لطفا علت گزارش %2 %1 را برای بررسی مشخص کنید. همچنین می توانید از یکی از دکمه های ارسال سریع استفاده کنید.",
"modal-reason-spam": "هرزنامه",
"modal-reason-offensive": "توهین آمیز",
diff --git a/public/language/fa-IR/modules.json b/public/language/fa-IR/modules.json
index 5df903c5b2..8f7d873aa9 100644
--- a/public/language/fa-IR/modules.json
+++ b/public/language/fa-IR/modules.json
@@ -59,7 +59,7 @@
"composer.upload-file": "بارگذاری فایل",
"composer.zen_mode": "حالت ذن",
"composer.select_category": "یک دستهبندی انتخاب کنید",
- "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
+ "composer.textarea.placeholder": "محتوای پست خود را اینجا وارد کنید یا تصاویر را به اینجا بکشید و رها کنید",
"bootbox.ok": "باشه",
"bootbox.cancel": "انصراف",
"bootbox.confirm": "تایید",
diff --git a/public/language/fa-IR/notifications.json b/public/language/fa-IR/notifications.json
index aff9a5edb1..86508854c4 100644
--- a/public/language/fa-IR/notifications.json
+++ b/public/language/fa-IR/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "هنگامی که کسی شما را دنبال می کند",
"notificationType_new-chat": "هنگامی که شما پیام چتی دریافت می کنید",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "هنگامی که شما دعوتنامه گروه دریافت می کنید",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "وقتی کسی به صف ثبت نام اضافه می شود",
diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json
index eebcf522a8..5dd9b7fd32 100644
--- a/public/language/fa-IR/topic.json
+++ b/public/language/fa-IR/topic.json
@@ -22,7 +22,7 @@
"purge": "پاک کردن",
"restore": "برگرداندن",
"move": "جابهجا کردن",
- "change-owner": "Change Owner",
+ "change-owner": "تغییر مالک پست",
"fork": "شاخه ساختن",
"link": "پیوند",
"share": "اشتراکگذاری",
@@ -30,12 +30,13 @@
"locked": "قفل شده است",
"pinned": "سنجاق شده",
"moved": "منتقل شده",
+ "moved-from": "Moved from %1",
"copy-ip": "کپی IP",
"ban-ip": "مسدود کردن IP",
"view-history": "تاریخچه ویرایش",
"bookmark_instructions": "برای بازگشت به آخرین پست در این موضوع اینجا را کلیک کنید.",
- "flag-post": "Flag this post",
- "flag-user": "Flag this user",
+ "flag-post": "گزارش این پست",
+ "flag-user": "گزارش این کاربر",
"already-flagged": "Already Flagged",
"view-flag-report": "View Flag Report",
"merged_message": "This topic has been merged into %2",
@@ -67,7 +68,7 @@
"thread_tools.move": "جابجا کردن موضوع",
"thread_tools.move-posts": "انتقال پست ها",
"thread_tools.move_all": "جابجایی همه",
- "thread_tools.change_owner": "Change Owner",
+ "thread_tools.change_owner": "تغییر مالک پست",
"thread_tools.select_category": "انتخاب دسته",
"thread_tools.fork": "شاخه ساختن از موضوع",
"thread_tools.delete": "پاک کردن موضوع",
@@ -80,7 +81,7 @@
"thread_tools.merge_topics": "ادغام موضوع ها",
"thread_tools.merge": "ادغام",
"topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
- "topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
+ "topic_move_multiple_success": "تاپیک به %1 منتقل خواهد شد. برای جلوگیری از منتقل شدن کلیک کنید.",
"topic_move_all_success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
"topic_move_undone": "Topic move undone",
"topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
@@ -102,18 +103,18 @@
"fork_topic": "شاخه ساختن از موضوع",
"fork_topic_instruction": "پستهایی را که میخواهید به موضوع تازه ببرید، انتخاب کنید",
"fork_no_pids": "هیچ پستی انتخاب نشده!",
- "no-posts-selected": "No posts selected!",
- "x-posts-selected": "%1 post(s) selected",
+ "no-posts-selected": "هیچ پستی انتخاب نشده!",
+ "x-posts-selected": "%1 پست انتخاب شده",
"x-posts-will-be-moved-to-y": "%1 post(s) will be moved to \"%2\"",
- "fork_pid_count": "%1 پست (ها) انتخاب شده اند",
+ "fork_pid_count": "%1 پست انتخاب شده",
"fork_success": "موضوع با موفقیت منشعب شد! برای رفتن به موضوع انشعابی اینجا را کلیک کنید.",
"delete_posts_instruction": "با کلیک بر روی پست شما می خواهید به حذف/پاکسازی",
- "merge_topics_instruction": "Click the topics you want to merge or search for them",
- "merge-topic-list-title": "List of topics to be merged",
- "merge-options": "Merge options",
+ "merge_topics_instruction": "تاپیک های مورد نظر برای ادغام را انتخاب کنید یا آن ها را جستجو کنید",
+ "merge-topic-list-title": "لیست تاپیک هایی که با هم ادغام می شوند",
+ "merge-options": "تنظیمات ادغام",
"merge-select-main-topic": "Select the main topic",
"merge-new-title-for-topic": "New title for topic",
- "move_posts_instruction": "Click the posts you want to move then go to target topic and click move.",
+ "move_posts_instruction": "پست های مورد نظر را انتخاب کنید سپس به تاپیک مقصد بروید و گزینه جابهجا کردن را بزنید.",
"change_owner_instruction": "Click the posts you want to assign to another user",
"composer.title_placeholder": "عنوان موضوعتان را اینجا بنویسید...",
"composer.handle_placeholder": "Enter your name/handle here",
diff --git a/public/language/fi/admin/settings/email.json b/public/language/fi/admin/settings/email.json
index 60b7b52e29..ac0b01163a 100644
--- a/public/language/fi/admin/settings/email.json
+++ b/public/language/fi/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Sähköposti koosteet",
"subscriptions.disable": "Poista sähköpostin koosteet käytöstä",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/fi/admin/settings/guest.json b/public/language/fi/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/fi/admin/settings/guest.json
+++ b/public/language/fi/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/fi/flags.json b/public/language/fi/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/fi/flags.json
+++ b/public/language/fi/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json
index be327e7527..733c1a70a2 100644
--- a/public/language/fi/notifications.json
+++ b/public/language/fi/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Kun joku alkaa seurata sinua",
"notificationType_new-chat": "Kun saat viestin keskusteluun",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Kun saat kutsun ryhmään",
"notificationType_group-request-membership": "Kun joku pyytää lupaa liittyä ryhmään, jonka omistaja olet",
"notificationType_new-register": "Kun joku lisätään rekisteröintijonoon",
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index 664632b470..e27966e041 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -30,6 +30,7 @@
"locked": "Lukittu",
"pinned": "Kiinnitetty",
"moved": "Siirretty",
+ "moved-from": "Moved from %1",
"copy-ip": "Kopioi IP",
"ban-ip": "Ban IP",
"view-history": "Muokkaa historiaa",
diff --git a/public/language/fr/admin/manage/privileges.json b/public/language/fr/admin/manage/privileges.json
index 80c1a2ab36..b9f4fcb5ef 100644
--- a/public/language/fr/admin/manage/privileges.json
+++ b/public/language/fr/admin/manage/privileges.json
@@ -9,7 +9,7 @@
"upload-files": "Fichiers envoyés",
"signature": "Signature",
"ban": "Bannir",
- "invite": "Invite",
+ "invite": "Inviter",
"search-content": "Rechercher un contenu",
"search-users": "Rechercher des utilisateurs",
"search-tags": "Rechercher les tags",
diff --git a/public/language/fr/admin/settings/email.json b/public/language/fr/admin/settings/email.json
index 09de353ad2..c36b86ea7b 100644
--- a/public/language/fr/admin/settings/email.json
+++ b/public/language/fr/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "L'adresse e-mail suivante fait référence à l'adresse que le destinataire verra dans les champs \"De :\" et \"Répondre à :\". ",
"from": "Nom de l’expéditeur",
"from-help": "Le nom de l’expéditeur à afficher dans l'e-mail",
-
+
"smtp-transport": "Protocole SMTP",
"smtp-transport.enabled": "Utiliser un server extérieur pour envoyer les emails",
"smtp-transport-help": "Vous pouvez sélectionner depuis une liste de services ou entrer un service personnalisé.",
@@ -35,5 +35,7 @@
"subscriptions": "Actualités du forum ",
"subscriptions.disable": "Désactiver les actualités du forum ",
"subscriptions.hour": "Heure d'envoi",
- "subscriptions.hour-help": "Veuillez entrer un nombre représentant l'heure à laquelle envoyer les emails de résumé (c'est à dire 0 pour minuit, 17 pour 5:00 pm). Gardez à l'esprit qu'il s'agit de l'heure du serveur, et peut ne pas correspondre à votre heure locale.
L'heure du serveur est :
Le prochain mail de resumé sera envoyé à "
+ "subscriptions.hour-help": "Veuillez entrer un nombre représentant l'heure à laquelle envoyer les emails de résumé (c'est à dire 0 pour minuit, 17 pour 5:00 pm). Gardez à l'esprit qu'il s'agit de l'heure du serveur, et peut ne pas correspondre à votre heure locale.
L'heure du serveur est :
Le prochain mail de resumé sera envoyé à ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/fr/admin/settings/guest.json b/public/language/fr/admin/settings/guest.json
index 422348f22b..0cde9b5f3a 100644
--- a/public/language/fr/admin/settings/guest.json
+++ b/public/language/fr/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Gestion des invités",
+ "settings": "Settings",
"handles.enabled": "Autoriser les invités à poster",
"handles.enabled-help": "Cette option affiche un nouveau champ qui permet aux invités de choisir un nom qui sera associé à chaque message qu'ils rédigent. Si désactivé, il seront simplement nommés \"Invité\".",
- "topic-views": "Consultations du sujet",
- "topic-views.enabled": "Autoriser les invités à augmenter le nombre de consultations de sujets"
+ "topic-views.enabled": "Autoriser les invités à augmenter le nombre de consultations de sujets",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/fr/admin/settings/user.json b/public/language/fr/admin/settings/user.json
index 8b8fbf3fee..2f8e608045 100644
--- a/public/language/fr/admin/settings/user.json
+++ b/public/language/fr/admin/settings/user.json
@@ -65,7 +65,7 @@
"restrict-chat": "Autoriser uniquement les discussions aux utilisateurs que je suis",
"outgoing-new-tab": "Ouvrir les liens sortants dans un nouvel onglet",
"topic-search": "Activer la recherche au sein des sujets",
- "update-url-with-post-index": "Update url with post index while browsing topics",
+ "update-url-with-post-index": "Mettre à jour l'URL avec l'index des articles",
"digest-freq": "S'inscrire aux compte rendus",
"digest-freq.off": "Désactivé",
"digest-freq.daily": "Quotidien",
diff --git a/public/language/fr/flags.json b/public/language/fr/flags.json
index 2492cee1c3..238191de50 100644
--- a/public/language/fr/flags.json
+++ b/public/language/fr/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Demandes positives",
"sort-replies": "Réponses",
- "modal-title": "Signaler un contenu inapproprié",
+ "modal-title": "Report Content",
"modal-body": "Veuillez saisir le motif de votre signalement pour %1 %2 et sélectionner le bouton ci-dessous le plus approprié.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Choquant",
diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json
index 913efafb54..ef664344c6 100644
--- a/public/language/fr/notifications.json
+++ b/public/language/fr/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Lorsqu'un article est modifié dans un sujet que vous regardez",
"notificationType_follow": "Lorsque quelqu'un commence à vous suivre",
"notificationType_new-chat": "Lorsque vous recevez un message du chat ",
+ "notificationType_new-group-chat": "Lorsque vous recevez un message de discussion de groupe",
"notificationType_group-invite": "Lorsque vous recevez une invitation d'un groupe",
"notificationType_group-request-membership": "Quand quelqu'un demande à rejoindre un groupe que vous administrez",
"notificationType_new-register": "Lorsque quelqu'un est ajouté à la file d'attente d'inscription",
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 92f0d48071..4366bc070d 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -30,6 +30,7 @@
"locked": "Verrouillé",
"pinned": "Épinglé",
"moved": "Déplacé",
+ "moved-from": "Déplacé de %1",
"copy-ip": "Copier l'IP",
"ban-ip": "Bannir l'IP",
"view-history": "Éditer l'historique",
diff --git a/public/language/fr/user.json b/public/language/fr/user.json
index 03f6e38456..593e9f001d 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -123,7 +123,7 @@
"open_links_in_new_tab": "Ouvrir les liens externes dans un nouvel onglet",
"enable_topic_searching": "Activer la recherche dans les sujets",
"topic_search_help": "Une fois activé, la recherche dans les sujets va remplacer la recherche de page du navigateur et vous permettra de rechercher dans l'intégralité d'un sujet au lieu des seuls posts affichés à l'écran.",
- "update_url_with_post_index": "Update url with post index while browsing topics",
+ "update_url_with_post_index": "Mettre à jour l'URL avec l'index des articles",
"scroll_to_my_post": "Après avoir répondu, montrer le nouveau message",
"follow_topics_you_reply_to": "S'abonner aux sujets auxquels vous répondez",
"follow_topics_you_create": "S'abonner aux sujets que vous créez",
diff --git a/public/language/fr/users.json b/public/language/fr/users.json
index c813e38e61..51413e9c93 100644
--- a/public/language/fr/users.json
+++ b/public/language/fr/users.json
@@ -11,7 +11,7 @@
"online-only": "En ligne uniquement",
"invite": "Invitation",
"prompt-email": "Emails:",
- "groups-to-join": "Groups to be joined when invite is accepted:",
+ "groups-to-join": "Groupes à rejoindre lorsque l'invitation est acceptée:",
"invitation-email-sent": "Un email d'invitation a été envoyé à %1",
"user_list": "Liste d'Utilisateurs",
"recent_topics": "Sujets Récents",
diff --git a/public/language/gl/admin/settings/email.json b/public/language/gl/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/gl/admin/settings/email.json
+++ b/public/language/gl/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/gl/admin/settings/guest.json b/public/language/gl/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/gl/admin/settings/guest.json
+++ b/public/language/gl/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/gl/flags.json b/public/language/gl/flags.json
index 14bda1b94a..29189beab3 100644
--- a/public/language/gl/flags.json
+++ b/public/language/gl/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Reportar Contido Inapropiado",
+ "modal-title": "Report Content",
"modal-body": "Por favor, especifique o seu motivo para marcar %1 %2 para revisión. Alternativamente, empregue un dos botóns de reporte rápido se fose pertinente.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Ofensivo",
diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json
index 6470a1fd96..059c57d3fb 100644
--- a/public/language/gl/notifications.json
+++ b/public/language/gl/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json
index e7637f3561..ef9e356214 100644
--- a/public/language/gl/topic.json
+++ b/public/language/gl/topic.json
@@ -30,6 +30,7 @@
"locked": "Pechado",
"pinned": "Fixo",
"moved": "Movido",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/he/admin/settings/email.json
+++ b/public/language/he/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/he/admin/settings/guest.json b/public/language/he/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/he/admin/settings/guest.json
+++ b/public/language/he/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/he/flags.json b/public/language/he/flags.json
index 021ea96562..f0d0dc9727 100644
--- a/public/language/he/flags.json
+++ b/public/language/he/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "הכי הרבה הצבעות",
"sort-replies": "הכי הרבה תגובות",
- "modal-title": "דווח על תוכן לא ראוי",
+ "modal-title": "Report Content",
"modal-body": "אנא ציין את הסיבה לסימון %1 %2 לצורך בקרה. לחלופין, השתמש באחד מכפתורי הדיווח המהיר אם אפשר.",
"modal-reason-spam": "זבל",
"modal-reason-offensive": "פוגעני",
diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json
index 58596f5a8a..8d02ec113b 100644
--- a/public/language/he/notifications.json
+++ b/public/language/he/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "כשמישהו מתחיל לעקוב אחריך",
"notificationType_new-chat": "כשאתה מקבל הודעת צאט",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "כשאתה מקבל הזמנה מקבוצה",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "כאשר מישהו מתווסף לתור הרישום",
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index 4b882bf540..8909b61143 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -30,6 +30,7 @@
"locked": "נעול",
"pinned": "נעוץ",
"moved": "הועבר",
+ "moved-from": "Moved from %1",
"copy-ip": "העתק כתובת IP",
"ban-ip": "הרחק כתובת IP",
"view-history": "ערוך היסטוריה",
diff --git a/public/language/hr/admin/settings/email.json b/public/language/hr/admin/settings/email.json
index 589332d162..b76e4551ba 100644
--- a/public/language/hr/admin/settings/email.json
+++ b/public/language/hr/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Sljedeća email adresa je adresa koju će primatelj vidjeti u \"Od\" i \"Odgovori na\" poljima.",
"from": "Od imena",
"from-help": "Ime prikazano u dolaznom emailu.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Pregled Sati.",
- "subscriptions.hour-help": "Unesite broj koji pretstavlja vrijeme kada će se poslati pregled mailom (npr. 0 za ponoć, 17za 5 popodne).Imajte na umu da to vrijeme predstavlja vrijeme servera te ne mora predstavljati vrijeme na Vašem sistemu. Vrijeme servera je:
Sljedeći pregled će biti poslan ."
+ "subscriptions.hour-help": "Unesite broj koji pretstavlja vrijeme kada će se poslati pregled mailom (npr. 0 za ponoć, 17za 5 popodne).Imajte na umu da to vrijeme predstavlja vrijeme servera te ne mora predstavljati vrijeme na Vašem sistemu. Vrijeme servera je:
Sljedeći pregled će biti poslan .",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/hr/admin/settings/guest.json b/public/language/hr/admin/settings/guest.json
index 3b86812ee4..78c75a43e2 100644
--- a/public/language/hr/admin/settings/guest.json
+++ b/public/language/hr/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Upravljanje gostima",
+ "settings": "Settings",
"handles.enabled": "Dozvoli upravljanje gostima",
"handles.enabled-help": "Ova opcija omogućava gostima da izaberi ime za svaku objavu koju naprave.Ako je onemogućena gosti će se zvati \"gost\".",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/hr/flags.json b/public/language/hr/flags.json
index f9e8dff1e9..6c1761dfe4 100644
--- a/public/language/hr/flags.json
+++ b/public/language/hr/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Prijavi neprimjereni sadržaj",
+ "modal-title": "Report Content",
"modal-body": "Navedite razlog označavanja zastavom %1 %2 .U suprotnom koristite jedan od dugmića za brzo prijavljivanje.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Uvredljivo",
diff --git a/public/language/hr/notifications.json b/public/language/hr/notifications.json
index 85f031bab3..4e43f28e4d 100644
--- a/public/language/hr/notifications.json
+++ b/public/language/hr/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json
index 5a18c836fc..ba109d49a7 100644
--- a/public/language/hr/topic.json
+++ b/public/language/hr/topic.json
@@ -30,6 +30,7 @@
"locked": "Zaključano",
"pinned": "Zakačeno",
"moved": "Premješteno",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/hu/admin/settings/email.json b/public/language/hu/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/hu/admin/settings/email.json
+++ b/public/language/hu/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/hu/admin/settings/guest.json b/public/language/hu/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/hu/admin/settings/guest.json
+++ b/public/language/hu/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/hu/flags.json b/public/language/hu/flags.json
index adc5a33942..9bf2b38188 100644
--- a/public/language/hu/flags.json
+++ b/public/language/hu/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json
index 71e4edd6a2..46b386ca38 100644
--- a/public/language/hu/notifications.json
+++ b/public/language/hu/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Mikor valaki elkezd követni téged",
"notificationType_new-chat": "Mikor chat üzenetet kapsz",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Mikor csoportmeghívást kapsz",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "Mikor valaki a regisztrációs várólistára kerül",
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index 4ee0d90804..3825796197 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -30,6 +30,7 @@
"locked": "Zárolva",
"pinned": "Rögzített",
"moved": "Áthelyezett",
+ "moved-from": "Moved from %1",
"copy-ip": "IP-cím másolása",
"ban-ip": "IP-cím kitiltása",
"view-history": "Edit History",
diff --git a/public/language/id/admin/settings/email.json b/public/language/id/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/id/admin/settings/email.json
+++ b/public/language/id/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/id/admin/settings/guest.json b/public/language/id/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/id/admin/settings/guest.json
+++ b/public/language/id/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/id/flags.json b/public/language/id/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/id/flags.json
+++ b/public/language/id/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json
index 2192cce6cc..57f60009db 100644
--- a/public/language/id/notifications.json
+++ b/public/language/id/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/id/topic.json b/public/language/id/topic.json
index 764c8b6639..97fa869ae0 100644
--- a/public/language/id/topic.json
+++ b/public/language/id/topic.json
@@ -30,6 +30,7 @@
"locked": "Terkunci",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/it/admin/settings/email.json b/public/language/it/admin/settings/email.json
index d67e27fcfa..5c7d376804 100644
--- a/public/language/it/admin/settings/email.json
+++ b/public/language/it/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Il seguente indirizzo email si riferisce all'email che il destinatario vedrà nei campi \"Da\" e \"Rispondi a\".",
"from": "Da Nome",
"from-help": "Il nome da visualizzare nell'email.",
-
+
"smtp-transport": "Trasporto SMTP",
"smtp-transport.enabled": "Utilizza un server di posta elettronica esterno per inviare le email",
"smtp-transport-help": "Puoi selezionare da un elenco di servizi noti o inserirne uno personalizzato.",
@@ -35,5 +35,7 @@
"subscriptions": "Email riepilogo",
"subscriptions.disable": "Disabilita email riepilogo",
"subscriptions.hour": "Orario riepilogo",
- "subscriptions.hour-help": "Si prega di inserire un numero che rappresenta l'ora per l'invio dell'email programmate (es. 0per mezzanotte, 17per le 17: 00). Tieni presente che questa è l'ora secondo il server stesso, e potrebbe non combaciare esattamente al tuo orologio di sistema.
L'orario approssimativo del server è:
La prossima trasmissione giornaliera è prevista alle "
+ "subscriptions.hour-help": "Si prega di inserire un numero che rappresenta l'ora per l'invio dell'email programmate (es. 0per mezzanotte, 17per le 17: 00). Tieni presente che questa è l'ora secondo il server stesso, e potrebbe non combaciare esattamente al tuo orologio di sistema.
L'orario approssimativo del server è:
La prossima trasmissione giornaliera è prevista alle ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/it/admin/settings/guest.json b/public/language/it/admin/settings/guest.json
index e946d8a26a..798eb01eda 100644
--- a/public/language/it/admin/settings/guest.json
+++ b/public/language/it/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Nome utente Ospite",
+ "settings": "Settings",
"handles.enabled": "Consenti nome utente ospite",
"handles.enabled-help": "Questa opzione mostra un nuovo campo che permette agli ospiti di scegliere un nome da associare ad ogni post che fanno. Se disabilitata, saranno semplicemente chiamati \"Ospite\".",
- "topic-views": "Visualizzazioni discussione",
- "topic-views.enabled": "Consentire agli ospiti di aumentare il numero di visualizzazioni della discussione"
+ "topic-views.enabled": "Consentire agli ospiti di aumentare il numero di visualizzazioni della discussione",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/it/flags.json b/public/language/it/flags.json
index 9709236047..5473628978 100644
--- a/public/language/it/flags.json
+++ b/public/language/it/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Più voti positivi",
"sort-replies": "Più risposte",
- "modal-title": "Segnala Contenuto Inappropriato",
+ "modal-title": "Report Content",
"modal-body": "Specifica il motivo per cui contrassegni %1 %2 per la revisione. In alternativa, utilizza uno dei pulsanti di segnalazione rapida, se applicabile.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensivo",
diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json
index 45bd4df2ec..812cae26d4 100644
--- a/public/language/it/notifications.json
+++ b/public/language/it/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Quando un post viene modificato in un topic che stai guardando",
"notificationType_follow": "Quando qualcuno inizia a seguirti",
"notificationType_new-chat": "Quando ricevi un messaggio in chat",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Quando ricevi un invito ad un gruppo",
"notificationType_group-request-membership": "Quando qualcuno richiede di iscriversi a un gruppo di tua proprietà",
"notificationType_new-register": "Quando qualcuno è in attesa della registrazione",
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index b257dcf8e5..252ac98c60 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -30,6 +30,7 @@
"locked": "Bloccato",
"pinned": "Appeso",
"moved": "Spostato",
+ "moved-from": "Moved from %1",
"copy-ip": "Copia indirizzo IP",
"ban-ip": "Banna indirizzo IP",
"view-history": "Modifica storico",
diff --git a/public/language/ja/admin/settings/email.json b/public/language/ja/admin/settings/email.json
index 5d638c3af5..c1dd208061 100644
--- a/public/language/ja/admin/settings/email.json
+++ b/public/language/ja/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "次の電子メールアドレスは「送信者」と「返信先」の欄に受信者が表示する電子メールを指します。",
"from": "名前から",
"from-help": "メールからの名前が表示されます。",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "ダイジェストアワー",
- "subscriptions.hour-help": "スケジュールされたメールのダイジェストを送信する時間を表す数字を入力してください(深夜は0、午後5:00は17)これはサーバー自体に基づく時間であり、システムの時計と正確に一致しない場合があります。
次の日のダイジェストは"
+ "subscriptions.hour-help": "スケジュールされたメールのダイジェストを送信する時間を表す数字を入力してください(深夜は0、午後5:00は17)これはサーバー自体に基づく時間であり、システムの時計と正確に一致しない場合があります。
次の日のダイジェストは",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/guest.json b/public/language/ja/admin/settings/guest.json
index 7d9d94db62..629e93d809 100644
--- a/public/language/ja/admin/settings/guest.json
+++ b/public/language/ja/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "ゲストハンドル",
+ "settings": "Settings",
"handles.enabled": "ゲストハンドルを有効にする",
"handles.enabled-help": "このオプションでは新しい投稿が表示される時に、ゲストは自分が投稿する各投稿に関連付ける名前を選択できます。無効にすると、単に「ゲスト」と呼ばれます。",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/ja/flags.json b/public/language/ja/flags.json
index 75c66b6681..df5a7713d4 100644
--- a/public/language/ja/flags.json
+++ b/public/language/ja/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "不適切なコンテンツを報告する",
+ "modal-title": "Report Content",
"modal-body": "レビューのために%1 %2 にフラグを付ける理由を指定してください。または必要に応じてクイックレポートボタンの1つを使用します。",
"modal-reason-spam": "スパム",
"modal-reason-offensive": "攻撃",
diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json
index e3db188cd6..7686ab1f78 100644
--- a/public/language/ja/notifications.json
+++ b/public/language/ja/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "誰かがあなたをフォローしたとき",
"notificationType_new-chat": "チャットメッセージを受信したとき",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "グループ招待を受けたとき",
"notificationType_group-request-membership": "誰かがあなたのグループへの参加を要求したとき",
"notificationType_new-register": "誰かが登録キューに追加されたとき",
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index 2913a57a96..7b37b0d752 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -30,6 +30,7 @@
"locked": "ロック",
"pinned": "ピンされた",
"moved": "移動しました",
+ "moved-from": "Moved from %1",
"copy-ip": "IPをコピー",
"ban-ip": "IPをBan",
"view-history": "履歴を編集",
diff --git a/public/language/ko/admin/settings/email.json b/public/language/ko/admin/settings/email.json
index cf7255cb1b..dd9ed857a4 100644
--- a/public/language/ko/admin/settings/email.json
+++ b/public/language/ko/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "아래 이메일 주소는 수신인의 \"보낸 사람\"과 \"답장하기\" 항목에서 보이게 됩니다.",
"from": "보낸 사람 이름",
"from-help": "이메일에 표시할 보낸 사람 이름",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "발송 시간",
- "subscriptions.hour-help": "정기 이메일을 보낼 시간을 기입해 주세요(예: 0은 자정, 17은 오후 5시 입니다. 이 시간은 서버기준이며, 귀하의 시스템 시간과 일치하지 않을 수 있습니다.
서버 시간은 입니다.
다음 정기 이메일은 에 발송 예정입니다."
+ "subscriptions.hour-help": "정기 이메일을 보낼 시간을 기입해 주세요(예: 0은 자정, 17은 오후 5시 입니다. 이 시간은 서버기준이며, 귀하의 시스템 시간과 일치하지 않을 수 있습니다.
서버 시간은 입니다.
다음 정기 이메일은 에 발송 예정입니다.",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/ko/admin/settings/guest.json b/public/language/ko/admin/settings/guest.json
index 56603dedc7..935f6c2ad1 100644
--- a/public/language/ko/admin/settings/guest.json
+++ b/public/language/ko/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "게스트 처리",
+ "settings": "Settings",
"handles.enabled": "미가입 사용자 닉네임 설정 허가",
"handles.enabled-help": "이 옵션은 게스트들이 포스트를 작성할 때 이름을 적는 공간을 제공합니다. 이 옵션이 비활성화 돼있다면 \"Guest\" 라고 표시될 것입니다.",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/ko/flags.json b/public/language/ko/flags.json
index c164aad462..4e0218d708 100644
--- a/public/language/ko/flags.json
+++ b/public/language/ko/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "부적절한 컨텐츠 신고",
+ "modal-title": "Report Content",
"modal-body": "%1 %2 에 대한 신고 사유를 적어주시거나, 빠른 신고 버튼 중 하나를 사용해 주세요.",
"modal-reason-spam": "스팸",
"modal-reason-offensive": "부적절한 글",
diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json
index 640ce1374a..b0b29021d9 100644
--- a/public/language/ko/notifications.json
+++ b/public/language/ko/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "누군가 사용자님을 팔로우 하면",
"notificationType_new-chat": "채팅 메시지를 받으면",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "그룹 초대를 받으면",
"notificationType_group-request-membership": "누군가가 당신이 소유한 그룹에 참여를 요청했을 때",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json
index 437fd01ac1..81aafa2234 100644
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -30,6 +30,7 @@
"locked": "잠긴 게시물",
"pinned": "고정된 게시물",
"moved": "이동된 게시물",
+ "moved-from": "Moved from %1",
"copy-ip": "IP 복사",
"ban-ip": "IP 차단",
"view-history": "편집 기록",
diff --git a/public/language/lt/admin/settings/email.json b/public/language/lt/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/lt/admin/settings/email.json
+++ b/public/language/lt/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/lt/admin/settings/guest.json b/public/language/lt/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/lt/admin/settings/guest.json
+++ b/public/language/lt/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/lt/flags.json b/public/language/lt/flags.json
index 556035ffbb..1977059a92 100644
--- a/public/language/lt/flags.json
+++ b/public/language/lt/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Šlamštas",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json
index 2b09fbc8ff..c7f4446e04 100644
--- a/public/language/lt/notifications.json
+++ b/public/language/lt/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index 7f0f281058..7d0b47f37b 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -30,6 +30,7 @@
"locked": "Užrakinta",
"pinned": "Pinned",
"moved": "Perkelta",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Blokuoti IP",
"view-history": "Edit History",
diff --git a/public/language/lv/admin/settings/email.json b/public/language/lv/admin/settings/email.json
index 0d878340e9..084dd5c055 100644
--- a/public/language/lv/admin/settings/email.json
+++ b/public/language/lv/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "E-pasta adrese, ko saņēmējs redzēs laukos \"No:\" un \"Atbildēt:\".",
"from": "Sūtītāja vārds vai nosaukums",
"from-help": "Vārds vai nosaukums, ko saņēmējs redzēs kā sūtītāju.",
-
+
"smtp-transport": "SMTP transports",
"smtp-transport.enabled": "Izmantot atsevišķu e-pasta serveri, lai nosūtītu e-pastus",
"smtp-transport-help": "Izvēlies no labi zināmu pakalpojumu saraksta vai ievadi pielāgotu pakalpojumu.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Kopsavilkumu nosūtīšanas stunda",
- "subscriptions.hour-help": "Ievadīt skaitli, kas norāda stundu, kurā nosūtītu e-pasta rakstu apkopojumu (piemēram, 0 nozīmē pusnakts, 17 nozīmē plkst.1700). Paturēt prātā, ka šī ir stunda servera laikā, un tā var neatbilst Tavam pulkstenim. Aptuvens servera laiks ir:
Nākamais ikdienas apkopojums tiks nosūtīts "
+ "subscriptions.hour-help": "Ievadīt skaitli, kas norāda stundu, kurā nosūtītu e-pasta rakstu apkopojumu (piemēram, 0 nozīmē pusnakts, 17 nozīmē plkst.1700). Paturēt prātā, ka šī ir stunda servera laikā, un tā var neatbilst Tavam pulkstenim. Aptuvens servera laiks ir:
Nākamais ikdienas apkopojums tiks nosūtīts ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/lv/admin/settings/guest.json b/public/language/lv/admin/settings/guest.json
index e355222d3d..394c6b8a25 100644
--- a/public/language/lv/admin/settings/guest.json
+++ b/public/language/lv/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Viesu iesaukas",
+ "settings": "Settings",
"handles.enabled": "Atļaut viesu iesaukas",
"handles.enabled-help": "Parādīt lauku, kas viesiem ļaus izvēlēties savu iesauku, kas saistīts ar katru viņu publicēto rakstu. Ja ir atspējots, viņus vienkārši sauks par \"Viesiem\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/lv/flags.json b/public/language/lv/flags.json
index ec9a8547e7..9132179172 100644
--- a/public/language/lv/flags.json
+++ b/public/language/lv/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Ziņot par nepiemērotu saturu",
+ "modal-title": "Report Content",
"modal-body": "Lūdzu, norādi iemeslu, kāpēc %1 %2 ir atzīmēts pārskatīšanai. Citādi, izmanto vienu no ātrā ziņojuma pogām.",
"modal-reason-spam": "Mēstule",
"modal-reason-offensive": "Aizskarošs",
diff --git a/public/language/lv/notifications.json b/public/language/lv/notifications.json
index afd3c42343..cced8052fe 100644
--- a/public/language/lv/notifications.json
+++ b/public/language/lv/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Kad kāds sāk Tev sekot",
"notificationType_new-chat": "Kad saņemi sarunu",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Kad saņemi ielūgumu pievienoties grupai",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "Kad kāds tiek ievietots reģistrācijas rindā",
diff --git a/public/language/lv/topic.json b/public/language/lv/topic.json
index 6827595739..dc6f01b54b 100644
--- a/public/language/lv/topic.json
+++ b/public/language/lv/topic.json
@@ -30,6 +30,7 @@
"locked": "Slēgtie",
"pinned": "Piespraustie",
"moved": "Pārvietots",
+ "moved-from": "Moved from %1",
"copy-ip": "Kopēt IP adresi",
"ban-ip": "Bloķēt IP adresi",
"view-history": "Rediģēšanas vēsture",
diff --git a/public/language/ms/admin/settings/email.json b/public/language/ms/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/ms/admin/settings/email.json
+++ b/public/language/ms/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/ms/admin/settings/guest.json b/public/language/ms/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/ms/admin/settings/guest.json
+++ b/public/language/ms/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/ms/flags.json b/public/language/ms/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/ms/flags.json
+++ b/public/language/ms/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json
index 444e49c195..598476cc8b 100644
--- a/public/language/ms/notifications.json
+++ b/public/language/ms/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index a53aca52fa..5f7f6257f1 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -30,6 +30,7 @@
"locked": "Kunci",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/nb/admin/settings/email.json b/public/language/nb/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/nb/admin/settings/email.json
+++ b/public/language/nb/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/nb/admin/settings/guest.json b/public/language/nb/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/nb/admin/settings/guest.json
+++ b/public/language/nb/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/nb/flags.json b/public/language/nb/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/nb/flags.json
+++ b/public/language/nb/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json
index 470d5d23bb..54f955a650 100644
--- a/public/language/nb/notifications.json
+++ b/public/language/nb/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index e33bd18b72..c59a5424f4 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -30,6 +30,7 @@
"locked": "Låst",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/nl/admin/settings/email.json b/public/language/nl/admin/settings/email.json
index 5fdd953ced..e1d062b536 100644
--- a/public/language/nl/admin/settings/email.json
+++ b/public/language/nl/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Het volgende e-mailadres refereert aan de e-mail die ontvanger ziet in de \"From\" en \"Reply To\" velden.",
"from": "From Naam",
"from-help": "De from naam om te tonen in de e-mail.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Gebruik een externe mail server om mails te verzenden",
"smtp-transport-help": "Je kunt een bekende dienst uit de lijst selecteren of vul een aangepaste dienst in.",
@@ -35,5 +35,7 @@
"subscriptions": "E-mail digests",
"subscriptions.disable": "Schakel e-mail digests uit",
"subscriptions.hour": "Uur van Digest",
- "subscriptions.hour-help": "Voer het nummer in dat het uur representeerd waarop scheduled email digests worden verstuurd (bv. 0 voor middernacht, 17 voor 17:00). Neem er s.v.p. notie van dat dit het uur is van de server self, dit hoeft niet exact overeen te komen met de klok van uw systeem.
De tijd op de server is bij benadering:
De volgende dagelijkse digest staat gepland om "
+ "subscriptions.hour-help": "Voer het nummer in dat het uur representeerd waarop scheduled email digests worden verstuurd (bv. 0 voor middernacht, 17 voor 17:00). Neem er s.v.p. notie van dat dit het uur is van de server self, dit hoeft niet exact overeen te komen met de klok van uw systeem.
De tijd op de server is bij benadering:
De volgende dagelijkse digest staat gepland om ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/nl/admin/settings/guest.json b/public/language/nl/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/nl/admin/settings/guest.json
+++ b/public/language/nl/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/nl/flags.json b/public/language/nl/flags.json
index c6cce94e4e..5d36245b74 100644
--- a/public/language/nl/flags.json
+++ b/public/language/nl/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Rapporteer ongepaste content",
+ "modal-title": "Report Content",
"modal-body": "Beschrijf de reden voor het markeren van %1 %2 voor review. Of gebruik een van de snelknoppen indien van toepassing.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Aanstootgevend",
diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json
index 6f33e6b37e..6c77277819 100644
--- a/public/language/nl/notifications.json
+++ b/public/language/nl/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Als een bericht wordt aangepast in een onderwerp dat je volgt",
"notificationType_follow": "Als iemand begint met jou te volgen",
"notificationType_new-chat": "Als je een chat-bericht ontvangt",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Als je een uitnodiging voor een groep ontvangt",
"notificationType_group-request-membership": "Als iemand vraagt om lid te worden van een groep waarvan je eigenaar bent",
"notificationType_new-register": "Als iemand wordt toegevoegd aan een registratiewachtrij",
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index 205eb899ce..48791248da 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -30,6 +30,7 @@
"locked": "Gesloten",
"pinned": "Pinned",
"moved": "Verplaatst",
+ "moved-from": "Moved from %1",
"copy-ip": "Kopieer IP",
"ban-ip": "Verban IP",
"view-history": "Revisie geschiedenis",
diff --git a/public/language/pl/admin/settings/email.json b/public/language/pl/admin/settings/email.json
index e3774d23a9..0133f3617a 100644
--- a/public/language/pl/admin/settings/email.json
+++ b/public/language/pl/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Ten adres e-mail odbiorca zobaczy w polach „Od” i „Odpowiedz”.",
"from": "Pole „Od”",
"from-help": "Nazwa „Od” widoczna w e-mailach",
-
+
"smtp-transport": "Transport SMTP",
"smtp-transport.enabled": "Używaj zewnętrznego serwera e-mail do wysyłania e-maili.",
"smtp-transport-help": "Możesz wybrać z listy dobrze znanych usług lub wskazać usługę niestandardową.",
@@ -35,5 +35,7 @@
"subscriptions": "Podsumowania e-mail",
"subscriptions.disable": "Wyłącz podsumowania e-maili",
"subscriptions.hour": "Godzina podsumowania",
- "subscriptions.hour-help": "Wprowadź liczbę odpowiadającą godzinie, o której mają być wysyłane regularne e-maile z podsumowaniem (np. 0 dla północy lub 17 dla 17:00). Pamiętaj, że godzina jest godziną serwera i nie musi zgadzać się z czasem lokalnym administratora. Przybliżony czas serwera to:
Wysłanie kolejnego e-maila z podsumowaniem zaplanowano na "
+ "subscriptions.hour-help": "Wprowadź liczbę odpowiadającą godzinie, o której mają być wysyłane regularne e-maile z podsumowaniem (np. 0 dla północy lub 17 dla 17:00). Pamiętaj, że godzina jest godziną serwera i nie musi zgadzać się z czasem lokalnym administratora. Przybliżony czas serwera to:
Wysłanie kolejnego e-maila z podsumowaniem zaplanowano na ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/pl/admin/settings/guest.json b/public/language/pl/admin/settings/guest.json
index 4eb4da8a21..1584969a45 100644
--- a/public/language/pl/admin/settings/guest.json
+++ b/public/language/pl/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Podpisywanie się gości",
+ "settings": "Settings",
"handles.enabled": "Zezwalaj gościom na podpisywanie się",
"handles.enabled-help": "Opcja ta udostępnia gościom nowe pole, w którym mogą wybrać nazwę, pod jaką będą publikować posty. Jeśli opcja jest wyłączona, stosowana będzie po prostu nazwa „Gość”",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/pl/flags.json b/public/language/pl/flags.json
index cc69a02ec9..241896eb4d 100644
--- a/public/language/pl/flags.json
+++ b/public/language/pl/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Zgłoś niewłaściwe treści",
+ "modal-title": "Report Content",
"modal-body": "Wskaż powód oflagowania i zgłoszenia %1 %2 do oceny. Jeśli to możliwe, użyj jednego z przycisków szybkiego zgłoszenia.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Treści obraźliwe",
diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json
index 5ff19a59a7..ae37815cc8 100644
--- a/public/language/pl/notifications.json
+++ b/public/language/pl/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Kiedy post jest edytowany w temacie, który obserwujesz",
"notificationType_follow": "Kiedy ktoś zacznie Cię obserwować",
"notificationType_new-chat": "Kiedy otrzymasz wiadomość na czacie",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Kiedy otrzymasz grupowe zaproszenie",
"notificationType_group-request-membership": "Kiedy ktoś prosi o dołączenie do grupy, którą posiadasz",
"notificationType_new-register": "Kiedy ktoś zostaje dodany do kolejki rejestracyjnej",
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index 682131652c..57f5ee1a1e 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -30,6 +30,7 @@
"locked": "Zablokowany",
"pinned": "Przypięty",
"moved": "Przeniesiony",
+ "moved-from": "Moved from %1",
"copy-ip": "Kopiuj IP",
"ban-ip": "Blokuj IP",
"view-history": "Historia edycji",
diff --git a/public/language/pt-BR/admin/settings/email.json b/public/language/pt-BR/admin/settings/email.json
index edeef89aa4..6d233e6dfd 100644
--- a/public/language/pt-BR/admin/settings/email.json
+++ b/public/language/pt-BR/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "O seguinte endereço de e-mail se refere ao e-mail que o destinatário verá nos campos \"De\" e \"Responder Para\".",
"from": "Por Nome (From)",
"from-help": "O nome que será mostrado em \"De\" no e-mail.",
-
+
"smtp-transport": "Trasporte por SMTP",
"smtp-transport.enabled": "Utilizar um servidor de e-mail externo para enviar e-mails",
"smtp-transport-help": "Você pode escolher entre uma lista de serviços conhecidos ou adicionar um personalizado.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Hora de Envio dos Resumos",
- "subscriptions.hour-help": "Por favor, entre um número representando a hora para enviar os resumos agendados via e-mail (por exemplo: 0 para meia-noite, 17 para 5:00pm). Tenha em mente que esta é a hora de acordo com o servidor e pode não combinar exatamente com o relógio do seu sistema.
O horário aproximado do servidor é:
O próximo resumo diário está agendado para ser enviado "
+ "subscriptions.hour-help": "Por favor, entre um número representando a hora para enviar os resumos agendados via e-mail (por exemplo: 0 para meia-noite, 17 para 5:00pm). Tenha em mente que esta é a hora de acordo com o servidor e pode não combinar exatamente com o relógio do seu sistema.
O horário aproximado do servidor é:
O próximo resumo diário está agendado para ser enviado ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/pt-BR/admin/settings/guest.json b/public/language/pt-BR/admin/settings/guest.json
index 09422d5b18..84e3098de0 100644
--- a/public/language/pt-BR/admin/settings/guest.json
+++ b/public/language/pt-BR/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Nome para Visitantes",
+ "settings": "Settings",
"handles.enabled": "Permitir que visitantes escolham um nome",
"handles.enabled-help": "Esta opção mostra um novo campo que permite visitantes de escolher um nome para associar a cada post que eles fizerem. Se desabilitado, eles serão simplesmente chamados de \"Visitante\".",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/pt-BR/flags.json b/public/language/pt-BR/flags.json
index 0dff281db8..1bb5fc5a31 100644
--- a/public/language/pt-BR/flags.json
+++ b/public/language/pt-BR/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Reportar Conteúdo Inadequado",
+ "modal-title": "Report Content",
"modal-body": "Por favor, especifique a razão pela qual você está sinalizando %1 %2 para a revisão. Alternativamente, use um dos botões de reporte rápido se for aplicável.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Ofensivo",
diff --git a/public/language/pt-BR/notifications.json b/public/language/pt-BR/notifications.json
index d9fc33c48a..c06ba4e7ca 100644
--- a/public/language/pt-BR/notifications.json
+++ b/public/language/pt-BR/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Quando alguém começar a seguir você",
"notificationType_new-chat": "Quando você receber uma mensagem de chat",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Quando você receber um convite para um grupo",
"notificationType_group-request-membership": "Quando alguém pede para participar de um grupo que você é dono",
"notificationType_new-register": "Quando alguém for adicionado à fila de registro",
diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json
index 9e5b448a82..7ae84e2309 100644
--- a/public/language/pt-BR/topic.json
+++ b/public/language/pt-BR/topic.json
@@ -30,6 +30,7 @@
"locked": "Trancado",
"pinned": "Fixado",
"moved": "Movido",
+ "moved-from": "Moved from %1",
"copy-ip": "Copiar IP",
"ban-ip": "Banir IP",
"view-history": "Histórico de Edição",
diff --git a/public/language/pt-PT/admin/settings/email.json b/public/language/pt-PT/admin/settings/email.json
index 9a4d43bb02..8917a8ea07 100644
--- a/public/language/pt-PT/admin/settings/email.json
+++ b/public/language/pt-PT/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Resumos por E-mail",
"subscriptions.disable": "Desativar resumos por e-mail",
"subscriptions.hour": "Hora do Resumo",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/pt-PT/admin/settings/guest.json b/public/language/pt-PT/admin/settings/guest.json
index d2e42cbedd..af3d498e80 100644
--- a/public/language/pt-PT/admin/settings/guest.json
+++ b/public/language/pt-PT/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Nomes para visitantes",
+ "settings": "Settings",
"handles.enabled": "Permitir nomes para visitantes",
"handles.enabled-help": "Esta opção expôe um novo campo que permite a visitantes escolher um nome para associar a cada publicação que eles criem. Se desabilitada, eles simplesmente se chamarão \"Visitante\" ",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/pt-PT/flags.json b/public/language/pt-PT/flags.json
index 87b36c6847..3f22c5b2c2 100644
--- a/public/language/pt-PT/flags.json
+++ b/public/language/pt-PT/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Denunciar Conteúdo Impróprio",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Ofensivo",
diff --git a/public/language/pt-PT/notifications.json b/public/language/pt-PT/notifications.json
index ed1b911ef8..cda956aa54 100644
--- a/public/language/pt-PT/notifications.json
+++ b/public/language/pt-PT/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Quando uma publicação é editada num tópico que estás a seguir",
"notificationType_follow": "Quando alguém começa a seguir-te",
"notificationType_new-chat": "Quando recebes uma mensagem numa conversa",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Quando recebes um convite para um grupo",
"notificationType_group-request-membership": "Quando alguém pede para entrar num grupo que é teu",
"notificationType_new-register": "Quando alguém é adicionado à fila de espera de registo",
diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json
index 8ea32d45f9..7599763939 100644
--- a/public/language/pt-PT/topic.json
+++ b/public/language/pt-PT/topic.json
@@ -30,6 +30,7 @@
"locked": "Bloqueado",
"pinned": "Afixado",
"moved": "Movido",
+ "moved-from": "Moved from %1",
"copy-ip": "Copiar IP",
"ban-ip": "Banir IP",
"view-history": "Histórico de Edição",
diff --git a/public/language/ro/admin/settings/email.json b/public/language/ro/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/ro/admin/settings/email.json
+++ b/public/language/ro/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/ro/admin/settings/guest.json b/public/language/ro/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/ro/admin/settings/guest.json
+++ b/public/language/ro/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/ro/flags.json b/public/language/ro/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/ro/flags.json
+++ b/public/language/ro/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json
index 10008327aa..175ee9c7e2 100644
--- a/public/language/ro/notifications.json
+++ b/public/language/ro/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index c7ecedf806..dd1844b7b4 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -30,6 +30,7 @@
"locked": "Închis",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/ru/admin/settings/email.json b/public/language/ru/admin/settings/email.json
index 805e300208..acdad4c0ed 100644
--- a/public/language/ru/admin/settings/email.json
+++ b/public/language/ru/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Этот адрес получатели писем увидят в полях «От кого» и «Ответить».",
"from": "От кого",
"from-help": "Имя отправителя письма (или название форума).",
-
+
"smtp-transport": "Сервис SMTP",
"smtp-transport.enabled": "Использовать сторонний сервис для рассылки писем",
"smtp-transport-help": "Выберите один из популярных сервисов или укажите свой почтовый сервер.",
@@ -35,5 +35,7 @@
"subscriptions": "Новостные рассылки",
"subscriptions.disable": "Отключить новостные рассылки",
"subscriptions.hour": "Час отправки",
- "subscriptions.hour-help": "Введите число, соответствующее номеру часа (например, 0 для полуночи, 17 для 17:00). Имейте в виду, что время определяется по часовому поясу сервера.
Текущее время сервера:
Следующая рассылка запланирована на "
+ "subscriptions.hour-help": "Введите число, соответствующее номеру часа (например, 0 для полуночи, 17 для 17:00). Имейте в виду, что время определяется по часовому поясу сервера.
Текущее время сервера:
Следующая рассылка запланирована на ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/ru/admin/settings/guest.json b/public/language/ru/admin/settings/guest.json
index 94d34bf6d6..4245f4eec1 100644
--- a/public/language/ru/admin/settings/guest.json
+++ b/public/language/ru/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Имена гостей",
+ "settings": "Settings",
"handles.enabled": "Разрешить гостям выбирать имена",
"handles.enabled-help": "Эта настройка добавляет поле, в котором гость сможет указать имя, под которым он хочет оставить сообщение. Когда она выключена, вместо имени будет написано просто «Гость».",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/ru/flags.json b/public/language/ru/flags.json
index d14a6d21b3..25aa9ffb02 100644
--- a/public/language/ru/flags.json
+++ b/public/language/ru/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Сообщить о недопустимом контенте",
+ "modal-title": "Report Content",
"modal-body": "Укажите причину для жалобы на %1 %2. Вы можете использовать одну из подходящих стандартных причин.",
"modal-reason-spam": "Спам",
"modal-reason-offensive": "Оскорбительное содержимое",
diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json
index 98be01de19..a8a05f48a9 100644
--- a/public/language/ru/notifications.json
+++ b/public/language/ru/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Когда сообщение было отредактировано в теме, на которую вы подписаны",
"notificationType_follow": "Когда кто-то подписался на вас",
"notificationType_new-chat": "Когда вы получаете сообщение в чат",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Когда вы получаете приглашение в группу",
"notificationType_group-request-membership": "Когда кто-то хочет присоединиться к группе, которой вы управляете",
"notificationType_new-register": "Когда в очереди на регистрацию появляется новый пользователь",
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 32c4174e35..40f5bd5934 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -30,6 +30,7 @@
"locked": "Закрыта",
"pinned": "Прикреплена",
"moved": "Перенесена",
+ "moved-from": "Moved from %1",
"copy-ip": "Копировать IP",
"ban-ip": "Забанить IP",
"view-history": "История правок",
diff --git a/public/language/rw/admin/settings/email.json b/public/language/rw/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/rw/admin/settings/email.json
+++ b/public/language/rw/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/rw/admin/settings/guest.json b/public/language/rw/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/rw/admin/settings/guest.json
+++ b/public/language/rw/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/rw/flags.json b/public/language/rw/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/rw/flags.json
+++ b/public/language/rw/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json
index 466d7cef9d..fc6ea70cf4 100644
--- a/public/language/rw/notifications.json
+++ b/public/language/rw/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json
index 4459286859..fb15f3a347 100644
--- a/public/language/rw/topic.json
+++ b/public/language/rw/topic.json
@@ -30,6 +30,7 @@
"locked": "Birafungiranye",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/sc/admin/settings/email.json b/public/language/sc/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/sc/admin/settings/email.json
+++ b/public/language/sc/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/sc/admin/settings/guest.json b/public/language/sc/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/sc/admin/settings/guest.json
+++ b/public/language/sc/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/sc/flags.json b/public/language/sc/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/sc/flags.json
+++ b/public/language/sc/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json
index e80a740a95..590e3aeb62 100644
--- a/public/language/sc/notifications.json
+++ b/public/language/sc/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index f362bdf565..9c4fd5ce6d 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -30,6 +30,7 @@
"locked": "Locked",
"pinned": "Pinned",
"moved": "Moved",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/sk/admin/settings/email.json b/public/language/sk/admin/settings/email.json
index ed440bb848..35fc262867 100644
--- a/public/language/sk/admin/settings/email.json
+++ b/public/language/sk/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Nasledujúce e-mailové adresy budú zobrazené príjemcovi v políčkach 'Od' a 'Odpovedať'.",
"from": "Meno - od",
"from-help": "Zobrazené meno v e-maily v - Od",
-
+
"smtp-transport": "Prenos SMTP",
"smtp-transport.enabled": "Pre odosielanie e-mailov použiť externý e-mailový server",
"smtp-transport-help": "Zo zoznamu môžete vybrať známe služby alebo zadať vlastné.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/sk/admin/settings/guest.json b/public/language/sk/admin/settings/guest.json
index bd342391fb..760cd59c8b 100644
--- a/public/language/sk/admin/settings/guest.json
+++ b/public/language/sk/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Zaobchádzanie s hosťami",
+ "settings": "Settings",
"handles.enabled": "Povoliť upravovanie zaobchádzania s hosťami",
"handles.enabled-help": "Táto možnosť odkryje nové pole, ktoré umožňuje hosťom vybrať meno, ktoré sa pripojí ku každému príspevku, ktorý vytvorí. Ak bude zakázané, budú jednoducho nazývaní 'Hosť'",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/sk/flags.json b/public/language/sk/flags.json
index bf24b2dfa8..f328f60e18 100644
--- a/public/language/sk/flags.json
+++ b/public/language/sk/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Nahlásiť nevhodný obsah",
+ "modal-title": "Report Content",
"modal-body": "Zadajte dôvod, pre ktorý chcete označiť %1 %2 na kontrolu. Prípadne použite jedno z tlačidiel rýchleho hlásenia, ak je to vhodné.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Urážlivý",
diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json
index 04d86ca116..ef9f509cff 100644
--- a/public/language/sk/notifications.json
+++ b/public/language/sk/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Ak Vás začne niekto sledovať",
"notificationType_new-chat": "Ak obdržíte novú správu konverzácie",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Ak obdržíte pozvanie do skupiny",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "Ak bude niekto pridaný do registračnej fronty",
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index c4c5ce68c9..d63f25d323 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -30,6 +30,7 @@
"locked": "Uzamknuté",
"pinned": "Pripnuté",
"moved": "Presunuté",
+ "moved-from": "Moved from %1",
"copy-ip": "Kopírovať IP adresu",
"ban-ip": "Zablokovať IP adresu",
"view-history": "Upraviť históriu",
diff --git a/public/language/sl/admin/settings/email.json b/public/language/sl/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/sl/admin/settings/email.json
+++ b/public/language/sl/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/sl/admin/settings/guest.json b/public/language/sl/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/sl/admin/settings/guest.json
+++ b/public/language/sl/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/sl/flags.json b/public/language/sl/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/sl/flags.json
+++ b/public/language/sl/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/sl/notifications.json b/public/language/sl/notifications.json
index 418a4db93e..9cf0a326b4 100644
--- a/public/language/sl/notifications.json
+++ b/public/language/sl/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "When someone starts following you",
"notificationType_new-chat": "When you receive a chat message",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "When you receive a group invite",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "When someone gets added to registration queue",
diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json
index 494c0e25af..3ed9160fd8 100644
--- a/public/language/sl/topic.json
+++ b/public/language/sl/topic.json
@@ -30,6 +30,7 @@
"locked": "Zaklenjeno",
"pinned": "Pripeto",
"moved": "Premaknjeno",
+ "moved-from": "Moved from %1",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"view-history": "Edit History",
diff --git a/public/language/sr/admin/settings/email.json b/public/language/sr/admin/settings/email.json
index 31274349b9..d7f907b94f 100644
--- a/public/language/sr/admin/settings/email.json
+++ b/public/language/sr/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Označena email adresa se odnosi na email koga će primalac videti \"Od\" i \"Odgovori\" poljima.",
"from": "Od koga",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Molim unesite broj koji označava satnicu kada da pošalje zakazani sažeti email (nrp. 0 za ponoć, 17 za 5:00 pm). Uzmite u obzir da će se slanje događati po satnici samog servara, i da vrlo verovatno se ne poklapa sa satnicom vašeg sistema.
Trenutno vreme servera je:
Sledeći dnevni sažeti email zakazan je za slanje u "
+ "subscriptions.hour-help": "Molim unesite broj koji označava satnicu kada da pošalje zakazani sažeti email (nrp. 0 za ponoć, 17 za 5:00 pm). Uzmite u obzir da će se slanje događati po satnici samog servara, i da vrlo verovatno se ne poklapa sa satnicom vašeg sistema.
Trenutno vreme servera je:
Sledeći dnevni sažeti email zakazan je za slanje u ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/sr/admin/settings/guest.json b/public/language/sr/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/sr/admin/settings/guest.json
+++ b/public/language/sr/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/sr/flags.json b/public/language/sr/flags.json
index f1b3b808db..3d9c10a421 100644
--- a/public/language/sr/flags.json
+++ b/public/language/sr/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Пријави неприкладан садржај",
+ "modal-title": "Report Content",
"modal-body": "Наведите разлог за означавање %1 %2 за проверу. Алтернативно, користите један од тастера за брзу пријаву ко је применљиво.",
"modal-reason-spam": "Непожељно",
"modal-reason-offensive": "Увредљиво",
diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json
index 0f1bbc6527..2431eef20e 100644
--- a/public/language/sr/notifications.json
+++ b/public/language/sr/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Када је порука уређена у теми коју надгледате",
"notificationType_follow": "Када неко почне да вас прати",
"notificationType_new-chat": "Када примите поруку за ћаскање",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Када примите позивницу за групу",
"notificationType_group-request-membership": "Када неко затражи да се придружи групи коју поседујете",
"notificationType_new-register": "Када је неко додат на чекање за регистрацију",
diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json
index e002fa1f8f..affe0651c4 100644
--- a/public/language/sr/topic.json
+++ b/public/language/sr/topic.json
@@ -30,6 +30,7 @@
"locked": "Закључано",
"pinned": "Закачено",
"moved": "Премештено",
+ "moved-from": "Moved from %1",
"copy-ip": "Копирај IP",
"ban-ip": "Бануј IP",
"view-history": "Уреди историју",
diff --git a/public/language/sv/admin/settings/email.json b/public/language/sv/admin/settings/email.json
index d2136c2ef3..8f11cd9449 100644
--- a/public/language/sv/admin/settings/email.json
+++ b/public/language/sv/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Epostsammandrag",
"subscriptions.disable": "Avaktivera epostsammandrag",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/sv/admin/settings/guest.json b/public/language/sv/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/sv/admin/settings/guest.json
+++ b/public/language/sv/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/sv/flags.json b/public/language/sv/flags.json
index c4b915ea26..4a617433ad 100644
--- a/public/language/sv/flags.json
+++ b/public/language/sv/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Rapportera opassande innehåll",
+ "modal-title": "Report Content",
"modal-body": "Vänligen ange anledningen till att du flaggar %1 %2 för granskning. Alternativt, använd en av snabbrapporteringsknapparna.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Kränkande",
diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json
index 500602ade4..14fabefc9a 100644
--- a/public/language/sv/notifications.json
+++ b/public/language/sv/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "När någon börjar följa dig",
"notificationType_new-chat": "När du får ett chattmeddelande",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "När du får en gruppinbjudan",
"notificationType_group-request-membership": "När någon ber om att få gå med i en grupp du äger",
"notificationType_new-register": "När någon läggs till i registreringskön",
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index 1e876d6a36..197d235d3e 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -30,6 +30,7 @@
"locked": "Låst",
"pinned": "Fäst",
"moved": "Flyttad",
+ "moved-from": "Moved from %1",
"copy-ip": "Kopiera IP",
"ban-ip": "Banna IP",
"view-history": "Redigera historik",
diff --git a/public/language/th/admin/settings/email.json b/public/language/th/admin/settings/email.json
index f6ade9cfc9..839fd2b6f6 100644
--- a/public/language/th/admin/settings/email.json
+++ b/public/language/th/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/th/admin/settings/guest.json b/public/language/th/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/th/admin/settings/guest.json
+++ b/public/language/th/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/th/flags.json b/public/language/th/flags.json
index eabb76398c..bddef72f81 100644
--- a/public/language/th/flags.json
+++ b/public/language/th/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "รายงานเนื้อหาไม่เหมาะสม",
+ "modal-title": "Report Content",
"modal-body": "กรุณาระเหตุผลสำหรับการปักธง %1 %2 สำหรับการรีวิว หรือไม่ก็ใช้หนึ่งในปุ่มกดรายงานด่วนถ้าเป็นไปได้",
"modal-reason-spam": "สแปม",
"modal-reason-offensive": "น่ารังเกียจ",
diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json
index 5d8b12583e..b076ad1697 100644
--- a/public/language/th/notifications.json
+++ b/public/language/th/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "เมื่อมีคนติดตามคุณ",
"notificationType_new-chat": "เมื่อคุณได้รับข้อความใหม่",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "เมื่อคุณได้รับเชิญเข้ากลุ่ม",
"notificationType_group-request-membership": "When someone requests to join a group you own",
"notificationType_new-register": "เมื่อมีคนถูกเพิ่มในคิวลงทะเบียน",
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index b66c499b54..57c29e9cf0 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -30,6 +30,7 @@
"locked": "ถูกล็อก",
"pinned": "ถูกปักหมุด",
"moved": "ถูกย้าย",
+ "moved-from": "Moved from %1",
"copy-ip": "คัดลอก IP",
"ban-ip": "แบน IP",
"view-history": "แก้ไขประวัติ",
diff --git a/public/language/tr/admin/manage/privileges.json b/public/language/tr/admin/manage/privileges.json
index 7b7ce492ce..821d8607bf 100644
--- a/public/language/tr/admin/manage/privileges.json
+++ b/public/language/tr/admin/manage/privileges.json
@@ -9,7 +9,7 @@
"upload-files": "Dosya Yükle",
"signature": "İmza",
"ban": "Ban",
- "invite": "Invite",
+ "invite": "Davet et",
"search-content": "İçerik Arama",
"search-users": "Kullanıcıları Ara",
"search-tags": "Etiketleri Ara",
diff --git a/public/language/tr/admin/menu.json b/public/language/tr/admin/menu.json
index 7069833691..7ead54cb9e 100644
--- a/public/language/tr/admin/menu.json
+++ b/public/language/tr/admin/menu.json
@@ -31,7 +31,7 @@
"settings/pagination": "Sayfalama",
"settings/tags": "Etiketler",
"settings/notifications": "Bildirimler",
- "settings/api": "API Access",
+ "settings/api": "API Erişimi",
"settings/sounds": "Sesler",
"settings/social": "Sosyal",
"settings/cookies": "Çerezler",
@@ -71,7 +71,7 @@
"logout": "Çıkış",
"view-forum": "Forumu Görüntüle",
- "search.placeholder": "Press "/" to search for settings",
+ "search.placeholder": "Ayarları aramak için "/" işaretine tıklayın",
"search.no-results": "Sonuç yok...",
"search.search-forum": "Forumda ara: ",
"search.keep-typing": "Sonuçları görmek için daha fazla yazın...",
diff --git a/public/language/tr/admin/settings/advanced.json b/public/language/tr/admin/settings/advanced.json
index 5067ca06e4..28e2766d79 100644
--- a/public/language/tr/admin/settings/advanced.json
+++ b/public/language/tr/admin/settings/advanced.json
@@ -37,7 +37,7 @@
"analytics.settings": "Analitik Ayarlar",
"analytics.max-cache": "Analytics Cache Max Value",
"analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)",
- "compression.settings": "Compression Settings",
- "compression.enable": "Enable Compression",
+ "compression.settings": "Sıkıştırma Ayarları",
+ "compression.enable": "Sıkıştırmayı Aktifleştir",
"compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes."
}
\ No newline at end of file
diff --git a/public/language/tr/admin/settings/api.json b/public/language/tr/admin/settings/api.json
index ba7d964a04..ede02cd927 100644
--- a/public/language/tr/admin/settings/api.json
+++ b/public/language/tr/admin/settings/api.json
@@ -2,11 +2,11 @@
"tokens": "Tokens",
"lead-text": "From this page you can configure access to the Write API in NodeBB.",
"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
- "docs": "Click here to access the full API specification",
+ "docs": "Tüm API özeliklerine erişmek için buraya tıklayın. ",
- "uid": "User ID",
+ "uid": "Kullanıcı ID",
"uid-help-text": "Specify a User ID to associate with this token. If the user ID is 0, it will be considered a master token, which can assume the identity of other users based on the _uid parameter",
- "description": "Description",
- "no-description": "No description specified.",
+ "description": "Açıklama",
+ "no-description": "Hiçbir açıklama belirtilmemiş.",
"token-on-save": "Token will be generated once form is saved"
}
\ No newline at end of file
diff --git a/public/language/tr/admin/settings/email.json b/public/language/tr/admin/settings/email.json
index 6dc0d4a7b6..73e7f67d21 100644
--- a/public/language/tr/admin/settings/email.json
+++ b/public/language/tr/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Özet E-postaları",
"subscriptions.disable": "Özet e-postalarını kapat",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "E-posta bildirim seçenekleri",
+ "notifications.remove-images": "Görselleri e-posta bildirimlerinden kaldır"
}
\ No newline at end of file
diff --git a/public/language/tr/admin/settings/general.json b/public/language/tr/admin/settings/general.json
index 176df64367..7b8e876149 100644
--- a/public/language/tr/admin/settings/general.json
+++ b/public/language/tr/admin/settings/general.json
@@ -27,12 +27,12 @@
"log.alt-text-placeholder": "Erişilebilirlik için alternatif metin",
"favicon": "Favicon",
"favicon.upload": "Yükle",
- "pwa": "Progressive Web App",
- "touch-icon": "Touch Icon",
+ "pwa": "İleri Web Uygulaması",
+ "touch-icon": "Dokunma Simgesi",
"touch-icon.upload": "Yükle",
- "touch-icon.help": "Recommended size and format: 512x512, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
- "maskable-icon": "Maskable (Homescreen) Icon",
- "maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
+ "touch-icon.help": "Önerilen Boyut: 512x512. Önerilen format: PNG. Simge belirtilmezse varsayılan olarak favicon kullanılır.",
+ "maskable-icon": "Maskelenebilir (Ana Ekran) Simgesi",
+ "maskable-icon.help": "Önerilen boyut ve format: 512x512, PNG formatı. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
"outgoing-links": "Harici Bağlantılar",
"outgoing-links.warning-page": "Dışarı giden bağlantılar için uyarı sayfası kullan",
"search-default-sort-by": "Aramada varsayılan sıralama",
diff --git a/public/language/tr/admin/settings/guest.json b/public/language/tr/admin/settings/guest.json
index 5b5a112576..1362b3affb 100644
--- a/public/language/tr/admin/settings/guest.json
+++ b/public/language/tr/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Ziyaretçi Kolları",
+ "settings": "Ayarlar",
"handles.enabled": "Misafir üyelere izin ver",
"handles.enabled-help": "Bu seçenek, misafirlerin yaptıkları her gönderiyle ilişkilendirebilecekleri bir isim alanı sunar. Devre dışı bırakılırsa, gönderenin ismi basitçe \"Misafir\" olarak adlandırılacaktır.",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Ziyaretçilerin konu bakış sayısını arttırmasına izin ver",
+ "reply-notifications.enabled": "Ziyaretçilerin cevap bildirimleri oluşturmasına izin ver"
}
\ No newline at end of file
diff --git a/public/language/tr/admin/settings/post.json b/public/language/tr/admin/settings/post.json
index d91fbc1cb3..3f3b6734d5 100644
--- a/public/language/tr/admin/settings/post.json
+++ b/public/language/tr/admin/settings/post.json
@@ -35,7 +35,7 @@
"timestamp.necro-threshold": "Ardışık iletiler arasında geçen gün sayısı (Necro Sınırı)",
"timestamp.necro-threshold-help": "Eğer iki ardışık ileti arasında geçen süre Necro Sınırı'ndan fazlaysa, geçen süre yazıyla belirtilecek. (Varsayılan: 7, yani bir hafta). Etkinsizleştirmek için 0 yazınız.",
"timestamp.topic-views-interval": "Increment topic views interval (in minutes)",
- "timestamp.topic-views-interval-help": "Topic views will only increment once every X minutes as defined by this setting.",
+ "timestamp.topic-views-interval-help": "Başlıkların bakış sayısı bu ayarların belirttiği her X dakikada bir güncellenecek. ",
"teaser": "Teaser İleti",
"teaser.last-post": "Son – cevap yoksa orijinal gönderi de dahil olmak üzere en son gönderiyi gösterir.",
"teaser.last-reply": "Son – cevap yoksa en son yanıtı veya \"Yanıt yok\" yertutucusunu gösterir.",
diff --git a/public/language/tr/admin/settings/user.json b/public/language/tr/admin/settings/user.json
index e6f7bbd972..e3f1c18353 100644
--- a/public/language/tr/admin/settings/user.json
+++ b/public/language/tr/admin/settings/user.json
@@ -43,9 +43,9 @@
"registration-type.disabled": "Kayıt yok",
"registration-type.help": "Normal - Kullanıcılar, kayıt sayfasından kayıt olabililrler
\nDavetiye İle - Kullanıcılar, başkalarını users sayfasından davet edebilirler.
\nYönetici Davetiyesi İle - Sadece yöneticiler başkalarını users sayfasından ve admin/manage/users sayfasından davet edebilir.
\nKayıt Yok - Yeni üye kaydı kapalı
",
"registration-approval-type.help": "Normal - Kullanıcılar hemen kaydolur.
\nYönetici Onayı - Kullanıcı kayıtları, yöneticiler tarafından onaylansın diyeapproval queue sırasına konulur.
\nIP için Yönetici Onayı - Yeni Kullanıcılar için Normal Üyelik; hali hazırda kayıtlı olan IP adresleri için Yönetici Onayı
",
- "registration-queue-auto-approve-time": "Automatic Approval Time",
- "registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
- "registration-queue-show-average-time": "Show users average time it takes to approve a new user",
+ "registration-queue-auto-approve-time": "Otomatik onaylanma süresi",
+ "registration-queue-auto-approve-time-help": "Kullanıcıların otomatik onayı için geçecek süre (saat). İptal etmek için 0 yazın.",
+ "registration-queue-show-average-time": "Kullanıcılara ortalama üyelik onaylanma süresini göster",
"registration.max-invites": "Kullanıcı Başına Maksimum Davetiye",
"max-invites": "Kullanıcı Başına Maksimum Davetiye",
"max-invites-help": "Kısıtlama olmaması için 0. Yöneticiler sınırsız davetiyeye sahiptir
\"Yalnızca Davet\" seçeneği için geçerlidir",
@@ -65,7 +65,7 @@
"restrict-chat": "Sadece takip ettiğim kişilerden sohbetleri kabul et",
"outgoing-new-tab": "Dışarı giden bağlantıları yeni sekmede aç",
"topic-search": "Konu içi aramayı etkinleştir",
- "update-url-with-post-index": "Update url with post index while browsing topics",
+ "update-url-with-post-index": "Sayfayı okurken URL bağlantısındaki ileti numarasını güncelle",
"digest-freq": "Özet e-postalarına abone ol",
"digest-freq.off": "Kapalı",
"digest-freq.daily": "Günlük",
diff --git a/public/language/tr/flags.json b/public/language/tr/flags.json
index cbf39d5d52..a7c482eaf2 100644
--- a/public/language/tr/flags.json
+++ b/public/language/tr/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "En çok artılanan",
"sort-replies": "En çok cevap verilen",
- "modal-title": "Uygunsuz İçeriği Rapor Et",
+ "modal-title": "İçeriği Şikayet Et",
"modal-body": "%1 %2 için şikayet nedenini belirtiniz. Alternatif olarak hızlı rapor butonlarından birini kullanabilirsiniz.",
"modal-reason-spam": "Gereksiz",
"modal-reason-offensive": "Saldırgan",
diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json
index 89ec68c3fb..5cdffb2295 100644
--- a/public/language/tr/groups.json
+++ b/public/language/tr/groups.json
@@ -35,8 +35,8 @@
"details.member_count": "Üye Sayısı",
"details.creation_date": "Oluşturulma Tarihi",
"details.description": "Tanımlama",
- "details.member-post-cids": "Categories to display posts from",
- "details.member-post-cids-help": "Note: Selecting no categories will assume all categories are included. Use ctrl and shift to select multiple options.",
+ "details.member-post-cids": "İletilerin gösterileceği kategoriler",
+ "details.member-post-cids-help": "Not: Hiçbir kategori belirtilmezse, tüm kategoriler dahil edilecek. Birden fazla kategori seçimi için ctrl ve shift tuşlarını kullanın. ",
"details.badge_preview": "Rozet Önizlemesi",
"details.change_icon": "İkonu Değiştir",
"details.change_label_colour": "Etiket Rengini Değiştir",
diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json
index 94b065cdf2..83132c1e14 100644
--- a/public/language/tr/notifications.json
+++ b/public/language/tr/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "Takip ettiğiniz bir konudaki bir ileti değiştirildiğinde",
"notificationType_follow": "Biri sizi takip etmeye başlayınca",
"notificationType_new-chat": "Bir sohbet mesajı aldığınızda",
+ "notificationType_new-group-chat": "Grup sohbet mesajı aldığınızda",
"notificationType_group-invite": "Bir gruba katılım davetiyesi aldığınızda",
"notificationType_group-request-membership": "Biri size ait bir gruba üye olmak istediğinde",
"notificationType_new-register": "Biri kayıt kuyruğuna eklendiğinde",
diff --git a/public/language/tr/register.json b/public/language/tr/register.json
index 6d2abcb98c..4bdfe87e1a 100644
--- a/public/language/tr/register.json
+++ b/public/language/tr/register.json
@@ -18,8 +18,8 @@
"agree_to_terms_of_use": "Kullanım Şartlarını Kabul Ediyorum",
"terms_of_use_error": "Kullanım Şartlarını Kabul Etmeniz Gerekiyor",
"registration-added-to-queue": "Kayıt olma isteğiniz kabul listesine eklenmiştir. Yönetici tarafından kabul edildiğinizde e-posta alacaksınız.",
- "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
- "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
+ "registration-queue-average-time": "Üyelik onayı için bekleyeceğiniz ortalama süre: %1 saat %2 dakika.",
+ "registration-queue-auto-approve-time": "Forum üyeliğiniz %1 saat içerisinde tamamen aktifleştirilecektir. ",
"interstitial.intro": "Hesabınızı yaratmadan önce bazı ekstra bilgiler gerekiyor.",
"interstitial.errors-found": "Kaydınız tamamlanamadı:",
"gdpr_agree_data": "Bu web sitesinde kişisel bilgilerimin toplanmasını ve işlenmesini kabul ediyorum.",
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index 0060b36557..cb7a6e3cff 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -30,6 +30,7 @@
"locked": "Kilitli",
"pinned": "Sabitlendi",
"moved": "Taşındı",
+ "moved-from": "Şuradan taşındı: %1",
"copy-ip": "IP Kopyala",
"ban-ip": "IP Yasakla",
"view-history": "Geçmişi Düzenle",
diff --git a/public/language/tr/user.json b/public/language/tr/user.json
index 603932d150..73cc7d081e 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -123,7 +123,7 @@
"open_links_in_new_tab": "Dışarı giden bağlantıları yeni sekmede aç",
"enable_topic_searching": "Konu içi aramayı aktive et",
"topic_search_help": "Aktive edilirse, konu içi arama tarayıcının normal arama davranışını değiştirerek tüm konuyu aramanızı sağlar",
- "update_url_with_post_index": "Update url with post index while browsing topics",
+ "update_url_with_post_index": "Sayfayı okurken URL bağlantısındaki ileti numarasını güncelle",
"scroll_to_my_post": "Cevap yazdıktan sonra yeni iletiyi göster",
"follow_topics_you_reply_to": "Cevap verdiğim başlıkları takip et",
"follow_topics_you_create": "Oluşturduğum başlıkları takip et",
diff --git a/public/language/tr/users.json b/public/language/tr/users.json
index 40bd09047e..fb539f9bdf 100644
--- a/public/language/tr/users.json
+++ b/public/language/tr/users.json
@@ -11,7 +11,7 @@
"online-only": "Sadece çevrimiçi",
"invite": "Davet et",
"prompt-email": "Eposta:",
- "groups-to-join": "Groups to be joined when invite is accepted:",
+ "groups-to-join": "Davet kabul edildiğinde katılacağınız gruplar:",
"invitation-email-sent": "%1'e bir davet e-posta'sı gönderildi",
"user_list": "Kullanıcı Listesi",
"recent_topics": "Güncel Konular",
diff --git a/public/language/uk/admin/settings/email.json b/public/language/uk/admin/settings/email.json
index bd74d9d519..e8171e17e0 100644
--- a/public/language/uk/admin/settings/email.json
+++ b/public/language/uk/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "Отримувачі будуть бачити цю адресу в полях \"From\" та \"Reply To\".",
"from": "Ім'я відправника",
"from-help": "Ім'я відправника, що буде показано в електронних листах",
-
+
"smtp-transport": "Протокол SMTP",
"smtp-transport.enabled": "Використовувати зовнішній поштовий сервер для відправлення повідомлень",
"smtp-transport-help": "Ви можете обрати поштовий сервіс зі списку або використати ваш власний сервіс.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Година дайджесту",
- "subscriptions.hour-help": "Вкажіть, будь ласка, годину о котрій кожного дня буде надсилатися дайджест (наприклад 0 — це північ, а 17 — п'ята година вечора). Зверніть увагу, що година визначається згідно налаштувань сервера і може не співпадати з часом вашого комп'ютера.
Приблизний час сервера:
Наступний дайджест заплановано до відправки "
+ "subscriptions.hour-help": "Вкажіть, будь ласка, годину о котрій кожного дня буде надсилатися дайджест (наприклад 0 — це північ, а 17 — п'ята година вечора). Зверніть увагу, що година визначається згідно налаштувань сервера і може не співпадати з часом вашого комп'ютера.
Приблизний час сервера:
Наступний дайджест заплановано до відправки ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/uk/admin/settings/guest.json b/public/language/uk/admin/settings/guest.json
index 8d54dcfa67..1e439e53a6 100644
--- a/public/language/uk/admin/settings/guest.json
+++ b/public/language/uk/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Гостьові імена",
+ "settings": "Settings",
"handles.enabled": "Дозволити гостьові імена",
"handles.enabled-help": "Ця опція надає додаткове поле, що дозволяє гостям обрати собі ім'я для кожного посту. Якщо вимкнено, вони будуть просто зватися \"Гість\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/uk/notifications.json b/public/language/uk/notifications.json
index eef2ab42a1..7656fcbb5e 100644
--- a/public/language/uk/notifications.json
+++ b/public/language/uk/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Коли хтось починає слідкувати за вами",
"notificationType_new-chat": "Коли ви отримуєте повідомлення чату",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Коли ви отримуєте запрошення до групи",
"notificationType_group-request-membership": "Коли хтось подає запит на приєднання до групи, якою ви володієте",
"notificationType_new-register": "Коли когось додано до черги на реєстрацію",
diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json
index 6176fa87ba..bc5f78287f 100644
--- a/public/language/uk/topic.json
+++ b/public/language/uk/topic.json
@@ -30,6 +30,7 @@
"locked": "Заблокована",
"pinned": "Закріплена",
"moved": "Переміщена",
+ "moved-from": "Moved from %1",
"copy-ip": "Копіювати IP",
"ban-ip": "Заблокувати IP",
"view-history": "Редагувати історію",
diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json
index 8b127a6afc..26481a209a 100644
--- a/public/language/vi/admin/settings/email.json
+++ b/public/language/vi/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
"from": "From Name",
"from-help": "The from name to display in the email.",
-
+
"smtp-transport": "SMTP Transport",
"smtp-transport.enabled": "Use an external email server to send emails",
"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
"subscriptions": "Email Digests",
"subscriptions.disable": "Disable email digests",
"subscriptions.hour": "Digest Hour",
- "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent "
+ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/vi/admin/settings/guest.json b/public/language/vi/admin/settings/guest.json
index 3ba81aa778..75d44f37e4 100644
--- a/public/language/vi/admin/settings/guest.json
+++ b/public/language/vi/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "Guest Handles",
+ "settings": "Settings",
"handles.enabled": "Allow guest handles",
"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/vi/flags.json b/public/language/vi/flags.json
index 10698842cc..13b3567bc9 100644
--- a/public/language/vi/flags.json
+++ b/public/language/vi/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "Report Inappropriate Content",
+ "modal-title": "Report Content",
"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
"modal-reason-spam": "Spam",
"modal-reason-offensive": "Offensive",
diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json
index cbc6e98906..2f1a7e6048 100644
--- a/public/language/vi/notifications.json
+++ b/public/language/vi/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "When a post is edited in a topic you are watching",
"notificationType_follow": "Khi ai đó theo dõi bạn",
"notificationType_new-chat": "Khi bạn nhận được thông điệp chat",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "Khi bạn nhận được lời mời gia nhập nhóm",
"notificationType_group-request-membership": "Khi ai đó yêu cầu tham gia một nhóm bạn sở hữu",
"notificationType_new-register": "Khi ai đó được thêm vào lượt chờ đăng ký",
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index 0fc45e0e13..65998bedc5 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -30,6 +30,7 @@
"locked": "Khóa",
"pinned": "Đã ghim",
"moved": "Chuyển đi",
+ "moved-from": "Moved from %1",
"copy-ip": "Sao chép IP",
"ban-ip": "Cấm IP",
"view-history": "Lịch sử chỉnh sửa",
diff --git a/public/language/zh-CN/admin/settings/email.json b/public/language/zh-CN/admin/settings/email.json
index a465b8900c..64b034879c 100644
--- a/public/language/zh-CN/admin/settings/email.json
+++ b/public/language/zh-CN/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "下面的电子邮件地址代表收件人在“发件人”和“回复”中所看到的地址。",
"from": "发送者",
"from-help": "用于邮件中显示的发送者",
-
+
"smtp-transport": "SMTP 通信",
"smtp-transport.enabled": "使用一个外部电子邮箱系统来发送邮件",
"smtp-transport-help": "您可以从列表中选取一个已知的服务或自定义。",
@@ -35,5 +35,7 @@
"subscriptions": "电子邮件摘要",
"subscriptions.disable": "禁用电子邮件摘要",
"subscriptions.hour": "摘要小时",
- "subscriptions.hour-help": "请输入一个代表小时的数字来发送计划的电子邮件摘要 (例如，对于午夜，0，对于下午5:00，17)。 请记住，这是根据服务器本身的时间，可能与您的系统时钟不完全匹配。
服务器的大致时间为：
下一个每日摘要被计划在发送"
+ "subscriptions.hour-help": "请输入一个代表小时的数字来发送计划的电子邮件摘要 (例如，对于午夜，0，对于下午5:00，17)。 请记住，这是根据服务器本身的时间，可能与您的系统时钟不完全匹配。
服务器的大致时间为：
下一个每日摘要被计划在发送",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/zh-CN/admin/settings/guest.json b/public/language/zh-CN/admin/settings/guest.json
index d4c98c2b26..725beaf2d1 100644
--- a/public/language/zh-CN/admin/settings/guest.json
+++ b/public/language/zh-CN/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "游客用户名",
+ "settings": "Settings",
"handles.enabled": "允许游客用户名",
"handles.enabled-help": "这个选项将允许游客使用一个额外的输入框来设置发帖时的用户名，如果被禁用，仅会统一显示为“游客”",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/zh-CN/flags.json b/public/language/zh-CN/flags.json
index 99cd14b5c7..dbcc5dba94 100644
--- a/public/language/zh-CN/flags.json
+++ b/public/language/zh-CN/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "最多顶",
"sort-replies": "最多回复",
- "modal-title": "举报不适内容",
+ "modal-title": "Report Content",
"modal-body": "请选择或者输入您举报 %1%2 的原因以便版主进行审核。",
"modal-reason-spam": "垃圾信息",
"modal-reason-offensive": "人身攻击",
diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json
index 59ab9764a2..45bc43c3b2 100644
--- a/public/language/zh-CN/notifications.json
+++ b/public/language/zh-CN/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "当您关注的主题有帖子被编辑时",
"notificationType_follow": "当有人关注您时",
"notificationType_new-chat": "当您收到聊天消息时",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "当您收到群组邀请时",
"notificationType_group-request-membership": "当有人请求加入您拥有的用户组时",
"notificationType_new-register": "当有人被添加到申请队列时",
diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json
index 0effe4205f..fccddf200c 100644
--- a/public/language/zh-CN/topic.json
+++ b/public/language/zh-CN/topic.json
@@ -30,6 +30,7 @@
"locked": "已锁定",
"pinned": "已固定",
"moved": "已移动",
+ "moved-from": "Moved from %1",
"copy-ip": "复制IP",
"ban-ip": "封禁IP",
"view-history": "编辑历史",
diff --git a/public/language/zh-TW/admin/settings/email.json b/public/language/zh-TW/admin/settings/email.json
index 43eb05afe9..987aef7c09 100644
--- a/public/language/zh-TW/admin/settings/email.json
+++ b/public/language/zh-TW/admin/settings/email.json
@@ -4,7 +4,7 @@
"address-help": "下面的電子郵件地址代表收件人在“發送人”和“回覆”中所看到的地址。",
"from": "發送人",
"from-help": "用於郵件中顯示的發送人",
-
+
"smtp-transport": "SMTP 通信",
"smtp-transport.enabled": "使用一個外部電子郵件系統來發送郵件",
"smtp-transport-help": "您可以從列表中選取一個已知的服務或自訂。",
@@ -35,5 +35,7 @@
"subscriptions": "電子郵件摘要",
"subscriptions.disable": "禁用電子郵件摘要",
"subscriptions.hour": "摘要小時",
- "subscriptions.hour-help": "請輸入一個代表小時的數字來發送排程的電子郵件摘要 (例如，對於午夜，0，對於下午5:00，17)。 請記住，這是根據伺服器本身的時間，可能與您的系統時鐘不完全符合。
伺服器的大致時間為：
下一個每日摘要被排程在發送"
+ "subscriptions.hour-help": "請輸入一個代表小時的數字來發送排程的電子郵件摘要 (例如，對於午夜，0，對於下午5:00，17)。 請記住，這是根據伺服器本身的時間，可能與您的系統時鐘不完全符合。
伺服器的大致時間為：
下一個每日摘要被排程在發送",
+ "notifications.settings": "Email notification settings",
+ "notifications.remove-images": "Remove images from email notifications"
}
\ No newline at end of file
diff --git a/public/language/zh-TW/admin/settings/guest.json b/public/language/zh-TW/admin/settings/guest.json
index 777b254aaf..a46b34a3f9 100644
--- a/public/language/zh-TW/admin/settings/guest.json
+++ b/public/language/zh-TW/admin/settings/guest.json
@@ -1,7 +1,7 @@
{
- "handles": "訪客使用者名",
+ "settings": "Settings",
"handles.enabled": "允許訪客使用者名",
"handles.enabled-help": "這個選項將允許訪客使用一個額外的輸入框來設置發文時的使用者名，如果被禁用，僅會統一顯示為“訪客”",
- "topic-views": "Topic views",
- "topic-views.enabled": "Allow guests to increase topic view counts"
+ "topic-views.enabled": "Allow guests to increase topic view counts",
+ "reply-notifications.enabled": "Allow guests to generate reply notifications"
}
\ No newline at end of file
diff --git a/public/language/zh-TW/flags.json b/public/language/zh-TW/flags.json
index 0b0fa9c3d3..883891eda6 100644
--- a/public/language/zh-TW/flags.json
+++ b/public/language/zh-TW/flags.json
@@ -67,7 +67,7 @@
"sort-upvotes": "Most upvotes",
"sort-replies": "Most replies",
- "modal-title": "舉報不適內容",
+ "modal-title": "Report Content",
"modal-body": "請選擇或者輸入您舉報 %1%2 的原因以便版主進行審核。",
"modal-reason-spam": "垃圾訊息",
"modal-reason-offensive": "人身攻擊",
diff --git a/public/language/zh-TW/notifications.json b/public/language/zh-TW/notifications.json
index 129454c339..9a982f8970 100644
--- a/public/language/zh-TW/notifications.json
+++ b/public/language/zh-TW/notifications.json
@@ -60,6 +60,7 @@
"notificationType_post-edit": "當您關注中的主題有貼文被編輯時",
"notificationType_follow": "當有人追隨您時",
"notificationType_new-chat": "當您收到聊天訊息時",
+ "notificationType_new-group-chat": "When you receive a group chat message",
"notificationType_group-invite": "當您收到群組邀請時",
"notificationType_group-request-membership": "當有人請求加入您擁有的群組時",
"notificationType_new-register": "當有註冊申請待審核時",
diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json
index b4defa47a0..b50e287032 100644
--- a/public/language/zh-TW/topic.json
+++ b/public/language/zh-TW/topic.json
@@ -30,6 +30,7 @@
"locked": "已鎖定",
"pinned": "已置頂",
"moved": "已移動",
+ "moved-from": "Moved from %1",
"copy-ip": "複製IP",
"ban-ip": "禁用IP",
"view-history": "編輯歷史",