diff --git a/public/language/ar/admin/settings/advanced.json b/public/language/ar/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/ar/admin/settings/advanced.json +++ b/public/language/ar/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/ar/global.json b/public/language/ar/global.json index ec720be881..58c7953fa0 100644 --- a/public/language/ar/global.json +++ b/public/language/ar/global.json @@ -30,6 +30,7 @@ "header.unread": "غير مقروء", "header.tags": "وسم", "header.popular": "الأكثر شهرة", + "header.top": "Top", "header.users": "المستخدمين", "header.groups": "المجموعات", "header.chats": "المحادثات", diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index f804cb85d6..2cae87b648 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "1% مشاركة محددة", "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "أدخل عنوان موضوعك هنا...", diff --git a/public/language/bg/admin/settings/advanced.json b/public/language/bg/admin/settings/advanced.json index 1c26c4ff3a..ead42606c1 100644 --- a/public/language/bg/admin/settings/advanced.json +++ b/public/language/bg/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Позволяване на предварителното зареждане на заглавката на HSTS", "hsts.help": "Ако това е включено, за този уеб ще бъде настроена заглавка за HSTS. Можете да изберете дали да включите поддомейните и дали за заредите предварително флаговете в заглавката си. Ако не знаете какво да направите, най-добре не избирайте нищо. Още информация", "traffic-management": "Управление на трафика", - "traffic.help": "NodeBB има вграден модул, който автоматично отказва заявките в натоварените моменти. Можете да настроите поведението тук, въпреки че стойностите по подразбиране са добра отправна точка.", + "traffic.help": "NodeBB използва модул, който автоматично отказва заявките в натоварените моменти. Можете да настроите поведението тук, въпреки че стойностите по подразбиране са добра отправна точка.", "traffic.enable": "Включване на управлението на трафика", "traffic.event-lag": "Граница на забавяне в цикъла на събитията (в милисекунди)", "traffic.event-lag-help": "Намаляването на тази стойност ще намали времето за изчакване при зареждане на страници, но също така ще предизвика по-често показване на съобщението „прекомерно натоварване“ на повече потребители. (Нужно е рестартиране.)", diff --git a/public/language/bg/global.json b/public/language/bg/global.json index dda8081b53..5eefce34e9 100644 --- a/public/language/bg/global.json +++ b/public/language/bg/global.json @@ -30,6 +30,7 @@ "header.unread": "Непрочетени", "header.tags": "Етикети", "header.popular": "Популярни", + "header.top": "Най-харесвани", "header.users": "Потребители", "header.groups": "Групи", "header.chats": "Разговори", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index 4820d8052e..35774bd54f 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "Избрани публикации: %1", "fork_success": "Темата е разделена успешно! Натиснете тук, за да преминете към отделената тема.", "delete_posts_instruction": "Натиснете публикациите, които искате да изтриете/изчистите", - "merge_topics_instruction": "Натиснете темите, които искате да слеете", + "merge_topics_instruction": "Щракнете върху темите, които искате да слеете, или ги потърсете", + "merge-topic-list-title": "Списък от темите, които ще бъдат слети", + "merge-options": "Настройки за сливането", + "merge-select-main-topic": "Изберете основната тема", + "merge-new-title-for-topic": "Ново заглавие за темата", "move_posts_instruction": "Натиснете публикациите, които искате да преместите", "change_owner_instruction": "Натиснете публикациите, които искате да прехвърлите на друг потребител", "composer.title_placeholder": "Въведете заглавието на темата си тук...", diff --git a/public/language/bn/admin/settings/advanced.json b/public/language/bn/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/bn/admin/settings/advanced.json +++ b/public/language/bn/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/bn/global.json b/public/language/bn/global.json index 3a817ce3cb..7b996ce062 100644 --- a/public/language/bn/global.json +++ b/public/language/bn/global.json @@ -30,6 +30,7 @@ "header.unread": "অপঠিত", "header.tags": "ট্যাগ", "header.popular": "জনপ্রিয়", + "header.top": "Top", "header.users": "ব্যবহারকারীগণ", "header.groups": "Groups", "header.chats": "কথোপকথন", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index 0c7c6d77a7..e347e02bc1 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "টপিক ফর্ক করা হয়েছে। ফর্ক করা টপিকে যেতে এখানে ক্লিক করুন", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "আপনার টপিকের শিরোনাম দিন", diff --git a/public/language/cs/admin/settings/advanced.json b/public/language/cs/admin/settings/advanced.json index 9163e47cfb..c6b43d5afc 100644 --- a/public/language/cs/admin/settings/advanced.json +++ b/public/language/cs/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Povolit před-načtení hlavičky HSTS", "hsts.help": "Je-li povoleno, bude nastavena pro tyto stránky hlavička HSTS . Můžete si v hlavičce zvolit zahrnutí i poddomén a přednastavených příznaků. Nejste-li si jist/a, ponechte nezaškrtnutéVíce informací ", "traffic-management": "Správa provozu", - "traffic.help": "NodeBB obsahuje modul, který automaticky zamítá požadavky při vysokém vytížení. Toto nastavení můžete zde upravit, ačkoliv výchozí hodnoty jsou zaručením úspěchu.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Povolit správu provozu", "traffic.event-lag": "Hranice prodlevy smyčky události (v milisekundách)", "traffic.event-lag-help": "Snížení této hodnoty sníží čas pro načtení stránky, ale taky zobrazí více uživatelům zprávu o „přetížení stránek”. (je vyžadován restart)", diff --git a/public/language/cs/global.json b/public/language/cs/global.json index e5a1fe3946..e1a8ca0751 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -30,6 +30,7 @@ "header.unread": "Nepřečtené", "header.tags": "Značky", "header.popular": "Populární", + "header.top": "Top", "header.users": "Uživatelé", "header.groups": "Skupiny", "header.chats": "Chaty", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 39aec20a52..b77f694bc1 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "Vybráno %1 příspěvek/ů", "fork_success": "Téma úspěšně rozděleno. Pro přejití na rozdělené téma, zde klikněte.", "delete_posts_instruction": "Klikněte na příspěvek, který chcete odstranit/vyčistit", - "merge_topics_instruction": "Pro sloučení témat, klikněte na ně", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Klikněte na příspěvek/y, který chcete přesunout", "change_owner_instruction": "Klikněte na příspěvek u kterého chcete změnit vlastníka", "composer.title_placeholder": "Zadejte název tématu…", diff --git a/public/language/da/admin/settings/advanced.json b/public/language/da/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/da/admin/settings/advanced.json +++ b/public/language/da/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/da/global.json b/public/language/da/global.json index bf94638863..d3f54710bd 100644 --- a/public/language/da/global.json +++ b/public/language/da/global.json @@ -30,6 +30,7 @@ "header.unread": "Ulæst", "header.tags": "Etiket", "header.popular": "Populære", + "header.top": "Top", "header.users": "Bruger", "header.groups": "Grupper", "header.chats": "Chats", diff --git a/public/language/da/topic.json b/public/language/da/topic.json index 92e673c9f2..ff02404fff 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Tråden blev fraskilt! Klik her for at gå til den fraskilte tråd.", "delete_posts_instruction": "Klik på de indlæg du vil slette/rense", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Angiv din trådtittel her ...", diff --git a/public/language/de/admin/settings/advanced.json b/public/language/de/admin/settings/advanced.json index 1894b4b867..94c09d885d 100644 --- a/public/language/de/admin/settings/advanced.json +++ b/public/language/de/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Vorabladen von HSTS Header erlauben", "hsts.help": "Wenn aktiviert, wird ein HSTS-Header für diese Seite gesetzt. Du kannst wählen, ob du Subdomains und Preloading-Flags in deinen Header aufnehmen möchtest. Im Zweifelsfall kannst du diese unmarkiert lassen.", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB wird mit einem Modul geliefert, welches automatisch anfragen in High-Traffic Situationen blockiert. Du kannst diese Einstellungen hier ändern, auch wenn die Standardeinstellungen einen guten Anfang darstellen sollten", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Traffic Management aktivieren", "traffic.event-lag": "Eventschleifenverzögerungsschwelle (in Millisekunden)", "traffic.event-lag-help": "Das Heruntersetzen dieses Werts reduziert die Ladezeiten, aber wird auch dafür sorgen, dass die \"Übermäßige Belastung\" nachricht öfter angezeigt wird. (Neustart erforderlich)", diff --git a/public/language/de/global.json b/public/language/de/global.json index 0a43bb9b50..2085e0a22a 100644 --- a/public/language/de/global.json +++ b/public/language/de/global.json @@ -30,6 +30,7 @@ "header.unread": "Ungelesen", "header.tags": "Tags", "header.popular": "Beliebt", + "header.top": "Top", "header.users": "Benutzer", "header.groups": "Gruppen", "header.chats": "Chats", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 625591ad4a..ded786d03e 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 Beiträge ausgewählt", "fork_success": "Thema erfolgreich aufgespalten! Klicke hier, um zum abgespaltenen Thema zu gelangen.", "delete_posts_instruction": "Wähle die zu löschenden Beiträge aus", - "merge_topics_instruction": "Wähle die Themen aus, die du vereinen möchtest", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Klicke auf die Beiträge, die du verschieben möchstest.", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Hier den Titel des Themas eingeben...", diff --git a/public/language/el/admin/settings/advanced.json b/public/language/el/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/el/admin/settings/advanced.json +++ b/public/language/el/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/el/global.json b/public/language/el/global.json index 37e6c52b89..bf1d9e4dad 100644 --- a/public/language/el/global.json +++ b/public/language/el/global.json @@ -30,6 +30,7 @@ "header.unread": "Μη αναγνωσμένα", "header.tags": "Ετικέτες", "header.popular": "Δημοφιλή", + "header.top": "Top", "header.users": "Χρήστες", "header.groups": "Ομάδες", "header.chats": "Συνομιλίες", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index 115cff610f..ef903a7e48 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Εισαγωγή του τίτλου του θέματος εδώ...", diff --git a/public/language/en-US/admin/settings/advanced.json b/public/language/en-US/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/en-US/admin/settings/advanced.json +++ b/public/language/en-US/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/en-x-pirate/admin/settings/advanced.json b/public/language/en-x-pirate/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/en-x-pirate/admin/settings/advanced.json +++ b/public/language/en-x-pirate/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/en-x-pirate/global.json b/public/language/en-x-pirate/global.json index 3967c948cd..4709a0dfe9 100644 --- a/public/language/en-x-pirate/global.json +++ b/public/language/en-x-pirate/global.json @@ -30,6 +30,7 @@ "header.unread": "Undiscovered", "header.tags": "Tags", "header.popular": "Famous", + "header.top": "Top", "header.users": "Mates", "header.groups": "Groups", "header.chats": "Yik-Yaks", diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index 100027b6eb..d9a3ba9251 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Enter your topic title here...", diff --git a/public/language/es/admin/settings/advanced.json b/public/language/es/admin/settings/advanced.json index 2d8c42238d..435eb5c98f 100644 --- a/public/language/es/admin/settings/advanced.json +++ b/public/language/es/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Administración de Tráfico", - "traffic.help": "NodeBB se despliega equipado con un módulo que deniega automáticamente requests de HTTP en situaciones de tráfico alto. Puedes ajustar esta configuración aquí, aunque los valores por defecto son un punto de partida aceptable.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Habilitar Administración de Tráfico", "traffic.event-lag": "Límite de Lag para el Event Loop (en milisegundos)", "traffic.event-lag-help": "Bajar este valor disminuye los tiempos de espera para cargas de página, pero también mostrará el mensaje \"carga excesiva\" a mas usuarios. (Se requiere Reiniciar)", diff --git a/public/language/es/global.json b/public/language/es/global.json index 65fa6fa6ed..0b34dfd95e 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -30,6 +30,7 @@ "header.unread": "No leídos", "header.tags": "Etiquetas", "header.popular": "Popular", + "header.top": "Top", "header.users": "Usuarios", "header.groups": "Grupos", "header.chats": "Chats", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index e75e8e4d8e..c379d5b1c9 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 mensaje(s) seleccionados", "fork_success": "¡Se ha creado un nuevo tema a partir del original! Haz click aquí para ir al nuevo tema.", "delete_posts_instruction": "Haz click en los mensajes que quieres eliminar/limpiar", - "merge_topics_instruction": "Selecciona los temas que quieres fusionar", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Pulsa en los posts que quieras mover", "change_owner_instruction": "Haz click en los mensajes que quieres asignar a otro usuario", "composer.title_placeholder": "Ingresa el título de tu tema...", diff --git a/public/language/et/admin/settings/advanced.json b/public/language/et/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/et/admin/settings/advanced.json +++ b/public/language/et/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/et/global.json b/public/language/et/global.json index e8347b2dae..12ed7c392a 100644 --- a/public/language/et/global.json +++ b/public/language/et/global.json @@ -30,6 +30,7 @@ "header.unread": "Lugemata", "header.tags": "Märksõnad", "header.popular": "Populaarne", + "header.top": "Top", "header.users": "Kasutajad", "header.groups": "Grupid", "header.chats": "Vestlused", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index c8acd6777d..06ec75cf7f 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 postitus(t) valitud", "fork_success": "Edukalt ''forkisid'' teema! Vajuta siia, et vaadata loodud teemat.", "delete_posts_instruction": "Klikka postitustel, mida tahad kustutada/puhastada", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Sisesta teema pealkiri siia...", diff --git a/public/language/fa-IR/admin/settings/advanced.json b/public/language/fa-IR/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/fa-IR/admin/settings/advanced.json +++ b/public/language/fa-IR/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/fa-IR/global.json b/public/language/fa-IR/global.json index 36d3f7eb4e..610f2547e9 100644 --- a/public/language/fa-IR/global.json +++ b/public/language/fa-IR/global.json @@ -30,6 +30,7 @@ "header.unread": "نخوانده‌ها", "header.tags": "برچسب‌ها", "header.popular": "دوست‌داشتنی‌ها", + "header.top": "Top", "header.users": "کاربران", "header.groups": "گروه‌ها", "header.chats": "چتها", diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index 453d9ccae2..7fe8080bf9 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 پست (ها) انتخاب شده اند", "fork_success": "موضوع با موفقیت منشعب شد! برای رفتن به موضوع انشعابی اینجا را کلیک کنید.", "delete_posts_instruction": "با کلیک بر روی پست شما می خواهید به حذف/پاکسازی", - "merge_topics_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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "بر روی پستی که می خواهید انتقال دهید کلیک کنید", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "عنوان موضوعتان را اینجا بنویسید...", diff --git a/public/language/fi/admin/settings/advanced.json b/public/language/fi/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/fi/admin/settings/advanced.json +++ b/public/language/fi/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/fi/global.json b/public/language/fi/global.json index 1a60ea6e35..4a9a7eb9cc 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -30,6 +30,7 @@ "header.unread": "Lukemattomat", "header.tags": "Tagit", "header.popular": "Suositut", + "header.top": "Top", "header.users": "Käyttäjät", "header.groups": "Ryhmät", "header.chats": "Keskustelut", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index 2c3a89d3cc..8b84a7e264 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 viesti(ä) valittuna", "fork_success": "Aihe eriytetty onnistuneesti! Klikkaa täältä mennäkseksi uuteen aiheeseen.", "delete_posts_instruction": "Valitse viestit jotka haluat poistaa (pysyvästi)", - "merge_topics_instruction": "Valitse viestit jotka haluat sulauttaa", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Valitse viestit jotka haluat siirtää", "change_owner_instruction": "Valitse viestit jotka haluat siirtää toiselle henkilölle", "composer.title_placeholder": "Syötä aiheesi otsikko tähän...", diff --git a/public/language/fr/admin/advanced/events.json b/public/language/fr/admin/advanced/events.json index fa4f325571..6e7c591e35 100644 --- a/public/language/fr/admin/advanced/events.json +++ b/public/language/fr/admin/advanced/events.json @@ -2,7 +2,7 @@ "events": "Évènements", "no-events": "Il n'y a aucun évènement.", "control-panel": "Panneau de contrôle des évènements", - "delete-events": "Delete Events", + "delete-events": "Supprimer les évènements", "filters": "Filtres", "filters-apply": "Appliquer", "filter-type": "Évènements", diff --git a/public/language/fr/admin/manage/privileges.json b/public/language/fr/admin/manage/privileges.json index 2b53114218..40de7906aa 100644 --- a/public/language/fr/admin/manage/privileges.json +++ b/public/language/fr/admin/manage/privileges.json @@ -34,9 +34,9 @@ "purge": "Purger", "moderate": "Modérer", - "admin-dashboard": "Dashboard", - "admin-categories": "Categories", - "admin-privileges": "Privileges", - "admin-users": "Users", - "admin-settings": "Settings" + "admin-dashboard": "Tableau de bord", + "admin-categories": "Catégories", + "admin-privileges": "Privilèges", + "admin-users": "Utilisateurs", + "admin-settings": "Paramètres" } \ No newline at end of file diff --git a/public/language/fr/admin/manage/users.json b/public/language/fr/admin/manage/users.json index 59e69434e4..108860c8c0 100644 --- a/public/language/fr/admin/manage/users.json +++ b/public/language/fr/admin/manage/users.json @@ -12,9 +12,9 @@ "unban": "Dé-bannir le(s) utilisateur(s)", "reset-lockout": "Supprimer le blocage", "reset-flags": "Supprimer les signalements", - "delete": "Delete User(s)", - "delete-content": "Delete User(s) Content", - "purge": "Delete User(s) and Content", + "delete": "Supprimer le(s) utilisateur(s)", + "delete-content": "Supprimer le contenu du compte", + "purge": "Supprimer le(s) compte(s) et le contenu", "download-csv": "Télécharger au format CSV", "manage-groups": "Gérer les groupes", "add-group": "Ajouter un groupe", @@ -94,11 +94,11 @@ "alerts.validate-email-success": "Adresse e-mail vérifiée", "alerts.validate-force-password-reset-success": "Les mots de passe des utilisateurs ont été réinitialisés et leurs sessions existantes ont été révoquées.", "alerts.password-reset-confirm": "Voulez-vous réellement envoyer un e-mail de réinitialisation de mot de passe à ces utilisateurs ?", - "alerts.confirm-delete": "Warning!

Do you really want to delete user(s)?

This action is not reversible! Only the user account will be deleted, their posts and topics will remain.

", + "alerts.confirm-delete": "Attention !

Voulez-vous réellement supprimer le(s) utilisateur(s) ?

Cette action est irréversible ! Toutes les données de ces utilisateurs seront effacées !

", "alerts.delete-success": "Utilisateur(s) supprimé(s) !", - "alerts.confirm-delete-content": "Warning!

Do you really want to delete these user(s) content?

This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.

", - "alerts.delete-content-success": "User(s) Content Deleted!", - "alerts.confirm-purge": "Warning!

Do you really want to delete user(s) and their content?

This action is not reversible! All user data and content will be erased!

", + "alerts.confirm-delete-content": "Attention !

Voulez-vous réellement supprimer le contenu de ces utilisateurs ?

Cette action est irréversible ! Toutes les données de ces utilisateurs seront effacées !

", + "alerts.delete-content-success": "Contenu utilisateur(s) supprimé(s) !", + "alerts.confirm-purge": "Attention !

Voulez-vous réellement supprimer ces utilisateurs ainsi que leurs contenus ?

Cette action est irréversible ! Toutes les données de ces utilisateurs seront effacées !

", "alerts.create": "Créer un utilisateur", "alerts.button-create": "Créer", "alerts.button-cancel": "Annuler", diff --git a/public/language/fr/admin/settings/advanced.json b/public/language/fr/admin/settings/advanced.json index 85f98335ed..1ab128efd8 100644 --- a/public/language/fr/admin/settings/advanced.json +++ b/public/language/fr/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Autoriser le préchargement de l'en-tête HSTS", "hsts.help": "Si activé, un en-tête HSTS sera défini pour ce site. Vous pouvez choisir d'inclure des sous-domaines et des indicateurs de préchargement dans votre en-tête. En cas de doute, ne cochez pas l'option. Plus d'informations", "traffic-management": "Gestion du trafic", - "traffic.help": "NodeBB est déployé équipé d'un module qui refuse les requêtes en cas de situation de haut traffic. Vous pouvez changer les paramètres ici, bien que les paramètres par défaut sont un bon commencement.", + "traffic.help": "NodeBB utilise un module qui refuse automatiquement les demandes dans les situations de fort trafic. Vous pouvez régler ces paramètres ici, bien que les valeurs par défaut soient un bon point de départ.", "traffic.enable": "Activé la gestion du trafic", "traffic.event-lag": "Seuil de lag des boucles d'événements (en millisecondes) ", "traffic.event-lag-help": "Descendre cette valeur réduit le temps d'attente pour le chargement de s pages, mais montrera le message \"charge excessive\" à plus d'utilisateurs. (redémarrage requis)", diff --git a/public/language/fr/global.json b/public/language/fr/global.json index 962a7a7f49..57055bee26 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -30,6 +30,7 @@ "header.unread": "Non lus", "header.tags": "Mots-clés", "header.popular": "Populaire", + "header.top": "Top", "header.users": "Utilisateurs", "header.groups": "Groupes", "header.chats": "Discussions", diff --git a/public/language/fr/tags.json b/public/language/fr/tags.json index 589308da5c..438c24c184 100644 --- a/public/language/fr/tags.json +++ b/public/language/fr/tags.json @@ -4,5 +4,5 @@ "enter_tags_here": "Entrez les mots-clés ici. Chaque mot doit faire entre %1 et %2 caractères.", "enter_tags_here_short": "Entrez des mots-clés...", "no_tags": "Il n'y a pas encore de mots-clés.", - "select_tags": "Select Tags" + "select_tags": "Sélectionner les mots-clés" } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index ea8c6df18a..10778d13c4 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -100,6 +100,10 @@ "fork_success": "Sujet copié avec succès ! Cliquez ici pour aller au sujet copié.", "delete_posts_instruction": "Sélectionnez les messages que vous souhaitez supprimer/vider", "merge_topics_instruction": "Cliquez sur les sujets que vous voulez fusionner", + "merge-topic-list-title": "Liste des sujets à fusionner", + "merge-options": "Options de fusion", + "merge-select-main-topic": "Sélectionnez le sujet principal", + "merge-new-title-for-topic": "Nouveau titre pour le sujet", "move_posts_instruction": "Cliquez sur les messages que vous souhaitez déplacer", "change_owner_instruction": "Cliquez sur les messages que vous souhaitez attribuer à un autre utilisateur.", "composer.title_placeholder": "Entrer le titre du sujet ici…", diff --git a/public/language/fr/user.json b/public/language/fr/user.json index f8d24cdc87..ff9f834182 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -8,20 +8,20 @@ "email": "Email", "confirm_email": "Confirmer l'adresse email", "account_info": "Informations du compte", - "admin_actions_label": "Administrative Actions", + "admin_actions_label": "Administration", "ban_account": "Bannir", "ban_account_confirm": "Êtes-vous sûr de bien vouloir bannir cet utilisateur ?", "unban_account": "Restaurer le compte", "delete_account": "Supprimer le compte", - "delete_account_as_admin": "Delete Account", - "delete_content": "Delete Account Content", - "delete_all": "Delete Account and Content", - "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?
This action is irreversible and you will not be able to recover any of your data

Enter your password to confirm that you wish to destroy this account.", - "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?
This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account

", - "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data

", - "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data

", + "delete_account_as_admin": "Supprimer le Compte", + "delete_content": "Supprimer le contenu du compte", + "delete_all": "Supprimer le compte et le contenu", + "delete_account_confirm": "Êtes-vous sûr de vouloir supprimer votre compte?
Cette action est irréversible et vous ne pourrez récupérer aucune de vos données

Entrez votre mot de passe pour confirmer que vous souhaitez détruire ce compte.", + "delete_this_account_confirm": "Êtes-vous sûr de vouloir supprimer ce compte?
Cette action est irréversible, les messages deviendront anonymes et vous ne pourrez pas restaurer les messages associés avec le compte supprimé.

", + "delete_account_content_confirm": "Êtes-vous sûr de vouloir supprimer le contenu de ce compte (messages / sujets / téléversements)?
Cette action est irréversible et vous ne pourrez récupérer aucune donnée.

", + "delete_all_confirm": "Êtes-vous sûr de vouloir supprimer ce compte et tout son contenu (messages / sujets / téléversements)?
Cette action est irréversible et vous ne pourrez récupérer aucune donnée.

", "account-deleted": "Compte supprimé", - "account-content-deleted": "Account content deleted", + "account-content-deleted": "Compte supprimé", "fullname": "Nom", "website": "Site web", "location": "Situation géographique", diff --git a/public/language/gl/admin/settings/advanced.json b/public/language/gl/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/gl/admin/settings/advanced.json +++ b/public/language/gl/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/gl/global.json b/public/language/gl/global.json index 7914876c5b..7deac83f0f 100644 --- a/public/language/gl/global.json +++ b/public/language/gl/global.json @@ -30,6 +30,7 @@ "header.unread": "Non lidas", "header.tags": "Etiquetas", "header.popular": "Populares", + "header.top": "Top", "header.users": "Usuarios", "header.groups": "Grupos", "header.chats": "Charlas", diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index a4514f2daf..72afedbc15 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 mensaxe(s) seleccionada(s)", "fork_success": "Creouse un novo tema a partir do orixinal! Fai clic aquí para ir ó novo tema.", "delete_posts_instruction": "Fai clic nas mensaxes que queres eliminar/limpar", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Introduce o título do teu tema", diff --git a/public/language/he/admin/settings/advanced.json b/public/language/he/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/he/admin/settings/advanced.json +++ b/public/language/he/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/he/global.json b/public/language/he/global.json index 81e084af9a..2b94efb60a 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -30,6 +30,7 @@ "header.unread": "לא נקרא", "header.tags": "תגיות", "header.popular": "פופולרי", + "header.top": "Top", "header.users": "משתמשים", "header.groups": "קבוצות", "header.chats": "צ'אטים", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index ad5c929045..2b815e7d44 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 פוסט(ים) נבחרו", "fork_success": "הפוסט שוכפל בהצלחה! לחץ כאן על מנת לעבור לפוסט המשוכפל.", "delete_posts_instruction": "לחץ על הפוסטים שברצונך למחוק", - "merge_topics_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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "לחץ על הפוסטים שאתה רוצה להזיז", "change_owner_instruction": "לחץ על ההודעה שהנך רוצה לשנות את בעל ההודעה", "composer.title_placeholder": "הכנס את כותרת הנושא כאן...", diff --git a/public/language/hr/admin/settings/advanced.json b/public/language/hr/admin/settings/advanced.json index d20c183ceb..a801e52b5b 100644 --- a/public/language/hr/admin/settings/advanced.json +++ b/public/language/hr/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Upravljanje prometom", - "traffic.help": "NodeBB koristi modul koji automatski odbija zahtjeve u situacijama visokog prometa.Možete ove postavke izmjeniti ovdje,iako su već zadane postavke dobra početna točka.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Omogući upravljanje prometom", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Smanjivanje ove vrijednosti smanjuje vrijeme čekanja za učitavanje stranica,ali će također pokazivati poruku \"prekomjerno opterećenje\" više korisnika(u takvim slučajevima potrebno je ponovo pokretanje).", diff --git a/public/language/hr/global.json b/public/language/hr/global.json index d36a85311a..ab701fbc7b 100644 --- a/public/language/hr/global.json +++ b/public/language/hr/global.json @@ -30,6 +30,7 @@ "header.unread": "Nepročitano", "header.tags": "Tagovi", "header.popular": "Popularno", + "header.top": "Top", "header.users": "Korisnici", "header.groups": "Grupe", "header.chats": "Razgovori", diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index c4c71c1835..2692a0720b 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 objava odabrana", "fork_success": "Uspješno duplirana tema. Kliknite ovdje za dupliranu temu.", "delete_posts_instruction": "Označite objave koje želite obrisati/odbaciti", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Unesite naslov teme ovdje ...", diff --git a/public/language/hu/admin/settings/advanced.json b/public/language/hu/admin/settings/advanced.json index 668f9b6160..7df8d005b4 100644 --- a/public/language/hu/admin/settings/advanced.json +++ b/public/language/hu/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Forgalomirányítás", - "traffic.help": "A NodeBB egy, a kéréseket nagy forgalmú helyzetekben automatikusan elutasító modullal felszerelve vonul fel. Átállíthatod ezen opciókat, habár az alapértékek egy remek kiinduló pont.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Forgalomirányítás engedélyezése", "traffic.event-lag": "Eseményciklus késési küszübértéke (ezredmásodpercben)", "traffic.event-lag-help": "Az érték csökkentésével csökken az oldalbetöltések várakozási ideje, ám több felhasználó fogja tapasztalni a \"túlzott terhelés\" üzenetet. (Újraindítást igényel)", diff --git a/public/language/hu/global.json b/public/language/hu/global.json index 145e556720..e0052bc833 100644 --- a/public/language/hu/global.json +++ b/public/language/hu/global.json @@ -30,6 +30,7 @@ "header.unread": "Olvasatlan", "header.tags": "Címkék", "header.popular": "Népszerű", + "header.top": "Top", "header.users": "Felhasználók", "header.groups": "Csoportok", "header.chats": "Chat", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 95c96c0d5e..522bdd1c0e 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 kiválasztott hozzászólás", "fork_success": "Témakör sikeresen szétválasztva! Kattints ide a szétválasztott témakörre ugráshoz.", "delete_posts_instruction": "Kattints a törlendő/véglegesen törlendő hozzászólásokra", - "merge_topics_instruction": "Kattints a összevonandó témakörökre", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Add meg a témakör címét...", diff --git a/public/language/id/admin/settings/advanced.json b/public/language/id/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/id/admin/settings/advanced.json +++ b/public/language/id/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/id/global.json b/public/language/id/global.json index c38d64b657..a388ee2e5d 100644 --- a/public/language/id/global.json +++ b/public/language/id/global.json @@ -30,6 +30,7 @@ "header.unread": "Belum dibaca", "header.tags": "Tag", "header.popular": "Populer", + "header.top": "Top", "header.users": "Pengguna", "header.groups": "Grup", "header.chats": "Chat", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 2aa3188d73..2581f4f653 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Topik berhasil dicabangkan! Klik disini untuk menuju topik yang telah dicabangkan.", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Masukkan judul topik di sini...", diff --git a/public/language/it/admin/settings/advanced.json b/public/language/it/admin/settings/advanced.json index a06bb45923..a31e71fae7 100644 --- a/public/language/it/admin/settings/advanced.json +++ b/public/language/it/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Consenti la precarica dell'intestazione HSTS", "hsts.help": "Se abilitato, sarà impostata un'intestazione HSTS per questo sito. Puoi scegliere di includere sottodomini e segnalazioni di precaricamento nell'intestazione. In caso di dubbio, puoi lasciarle deselezionate. Più informazioni ", "traffic-management": "Gestione Traffico", - "traffic.help": "NodeBB è dotato di un modulo che nega automaticamente le richieste in situazioni ad alto traffico. Puoi regolare queste impostazioni qui, anche se i valori predefiniti sono un buon punto di partenza.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Abilita Gestione Traffico", "traffic.event-lag": "Soglia ritardo ciclo eventi (in millisecondi)", "traffic.event-lag-help": "L'abbassamento di questo valore diminuisce i tempi di attesa per il caricamento della pagina, ma mostrerà il messaggio \"carico eccessivo\" a più utenti. (Necessario riavviare)", diff --git a/public/language/it/global.json b/public/language/it/global.json index 1c753e26e9..c6f3e178bd 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -30,6 +30,7 @@ "header.unread": "Non letti", "header.tags": "Tag", "header.popular": "Popolare", + "header.top": "Top", "header.users": "Utenti", "header.groups": "Gruppi", "header.chats": "Chat", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 0b86324ace..b7a48af50e 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post selezionati", "fork_success": "Topic Diviso con successo ! Clicca qui per andare al Topic Diviso.", "delete_posts_instruction": "Clicca sui post che vuoi eliminare/eliminare definitivamente", - "merge_topics_instruction": "Clicca sulle discussioni che vuoi unire", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Clicca sui post che vuoi spostare", "change_owner_instruction": "Clicca sui post che vuoi assegnare ad un altro utente", "composer.title_placeholder": "Inserisci qui il titolo della discussione...", diff --git a/public/language/ja/admin/settings/advanced.json b/public/language/ja/admin/settings/advanced.json index 5823517fd1..aec3cfd388 100644 --- a/public/language/ja/admin/settings/advanced.json +++ b/public/language/ja/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "トラフィック管理", - "traffic.help": "NodeBBは、トラフィックの多い状況で要求を自動的に拒否するモジュールを備えています。これらの設定はここで調整することができますが、はじめはデフォルト設定にしておくことをお勧めします。", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "トラフィック管理を有効にする", "traffic.event-lag": "イベントループの場所のしきい値(ミリ秒単位)", "traffic.event-lag-help": "この値を下げるとページの読み込み時間が短縮されますが、さらに多くのユーザーには「過剰な読み込み」メッセージが表示されます。(再起動が必要)", diff --git a/public/language/ja/global.json b/public/language/ja/global.json index e04b15067c..af9a99033e 100644 --- a/public/language/ja/global.json +++ b/public/language/ja/global.json @@ -30,6 +30,7 @@ "header.unread": "未読", "header.tags": "タグ", "header.popular": "人気", + "header.top": "Top", "header.users": "ユーザー", "header.groups": "グループ", "header.chats": "チャット", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 5d05c10aec..2e9d6dea2b 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 投稿(s)が選択されました", "fork_success": "スレッドをフォークするのに成功しました。ここを押して、このフォークしたスレッドに行きます。", "delete_posts_instruction": "削除または切り離するには、当てはまる投稿を押してください", - "merge_topics_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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "移動したい投稿をクリック", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "スレッドのタイトルを入力...", diff --git a/public/language/ko/admin/settings/advanced.json b/public/language/ko/admin/settings/advanced.json index f1c277fd21..87551495ef 100644 --- a/public/language/ko/admin/settings/advanced.json +++ b/public/language/ko/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "트래픽 관리", - "traffic.help": "NodeBB는 트래픽이 많은 상황에서는 자동으로 리퀘스트를 거부하는 모듈을 가지고 있습니다. 이에 관련된 세팅은 디폴트 값들도 괜찮지만, 여기서 세부 조율도 가능합니다.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "트래픽 관리 허용", "traffic.event-lag": "이벤트 루프 간격(단위: 1/1000초)", "traffic.event-lag-help": "이 값을 낮추게 되면 페이지 로딩에 걸리는 시간이 단축되지만, 더 많은 사용자들이 \"과도한 로딩\"이라는 메시지를 보게됩니다. (재시작 필요)", diff --git a/public/language/ko/global.json b/public/language/ko/global.json index b8f8c3ffe8..b7c532051d 100644 --- a/public/language/ko/global.json +++ b/public/language/ko/global.json @@ -30,6 +30,7 @@ "header.unread": "읽지 않은 게시물", "header.tags": "태그", "header.popular": "인기 게시물", + "header.top": "Top", "header.users": "사용자", "header.groups": "그룹", "header.chats": "채팅", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index 8aa5f8b716..2fcacf5153 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 개의 포스트(들)이 선택되었습니다", "fork_success": "게시물이 분리되었습니다! 분리된 게시물을 보려면 여기를 클릭 하세요.", "delete_posts_instruction": "삭제할 포스트를 선택하세요.", - "merge_topics_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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "게시물 제목을 입력하세요.", diff --git a/public/language/lt/admin/settings/advanced.json b/public/language/lt/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/lt/admin/settings/advanced.json +++ b/public/language/lt/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/lt/global.json b/public/language/lt/global.json index 1347fc4fba..08cdfeb825 100644 --- a/public/language/lt/global.json +++ b/public/language/lt/global.json @@ -30,6 +30,7 @@ "header.unread": "Neskaityti", "header.tags": "Žymos", "header.popular": "Populiarūs", + "header.top": "Top", "header.users": "Vartotojai", "header.groups": "Grupės", "header.chats": "Susirašinėjimai", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index 5255a43d62..f757086e0b 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Sėkmingai išsišakota iš temos! Spausk čia kad nueitu į išsišakota temą", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Įrašykite temos pavadinimą...", diff --git a/public/language/lv/admin/settings/advanced.json b/public/language/lv/admin/settings/advanced.json index d02f48f100..2b4dc98277 100644 --- a/public/language/lv/admin/settings/advanced.json +++ b/public/language/lv/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Atļaut iepriekš ielādēt HSTS iezīmi", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Satiksmes pārvaldīšana", - "traffic.help": "NodeBB ir aprīkots ar moduli, kas automātiski liedz pieprasījumus lielas slodzes situācijās. Šeit var iestatīt šo moduli, lai gan noklusējuma iestatījumi ir labs sākumpunkts.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Iespējot satiksmes pārvaldīšanu", "traffic.event-lag": "Notikumu cilpas novilcināšanas slieksnis (milisekundēs)", "traffic.event-lag-help": "Samazinot šo vērtību, tiek samazināti lapas ielādes gaidīšanas laiki, bet arī vairāk lietotājiem parādīsies ziņojums \"pārmērīga slodze\". (Nepieciešams restartēt)", diff --git a/public/language/lv/global.json b/public/language/lv/global.json index 4b910d6e40..e4e32a7a90 100644 --- a/public/language/lv/global.json +++ b/public/language/lv/global.json @@ -30,6 +30,7 @@ "header.unread": "Nelasītie", "header.tags": "Birkas", "header.popular": "Populārākie", + "header.top": "Top", "header.users": "Lietotāji", "header.groups": "Grupas", "header.chats": "Sarunas", diff --git a/public/language/lv/topic.json b/public/language/lv/topic.json index 70615cba56..aab5ca423c 100644 --- a/public/language/lv/topic.json +++ b/public/language/lv/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 raksts(-i) atlasīts(-i)", "fork_success": "Veiksmīgi nozarots temats! Noklikšķini, lai dotos uz nozaroto tematu.", "delete_posts_instruction": "Noklikšķini uz rakstiem, kurus notīrīt/iztīrīt", - "merge_topics_instruction": "Noklikšķini uz tematiem, kurus apvienot", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Noklikšķini uz rakstiem, kurus pārvietot", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Ievadīt temata virsrakstu...", diff --git a/public/language/ms/admin/settings/advanced.json b/public/language/ms/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/ms/admin/settings/advanced.json +++ b/public/language/ms/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/ms/global.json b/public/language/ms/global.json index 94f44a3fa4..169b2baea5 100644 --- a/public/language/ms/global.json +++ b/public/language/ms/global.json @@ -30,6 +30,7 @@ "header.unread": "Belum dibaca", "header.tags": "Tag", "header.popular": "Popular", + "header.top": "Top", "header.users": "Pengguna", "header.groups": "Kumpulan", "header.chats": "Sembang", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index 891e76c511..2d878fc0fe 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Berjaya menyalin topik. Klik sini untuk ke topik yang disalin.", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Masukkan tajuk topik disini", diff --git a/public/language/nb/admin/settings/advanced.json b/public/language/nb/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/nb/admin/settings/advanced.json +++ b/public/language/nb/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/nb/global.json b/public/language/nb/global.json index 0b89a32def..b25e7701cb 100644 --- a/public/language/nb/global.json +++ b/public/language/nb/global.json @@ -30,6 +30,7 @@ "header.unread": "Uleste", "header.tags": "Emneord", "header.popular": "Populære", + "header.top": "Top", "header.users": "Brukere", "header.groups": "Grupper", "header.chats": "Samtaler", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 57bebcc951..2bed75b37d 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Dette emnet ble forgrenet! Klikk for å gå til forgrenet emne.", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Skriv din tråd-tittel her", diff --git a/public/language/nl/admin/settings/advanced.json b/public/language/nl/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/nl/admin/settings/advanced.json +++ b/public/language/nl/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/nl/global.json b/public/language/nl/global.json index 808f94000c..3acb2494b3 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -30,6 +30,7 @@ "header.unread": "Ongelezen", "header.tags": "Tags", "header.popular": "Populair", + "header.top": "Top", "header.users": "Gebruikers", "header.groups": "Groepen", "header.chats": "Chats", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index 5dcbd3f693..f55b18b791 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 bericht(en) geselecteerd", "fork_success": "Onderwerp is succesvol afgesplitst. Klik hier om het nieuwe onderwerp te zien.", "delete_posts_instruction": "Klik op de berichten die verwijderd moeten worden", - "merge_topics_instruction": "Klik op de onderwerpen die samengevoegd moeten worden", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Klik op de berichten die je wilt verplaatsen", "change_owner_instruction": "Klik op de berichten die je wilt toewijzen aan een andere gebruiker", "composer.title_placeholder": "Voer hier de titel van het onderwerp in...", diff --git a/public/language/pl/admin/advanced/events.json b/public/language/pl/admin/advanced/events.json index 7404a578a0..02df129699 100644 --- a/public/language/pl/admin/advanced/events.json +++ b/public/language/pl/admin/advanced/events.json @@ -2,7 +2,7 @@ "events": "Zdarzenia", "no-events": "Brak zdarzeń", "control-panel": "Panel zdarzeń", - "delete-events": "Delete Events", + "delete-events": "Usuń zdarzenia", "filters": "Filtry", "filters-apply": "Zatwierdź filtry", "filter-type": "Typ zdarzenia", diff --git a/public/language/pl/admin/manage/privileges.json b/public/language/pl/admin/manage/privileges.json index 06ed574285..12b935ff8b 100644 --- a/public/language/pl/admin/manage/privileges.json +++ b/public/language/pl/admin/manage/privileges.json @@ -35,8 +35,8 @@ "moderate": "Moderowanie", "admin-dashboard": "Dashboard", - "admin-categories": "Categories", - "admin-privileges": "Privileges", - "admin-users": "Users", - "admin-settings": "Settings" + "admin-categories": "Kategorie", + "admin-privileges": "Uprawnienia", + "admin-users": "Użytkownicy", + "admin-settings": "Ustawienia" } \ No newline at end of file diff --git a/public/language/pl/admin/manage/users.json b/public/language/pl/admin/manage/users.json index ced11f50c0..6eeb0adc79 100644 --- a/public/language/pl/admin/manage/users.json +++ b/public/language/pl/admin/manage/users.json @@ -12,9 +12,9 @@ "unban": "Odbanuj użytkownika(-ów)", "reset-lockout": "Zresetuj blokadę", "reset-flags": "Zresetuj flagi", - "delete": "Delete User(s)", - "delete-content": "Delete User(s) Content", - "purge": "Delete User(s) and Content", + "delete": "Usuń Użytkownika(ów)", + "delete-content": "Usuń Treści Użytkownika(ów)", + "purge": "Usuń Użytkownika(ów) i Treści", "download-csv": "Pobierz CSV", "manage-groups": "Zarządzaj grupami", "add-group": "Dodaj grupę", @@ -94,11 +94,11 @@ "alerts.validate-email-success": "Zweryfikowano adresy e-mail", "alerts.validate-force-password-reset-success": "Hasła użytkownika(ów) zostały zresetowane, a ich istniejące sesje zostały odwołane.", "alerts.password-reset-confirm": "Czy chcesz wysłać e-mail do resetu hasła tym użytkownikom?", - "alerts.confirm-delete": "Warning!

Do you really want to delete user(s)?

This action is not reversible! Only the user account will be deleted, their posts and topics will remain.

", + "alerts.confirm-delete": "Uwaga!

Czy na pewno chcesz usunąć Uzykownika(ów)?

To działanie jest nieodwracalne! Tylko konto użytkownika zostanie usunięte, jego posty i tematy pozostaną.

", "alerts.delete-success": "Skasowano użytkownika(-ów)!", - "alerts.confirm-delete-content": "Warning!

Do you really want to delete these user(s) content?

This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.

", - "alerts.delete-content-success": "User(s) Content Deleted!", - "alerts.confirm-purge": "Warning!

Do you really want to delete user(s) and their content?

This action is not reversible! All user data and content will be erased!

", + "alerts.confirm-delete-content": "Uwaga!

Czy na pewno chcesz usunąć treściużytkownika(ów)?

To działanie jest nieodwracalne! Konto użytkownika pozostanie, jednak jego posty i tematy zostaną usunięte.

", + "alerts.delete-content-success": "Treści Użytkownika(ów) usunięte!", + "alerts.confirm-purge": "Uwaga!

Czy na pewno chcesz usunąc użytkownika(ów) i jego(ich) treści?

To działanie jest nieodwracalne! Wszystkie dane użytkownika i jego treści zostaną usunięte!

", "alerts.create": "Utwórz użytkownika", "alerts.button-create": "Utwórz", "alerts.button-cancel": "Anuluj", diff --git a/public/language/pl/admin/settings/advanced.json b/public/language/pl/admin/settings/advanced.json index 54a3d9ec08..fff7282d51 100644 --- a/public/language/pl/admin/settings/advanced.json +++ b/public/language/pl/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Zezwól na wstępne ładowanie nagłówka HSTS", "hsts.help": "Jeśli ta opcja jest włączona, dla tej witryny zostanie ustawiony nagłówek HSTS. Możesz zdecydować, czy uwzględnić subdomeny i wstępnie ładować flagi w nagłówku. Jeśli masz wątpliwości, możesz zostawić te pola niezaznaczone. Więcej informacji", "traffic-management": "Zarządzanie ruchem", - "traffic.help": "System NodeBB jest dostarczany z modułem, który automatycznie blokuje żądania w przypadku nadmiernego ruchu. Tutaj możesz zmienić te ustawienia, ale ustawienia początkowe są dobrym punktem wyjścia w większości sytuacji.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Włącz zarządzanie ruchem", "traffic.event-lag": "Próg opóźnienia pętli zdarzeń (w milisekundach)", "traffic.event-lag-help": "Obniżenie tej wartości spowoduje krótsze ładowanie stron, ale równocześnie wyświetli komunikat \"excessive load\" dla większej liczby użytkowników (wymagany restart).", diff --git a/public/language/pl/flags.json b/public/language/pl/flags.json index f1e44db6c6..9b75b0e648 100644 --- a/public/language/pl/flags.json +++ b/public/language/pl/flags.json @@ -32,9 +32,9 @@ "view-profile": "Zobacz profil", "start-new-chat": "Rozpocznij nowy czat", "go-to-target": "Zobacz cel flagowania", - "delete-post": "Delete Post", - "purge-post": "Purge Post", - "restore-post": "Restore Post", + "delete-post": "Usuń post", + "purge-post": "Wyczyść post", + "restore-post": "Przywróć post", "user-view": "Zobacz profil", "user-edit": "Edytuj profil", diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 45fadc7206..0166b6f7e0 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -30,6 +30,7 @@ "header.unread": "Nieprzeczytane", "header.tags": "Tagi", "header.popular": "Popularne", + "header.top": "Top", "header.users": "Użytkownicy", "header.groups": "Grupy", "header.chats": "Czaty", diff --git a/public/language/pl/tags.json b/public/language/pl/tags.json index 104def8571..df5b2ee6f5 100644 --- a/public/language/pl/tags.json +++ b/public/language/pl/tags.json @@ -4,5 +4,5 @@ "enter_tags_here": "Wpisz tagi tutaj, każdy o długości od %1 do %2 znaków.", "enter_tags_here_short": "Wpisz tagi...", "no_tags": "Jeszcze nie ma tagów.", - "select_tags": "Select Tags" + "select_tags": "Wybierz tagi" } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 0fd5ac7593..ba840e42ea 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -99,11 +99,15 @@ "fork_pid_count": "Zaznaczono %1 post(-ów)", "fork_success": "Temat został skopiowany. Kliknij tutaj, aby do niego przejść.", "delete_posts_instruction": "Zaznacz posty, które chcesz usunąć/wyczyścić", - "merge_topics_instruction": "Zaznacz tematy, które chcesz połączyć", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Zaznacz posty, które chcesz przenieść", "change_owner_instruction": "Kliknij w posty, które chcesz przypisać do innego użytkownika", "composer.title_placeholder": "Tutaj wpisz tytuł tematu...", - "composer.handle_placeholder": "Enter your name/handle here", + "composer.handle_placeholder": "Tutaj wpisz swoje imię/nazwę", "composer.discard": "Odrzuć", "composer.submit": "Utwórz", "composer.replying_to": "Odpowiedź na %1", diff --git a/public/language/pl/user.json b/public/language/pl/user.json index 58df846c9e..9f506dde62 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -8,20 +8,20 @@ "email": "Adres e-mail", "confirm_email": "Potwierdź adres e-mail", "account_info": "Informacje o koncie", - "admin_actions_label": "Administrative Actions", + "admin_actions_label": "Działania administacyjne", "ban_account": "Zbanuj konto", "ban_account_confirm": "Na pewno chcesz zbanować tego użytkownika?", "unban_account": "Odbanuj konto", "delete_account": "Usuń konto", - "delete_account_as_admin": "Delete Account", - "delete_content": "Delete Account Content", - "delete_all": "Delete Account and Content", - "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?
This action is irreversible and you will not be able to recover any of your data

Enter your password to confirm that you wish to destroy this account.", - "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?
This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account

", - "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data

", - "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data

", + "delete_account_as_admin": "Usuń Konto", + "delete_content": "Usuń Treści Konta", + "delete_all": "Usuń Konto i Treści", + "delete_account_confirm": "Czy na pewno chcesz zanonimizować swoje posty i usunąć konto?
To działanie jest nieodwracalne i nie będziesz w stanie przywrócić swoich danych

Wpisz hasło w celu potwierdzenia chęci usunięcia konta.", + "delete_this_account_confirm": "Czy na pewno chcesz usunąć konto pozostawiając swoje treści?
To działanie jest nieodwracalne, posty zostaną zanonimizowane i nie będziesz w stanie przywrócić żadnych powiązań z usuniętym kontem

", + "delete_account_content_confirm": "Czy na pewno chcesz usunąć treści tego konta (posty/tematy/pliki)?
To działanie jest nieodwracalne i nie będziesz w stanie przywrócić żadnych danych

", + "delete_all_confirm": "Czy na pewno chcesz usunąć konto i jego treści (posty/tematy/pliki)?
To działanie jest nieodwracalne i nie będziesz w stanie przywrócić żadnych danych

", "account-deleted": "Konto usunięte", - "account-content-deleted": "Account content deleted", + "account-content-deleted": "Treści konta usunięte", "fullname": "Pełna nazwa", "website": "Strona WWW", "location": "Lokalizacja", @@ -151,7 +151,7 @@ "info.ban-history": "Historia ostatnich banów", "info.no-ban-history": "Ten użytkownik nigdy nie był zbanowany", "info.banned-until": "Zbanowany do %1", - "info.banned-expiry": "Expiry", + "info.banned-expiry": "Wygaśnięcie", "info.banned-permanently": "Zbanowany permanentnie", "info.banned-reason-label": "Powód", "info.banned-no-reason": "Nie podano powodu.", diff --git a/public/language/pt-BR/admin/settings/advanced.json b/public/language/pt-BR/admin/settings/advanced.json index ed41037a5a..63c3ca7536 100644 --- a/public/language/pt-BR/admin/settings/advanced.json +++ b/public/language/pt-BR/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Permitir pré-carregamento do cabeçalho do HSTS", "hsts.help": "Se habilitado, um cabeçalho de HSTS será enviado para este site. Você pode selecionar tanto quais subdomínios deseja incluir, como quais serão as flags de pré-carregamento no seu cabeçalho. Se estiver em dúvida, você pode deixar esta opção desmarcada. Mais informações", "traffic-management": "Administração de Tráfego", - "traffic.help": "Quando instalado, o NodeBB vem equipado com um módulo que nega automaticamente solicitações em situações de alto tráfego. Você pode ajustar estas configurações aqui, apesar de que os valores padrões são um bom começo.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Ativar a Administração de Tráfego", "traffic.event-lag": "Limite do Lag do Loop de Eventos (em milisegundos)", "traffic.event-lag-help": "Abaixar este valor diminui o tempo de espera para o carregamentos de página, mas irá também mostrar a mensagem de \"carga excessiva\" para mais usuários. (É necessário reiniciar)", diff --git a/public/language/pt-BR/global.json b/public/language/pt-BR/global.json index b37dd8aed8..741c7d7112 100644 --- a/public/language/pt-BR/global.json +++ b/public/language/pt-BR/global.json @@ -30,6 +30,7 @@ "header.unread": "Não Lido", "header.tags": "Tags", "header.popular": "Popular", + "header.top": "Top", "header.users": "Usuários", "header.groups": "Grupos", "header.chats": "Chats", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 928917a2bf..2f4f2bb1d9 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selecionado(s)", "fork_success": "Tópico ramificado com sucesso! Clique aqui para ir ao tópico ramificado.", "delete_posts_instruction": "Clique nos posts que você deseja deletar/limpar", - "merge_topics_instruction": "Clique nos tópicos que você deseja mesclar", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Clique nas postagens que você deseja mover", "change_owner_instruction": "Clique na postagem que você quer associar a outro usuário", "composer.title_placeholder": "Digite aqui o título para o seu tópico...", diff --git a/public/language/pt-PT/admin/settings/advanced.json b/public/language/pt-PT/admin/settings/advanced.json index e25d362e6b..4f0992351a 100644 --- a/public/language/pt-PT/admin/settings/advanced.json +++ b/public/language/pt-PT/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/pt-PT/global.json b/public/language/pt-PT/global.json index 8dedd92b39..dc8f3ef73e 100644 --- a/public/language/pt-PT/global.json +++ b/public/language/pt-PT/global.json @@ -30,6 +30,7 @@ "header.unread": "Por ler", "header.tags": "Marcadores", "header.popular": "Popular", + "header.top": "Top", "header.users": "Utilizadores", "header.groups": "Grupos", "header.chats": "Conversas", diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index a69ae133b0..60ab60a457 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 publicação(ões) selecionada(s)", "fork_success": "Clonaste um tópico com sucesso! Carrega aqui para ires para o tópico clonado.", "delete_posts_instruction": "Carrega nas publicações que queres apagar/eliminar", - "merge_topics_instruction": "Clica nos tópicos que queres fundir", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Clica nas publicações que queres mover", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Insere aqui o título do tópico...", diff --git a/public/language/ro/admin/settings/advanced.json b/public/language/ro/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/ro/admin/settings/advanced.json +++ b/public/language/ro/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/ro/global.json b/public/language/ro/global.json index 0e3b39fb24..4794439d78 100644 --- a/public/language/ro/global.json +++ b/public/language/ro/global.json @@ -30,6 +30,7 @@ "header.unread": "Necitite", "header.tags": "Taguri", "header.popular": "Populare", + "header.top": "Top", "header.users": "Utilizatori", "header.groups": "Grupuri", "header.chats": "Conversații", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 7f522b36d0..08d7312700 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Introdu numele subiectului aici ...", diff --git a/public/language/ru/admin/settings/advanced.json b/public/language/ru/admin/settings/advanced.json index d8da8097e1..f98db42ef0 100644 --- a/public/language/ru/admin/settings/advanced.json +++ b/public/language/ru/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Разрешить предзагрузку заголовка HSTS", "hsts.help": "Включите, чтобы установить заголовок HSTS для этого сайта, а также настроить его предзагрузку или использование поддоменов. Если вы не уверены, какими должны быть эти параметры, оставьте всё как есть. Дополнительная информация ", "traffic-management": "Управление трафиком", - "traffic.help": "NodeBB может автоматически блокировать соединения при высокой нагрузке. Настройте параметры блокировки как считаете нужным, хотя настройки по умолчанию и так вполне хороши.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Включить управление трафиком", "traffic.event-lag": "Порог лага Event Loop (в миллисекундах)", "traffic.event-lag-help": "Уменьшение этого значение ускорит загрузку страниц, но также может привести к показу сообщения \"высокая нагрузка\" большому количеству участников. (Необходим перезапуск)", diff --git a/public/language/ru/global.json b/public/language/ru/global.json index 2dd4f38d9f..45d132353e 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -30,6 +30,7 @@ "header.unread": "Непрочитанные", "header.tags": "Метки", "header.popular": "Популярные", + "header.top": "Top", "header.users": "Пользователи", "header.groups": "Группы", "header.chats": "Чаты", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 57a0844317..b0a30cae4e 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "Выбрано сообщений: %1", "fork_success": "Готово! Нажмите здесь, чтобы перейти к новой теме.", "delete_posts_instruction": "Отметьте сообщения, которые вы хотите удалить или стереть", - "merge_topics_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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Нажмите на сообщения, которые вы хотите перенести", "change_owner_instruction": "Нажмите на сообщения, которые вы хотите присвоить другому пользователю", "composer.title_placeholder": "Введите название темы...", diff --git a/public/language/rw/admin/settings/advanced.json b/public/language/rw/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/rw/admin/settings/advanced.json +++ b/public/language/rw/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/rw/global.json b/public/language/rw/global.json index b444c49281..59fb1a98c7 100644 --- a/public/language/rw/global.json +++ b/public/language/rw/global.json @@ -30,6 +30,7 @@ "header.unread": "Ibitarasomwa", "header.tags": "Utumenyetso", "header.popular": "Ibikunzwe", + "header.top": "Top", "header.users": "Abantu", "header.groups": "Amatsinda", "header.chats": "Ubutumwa", diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index 25cc8e1bc3..f6a39cd953 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Umaze kugabanyaho ku kiganiro! Kanda hano ugezwe ku kiganiro cyavutse. ", "delete_posts_instruction": "Kanda ku bintu ushaka guhisha/gusiba", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Shyira umutwe w'ikiganiro cyawe aha...", diff --git a/public/language/sc/admin/settings/advanced.json b/public/language/sc/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/sc/admin/settings/advanced.json +++ b/public/language/sc/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/sc/global.json b/public/language/sc/global.json index abcfd36b1d..fb4d84a054 100644 --- a/public/language/sc/global.json +++ b/public/language/sc/global.json @@ -30,6 +30,7 @@ "header.unread": "De lèghere", "header.tags": "Tags", "header.popular": "Populare", + "header.top": "Top", "header.users": "Impitadores", "header.groups": "Groups", "header.chats": "Tzarras", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index 8bdb1f72c6..0a849305e0 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "delete_posts_instruction": "Click the posts you want to delete/purge", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Pone su tìtulu de s'arresonada inoghe...", diff --git a/public/language/sk/admin/settings/advanced.json b/public/language/sk/admin/settings/advanced.json index b90ca85d8a..51c2dece93 100644 --- a/public/language/sk/admin/settings/advanced.json +++ b/public/language/sk/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Povoliť pred načítavanie hlavičky HSTS", "hsts.help": "Ak je povolené, bude nastavená pre tieto stránky hlavička HSTS. V hlavičke si môžete zvoliť aj zahrnutie pod domén a prednastavených príznakov. Ak si nieste istý, nechajte nezaškrtnuté Viac informácií ", "traffic-management": "Správa prevádzky", - "traffic.help": "NodeBB obsahuje modul, ktorý automaticky zamieta požiadavky pri vysokom vyťažení. Toto nastavenie môžete upraviť tu, hoci východiskové hodnoty sú zaručením úspechu.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Povoliť správu prevádzky", "traffic.event-lag": "Hranice oneskorenia slučky udalosti (v milisekundách)", "traffic.event-lag-help": "Zníženie tejto hodnoty zníži čas pre načítanie stránky, ale taktiež zobrazí viac používateľom správu o „preťažení stránok”. (je vyžadovaný reštart)", diff --git a/public/language/sk/global.json b/public/language/sk/global.json index 3a74f7d2fb..5171eb8070 100644 --- a/public/language/sk/global.json +++ b/public/language/sk/global.json @@ -30,6 +30,7 @@ "header.unread": "Neprečítané", "header.tags": "Značky", "header.popular": "Populárne", + "header.top": "Top", "header.users": "Užívatelia", "header.groups": "Skupiny", "header.chats": "Konverzácie", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index adaaa97622..a913e34d49 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 príspevky(ov) vybraté", "fork_success": "Rozdelenie témy bolo úspešné! Kliknutím sem sa dostanete na rozdelenú tému", "delete_posts_instruction": "Kliknite na príspevky, ktoré chcete odstrániť/očistiť", - "merge_topics_instruction": "K zlúčeniu tém, kliknite na nich", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Kliknite na príspevky, ktoré chcete presunúť", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Sem zadajte názov témy...", diff --git a/public/language/sl/admin/settings/advanced.json b/public/language/sl/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/sl/admin/settings/advanced.json +++ b/public/language/sl/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/sl/global.json b/public/language/sl/global.json index d5bfb8c617..acd07c6111 100644 --- a/public/language/sl/global.json +++ b/public/language/sl/global.json @@ -30,6 +30,7 @@ "header.unread": "Neprebrano", "header.tags": "Oznake", "header.popular": "Priljubljeno", + "header.top": "Top", "header.users": "Uporabniki", "header.groups": "Skupine", "header.chats": "Klepeti", diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index 24c83d4009..2224304f6b 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "Izbranih objav: %1 ", "fork_success": "Uspešno ste razcepili temo! Klikni tu za ogled te teme.", "delete_posts_instruction": "Kliknite na teme, ki jih želite izbrisati/očistiti ", - "merge_topics_instruction": "Click the topics you want to merge", + "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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "Vpiši naslov teme...", diff --git a/public/language/sr/admin/settings/advanced.json b/public/language/sr/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/sr/admin/settings/advanced.json +++ b/public/language/sr/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/sr/global.json b/public/language/sr/global.json index a7b8ae82eb..312a3b54d7 100644 --- a/public/language/sr/global.json +++ b/public/language/sr/global.json @@ -30,6 +30,7 @@ "header.unread": "Непрочитано", "header.tags": "Ознаке", "header.popular": "Популарно", + "header.top": "Top", "header.users": "Корисници", "header.groups": "Групе", "header.chats": "Ћаскања", diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index 2050d4d02b..7152057b7d 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "Одабрано порука: %1", "fork_success": "Тема је успешно рачвана! Кликните овде за одлазак на рачвану тему.", "delete_posts_instruction": "Кликните на поруке које желите да избришете/очистите", - "merge_topics_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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Кликните на поруке које желите да преместите", "change_owner_instruction": "Кликните на поруке које желите да доделите другом кориснику", "composer.title_placeholder": "Овде унесите назив теме...", diff --git a/public/language/sv/admin/settings/advanced.json b/public/language/sv/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/sv/admin/settings/advanced.json +++ b/public/language/sv/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/sv/global.json b/public/language/sv/global.json index 757c71e907..1fdda8eeb6 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -30,6 +30,7 @@ "header.unread": "Olästa", "header.tags": "Taggar", "header.popular": "Populära", + "header.top": "Top", "header.users": "Användare", "header.groups": "Grupper", "header.chats": "Chattar", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 664d951970..cec78ed614 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 inlägg vald(a)", "fork_success": "Ämnet har blivit förgrenat. Klicka här för att gå till det förgrenade ämnet.", "delete_posts_instruction": "Klicka på inläggen du vill radera/rensa bort", - "merge_topics_instruction": "Klicka på de ämnen du vill slå samman", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Klicka på de inlägg du vill flytta", "change_owner_instruction": "Klicka på de inlägg du vill tilldela en annan användare", "composer.title_placeholder": "Skriv in ämnets titel här...", diff --git a/public/language/th/admin/settings/advanced.json b/public/language/th/admin/settings/advanced.json index aa4079f6f4..00915e4da2 100644 --- a/public/language/th/admin/settings/advanced.json +++ b/public/language/th/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Enable Traffic Management", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/th/global.json b/public/language/th/global.json index bfa18f0447..7c4f21ff72 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -30,6 +30,7 @@ "header.unread": "ไม่ได้อ่าน", "header.tags": "แท็ก", "header.popular": "ฮิต", + "header.top": "Top", "header.users": "ผู้ใช้", "header.groups": "กลุ่ม", "header.chats": "สนทนา", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index 929be7d744..89fe2fd596 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": " %1 โพสต์(s) ที่เลือก", "fork_success": "แตกกระทู้สำเร็จแล้ว! คลิกที่นี่เพื่อไปยั้งกระทู้ที่คุณแตกประเด็น", "delete_posts_instruction": "คลิกโพสต์ที่คุณต้องการลบ/ล้าง", - "merge_topics_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-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", "change_owner_instruction": "Click the posts you want to assign to another user", "composer.title_placeholder": "ป้อนชื่อกระทู้ของคุณที่นี่ ...", diff --git a/public/language/tr/admin/settings/advanced.json b/public/language/tr/admin/settings/advanced.json index bc3c885013..715594699d 100644 --- a/public/language/tr/admin/settings/advanced.json +++ b/public/language/tr/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "HSTS üst bilgisinin ön yüklemesine izin ver", "hsts.help": "Etkinleştirildiğinde, bu site için bir HSTS başlığı ayarlanır. Alt alanları ve önyükleme bayraklarını dahil etmeyi seçebilirsiniz. Kararsızsanız, bu alanı işaretlenmemiş olarak bırakabilirsiniz. Daha fazla bilgi ", "traffic-management": "Trafik Yönetimi", - "traffic.help": "NodeBB, yoğun trafik isteklerini otomatik olarak reddeden bir modül ile donatılmıştır. Varsayıla ayarlar başlangıç için yeterli olsa da, bu ayarları buradan düzenleyebilirsiniz.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Trafik Yönetimini Etkinleştir", "traffic.event-lag": "Olay Döngüsü Gecikme Eşiği (milisaniye cinsinden)", "traffic.event-lag-help": "Bu değeri düşürmek, sayfa yüklemeleri için bekleme sürelerini azaltır, ancak daha fazla kullanıcıya \"aşırı yükleme\" mesajını da gösterir. (Yeniden başlatmak gerekir)", diff --git a/public/language/tr/global.json b/public/language/tr/global.json index 9ceceb6978..e0e1bdf411 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -30,6 +30,7 @@ "header.unread": "Okunmamış", "header.tags": "Etiketler", "header.popular": "Popüler", + "header.top": "Top", "header.users": "Kullanıcılar", "header.groups": "Gruplar", "header.chats": "Sohbetler", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index 0ae9c3bf4e..ca916e53dc 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 ileti(ler) seçildi", "fork_success": "Başlık başarıyla ayrıldı! Yeni başlığı görüntülemek için tıklayınız!", "delete_posts_instruction": "Silmek/temizlemek istediğiniz iletileri seçiniz!", - "merge_topics_instruction": "Birleştirmek istediğiniz başlıkları seçiniz!", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Taşımak istediğiniz iletileri seçiniz!", "change_owner_instruction": "Başka kullanıcıya aktarmak istediğiniz iletileri seçiniz!", "composer.title_placeholder": "Başlık ismini buraya giriniz...", diff --git a/public/language/uk/admin/settings/advanced.json b/public/language/uk/admin/settings/advanced.json index efcd3da44e..021b2e514c 100644 --- a/public/language/uk/admin/settings/advanced.json +++ b/public/language/uk/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Керування трафіком", - "traffic.help": "NodeBB має модуль автоматичного відхилення запитів у разі надмірного напливу користувачів. Ви можете налаштувати цей модуль тут, хоча типові налаштування є достатньо дієвими.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Увімкнути керування трафіком", "traffic.event-lag": "Затримка циклу обробки дій (в мілісекундах)", "traffic.event-lag-help": "Зменшення цього значення прискорює час завантаження сторінок, але в той же час більше користувачів будуть отримувати повідомлення про \"надмірне навантаження\". (Потребує перезавантаження)", diff --git a/public/language/uk/global.json b/public/language/uk/global.json index c2d1c1a6a9..d56a12e1f0 100644 --- a/public/language/uk/global.json +++ b/public/language/uk/global.json @@ -30,6 +30,7 @@ "header.unread": "Непрочитані", "header.tags": "Теги", "header.popular": "Популярні", + "header.top": "Top", "header.users": "Користувачі", "header.groups": "Групи", "header.chats": "Чати", diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index 0a22ffa3ab..5ff21b471a 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "вибрано %1 пост(ів) ", "fork_success": "Тему успішно відгалужено. Тисніть тут, щоб перейти до відгалуженої теми.", "delete_posts_instruction": "Тисніть пости які ви бажаєте видалити/стерти", - "merge_topics_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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Натисніть на пости, які ви хочете перемістити", "change_owner_instruction": "Клікніть на дописи які ви хочете призначити іншому користувачу", "composer.title_placeholder": "Уведіть заголовок теми...", diff --git a/public/language/vi/admin/settings/advanced.json b/public/language/vi/admin/settings/advanced.json index 8a28e9e47a..149ca4389f 100644 --- a/public/language/vi/admin/settings/advanced.json +++ b/public/language/vi/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "Quản lý lưu lượng", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "Bật quản lý lưu lượng", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", diff --git a/public/language/vi/global.json b/public/language/vi/global.json index 6c8cc8cc14..eb0e00a652 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -30,6 +30,7 @@ "header.unread": "Chưa đọc", "header.tags": "Tags", "header.popular": "Nổi bật", + "header.top": "Top", "header.users": "Thành viên", "header.groups": "Nhóm", "header.chats": "Phần Chat", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index d53527a79b..f2057e7d75 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "%1 bài viết(s) đã được gửi", "fork_success": "Tạo bản sao thành công! Nhấn vào đây để chuyển tới chủ đề vừa tạo.", "delete_posts_instruction": "Chọn những bài viết bạn muốn xoá", - "merge_topics_instruction": "Click vào các chủ đề bạn muốn xác nhập", + "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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "Nhấp chuột vào bài viết bạn muốn di chuyển", "change_owner_instruction": "Bấm vào bài viết bạn muốn chỉ định cho người dùng khác", "composer.title_placeholder": "Nhập tiêu đề cho chủ đề của bạn tại đây...", diff --git a/public/language/zh-CN/admin/settings/advanced.json b/public/language/zh-CN/admin/settings/advanced.json index ac718a746a..18ef668762 100644 --- a/public/language/zh-CN/admin/settings/advanced.json +++ b/public/language/zh-CN/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "允许在HSTS头信息中预加载（preloading）", "hsts.help": "如果启用此项，站点将会向浏览器发送HSTS头信息。您可以设置是否为子域名开启HSTS，以及HSTS头信息中是否包含预加载标志（preload参数）如果您不了解HSTS，可以忽略此项设置。了解详情 ", "traffic-management": "流量管理", - "traffic.help": "NodeBB 拥有在高流量情况下自动拒绝请求的模块。尽管默认值就很棒，但您可以在这里调整这些设置。", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "启用流量管理", "traffic.event-lag": "事件循环滞后阈值（毫秒）", "traffic.event-lag-help": "降低此值会减少页面加载的等待时间，但也会向更多用户显示“过载”消息。(需要重新启动)", diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json index 90ebec803f..3d5067e3d7 100644 --- a/public/language/zh-CN/global.json +++ b/public/language/zh-CN/global.json @@ -30,6 +30,7 @@ "header.unread": "未读", "header.tags": "话题", "header.popular": "热门", + "header.top": "Top", "header.users": "用户", "header.groups": "群组", "header.chats": "聊天", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 4676bec671..47ca7c2e05 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "选择了 %1 个帖子", "fork_success": "成功分割主题! 点这里跳转到分割后的主题。", "delete_posts_instruction": "点击想要删除/永久删除的帖子", - "merge_topics_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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "点击您想要移动的帖子", "change_owner_instruction": "点击您想转移给其他用户的帖子", "composer.title_placeholder": "在此输入您主题的标题...", diff --git a/public/language/zh-TW/admin/settings/advanced.json b/public/language/zh-TW/admin/settings/advanced.json index 57c431d2a8..be178bcc9c 100644 --- a/public/language/zh-TW/admin/settings/advanced.json +++ b/public/language/zh-TW/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "允許在HSTS標頭中預加載", "hsts.help": "如果啟用此項，網站將會向瀏覽器發送HSTS標頭訊息。您可以設定是否為子域名開啟HSTS，以及HSTS標頭訊息中是否包含預加載標誌。如果您不瞭解HSTS，可以忽略此項設定。瞭解詳情 ", "traffic-management": "流量管理", - "traffic.help": "NodeBB 擁有在高流量情況下自動拒絕請求的模塊。儘管預設值就很棒，但您可以在這裡調整這些設定。", + "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", "traffic.enable": "啟用流量管理", "traffic.event-lag": "事件循環滯後門檻值（毫秒）", "traffic.event-lag-help": "降低此值會減少頁面加載的等待時間，但也會向更多使用者顯示“過載”訊息。(需要重新啟動)", diff --git a/public/language/zh-TW/global.json b/public/language/zh-TW/global.json index 756aa27bff..f92eb6656c 100644 --- a/public/language/zh-TW/global.json +++ b/public/language/zh-TW/global.json @@ -30,6 +30,7 @@ "header.unread": "未讀", "header.tags": "標籤", "header.popular": "熱門", + "header.top": "Top", "header.users": "使用者", "header.groups": "群組", "header.chats": "聊天", diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index 1e87a4d755..39ca3726d0 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -99,7 +99,11 @@ "fork_pid_count": "選擇了 %1 則貼文", "fork_success": "成功分割主題! 點這裡跳轉到分割後的主題。", "delete_posts_instruction": "點擊想要刪除/永久刪除的貼文", - "merge_topics_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-select-main-topic": "Select the main topic", + "merge-new-title-for-topic": "New title for topic", "move_posts_instruction": "點擊您想要移動的貼文", "change_owner_instruction": "點擊您想轉移給其他使用者的貼文", "composer.title_placeholder": "在此輸入您主題的標題...",