From 9a59aaa75529797525adad7aa379d620307bc7ad Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 6 Dec 2017 10:52:46 -0500 Subject: [PATCH] topic merge fallbacks --- public/language/ar/topic.json | 3 +++ public/language/bg/topic.json | 3 +++ public/language/bn/topic.json | 3 +++ public/language/cs/topic.json | 3 +++ public/language/da/topic.json | 3 +++ public/language/de/topic.json | 3 +++ public/language/el/topic.json | 3 +++ public/language/en-US/topic.json | 3 +++ public/language/en-x-pirate/topic.json | 3 +++ public/language/es/topic.json | 3 +++ public/language/et/topic.json | 3 +++ public/language/fa-IR/topic.json | 3 +++ public/language/fi/topic.json | 3 +++ public/language/fr/topic.json | 3 +++ public/language/gl/topic.json | 3 +++ public/language/he/topic.json | 3 +++ public/language/hr/topic.json | 3 +++ public/language/hu/topic.json | 3 +++ public/language/id/topic.json | 3 +++ public/language/it/topic.json | 3 +++ public/language/ja/topic.json | 3 +++ public/language/ko/topic.json | 3 +++ public/language/lt/topic.json | 3 +++ public/language/ms/topic.json | 3 +++ public/language/nb/topic.json | 3 +++ public/language/nl/topic.json | 3 +++ public/language/pl/topic.json | 3 +++ public/language/pt-BR/topic.json | 3 +++ public/language/pt-PT/topic.json | 3 +++ public/language/ro/topic.json | 3 +++ public/language/ru/topic.json | 3 +++ public/language/rw/topic.json | 3 +++ public/language/sc/topic.json | 3 +++ public/language/sk/topic.json | 3 +++ public/language/sl/topic.json | 3 +++ public/language/sr/topic.json | 3 +++ public/language/sv/topic.json | 3 +++ public/language/th/topic.json | 3 +++ public/language/tr/topic.json | 3 +++ public/language/uk/topic.json | 3 +++ public/language/vi/topic.json | 3 +++ public/language/zh-CN/topic.json | 3 +++ public/language/zh-TW/topic.json | 3 +++ 43 files changed, 129 insertions(+) diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 4a5c8789b0..851e10c292 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "هل أنت متأكد أنك تريد استعادة هذا الموضوع؟", "thread_tools.purge": "تطهير الموضوع", "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "تم نقل هذا الموضوع إلى %1 بنجاح", "post_delete_confirm": "هل أنت متأكد أنك تريد حذف هذه المشاركة؟", "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "أدخل عنوان موضوعك هنا...", "composer.handle_placeholder": "اﻹسم", "composer.discard": "نبذ التغييرات", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index fb7faaea2f..3e83e70b12 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Наистина ли искате да възстановите тази тема?", "thread_tools.purge": "Изчистване на темата", "thread_tools.purge_confirm": "Наистина ли искате да изчистите тази тема?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Темата беше преместена успешно в %1", "post_delete_confirm": "Наистина ли искате да изтриете тази публикация?", "post_restore_confirm": "Наистина ли искате да възстановите тази публикация?", @@ -89,6 +91,7 @@ "fork_pid_count": "Избрани публикации: %1", "fork_success": "Темата е разделена успешно! Натиснете тук, за да преминете към отделената тема.", "delete_posts_instruction": "Натиснете публикациите, които искате да изтриете/изчистите", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "Въведете заглавието на темата си тук...", "composer.handle_placeholder": "Име", "composer.discard": "Отхвърляне", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index 46b6c48e0f..537b8a7200 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পুনরূদ্ধার করতে চান?", "thread_tools.purge": "টপিক পার্জ করুন", "thread_tools.purge_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পার্জ করতে চাচ্ছেন ? ", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "টপিকটি %1 এ সরিয়ে নেয়া হয়েছে", "post_delete_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি মুছে ফেলতে চান ?", "post_restore_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পুনরূূদ্ধার করতে চান ? ", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "আপনার টপিকের শিরোনাম দিন", "composer.handle_placeholder": "Name", "composer.discard": "বাতিল", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index c5ce32c134..7cedca5e24 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Jste si jist/a, že chcete toto téma obnovit?", "thread_tools.purge": "Vyčistit téma", "thread_tools.purge_confirm": "Jste si jist/a, že chcete vyčistit toto téma?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Toto téma bylo úspěšně přesunuto do %1", "post_delete_confirm": "Jste si jist/a, že chcete odstranit tento příspěvek?", "post_restore_confirm": "Jste si jist/a, že chcete obnovit tento příspěvek?", @@ -89,6 +91,7 @@ "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": "Click the topics you want to merge", "composer.title_placeholder": "Zadejte název tématu…", "composer.handle_placeholder": "Jméno", "composer.discard": "Zrušit", diff --git a/public/language/da/topic.json b/public/language/da/topic.json index de6b087b5d..e1c7cf0501 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Er du sikker på at du ønsker at genoprette denne tråd?", "thread_tools.purge": "Udrader tråd", "thread_tools.purge_confirm": "Er du sikker på at du vil udrense denne tråd?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Denne tråd blev flyttet til %1", "post_delete_confirm": "Er du sikker på at du vil slette dette indlæg?", "post_restore_confirm": "Er du sikker på at du vil gendanne dette indlæg?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Angiv din trådtittel her ...", "composer.handle_placeholder": "Navn", "composer.discard": "Fortryd", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 7793082abb..1505a77485 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Bist du sicher, dass du dieses Thema wiederherstellen möchtest?", "thread_tools.purge": "Thema endgültig löschen", "thread_tools.purge_confirm": "Bist du sicher, dass du dieses Thema endgültig löschen möchtest?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Thema wurde erfolgreich nach %1 verschoben.", "post_delete_confirm": "Sind Sie sicher, dass Sie diesen Beitrag löschen möchten?", "post_restore_confirm": "Sind Sie sicher, dass Sie diesen Beitrag wiederherstellen möchten?", @@ -89,6 +91,7 @@ "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": "Click the topics you want to merge", "composer.title_placeholder": "Hier den Titel des Themas eingeben...", "composer.handle_placeholder": "Name", "composer.discard": "Verwerfen", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index b2e35c7484..61f1988f50 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Είσαι σίγουρος/η πως θέλεις να επαναφέρεις αυτό το θέμα;", "thread_tools.purge": "Εκκαθάριση Θέματος", "thread_tools.purge_confirm": "Είσαι σίγουρος/η πως θέλεις να εκκαθαρίσεις αυτό το θέμα;", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Το θέμα μετακινήθηκε στο %1 με επιτυχία", "post_delete_confirm": "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτή την δημοσίευση;", "post_restore_confirm": "Είσαι σίγουρος/η πως θέλεις να επαναφέρεις αυτή την δημοσίευση;", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Εισαγωγή του τίτλου του θέματος εδώ...", "composer.handle_placeholder": "Name", "composer.discard": "Πέταγμα", diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json index 9c41963d50..2ba819ecdf 100644 --- a/public/language/en-US/topic.json +++ b/public/language/en-US/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", "thread_tools.purge": "Purge Topic", "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "This topic has been successfully moved to %1", "post_delete_confirm": "Are you sure you want to delete this post?", "post_restore_confirm": "Are you sure you want to restore this post?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Enter your topic title here...", "composer.handle_placeholder": "Name", "composer.discard": "Discard", diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index 9c41963d50..2ba819ecdf 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", "thread_tools.purge": "Purge Topic", "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "This topic has been successfully moved to %1", "post_delete_confirm": "Are you sure you want to delete this post?", "post_restore_confirm": "Are you sure you want to restore this post?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Enter your topic title here...", "composer.handle_placeholder": "Name", "composer.discard": "Discard", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index 50496a6106..7d3c75de23 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "¿Estás seguro que deseas restaurar este tema?", "thread_tools.purge": "Purgar tema", "thread_tools.purge_confirm": "¿Está seguro que desea eliminar definitivamente (purgar) este tema?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "El tema ha sido movido correctamente a %1", "post_delete_confirm": "¿Estás seguro de que quieres eliminar esta respuesta?", "post_restore_confirm": "¿Estás seguro de que quieres restaurar esta respuesta?", @@ -89,6 +91,7 @@ "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": "Click the topics you want to merge", "composer.title_placeholder": "Ingresa el título de tu tema...", "composer.handle_placeholder": "Nombre", "composer.discard": "Descartar", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index ce17ec70e0..90f8a84493 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Oled kindel, et soovid selle teema taastada?", "thread_tools.purge": "Kustuta teema täielikult", "thread_tools.purge_confirm": "Oled kindel, et soovid puhastada selle teema?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Teema liigutatud kategooriasse %1", "post_delete_confirm": "Oled kindel, et soovid kustutada selle postituse?", "post_restore_confirm": "Oled kindel, et soovid taastada antud postituse?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Sisesta teema pealkiri siia...", "composer.handle_placeholder": "Nimi", "composer.discard": "Katkesta", diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index 2bf5829ed6..3102da6b99 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "آیا مطمئنید که می خواهید این موضوع را بازگردانی کنید؟", "thread_tools.purge": "پاک کردن موضوع", "thread_tools.purge_confirm": "آیا مطمئنید که میمید این موضوع را پاکسازی کنید؟", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "جابه‌جایی این موضوع به %1 باموفقیت انجام شد.", "post_delete_confirm": "آیا از پاک کردن این پست اطمینان دارید؟", "post_restore_confirm": "آیا از بازگردانی این پست اطمینان دارید؟", @@ -89,6 +91,7 @@ "fork_pid_count": "%1 پست (ها) انتخاب شده اند", "fork_success": "موضوع با موفقیت منشعب شد! برای رفتن به موضوع انشعابی اینجا را کلیک کنید.", "delete_posts_instruction": "با کلیک بر روی پست شما می خواهید به حذف/پاکسازی", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "عنوان موضوعتان را اینجا بنویسید...", "composer.handle_placeholder": "نام", "composer.discard": "دور بیانداز", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index 84b298c455..96c9c894f7 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Haluatko varmasti palauttaa tämän aiheen?", "thread_tools.purge": "Purge Topic", "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "This topic has been successfully moved to %1", "post_delete_confirm": "Haluatko varmasti poistaa tämän viestin?", "post_restore_confirm": "Haluatko varmasti palauttaa tämän viestin?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Syötä aiheesi otsikko tähän...", "composer.handle_placeholder": "Name", "composer.discard": "Hylkää", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 1c59ccba72..3cbcdfefe8 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Êtes-vous sûr de bien vouloir restaurer ce sujet ?", "thread_tools.purge": "Supprimer définitivement le(s) sujet(s)", "thread_tools.purge_confirm": "Êtes-vous sûr de bien vouloir supprimer définitivement ce sujet ?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Ce sujet a bien été déplacé vers %1.", "post_delete_confirm": "Êtes-vous sûr de bien vouloir supprimer ce message ?", "post_restore_confirm": "Êtes-vous sûr de bien vouloir restaurer ce message ?", @@ -89,6 +91,7 @@ "fork_pid_count": "%1 message(s) sélectionné(s)", "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": "Click the topics you want to merge", "composer.title_placeholder": "Entrer le titre du sujet ici…", "composer.handle_placeholder": "Nom", "composer.discard": "Abandonner", diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index ace8074655..4752bf17ab 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Estás seguro de que desexas restaurar este tema?", "thread_tools.purge": "Purgar Tema", "thread_tools.purge_confirm": "Estás seguro de que desexas eliminar definitivamente (purgar) este tema?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Este tema foi movido correctamente a %1", "post_delete_confirm": "Estás seguro de que desexas eliminar esta publicación?", "post_restore_confirm": "Estás seguro de que desexas restaurar esta publicación?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Introduce o título do teu tema", "composer.handle_placeholder": "Nome", "composer.discard": "Descartar", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index b9630978ea..e8d77f491c 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "אתה בטוח שאתה רוצה לשחזר את הנושא הזה?", "thread_tools.purge": "מחק נושא", "thread_tools.purge_confirm": "אתה בטוח שאתה רוצה למחוק את הנושא הזה?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "נושא זה הועבר בהצלחה ל %1", "post_delete_confirm": "אתה בטוח שאתה רוצה למחוק את הפוסט הזה?", "post_restore_confirm": "אתה בטוח שאתה רוצה לשחזר את הפוסט הזה?", @@ -89,6 +91,7 @@ "fork_pid_count": "%1 post(s) selected", "fork_success": "הפוסט שוכפל בהצלחה! לחץ כאן על מנת לעבור לפוסט המשוכפל.", "delete_posts_instruction": "לחץ על הפוסטים שברצונך למחוק", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "הכנס את כותרת הנושא כאן...", "composer.handle_placeholder": "שם", "composer.discard": "מחק", diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index 98a6210428..00ad1d8de7 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Sigurni ste da želite povratiti ovu temu?", "thread_tools.purge": "Odbaci temu", "thread_tools.purge_confirm": "Sigurni ste da želite odbaciti ovu temu?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Tema je uspješno pomaknuta u %1", "post_delete_confirm": "Sigurni ste da želite obrisati ovu objavu?", "post_restore_confirm": "Sigurni ste da želite povratiti ovu objavu?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Unesite naslov teme ovdje ...", "composer.handle_placeholder": "Ime", "composer.discard": "Odbaci", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 2643558f3d..11eeb4eb0f 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", "thread_tools.purge": "Purge Topic", "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "This topic has been successfully moved to %1", "post_delete_confirm": "Are you sure you want to delete this post?", "post_restore_confirm": "Are you sure you want to restore this post?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Írd be a témanevet...", "composer.handle_placeholder": "Name", "composer.discard": "Elvet", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 745de176bf..700acd9b84 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Kamu yakin ingin mengembalikan topik ini?", "thread_tools.purge": "Musnahkan Topik", "thread_tools.purge_confirm": "Kamu yakin ingin memusnahkan topik ini?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Topik ini berhasil dipindahkan ke %1", "post_delete_confirm": "Kamu yakin ingin menghapus posting ini?", "post_restore_confirm": "Kamu yakin ingin mengembalikan posting ini?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Masukkan judul topik di sini...", "composer.handle_placeholder": "Nama", "composer.discard": "Buang", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index e9540a5b89..747ba4876b 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Sei sicuro di voler ripristinare questa discussione?", "thread_tools.purge": "Svuota Discussione", "thread_tools.purge_confirm": "Sei sicuro di voler svuotare questa discussione?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Questa discussione è stata correttamente spostata in %1", "post_delete_confirm": "Sei sicuro di voler cancellare questo post?", "post_restore_confirm": "Sei sicuro di voler ripristinare questo post?", @@ -89,6 +91,7 @@ "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 cancellare/eliminare", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "Inserisci qui il titolo della discussione...", "composer.handle_placeholder": "Nome", "composer.discard": "Annulla", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 98e0208920..f34844e326 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "本当にこのスレッドを戻しますか？", "thread_tools.purge": "スレッドを切り離します", "thread_tools.purge_confirm": "本当にこのスレッドを切り離しますか？", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "このスレッドを%1に移動しました。", "post_delete_confirm": "本当にこの投稿を削除しますか？", "post_restore_confirm": "本当にこの投稿を元に戻しますか？", @@ -89,6 +91,7 @@ "fork_pid_count": "%1 投稿(s)が選択されました", "fork_success": "スレッドをフォークするのに成功しました。ここを押して、このフォークしたスレッドに行きます。", "delete_posts_instruction": "削除または切り離するには、当てはまる投稿を押してください", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "スレッドのタイトルを入力...", "composer.handle_placeholder": "名前", "composer.discard": "破棄する", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index 11d0d8fc7e..d55fb7fcec 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "이 게시물을 복원 하시겠습니까?", "thread_tools.purge": "게시물 폐기", "thread_tools.purge_confirm": "이 게시물을 폐기 하시겠습니까?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "성공적으로 이 게시물을 %1로 이동했습니다.", "post_delete_confirm": "이 포스트를 삭제 하시겠습니까?", "post_restore_confirm": "이 포스트를 복원 하시겠습니까?", @@ -89,6 +91,7 @@ "fork_pid_count": "%1 개의 포스트(들)이 선택되었습니다", "fork_success": "게시물이 분리되었습니다! 분리된 게시물을 보려면 여기를 클릭 하세요.", "delete_posts_instruction": "삭제할 포스트를 선택하세요.", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "게시물 제목을 입력하세요.", "composer.handle_placeholder": "이름", "composer.discard": "취소", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index 406d1062b9..822acaf0b8 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Ar jūs tikrai norite atkurti šią temą?", "thread_tools.purge": "Išvalyti temą", "thread_tools.purge_confirm": "Ar tikrai norite išvalyti šią temą?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Ši tema buvo sėkmingai perkelta į %1", "post_delete_confirm": "Ar jūs tikrai norite ištrinti šį įrašą?", "post_restore_confirm": "Ar jūs tikrai norite atkurti šį įrašą?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Įrašykite temos pavadinimą...", "composer.handle_placeholder": "Vardas ir pavardė", "composer.discard": "Atšaukti", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index 3f8737d458..5467b70702 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Anda yakin untuk pulihkan topik ini?", "thread_tools.purge": "Singkirkan Topik", "thread_tools.purge_confirm": "Anda yakin untuk singkirkan topik ini?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Topik telah dipindahkan ke %1", "post_delete_confirm": "Adakah anda pasti untuk memadam kiriman ini?", "post_restore_confirm": "Adakah anda pasti untuk memulihkan kiriman ini?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Masukkan tajuk topik disini", "composer.handle_placeholder": "Nama", "composer.discard": "Abaikan", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 031f366c51..27db8ac117 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Er du sikker på at du vil gjenopprette dette emnet?", "thread_tools.purge": "Rensk emne", "thread_tools.purge_confirm": "Er du sikker på at du vil renske dette emnet?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Emnet har blitt flyttet til %1", "post_delete_confirm": "Er du sikker på at du vil slette dette innlegget?", "post_restore_confirm": "Er du sikker på at du vil gjenopprette dette innlegget?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Skriv din tråd-tittel her", "composer.handle_placeholder": "Navn", "composer.discard": "Forkast", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index 4908453fee..b1d33fd9da 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Zeker weten dit onderwerp te herstellen?", "thread_tools.purge": "Wis onderwerp ", "thread_tools.purge_confirm": "Weet je zeker dat je dit onderwerp wil verwijderen?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Verplaatsen van onderwerp naar %1 succesvol", "post_delete_confirm": "Is het absoluut de bedoeling dit bericht te verwijderen?", "post_restore_confirm": "Is het de bedoeling dit bericht te herstellen?", @@ -89,6 +91,7 @@ "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": "Click the topics you want to merge", "composer.title_placeholder": "Voer hier de titel van het onderwerp in...", "composer.handle_placeholder": "Naam", "composer.discard": "Annuleren", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index fb2fa3e93c..e3fd7d49fe 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Na pewno chcesz przywrócić ten temat?", "thread_tools.purge": "Wymaż temat", "thread_tools.purge_confirm": "Na pewno chcesz wymazać ten temat?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Temat przeniesiono do %1", "post_delete_confirm": "Na pewno chcesz usunąć ten post?", "post_restore_confirm": "Na pewno chcesz przywrócić ten post?", @@ -89,6 +91,7 @@ "fork_pid_count": "wybrano %1 post(-ów)", "fork_success": "Udało się skopiować temat. Kliknij tutaj, aby do niego przejść.", "delete_posts_instruction": "Kliknij na posty, które chcesz usunąć", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "Wpisz tutaj tytuł tematu...", "composer.handle_placeholder": "Nazwa", "composer.discard": "Odrzuć", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 6ae93feb95..def9099360 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Tem certeza que deseja restaurar este tópico?", "thread_tools.purge": "Expurgar Tópico", "thread_tools.purge_confirm": "Tem certeza que deseja expurgar este tópico? ", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Tópico movido com sucesso para %1", "post_delete_confirm": "Tem certeza que deseja deletar este post?", "post_restore_confirm": "Tem certeza que deseja restaurar este post?", @@ -89,6 +91,7 @@ "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": "Click the topics you want to merge", "composer.title_placeholder": "Digite aqui o título para o seu tópico...", "composer.handle_placeholder": "Nome", "composer.discard": "Descartar", diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index 9647b731c5..fb2ea14eee 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Tens a certeza que pretendes restaurar este tópico?", "thread_tools.purge": "Purgar tópico", "thread_tools.purge_confirm": "Tens a certeza que desejas continuar com a purgação deste tópico?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Este tópico foi movido com sucesso para %1", "post_delete_confirm": "Tens a certeza que desejas eliminar esta publicação?", "post_restore_confirm": "Tens a certeza que desejas restaurar esta publicação?", @@ -89,6 +91,7 @@ "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 em publicações que queres apagar/purgar", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "Insere aqui o título do tópico...", "composer.handle_placeholder": "Nome", "composer.discard": "Descartar", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 36ed0ffb0f..fe89ee4244 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Esti sigur că vrei să restaurezi acest subiect?", "thread_tools.purge": "Curăță Subiect", "thread_tools.purge_confirm": "Ești sigur că vrei sa cureți acest subiect?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Acest mesaj a fost mutat cu succes în %1", "post_delete_confirm": "Ești sigur că vrei să ștergi acest mesaj?", "post_restore_confirm": "Esti sigur că vrei să restaurezi acest mesaj?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Introdu numele subiectului aici ...", "composer.handle_placeholder": "Name", "composer.discard": "Renunță", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index ba4e4fcec0..84aa1fa724 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Вы уверены, что хотите восстановить тему?", "thread_tools.purge": "Стереть тему", "thread_tools.purge_confirm": "Вы уверены, что хотите стереть эту тему?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Эта тема успешно перемещена в %1", "post_delete_confirm": "Вы уверены, что хотите удалить эту запись?", "post_restore_confirm": "Вы уверены, что хотите восстановить эту запись?", @@ -89,6 +91,7 @@ "fork_pid_count": "Отмечено %1 сообщений", "fork_success": "Готово! Просмотр отделённой темы.", "delete_posts_instruction": "Отметьте записи, которые вы хотите удалить", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "Введите название темы...", "composer.handle_placeholder": "Название", "composer.discard": "Отменить", diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index dfe0130e0f..c01bbf1dd1 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Wiringiye neza ko ushaka kugarura iki kiganiro?", "thread_tools.purge": "Sibanganya Ikiganiro", "thread_tools.purge_confirm": "Wiringiye neza ko ushaka gusibanganya iki kiganiro?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Nta ngorane, iki kiganiro kimaze kwimurirwa muri %1", "post_delete_confirm": "Wiringiye neza ko ushaka gukuraho iki kiganiro?", "post_restore_confirm": "Wiringiye neza ko ushaka kugarura iki kiganiro? ", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Shyira umutwe w'ikiganiro cyawe aha...", "composer.handle_placeholder": "Izina", "composer.discard": "Byihorere", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index f5e4b1b376..3074f4b2f0 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", "thread_tools.purge": "Purge Topic", "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "This topic has been successfully moved to %1", "post_delete_confirm": "Are you sure you want to delete this post?", "post_restore_confirm": "Are you sure you want to restore this post?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Pone su tìtulu de s'arresonada inoghe...", "composer.handle_placeholder": "Name", "composer.discard": "Lassa a Pèrdere", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index 9eeab330be..f32fa2c20e 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Ste si naozaj istý že chcete obnoviť túto tému?", "thread_tools.purge": "Vyčistiť tému", "thread_tools.purge_confirm": "Ste si naozaj istý že chcete vyčistiť túto tému?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Téma bola úspešne presunutá do %1", "post_delete_confirm": "Ste si istý, že chcete odstrániť tento príspevok?", "post_restore_confirm": "Ste si istí, že chcete obnoviť tento príspevok?", @@ -89,6 +91,7 @@ "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": "Click the topics you want to merge", "composer.title_placeholder": "Sem zadajte názov témy...", "composer.handle_placeholder": "Meno", "composer.discard": "Zahodiť", diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index cc539f3f40..0c2f4f135e 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Ste prepričani, da želite obnoviti to temo?", "thread_tools.purge": "Očisti temo", "thread_tools.purge_confirm": "Ste prepričani, da želite očistiti to temo?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Ta tema je bila uspešno prestavljena v %1", "post_delete_confirm": "Ste prepričani, da želite izbrisati to objavo?", "post_restore_confirm": "Ste prepričani, da želite razveljaviti to objavo?", @@ -89,6 +91,7 @@ "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", "composer.title_placeholder": "Vpiši naslov teme...", "composer.handle_placeholder": "Ime", "composer.discard": "Zavrzi", diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index e104832976..53f860c3d3 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Да ли сте сигурни да желите да обновите ову тему?", "thread_tools.purge": "Очисти тему", "thread_tools.purge_confirm": "Да ли сте сигурни да желите да очистите ову тему?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Ова тема је успешно премештена у %1", "post_delete_confirm": "Да ли сте сигурни да желите да избришете ову поруку?", "post_restore_confirm": "Да ли сте сигурни да желите да обновите ову поруку?", @@ -89,6 +91,7 @@ "fork_pid_count": "Одабрано порука: %1", "fork_success": "Тема је успешно рачвана! Кликните овде за одлазак на рачвану тему.", "delete_posts_instruction": "Кликните на поруке које желите да избришете/очистите", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "Овде унесите назив теме...", "composer.handle_placeholder": "Име", "composer.discard": "Одбаци", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index bf51d85095..131077062e 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Är du säker på att du vill återställa det här ämnet?", "thread_tools.purge": "Rensa bort ämne", "thread_tools.purge_confirm": "Är du säker att du vill rensa bort det här ämnet?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Det här ämnet har flyttats till %1", "post_delete_confirm": "Är du säker på att du vill ta bort det här inlägget?", "post_restore_confirm": "Är du säker på att du vill återställa det här inlägget?", @@ -89,6 +91,7 @@ "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": "Click the topics you want to merge", "composer.title_placeholder": "Skriv in ämnets titel här...", "composer.handle_placeholder": "Namn", "composer.discard": "Avbryt", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index 69e1b0b54f..980bf12387 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "มั่นใจแล้วหรือไม่ที่จะกู้คืน Topic นี้?", "thread_tools.purge": "ล้างกระทู้", "thread_tools.purge_confirm": "คุณแน่ใจแล้วใช้ไมว่าต้องการล้างกระทู้นี้?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "กระทู้นี้ได้รับการย้ายไปยัง %1 เรียบร้อยแล้ว", "post_delete_confirm": "คุณแน่ใจแล้วใช่ไหมว่าต้องการลบโพสต์นี้", "post_restore_confirm": "คุณแน่ใจแล้วใช้ไหมว่าต้องการกู้คืนโพสต์นี้", @@ -89,6 +91,7 @@ "fork_pid_count": " %1 โพสต์(s) ที่เลือก", "fork_success": "แตกกระทู้สำเร็จแล้ว! คลิกที่นี่เพื่อไปยั้งกระทู้ที่คุณแตกประเด็น", "delete_posts_instruction": "คลิกโพสต์ที่คุณต้องการลบ/ล้าง", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "ป้อนชื่อกระทู้ของคุณที่นี่ ...", "composer.handle_placeholder": "ชื่อ", "composer.discard": "ยกเลิก", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index b05175efa4..4fa9e54998 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Bu konuyu gerçekten geri getirmek istiyor musun?", "thread_tools.purge": "Konuyu Temizle", "thread_tools.purge_confirm": "Bu konuyu temizlemek istediğinize eminmisiniz?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Başlık %1 kategorisine başarıyla taşındı.", "post_delete_confirm": "Bu iletiyi gerçekten silmek istediğinize emin misiniz?", "post_restore_confirm": "Bu iletiyi gerçekten geri getirmek istiyor musun?", @@ -89,6 +91,7 @@ "fork_pid_count": "%1 ileti(ler) seçildi", "fork_success": "Başlık başarıyla ayrıldı!", "delete_posts_instruction": "Silmek/temizlemek istediğiniz iletilere tıklayın.", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "Başlık ismini buraya girin...", "composer.handle_placeholder": "İsim", "composer.discard": "Vazgeç", diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index 76ac483f3b..5b464da5fe 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Ви точно бажаєте відновити цю тему?", "thread_tools.purge": "Стерти тему", "thread_tools.purge_confirm": "Ви точно бажаєте стерти цю тему?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Тема була успішно переміщена до %1", "post_delete_confirm": "Ви точно бажаєте видалити цей пост?", "post_restore_confirm": "Ви точно бажаєте відновити цей пост?", @@ -89,6 +91,7 @@ "fork_pid_count": "вибрано %1 пост(ів) ", "fork_success": "Тему успішно відгалужено. Тисніть тут, щоб перейти до відгалуженої теми.", "delete_posts_instruction": "Тисніть пости які ви бажаєте видалити/стерти", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "Уведіть заголовок теми...", "composer.handle_placeholder": "Ім'я", "composer.discard": "Скасувати", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index d3379b29fd..6f8290fa75 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "Bạn có muốn phục hồi chủ đề này?", "thread_tools.purge": "Xóa hẳn chủ đề", "thread_tools.purge_confirm": "Bạn có muốn xóa hẳn chủ đề này?", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "Đã chuyển thành công chủ đề này sang %1", "post_delete_confirm": "Bạn có chắc là muốn xóa bài gửi này không?", "post_restore_confirm": "Bạn có chắc là muốn phục hồi bài gửi này không?", @@ -89,6 +91,7 @@ "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 the topics you want to merge", "composer.title_placeholder": "Nhập tiêu đề cho chủ đề của bạn tại đây...", "composer.handle_placeholder": "Tên", "composer.discard": "Huỷ bỏ", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 63d808ecd6..6687b7b58c 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "确定要恢复此主题吗？", "thread_tools.purge": "清除主题", "thread_tools.purge_confirm": "确认清除此主题吗？", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "此主题已成功移到 %1", "post_delete_confirm": "确定删除此帖吗？", "post_restore_confirm": "确定恢复此帖吗？", @@ -89,6 +91,7 @@ "fork_pid_count": "选择了 %1 个帖子", "fork_success": "成功分割主题! 点这里跳转到分割后的主题。", "delete_posts_instruction": "点击想要删除/永久删除的帖子", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "在此输入您主题的标题...", "composer.handle_placeholder": "姓名", "composer.discard": "撤销", diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index 07b37ee21e..bcfd71fb09 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -68,6 +68,8 @@ "thread_tools.restore_confirm": "你確定你要恢復這個主題嗎？", "thread_tools.purge": "清除主題", "thread_tools.purge_confirm": "你確定要清除這個主題？", + "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge": "Merge", "topic_move_success": "主題已成功移至 %1", "post_delete_confirm": "你確定要刪除這文章嗎？", "post_restore_confirm": "你確定要還原這文章嗎？", @@ -89,6 +91,7 @@ "fork_pid_count": "%1 張貼已選定", "fork_success": "成功分叉成新的主題！點擊這裡進入新的主題。", "delete_posts_instruction": "點擊你想要刪除/清除的張貼", + "merge_topics_instruction": "Click the topics you want to merge", "composer.title_placeholder": "輸入標題...", "composer.handle_placeholder": "名字", "composer.discard": "放棄",