NodeBB could not reach the package manager, proceed with installation of latest version?
NodeBB could not reach the package manager, proceed with installation of latest version?
NodeBB could not reach the package manager, proceed with installation of latest version?
NodeBB could not reach the package manager, proceed with installation of latest version?
NodeBB could not reach the package manager, proceed with installation of latest version?
NodeBB could not reach the package manager, proceed with installation of latest version?
NodeBB가 페키지 매니저 접근에 실패하였습니다. 최신 버젼을 설치하시겠습니까?
NodeBB could not reach the package manager, proceed with installation of latest version?
Šis veiksmas yra negrįžtamas, ir jūs negalėsite susigrąžinti jokių duomenų
Įveskite savo vardą, kad patvirtintumėte, jog norite panaikinti šią paskyrą.",
+ "delete_account_confirm": "Are you sure you want to 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": "Ar jūs tikrai norite ištrint šią paskyrą?
Šis veiksmas nebesugražinamas ir jūs nebegalėsite atgauti jokių duomenų
",
"account-deleted": "Paskyra ištrinta",
"fullname": "Vardas ir pavardė",
@@ -53,7 +53,6 @@
"change_password": "Pakeisti slaptažodį",
"change_password_error": "Negalimas slaptažodis!",
"change_password_error_wrong_current": "Jūsų dabartinis slaptažodis neteisingas!",
- "change_password_error_length": "Slaptažodis per trumpas!",
"change_password_error_match": "Slaptažodžiai privalo sutapti!",
"change_password_error_privileges": "Jūs neturite teisių pakeisti šį slaptažodį.",
"change_password_success": "Jūsų slaptažodis atnaujintas!",
diff --git a/public/language/ms/admin/admin.json b/public/language/ms/admin/admin.json
index cca6420575..36f0fdde60 100644
--- a/public/language/ms/admin/admin.json
+++ b/public/language/ms/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
"acp-title": "%1 | NodeBB Admin Control Panel",
diff --git a/public/language/ms/admin/appearance/themes.json b/public/language/ms/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/ms/admin/appearance/themes.json
+++ b/public/language/ms/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/ms/admin/extend/plugins.json b/public/language/ms/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/ms/admin/extend/plugins.json
+++ b/public/language/ms/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/ms/admin/general/dashboard.json b/public/language/ms/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/ms/admin/general/dashboard.json
+++ b/public/language/ms/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/ms/admin/menu.json b/public/language/ms/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/ms/admin/menu.json
+++ b/public/language/ms/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/ms/admin/settings/post.json b/public/language/ms/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/ms/admin/settings/post.json
+++ b/public/language/ms/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/ms/reset_password.json b/public/language/ms/reset_password.json
index cb2fd6f183..c2701e9866 100644
--- a/public/language/ms/reset_password.json
+++ b/public/language/ms/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Sahkan kata laluan",
"enter_email": "Sila masukkan alamat emel dan kami akan menghantar arahan untuk penetapan semula akaun anda",
"enter_email_address": "Masukkan alamat emel",
- "password_reset_sent": "Penetapan semula kata laluan telah dihantar",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Emel yang tidak sah / Emel tidak wujud",
"password_too_short": "Kata lauan terlalu pendek, sila pilih kata laluan yang lain",
"passwords_do_not_match": "Kedua-dua laluan yang dimasukkan tidak sepadan / tidak sama",
diff --git a/public/language/ms/search.json b/public/language/ms/search.json
index a8124e414b..feae32b7b5 100644
--- a/public/language/ms/search.json
+++ b/public/language/ms/search.json
@@ -5,6 +5,9 @@
"in": "Dalam",
"titles": "Tajuk",
"titles-posts": "Tajuk dan kiriman",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Dikirim oleh",
"in-categories": "Dalam kategori",
"search-child-categories": "Cari anak kategori",
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index 1f294a5778..20dd15bb0d 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Kunci topik",
"thread_tools.unlock": "Buka kekunci topik",
"thread_tools.move": "Pindahkan topik",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Pindahkan Semua",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "Fork topik",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Masukkan tajuk topik disini",
"composer.handle_placeholder": "Nama",
"composer.discard": "Abaikan",
diff --git a/public/language/ms/user.json b/public/language/ms/user.json
index 5f2de188d1..9dd8aad851 100644
--- a/public/language/ms/user.json
+++ b/public/language/ms/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Adakah anda pasti ingin menyekat pengguna ini?",
"unban_account": "Buang Sekatan Akaun",
"delete_account": "Padam Akaun",
- "delete_account_confirm": "Anda yakin untuk padam akaun anda?
Pebuatan ini tidak boleh diundur dan anda tidak boleh memulihkan sebarang data anda.
Masukkan nama pengguna anda untuk memastikan anda benar-benar ingin memadam akaun ini.",
+ "delete_account_confirm": "Are you sure you want to 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": "Anda yakin untuk padam akaun ini?
Pebuatan ini tidak boleh diundur dan anda tidak boleh memulihkan sebarang data
",
"account-deleted": "Akaun Dipadam",
"fullname": "Nama Penuh",
@@ -53,7 +53,6 @@
"change_password": "Tukar kata laluan",
"change_password_error": "Kata laluan salah!",
"change_password_error_wrong_current": "Kata laluan anda sekarang tidak sah",
- "change_password_error_length": "Kata laluan terlalu pendek",
"change_password_error_match": "Kata laluan mesti padan",
"change_password_error_privileges": "Anda tidak mempunyai kebenaran untuk mengubah kata laluan ini",
"change_password_success": "Kata laluan dikemaskini",
diff --git a/public/language/nb/admin/admin.json b/public/language/nb/admin/admin.json
index 3869f69f58..1c96a5c8cc 100644
--- a/public/language/nb/admin/admin.json
+++ b/public/language/nb/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Er du sikker på at du ønsker å restarte NoddeBB?",
"acp-title": "%1 | NodeBB Admin Control Panel",
diff --git a/public/language/nb/admin/appearance/themes.json b/public/language/nb/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/nb/admin/appearance/themes.json
+++ b/public/language/nb/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/nb/admin/extend/plugins.json b/public/language/nb/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/nb/admin/extend/plugins.json
+++ b/public/language/nb/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/nb/admin/general/dashboard.json b/public/language/nb/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/nb/admin/general/dashboard.json
+++ b/public/language/nb/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/nb/admin/menu.json b/public/language/nb/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/nb/admin/menu.json
+++ b/public/language/nb/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/nb/admin/settings/post.json b/public/language/nb/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/nb/admin/settings/post.json
+++ b/public/language/nb/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/nb/reset_password.json b/public/language/nb/reset_password.json
index 954755912c..86622f97fd 100644
--- a/public/language/nb/reset_password.json
+++ b/public/language/nb/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Bekreft passord",
"enter_email": "Vennligst skriv inn e-post-adressen din, så sender vi en e-post med instruksjoner om hvordan du tilbakestiller kontoen din.",
"enter_email_address": "Skriv e-postadresse",
- "password_reset_sent": "Passord-tilbakestilling sendt",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Ugyldig e-post / e-post eksisterer ikke",
"password_too_short": "Passordet du skrev inn er for kort, vennligst velg et lengre passord.",
"passwords_do_not_match": "Passordene du har skrevet inn samsvarer ikke.",
diff --git a/public/language/nb/search.json b/public/language/nb/search.json
index 81bba3d430..a3e13371a8 100644
--- a/public/language/nb/search.json
+++ b/public/language/nb/search.json
@@ -5,6 +5,9 @@
"in": "I",
"titles": "Titler",
"titles-posts": "Titler og innlegg",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Skapt av",
"in-categories": "I kategorier",
"search-child-categories": "Søk underkategorier",
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index e195da3eca..679312c3c4 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Lås tråd",
"thread_tools.unlock": "Lås opp tråd",
"thread_tools.move": "Flytt tråd",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Flytt alle",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "Forgren tråd",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Skriv din tråd-tittel her",
"composer.handle_placeholder": "Navn",
"composer.discard": "Forkast",
diff --git a/public/language/nb/user.json b/public/language/nb/user.json
index 43e2679f66..a2ba42248a 100644
--- a/public/language/nb/user.json
+++ b/public/language/nb/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Vil du virkelig utestenge denne brukeren?",
"unban_account": "Opphev utestenging",
"delete_account": "Slett konto",
- "delete_account_confirm": "Er du sikker på at du vil slette kontoen din?
Dette kan ikke reverseres, og du vil ikke kunne hente tilbake dine data.
Skriv inn ditt brukernavn for å bekrefte at du vil tilintetgjøre denne kontoen.",
+ "delete_account_confirm": "Are you sure you want to 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": "Er du sikker på at du vil slette denne kontoen?
Denne handlingen kan ikke reverseres og du vil ikke kunne gjenopprette noe data
",
"account-deleted": "Konto slettet",
"fullname": "Fullt navn",
@@ -53,7 +53,6 @@
"change_password": "Endre passord",
"change_password_error": "Ugyldig passord!",
"change_password_error_wrong_current": "Ditt gjeldende passord er ikke korrekt!",
- "change_password_error_length": "Passord for kort!",
"change_password_error_match": "Passordene må samsvare!",
"change_password_error_privileges": "Du har ikke rettigheter tli å endre dette passordet.",
"change_password_success": "Passordet ditt ble oppdatert!",
diff --git a/public/language/nl/admin/admin.json b/public/language/nl/admin/admin.json
index b7b24544fe..2f59978661 100644
--- a/public/language/nl/admin/admin.json
+++ b/public/language/nl/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Weet u zeker dat u NodeBB opnieuw wilt opstarten?",
"acp-title": "%1 | NodeBB Administratiepaneel",
diff --git a/public/language/nl/admin/appearance/themes.json b/public/language/nl/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/nl/admin/appearance/themes.json
+++ b/public/language/nl/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/nl/admin/extend/plugins.json b/public/language/nl/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/nl/admin/extend/plugins.json
+++ b/public/language/nl/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/nl/admin/general/dashboard.json b/public/language/nl/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/nl/admin/general/dashboard.json
+++ b/public/language/nl/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/nl/admin/menu.json b/public/language/nl/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/nl/admin/menu.json
+++ b/public/language/nl/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/nl/admin/settings/post.json b/public/language/nl/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/nl/admin/settings/post.json
+++ b/public/language/nl/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/nl/email.json b/public/language/nl/email.json
index 91f7613428..8f9c2faaf0 100644
--- a/public/language/nl/email.json
+++ b/public/language/nl/email.json
@@ -9,7 +9,7 @@
"welcome.text3": "Een administrator heeft uw registratie geaccepteerd. U kan nu inloggen met uw gebruikersnaam en wachtwoord.",
"welcome.cta": "Klik hier om je e-mailadres te bevestigen",
"invitation.text1": "%1 heeft u uitgenodigd voor %2 ",
- "invitation.text2": "Your invitation will expire in %1 days.",
+ "invitation.text2": "Uw uitnodiging vervalt over %1 dagen.",
"invitation.ctr": "Klik hier om je account aan te maken.",
"reset.text1": "We hebben een verzoek ontvangen om je wachtwoord te herstellen, wellicht omdat je hem bent vergeten. Indien dit niet het geval is kan je deze e-mail gewoon negeren.",
"reset.text2": "Om je wachtwoord opnieuw in te stellen klik je op deze link:",
diff --git a/public/language/nl/error.json b/public/language/nl/error.json
index ffe8c5f318..762d3e3de7 100644
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -116,8 +116,8 @@
"cant-delete-chat-message": "Het is niet toegestaan om dit bericht te verwijderen",
"chat-edit-duration-expired": "Het is slechts toegestaan om binnen %1 seconde(n) na plaatsen van het chat bericht, deze te bewerken.",
"chat-delete-duration-expired": "Het is slechts toegestaan om binnen %1 seconde(n) na plaatsen van het chat bericht, deze te verwijderen.",
- "chat-deleted-already": "This chat message has already been deleted.",
- "chat-restored'already": "This chat message has already been restored.",
+ "chat-deleted-already": "Dit chat bericht is al verwijderd.",
+ "chat-restored'already": "Dit chat bericht is al hersteld.",
"already-voting-for-this-post": "Je hebt al gestemd voor deze post.",
"reputation-system-disabled": "Reputatie systeem is uitgeschakeld.",
"downvoting-disabled": "Negatief stemmen is uitgeschakeld",
@@ -134,7 +134,7 @@
"wrong-login-type-email": "Gebruik je e-mailadres om in te loggen",
"wrong-login-type-username": "Gebruik je gebruikersnaam om in te loggen",
"sso-registration-disabled": "Registratie is uitgeschakeld voor %1 accounts, registreer eerst met een e-mailadres",
- "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.",
+ "sso-multiple-association": "U kunt niet meerdere accounts van deze service associeren met uw NodeBB account. Verwijder eerst de associatie met uw huidige account en probeer het opnieuw.",
"invite-maximum-met": "Je heb het maximum aantal mensen uitgenodigd (%1 van de %2).",
"no-session-found": "Geen login sessie gevonden!",
"not-in-room": "Gebruiker niet in de chat",
@@ -145,5 +145,5 @@
"invalid-session": "Verkeerde sessie combinatie",
"invalid-session-text": "Het lijkt erop dat je login sessie niet meer actief is of niet langer synchroon is met de server. Ververs de pagina.",
"no-topics-selected": "Geen onderwerpen geselecteerd!",
- "cant-move-to-same-topic": "Can't move post to same topic!"
+ "cant-move-to-same-topic": "Een bericht kan niet naar hetzelfde onderwerp worden verplaatst!"
}
\ No newline at end of file
diff --git a/public/language/nl/global.json b/public/language/nl/global.json
index d828a8b681..81742a4e0a 100644
--- a/public/language/nl/global.json
+++ b/public/language/nl/global.json
@@ -107,5 +107,5 @@
"edited": "Bewerkt",
"disabled": "Uitgeschakeld",
"select": "Selecteer",
- "user-search-prompt": "Type something here to find users..."
+ "user-search-prompt": "Typ hier om gebruikers te vinden..."
}
\ No newline at end of file
diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json
index 1203e055af..cd13416ea1 100644
--- a/public/language/nl/modules.json
+++ b/public/language/nl/modules.json
@@ -1,5 +1,5 @@
{
- "chat.chatting_with": "Chat with",
+ "chat.chatting_with": "Chat met",
"chat.placeholder": "Typ een chatbericht hier, toets enter om te verzenden",
"chat.send": "Verzenden",
"chat.no_active": "Er zijn geen actieve chats.",
@@ -12,7 +12,7 @@
"chat.recent-chats": "Recent gevoerde gesprekken",
"chat.contacts": "Contacten",
"chat.message-history": "Berichtengeschiedenis",
- "chat.options": "Chat options",
+ "chat.options": "Chat opties",
"chat.pop-out": "Chatvenster opbrengen bij chat",
"chat.minimize": "Verkleinen",
"chat.maximize": "Maximaliseren",
@@ -21,17 +21,17 @@
"chat.three_months": "3 maanden",
"chat.delete_message_confirm": "Weet je zeker dat je dit bericht wilt verwijderen?",
"chat.add-users-to-room": "Voeg gebruikers toe aan deze chat room",
- "chat.retrieving-users": "Retrieving users...",
- "chat.manage-room": "Manage Chat Room",
- "chat.add-user-help": "Search for users here. When selected, the user will be added to the chat. The new user will not be able to see chat messages written before they were added to the conversation.",
+ "chat.retrieving-users": "Gebruikers ophalen...",
+ "chat.manage-room": "Chat Room beheren",
+ "chat.add-user-help": "Zoek hier naar gebruikers. Indien geselecteerd word de gebruiker toegevoegd aan de chat. De nieuwe gebruiker kan geen chat berichten zien die geschreven zijn voordat de gebruiker was toegevoegd aan de conversatie.",
"chat.confirm-chat-with-dnd-user": "Deze gebruiker heeft de status op Niet Storen (DnD, Do not disturb) gezet. Wil je nog steeds een chat starten met deze persoon?",
- "chat.rename-room": "Rename room",
- "chat.rename-placeholder": "Enter your room name here",
- "chat.rename-help": "The room name set here will be viewable by all participants in the room.",
- "chat.leave": "Leave Chat",
- "chat.leave-prompt": "Are you sure you wish to leave this chat?",
- "chat.leave-help": "Leaving this chat will remove you from future correspondence in this chat. If you are re-added in the future, you will not see any chat history from prior to your re-joining.",
- "chat.in-room": "In this room",
+ "chat.rename-room": "Verander chat room van naam",
+ "chat.rename-placeholder": "Voer hier de naam van je chat room in",
+ "chat.rename-help": "De naam van de chat room die je hier zet is zichtbaar voor alle deelnemers aan de chat.",
+ "chat.leave": "Verlaat Chat",
+ "chat.leave-prompt": "Weet je zeker dat je deze chat wilt verlaten?",
+ "chat.leave-help": "Als je de chat verlaat zul je toekomstige correspondentie in de chat niet meer zien. Als je later weer wordt toegevoegd, dan kun je de chat geschiedenis tot de hertoevoeging niet zien.",
+ "chat.in-room": "In deze chat room",
"composer.compose": "Samenstellen",
"composer.show_preview": "Voorbeeldweergave",
"composer.hide_preview": "Verberg voorbeeld",
diff --git a/public/language/nl/reset_password.json b/public/language/nl/reset_password.json
index c5b9ef1a9f..7f529fdf84 100644
--- a/public/language/nl/reset_password.json
+++ b/public/language/nl/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Bevestiging wachtwoord",
"enter_email": "Geef het e-mailadres op dat tijdens registratie gebruikt is, en we versturen je een bericht met vervolginstructies voor het ontgrendelen van de account.",
"enter_email_address": "Geef het e-mailadres op",
- "password_reset_sent": "Het bericht met daarin een link en de vervolgstappen voor het wachtwoordherstel, is verzonden",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Onbekend e-mailadres!",
"password_too_short": "Het opgegeven wachtwoord bevat te weinig tekens. Kies een veiliger wachtwoord met meer tekens.",
"passwords_do_not_match": "De twee opgegeven wachtwoorden komen niet overeen",
diff --git a/public/language/nl/search.json b/public/language/nl/search.json
index 55a1964be5..b2ba7ef272 100644
--- a/public/language/nl/search.json
+++ b/public/language/nl/search.json
@@ -5,6 +5,9 @@
"in": "in",
"titles": "Titels",
"titles-posts": "Titels en berichten",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Geplaatst door",
"in-categories": "In categorieën",
"search-child-categories": "Doorzoek subcategorieën ",
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index 7077bc6066..2dbe7745b3 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -30,12 +30,12 @@
"locked": "Gesloten",
"pinned": "Pinned",
"moved": "Verplaatst",
- "copy-ip": "Copy IP",
- "ban-ip": "Ban IP",
- "view-history": "Edit History",
+ "copy-ip": "Kopieer IP",
+ "ban-ip": "Verban IP",
+ "view-history": "Revisie geschiedenis",
"bookmark_instructions": "Klik hier om terug te keren naar de laatst gelezen post in deze thread.",
"flag_title": "Bericht aan beheerders melden",
- "merged_message": "This topic has been merged into %2",
+ "merged_message": "Dit onderwerp is gevoegd in %2",
"deleted_message": "Dit onderwerp is verwijderd. Alleen gebruikers met beheerrechten op onderwerpniveau kunnen dit inzien.",
"following_topic.message": "Vanaf nu worden meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.",
"not_following_topic.message": "Dit onderwerp zal verschijnen in de lijst van ongelezen onderwerpen, maar er zullen geen meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.",
@@ -62,6 +62,7 @@
"thread_tools.lock": "Onderwerp sluiten",
"thread_tools.unlock": "Onderwerp openen",
"thread_tools.move": "Onderwerp verplaatsen",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Verplaats alles",
"thread_tools.select_category": "Selecteer categorie",
"thread_tools.fork": "Onderwerp afsplitsen",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Voer hier de titel van het onderwerp in...",
"composer.handle_placeholder": "Naam",
"composer.discard": "Annuleren",
@@ -123,7 +125,7 @@
"stale.create": "Maak een nieuw onderwerp",
"stale.reply_anyway": "Reageer toch op dit onderwerp",
"link_back": "Re: [%1](%2)",
- "diffs.title": "Post Edit History",
- "diffs.description": "This post has %1 revisions. Click one of the revisions below to see the post content at that point in time.",
- "diffs.no-revisions-description": "This post has %1 revisions."
+ "diffs.title": "Bericht revisie geschiedenis",
+ "diffs.description": "Dit bericht heeft %1 revisies. Klik op een revisie hieronder om het bericht te zien op dat punt in de tijd.",
+ "diffs.no-revisions-description": "Dit bericht heeft %1 revisies."
}
\ No newline at end of file
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index ccac528faf..b20787831b 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -1,7 +1,7 @@
{
"banned": "Verbannen",
"offline": "Offline",
- "deleted": "Deleted",
+ "deleted": "Verwijderd",
"username": "Gebruikersnaam",
"joindate": "Datum van registratie",
"postcount": "Aantal geplaatste berichten",
@@ -12,7 +12,7 @@
"ban_account_confirm": "Weet u zeker dat u deze gebruiker wilt verbannen?",
"unban_account": "Verbanning intrekken",
"delete_account": "Account verwijderen",
- "delete_account_confirm": "Controleer of dat het zeker is dat deze account verwijderd moet worden.
Deze actie kan niet ongedaan gemaakt worden en herstellen van gebruiker- of profielgegevens is niet mogelijk
Typ hier de gebruikersnaam als extra controle om te bevestigen dat deze account verwijderd moet worden.",
+ "delete_account_confirm": "Are you sure you want to 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": "Weet u zeker dat u deze account wilt verwijderen?
Deze actie kan niet ongedaan worden en u kunt niet de informatie herstellen
",
"account-deleted": "Account verwijderd",
"fullname": "Volledige naam",
@@ -53,7 +53,6 @@
"change_password": "Wijzig wachtwoord",
"change_password_error": "Ongeldig wachtwoord!",
"change_password_error_wrong_current": "Het opgegeven huidige wachtwoord is onjuist!",
- "change_password_error_length": "Wachtwoord bevat te weinig tekens!",
"change_password_error_match": "Het eerder opgegeven wachtwoord komt niet overeen!",
"change_password_error_privileges": "Niet geautoriseerd om dit wachtwoord te mogen wijzigen.",
"change_password_success": "Het wachtwoord is gewijzigd!",
@@ -96,7 +95,7 @@
"topics_per_page": "Onderwerpen per pagina",
"posts_per_page": "Berichten per pagina",
"max_items_per_page": "Maximaal %1",
- "acp_language": "Admin Page Language",
+ "acp_language": "Taal van Admin Pagina",
"notification_sounds": "Speel een geluid af wanneer ik een notificatie ontvang",
"notifications_and_sounds": "Notificaties & Geluiden",
"incoming-message-sound": "Inkomend bericht geluid",
diff --git a/public/language/pl/admin/admin.json b/public/language/pl/admin/admin.json
index 26937bcd4f..d8f48c192e 100644
--- a/public/language/pl/admin/admin.json
+++ b/public/language/pl/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Jesteś pewny, że chciałbyś przebudować oraz zrestartować NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Jesteś pewny, że chciałbyś zrestartować NodeBB?",
"acp-title": "%1 | Panel administracyjny NodeBB",
diff --git a/public/language/pl/admin/appearance/themes.json b/public/language/pl/admin/appearance/themes.json
index 70f0f304f0..110cd26bf3 100644
--- a/public/language/pl/admin/appearance/themes.json
+++ b/public/language/pl/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Czy na pewno chcesz przywrócić domyślny styl NodeBB?",
"theme-changed": "Styl Zmieniony",
"revert-success": "Pomyślnie przywrócono domyślny styl NodeBB.",
- "restart-to-activate": "Proszę zrestartować NodeBB, aby styl poprawnie działał."
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/pl/admin/extend/plugins.json b/public/language/pl/admin/extend/plugins.json
index 99801f0b18..d02d1ad56d 100644
--- a/public/language/pl/admin/extend/plugins.json
+++ b/public/language/pl/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Wtyczka odinstalowana",
"alert.activate-success": "Proszę zrestartować NodeBB, aby w pełni aktywować tą wtyczkę",
"alert.deactivate-success": "Wtyczka pomyślnie dezaktywowana",
- "alert.upgrade-success": "Proszę przeładować NodeBB, aby w pełni aktualizować tą wtyczkę",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Wtyczka została pomyślnie zainstalowana, proszę ją aktywować.",
"alert.uninstall-success": "Wtyczka została pomyślnie zdezaktywowana oraz odinstalowana.",
"alert.suggest-error": "NodeBB nie może dostać się do menedżera pakietów, kontynuować instalacji ostatniej wersji?
Serwer zwrócił (%1): %2
",
diff --git a/public/language/pl/admin/general/dashboard.json b/public/language/pl/admin/general/dashboard.json
index 42f6e2af6f..122db4992f 100644
--- a/public/language/pl/admin/general/dashboard.json
+++ b/public/language/pl/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Zainstaluj wtyczkę wyszukiwania ze strony wtyczek, aby aktywować funkcję szukania",
"control-panel": "Zarządzanie systemem",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Tryb konserwacji",
diff --git a/public/language/pl/admin/menu.json b/public/language/pl/admin/menu.json
index b18bf5832d..aa8094d48f 100644
--- a/public/language/pl/admin/menu.json
+++ b/public/language/pl/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Loger",
"development/info": "Informacja",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restartuj forum",
"logout": "Wyloguj się",
"view-forum": "Zobacz forum",
diff --git a/public/language/pl/admin/settings/post.json b/public/language/pl/admin/settings/post.json
index 1cbb47e88c..70509cc83e 100644
--- a/public/language/pl/admin/settings/post.json
+++ b/public/language/pl/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Zezwalaj wtyczkom na dodawanie zawartości do zakładki pomocy",
"composer.custom-help": "Własny tekst pomocy",
"ip-tracking": "Śledzenie IP",
- "ip-tracking.each-post": "Śledź adres IP każdego z postów"
+ "ip-tracking.each-post": "Śledź adres IP każdego z postów",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/pl/reset_password.json b/public/language/pl/reset_password.json
index 6855f273c9..37b32b1a9b 100644
--- a/public/language/pl/reset_password.json
+++ b/public/language/pl/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Powtórz hasło",
"enter_email": "Podaj swój adres e-mail, a następnie wyślemy Ci wiadomość z instrukcjami, jak zresetować hasło.",
"enter_email_address": "Wpisz swój adres e-mail",
- "password_reset_sent": "Instrukcje zostały wysłane",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Niepoprawny adres e-mail.",
"password_too_short": "Wprowadzone hasło jest zbyt krótkie, proszę wybrać inne hasło.",
"passwords_do_not_match": "Wprowadzone hasła nie pasują do siebie",
diff --git a/public/language/pl/search.json b/public/language/pl/search.json
index f8f512f067..78eed9db24 100644
--- a/public/language/pl/search.json
+++ b/public/language/pl/search.json
@@ -5,6 +5,9 @@
"in": "w",
"titles": "Tytuły",
"titles-posts": "Tytuły i posty",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Napisane przez",
"in-categories": "W kategoriach",
"search-child-categories": "Przeszukaj podkategorie",
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index 6aba0d3865..f1a39e5cb4 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Zablokuj temat",
"thread_tools.unlock": "Odblokuj temat",
"thread_tools.move": "Przenieś temat",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Przenieś wszystko",
"thread_tools.select_category": "Wybierz kategorię",
"thread_tools.fork": "Skopiuj temat",
@@ -96,6 +97,7 @@
"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": "Zaznacz tematy, które chcesz połączyć",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Wpisz tutaj tytuł tematu...",
"composer.handle_placeholder": "Nazwa",
"composer.discard": "Odrzuć",
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index 97b0c96ff4..6c954a1e99 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Na pewno chcesz zbanować tego użytkownika?",
"unban_account": "Odbanuj konto",
"delete_account": "Usuń konto",
- "delete_account_confirm": "Jesteś pewny, że chcesz skasować swoje konto?
Tej operacji nie można cofnąć i utracisz wszystkie swoje dane
Podaj swoją nazwę użytkownika, by potwierdzić skasowanie konta.",
+ "delete_account_confirm": "Are you sure you want to 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": "Na pewno chcesz usunąć to konto?
Tej operacji nie można cofnąć i nie będzie możliwości odzyskania swoich danych
",
"account-deleted": "Konto usunięte",
"fullname": "Pełna nazwa",
@@ -53,7 +53,6 @@
"change_password": "Zmień hasło",
"change_password_error": "Błędne hasło!",
"change_password_error_wrong_current": "Twoje aktualne hasło nie jest poprawne!",
- "change_password_error_length": "Hasło jest za krótkie!",
"change_password_error_match": "Hasła muszą pasować!",
"change_password_error_privileges": "Nie masz uprawnień do zmiany tego hasła.",
"change_password_success": "Twoje hasło zostało zaktualizowane!",
diff --git a/public/language/pt-BR/admin/admin.json b/public/language/pt-BR/admin/admin.json
index 0f56c78859..d0bc026637 100644
--- a/public/language/pt-BR/admin/admin.json
+++ b/public/language/pt-BR/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Tem certeza de que você deseja reiniciar o NodeBB?",
"acp-title": "%1 | Painel de Controle Administrativo do NodeBB",
diff --git a/public/language/pt-BR/admin/appearance/themes.json b/public/language/pt-BR/admin/appearance/themes.json
index e2793ce865..56247e46e8 100644
--- a/public/language/pt-BR/admin/appearance/themes.json
+++ b/public/language/pt-BR/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Tem certeza que você deseja restaurar o tema padrão do NodeBB?",
"theme-changed": "Tema Alterado",
"revert-success": "Você reverteu com sucesso o seu NodeBB para seu tema padrão.",
- "restart-to-activate": "Por favor reinicei o seu NodeBB para ativar completamente este tema"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/pt-BR/admin/extend/plugins.json b/public/language/pt-BR/admin/extend/plugins.json
index 0a29ecef33..5551818369 100644
--- a/public/language/pt-BR/admin/extend/plugins.json
+++ b/public/language/pt-BR/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Desinstalado",
"alert.activate-success": "Por favor reinicie o seu NodeBB para ativar completamente este plugin",
"alert.deactivate-success": "Plugin desativado com sucesso",
- "alert.upgrade-success": "Por favor recarregue o seu NodeBB para atualizar completamente este plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin instalado com sucesso, por favor ative o plugin.",
"alert.uninstall-success": "O plugin foi desativado com sucesso e desinstalado.",
"alert.suggest-error": "O NodeBB não pôde encontrar o administrador de pacotes, proceder com a instalação da última versão?
O servidor retornou (%1): %2
",
diff --git a/public/language/pt-BR/admin/general/dashboard.json b/public/language/pt-BR/admin/general/dashboard.json
index 4c5429d57e..193bee8c82 100644
--- a/public/language/pt-BR/admin/general/dashboard.json
+++ b/public/language/pt-BR/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Instale um plugin de pesquisa da página de plugins de modo à ativar a funcionalidade de pesquisa",
"control-panel": "Controle do Sistema",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Modo de Manutenção",
diff --git a/public/language/pt-BR/admin/menu.json b/public/language/pt-BR/admin/menu.json
index 280cc03631..305ef80e0e 100644
--- a/public/language/pt-BR/admin/menu.json
+++ b/public/language/pt-BR/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Informação",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Reiniciar o Fórum",
"logout": "Sair da Conta",
"view-forum": "Ver Fórum",
diff --git a/public/language/pt-BR/admin/settings/post.json b/public/language/pt-BR/admin/settings/post.json
index fa653ce7cd..3941fcc260 100644
--- a/public/language/pt-BR/admin/settings/post.json
+++ b/public/language/pt-BR/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Permitir plugins de adicionar conteúdo à aba ajuda",
"composer.custom-help": "Texto de Ajuda Personalizado",
"ip-tracking": "Rastreamento de IP",
- "ip-tracking.each-post": "Rastrear Endereço IP para cada post"
+ "ip-tracking.each-post": "Rastrear Endereço IP para cada post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/pt-BR/reset_password.json b/public/language/pt-BR/reset_password.json
index 79785f648c..60178906a0 100644
--- a/public/language/pt-BR/reset_password.json
+++ b/public/language/pt-BR/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Confirmar Senha",
"enter_email": "Por favor digite seu endereço de email e nós iremos lhe enviar em email com instruções de como reconfigurar a sua conta.",
"enter_email_address": "Digite seu Email",
- "password_reset_sent": "Reconfiguração de Senha Enviada",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Email Inválido / Email não existe!",
"password_too_short": "A senha entrada é muito curta, por favor escolha uma senha diferente.",
"passwords_do_not_match": "As duas senhas que você digitou não combinam.",
diff --git a/public/language/pt-BR/search.json b/public/language/pt-BR/search.json
index 43d847db48..30ba6f3b1a 100644
--- a/public/language/pt-BR/search.json
+++ b/public/language/pt-BR/search.json
@@ -5,6 +5,9 @@
"in": "Em",
"titles": "Títulos",
"titles-posts": "Títulos e Posts",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Postado por",
"in-categories": "Nas Categorias",
"search-child-categories": "Pesquisar subcategorias",
diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json
index c87369cb6f..d219642af7 100644
--- a/public/language/pt-BR/topic.json
+++ b/public/language/pt-BR/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Trancar Tópico",
"thread_tools.unlock": "Destrancar Tópico",
"thread_tools.move": "Mover Tópico",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Mover Tudo",
"thread_tools.select_category": "Escolha a Categoria",
"thread_tools.fork": "Ramificar Tópico",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"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-BR/user.json b/public/language/pt-BR/user.json
index a613000065..824abb079c 100644
--- a/public/language/pt-BR/user.json
+++ b/public/language/pt-BR/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Você realmente quer banir esse usuario?",
"unban_account": "Desbanir Conta",
"delete_account": "Deletar Conta",
- "delete_account_confirm": "Você tem certeza que deseja excluir a sua conta?
Esta ação é irreversível e você não poderá recuperar quaisquer dos seus dados
Entre com o seu nome de usuário para confirmar que deseja destruir esta conta.",
+ "delete_account_confirm": "Are you sure you want to 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": "Você tem certeza que deseja excluir essa conta?
Essa ação é irreversível e você não poderá recuperar quaisquer dados
",
"account-deleted": "Conta excluída",
"fullname": "Nome Completo",
@@ -53,7 +53,6 @@
"change_password": "Alterar Senha",
"change_password_error": "Senha Inválida!",
"change_password_error_wrong_current": "Sua senha atual está incorreta!",
- "change_password_error_length": "Senha muito curta!",
"change_password_error_match": "As senhas devem conferir!",
"change_password_error_privileges": "Você não possui permissões para alterar esta senha.",
"change_password_success": "Sua senha foi alterada!",
diff --git a/public/language/pt-PT/admin/admin.json b/public/language/pt-PT/admin/admin.json
index 1cec53531d..f89475e468 100644
--- a/public/language/pt-PT/admin/admin.json
+++ b/public/language/pt-PT/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
"acp-title": "%1 | NodeBB Admin Control Panel",
diff --git a/public/language/pt-PT/admin/appearance/themes.json b/public/language/pt-PT/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/pt-PT/admin/appearance/themes.json
+++ b/public/language/pt-PT/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/pt-PT/admin/extend/plugins.json b/public/language/pt-PT/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/pt-PT/admin/extend/plugins.json
+++ b/public/language/pt-PT/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/pt-PT/admin/general/dashboard.json b/public/language/pt-PT/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/pt-PT/admin/general/dashboard.json
+++ b/public/language/pt-PT/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/pt-PT/admin/menu.json b/public/language/pt-PT/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/pt-PT/admin/menu.json
+++ b/public/language/pt-PT/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/pt-PT/admin/settings/post.json b/public/language/pt-PT/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/pt-PT/admin/settings/post.json
+++ b/public/language/pt-PT/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/pt-PT/reset_password.json b/public/language/pt-PT/reset_password.json
index a317ced7bc..27c50ec3ee 100644
--- a/public/language/pt-PT/reset_password.json
+++ b/public/language/pt-PT/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Confirmar palavra-passe",
"enter_email": "Por favor, insere o teu undergo de e-mail e nós iremos enviar-te um e-mail com instruções para reiniciares a tua conta.",
"enter_email_address": "Insere o endereço de e-mail",
- "password_reset_sent": "Reinício de palavra-passe enviado",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "E-mail inválido / E-mail não existe!",
"password_too_short": "A palavra-passe inserida é demasiado pequena. Por favor, escolhe uma nova.",
"passwords_do_not_match": "As duas palavras-passe que inseriste não coincidem.",
diff --git a/public/language/pt-PT/search.json b/public/language/pt-PT/search.json
index 710b060b6e..d9c8ca3df8 100644
--- a/public/language/pt-PT/search.json
+++ b/public/language/pt-PT/search.json
@@ -5,6 +5,9 @@
"in": "Em",
"titles": "Títulos",
"titles-posts": "Títulos e Publicações",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Publicado por",
"in-categories": "Em Categorias",
"search-child-categories": "Procurar categorias infantis",
diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json
index 477411bdf3..f2828520b3 100644
--- a/public/language/pt-PT/topic.json
+++ b/public/language/pt-PT/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Bloquear tópico",
"thread_tools.unlock": "Desbloquear tópico",
"thread_tools.move": "Mover tópico",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Mover todos",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "Clonar tópico",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Insere aqui o título do tópico...",
"composer.handle_placeholder": "Nome",
"composer.discard": "Descartar",
diff --git a/public/language/pt-PT/user.json b/public/language/pt-PT/user.json
index 65a3aa870a..f5e96926ee 100644
--- a/public/language/pt-PT/user.json
+++ b/public/language/pt-PT/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Queres realmente banir este utilizador?",
"unban_account": "Deixar de banir esta conta",
"delete_account": "Eliminar conta",
- "delete_account_confirm": "Tens a certeza que queres eliminar a tua conta?
Esta ação é irreversível e não terás oportunidade de recuperar nenhuma das tuas informações
Insere o teu nome de utilizador para confirmar que desejas destruir esta conta.",
+ "delete_account_confirm": "Are you sure you want to 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": "Tens a certeza que queres apagar esta conta?
Esta acção é irreversível e não terás oportunidade de recuperar nenhuma informação
",
"account-deleted": "Conta eliminada",
"fullname": "Nome completo",
@@ -53,7 +53,6 @@
"change_password": "Palavra-passe alterada",
"change_password_error": "Palavra-passe inválida!",
"change_password_error_wrong_current": "A tua palavra-passe atual não está correta!",
- "change_password_error_length": "Palavra-passe demasiado curta!",
"change_password_error_match": "As palavras-passe devem coincidir!",
"change_password_error_privileges": "Não tens os direitos necessários para alterar esta palavra-passe.",
"change_password_success": "A tua palavra-passe foi atualizada!",
diff --git a/public/language/ro/admin/admin.json b/public/language/ro/admin/admin.json
index cca6420575..36f0fdde60 100644
--- a/public/language/ro/admin/admin.json
+++ b/public/language/ro/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
"acp-title": "%1 | NodeBB Admin Control Panel",
diff --git a/public/language/ro/admin/appearance/themes.json b/public/language/ro/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/ro/admin/appearance/themes.json
+++ b/public/language/ro/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/ro/admin/extend/plugins.json b/public/language/ro/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/ro/admin/extend/plugins.json
+++ b/public/language/ro/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/ro/admin/general/dashboard.json b/public/language/ro/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/ro/admin/general/dashboard.json
+++ b/public/language/ro/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/ro/admin/menu.json b/public/language/ro/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/ro/admin/menu.json
+++ b/public/language/ro/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/ro/admin/settings/post.json b/public/language/ro/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/ro/admin/settings/post.json
+++ b/public/language/ro/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/ro/reset_password.json b/public/language/ro/reset_password.json
index 02afb16f0c..0071a04c1f 100644
--- a/public/language/ro/reset_password.json
+++ b/public/language/ro/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Confirmă Parola",
"enter_email": "Te rugăm sa introduci adresa ta de email și îți vom trimite un email cu instrucțiuni pentru a îți reseta contul tău de utilizator.",
"enter_email_address": "Introdu adresă de email",
- "password_reset_sent": "Emailul pentru resetarea parolei a fost trimis",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Adresă de email invalidă / Adresa de email nu există!",
"password_too_short": "The password entered is too short, please pick a different password.",
"passwords_do_not_match": "The two passwords you've entered do not match.",
diff --git a/public/language/ro/search.json b/public/language/ro/search.json
index 91a591e180..28721a7d01 100644
--- a/public/language/ro/search.json
+++ b/public/language/ro/search.json
@@ -5,6 +5,9 @@
"in": "În",
"titles": "Titluri",
"titles-posts": "Titluri şi Mesaje",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Postat de",
"in-categories": "În Categorii",
"search-child-categories": "Search child categories",
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index b5e3e3efcd..8318e03c51 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Închide Subiect",
"thread_tools.unlock": "Deschide Subiect",
"thread_tools.move": "Mută Subiect",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Mută-le pe toate",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "Bifurcă Subiect",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Introdu numele subiectului aici ...",
"composer.handle_placeholder": "Name",
"composer.discard": "Renunță",
diff --git a/public/language/ro/user.json b/public/language/ro/user.json
index 5e9ace2147..da13335e90 100644
--- a/public/language/ro/user.json
+++ b/public/language/ro/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
"delete_account": "Șterge Cont",
- "delete_account_confirm": "Ești sigur ca vrei să îți ștergi contul?
Această acțiune este ireversibilă și nu o să mai fie posibil să îți recuperezi datele
Introdu numele tău de utilizator pentru a confirma că dorești să ștergi acest cont.",
+ "delete_account_confirm": "Are you sure you want to 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?
This action is irreversible and you will not be able to recover any data
",
"account-deleted": "Cont șters",
"fullname": "Nume Întreg",
@@ -53,7 +53,6 @@
"change_password": "Schimbă Parola",
"change_password_error": "Parola invalidă!",
"change_password_error_wrong_current": "Parola ta curentă nu este corectă!",
- "change_password_error_length": "Parolă prea scurtă!",
"change_password_error_match": "Parolele trebuie să se potrivească!",
"change_password_error_privileges": "Nu ai nici un drept să schimbi această parolă.",
"change_password_success": "Parola ta a fost actualizată!",
diff --git a/public/language/ru/admin/admin.json b/public/language/ru/admin/admin.json
index 3646a8389e..26dc23bef2 100644
--- a/public/language/ru/admin/admin.json
+++ b/public/language/ru/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Вы уверены что хотите перестроить и перезапустить NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Вы уверены, что хотите перезапустить NodeBB?",
"acp-title": "%1 | Панель администратора NodeBB",
diff --git a/public/language/ru/admin/appearance/themes.json b/public/language/ru/admin/appearance/themes.json
index b4d1b87426..e492719141 100644
--- a/public/language/ru/admin/appearance/themes.json
+++ b/public/language/ru/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Вы уверены, что хотите восстановить стандартную NodeBB тему?",
"theme-changed": "Тема сменена",
"revert-success": "Вы успешно вернули ваш NodeBB обратно к его стандартной теме.",
- "restart-to-activate": "Пожалуйста, перезапустите ваш NodeBB, чтобы полностью активировать эту тему"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/ru/admin/extend/plugins.json b/public/language/ru/admin/extend/plugins.json
index 89b319c346..4b2e04b805 100644
--- a/public/language/ru/admin/extend/plugins.json
+++ b/public/language/ru/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Плагин удален",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Плагин успешно отключен",
- "alert.upgrade-success": "Пожалуйста перезапустите ваш NodeBB, чтобы полностью обновить этот плагин",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Плагин успешно установлен, пожалуйста активируйте этот плагин.",
"alert.uninstall-success": "Плагин успешно отключен и удален.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/ru/admin/general/dashboard.json b/public/language/ru/admin/general/dashboard.json
index ffdc635c87..b8dbff3a40 100644
--- a/public/language/ru/admin/general/dashboard.json
+++ b/public/language/ru/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "Управление",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Режим тех обслуживания",
diff --git a/public/language/ru/admin/menu.json b/public/language/ru/admin/menu.json
index 5fd64eb920..d60fc012f4 100644
--- a/public/language/ru/admin/menu.json
+++ b/public/language/ru/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Перезапустить Форум",
"logout": "Выйти",
"view-forum": "Просмотреть Форум",
diff --git a/public/language/ru/admin/settings/post.json b/public/language/ru/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/ru/admin/settings/post.json
+++ b/public/language/ru/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/ru/reset_password.json b/public/language/ru/reset_password.json
index 8241e1ac34..241b50fa8f 100644
--- a/public/language/ru/reset_password.json
+++ b/public/language/ru/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Подтвердите пароль",
"enter_email": "Пожалуйста введите ваш адрес электронной почты, чтобы получить письмо с инструкцией по восстановлению пароля.",
"enter_email_address": "Введите адрес электронной почты",
- "password_reset_sent": "Пароль отправлен",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Адрес электронной почты указан неверно. Пожалуйста, исправьте",
"password_too_short": "Введённый пароль слишком короткий, это небезопасно. Пожалуйста, придумайте более длинный пароль.",
"passwords_do_not_match": "Введённые пароли не совпадают. Пожалуйста, укажите одинаковые пароли.",
diff --git a/public/language/ru/search.json b/public/language/ru/search.json
index 9ff5643500..f685b6f9c0 100644
--- a/public/language/ru/search.json
+++ b/public/language/ru/search.json
@@ -5,6 +5,9 @@
"in": "В",
"titles": "Названия",
"titles-posts": "Названия и записи",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "В именах авторов записей",
"in-categories": "В сообществах",
"search-child-categories": "Искать в рубриках",
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 5a2cec8af8..6fef30267d 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Закрыть тему",
"thread_tools.unlock": "Открыть тему",
"thread_tools.move": "Переместить тему",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Переместить всё",
"thread_tools.select_category": "Выберите категорию",
"thread_tools.fork": "Создать дополнительную ветвь дискуссии",
@@ -96,6 +97,7 @@
"fork_success": "Готово! Просмотр отделённой темы.",
"delete_posts_instruction": "Отметьте записи, которые вы хотите удалить",
"merge_topics_instruction": "Выберите темы которые вы хотите объединить",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Введите название темы...",
"composer.handle_placeholder": "Название",
"composer.discard": "Отменить",
diff --git a/public/language/ru/user.json b/public/language/ru/user.json
index 1e62334f05..b27478afcc 100644
--- a/public/language/ru/user.json
+++ b/public/language/ru/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Вы действительно хотите заблокировать этого участника?",
"unban_account": "Разблокировать учётную запись",
"delete_account": "Удалить учётную запись",
- "delete_account_confirm": "Вы уверены, что хотите удалить учётную запись?
Это действие необратимо, вы не сможете восстановить свои данные
Введите имя участника для подтверждения уничтожения учётной записи.",
+ "delete_account_confirm": "Are you sure you want to 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": "Вы уверены, что хотите удалить этот аккаунт?
Это действие является необратимым, вы не сможете восстановить любые данные
",
"account-deleted": "Учётная запись удалена",
"fullname": "Полное имя",
@@ -53,7 +53,6 @@
"change_password": "Изменить пароль",
"change_password_error": "Неверный пароль!",
"change_password_error_wrong_current": "Текущий пароль указан неверно!",
- "change_password_error_length": "Пароль слишком короткий!",
"change_password_error_match": "Пароли должны совпадать!",
"change_password_error_privileges": "Вы не можете изменить пароль.",
"change_password_success": "Ваш пароль изменён!",
diff --git a/public/language/rw/admin/admin.json b/public/language/rw/admin/admin.json
index cca6420575..36f0fdde60 100644
--- a/public/language/rw/admin/admin.json
+++ b/public/language/rw/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
"acp-title": "%1 | NodeBB Admin Control Panel",
diff --git a/public/language/rw/admin/appearance/themes.json b/public/language/rw/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/rw/admin/appearance/themes.json
+++ b/public/language/rw/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/rw/admin/extend/plugins.json b/public/language/rw/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/rw/admin/extend/plugins.json
+++ b/public/language/rw/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/rw/admin/general/dashboard.json b/public/language/rw/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/rw/admin/general/dashboard.json
+++ b/public/language/rw/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/rw/admin/menu.json b/public/language/rw/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/rw/admin/menu.json
+++ b/public/language/rw/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/rw/admin/settings/post.json b/public/language/rw/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/rw/admin/settings/post.json
+++ b/public/language/rw/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/rw/reset_password.json b/public/language/rw/reset_password.json
index b5450e687d..bbc7e28c5b 100644
--- a/public/language/rw/reset_password.json
+++ b/public/language/rw/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Emeza Ijambobanga",
"enter_email": "Tanga email ukoresha maze tuze kukoherereza ubutumwa bugusobanuria uko uri bureme bundibushya konte yawe.",
"enter_email_address": "Shyiramo Email",
- "password_reset_sent": "Ubusabe bwo Kurema Bundibushya Bwakiriwe",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Email Itemewe / Email Itabaho!",
"password_too_short": "Ijambobanga washyizemo ni rigufi cyane. Gerageza ufate irindi. ",
"passwords_do_not_match": "Ijambobanga waryanditse mu buryo bubiri butandukanye kandi bitemewe. ",
diff --git a/public/language/rw/search.json b/public/language/rw/search.json
index bae0f8f6e7..d8c93408fe 100644
--- a/public/language/rw/search.json
+++ b/public/language/rw/search.json
@@ -5,6 +5,9 @@
"in": "Muri",
"titles": "Imitwe",
"titles-posts": "Imitwe n'Ibyashyizweho",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Mu Byashyizweho na",
"in-categories": "Mu Byiciro bya",
"search-child-categories": "Shakira no mu byiciro bikomokaho",
diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json
index 0f65ddf6b3..784113dabc 100644
--- a/public/language/rw/topic.json
+++ b/public/language/rw/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Fungirana Ikiganiro",
"thread_tools.unlock": "Fungurira Ikiganiro",
"thread_tools.move": "Imura Ikiganiro",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Byimure Byose",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "Gabanyaho ku Kiganiro",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Shyira umutwe w'ikiganiro cyawe aha...",
"composer.handle_placeholder": "Izina",
"composer.discard": "Byihorere",
diff --git a/public/language/rw/user.json b/public/language/rw/user.json
index b32efb7e5f..f4512ea455 100644
--- a/public/language/rw/user.json
+++ b/public/language/rw/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Wiringiye neza ko ushaka kwirukana uyu muntu?",
"unban_account": "Garura iyi Konte",
"delete_account": "Siba Konte",
- "delete_account_confirm": "Wiringiye neza ko ushaka gusiba konte yawe?
Numara kuyisiba ntabwo urabasha kwisubira kandi nturabasha kugarura ibyo wari ufiteho
Shyiramo izina ryawe kugirango wemeze ko koko ushaka gusenya iyi konte.",
+ "delete_account_confirm": "Are you sure you want to 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": "Wiringiye neza ko ushaka gusiba iyi konte?
Ntabwo uri bubashe kwisubira kandi ntabwo urabasha gusubirana ibyo wari ufiteho numara kuyisiba
",
"account-deleted": "Konte yasibwe",
"fullname": "Izina Ryuzuye",
@@ -53,7 +53,6 @@
"change_password": "Hindura Ijambobanga",
"change_password_error": "Ijambobanga Ritari Ryo!",
"change_password_error_wrong_current": "Ijambobanga ryawe watanze nk'irisanzweho ntabwo ari ryo!",
- "change_password_error_length": "Ijambobanga watanze ni rigufi cyane!",
"change_password_error_match": "Ijambobanga ugomba kuryandukura mu buryo bumwe inshuro ebyiri!",
"change_password_error_privileges": "Nta burenganzira ufite bwo guhindura iri jambobanga. ",
"change_password_success": "Ijambobanga ryawe ryavuguruwe!",
diff --git a/public/language/sc/admin/admin.json b/public/language/sc/admin/admin.json
index cca6420575..36f0fdde60 100644
--- a/public/language/sc/admin/admin.json
+++ b/public/language/sc/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
"acp-title": "%1 | NodeBB Admin Control Panel",
diff --git a/public/language/sc/admin/appearance/themes.json b/public/language/sc/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/sc/admin/appearance/themes.json
+++ b/public/language/sc/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/sc/admin/extend/plugins.json b/public/language/sc/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/sc/admin/extend/plugins.json
+++ b/public/language/sc/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/sc/admin/general/dashboard.json b/public/language/sc/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/sc/admin/general/dashboard.json
+++ b/public/language/sc/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/sc/admin/menu.json b/public/language/sc/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/sc/admin/menu.json
+++ b/public/language/sc/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/sc/admin/settings/post.json b/public/language/sc/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/sc/admin/settings/post.json
+++ b/public/language/sc/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/sc/reset_password.json b/public/language/sc/reset_password.json
index 5662fb238f..6e41689782 100644
--- a/public/language/sc/reset_password.json
+++ b/public/language/sc/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Cunfirma Password",
"enter_email": "Pro praghere pone s'indiritzu email tuo e t'amus a imbiare un'email cun is istrutziones pro torrare a assentare s'intrada tua.",
"enter_email_address": "Pone s'Indiritzu Email",
- "password_reset_sent": "Còdighe pro Torrare a Assentare sa Password Imbiadu",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Email Non Bàlida / Email chi no esistit!",
"password_too_short": "The password entered is too short, please pick a different password.",
"passwords_do_not_match": "The two passwords you've entered do not match.",
diff --git a/public/language/sc/search.json b/public/language/sc/search.json
index 1f4d555f92..accf59f8a3 100644
--- a/public/language/sc/search.json
+++ b/public/language/sc/search.json
@@ -5,6 +5,9 @@
"in": "In",
"titles": "Titles",
"titles-posts": "Titles and Posts",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Posted by",
"in-categories": "In Categories",
"search-child-categories": "Search child categories",
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index 989e22d827..b02d644384 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Bloca Arresonada",
"thread_tools.unlock": "Isbloca Arresonada",
"thread_tools.move": "Move Arresonada",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Move All",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "Partzi Arresonada",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"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/sc/user.json b/public/language/sc/user.json
index 130019fee8..ed4a8b81e8 100644
--- a/public/language/sc/user.json
+++ b/public/language/sc/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
"delete_account": "Delete Account",
- "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data
Enter your username to confirm that you wish to destroy this account.",
+ "delete_account_confirm": "Are you sure you want to 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?
This action is irreversible and you will not be able to recover any data
",
"account-deleted": "Account deleted",
"fullname": "Nùmene e Sambenadu",
@@ -53,7 +53,6 @@
"change_password": "Muda Password",
"change_password_error": "Invalid Password!",
"change_password_error_wrong_current": "Your current password is not correct!",
- "change_password_error_length": "Password too short!",
"change_password_error_match": "Passwords must match!",
"change_password_error_privileges": "You do not have the rights to change this password.",
"change_password_success": "Your password is updated!",
diff --git a/public/language/sk/admin/admin.json b/public/language/sk/admin/admin.json
index 6cbed254f1..79212042c5 100644
--- a/public/language/sk/admin/admin.json
+++ b/public/language/sk/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Ste si naozaj istý/á, že chcete reštartovať NodeBB?",
"acp-title": "Ovládací panel administrátora %1 | NodeBB ",
diff --git a/public/language/sk/admin/appearance/themes.json b/public/language/sk/admin/appearance/themes.json
index 39e282e898..4eb6538272 100644
--- a/public/language/sk/admin/appearance/themes.json
+++ b/public/language/sk/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Ste si istý/a, že chcete obnoviť predvolený NodeBB motív?",
"theme-changed": "Motív bol zmenený",
"revert-success": "Úspešne sa Vám podarilo obnoviť Váš NodeBB do predvoleného motívu.",
- "restart-to-activate": "Prosím, reštartujte Váš NodeBB pre úplne aktivovanie tohto motívu."
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/sk/admin/extend/plugins.json b/public/language/sk/admin/extend/plugins.json
index 2348758cec..2b67320a7d 100644
--- a/public/language/sk/admin/extend/plugins.json
+++ b/public/language/sk/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB sa nemohol pripojiť k správcovi balíčku, pokračovať v inštalácii poslednej verzie?
Server odpovedal (% 1):%2
",
diff --git a/public/language/sk/admin/general/dashboard.json b/public/language/sk/admin/general/dashboard.json
index d6da66537e..cce872f7df 100644
--- a/public/language/sk/admin/general/dashboard.json
+++ b/public/language/sk/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/sk/admin/menu.json b/public/language/sk/admin/menu.json
index 2423f50ffb..993f6b5e31 100644
--- a/public/language/sk/admin/menu.json
+++ b/public/language/sk/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/sk/admin/settings/post.json b/public/language/sk/admin/settings/post.json
index 8ae9b903e2..91c542dbf6 100644
--- a/public/language/sk/admin/settings/post.json
+++ b/public/language/sk/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Povoliť zásuvné moduly pre pridanie obsahu do záložky nápovedy",
"composer.custom-help": "Používateľský text nápovedy",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/sk/reset_password.json b/public/language/sk/reset_password.json
index be29ba09ab..15ec9bb515 100644
--- a/public/language/sk/reset_password.json
+++ b/public/language/sk/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Potvrdenie hesla",
"enter_email": "Prosím zadajte svoju e-mailovú adresu a my Vám pošleme informácie, ako môžete obnoviť svoje heslo.",
"enter_email_address": "Zadajte e-mailovú adresu",
- "password_reset_sent": "Obnova hesla odoslaná",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Nesprávny e-mail / E-mail neexistuje.",
"password_too_short": "Zadané heslo je príliš krátke, prosím zadajte iné heslo.",
"passwords_do_not_match": "Heslá ktoré ste zadali sa nezhodujú.",
diff --git a/public/language/sk/search.json b/public/language/sk/search.json
index a4393677af..dae06b0d1c 100644
--- a/public/language/sk/search.json
+++ b/public/language/sk/search.json
@@ -5,6 +5,9 @@
"in": "V",
"titles": "Nadpisy",
"titles-posts": "Nadpisy a príspevky",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Napísal",
"in-categories": "V kategóriách",
"search-child-categories": "Hľadať podružné kategórie",
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index ec875a39b5..7b585a9d8b 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Uzamknúť tému",
"thread_tools.unlock": "Odomknúť tému",
"thread_tools.move": "Presunúť tému",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Presunúť všetko",
"thread_tools.select_category": "Vybrať kategóriu",
"thread_tools.fork": "Rozvetviť tému",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Sem zadajte názov témy...",
"composer.handle_placeholder": "Meno",
"composer.discard": "Zahodiť",
diff --git a/public/language/sk/user.json b/public/language/sk/user.json
index 9d7e5c6860..58e3ef94a7 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Naozaj chcete zablokovať tohto používateľa?",
"unban_account": "Odblokovať účet",
"delete_account": "Odstrániť účet",
- "delete_account_confirm": "Ste si naozaj istý, že chcete odstrániť tento účet?
Táto akcia je nezvratná a taktiež nebudete môcť obnoviť žiadne Vaše dáta
Zadajte svoje používateľské meno pre potvrdenie, že chcete zničiť tento účet.",
+ "delete_account_confirm": "Are you sure you want to 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": "Naozaj ste si istý že chcete odstrániť tento účet?
Táto akcia je nezvratná a taktiež nebudete môcť obnoviť žiadne Vaše údaje
",
"account-deleted": "Účet bol odstránený",
"fullname": "Meno a priezvisko",
@@ -53,7 +53,6 @@
"change_password": "Zmeniť heslo",
"change_password_error": "Nesprávne heslo!",
"change_password_error_wrong_current": "Vaše súčasné heslo nie je správne",
- "change_password_error_length": "Heslo je krátke!",
"change_password_error_match": "Heslá sa musia zhodovať!",
"change_password_error_privileges": "Nemáte práva na zmenu hesla.",
"change_password_success": "Vaše heslo je aktualizované.",
diff --git a/public/language/sl/admin/admin.json b/public/language/sl/admin/admin.json
index cca6420575..36f0fdde60 100644
--- a/public/language/sl/admin/admin.json
+++ b/public/language/sl/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
"acp-title": "%1 | NodeBB Admin Control Panel",
diff --git a/public/language/sl/admin/appearance/themes.json b/public/language/sl/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/sl/admin/appearance/themes.json
+++ b/public/language/sl/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/sl/admin/extend/plugins.json b/public/language/sl/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/sl/admin/extend/plugins.json
+++ b/public/language/sl/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/sl/admin/general/dashboard.json b/public/language/sl/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/sl/admin/general/dashboard.json
+++ b/public/language/sl/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/sl/admin/menu.json b/public/language/sl/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/sl/admin/menu.json
+++ b/public/language/sl/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/sl/admin/settings/post.json b/public/language/sl/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/sl/admin/settings/post.json
+++ b/public/language/sl/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/sl/reset_password.json b/public/language/sl/reset_password.json
index 10fb813a9a..67a7b60fc1 100644
--- a/public/language/sl/reset_password.json
+++ b/public/language/sl/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Potrdi geslo",
"enter_email": "Prosimo, vpišite svoj e-poštni naslov in poslali vam bomo navodila za ponastavitev uporabniškega računa.",
"enter_email_address": "Vpišite svoj e-poštni naslov.",
- "password_reset_sent": "Ponastavitev gesla poslana",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Napačen e-poštni naslov./E-poštni naslov ne obstaja!",
"password_too_short": "Geslo, ki ste ga izbrali, je prekratko, prosimo, izberite drugačno geslo.",
"passwords_do_not_match": "Gesli, ki ste ju vpisali, se ne ujemata.",
diff --git a/public/language/sl/search.json b/public/language/sl/search.json
index 30c806eba6..c0aa501806 100644
--- a/public/language/sl/search.json
+++ b/public/language/sl/search.json
@@ -5,6 +5,9 @@
"in": "V",
"titles": "Naslovi",
"titles-posts": "Naslovi in objave",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Objavil",
"in-categories": "V kategoriji",
"search-child-categories": "Išči podkategorije",
diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json
index 11929df103..c472561b4c 100644
--- a/public/language/sl/topic.json
+++ b/public/language/sl/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Zakleni temo",
"thread_tools.unlock": "Odkleni temo",
"thread_tools.move": "Premakni temo",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Premakni vse",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "Razcepi temo",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Vpiši naslov teme...",
"composer.handle_placeholder": "Ime",
"composer.discard": "Zavrzi",
diff --git a/public/language/sl/user.json b/public/language/sl/user.json
index f726f102c2..f130e97480 100644
--- a/public/language/sl/user.json
+++ b/public/language/sl/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Ali želiš izločiti uporabnika?",
"unban_account": "Ponovno vključi račun",
"delete_account": "Izbriši račun",
- "delete_account_confirm": "Ali želiš izbrisati račun?
S potrditvijo bodo izbrisani vsi podatki, ki jih ne bo več možno obnoviti.
Vpiši svoje uporabniško ime za dokončanje procesa.",
+ "delete_account_confirm": "Are you sure you want to 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": "Ali želiš izbrisati račun?
S potrditvijo bodo izbrisani vsi podatki, ki jih ne bo več možno obnoviti.
",
"account-deleted": "Račun je izbrisan",
"fullname": "Ime in priimek",
@@ -53,7 +53,6 @@
"change_password": "Spremeni geslo",
"change_password_error": "Napačno geslo!",
"change_password_error_wrong_current": "Tvoje trenutno geslo je napačno!",
- "change_password_error_length": "Geslo je prekratko!",
"change_password_error_match": "Gesli se morata ujemati!",
"change_password_error_privileges": "Nimaš pravice do spremembe gesla.",
"change_password_success": "Geslo je bilo posodobljeno!",
diff --git a/public/language/sr/admin/admin.json b/public/language/sr/admin/admin.json
index 80c210f142..4246df30eb 100644
--- a/public/language/sr/admin/admin.json
+++ b/public/language/sr/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Da li želite da restartujete NodeBB?",
"acp-title": "%1 | NodeBB Administratorski panel",
diff --git a/public/language/sr/admin/appearance/themes.json b/public/language/sr/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/sr/admin/appearance/themes.json
+++ b/public/language/sr/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/sr/admin/extend/plugins.json b/public/language/sr/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/sr/admin/extend/plugins.json
+++ b/public/language/sr/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/sr/admin/general/dashboard.json b/public/language/sr/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/sr/admin/general/dashboard.json
+++ b/public/language/sr/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/sr/admin/menu.json b/public/language/sr/admin/menu.json
index c2732bce05..9651eae839 100644
--- a/public/language/sr/admin/menu.json
+++ b/public/language/sr/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Loger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Ponovo učitaj forum",
"logout": "Izloguj se",
"view-forum": "Pogledaj Forum",
diff --git a/public/language/sr/admin/settings/post.json b/public/language/sr/admin/settings/post.json
index 5deedb8d42..28be4cea86 100644
--- a/public/language/sr/admin/settings/post.json
+++ b/public/language/sr/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Dozvoli plugin-ovima da dodaju sadržaj na tab-u \"pomoć\"",
"composer.custom-help": "Prilagođen tekst za pomoć",
"ip-tracking": "Praćenje IP adrese",
- "ip-tracking.each-post": "Prati IP Adresu za svaki post"
+ "ip-tracking.each-post": "Prati IP Adresu za svaki post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/sr/reset_password.json b/public/language/sr/reset_password.json
index 2b436964c0..0f50aef356 100644
--- a/public/language/sr/reset_password.json
+++ b/public/language/sr/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Потврда нове лозинке",
"enter_email": "Унесите вашу адресу е-поште и послаћемо вам писмо за упутством за ресетовање налога.",
"enter_email_address": "Унесите адресу е-поште",
- "password_reset_sent": "Порука за ресетовање лозинке је послата",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Неисправна е-пошта / е-пошта не постоји!",
"password_too_short": "Унета лозинка је прекратка, молимо изаберите другу лозинку.",
"passwords_do_not_match": "Унете лозинке се не подударају.",
diff --git a/public/language/sr/search.json b/public/language/sr/search.json
index ef24e92f17..8c2b039c88 100644
--- a/public/language/sr/search.json
+++ b/public/language/sr/search.json
@@ -5,6 +5,9 @@
"in": "У",
"titles": "Наслови",
"titles-posts": "Наслови и поруке",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Објавио",
"in-categories": "У категоријама",
"search-child-categories": "Претражи поткатегорије",
diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json
index e5e9065f3e..2d0e568291 100644
--- a/public/language/sr/topic.json
+++ b/public/language/sr/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Закључај тему",
"thread_tools.unlock": "Откључај тему",
"thread_tools.move": "Премести тему",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Премести све",
"thread_tools.select_category": "Изаберите категорију",
"thread_tools.fork": "Рачвај тему",
@@ -96,6 +97,7 @@
"fork_success": "Тема је успешно рачвана! Кликните овде за одлазак на рачвану тему.",
"delete_posts_instruction": "Кликните на поруке које желите да избришете/очистите",
"merge_topics_instruction": "Кликните на теме које желите да спојите",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Овде унесите назив теме...",
"composer.handle_placeholder": "Име",
"composer.discard": "Одбаци",
diff --git a/public/language/sr/user.json b/public/language/sr/user.json
index d588782e3f..f6432ba990 100644
--- a/public/language/sr/user.json
+++ b/public/language/sr/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Да ли заиста желите да забраните овог корисника?",
"unban_account": "Скини забрану налогу",
"delete_account": "Брисање налога",
- "delete_account_confirm": "Да ли заиста желите да избришете свој налог?
Ова радња је неповратна и нећете моћи да вратите ваше податке
Унесите ваше корисничко име да бисте потврдили да желите да уништите овај налог.",
+ "delete_account_confirm": "Are you sure you want to 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": "Да ли заиста желите да избришете овај налог?
Ова радња је неповратна и нећете моћи да вратите било који податак
",
"account-deleted": "Налог је избрисан",
"fullname": "Пуно име",
@@ -53,7 +53,6 @@
"change_password": "Промена лозинке",
"change_password_error": "Неисправна лозинка",
"change_password_error_wrong_current": "Ваша тренутна лозинка није исправна!",
- "change_password_error_length": "Лозинка је прекратка!",
"change_password_error_match": "Лозинке се морају подударати!",
"change_password_error_privileges": "Немате дозволу за мењање ове лозинке.",
"change_password_success": "Ваша лозинка је ажурирана!",
diff --git a/public/language/sv/admin/admin.json b/public/language/sv/admin/admin.json
index cca6420575..36f0fdde60 100644
--- a/public/language/sv/admin/admin.json
+++ b/public/language/sv/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
"acp-title": "%1 | NodeBB Admin Control Panel",
diff --git a/public/language/sv/admin/appearance/themes.json b/public/language/sv/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/sv/admin/appearance/themes.json
+++ b/public/language/sv/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/sv/admin/extend/plugins.json b/public/language/sv/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/sv/admin/extend/plugins.json
+++ b/public/language/sv/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/sv/admin/general/dashboard.json b/public/language/sv/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/sv/admin/general/dashboard.json
+++ b/public/language/sv/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/sv/admin/menu.json b/public/language/sv/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/sv/admin/menu.json
+++ b/public/language/sv/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/sv/admin/settings/post.json b/public/language/sv/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/sv/admin/settings/post.json
+++ b/public/language/sv/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/sv/reset_password.json b/public/language/sv/reset_password.json
index a6ee1793e1..5a75305e0e 100644
--- a/public/language/sv/reset_password.json
+++ b/public/language/sv/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Bekräfta lösenord",
"enter_email": "Var god fyll i din e-postadress så skickas ett e-postmeddelande med instruktioner hur du återställer ditt konto.",
"enter_email_address": "Skriv in e-postadress",
- "password_reset_sent": "Lösenordsåterställning skickad",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Felaktig e-post / E-post finns inte!",
"password_too_short": "Lösenordet är för kort, var god välj ett annat lösenord.",
"passwords_do_not_match": "De två lösenorden du har fyllt i matchar ej varandra.",
diff --git a/public/language/sv/search.json b/public/language/sv/search.json
index e8f6df7141..f10767f346 100644
--- a/public/language/sv/search.json
+++ b/public/language/sv/search.json
@@ -5,6 +5,9 @@
"in": "i",
"titles": "Ämnen",
"titles-posts": "Ämnen och inlägg",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Skapad av",
"in-categories": "I kategorier",
"search-child-categories": "Sök i underkategorier",
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index b8840b4b0d..709495b9de 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Lås ämne",
"thread_tools.unlock": "Lås upp ämne",
"thread_tools.move": "Flytta ämne",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Flytta alla",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "Grena ämne",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Skriv in ämnets titel här...",
"composer.handle_placeholder": "Namn",
"composer.discard": "Avbryt",
diff --git a/public/language/sv/user.json b/public/language/sv/user.json
index d358c84a76..be267a7c81 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Vill du verkligen bannlysa den här användaren?",
"unban_account": "Ta bort bannlysning",
"delete_account": "Ta bort ämne",
- "delete_account_confirm": "Är du säker på att du vill radera ditt konto?
Denna åtgärd går inte att ångra och du kommer inte kunna återställa ditt konto
Skriv in ditt användarnamn för att bekräfta att du vill radera ditt konto.",
+ "delete_account_confirm": "Are you sure you want to 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": "Är du säker på att du vill ta bort detta konto?
Detta går ej att ångra - data går förlorad för alltid
",
"account-deleted": "Kontot raderat",
"fullname": "Hela namnet",
@@ -53,7 +53,6 @@
"change_password": "Ändra lösenord",
"change_password_error": "Ogiltigt lösenord.",
"change_password_error_wrong_current": "Ditt nuvarande lösenord är inte korrekt.",
- "change_password_error_length": "Lösenordet är för kort.",
"change_password_error_match": "Lösenorden måste stämma överens.",
"change_password_error_privileges": "Du har inte rättigheter att ändra det här lösenordet.",
"change_password_success": "Ditt lösenord är uppdaterat.",
diff --git a/public/language/th/admin/admin.json b/public/language/th/admin/admin.json
index 7468947a5c..e0e531a478 100644
--- a/public/language/th/admin/admin.json
+++ b/public/language/th/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "คุณต้องการเริ่มการทำงาน NodeBB ใหม่หรือไม่?",
"acp-title": "%1 | แผงควบคุมของผู้ดูแลระบบ",
diff --git a/public/language/th/admin/appearance/themes.json b/public/language/th/admin/appearance/themes.json
index efe9954248..589f054c4a 100644
--- a/public/language/th/admin/appearance/themes.json
+++ b/public/language/th/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "คุณแน่ใจแล้วใช่ไหมที่ต้องการกลับไปใช้ธีมพื้นฐานของ NodeBB?",
"theme-changed": "ธีมถูกเปลี่ยนแล้ว",
"revert-success": "คุณได้ทำการเปลี่ยน NodeBB ของคุณให้กลับไปใช้ธีมพื้นฐานของมันแล้ว",
- "restart-to-activate": "โปรดรีสตาร์ท NodeBB ของคุณเพื่อเปิดการทำงานของธีมนี้"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/th/admin/extend/plugins.json b/public/language/th/admin/extend/plugins.json
index c9e739c6fb..1f0ade6cd7 100644
--- a/public/language/th/admin/extend/plugins.json
+++ b/public/language/th/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "ถอนการติดตั้งปลั๊กอินแล้ว",
"alert.activate-success": "โปรดรีสตาร์ท NodeBB ของคุณเพื่อเปิดการทำงานของธีมนี้",
"alert.deactivate-success": "ปิดการใช้งานปลั๊กอินนี้แล้ว",
- "alert.upgrade-success": "โปรดรีสตาร์ท NodeBB ของคุณเพื่ออัพเกรดปลั๊กอินนี้",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "ติดตั้งปลั๊กอินแล้ว โปรดเปิดใช้งานปลั๊กอิน",
"alert.uninstall-success": "ปิดใช้งานปลั๊กอินและยกเลิกการติดตั้งแล้ว",
"alert.suggest-error": "NodeBB ไม่สามารถเข้าถึงตัวจัดการแพคเกจดำเนินการติดตั้งเวอร์ชันล่าสุดได้หรือไม่?
เซิร์ฟเวอร์ตอบกลับ (%1): %2
",
diff --git a/public/language/th/admin/general/dashboard.json b/public/language/th/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/th/admin/general/dashboard.json
+++ b/public/language/th/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/th/admin/menu.json b/public/language/th/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/th/admin/menu.json
+++ b/public/language/th/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/th/admin/settings/post.json b/public/language/th/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/th/admin/settings/post.json
+++ b/public/language/th/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/th/reset_password.json b/public/language/th/reset_password.json
index be04453dec..bc0ef8cc65 100644
--- a/public/language/th/reset_password.json
+++ b/public/language/th/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "ยืนยันรหัสผ่าน",
"enter_email": "กรุณาใส่อีเมลของคุณ เราจะส่งอีเมลให้คุณพร้อมคำแนะนำเกี่ยวกับวิธีการรีเซ็ตบัญชีของคุณ",
"enter_email_address": "ใส่อีเมล์",
- "password_reset_sent": "รหัสรีเซ็ตถูกส่งออกไปแล้ว",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "อีเมล์ไม่ถูกต้อง / อีเมล์ไม่มีอยู่!",
"password_too_short": "รหัสผ่านที่คุณกำหนดยังสั้นเกินไป กรุณากำหนดรหัสผ่านของคุณใหม่",
"passwords_do_not_match": "รหัสผ่านทั้ง 2 ที่ใส่ไม่ตรงกัน",
diff --git a/public/language/th/search.json b/public/language/th/search.json
index fc250eb3dc..a38be1d03c 100644
--- a/public/language/th/search.json
+++ b/public/language/th/search.json
@@ -5,6 +5,9 @@
"in": "ใน",
"titles": "หัวข้อ",
"titles-posts": "หัวข้อ และ ข้อความ",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "บันทึกโดย",
"in-categories": "ในหมวดหมู่",
"search-child-categories": "ค้นหาหมวดหมู่ย่อย",
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index 5c8998e667..c20c123771 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "ล็อคกระทู้",
"thread_tools.unlock": "ปลดล็อคกระทู้",
"thread_tools.move": "ย้ายกระทู้",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "ย้ายทั้งหมด",
"thread_tools.select_category": "เลือกประเภท",
"thread_tools.fork": "แยกกระทู้",
@@ -96,6 +97,7 @@
"fork_success": "แตกกระทู้สำเร็จแล้ว! คลิกที่นี่เพื่อไปยั้งกระทู้ที่คุณแตกประเด็น",
"delete_posts_instruction": "คลิกโพสต์ที่คุณต้องการลบ/ล้าง",
"merge_topics_instruction": "เลือกกระทู้ที่คุณต้องการรวม",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "ป้อนชื่อกระทู้ของคุณที่นี่ ...",
"composer.handle_placeholder": "ชื่อ",
"composer.discard": "ยกเลิก",
diff --git a/public/language/th/user.json b/public/language/th/user.json
index d6aa264c09..c9c64ec5b8 100644
--- a/public/language/th/user.json
+++ b/public/language/th/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "คุณต้องการแบนผู้ใช้นี้หรือไม่?",
"unban_account": "ปลดแบน",
"delete_account": "ลบบัญชี",
- "delete_account_confirm": "คุณต้องการลบบัญชีของคุณใช่หรือไม่?
การกระทำนี้ไม่สามารถกู้คืนได้ ข้อมูลบัญชีของคุณจะถูกลบทั้งหมด
กรอกชื่อผู้ใช้ของคุณ เพื่อยืนยันการลบบัญชีของ",
+ "delete_account_confirm": "Are you sure you want to 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": "คุณต้องการลบบัญชีนี้ใช่หรือไม่?
การกระทำนี้ไม่สามารถกู้คืนได้ ข้อมูลบัญชีนี้จะถูกลบทั้งหมด",
"account-deleted": "บัญชีถูกลบแล้ว",
"fullname": "ชื่อเต็ม",
@@ -53,7 +53,6 @@
"change_password": "เปลี่ยนรหัสผ่าน",
"change_password_error": "รหัสผ่านใช้ไม่ได้",
"change_password_error_wrong_current": "รหัสผ่านปัจจุบันไม่ถูกต้อง",
- "change_password_error_length": "รหัสผ่านสั้นเกินไป",
"change_password_error_match": "รหัสผ่านต้องเหมือนกัน",
"change_password_error_privileges": "คุณไม่มีสิทธิในการเปลี่ยนรหัสผ่าน",
"change_password_success": "รหัสผ่านของคุณได้รับการแก้ไขแล้ว",
diff --git a/public/language/tr/admin/admin.json b/public/language/tr/admin/admin.json
index f094318e96..17319d396b 100644
--- a/public/language/tr/admin/admin.json
+++ b/public/language/tr/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "NodeBB'yi yeniden başlatmak istediğinize emin misiniz?",
"acp-title": "%1 | NodeBB Yönetici Kontrol Paneli",
diff --git a/public/language/tr/admin/appearance/themes.json b/public/language/tr/admin/appearance/themes.json
index e8df4d06b8..51f0e7b969 100644
--- a/public/language/tr/admin/appearance/themes.json
+++ b/public/language/tr/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Varsayılan NodeBB temasını geri yüklemek istediğinizden emin misiniz?",
"theme-changed": "Tema Değiştirildi",
"revert-success": "NodeBB'nin varsayılan temasına başarıyla geri dönüş yaptınız.",
- "restart-to-activate": "Temayı tamamen aktif hale getirebilmek için NodeBB'yi yeniden başlat"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/tr/admin/extend/plugins.json b/public/language/tr/admin/extend/plugins.json
index 20ec5d126d..95e98bbad6 100644
--- a/public/language/tr/admin/extend/plugins.json
+++ b/public/language/tr/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Eklenti Kaldırıldı",
"alert.activate-success": "Bu eklentiyi tamamen aktif edebilmek için lütfen NodeBB'yi yeniden başlatın",
"alert.deactivate-success": "Eklenti başarıyla pasifleştirildi",
- "alert.upgrade-success": "Bu eklentiyi tamamen güncelleyebilmek için lütfen NodeBB'yi yeniden başlatın",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Eklenti başarıyla kuruldu, lütfen eklentiyi aktif edin.",
"alert.uninstall-success": "Eklenti başarıyla pasifleştirildi ve kaldırıldı.",
"alert.suggest-error": "NodeBB paket yöneticisine ulaşamadı, en yeni sürüm yüklenmeye devam edilsin mi?
Sunucu iade etti (%1): %2
",
diff --git a/public/language/tr/admin/general/dashboard.json b/public/language/tr/admin/general/dashboard.json
index f0459fd96c..1e615be4ab 100644
--- a/public/language/tr/admin/general/dashboard.json
+++ b/public/language/tr/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Arama işlevselliğini etkinleştirmek için eklenti sayfasından bir arama eklentisi kurun",
"control-panel": "Sistem Kontrol",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Bakım Modu",
diff --git a/public/language/tr/admin/menu.json b/public/language/tr/admin/menu.json
index 292186f5a3..c2aaae413c 100644
--- a/public/language/tr/admin/menu.json
+++ b/public/language/tr/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Forumu Yeniden Başlat",
"logout": "Çıkış",
"view-forum": "Forumu Görüntüle",
diff --git a/public/language/tr/admin/settings/post.json b/public/language/tr/admin/settings/post.json
index 92b8e7dfaa..abf2eab638 100644
--- a/public/language/tr/admin/settings/post.json
+++ b/public/language/tr/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Eklentilerin yardım sekmesine içerik eklemesine izin ver",
"composer.custom-help": "Özel Yardım Metni",
"ip-tracking": "IP İzleme",
- "ip-tracking.each-post": "Her ileti için IP Adresini takip et"
+ "ip-tracking.each-post": "Her ileti için IP Adresini takip et",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/tr/reset_password.json b/public/language/tr/reset_password.json
index 55adbe7083..4044c43d81 100644
--- a/public/language/tr/reset_password.json
+++ b/public/language/tr/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Şifreyi Onayla",
"enter_email": "Lütfen e-posta adresinizi girin , size hesabınızı nasıl sıfırlayacağınızı anlatan bir e-posta gönderelim",
"enter_email_address": "E-posta Adresinizi Girin",
- "password_reset_sent": "Şifre Yenilemesi Gönderildi",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Geçersiz E-posta / E-posta mevcut değil!",
"password_too_short": "Girdiğiniz şifre çok kısa, lütfen farklı bir şifre seçiniz.",
"passwords_do_not_match": "Girdiğiniz iki şifre birbirine uymuyor.",
diff --git a/public/language/tr/search.json b/public/language/tr/search.json
index cfbcc7db4b..c53e936cd5 100644
--- a/public/language/tr/search.json
+++ b/public/language/tr/search.json
@@ -5,6 +5,9 @@
"in": "Konum:",
"titles": "Başlıklar",
"titles-posts": "Başlıklar ve Yayınlar",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Gönderen",
"in-categories": "Kategorilerde",
"search-child-categories": "Alt kategorilerde arat",
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index d538842a6b..1b93a65f30 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Başlığı Kitle",
"thread_tools.unlock": "Başlığı Aç",
"thread_tools.move": "Başlığı Taşı",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Hepsini Taşı",
"thread_tools.select_category": "Kategori Seç",
"thread_tools.fork": "Başlığı Ayır",
@@ -96,6 +97,7 @@
"fork_success": "Başlık başarıyla ayrıldı!",
"delete_posts_instruction": "Silmek/temizlemek istediğiniz iletilere tıklayın.",
"merge_topics_instruction": "Birleştirmek istediğiniz başlıklara tıklayın",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Başlık ismini buraya girin...",
"composer.handle_placeholder": "İsim",
"composer.discard": "Vazgeç",
diff --git a/public/language/tr/user.json b/public/language/tr/user.json
index a2f8caae9d..d3b2787d86 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Hesabı dondurmak istediğinizden emin misiniz!",
"unban_account": "Hesabı Kullanıma Aç",
"delete_account": "Hesabı Sil",
- "delete_account_confirm": "Hesabınızı silmek istediğinize emin misiniz?
Bu işlem geri çevrilemez ve tüm verileriniz sistemden silinecek.
Eğer hesabınızı silmek istiyorsanız lütfen kullanıcı isminizi girerek işlemi onaylayın.",
+ "delete_account_confirm": "Are you sure you want to 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": "Bu hesabı silmek istediğinizden emin misiniz?
Bu işlem geri döndürülemez ve hiç bir veriyi kurtaramazsınız
",
"account-deleted": "Hesap silindi",
"fullname": "Tam Ad",
@@ -53,7 +53,6 @@
"change_password": "Şifre Değiştir",
"change_password_error": "Geçersiz Şifre",
"change_password_error_wrong_current": "Şu anki şifre doğru değil!",
- "change_password_error_length": "Şifre çok kısa!",
"change_password_error_match": "Şifreler aynı olmalı!",
"change_password_error_privileges": "Bu şifreyi değiştirme yetkiniz yok.",
"change_password_success": "Şifreniz güncellendi!",
diff --git a/public/language/uk/admin/admin.json b/public/language/uk/admin/admin.json
index abe94c184b..e4eb21b768 100644
--- a/public/language/uk/admin/admin.json
+++ b/public/language/uk/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Ви впевнені, що бажаєте перезавантажити NodeBB?",
"acp-title": "%1 | Адмінська Панель Керування NodeBB",
diff --git a/public/language/uk/admin/appearance/themes.json b/public/language/uk/admin/appearance/themes.json
index 9d2dd953a9..2438eb3ad0 100644
--- a/public/language/uk/admin/appearance/themes.json
+++ b/public/language/uk/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Ви впевнені, що бажаєте відновити тему NodeBB по замовчуванню?",
"theme-changed": "Тему змінено",
"revert-success": "Ви успішно повернули NodeBB до теми по замовчуванню.",
- "restart-to-activate": "Будь ласка, перезавантажте NodeBB, щоб повністю активувати цю тему"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/uk/admin/extend/plugins.json b/public/language/uk/admin/extend/plugins.json
index 1bba5d7896..0315d8af64 100644
--- a/public/language/uk/admin/extend/plugins.json
+++ b/public/language/uk/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Плагін видалено",
"alert.activate-success": "Будь ласка, перезавантажте NodeBB, щоб повністю активувати цей плагін",
"alert.deactivate-success": "Плагін успішно деактивовано",
- "alert.upgrade-success": "Будь ласка, перевантажте NodeBB, щоб повністю оновити цей плагін",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Плагін успішно встановлено, будь-ласка активуйте його.",
"alert.uninstall-success": "Плагін успішно деактивовано та видалено.",
"alert.suggest-error": "NodeBB не вдалося зв'язатися з менеджером пакетів, приступити до установки останньої версії?
Відповідь сервера (%1): %2
",
diff --git a/public/language/uk/admin/general/dashboard.json b/public/language/uk/admin/general/dashboard.json
index fbccd7ff22..b9f9856394 100644
--- a/public/language/uk/admin/general/dashboard.json
+++ b/public/language/uk/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Встановіть пошуковий плагін зі сторінки плагінів, що активувати пошуковий функціонал",
"control-panel": "Керування системою",
- "reload": "Перезавантажити",
- "restart": "Перебудувати та перезавантажити",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Перебудування або перезапуск вашого NodeBB призведе до втрати всіх існуючих з'єднань протягом декількох секунд.",
"restart-disabled": "Перебудування та перезапуск вашого NodeBB вимкнено, оскільки ви, здається, не запускаєте його через відповідний демон.",
"maintenance-mode": "Режим обслуговування",
diff --git a/public/language/uk/admin/menu.json b/public/language/uk/admin/menu.json
index 68a462f4d5..06a3e434ea 100644
--- a/public/language/uk/admin/menu.json
+++ b/public/language/uk/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Логування",
"development/info": "Інформація",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Перезавантажити форум",
"logout": "Вийти",
"view-forum": "Переглянути форум",
diff --git a/public/language/uk/admin/settings/post.json b/public/language/uk/admin/settings/post.json
index d7f01d5121..06f02232fb 100644
--- a/public/language/uk/admin/settings/post.json
+++ b/public/language/uk/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Дозволити плагінам додавати зміст довідки",
"composer.custom-help": "Користувацький текст довідки",
"ip-tracking": "Відстеження IP",
- "ip-tracking.each-post": "Відстежувати IP адреси для кожного посту"
+ "ip-tracking.each-post": "Відстежувати IP адреси для кожного посту",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/uk/reset_password.json b/public/language/uk/reset_password.json
index f3bbe1b550..a3841d89c6 100644
--- a/public/language/uk/reset_password.json
+++ b/public/language/uk/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Підтвердіть пароль",
"enter_email": "Будь ласка, введіть свою електронну пошту і ми надішлемо вам листа с інструкцією як скинути ваш обліковий запис.",
"enter_email_address": "Введіть електронну пошту",
- "password_reset_sent": "Скидання паролю надіслано",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Невірна або неіснуюча електронна пошта!",
"password_too_short": "Уведений пароль закороткий, оберіть, будь ласка, інший.",
"passwords_do_not_match": "Паролі що ви ввели не співпадають.",
diff --git a/public/language/uk/search.json b/public/language/uk/search.json
index 7d7f6c65d5..21fe00d4ca 100644
--- a/public/language/uk/search.json
+++ b/public/language/uk/search.json
@@ -5,6 +5,9 @@
"in": "В",
"titles": "Заголовки",
"titles-posts": "Заголовки та Пости",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Запощено",
"in-categories": "В Категоріях",
"search-child-categories": "Шукати в дочірніх категоріях",
diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json
index 2a5c67279e..aa42e4ba7d 100644
--- a/public/language/uk/topic.json
+++ b/public/language/uk/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Заблокувати тему",
"thread_tools.unlock": "Розблокувати тему",
"thread_tools.move": "Перемістити тему",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Перемістити всі",
"thread_tools.select_category": "Обрати Категорію",
"thread_tools.fork": "Відгалужити тему",
@@ -96,6 +97,7 @@
"fork_success": "Тему успішно відгалужено. Тисніть тут, щоб перейти до відгалуженої теми.",
"delete_posts_instruction": "Тисніть пости які ви бажаєте видалити/стерти",
"merge_topics_instruction": "Натисніть на теми, які потрібно об'єднати",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "Уведіть заголовок теми...",
"composer.handle_placeholder": "Ім'я",
"composer.discard": "Скасувати",
diff --git a/public/language/uk/user.json b/public/language/uk/user.json
index e4f2590039..1eb4a2a1bb 100644
--- a/public/language/uk/user.json
+++ b/public/language/uk/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Ви точно хочете забанити цього користувача?",
"unban_account": "Розбанити акаунт",
"delete_account": "Видалити акаунт",
- "delete_account_confirm": "Ви точно бажаєте видалити ваш акаунт?
Ця дія є незворотньою і ви не зможете відновити жодні з ваших даних.
Уведіть ваше ім'я користувача для підтвердження знищення цього акаунту.",
+ "delete_account_confirm": "Are you sure you want to 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": "Ви точно бажаєте видалити цей акаунт?
Ця дія є незворотньою і ви не зможете відновити жодні дані.
",
"account-deleted": "Акаунт видалено",
"fullname": "Повне ім'я",
@@ -53,7 +53,6 @@
"change_password": "Змінити пароль",
"change_password_error": "Невірний пароль!",
"change_password_error_wrong_current": "Ваш поточний пароль не вірний!",
- "change_password_error_length": "Пароль закороткий!",
"change_password_error_match": "Паролі мають співпадати!",
"change_password_error_privileges": "У вас немає прав змінювати цей пароль.",
"change_password_success": "Ваш пароль оновлено!",
diff --git a/public/language/vi/admin/admin.json b/public/language/vi/admin/admin.json
index 6f14021cb2..d16c92d85e 100644
--- a/public/language/vi/admin/admin.json
+++ b/public/language/vi/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "Bạn có thật sự muốn khởi động lại NodeBB",
"acp-title": "%1 | Bảng điểu khiển",
diff --git a/public/language/vi/admin/appearance/themes.json b/public/language/vi/admin/appearance/themes.json
index 3148a01337..597830f379 100644
--- a/public/language/vi/admin/appearance/themes.json
+++ b/public/language/vi/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
"theme-changed": "Theme Changed",
"revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
- "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/vi/admin/extend/plugins.json b/public/language/vi/admin/extend/plugins.json
index 7515f72590..05f7df4ecb 100644
--- a/public/language/vi/admin/extend/plugins.json
+++ b/public/language/vi/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "Plugin Uninstalled",
"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
"alert.deactivate-success": "Plugin successfully deactivated",
- "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "Plugin successfully installed, please activate the plugin.",
"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/vi/admin/general/dashboard.json b/public/language/vi/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/vi/admin/general/dashboard.json
+++ b/public/language/vi/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/vi/admin/menu.json b/public/language/vi/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/vi/admin/menu.json
+++ b/public/language/vi/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/vi/admin/settings/post.json b/public/language/vi/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/vi/admin/settings/post.json
+++ b/public/language/vi/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/vi/reset_password.json b/public/language/vi/reset_password.json
index 53e9e4060c..5ddc79d656 100644
--- a/public/language/vi/reset_password.json
+++ b/public/language/vi/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "Xác nhận lại mật khẩu",
"enter_email": "Xin hãy nhập địa chỉ email của bạn và chúng tôi sẽ gửi một email hướng dẫn cách thiết lập lại tài khoản cho bạn",
"enter_email_address": "Nhập địa chỉ Email",
- "password_reset_sent": "Đã gửi mật khẩu được thiết lập lại",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "Email không đúng / Email không tồn tại!",
"password_too_short": "Mật khẩu bạn nhập quá ngắn, vui lòng chọn một mật khẩu khác.",
"passwords_do_not_match": "Hai mật khẩu bạn nhập không trùng khớp với nhau.",
diff --git a/public/language/vi/search.json b/public/language/vi/search.json
index fc4e78954b..7cd8918a0f 100644
--- a/public/language/vi/search.json
+++ b/public/language/vi/search.json
@@ -5,6 +5,9 @@
"in": "Trong",
"titles": "Các tựa đề",
"titles-posts": "Tựa đề và Bài viết",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "Đăng bởi",
"in-categories": "Nằm trong chuyên mục",
"search-child-categories": "Tìm kiếm chuyên mục con",
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index 0927919298..130a93af97 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "Khóa chủ đề",
"thread_tools.unlock": "Mở khóa chủ đề",
"thread_tools.move": "Chuyển chủ đề",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "Chuyển tất cả",
"thread_tools.select_category": "Chọn chuyện mục",
"thread_tools.fork": "Tạo bản sao chủ đề",
@@ -96,6 +97,7 @@
"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",
+ "move_posts_instruction": "Click the posts you want to move",
"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/vi/user.json b/public/language/vi/user.json
index 4286f64e5b..4a532e4f52 100644
--- a/public/language/vi/user.json
+++ b/public/language/vi/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "Bạn có chắc bạn muốn cấm thành viên này?",
"unban_account": "Bỏ cấm thành viên",
"delete_account": "Xóa tài khoản",
- "delete_account_confirm": "Bạn có chắc muốn xóa tài khoản của mình?
Hành động này không thể khôi phục và bạn sẽ mất toàn bộ dữ liệu
Hãy nhập tên đăng nhập để xác nhận.",
+ "delete_account_confirm": "Are you sure you want to 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": "Bạn có chắc bạn muốn xoá tài khoản này chứ?
Tác vụ này không thể đảo ngược và bạn sẽ không thể phục hồi lại được dữ liệu đã xoá
",
"account-deleted": "Tài khoản đã bị xoá",
"fullname": "Tên đầy đủ",
@@ -53,7 +53,6 @@
"change_password": "Thay đổi mật khẩu",
"change_password_error": "Mật khẩu không đúng!",
"change_password_error_wrong_current": "Mật khẩu hiện tại của bạn không đúng",
- "change_password_error_length": "Mật khẩu quá ngắn!",
"change_password_error_match": "Mật khẩu phải khớp!",
"change_password_error_privileges": "Bạn không có quyền thay đổi mật khẩu này",
"change_password_success": "Mật khẩu của bạn đã được cập nhật",
diff --git a/public/language/zh-CN/admin/admin.json b/public/language/zh-CN/admin/admin.json
index 0648bf14af..6dd2b94890 100644
--- a/public/language/zh-CN/admin/admin.json
+++ b/public/language/zh-CN/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "你确定要重建并重启 NodeBB 吗？",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "你确定要重启 NodeBB 吗？",
"acp-title": "%1 | NodeBB 管理员控制面板",
diff --git a/public/language/zh-CN/admin/appearance/themes.json b/public/language/zh-CN/admin/appearance/themes.json
index acaecf2a93..e931245a1e 100644
--- a/public/language/zh-CN/admin/appearance/themes.json
+++ b/public/language/zh-CN/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "确认恢复到 NodeBB 默认主题？",
"theme-changed": "主题已更改",
"revert-success": "已成功恢复到 NodeBB 默认主题。",
- "restart-to-activate": "请重启 NodeBB 来完全激活该主题"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/zh-CN/admin/extend/plugins.json b/public/language/zh-CN/admin/extend/plugins.json
index 8bc3065ed6..4cfbc37875 100644
--- a/public/language/zh-CN/admin/extend/plugins.json
+++ b/public/language/zh-CN/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "插件已卸载",
"alert.activate-success": "请重启 NodeBB 来完全激活此插件",
"alert.deactivate-success": "插件停用成功",
- "alert.upgrade-success": "请重新载入 NodeBB 来完成插件升级",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "插件安装成功，请启用插件。",
"alert.uninstall-success": "插件已成功被停用且卸载。",
"alert.suggest-error": "NodeBB 联系不到包管理器， 继续安装最新版本？
服务器返回 (%1): %2
",
diff --git a/public/language/zh-CN/admin/general/dashboard.json b/public/language/zh-CN/admin/general/dashboard.json
index b21be3ae65..b74de75832 100644
--- a/public/language/zh-CN/admin/general/dashboard.json
+++ b/public/language/zh-CN/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "在插件页面安装搜索插件来激活搜索功能",
"control-panel": "系统控制",
- "reload": "重启",
- "restart": "重载&重启",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "重载或重启 NodeBB 会丢失数秒内全部的连接。",
"restart-disabled": "重建和重新启动NodeBB已被禁用，因为您似乎没有通过适当的守护进程运行它。",
"maintenance-mode": "维护模式",
diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json
index 84e89d7a03..def99ee8e4 100644
--- a/public/language/zh-CN/admin/menu.json
+++ b/public/language/zh-CN/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "记录器",
"development/info": "信息",
- "reload-forum": "重建并重启论坛",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "重启论坛",
"logout": "登出",
"view-forum": "查看论坛",
diff --git a/public/language/zh-CN/admin/settings/post.json b/public/language/zh-CN/admin/settings/post.json
index 02761f9ad7..290fb1d077 100644
--- a/public/language/zh-CN/admin/settings/post.json
+++ b/public/language/zh-CN/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "允许插件将内容添加到帮助选项卡",
"composer.custom-help": "自定义帮助文本",
"ip-tracking": "IP 跟踪",
- "ip-tracking.each-post": "跟踪每个帖子的 IP 地址"
+ "ip-tracking.each-post": "跟踪每个帖子的 IP 地址",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/zh-CN/reset_password.json b/public/language/zh-CN/reset_password.json
index 5dd547b48e..acb7fc6c5f 100644
--- a/public/language/zh-CN/reset_password.json
+++ b/public/language/zh-CN/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "验证密码",
"enter_email": "请输入您的电子邮箱地址，我们将会发送一份邮件协助您重置账号密码。",
"enter_email_address": "输入邮箱地址",
- "password_reset_sent": "密码重置邮件已发送。",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "无效的电子邮箱/电子邮箱不存在！",
"password_too_short": "密码太短，请选择其他密码。",
"passwords_do_not_match": "您输入两个密码不一致。",
diff --git a/public/language/zh-CN/search.json b/public/language/zh-CN/search.json
index 2d6b500297..ae445e7168 100644
--- a/public/language/zh-CN/search.json
+++ b/public/language/zh-CN/search.json
@@ -5,6 +5,9 @@
"in": "在",
"titles": "标题",
"titles-posts": "标题和回帖",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "发表",
"in-categories": "在版块",
"search-child-categories": "搜索子版块",
diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json
index 046f52af6a..bc5d88da2a 100644
--- a/public/language/zh-CN/topic.json
+++ b/public/language/zh-CN/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "锁定主题",
"thread_tools.unlock": "解锁主题",
"thread_tools.move": "移动主题",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "移动全部",
"thread_tools.select_category": "选择版块",
"thread_tools.fork": "分割主题",
@@ -96,6 +97,7 @@
"fork_success": "成功分割主题! 点这里跳转到分割后的主题。",
"delete_posts_instruction": "点击想要删除/永久删除的帖子",
"merge_topics_instruction": "点击您想合并的主题",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "在此输入您主题的标题...",
"composer.handle_placeholder": "姓名",
"composer.discard": "撤销",
diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json
index eb9525aac9..33930bc67a 100644
--- a/public/language/zh-CN/user.json
+++ b/public/language/zh-CN/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "您确定要封禁这位用户吗？",
"unban_account": "解禁账户",
"delete_account": "删除帐号",
- "delete_account_confirm": "确认要删除您的帐户吗？
此操作是不可逆转的，您将无法恢复您的任何数据
请输入您的用户名，确认您想要删除此帐户。",
+ "delete_account_confirm": "Are you sure you want to 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": "您确定要删除账户吗？
这个操作不可逆，而且您可能不能找回任何数据
",
"account-deleted": "帐号已删除",
"fullname": "姓名",
@@ -53,7 +53,6 @@
"change_password": "更改密码",
"change_password_error": "无效的密码！",
"change_password_error_wrong_current": "您的当前密码不正确！",
- "change_password_error_length": "密码太短！",
"change_password_error_match": "两次输入的密码必须相同！",
"change_password_error_privileges": "您无权更改此密码。",
"change_password_success": "您的密码已更新！",
diff --git a/public/language/zh-TW/admin/admin.json b/public/language/zh-TW/admin/admin.json
index 9bfc6d9210..f61ad3c9ad 100644
--- a/public/language/zh-TW/admin/admin.json
+++ b/public/language/zh-TW/admin/admin.json
@@ -1,5 +1,5 @@
{
- "alert.confirm-reload": "Are you sure you wish to rebuild and restart NodeBB?",
+ "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
"alert.confirm-restart": "確認重啟NodeBB？",
"acp-title": "%1 | NodeBB 管理控制面板",
diff --git a/public/language/zh-TW/admin/appearance/themes.json b/public/language/zh-TW/admin/appearance/themes.json
index 6a3008132b..960011ef91 100644
--- a/public/language/zh-TW/admin/appearance/themes.json
+++ b/public/language/zh-TW/admin/appearance/themes.json
@@ -7,5 +7,5 @@
"revert-confirm": "你確定要回復預設的主題嗎？",
"theme-changed": "主題已更換",
"revert-success": "已經成功回復為預設主題。",
- "restart-to-activate": "請重新啟動你的NodeBB以啟動主題。"
+ "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
}
\ No newline at end of file
diff --git a/public/language/zh-TW/admin/extend/plugins.json b/public/language/zh-TW/admin/extend/plugins.json
index be5ca1fe60..4e97474380 100644
--- a/public/language/zh-TW/admin/extend/plugins.json
+++ b/public/language/zh-TW/admin/extend/plugins.json
@@ -37,7 +37,7 @@
"alert.uninstalled": "外掛已移除",
"alert.activate-success": "請重新啟動你的NodeBB來完成外掛的啟用",
"alert.deactivate-success": "外掛已成功停用",
- "alert.upgrade-success": "請重新載入你的NodeBB來完成外掛的升級",
+ "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
"alert.install-success": "外掛已成功安裝，請啟用外掛。",
"alert.uninstall-success": "外掛已成功停用並且移除。",
"alert.suggest-error": "NodeBB could not reach the package manager, proceed with installation of latest version?
Server returned (%1): %2
",
diff --git a/public/language/zh-TW/admin/general/dashboard.json b/public/language/zh-TW/admin/general/dashboard.json
index 4d287c409d..56049387eb 100644
--- a/public/language/zh-TW/admin/general/dashboard.json
+++ b/public/language/zh-TW/admin/general/dashboard.json
@@ -37,8 +37,8 @@
"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
"control-panel": "System Control",
- "reload": "Restart",
- "restart": "Rebuild & Restart",
+ "rebuild-and-restart": "Rebuild & Restart",
+ "restart": "Restart",
"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
"maintenance-mode": "Maintenance Mode",
diff --git a/public/language/zh-TW/admin/menu.json b/public/language/zh-TW/admin/menu.json
index bebff6aa37..7e0d46d86b 100644
--- a/public/language/zh-TW/admin/menu.json
+++ b/public/language/zh-TW/admin/menu.json
@@ -63,7 +63,7 @@
"development/logger": "Logger",
"development/info": "Info",
- "reload-forum": "Rebuild & Restart Forum",
+ "rebuild-and-restart-forum": "Rebuild & Restart Forum",
"restart-forum": "Restart Forum",
"logout": "Log out",
"view-forum": "View Forum",
diff --git a/public/language/zh-TW/admin/settings/post.json b/public/language/zh-TW/admin/settings/post.json
index 6a1ab9a2a5..6594fe384b 100644
--- a/public/language/zh-TW/admin/settings/post.json
+++ b/public/language/zh-TW/admin/settings/post.json
@@ -49,5 +49,6 @@
"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text",
"ip-tracking": "IP Tracking",
- "ip-tracking.each-post": "Track IP Address for each post"
+ "ip-tracking.each-post": "Track IP Address for each post",
+ "enable-post-history": "Enable Post History"
}
\ No newline at end of file
diff --git a/public/language/zh-TW/reset_password.json b/public/language/zh-TW/reset_password.json
index f7d83c8dd1..75c9192e59 100644
--- a/public/language/zh-TW/reset_password.json
+++ b/public/language/zh-TW/reset_password.json
@@ -9,7 +9,7 @@
"repeat_password": "再次確認新密碼",
"enter_email": "請輸入你的電子郵件地址，我們會寄送郵件告訴你如何重置你的帳戶。",
"enter_email_address": "輸入電子郵件地址",
- "password_reset_sent": "密碼重設郵件已發送。",
+ "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
"invalid_email": "無效的電子郵件 / 電子郵件不存在！",
"password_too_short": "輸入的密碼太短，請使用另一個不同的密碼",
"passwords_do_not_match": "你已經輸入的兩個密碼不一樣",
diff --git a/public/language/zh-TW/search.json b/public/language/zh-TW/search.json
index 81f5249d3b..b032146124 100644
--- a/public/language/zh-TW/search.json
+++ b/public/language/zh-TW/search.json
@@ -5,6 +5,9 @@
"in": "在",
"titles": "標題",
"titles-posts": "標題與張貼",
+ "match-words": "Match words",
+ "all": "All",
+ "any": "Any",
"posted-by": "張貼由",
"in-categories": "在類別中",
"search-child-categories": "搜尋子類別",
diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json
index 426a6afee4..a965cce19b 100644
--- a/public/language/zh-TW/topic.json
+++ b/public/language/zh-TW/topic.json
@@ -62,6 +62,7 @@
"thread_tools.lock": "鎖定主題",
"thread_tools.unlock": "解除主題鎖定",
"thread_tools.move": "移動主題",
+ "thread_tools.move-posts": "Move Posts",
"thread_tools.move_all": "移動全部",
"thread_tools.select_category": "Select Category",
"thread_tools.fork": "分叉主題",
@@ -96,6 +97,7 @@
"fork_success": "成功分叉成新的主題！點擊這裡進入新的主題。",
"delete_posts_instruction": "點擊你想要刪除/清除的張貼",
"merge_topics_instruction": "Click the topics you want to merge",
+ "move_posts_instruction": "Click the posts you want to move",
"composer.title_placeholder": "輸入標題...",
"composer.handle_placeholder": "名字",
"composer.discard": "放棄",
diff --git a/public/language/zh-TW/user.json b/public/language/zh-TW/user.json
index 9cd7fcfbab..5cccec7321 100644
--- a/public/language/zh-TW/user.json
+++ b/public/language/zh-TW/user.json
@@ -12,7 +12,7 @@
"ban_account_confirm": "你確定要禁用這個使用者?",
"unban_account": "取消禁用帳號",
"delete_account": "刪除帳戶",
- "delete_account_confirm": "你確定要刪除自己的帳戶？
此操作不能復原，你將無法恢復任何資料
輸入你的帳號，來確認你希望刪除這個帳戶。",
+ "delete_account_confirm": "Are you sure you want to 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": "你確定要刪除這個帳戶？
此操作是不能還原的，你將無法回復任何資料
",
"account-deleted": "帳號已刪除",
"fullname": "全名",
@@ -53,7 +53,6 @@
"change_password": "更改密碼",
"change_password_error": "無效的密碼！",
"change_password_error_wrong_current": "目前的密碼不正確！",
- "change_password_error_length": "密碼太短！",
"change_password_error_match": "密碼必須要一致！",
"change_password_error_privileges": "你沒有變更此密碼的權限！",
"change_password_success": "你的密碼已經更新！",